[Button] Apply Dark theme UX 1.1 for Button.
[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / button.edc
index b4a5a12..9fa44b8 100644 (file)
 #define BUTTON_LANDSCAPE_DISABLED 0
 #define BUTTON_LANDSCAPE_ENABLED 1
 
-   sounds {
-      sample {
-         name: "touch_sound" AS_IS;
-         source: "S_Touch_30ms.wav";
-      }
-   }
-
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/style1";
       alias: "elm/button/base/text_only/style1";
@@ -36,6 +29,9 @@
       alias: "elm/button/base/icon_and_text/center";
       alias: "elm/button/base/nocontents/search_button";
       alias: "elm/button/base/style1/multiline";
+      alias: "elm/button/base/style2";
+      alias: "elm/button/base/text_only/style2";
+      alias: "elm/button/base/style2/multiline";
       data {
          item: "focus_highlight" "on";
       }
          image: "00_button_01_dim.png" COMP;
          image: "00_button_01_focus.png" COMP;
       }
+      styles{
+         style { name: "btn_base_style1";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
                max: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
+         part { name: "elm.swallow.content.shadow.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "elm.swallow.content.shadow.clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_NORMAL_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_NORMAL_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_PRESSED_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_STYLE1_PRESSED_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.content.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1.to: "elm.swallow.content";
+               rel2.to: "elm.swallow.content";
+            }
+         }
+         part { name: "elm.swallow.content.shadow.clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_STYLE1_SHADOW_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_STYLE1_SHADOW_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_STYLE1_SHADOW_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "icon_clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_STYLE1_ICON_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_STYLE1_ICON_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_STYLE1_ICON_DISABLED_COLOR_INC;
+            }
+         }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
-               }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
+               } 
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
+                  style: "btn_base_style1";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
          part { name: "over2";
                color: 0 0 0 0;
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             after: "text_clicked";
          }
          program { name: "text_clicked";
                  }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"button_image", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.proxy", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.clipper", "default", 0.0);
+               set_state(PART:"icon_clipper", "default", 0.0);
             }
             after: button_unpress;
          }
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             after: "disable_text";
          }
          program { name: "disable_text";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             target: "disabler";
             after: "enable_text";
          }
       inherit: "elm/button/base/style1";
       parts {
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
+                  style: "btn_base_style1";
                   min: 1 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text.size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC;
-               text.min: 1 1;
+               text {
+                  style: "btn_base_style1";
+                  size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC;
+                  min: 1 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_focus";
+               }
             }
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/style1/delete";
+//////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/sweep";
+      alias: "elm/button/base/text_only/sweep";
+      alias: "elm/button/base/hidden";
+      alias: "elm/button/base/sweep/multiline";
       inherit: "elm/button/base/style1";
-      images {
-         image: "00_button_01_delete.png" COMP;
-         image: "00_button_01_delete_dim.png" COMP;
-         image: "00_button_01_delete_press.png" COMP;
+      styles{
+         style { name: "btn_base_sweep";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SWEEP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_sweep_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SWEEP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_sweep_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SWEEP_BUTTON_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_sweep_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               image {
-                  normal: "00_button_01_delete.png";
-                  border: BUTTON_TEXT_STYLE1_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
-            }
-         }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
+                  style: "btn_base_sweep";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_sweep_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_sweep_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_sweep_focus";
+               }
             }
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/search_button/text";
-      alias: "elm/button/base/searchbar/default";
+   group { name: "elm/button/base/style1/delete";
+      alias: "elm/button/base/sweep/delete";
+      alias: "elm/button/base/sweep/delete/multiline";
       inherit: "elm/button/base/style1";
       images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_press.png" COMP;
+         image: "00_button_01_delete.png" COMP;
+         image: "00_button_01_delete_dim.png" COMP;
+         image: "00_button_01_delete_press.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_style1_delete";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_DELETE_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_DELETE_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_delete_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_DELETE_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_DELETE_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_delete_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_DELETE_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_DELETE_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_delete_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_DELETE_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
                image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
+                  normal: "00_button_01_delete.png";
+                  border: BUTTON_TEXT_STYLE1_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
+               image.normal: "00_button_01_delete_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
+               image.normal: "00_button_01_delete_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_SEARCH_BUTTON_BG_MIN_INC;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC;
+               image.normal: "00_button_01_delete_press.png";
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SEARCH_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
+                  style: "btn_base_style1_delete";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_delete_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_style1_delete_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_TEXT_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_delete_focus";
+               }
             }
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/search_button/send";
-      inherit: "elm/button/base/style1";
-      images {
-         image: "00_button_01_send.png" COMP;
-         image: "00_button_01_send_dim.png" COMP;
-         image: "00_button_01_send_press.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               image {
-                  normal: "00_button_01_send.png";
-                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_send_press.png";
-            }
-            description { state: "disabled" 0.0;
+//////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/sweep/delete";
+      alias: "elm/button/base/sweep/delete/multiline";
+      inherit: "elm/button/base/style1/delete";
+      styles{
+         style { name: "btn_base_sweep_delete";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SWEEP_BUTTON_SHADOW_TEXTBLOCK_DELETE_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_sweep_delete_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SWEEP_BUTTON_SHADOW_TEXTBLOCK_DELETE_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_sweep_delete_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SWEEP_BUTTON_SHADOW_TEXTBLOCK_DELETE_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_sweep_delete_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      parts {
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               text {
+                  style: "btn_base_sweep_delete";
+               }
+            }
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_send_dim.png";
+               visible: 1;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_sweep_delete_pressed";
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_sweep_delete_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_send_press.png";
+               visible: 1;
+               text {
+                  style: "btn_base_sweep_delete_focus";
+               }
             }
          }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/search_button/text";
+      alias: "elm/button/base/searchbar/default";
+      inherit: "elm/button/base/style1";
+      styles{
+         style { name: "btn_base_search";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      parts {
          part { name: "bg";
             type: RECT;
             scale: 1;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
-               }
-               color: BUTTON_SEARCH_BUTTON_SEND_NORMAL_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_SEND_SHADOW_NORMAL_COLOR_INC;
+               } 
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_SEND_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_SEND_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_SEND_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_focus";
+               }
             }
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/search_button/cancel";
+   group { name: "elm/button/base/search_button/send";
       inherit: "elm/button/base/style1";
       images {
-         image: "00_button_01_delete.png" COMP;
-         image: "00_button_01_delete_dim.png" COMP;
-         image: "00_button_01_delete_press.png" COMP;
+         image: "00_button_01_send.png" COMP;
+         image: "00_button_01_send_dim.png" COMP;
+         image: "00_button_01_send_press.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_search_send";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_send_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_send_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_send_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_SEND_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
                image {
-                  normal: "00_button_01_delete.png";
+                  normal: "00_button_01_send.png";
                   border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
+               image.normal: "00_button_01_send_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_dim.png";
+               image.normal: "00_button_01_send_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
+               image.normal: "00_button_01_send_press.png";
             }
          }
          part { name: "bg";
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            clip_to: "clipper";
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SEARCH_BUTTON_CANCEL_NORMAL_COLOR_INC;
-               color2: BUTTON_SEARCH_BUTTON_CANCEL_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_search_send";
                   min: 0 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_send_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_DISABLED_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_search_send_dim";
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_SEARCH_BUTTON_CANCEL_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_search_send_focus";
+               }
             }
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/style2";
-      alias: "elm/button/base/text_only/style2";
-      alias: "elm/button/base/style2/multiline";
-      data {
-         item: "focus_highlight" "on";
-      }
+   group { name: "elm/button/base/search_button/cancel";
+      inherit: "elm/button/base/style1";
       images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_focus.png" COMP;
+         image: "00_button_01_delete.png" COMP;
+         image: "00_button_01_delete_dim.png" COMP;
+         image: "00_button_01_delete_press.png" COMP;
       }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
+      styles{
+         style { name: "btn_base_search_cancel";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_cancel_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_cancel_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_search_cancel_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_SEARCH_BUTTON_TEXT_FONT_SIZE_INC" align=center color="BUTTON_SEARCH_BUTTON_CANCEL_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
                image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
+                  normal: "00_button_01_delete.png";
+                  border: BUTTON_SEARCH_BUTTON_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
+               image.normal: "00_button_01_delete_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_01_delete_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
+               image.normal: "00_button_01_delete_press.png";
             }
          }
          part { name: "bg";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               min: BUTTON_SEARCH_BUTTON_BG_MIN_INC;
                visible: 0;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+               min: BUTTON_SEARCH_BUTTON_VISIBLE_BG_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+               min: BUTTON_SEARCH_BUTTON_ICONONLY_BG_MIN_INC;
             }
          }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
+         part { name: "elm.text";
+            type: TEXTBLOCK;
             mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "icon_rect";
-            type: RECT;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
                visible: 0;
-               min: 0 0;
-               fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               text {
+                  style: "btn_base_search_cancel";
+                  min: 0 0;
+                  max: 1 0;
                }
-               align: 0.0 0.5;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               visible: 1;
             }
-            description { state: "icononly" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_search_cancel_pressed";
+               }
             }
-         }
-         part { name: "padding_after_icon";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               visible: 0;
-               min: 0 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_search_cancel_dim";
                }
-               rel2.to: "icon_rect";
-               align: 0.0 0.0;
             }
-            description { state: "visible" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 1;
+               text {
+                  style: "btn_base_search_cancel_focus";
+               }
             }
-            description { state: "icononly" 0.0;
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/popup_button/default";
+      alias: "elm/button/base/popup_button/menustyle";
+      alias: "elm/button/base/popup_button/liststyle";
+      alias: "elm/button/base/popup_button/volumebarstyle";
+      alias: "elm/button/base/popup_button/customstyle";
+      alias: "elm/button/base/popup_button/verticalbuttonstyle";
+      alias: "elm/button/base/popup_button/default/multiline";
+      data {
+         item: "focus_highlight" "on";
+      }
+      images {
+         image: "00_popup_button.png" COMP;
+         image: "00_popup_button_dim.png" COMP;
+         image: "00_popup_button_press.png" COMP;
+         image: "00_popup_button_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_popup_button";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_popup_button_pressed";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_popup_button_dim";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_popup_button_focus";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_POPUP_BG_NORMAL_MIN_INC;
+               image {
+                  normal: "00_popup_button.png";
+                  border: BUTTON_POPUP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_popup_button_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_popup_button_dim.png";
+            }
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_popup_button_focus.png";
             }
          }
-         part { name: "padding_before_text";
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_popup_button_focus.png";
+                  border: BUTTON_POPUP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_POPUP_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "padding_right_bottom";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 0.0;
+               rel1.relative: 1.0 1.0;
+               min: BUTTON_POPUP_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "padding_icon_text";
+            type: RECT;
+            scale: 1;
             description { state: "default" 0.0; //when only icon or no icon is there
-               align: 1.0 0.5;
+               align: 0.0 0.0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text";
-                  to_y: "padding_right_bottom";
+                  relative: 1.0 0.0;
+                  to: "elm.swallow.content";
                }
+               rel2.to: "elm.swallow.content";
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: 0 0;
                visible: 0;
             }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               inherit: "default" 0.0;
+               min: BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+            }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
+               inherit: "default" 0.0;
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
-               align: 1.0 0.5;
+               visible: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
+               visible: 1;
+               align: 0.5 0.5;
+            }
+         }
+         part { name: "elm.swallow.content.shadow.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "elm.swallow.content.shadow.clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_left_top";
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_NORMAL_TOP_OFFSET_INC;
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_right_bottom";
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_NORMAL_BOTTOM_OFFSET_INC;
                }
             }
-            description { state: "icononly" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_PRESSED_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "elm.swallow.content";
+                  offset: BUTTON_POPUP_PRESSED_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "elm.swallow.content.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+               source: "elm.swallow.content";
+               proxy.source_clip: 0;
+               rel1.to: "elm.swallow.content";
+               rel2.to: "elm.swallow.content";
+            }
+         }
+         part { name: "elm.swallow.content.shadow.clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_POPUP_SHADOW_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_POPUP_SHADOW_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_POPUP_SHADOW_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "icon_clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_POPUP_ICON_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_POPUP_ICON_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_POPUP_ICON_DISABLED_COLOR_INC;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "clipper";
-            effect: SHADOW BOTTOM;
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
+                  to_x: "padding_icon_text";
                   to_y: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE2_FONT_SIZE_INC;
+                  style: "btn_base_popup_button";
                   min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               min: BUTTON_POPUP_TEXT_MIN_INC;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_popup_button_pressed";
+                  min: 0 0;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_popup_button_dim";
+               }
+               min: BUTTON_POPUP_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
+               text {
+                  style: "btn_base_popup_button_dim";
+                  min: 0 0;
+               }
             }
          }
          part { name: "over2";
                color: 0 0 0 0;
             }
          }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             after: "text_clicked";
          }
          program { name: "text_clicked";
                  }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"button_image", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.proxy", "default", 0.0);
+               set_state(PART:"elm.swallow.content.shadow.clipper", "default", 0.0);
+               set_state(PART:"icon_clipper", "default", 0.0);
             }
             after: button_unpress;
          }
                if (!strcmp(st, "icononly"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                    set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
                  }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "icononly", 0.0);
-                    set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
                  }
                set_state(PART:"elm.text", "default", 0.0);
             }
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                    set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
                  }
                else
                  {
                     set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "icononly", 0.0);
-                    set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
                  }
             }
          }
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
-            target: "padding_after_icon";
-            target: "icon_rect";
-            target: "bg";
+            target: "padding_icon_text";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             target: "disabler";
             after: "disable_text";
          }
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "clipper";
+            target: "elm.swallow.content.shadow.proxy";
+            target: "elm.swallow.content.shadow.clipper";
+            target: "icon_clipper";
             target: "disabler";
             after: "enable_text";
          }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep";
-      alias: "elm/button/base/text_only/sweep";
-      alias: "elm/button/base/hidden";
-      alias: "elm/button/base/sweep/multiline";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      styles{
-         style { name: "btn_sweep_multiline";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SWEEP_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed linegap=-7 ellipsis=1.0 text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "padding_icon_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               visible: 0;
-               fixed: 1 0;
-               min: 0 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2.to: "icon_rect";
-               align: 0.0 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               inherit: "default" 0.0;
-               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               max: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               visible: 1;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               max: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  style: "btn_sweep_multiline";
-                  align: 0.5 0.45;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_icon_text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep/delete";
-      inherit: "elm/button/base/sweep";
-      alias: "elm/button/base/sweep/delete/multiline";
-      images {
-         image: "00_button_01_delete_press.png" COMP;
-         image: "00_button_01_delete.png" COMP;
-         image: "00_button_01_delete_dim.png" COMP;
-      }
-      styles{
-         style { name: "btn_sweep_delete_multiline";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SWEEP_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed linegap=-7 ellipsis=1.0 text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
-               image {
-                  normal: "00_button_01_delete.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_delete_press.png";
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  style: "btn_sweep_multiline";
-                  align: 0.5 0.45;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
-               visible: 1;
-               min: BUTTON_SWEEP_TEXT_MIN_INC;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_DELETE_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/popup_button/default";
-      alias: "elm/button/base/popup_button/menustyle";
-      alias: "elm/button/base/popup_button/liststyle";
-      alias: "elm/button/base/popup_button/volumebarstyle";
-      alias: "elm/button/base/popup_button/customstyle";
-      alias: "elm/button/base/popup_button/verticalbuttonstyle";
-      alias: "elm/button/base/popup_button/default/multiline";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_POPUP_BG_NORMAL_MIN_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_POPUP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_POPUP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_POPUP_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 1.0 0.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_POPUP_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_icon_text";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "elm.swallow.content";
-               }
-               rel2.to: "elm.swallow.content";
-               fixed: 1 0;
-               min: 0 0;
-               visible: 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               inherit: "default" 0.0;
-               min: BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               fixed: 1 0;
-               visible: 1;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
-               visible: 1;
-               align: 0.5 0.5;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clipper";
-            effect: SHADOW BOTTOM;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
-                  min: 0 0;
-                  text_class: "tizen";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_POPUP_TEXT_MIN_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               visible: 1;
-               min: BUTTON_POPUP_TEXT_MIN_INC;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_POPUP_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_icon_text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "clipper";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
-   group { name: "elm/button/base/"style_name; \
-      data { \
-         item: "focus_highlight" "on"; \
-      } \
-      images { \
-         image: "00_circle_button.png" COMP; \
-         image: "00_circle_button_press.png" COMP; \
-         image: "00_circle_button_dim.png" COMP; \
-         image: image_normal COMP; \
-         image: image_press COMP; \
-         image: 00_circle_button_focus.png COMP; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-               max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-               image.normal: "00_circle_button.png"; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_press.png"; \
-            } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_dim.png"; \
-            } \
-         } \
-         part { name: "left_top_padding"; \
-            scale: 1; \
-            type: SPACER; \
-            description { state: "default" 0.0; \
-               min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \
-               max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \
-               fixed: 1 1; \
-               align: 0.0 0.0; \
-               rel1.to: "button_image"; \
-               rel2.to: "button_image"; \
-            } \
-         } \
-         part { name: "right_bottom_padding"; \
-            scale: 1; \
-            type: SPACER; \
-            description { state: "default" 0.0; \
-               min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \
-               max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \
-               fixed: 1 1; \
-               align: 1.0 1.0; \
-               rel1 { \
-                  relative: 1.0 1.0; \
-                  to: "button_image"; \
-               } \
-               rel2.to: "button_image"; \
-            } \
-         } \
-         part { name: "button_center_part"; \
-            scale: 1; \
-            clip_to: "icon_clipper"; \
-            description { state: "default" 0.0; \
-               min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
-               max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
-               image.normal: image_normal; \
-               rel1 { \
-                  relative: 1.0 1.0; \
-                  to: "left_top_padding"; \
-               } \
-               rel2 { \
-                  relative: 0.0 0.0; \
-                  to: "right_bottom_padding"; \
-               } \
-            } \
-            description { state: "clicked" 0.0; \
-               inherit: "default"; \
-               image.normal: image_press; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default"; \
-            } \
-         } \
-         part { name: "icon_clipper"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; \
-            } \
-         } \
-         part { name: "focus_image"; \
-            scale: 1; \
-            mouse_events: 0; \
-            repeat_events: 1; \
-              description { state: "default" 0.0; \
-                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-                 visible: 0; \
-                 rel1.to : "button_image"; \
-                 rel2.to : "button_image"; \
-                 image { \
-                  normal: "00_circle_button_focus.png"; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "focused" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               min: min_width min_height; \
-            } \
-         } \
-         part { name: "over2"; \
-            type: RECT; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-            } \
-         } \
-         part { name: "disabler"; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               visible: 0; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-      } \
-      programs { \
-         program { name: "button_click"; \
-            signal: "mouse,down,1"; \
-            source: "over1"; \
-            action: SIGNAL_EMIT "elm,action,press" ""; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_click_anim"; \
-            action: STATE_SET "clicked" 0.0; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "button_double_click"; \
-            signal: "mouse,down,1,double"; \
-            source: "over1"; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_unclick"; \
-            signal: "mouse,up,1"; \
-            source: "over2"; \
-            action: SIGNAL_EMIT "elm,action,unpress" ""; \
-            after: "button_unclick_anim"; \
-         } \
-         program { name: "button_unclick_anim"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "touch_snd"; \
-            signal: "mouse,clicked,1"; \
-            source: "over1"; \
-            action: PLAY_SAMPLE "touch_sound" 1.0; \
-            after: button_unclick3; \
-         } \
-         program { name: "button_unclick3"; \
-            action: SIGNAL_EMIT "elm,action,click" ""; \
-         } \
-         program { name: "disable"; \
-            signal: "elm,state,disabled"; \
-            source: "elm"; \
-            action: STATE_SET "disabled" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "enable"; \
-            signal: "elm,state,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "action_focus"; \
-            signal: "elm,action,focus_highlight,show"; \
-            source: "elm"; \
-            action: STATE_SET "focused" 0.0; \
-            target: "focus_image"; \
-         } \
-         program { name: "action_unfocus"; \
-            signal: "elm,action,focus_highlight,hide"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "focus_image"; \
-         } \
-      } \
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal","00_button_right.png", "00_button_right_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_right.png", "00_button_right_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", "00_button_expand_opened_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", "00_button_info_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", "00_button_info_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", "00_button_rename_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", "00_button_rename_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", "00_button_call_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", "00_button_call_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus", "00_button_add.png", "00_button_add_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_add.png", "00_button_add_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus", "00_button_delete.png", "00_button_delete_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_delete.png", "00_button_delete_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel", "00_button_expand_cancel.png", "00_button_expand_cancel_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_expand_cancel.png", "00_button_expand_cancel_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send", "00_button_expand_send.png", "00_button_expand_send_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send/extended", "00_button_expand_send.png", "00_button_expand_send_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-///////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("contact", "00_button_contact.png", "00_button_contact_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-///////////////////////////////////////////////////////////////////////////////////////
-
-#define BUTTON_CIRCLE_WARNING_STYLES(style_name, min_width, min_height) \
-   group { name: "elm/button/base/"style_name; \
-      inherit: "elm/button/base/info"; \
-      images { \
-         image: "00_circle_button_delete.png" COMP; \
-         image: "00_circle_button_delete_press.png" COMP; \
-         image: "00_circle_button_delete_dim.png" COMP; \
-         image: "00_button_warning.png" COMP; \
-         image: "00_button_warning_press.png" COMP; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               image.normal: "00_circle_button_delete.png"; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_delete_press.png"; \
-            } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_delete_dim.png"; \
-            } \
-         } \
-         part { name: "button_center_part"; \
-            scale: 1; \
-            clip_to: "icon_clipper"; \
-            description { state: "default" 0.0; \
-               image.normal: "00_button_warning.png"; \
-            } \
-            description { state: "clicked" 0.0; \
-               inherit: "default"; \
-               image.normal: "00_button_warning_press.png"; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default"; \
-            } \
-         } \
-         part { name: "icon_clipper"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_WARNING_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_WARNING_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_WARNING_DISABLED_COLOR_INC; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               min: min_width min_height; \
-            } \
-         } \
-      } \
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_WARNING_STYLES("warning", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_WARNING_STYLES("warning/extended", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/circle/empty";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_circle_button.png" COMP;
-         image: "00_circle_button_press.png" COMP;
-         image: "00_circle_button_dim.png" COMP;
-         image: 00_circle_button_focus.png COMP;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
-               max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
-               fixed: 1 1;
-               image.normal: "00_circle_button.png";
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_circle_button_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_circle_button_dim.png";
-            }
-         }
-         part { name: "left_top_padding";
-            scale: 1;
-            type: SPACER;
-            description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC;
-               max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.0 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-            }
-         }
-         part { name: "right_bottom_padding";
-            scale: 1;
-            type: SPACER;
-            description { state: "default" 0.0;
-               min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC;
-               max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 1.0 1.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "button_image";
-               }
-               rel2.to: "button_image";
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            clip_to: "icon_clipper";
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "left_top_padding";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "right_bottom_padding";
-               }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
-               max: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
-            }
-         }
-         part { name: "icon_clipper";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-              description { state: "default" 0.0;
-                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
-                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
-                 visible: 0;
-                 rel1.to : "button_image";
-                 rel2.to : "button_image";
-                 image {
-                  normal: "00_circle_button_focus.png";
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "icon_clipper";
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over1";
-            after: "button_click_anim";
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick2;
-         }
-         program { name: "button_unclick2";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "icon_clipper";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
-   group { name: "elm/button/base/contacts/"style_name; \
-   alias: "elm/button/base/"style_name; \
-      data { \
-         item: "focus_highlight" "on"; \
-      } \
-      images { \
-         image: "00_circle_button.png" COMP; \
-         image: "00_circle_button_press.png" COMP; \
-         image: "00_circle_button_dim.png" COMP; \
-         image: edit_normal COMP; \
-         image: edit_press COMP; \
-         image: 00_circle_button_focus.png COMP; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
-               max: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
-               image.normal: "00_circle_button.png"; \
-            } \
-            description { state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_press.png"; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_dim.png"; \
-            } \
-         } \
-         part { name: "button_center_part"; \
-            mouse_events: 0; \
-            scale: 1; \
-            clip_to: "icon_clipper"; \
-            description { state: "default" 0.0; \
-               min: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
-               max: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
-               image.normal: image_normal; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: image_press; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-            } \
-         } \
-         part { name: "focus_image"; \
-            scale: 1; \
-            mouse_events: 0; \
-            repeat_events: 1; \
-              description { state: "default" 0.0; \
-                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-                 visible: 0; \
-                 rel1.to : "button_image"; \
-                 rel2.to : "button_image"; \
-                 image { \
-                  normal: "00_circle_button_focus.png"; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "focused" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-         part { name: "icon_clipper"; \
-            scale: 1; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               color: BUTTON_EDIT_STYLE_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               color: BUTTON_EDIT_STYLE_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               color: BUTTON_EDIT_STYLE_DISABLED_COLOR_INC; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            repeat_events: 1; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               min: min_width min_height; \
-            } \
-         } \
-         part { name: "over2"; \
-            type: RECT; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-            } \
-         } \
-         part { name: "disabler"; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               visible: 0; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-      } \
-      programs { \
-         program { name: "button_click"; \
-            signal: "mouse,down,1"; \
-            source: "over1"; \
-            action: SIGNAL_EMIT "elm,action,press" ""; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_click_anim"; \
-            action: STATE_SET "clicked" 0.0; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "button_double_click"; \
-            signal: "mouse,down,1,double"; \
-            source: "over1"; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_unclick"; \
-            signal: "mouse,up,1"; \
-            source: "over2"; \
-            action: SIGNAL_EMIT "elm,action,unpress" ""; \
-            after: "button_unclick_anim"; \
-         } \
-         program { name: "button_unclick_anim"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "touch_snd"; \
-            signal: "mouse,clicked,1"; \
-            source: "over1"; \
-            action: PLAY_SAMPLE "touch_sound" 1.0; \
-            after: button_unclick3; \
-         } \
-         program { name: "button_unclick3"; \
-            action: SIGNAL_EMIT "elm,action,click" ""; \
-         } \
-         program { name: "disable"; \
-            signal: "elm,state,disabled"; \
-            source: "elm"; \
-            action: STATE_SET "disabled" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "enable"; \
-            signal: "elm,state,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: "icon_clipper"; \
-         } \
-         program { name: "action_focus"; \
-            signal: "elm,action,focus_highlight,show"; \
-            source: "elm"; \
-            action: STATE_SET "focused" 0.0; \
-            target: "focus_image"; \
-         } \
-         program { name: "action_unfocus"; \
-            signal: "elm,action,focus_highlight,hide"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "focus_image"; \
-         } \
-      } \
-   }
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus", "00_button_add.png", "00_button_add_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_add.png", "00_button_add_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-#define BUTTON_EDIT_MINUS_STYLES(style_name, min_width, min_height) \
-   group { name: "elm/button/base/contacts/"style_name; \
-      alias: "elm/button/base/"style_name; \
-      inherit: "elm/button/base/contacts/icon_plus"; \
-      images { \
-         image: "00_circle_button_delete.png" COMP; \
-         image: "00_circle_button_delete_press.png" COMP; \
-         image: "00_circle_button_delete_dim.png" COMP; \
-         image: "00_button_delete.png" COMP; \
-         image: "00_button_delete_press.png" COMP; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               image.normal: "00_circle_button_delete.png"; \
-            } \
-            description { state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_delete_press.png"; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_circle_button_delete_dim.png"; \
-            } \
-         } \
-         part { name: "button_center_part"; \
-            mouse_events: 0; \
-            scale: 1; \
-            clip_to: "icon_clipper"; \
-            description { state: "default" 0.0; \
-               image.normal: "00_button_delete.png"; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_button_delete_press.png"; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-            } \
-         } \
-         part { name: "icon_clipper"; \
-            scale: 1; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               color: BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            repeat_events: 1; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               min: min_width min_height; \
-            } \
-         } \
-      } \
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_MINUS_STYLES("icon_minus", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_MINUS_STYLES("icon_minus/extended", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_SCROLL_JUMPTO(style_name, image_normal)\
-   group { name: "elm/button/base/"style_name; \
-      data { \
-         item: "focus_highlight" "on"; \
-      } \
-      images { \
-         image: "00_button_01.png" COMP; \
-         image: "00_button_01_press.png" COMP; \
-         image: "00_button_01_dim.png" COMP; \
-         image: image_normal COMP; \
-         image: "00_button_01_focus.png" COMP; \
-      }\
-      parts { \
-         part { name: "button_image";\
-            type: IMAGE; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: BUTTON_JUMP_STYLE_BG_MIN_INC; \
-               image { \
-                  normal: "00_button_01.png"; \
-                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "clicked" 0.0; \
-             inherit: "default" 0.0; \
-             image.normal: "00_button_01_press.png"; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_button_01_dim.png"; \
-            } \
-         } \
-         part { name: "focus_image"; \
-            scale: 1; \
-            mouse_events: 0; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               visible: 0; \
-               rel1.to : "button_image"; \
-               rel2.to : "button_image"; \
-               image { \
-                  normal: "00_button_01_focus.png"; \
-                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "focused" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-         part { name: "padding_left_top"; \
-            type: SPACER; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               align: 0.0 0.0; \
-               rel2.relative: 0.0 0.0; \
-               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC; \
-               fixed: 1 1; \
-            } \
-         } \
-         part { name: "padding_right_bottom"; \
-            type: SPACER; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               align: 1.0 1.0; \
-               rel1.relative: 1.0 1.0; \
-               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC; \
-               fixed: 1 1; \
-            } \
-         } \
-         part { name: "jump_image"; \
-            type: IMAGE; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
-               max: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
-               rel1 { \
-                  relative: 1.0 0.0; \
-                  to_x: "padding_left_top"; \
-               } \
-               rel2 { \
-                  relative: 0.0 1.0; \
-                  to_x: "padding_right_bottom"; \
-               } \
-               image.normal: image_normal; \
-               aspect: 1.0 1.0; \
-               aspect_preference: VERTICAL; \
-               color: BUTTON_JUMP_ICON_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               color: BUTTON_JUMP_ICON_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               color: BUTTON_JUMP_ICON_DIM_COLOR_INC; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            repeat_events: 1; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               rel1.relative: 0.0 0.0; \
-               rel2.relative: 1.0 1.0; \
-            } \
-         } \
-         part { name: "over2"; \
-            type: RECT; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-            } \
-         } \
-      } \
-      programs { \
-         program { name: "button_click"; \
-            signal: "mouse,down,1"; \
-            source: "over1"; \
-            action: SIGNAL_EMIT "elm,action,press" ""; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_click_anim"; \
-            action: STATE_SET "clicked" 0.0; \
-            target: "button_image"; \
-            target: "jump_image"; \
-         } \
-         program { name: "button_double_click"; \
-            signal: "mouse,down,1,double"; \
-            source: "over1"; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_unclick"; \
-            signal: "mouse,up,1"; \
-            source: "over2"; \
-            action: SIGNAL_EMIT "elm,action,unpress" ""; \
-            after: "button_unclick_anim"; \
-         } \
-         program { name: "button_unclick_anim"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_image"; \
-            target: "jump_image"; \
-         } \
-         program { name: "touch_snd"; \
-            signal: "mouse,clicked,1"; \
-            source: "over1"; \
-            action: PLAY_SAMPLE "touch_sound" 1.0; \
-            after: button_unclick3; \
-         } \
-         program { name: "button_unclick3"; \
-            action: SIGNAL_EMIT "elm,action,click" ""; \
-         } \
-         program { name: "disable"; \
-            signal: "elm,state,disabled"; \
-            source: "elm"; \
-            action: STATE_SET "disabled" 0.0; \
-            target: "button_image"; \
-            target: "jump_image"; \
-         } \
-         program { name: "enable"; \
-            signal: "elm,state,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_image"; \
-            target: "jump_image"; \
-         } \
-         program { name: "action_focus"; \
-            signal: "elm,action,focus_highlight,show"; \
-            source: "elm"; \
-            action: STATE_SET "focused" 0.0; \
-            target: "focus_image"; \
-         } \
-         program { name: "action_unfocus"; \
-            signal: "elm,action,focus_highlight,hide"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "focus_image"; \
-         } \
-      } \
-   }
-
-////////////////////////////////////////////////////////////////////////
-BUTTON_SCROLL_JUMPTO("jumpto_top", "00_icon_jump.png")
-////////////////////////////////////////////////////////////////////////
-BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
-
-////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/default";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_DEFAULT_STYLE_BG_MIN_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_icon_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               visible: 0;
-               fixed: 1 0;
-               min: 0 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "elm.swallow.content";
-               }
-               rel2.to: "elm.swallow.content";
-               align: 0.0 0.0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               inherit: "default" 0.0;
-               min: BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "disclip";
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;
-               min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_right_bottom";
-               }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "disclip";
-            effect: SHADOW BOTTOM;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_DEFAULT_STYLE_FONT_SIZE_INC;
-                  min: 0 0;
-                  text_class: "tizen";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
-               visible: 1;
-               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over3";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over3";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_icon_text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disabler";
-            target: "disclip";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disabler";
-            target: "disclip";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/multiline";
-      alias: "elm/button/base/text_only/multiline";
-      inherit: "elm/button/base/default";
-      styles{
-         style { name: "btn_multiline_style";
-            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0 text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_DEFAULT_STYLE_MULTILINE_BG_MIN_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_DEFAULT_STYLE_MULTILINE_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "disclip";
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               text {
-                  style: "btn_multiline_style";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 80 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               visible: 1;
-               min: 80 0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-            }
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_COLORSELECTOR_STYLES(style_name, image_normal, image_press) \
-   group { name: "elm/button/base/"style_name; \
-      data { \
-         item: "focus_highlight" "on"; \
-      } \
-      images { \
-         image: image_normal COMP; \
-         image: image_press COMP; \
-         image: image_dim COMP; \
-         image: "00_button_01.png" COMP; \
-         image: "00_button_01_press.png" COMP; \
-         image: "00_button_01_focus.png" COMP; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               min: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
-               max: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
-               image { \
-                  normal: "00_button_01.png"; \
-                  border: BUTTON_COLORSELECTOR_BG_BORDER_INC; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_button_01_press.png"; \
-            } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_button_01_dim.png"; \
-            } \
-            description { \
-               state: "focused" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_button_01_press.png"; \
-            } \
-         } \
-         part { name: "focus_image"; \
-            scale: 1; \
-            mouse_events: 0; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               min: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
-               max: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
-               visible: 0; \
-               rel1.to : "button_image"; \
-               rel2.to : "button_image"; \
-               image { \
-                  normal: "00_button_01_focus.png"; \
-                  border: BUTTON_COLORSELECTOR_BG_BORDER_INC; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "focused" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-         part { name: "button_center_part"; \
-            scale: 1; \
-            clip_to: "icon_clipper"; \
-            description { state: "default" 0.0; \
-               min: BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC; \
-               max: BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC; \
-               image.normal: image_normal; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: image_press; \
-            } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-            } \
-         } \
-         part { name: "icon_clipper"; \
-            type: RECT; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               color: BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC; \
-            } \
-            description { state: "clicked" 0.0; \
-               color: BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC; \
-            } \
-            description { state: "disabled" 0.0; \
-               color: BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC; \
-            } \
-         } \
-         part { name: "over1"; \
-            type: RECT; \
-            ignore_flags: ON_HOLD; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-            } \
-         } \
-         part { name: "over2"; \
-            type: RECT; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-            } \
-         } \
-         part { name: "disabler"; \
-            type: RECT; \
-            description { state: "default" 0.0; \
-               color: 0 0 0 0; \
-               visible: 0; \
-            } \
-            description { state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-      } \
-      programs { \
-         program { name: "button_click"; \
-            signal: "mouse,down,1"; \
-            source: "over1"; \
-            action: SIGNAL_EMIT "elm,action,press" ""; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_click_anim"; \
-            action: STATE_SET "clicked" 0.0; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: ""icon_clipper""; \
-         } \
-         program { name: "button_double_click"; \
-            signal: "mouse,down,1,double"; \
-            source: "over1"; \
-            after: "button_click_anim"; \
-         } \
-         program { name: "button_unclick"; \
-            signal: "mouse,up,1"; \
-            source: "over2"; \
-            action: SIGNAL_EMIT "elm,action,unpress" ""; \
-            after: "button_unclick_anim"; \
-         } \
-         program { name: "button_unclick_anim"; \
-            action: STATE_SET "default" 0.0; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: ""icon_clipper""; \
-         } \
-         program { name: "touch_snd"; \
-            signal: "mouse,clicked,1"; \
-            source: "over1"; \
-            action: PLAY_SAMPLE "touch_sound" 1.0; \
-            after: button_unclick3; \
-         } \
-         program { name: "button_unclick3"; \
-            action: SIGNAL_EMIT "elm,action,click" ""; \
-         } \
-         program { name: "disable"; \
-            signal: "elm,state,disabled"; \
-            source: "elm"; \
-            action: STATE_SET "disabled" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: ""icon_clipper""; \
-         } \
-         program { name: "enable"; \
-            signal: "elm,state,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-            target: ""icon_clipper""; \
-         } \
-         program { name: "action_focus"; \
-            signal: "elm,action,focus_highlight,show"; \
-            source: "elm"; \
-            action: STATE_SET "focused" 0.0; \
-            target: "focus_image"; \
-         } \
-         program { name: "action_unfocus"; \
-            signal: "elm,action,focus_highlight,hide"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "focus_image"; \
-         } \
-      } \
-   }
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_COLORSELECTOR_STYLES("colorselector/left/default", "00_button_left.png", "00_button_left_press.png")
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_COLORSELECTOR_STYLES("colorselector/right/default", "00_button_right.png", "00_button_right_press.png")
-///////////////////////////////////////////////////////////////////////////////////////
-
-   group { name: "elm/button/base/multibuttonentry";
-      alias: "elm/button/base/text_only/multibuttonentry";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_contacts_button.png" COMP;
-         image: "00_contacts_button_press.png" COMP;
-         image: "00_contacts_button_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to_x: "padding.left";
-                  to_y: "elm.text";
-               }
-               rel2 {
-                  to_x: "padding.right";
-                  to_y: "elm.text";
-               }
-               min: BUTTON_CONTACT_BG_MIN_INC;
-               image {
-                  normal: "00_contacts_button.png";
-                  border: BUTTON_CONTACT_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_contacts_button_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_contacts_button_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_contacts_button_focus.png";
-                  border: BUTTON_CONTACT_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding.left";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_CONTACT_LEFT_PADDING_MIN_INC;
-               fixed: 1 0;
-               color: 0 0 0 0;
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-               }
-               align: 1.0 0.0;
-            }
-         }
-         part { name: "padding.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_CONTACT_RIGHT_PADDING_MIN_INC;
-               fixed: 1 0;
-               color: 0 0 0 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text";
-               }
-               align: 0.0 0.0;
-            }
-         }
-         part {   name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_CONTACT_FONT_SIZE_INC;
-                  min: 1 1;
-                  text_class: "tizen";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 1 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-               min: 1 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel2.relative: 1.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "elm.text";
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/back_btn/default";
-      alias: "elm/button/base/naviframe/prev_btn/default";
-      alias: "elm/button/base/naviframe/end_btn/default";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_icon_back.png" COMP;
-         image: "00_icon_SIP_close.png" COMP;
-         image: "00_icon_focus.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
-               visible: 0;
-            }
-            description { state: "landscape" 0.0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC;
-               visible: 0;
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_icon_focus.png";
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "back_button";
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "back_button.clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               image.normal: "00_icon_back.png";
-            }
-            description { state: "compress" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_icon_SIP_close.png";
-            }
-         }
-         part { name: "back_button.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            script {
-               set_state(PART:"back_button.clipper", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over3";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            script {
-               set_state(PART:"back_button.clipper", "default", 0.0);
-            }
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               set_state(PART:"back_button.clipper", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               set_state(PART:"back_button.clipper", "default", 0.0);
-            }
-         }
-         program { name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            action: STATE_SET "landscape" 0.0;
-            target: "button_image";
-         }
-         program { name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
-            source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "portrait_mode2";
-            source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "display_compress_mode";
-            signal: "elm,state,display,compress";
-            source: "elm";
-            action: STATE_SET "compress" 0.0;
-            target: "back_button";
-         }
-         program { name: "display_default_mode";
-            signal: "elm,state,display,default";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "back_button";
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-//////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/toolbar/default";
-      alias: "elm/button/base/naviframe/title/default";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_toolbar_button.png" COMP;
-         image: "00_toolbar_button_press.png" COMP;
-         image: "00_toolbar_button_dim.png" COMP;
-         image: "00_toolbar_button_focus.png" COMP;
-      }
-      styles{
-         style { name: "btn_naviframe_toolbar";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_naviframe_toolbar_pressed";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_PRESSED_COLOR_INC" style=shadow,top shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-         style { name: "btn_naviframe_toolbar_disabled";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-         public landscape_state = BUTTON_LANDSCAPE_DISABLED;
-      }
-      parts {
-         part { name: "button_bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
-            }
-         }
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "button_bg";
-               rel2.to: "button_bg";
-               image {
-                  normal: "00_toolbar_button.png";
-                  border: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_PRESSED_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_toolbar_button_focus.png";
-                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_text_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "elm.text";
-               }
-               align: 1.0 1.0;
-            }
-         }
-         part { name: "padding_text_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "elm.text";
-               }
-               rel2.to: "elm.text";
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  align: 0.5 0.54;
-                  style: "btn_naviframe_toolbar";
-               }
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "landscape_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_clicked" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "landscape_disabled" 0.0;
-               inherit: "landscape" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "landscape_disabled_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_focused" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            script {
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                  set_state(PART:"elm.text", "landscape_clicked", 0.0);
-               else
-                  set_state(PART:"elm.text", "clicked", 0.0);
-               set_state(PART:"button_image", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_clicked") || !strcmp(st, "landscape_focused"))
-                      {
-                         emit("elm,action,default,text,set", "");
-                         set_state(PART:"elm.text", "landscape_visible", 0.0);
-                      }
-                 }
-               else
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                      {
-                         emit("elm,action,default,text,set", "");
-                         set_state(PART:"elm.text", "visible", 0.0);
-                      }
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 {
-                    if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                      set_state(PART:"elm.text", "landscape_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               else
-                 {
-                    if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                      set_state(PART:"elm.text", "landscape_disabled_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "disabled_visible", 0.0);
-                 }
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 set_state(PART:"elm.text", "landscape", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_visible"))
-                      set_state(PART:"elm.text", "landscape_disabled_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "landscape_disabled", 0.0);
-                 }
-               else
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "visible"))
-                      set_state(PART:"elm.text", "disabled_visible", 0.0);
-                    else
-                      set_state(PART:"elm.text", "disabled", 0.0);
-                 }
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_disabled"))
-                      set_state(PART:"elm.text", "landscape", 0.0);
-                    else
-                      set_state(PART:"elm.text", "landscape_visible", 0.0);
-                 }
-               else
-                 {
-                    get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "disabled"))
-                      set_state(PART:"elm.text", "default", 0.0);
-                    else
-                      set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
-         }
-         program { name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               set_int(landscape_state, BUTTON_LANDSCAPE_ENABLED);
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "default"))
-                 set_state(PART:"elm.text", "landscape", 0.0);
-               else if (!strcmp(st, "clicked"))
-                 set_state(PART:"elm.text", "landscape_clicked", 0.0);
-               else if (!strcmp(st, "disabled"))
-                 set_state(PART:"elm.text", "landscape_disabled", 0.0);
-               else if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "landscape_disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "landscape_visible", 0.0);
-               set_state(PART:"button_bg", "landscape", 0.0);
-            }
-         }
-         program { name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               set_int(landscape_state, BUTTON_LANDSCAPE_DISABLED);
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "landscape"))
-                 set_state(PART:"elm.text", "default", 0.0);
-               else if (!strcmp(st, "landscape_clicked"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-               else if (!strcmp(st, "landscape_disabled"))
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               else if (!strcmp(st, "landscape_disabled_visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "visible", 0.0);
-               set_state(PART:"button_bg", "default", 0.0);
-            }
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
-            source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "portrait_mode2";
-            source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
-         }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
-         }
-      }
-   }
-
-//////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/toolbar/left";
-      inherit: "elm/button/base/naviframe/toolbar/default";
-      parts {
-         part { name: "button_bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-               align: 1.0 0.5;
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               align: 1.0 0.5;
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  align: 0.5 0.54;
-                  style: "btn_naviframe_toolbar";
-               }
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "landscape_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_clicked" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "landscape_disabled" 0.0;
-               inherit: "landscape" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "landscape_disabled_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_focused" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-         }
-      }
+#define BUTTON_CIRCLE_STYLES(style_name, image_normal, min_width, min_height) \
+   group { name: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
+      images { \
+         image: "00_circle_button.png" COMP; \
+         image: "00_circle_button_press.png" COMP; \
+         image: "00_circle_button_dim.png" COMP; \
+         image: image_normal COMP; \
+         image: 00_circle_button_focus.png COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+               image.normal: "00_circle_button.png"; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_press.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_dim.png"; \
+            } \
+         } \
+         part { name: "left_top_padding"; \
+            scale: 1; \
+            type: SPACER; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC; \
+               fixed: 1 1; \
+               align: 0.0 0.0; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+            } \
+         } \
+         part { name: "right_bottom_padding"; \
+            scale: 1; \
+            type: SPACER; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC; \
+               fixed: 1 1; \
+               align: 1.0 1.0; \
+               rel1 { \
+                  relative: 1.0 1.0; \
+                  to: "button_image"; \
+               } \
+               rel2.to: "button_image"; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
+               image.normal: image_normal; \
+               rel1 { \
+                  relative: 1.0 1.0; \
+                  to: "left_top_padding"; \
+               } \
+               rel2 { \
+                  relative: 0.0 0.0; \
+                  to: "right_bottom_padding"; \
+               } \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "icon_clipper"; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1.to: "button_center_part"; \
+                rel2.to: "button_center_part"; \
+            } \
+         }\
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_CLIPPER_DEFAULT_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "icon_clipper"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+              description { state: "default" 0.0; \
+                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 visible: 0; \
+                 rel1.to : "button_image"; \
+                 rel2.to : "button_image"; \
+                 image { \
+                  normal: "00_circle_button_focus.png"; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               min: min_width min_height; \
+            } \
+         } \
+         part { name: "over2"; \
+            type: RECT; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "disabler"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               visible: 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_click"; \
+            signal: "mouse,down,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_click_anim"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "button_double_click"; \
+            signal: "mouse,down,1,double"; \
+            source: "over1"; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
+         } \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "touch_snd"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
+      } \
    }
 
-//////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/toolbar/right";
-      inherit: "elm/button/base/naviframe/toolbar/default";
-      parts {
-         part { name: "button_bg";
-            type: SPACER;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-               align: 0.0 0.5;
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  align: 0.5 0.54;
-                  style: "btn_naviframe_toolbar";
-               }
-            }
-            description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "landscape_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_clicked" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "landscape_disabled" 0.0;
-               inherit: "landscape" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "landscape_disabled_visible" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_disabled";
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-            description { state: "landscape_focused" 0.0;
-               inherit: "landscape" 0.0;
-               visible: 1;
-               text {
-                  style: "btn_naviframe_toolbar_pressed";
-               }
-            }
-         }
-      }
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("reveal","00_button_right.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_right.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("plus", "00_button_add.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_add.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("minus", "00_button_delete.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_delete.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("cancel", "00_button_expand_cancel.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_expand_cancel.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("send", "00_button_expand_send.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("send/extended", "00_button_expand_send.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+///////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("contact", "00_button_contact.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+///////////////////////////////////////////////////////////////////////////////////////
+
+#define BUTTON_CIRCLE_WARNING_STYLES(style_name, min_width, min_height) \
+   group { name: "elm/button/base/"style_name; \
+      inherit: "elm/button/base/info"; \
+      images { \
+         image: "00_circle_button_delete.png" COMP; \
+         image: "00_circle_button_delete_press.png" COMP; \
+         image: "00_circle_button_delete_dim.png" COMP; \
+         image: "00_button_warning.png" COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               image.normal: "00_circle_button_delete.png"; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_delete_press.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_delete_dim.png"; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
+               max: BUTTON_CIRCLE_STYLE_IMAGE_MIN_MAX_INC; \
+               image.normal: "00_button_warning.png"; \
+               rel1 { \
+                  relative: 1.0 1.0; \
+                  to: "left_top_padding"; \
+               } \
+               rel2 { \
+                  relative: 0.0 0.0; \
+                  to: "right_bottom_padding"; \
+               } \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_WARNING_STYLE_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_WARNING_STYLE_CLIPPER_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_WARNING_STYLE_CLIPPER_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_WARNING_STYLE_CLIPPER_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "icon_clipper"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_WARNING_STYLE_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_WARNING_STYLE_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_WARNING_STYLE_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               min: min_width min_height; \
+            } \
+         } \
+      } \
    }
 
-////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/toolbar/segmentedcontrol";
-      images {
-         image: "00_toolbar_button.png" COMP;
-         image: "00_toolbar_button_press.png" COMP;
-         image: "00_toolbar_button_dim.png" COMP;
-         image: "00_button_icon_arrow.png" COMP;
-         image: "00_button_icon_arrow_press.png" COMP;
-      }
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_WARNING_STYLES("warning", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_WARNING_STYLES("warning/extended", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/circle/empty";
       data {
          item: "focus_highlight" "on";
       }
-      styles{
-         style { name: "btn_toolbar_segmentedcontrol";
-            base: "font=Tizen:style=Bold font_size="BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC" align=center color=#ffffff ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
+      images {
+         image: "00_circle_button.png" COMP;
+         image: "00_circle_button_press.png" COMP;
+         image: "00_circle_button_dim.png" COMP;
+         image: 00_circle_button_focus.png COMP;
       }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC;
-               max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC;
+               min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
                fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-               image {
-                  normal: "00_toolbar_button.png";
-                  border: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_circle_button.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
+               image.normal: "00_circle_button_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC;
-               max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_toolbar_button_focus.png";
-                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
+               image.normal: "00_circle_button_dim.png";
             }
          }
-         part { name: "padding_text_left_top";
-            type: RECT;
+         part { name: "left_top_padding";
             scale: 1;
-            mouse_events: 0;
+            type: SPACER;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC;
+               min: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_LEFT_PADDING_MIN_MAX_INC;
                fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "elm.text";
-               }
-               align: 1.0 0.0;
+               align: 0.0 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
             }
          }
-         part { name: "padding_text_right_bottom";
-            type: RECT;
+         part { name: "right_bottom_padding";
             scale: 1;
-            mouse_events: 0;
+            type: SPACER;
             description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC;
+               min: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_RIGHT_PADDING_MIN_MAX_INC;
                fixed: 1 1;
-               visible: 0;
+               align: 1.0 1.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "icon";
-                  to_y: "elm.text";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "icon";
-                  to_y: "elm.text";
+                  to: "button_image";
                }
-               align: 0.0 0.0;
+               rel2.to: "button_image";
             }
          }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
+               min: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
+               max: BUTTON_CIRCLE_STYLE_CONTENT_MIN_MAX_INC;
                fixed: 1 1;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  to: "left_top_padding";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  style: "btn_toolbar_segmentedcontrol";
+                  to: "right_bottom_padding";
                }
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+         }
+         part { name: "elm.swallow.icon.shadow.proxy";
+            type: PROXY;
+            clip_to: "elm.icon.proxy.clipper";
+            scale: 1;
+            description { state: "default" 0.0;
+                source: "elm.swallow.content";
+                proxy.source_clip: 0;
+                rel1 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_TOP_OFFSET_INC;
+                }
+                rel2 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_NORMAL_BOTTOM_OFFSET_INC;
+                }
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PRESSED_COLOR_INC;
+                inherit: "default" 0.0;
+                rel1 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_TOP_OFFSET_INC;
+                }
+                rel2 {
+                   to: "elm.swallow.content";
+                   offset: BUTTON_CIRCLE_STYLE_PRESSED_BOTTOM_OFFSET_INC;
+                }
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_FOCUSED_COLOR_INC;
+                inherit: "default" 0.0;
             }
          }
-         part { name: "icon_padding";
+         part { name: "elm.swallow.icon.proxy";
+            type: PROXY;
             scale: 1;
-            type: RECT;
+            clip_to: "icon_clipper";
             description { state: "default" 0.0;
-               min: 6 5;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "elm.text";
-               }
-               visible: 0;
-               rel2.to: "elm.text";
+                source: "elm.swallow.content";
+                proxy.source_clip: 0;
+                rel1.to: "elm.swallow.content";
+                rel2.to: "elm.swallow.content";
             }
          }
-         part { name: "icon";
-            scale: 1;
-            clip_to: "icon_clipper";
+         part { name: "elm.icon.proxy.clipper";
+            type: RECT;
             description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC;
-               max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "icon_padding";
-                  to_y: "elm.text";
-                  offset: 0 6;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "icon_padding";
-                  to_y: "elm.text";
-               }
-               image.normal: "00_button_icon_arrow.png";
+               color: BUTTON_CIRCLE_STYLE_CLIPPER_DEFAULT_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_icon_arrow_press.png";
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_CIRCLE_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
          part { name: "icon_clipper";
             type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
-               color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC;
+               color: BUTTON_CIRCLE_STYLE_NORMAL_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC;
+               color: BUTTON_CIRCLE_STYLE_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC;
             }
          }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+              description { state: "default" 0.0;
+                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
+                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
+                 visible: 0;
+                 rel1.to : "button_image";
+                 rel2.to : "button_image";
+                 image {
+                  normal: "00_circle_button_focus.png";
+                  border_scale: 1;
+               }
             }
-            description { state: "disabled" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
+               visible: 1;
             }
          }
-         part { name: "over2";
+         part { name: "over1";
             type: RECT;
-            repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
-         part { name: "over3";
+         part { name: "over2";
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
                visible: 0;
             }
@@ -5722,110 +2503,63 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "over2";
+            source: "over1";
             action: SIGNAL_EMIT "elm,action,press" "";
             after: "button_click_anim";
          }
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
-            target: "elm.text";
-            target: "icon";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
             target: "icon_clipper";
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
-            source: "over2";
+            source: "over1";
             after: "button_click_anim";
          }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-               set_state(PART:"icon", "default", 0.0);
-               set_state(PART:"icon_clipper", "default", 0.0);
-            }
-            after: button_unpress;
-         }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
-            source: "over2";
+            source: "over1";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
+            after: button_unclick2;
          }
-         program { name: "button_unclick3";
+         program { name: "button_unclick2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
+         program { name: "button_unclick_anim";
             action: STATE_SET "default" 0.0;
-            target: "elm.text";
+            target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
+            target: "icon_clipper";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disclip";
             target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
+            target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
+            target: "icon_clipper";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disclip";
             target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
+            target: "button_image";
+            target: "elm.swallow.icon.shadow.proxy";
+            target: "elm.icon.proxy.clipper";
+            target: "icon_clipper";
          }
          program { name: "action_focus";
             signal: "elm,action,focus_highlight,show";
@@ -5842,242 +2576,845 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       }
    }
 
-////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/title_icon";
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_EDIT_STYLES(style_name, image_normal, min_width, min_height) \
+   group { name: "elm/button/base/contacts/"style_name; \
+   alias: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
+      images { \
+         image: "00_circle_button.png" COMP; \
+         image: "00_circle_button_press.png" COMP; \
+         image: "00_circle_button_dim.png" COMP; \
+         image: image_normal COMP; \
+         image: 00_circle_button_focus.png COMP;\
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
+               max: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
+               image.normal: "00_circle_button.png"; \
+            } \
+            description { state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_press.png"; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_dim.png"; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
+               max: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
+               image.normal: image_normal; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_EDIT_STYLE_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "icon_clipper"; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1.to: "button_center_part"; \
+                rel2.to: "button_center_part"; \
+            } \
+         }\
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_EDIT_STYLE_CLIPPER_DEFAULT_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_EDIT_STYLE_ICON_CLIPPER_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_EDIT_STYLE_ICON_CLIPPER_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "icon_clipper"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_EDIT_STYLE_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_EDIT_STYLE_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_EDIT_STYLE_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+              description { state: "default" 0.0; \
+                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 visible: 0; \
+                 rel1.to : "button_image"; \
+                 rel2.to : "button_image"; \
+                 image { \
+                  normal: "00_circle_button_focus.png"; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            repeat_events: 1; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               min: min_width min_height; \
+            } \
+         } \
+         part { name: "over2"; \
+            type: RECT; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "disabler"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               visible: 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_click"; \
+            signal: "mouse,down,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_click_anim"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "button_double_click"; \
+            signal: "mouse,down,1,double"; \
+            source: "over1"; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
+         } \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "touch_snd"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: "icon_clipper"; \
+         } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
+      } \
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_STYLES("icon_plus", "00_button_add.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_add.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_STYLES("icon_expand", "00_button_expand_closed.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_expand_closed.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_expand_closed.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_expand_opened.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+#define BUTTON_EDIT_MINUS_STYLES(style_name, min_width, min_height) \
+   group { name: "elm/button/base/contacts/"style_name; \
+      alias: "elm/button/base/"style_name; \
+      inherit: "elm/button/base/contacts/icon_plus"; \
+      images { \
+         image: "00_circle_button_delete.png" COMP; \
+         image: "00_circle_button_delete_press.png" COMP; \
+         image: "00_circle_button_delete_dim.png" COMP; \
+         image: "00_button_delete.png" COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               image.normal: "00_circle_button_delete.png"; \
+            } \
+            description { state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_delete_press.png"; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_circle_button_delete_dim.png"; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            mouse_events: 0; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
+               max: BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC; \
+               image.normal: "00_button_delete.png"; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_SHADOW_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_SHADOW_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_SHADOW_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "icon_clipper"; \
+            scale: 1; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            repeat_events: 1; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               min: min_width min_height; \
+            } \
+         } \
+      } \
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_MINUS_STYLES("icon_minus", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_EDIT_MINUS_STYLES("icon_minus/extended", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_SCROLL_JUMPTO(style_name, image_normal)\
+   group { name: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
+      images { \
+         image: "00_button_01.png" COMP; \
+         image: "00_button_01_press.png" COMP; \
+         image: "00_button_01_dim.png" COMP; \
+         image: image_normal COMP; \
+         image: "00_button_01_focus.png" COMP; \
+      }\
+      parts { \
+         part { name: "button_image";\
+            type: IMAGE; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_JUMP_STYLE_BG_MIN_INC; \
+               image { \
+                  normal: "00_button_01.png"; \
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "clicked" 0.0; \
+             inherit: "default" 0.0; \
+             image.normal: "00_button_01_press.png"; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_01_dim.png"; \
+            } \
+         } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               visible: 0; \
+               rel1.to : "button_image"; \
+               rel2.to : "button_image"; \
+               image { \
+                  normal: "00_button_01_focus.png"; \
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+         part { name: "padding_left_top"; \
+            type: SPACER; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               align: 0.0 0.0; \
+               rel2.relative: 0.0 0.0; \
+               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC; \
+               fixed: 1 1; \
+            } \
+         } \
+         part { name: "padding_right_bottom"; \
+            type: SPACER; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               align: 1.0 1.0; \
+               rel1.relative: 1.0 1.0; \
+               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC; \
+               fixed: 1 1; \
+            } \
+         } \
+         part { name: "jump_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
+               max: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
+               rel1 { \
+                  relative: 1.0 0.0; \
+                  to_x: "padding_left_top"; \
+               } \
+               rel2 { \
+                  relative: 0.0 1.0; \
+                  to_x: "padding_right_bottom"; \
+               } \
+               image.normal: image_normal; \
+               aspect: 1.0 1.0; \
+               aspect_preference: VERTICAL; \
+            } \
+         } \
+         part { name: "jump_image.shadow.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "elm.swallow.icon.shadow.proxy"; \
+            description { state: "default" 0.0; \
+               source: "jump_image"; \
+               proxy.source_clip: 0; \
+               rel1 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_NORMAL_TOP_OFFSET_INC; \
+               } \
+               rel2 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_NORMAL_BOTTOM_OFFSET_INC; \
+               } \
+            } \
+            description { state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               rel1 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_PRESSED_TOP_OFFSET_INC; \
+               } \
+               rel2 { \
+                  to: "jump_image"; \
+                  offset: BUTTON_JUMP_TO_PRESSED_BOTTOM_OFFSET_INC; \
+               } \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "jump_image.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "elm.swallow.icon.proxy"; \
+            description { state: "default" 0.0; \
+               source: "jump_image"; \
+               proxy.source_clip: 0; \
+               rel1.to: "jump_image"; \
+               rel2.to: "jump_image"; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_JUMP_SHADOW_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_JUMP_SHADOW_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_JUMP_SHADOW_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_JUMP_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_JUMP_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_JUMP_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            repeat_events: 1; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               rel1.relative: 0.0 0.0; \
+               rel2.relative: 1.0 1.0; \
+            } \
+         } \
+         part { name: "over2"; \
+            type: RECT; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_click"; \
+            signal: "mouse,down,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_click_anim"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "button_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
+         } \
+         program { name: "button_double_click"; \
+            signal: "mouse,down,1,double"; \
+            source: "over1"; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
+         } \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
+         } \
+         program { name: "touch_snd"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "button_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "jump_image.shadow.proxy"; \
+            target: "elm.swallow.icon.shadow.proxy"; \
+            target: "elm.swallow.icon.proxy"; \
+         } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
+      } \
+   }
+
+////////////////////////////////////////////////////////////////////////
+BUTTON_SCROLL_JUMPTO("jumpto_top", "00_icon_jump.png")
+////////////////////////////////////////////////////////////////////////
+BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
+
+////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/default";
       data {
          item: "focus_highlight" "on";
       }
       images {
-         image: "00_icon_focus.png" COMP;
+         image: "00_button_01.png" COMP;
+         image: "00_button_01_press.png" COMP;
+         image: "00_button_01_dim.png" COMP;
+         image: "00_button_01_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_default";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_default_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_default_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_default_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
+               min: BUTTON_DEFAULT_STYLE_BG_MIN_INC;
+               image {
+                  normal: "00_button_01.png";
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
-            description { state: "landscape" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_01_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_01_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_01_press.png";
             }
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
+         part { name: "focus_image";
             scale: 1;
-            clip_to: "elm.icon.clipper";
+            mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
                visible: 0;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
-               align: 0.5 0.5;
-               rel1 { to: "button_image"; }
-               rel2 { to: "button_image"; }
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
-            description { state: "visible" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
-         part { name: "elm.icon.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
+         part { name: "padding_left_top";
             type: RECT;
-            repeat_events: 1;
+            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
             }
          }
-         part { name: "disabler";
+         part { name: "padding_right_bottom";
             type: RECT;
+            scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
+               align: 1.0 1.0;
+               rel1.relative: 1.0 1.0;
+               min: BUTTON_DEFAULT_STYLE_PADDING_MIN_INC;
+               fixed: 1 1;
                visible: 0;
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            script {
-               set_state(PART:"elm.icon.clipper", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            action: STATE_SET "default" 0.0;
-            target: "elm.icon.clipper";
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               set_state(PART:"disabler", "disabled", 0.0);
-               set_state(PART:"elm.icon.clipper", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               set_state(PART:"disabler", "default", 0.0);
-               set_state(PART:"elm.icon.clipper", "default", 0.0);
-            }
-         }
-         program { name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            action: STATE_SET "landscape" 0.0;
-            target: "button_image";
-         }
-         program { name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
-            source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-         program { name: "portrait_mode2";
-            source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-      }
-   }
-
-////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/title_text";
-      images {
-         image: "00_title_press.png" COMP;
-      }
-      styles{
-         style { name: "btn_naviframe_title_text";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
          }
-      }
-      parts {
-         part { name: "button_bg";
+         part { name: "padding_icon_text";
             type: RECT;
             scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_MAX_INC;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               visible: 0;
+               fixed: 1 0;
+               min: 0 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "elm.swallow.content";
+               }
+               rel2.to: "elm.swallow.content";
+               align: 0.0 0.0;
             }
-            description { state: "landscape" 0.0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_MAX_INC;
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               inherit: "default" 0.0;
+               min: BUTTON_DEFAULT_STYLE_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
             }
          }
-         part { name: "button_image";
-            type: IMAGE;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
+            clip_to: "disclip";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 { to: "button_bg"; }
-               rel2 { to: "button_bg"; }
+               fixed: 1 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
             }
-            description { state: "clicked" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               image {
-                  normal: "00_title_press.png";
-                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
-                  border_scale: 1;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
                }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
             }
          }
          part { name: "elm.text";
             type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
-            clip_to: "button_bg";
+            clip_to: "disclip";
             description { state: "default" 0.0;
-               rel1.to: "button_bg";
-               rel2.to: "button_bg";
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "padding_icon_text";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
                text {
-                  style: "btn_naviframe_title_text";
-                  min: 0 1;
+                  style: "btn_base_default";
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
+               text {
+                  style: "btn_base_default_pressed";
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_default_dim";
+               }
+               min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               text {
+                  style: "btn_base_default_focus";
+                  min: 0 0;
                }
             }
          }
          part { name: "over2";
             type: RECT;
+            repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -6090,6 +3427,16 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                color: 0 0 0 0;
             }
          }
+         part { name: "disclip";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -6105,275 +3452,455 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "over2";
+            source: "over3";
             action: SIGNAL_EMIT "elm,action,press" "";
             after: "button_click_anim";
          }
          program { name: "button_click_anim";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
             script {
-               set_state(PART:"button_image", "clicked", 0.0);
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
             }
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
-            source: "over2";
+            source: "over3";
             after: "button_click_anim";
          }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over3";
+         program { name: "button_unpress";
             action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
          }
-         program { name: "button_unclick_anim";
+         program { name: "button_mouseout_clicked";
+            signal: "mouse,up,1";
+            source: "over3";
             script {
-               set_state(PART:"button_image", "default", 0.0);
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+                 {
+                    emit("elm,action,default,text,set", "");
+                    set_state(PART:"elm.text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"button_image", "default", 0.0);
             }
+            after: button_unpress;
          }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: "button_unclick3";
+            after: button_unclick3;
          }
          program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
-         program { name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            action: STATE_SET "landscape" 0.0;
-            target: "button_bg";
-         }
-         program { name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_bg";
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
             source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+            }
          }
-         program { name: "portrait_mode2";
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
             source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         }
-      }
-   }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/more/default";
-      data {
-         item: "focus_highlight" "on";
-      }
-      images {
-         image: "00_icon_more.png" COMP;
-         image: "00_icon_focus.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
-               visible: 0;
-            }
-            description { state: "landscape" 0.0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC;
-               visible: 0;
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
+               set_state(PART:"elm.text", "default", 0.0);
             }
          }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_icon_focus.png";
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 {
+                    set_state(PART:"elm.swallow.content", "visible", 0.0);
+                    set_state(PART:"padding_icon_text", "visible", 0.0);
+                 }
+               else
+                 {
+                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                    set_state(PART:"padding_icon_text", "icononly", 0.0);
+                 }
             }
          }
-         part { name: "more_image";
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "more_image.clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               image.normal: "00_icon_more.png";
-            }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "padding_icon_text";
          }
-         part { name: "more_image.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
-            }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "disabler";
+            target: "disclip";
+            after: "disable_text";
          }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
+         program { name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(button_state, BUTTON_STATE_DISABLED);
             }
          }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "disabler";
+            target: "disclip";
+            after: "enable_text";
          }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+         program { name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "default", 0.0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_COLORSELECTOR_STYLES(style_name, image_normal) \
+   group { name: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
+      images { \
+         image: image_normal COMP; \
+         image: image_dim COMP; \
+         image: "00_button_01.png" COMP; \
+         image: "00_button_01_press.png" COMP; \
+         image: "00_button_01_focus.png" COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
+               max: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
+               image { \
+                  normal: "00_button_01.png"; \
+                  border: BUTTON_COLORSELECTOR_BG_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_01_press.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_01_dim.png"; \
+            } \
+            description { \
+               state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_01_press.png"; \
+            } \
+         } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
+               max: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
+               visible: 0; \
+               rel1.to : "button_image"; \
+               rel2.to : "button_image"; \
+               image { \
+                  normal: "00_button_01_focus.png"; \
+                  border: BUTTON_COLORSELECTOR_BG_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC; \
+               max: BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC; \
+               image.normal: image_normal; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.shadow.proxy"; \
+            type: PROXY; \
+            clip_to: "elm.icon.proxy.clipper"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_NORMAL_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_NORMAL_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "clicked" 0.0; \
+                inherit: "default" 0.0; \
+                rel1 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_PRESSED_TOP_OFFSET_INC; \
+                } \
+                rel2 { \
+                   to: "button_center_part"; \
+                   offset: BUTTON_COLORSELECTOR_PRESSED_BOTTOM_OFFSET_INC; \
+                } \
+            } \
+            description { state: "disabled" 0.0; \
+                inherit: "default" 0.0; \
+            } \
+         } \
+         part { name: "elm.swallow.icon.proxy"; \
+            type: PROXY; \
+            scale: 1; \
+            clip_to: "icon_clipper"; \
+            description { state: "default" 0.0; \
+                source: "button_center_part"; \
+                proxy.source_clip: 0; \
+                rel1.to: "button_center_part"; \
+                rel2.to: "button_center_part"; \
+            } \
+         }\
+         part { name: "elm.icon.proxy.clipper"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: BUTTON_COLORSELECTOR_SHADOW_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_COLORSELECTOR_SHADOW_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_COLORSELECTOR_SHADOW_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "icon_clipper"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               color: BUTTON_COLORSELECTOR_NORMAL_COLOR_INC; \
+            } \
+            description { state: "clicked" 0.0; \
+               color: BUTTON_COLORSELECTOR_PRESSED_COLOR_INC; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: BUTTON_COLORSELECTOR_DISABLED_COLOR_INC; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "over2"; \
+            type: RECT; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "disabler"; \
+            type: RECT; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+               visible: 0; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
+      } \
+      programs { \
+         program { name: "button_click"; \
+            signal: "mouse,down,1"; \
+            source: "over1"; \
+            action: SIGNAL_EMIT "elm,action,press" ""; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_click_anim"; \
+            action: STATE_SET "clicked" 0.0; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: ""icon_clipper""; \
+         } \
+         program { name: "button_double_click"; \
+            signal: "mouse,down,1,double"; \
+            source: "over1"; \
+            after: "button_click_anim"; \
+         } \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
+            action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
+         } \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: ""icon_clipper""; \
+         } \
+         program { name: "touch_snd"; \
+            signal: "mouse,clicked,1"; \
+            source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
+            action: SIGNAL_EMIT "elm,action,click" ""; \
+         } \
+         program { name: "disable"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: ""icon_clipper""; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "elm.swallow.icon.proxy"; \
+            target: "elm.icon.proxy.clipper"; \
+            target: ""icon_clipper""; \
+         } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
+      } \
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_COLORSELECTOR_STYLES("colorselector/left/default", "00_button_left.png")
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_COLORSELECTOR_STYLES("colorselector/right/default", "00_button_right.png")
+///////////////////////////////////////////////////////////////////////////////////////
+
+   group { name: "elm/button/base/multibuttonentry";
+      alias: "elm/button/base/text_only/multibuttonentry";
+      data {
+         item: "focus_highlight" "on";
       }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            script {
-               set_state(PART:"more_image.clipper", "clicked", 0.0);
-            }
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over2";
-            after: "button_click_anim";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over3";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            script {
-               set_state(PART:"more_image.clipper", "default", 0.0);
-            }
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               set_state(PART:"disabler", "disabled", 0.0);
-               set_state(PART:"more_image.clipper", "disabled", 0.0);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            script {
-               set_state(PART:"disabler", "default", 0.0);
-               set_state(PART:"more_image.clipper", "default", 0.0);
-            }
-         }
-         program { name: "change_to_landscape";
-            signal: "elm,state,landscape";
-            source: "elm";
-            action: STATE_SET "landscape" 0.0;
-            target: "button_image";
-         }
-         program { name: "change_to_portrait";
-            signal: "elm,state,portrait";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-         }
-         program { name: "landscape_mode";
-            source: "elm";
-            signal: "elm,state,orient,90";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "landscape_mode2";
-            source: "elm";
-            signal: "elm,state,orient,270";
-            action: SIGNAL_EMIT "elm,state,landscape" "elm";
-         }
-         program { name: "portrait_mode";
-            source: "elm";
-            signal: "elm,state,orient,0";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+      images {
+         image: "00_contacts_button.png" COMP;
+         image: "00_contacts_button_press.png" COMP;
+         image: "00_contacts_button_focus.png" COMP;
+         image: "00_contacts_button_dim.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_multibuttonentry";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
          }
-         program { name: "portrait_mode2";
-            source: "elm";
-            signal: "elm,state,orient,180";
-            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         style { name: "btn_base_multibuttonentry_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
          }
-         program { name: "action_focus";
-            signal: "elm,action,focus_highlight,show";
-            source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "focus_image";
+         style { name: "btn_base_multibuttonentry_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
          }
-         program { name: "action_unfocus";
-            signal: "elm,action,focus_highlight,hide";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "focus_image";
+         style { name: "btn_base_multibuttonentry_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
          }
       }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/tickernoti";
-      images {
-         image: "00_notification_button.png" COMP;
-         image: "00_notification_button_press.png" COMP;
-         image: "00_notification_button_dim.png" COMP;
-      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
@@ -6381,254 +3908,160 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_TICKERNOTI_BG_MIN_MAX_INC;
-               max: BUTTON_TICKERNOTI_BG_MIN_MAX_INC;
+               rel1 {
+                  to_x: "padding.left";
+                  to_y: "elm.text";
+               }
+               rel2 {
+                  to_x: "padding.right";
+                  to_y: "elm.text";
+               }
+               min: BUTTON_CONTACT_BG_MIN_INC;
                image {
-                  normal: "00_notification_button.png";
-                  border: BUTTON_TICKERNOTI_BG_BORDER_INC;
+                  normal: "00_contacts_button.png";
+                  border: BUTTON_CONTACT_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_notification_button_press.png";
+               image.normal: "00_contacts_button_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_notification_button_dim.png";
+               image.normal: "00_contacts_button_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_notification_button_press.png";
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_TICKERNOTI_PADDING_MIN_INC;
-               fixed: 1 1;
-            }
-         }
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_TICKERNOTI_BG_MIN_MAX_INC;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_TICKERNOTI_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
+               image.normal: "00_contacts_button_press.png";
             }
          }
-         part { name: "icon_rect";
-            type: RECT;
+         part { name: "focus_image";
             scale: 1;
             mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
                visible: 0;
-               min: 0 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_TICKERNOTI_VISIBLE_ICON_RECT_MIN_MAX_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_after_icon";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               visible: 0;
-               fixed: 1 0;
-               min: 0 0;
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2.to: "icon_rect";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_contacts_button_focus.png";
+                  border: BUTTON_CONTACT_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
-            description { state: "icononly" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "padding_before_text";
+         part { name: "padding.left";
             type: RECT;
             scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
+            description { state: "default" 0.0;
                visible: 0;
-               align: 1.0 0.5;
+               min: BUTTON_CONTACT_LEFT_PADDING_MIN_INC;
                fixed: 1 0;
-               min: BUTTON_TICKERNOTI_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-                  to_y: "padding_left_top";
-               }
+               color: 0 0 0 0;
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.text";
-                  to_y: "padding_right_bottom";
                }
+               align: 1.0 0.0;
             }
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
+         part { name: "padding.right";
+            type: RECT;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
+               min: BUTTON_CONTACT_RIGHT_PADDING_MIN_INC;
                fixed: 1 0;
-               align: 0.0 0.5;
+               color: 0 0 0 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
                   relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 0;
-               min: BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_TICKERNOTI_VISIBLE_ICON_MIN_MAX_INC;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_right_bottom";
+                  to_x: "elm.text";
                }
-            }
-            description { state: "icononly" 0.0;
-               min: BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_TICKERNOTI_ICONONLY_ICON_MIN_MAX_INC;
+               align: 0.0 0.0;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_TICKERNOTI_NORMAL_COLOR_INC;
-               color2: BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC;
+               fixed: 1 1;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TICKERNOTI_FONT_SIZE_INC;
-                  text_class: "tizen";
+                  style: "btn_base_multibuttonentry";
+                  min: 1 1;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               min: 1 1;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TICKERNOTI_PRESSED_COLOR_INC;
+               min: 1 1;
+               text {
+                  style: "btn_base_multibuttonentry_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TICKERNOTI_DISABLED_COLOR_INC;
-               color2: BUTTON_TICKER_TEXT_SHADOW_NORMAL_COLOR_INC;
                visible: 1;
+               text {
+                  style: "btn_base_multibuttonentry_dim";
+                  min: 1 1;
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TICKERNOTI_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_multibuttonentry_focus";
+                  min: 1 1;
+               }
             }
          }
-         part { name: "over2";
+         part { name: "over1";
             type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
+            mouse_events: 0;
             description { state: "default" 0.0;
+               rel2.relative: 1.0 0.5;
                color: 0 0 0 0;
             }
          }
-         part { name: "over3";
+         part { name: "over2";
             type: RECT;
             repeat_events: 1;
+            ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
-         part { name: "clipper";
+         part { name: "over3";
             type: RECT;
+            repeat_events: 1;
             description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               color: 0 0 0 0;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
                color: 0 0 0 0;
                visible: 0;
             }
@@ -6648,16 +4081,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
+            target: "elm.text";
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
@@ -6673,8 +4097,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             script {
                new st[31];
                new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
                  {
                     emit("elm,action,default,text,set", "");
                     set_state(PART:"elm.text", "visible", 0.0);
@@ -6697,16 +4121,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             signal: "elm,state,text,visible";
             source: "elm";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                    set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
-                 }
                if (get_int(button_state) != BUTTON_STATE_DISABLED)
                  set_state(PART:"elm.text", "visible", 0.0);
                else
@@ -6716,51 +4130,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "text_hide";
             signal: "elm,state,text,hidden";
             source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "icononly", 0.0);
-                    set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"icon_rect", "visible", 0.0);
-                    set_state(PART:"padding_after_icon", "visible", 0.0);
-                    set_state(PART:"bg", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"icon_rect", "icononly", 0.0);
-                    set_state(PART:"padding_after_icon", "icononly", 0.0);
-                    set_state(PART:"bg", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_after_icon";
-            target: "icon_rect";
-            target: "bg";
+            target: "elm.text";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -6768,7 +4139,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "clipper";
             after: "disable_text";
          }
          program { name: "disable_text";
@@ -6789,7 +4159,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "default" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "clipper";
             after: "enable_text";
          }
          program { name: "enable_text";
@@ -6804,214 +4173,97 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/expandable_number";
-      alias: "elm/button/base/text_only/expandable_number";
+   group { name: "elm/button/base/naviframe/back_btn/default";
+      alias: "elm/button/base/naviframe/prev_btn/default";
+      alias: "elm/button/base/naviframe/end_btn/default";
       data {
          item: "focus_highlight" "on";
       }
       images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_press.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_arrow_expand.png" COMP;
-         image: "00_button_01_focus.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
-               max: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
-               image {
-                  normal: "00_button_01.png";
-                  border: BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
-            }
-         }
-         part { name: "focus_image";
-            scale: 1;
-            mouse_events: 0;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
-               max: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
-               visible: 0;
-               rel1.to : "button_image";
-               rel2.to : "button_image";
-               image {
-                  normal: "00_button_01_focus.png";
-                  border: BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
+         image: "00_icon_back.png" COMP;
+         image: "00_icon_SIP_close.png" COMP;
+         image: "00_icon_focus.png" COMP;
+      }
+      parts {
+         part { name: "button_image";
             type: RECT;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               visible: 0;
+            }
+            description { state: "landscape" 0.0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_BACK_BUTTON_BG_MIN_MAX_INC;
                visible: 0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC;
-               fixed: 1 1;
             }
          }
-         part { name: "icon_rect";
-            type: RECT;
+         part { name: "focus_image";
             scale: 1;
             mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
                visible: 0;
-               min: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
-               max: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_right_bottom";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_icon_focus.png";
+                  border_scale: 1;
                }
-               align: 1.0 0.5;
             }
-         }
-         part { name: "arrow_expand";
-            scale: 1;
-            clip_to: "icon_clipper";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               min: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
-               max: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
-               fixed: 0 0;
-               rel1.to: "icon_rect";
-               rel2.to: "icon_rect";
-               image.normal:"00_arrow_expand.png";
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            effect: SHADOW BOTTOM;
+         part { name: "back_button";
             scale: 1;
+            mouse_events: 0;
+            clip_to: "back_button.clipper";
             description { state: "default" 0.0;
-               min: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
-               max: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
-               fixed:1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x:"padding_left_top";
-                  to_y:"padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               color: BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC;
-                  min: 0 0;
-                  fit: 1 1;
-                  size_range: 28 32;
-                  text_class: "tizen";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
+               fixed: 1 1;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               image.normal: "00_icon_back.png";
             }
-            description { state: "focused" 0.0;
+            description { state: "compress" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_FOCUSED_COLOR_INC;
+               image.normal: "00_icon_SIP_close.png";
             }
          }
-         part { name: "icon_clipper";
-            scale: 1;
+         part { name: "back_button.clipper";
             type: RECT;
             description { state: "default" 0.0;
-               color: BUTTON_NUMBER_ICON_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               color: BUTTON_NUMBER_ICON_PRESSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               color: BUTTON_NUMBER_ICON_DISABLED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
          part { name: "over2";
             type: RECT;
-            repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -7044,18 +4296,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             after: "button_click_anim";
          }
          program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "icon_clipper";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
+               set_state(PART:"back_button.clipper", "clicked", 0.0);
             }
          }
          program { name: "button_double_click";
@@ -7063,21 +4305,16 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             source: "over2";
             after: "button_click_anim";
          }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
+         program { name: "button_unclick";
             signal: "mouse,up,1";
             source: "over3";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
+         }
+         program { name: "button_unclick_anim";
             script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 {
-                    set_state(PART:"button_image", "default", 0.0);
-                    set_state(PART:"elm.text", "visible", 0.0);
-                    set_state(PART:"icon_clipper", "default", 0.0);
-                 }
+               set_state(PART:"back_button.clipper", "default", 0.0);
             }
-            after: button_unpress;
          }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
@@ -7088,64 +4325,63 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
+         program { name: "disable";
+            signal: "elm,state,disabled";
             source: "elm";
             script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"back_button.clipper", "disabled", 0.0);
             }
          }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
+         program { name: "enable";
+            signal: "elm,state,enabled";
             source: "elm";
             script {
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"back_button.clipper", "default", 0.0);
             }
          }
-         program { name: "disable";
-            signal: "elm,state,disabled";
+         program { name: "change_to_landscape";
+            signal: "elm,state,landscape";
             source: "elm";
-            action: STATE_SET "disabled" 0.0;
+            action: STATE_SET "landscape" 0.0;
             target: "button_image";
-            target: "disabler";
-            target: "icon_clipper";
-            after: "disable_text";
          }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
+         program { name: "change_to_portrait";
+            signal: "elm,state,portrait";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "disabler";
-            target: "icon_clipper";
-            after: "enable_text";
          }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
+         program { name: "landscape_mode";
+            source: "elm";
+            signal: "elm,state,orient,90";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "landscape_mode2";
+            source: "elm";
+            signal: "elm,state,orient,270";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "portrait_mode";
+            source: "elm";
+            signal: "elm,state,orient,0";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "portrait_mode2";
+            source: "elm";
+            signal: "elm,state,orient,180";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "display_compress_mode";
+            signal: "elm,state,display,compress";
+            source: "elm";
+            action: STATE_SET "compress" 0.0;
+            target: "back_button";
+         }
+         program { name: "display_default_mode";
+            signal: "elm,state,display,default";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "back_button";
          }
          program { name: "action_focus";
             signal: "elm,action,focus_highlight,show";
@@ -7162,365 +4398,427 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
       }
    }
 
-////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/bubble_sent";
-      inherit: "elm/button/base/style1";
+////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/title_icon";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
-         image: "00_messagebubble_button_sent.png" COMP;
-         image: "00_messagebubble_button_sent_press.png" COMP;
-         image: "00_messagebubble_button_sent_dim.png" COMP;
+         image: "00_icon_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
+            }
+            description { state: "landscape" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
+            }
+         }
+         part { name: "focus_image";
             scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
                image {
-                  normal: "00_messagebubble_button_sent.png";
-                  border: BUTTON_SENT_BUBBLE_BG_BORDER_INC;
+                  normal: "00_icon_focus.png";
                   border_scale: 1;
                }
             }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_button_sent_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_button_sent_dim.png";
-            }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_messagebubble_button_sent_press.png";
+               visible: 1;
             }
          }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
-            clip_to: "clipper";
+            clip_to: "elm.icon.clipper";
             description { state: "default" 0.0;
                visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_SEND_BUBBLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_SEND_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_SENT_BUBBLE_TEXT_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
-               }
+               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
+               align: 0.5 0.5;
+               rel1 { to: "button_image"; }
+               rel2 { to: "button_image"; }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
+         }
+         part { name: "elm.icon.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+            }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_SEND_BUBBLE_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_SEND_BUBBLE_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_SEND_BUBBLE_TEXT_FOCUSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
-      }
-   }
-
-////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/bubble_sent/multiline";
-      inherit: "elm/button/base/bubble_sent";
-      styles{
-         style { name: "bubble_sent_multiline";
-            base: "font=Tizen:style=Regular font_size="BUTTON_SENT_BUBBLE_TEXT_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0 text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
-      }
-      parts {
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
+         part { name: "elm.swallow.content.proxy_shadow";
+            type: PROXY;
             scale: 1;
-            clip_to: "clipper";
+            clip_to: "elm.icon.proxy_shadow.clipper";
             description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_SEND_BUBBLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_SEND_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                   style: "bubble_sent_multiline";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+               source: "elm.swallow.content";
+               rel1 { to: "elm.swallow.content"; offset: 0 2; }
+               rel2 { to: "elm.swallow.content"; offset: -1 1; }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_SEND_BUBBLE_TEXT_PRESSED_COLOR_INC;
+               rel1.offset: 0 -2;
+               rel2.offset: -1 -3;
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
+               visible: 0;
             }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_SEND_BUBBLE_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
+         }
+         part { name: "elm.icon.proxy_shadow.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_SHADOW_COLOR_INC;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_SEND_BUBBLE_TEXT_FOCUSED_COLOR_INC;
+            description { state: "clicked" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_SHADOW_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               visible: 0;
             }
          }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/bubble_receive";
-      inherit: "elm/button/base/style1";
-      images {
-         image: "00_messagebubble_button_receive.png" COMP;
-         image: "00_messagebubble_button_receive_press.png" COMP;
-         image: "00_messagebubble_button_receive_dim.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
+         part { name: "elm.swallow.content.proxy";
+            type: PROXY;
             scale: 1;
+            clip_to: "elm.icon.proxy.clipper";
             description { state: "default" 0.0;
-               image {
-                  normal: "00_messagebubble_button_receive.png";
-                  border: BUTTON_RECEIVE_BUBBLE_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               source: "elm.swallow.content";
+               rel1 { to: "elm.swallow.content"; }
+               rel2 { to: "elm.swallow.content"; }
+            }
+         }
+         part { name: "elm.icon.proxy.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_button_receive_press.png";
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_button_receive_dim.png";
+               visible: 0;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_button_receive_press.png";
+         }
+         part { name: "over2";
+            type: RECT;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
             }
          }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            effect: SHADOW BOTTOM;
-            scale: 1;
-            clip_to: "clipper";
+         part { name: "over3";
+            type: RECT;
+            repeat_events: 1;
             description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
                visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_RECEIVE_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_RECEIVE_BUBBLE_TEXT_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
-               }
             }
-            description { state: "visible" 0.0;
+            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_PRESSED_COLOR_INC;
+         }
+      }
+      programs {
+         program { name: "button_click";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,press" "";
+            after: "button_click_anim";
+         }
+         program { name: "button_click_anim";
+            script {
+               set_state(PART:"elm.icon.proxy_shadow.clipper", "clicked", 0.0);
+               set_state(PART:"elm.icon.proxy.clipper", "clicked", 0.0);
+               set_state(PART:"elm.icon.clipper", "clicked", 0.0);
+               set_state(PART:"elm.swallow.content.proxy_shadow", "clicked", 0.0);
             }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
+         }
+         program { name: "button_double_click";
+            signal: "mouse,down,1,double";
+            source: "over2";
+            after: "button_click_anim";
+         }
+         program { name: "button_unpress";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+         }
+         program { name: "button_mouseout_clicked";
+            signal: "mouse,up,1";
+            source: "over3";
+            script {
+               set_state(PART:"elm.icon.proxy_shadow.clipper", "default", 0.0);
+               set_state(PART:"elm.icon.proxy.clipper", "default", 0.0);
+               set_state(PART:"elm.icon.clipper", "default", 0.0);
+               set_state(PART:"elm.swallow.content.proxy_shadow", "default", 0.0);
             }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
+            after: button_unpress;
+         }
+         program { name: "touch_snd";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            script {
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"elm.icon.proxy_shadow.clipper", "disabled", 0.0);
+               set_state(PART:"elm.icon.proxy.clipper", "disabled", 0.0);
+               set_state(PART:"elm.icon.clipper", "disabled", 0.0);
+               set_state(PART:"elm.swallow.content.proxy_shadow", "disabled", 0.0);
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC;
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            script {
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"elm.icon.proxy_shadow.clipper", "default", 0.0);
+               set_state(PART:"elm.icon.proxy.clipper", "default", 0.0);
+               set_state(PART:"elm.icon.clipper", "default", 0.0);
+               set_state(PART:"elm.swallow.content.proxy_shadow", "default", 0.0);
             }
          }
+         program { name: "change_to_landscape";
+            signal: "elm,state,landscape";
+            source: "elm";
+            action: STATE_SET "landscape" 0.0;
+            target: "button_image";
+         }
+         program { name: "change_to_portrait";
+            signal: "elm,state,portrait";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
+         program { name: "landscape_mode";
+            source: "elm";
+            signal: "elm,state,orient,90";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "landscape_mode2";
+            source: "elm";
+            signal: "elm,state,orient,270";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "portrait_mode";
+            source: "elm";
+            signal: "elm,state,orient,0";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "portrait_mode2";
+            source: "elm";
+            signal: "elm,state,orient,180";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
       }
    }
 
-///////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/bubble_receive/multiline";
-      inherit: "elm/button/base/bubble_receive";
+////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/title_text";
+      images {
+         image: "00_title_press.png" COMP;
+      }
+      script {
+         public landscape = 0;
+         public disabled = 0;
+      }
       styles{
-         style { name: "bubble_receive_multiline";
-            base: "font=Tizen:style=Regular font_size="BUTTON_RECEIVE_BUBBLE_TEXT_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0 text_class=tizen";
+         style { name: "btn_naviframe_title_text";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_naviframe_title_text_disabled";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_DISABLED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_naviframe_title_text_pressed";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
       }
       parts {
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            effect: SHADOW BOTTOM;
+         part { name: "button_bg";
+            type: RECT;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_after_icon";
-                  to_y: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_RECEIVE_BUBBLE_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                   style: "btn_style1_multiline";
-               }
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC;
             }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
+            description { state: "landscape" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC;
+            }
+         }
+         part { name: "button_image";
+            type: IMAGE;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 { to: "button_bg"; }
+               rel2 { to: "button_bg"; }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_PRESSED_COLOR_INC;
+               image {
+                  normal: "00_title_press.png";
+                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC;
-            }
          }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////
-group { name: "elm/button/base/bubble_circle/receive";
-      images {
-         image: "00_messagebubble_circle_receive.png" COMP;
-         image: "00_messagebubble_circle_receive_press.png" COMP;
-         image: "00_messagebubble_circle_receive_dim.png" COMP;
-         image: "00_button_right.png" COMP;
-         image: "00_button_right_press.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
+         part { name: "left_padding";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               max: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               image.normal: "00_messagebubble_circle_receive.png";
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_receive_press.png";
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC -1;
+               align: 0.0 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "button_bg"; }
+               rel2 { relative: 0.0 1.0; to: "button_bg"; }
             }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_receive_dim.png";
+         }
+         part { name: "right_padding";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC -1;
+               align: 1.0 0.5;
+               fixed: 1 0;
+               rel1 { relative: 1.0 0.0; to: "button_bg"; }
+               rel2 { relative: 1.0 1.0; to: "button_bg"; }
             }
          }
-         part { name: "image";
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
-            clip_to: "icon_clipper";
             description { state: "default" 0.0;
-               min: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
-               max: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
-               image.normal: "00_button_right.png";
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MAX_INC;
+               rel1 { relative: 1.0 0.0; to: "left_padding"; }
+               rel2 { relative: 0.0 1.0; to: "right_padding"; }
+               text {
+                  style: "btn_naviframe_title_text";
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+               }
             }
-            description {
-               state: "clicked" 0.0;
+            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_right_press.png";
+               text {
+                  style: "btn_naviframe_title_text_disabled";
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+               }
             }
-            description {
-               state: "disabled" 0.0;
+            description { state: "pressed" 0.0;
                inherit: "default" 0.0;
+               text {
+                  style: "btn_naviframe_title_text_pressed";
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+               }
             }
-         }
-         part { name: "icon_clipper";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_NORMAL_COLOR_INC;
+            description { state: "landscape" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MIN_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MAX_INC;
             }
-            description { state: "clicked" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_PRESSED_COLOR_INC;
+            description { state: "landscape_disabled" 0.0;
+               inherit: "landscape" 0.0;
+               text {
+                  style: "btn_naviframe_title_text_disabled";
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+               }
             }
-            description { state: "disabled" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_DISABLED_COLOR_INC;
+            description { state: "landscape_pressed" 0.0;
+               inherit: "landscape" 0.0;
+               text {
+                  style: "btn_naviframe_title_text_pressed";
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+               }
             }
          }
-         part { name: "over1";
+         part { name: "over2";
             type: RECT;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
-         part { name: "over2";
+         part { name: "over3";
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
@@ -7542,38 +4840,46 @@ group { name: "elm/button/base/bubble_circle/receive";
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "over1";
+            source: "over2";
             action: SIGNAL_EMIT "elm,action,press" "";
             after: "button_click_anim";
          }
          program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "image";
-            target: "icon_clipper";
+            script {
+               set_state(PART:"button_image", "clicked", 0.0);
+
+               if (get_int(landscape))
+                 set_state(PART:"elm.text", "landscape_pressed", 0.0);
+               else
+                 set_state(PART:"elm.text", "pressed", 0.0);
+            }
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
-            source: "over1";
+            source: "over2";
             after: "button_click_anim";
          }
          program { name: "button_unclick";
             signal: "mouse,up,1";
-            source: "over2";
+            source: "over3";
             action: SIGNAL_EMIT "elm,action,unpress" "";
             after: "button_unclick_anim";
          }
          program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "image";
-            target: "icon_clipper";
+            script {
+               set_state(PART:"button_image", "default", 0.0);
+
+               if (get_int(landscape))
+                 set_state(PART:"elm.text", "landscape", 0.0);
+               else
+                 set_state(PART:"elm.text", "default", 0.0);
+            }
          }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
-            source: "over1";
+            source: "over2";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
+            after: "button_unclick3";
          }
          program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
@@ -7581,90 +4887,155 @@ group { name: "elm/button/base/bubble_circle/receive";
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
-            
+            script {
+               set_int(disabled, 1);
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"button_image", "disabled", 0.0);
+
+               if (get_int(landscape))
+                 set_state(PART:"elm.text", "landscape_disabled", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled", 0.0);
+            }
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
+            script {
+               set_int(disabled, 0);
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"button_image", "default", 0.0);
+
+               if (get_int(landscape))
+                 set_state(PART:"elm.text", "landscape", 0.0);
+               else
+                 set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "change_to_landscape";
+            signal: "elm,state,landscape";
+            source: "elm";
+            script {
+               set_int(landscape, 1);
+               set_state(PART:"button_bg", "landscape", 0.0);
+
+               if (get_int(disabled))
+                 set_state(PART:"elm.text", "landscape_disabled", 0.0);
+               else
+                 set_state(PART:"elm.text", "landscape", 0.0);
+            }
+         }
+         program { name: "change_to_portrait";
+            signal: "elm,state,portrait";
+            source: "elm";
+            script {
+               set_int(landscape, 0);
+               set_state(PART:"button_bg", "default", 0.0);
+
+               if (get_int(disabled))
+                 set_state(PART:"elm.text", "disabled", 0.0);
+               else
+                 set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "landscape_mode";
+            source: "elm";
+            signal: "elm,state,orient,90";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "landscape_mode2";
+            source: "elm";
+            signal: "elm,state,orient,270";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "portrait_mode";
+            source: "elm";
+            signal: "elm,state,orient,0";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "portrait_mode2";
+            source: "elm";
+            signal: "elm,state,orient,180";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
          }
       }
    }
 
-///////////////////////////////////////////////////////////////////////
-group { name: "elm/button/base/bubble_circle/sent";
+/////////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/more/default";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
-         image: "00_messagebubble_circle_sent.png" COMP;
-         image: "00_messagebubble_circle_sent_press.png" COMP;
-         image: "00_messagebubble_circle_sent_dim.png" COMP;
-         image: "00_button_right.png" COMP;
-         image: "00_button_right_press.png" COMP;
+         image: "00_icon_more.png" COMP;
+         image: "00_icon_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               max: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               image.normal: "00_messagebubble_circle_sent.png";
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_sent_press.png";
+               min: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
+               visible: 0;
             }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_sent_dim.png";
+            description { state: "landscape" 0.0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC;
+               visible: 0;
             }
          }
-         part { name: "image";
+         part { name: "focus_image";
             scale: 1;
-            clip_to: "icon_clipper";
+            mouse_events: 0;
+            repeat_events: 1;
             description { state: "default" 0.0;
-               min: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
-               max: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
-               image.normal: "00_button_right.png";
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_icon_focus.png";
+                  border_scale: 1;
+               }
             }
-            description {
-               state: "clicked" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_right_press.png";
+               visible: 1;
             }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
+         }
+         part { name: "more_image";
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "more_image.clipper";
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_MORE_DEFAULT_IMAGE_MIN_MAX_INC;
+               fixed: 1 1;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               image.normal: "00_icon_more.png";
             }
          }
-         part { name: "icon_clipper";
+         part { name: "more_image.clipper";
             type: RECT;
-            scale: 1;
             description { state: "default" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
-         part { name: "over1";
+         part { name: "over2";
             type: RECT;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
-         part { name: "over2";
+         part { name: "over3";
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
@@ -7686,36 +5057,34 @@ group { name: "elm/button/base/bubble_circle/sent";
       programs {
          program { name: "button_click";
             signal: "mouse,down,1";
-            source: "over1";
+            source: "over2";
             action: SIGNAL_EMIT "elm,action,press" "";
             after: "button_click_anim";
          }
          program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "image";
-            target: "icon_clipper";
+            script {
+               set_state(PART:"more_image.clipper", "clicked", 0.0);
+            }
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
-            source: "over1";
+            source: "over2";
             after: "button_click_anim";
          }
          program { name: "button_unclick";
             signal: "mouse,up,1";
-            source: "over2";
+            source: "over3";
             action: SIGNAL_EMIT "elm,action,unpress" "";
             after: "button_unclick_anim";
          }
          program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "image";
-            target: "icon_clipper";
+            script {
+               set_state(PART:"more_image.clipper", "default", 0.0);
+            }
          }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
-            source: "over1";
+            source: "over2";
             action: PLAY_SAMPLE "touch_sound" 1.0;
             after: button_unclick3;
          }
@@ -7725,70 +5094,336 @@ group { name: "elm/button/base/bubble_circle/sent";
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
+            script {
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"more_image.clipper", "disabled", 0.0);
+            }
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
+            script {
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"more_image.clipper", "default", 0.0);
+            }
+         }
+         program { name: "change_to_landscape";
+            signal: "elm,state,landscape";
+            source: "elm";
+            action: STATE_SET "landscape" 0.0;
+            target: "button_image";
+         }
+         program { name: "change_to_portrait";
+            signal: "elm,state,portrait";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "disabler";
             target: "button_image";
-            target: "icon_clipper";
+         }
+         program { name: "landscape_mode";
+            source: "elm";
+            signal: "elm,state,orient,90";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "landscape_mode2";
+            source: "elm";
+            signal: "elm,state,orient,270";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "portrait_mode";
+            source: "elm";
+            signal: "elm,state,orient,0";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "portrait_mode2";
+            source: "elm";
+            signal: "elm,state,orient,180";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
          }
       }
    }
 
-//////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/editfield_rename";
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/expandable_number";
+      alias: "elm/button/base/text_only/expandable_number";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
-         image: "00_edit_field_rename.png" COMP;
+         image: "00_button_01.png" COMP;
+         image: "00_button_01_press.png" COMP;
+         image: "00_button_01_dim.png" COMP;
+         image: "00_arrow_expand.png" COMP;
+         image: "00_button_01_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_exapandable_number";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NUMBER_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_exapandable_number_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_NUMBER_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_exapandable_number_dim";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_DISABLE_VISIBLE_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_NUMBER_SHADOW_TEXTBLOCK_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_exapandable_number_focus";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_FOCUSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
+               min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
+               max: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
+               image {
+                  normal: "00_button_01.png";
+                  border: BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_button_01_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_button_01_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_01_press.png";
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
+               max: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC;
+               fixed: 1 1;
+            }
+         }
+         part { name: "padding_right_bottom";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 1.0 1.0;
+               rel1.relative: 1.0 1.0;
+               min: BUTTON_EXPANDABLE_NUMBER_PADDING_MIN_INC;
+               fixed: 1 1;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
+               max: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
+               fixed: 1 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "padding_right_bottom";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               align: 1.0 0.5;
+            }
+         }
+         part { name: "arrow_expand";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               min: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
+               max: BUTTON_EXPANDABLE_NUMBER_ICON_RECT_EXPAND_MIN_MAX_INC;
+               fixed: 0 0;
+               rel1.to: "icon_rect";
+               rel2.to: "icon_rect";
+               image.normal:"00_arrow_expand.png";
+            }
+         }
+         part { name: "arrow_expand.shadow.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "arrow_expand.shadow.clipper";
+            description { state: "default" 0.0;
+               source: "arrow_expand";
+               proxy.source_clip: 0;
+               rel1 {
+                  to: "arrow_expand";
+                  offset: BUTTON_EXPANDABLE_NORMAL_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "arrow_expand";
+                  offset: BUTTON_EXPANDABLE_NORMAL_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               rel1 {
+                  to: "icon_rect";
+                  offset: BUTTON_EXPANDABLE_PRESSED_TOP_OFFSET_INC;
+               }
+               rel2 {
+                  to: "arrow_expand";
+                  offset: BUTTON_EXPANDABLE_PRESSED_BOTTOM_OFFSET_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "arrow_expand.proxy";
+            type: PROXY;
+            scale: 1;
+            clip_to: "icon_clipper";
+            description { state: "default" 0.0;
+               source: "arrow_expand";
+               proxy.source_clip: 0;
+               rel1.to: "arrow_expand";
+               rel2.to: "arrow_expand";
+            }
+         }
+         part { name: "arrow_expand.shadow.clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_EXPANDABLE_SHADOW_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_EXPANDABLE_SHADOW_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_EXPANDABLE_SHADOW_DISABLED_COLOR_INC;
+            }
+         }
+         part { name: "icon_clipper";
+            scale: 1;
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_NUMBER_ICON_NORMAL_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_NUMBER_ICON_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_NUMBER_ICON_DISABLED_COLOR_INC;
             }
          }
-         part { name: "rename_button";
-            scale: 1;
+         part { name: "elm.text";
+            type: TEXTBLOCK;
             mouse_events: 0;
-            clip_to: "rename_button.clipper";
+            scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC;
-               max: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
+               min: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
+               max: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
+               fixed:1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x:"padding_left_top";
+                  to_y:"padding_right_bottom";
+               }
                align: 0.0 0.5;
-               image.normal: "00_edit_field_rename.png";
+               text {
+                  style: "btn_base_exapandable_number";
+                  min: 0 0;
+                  fit: 1 1;
+                  size_range: 28 32;
+               }
             }
-         }
-         part { name: "rename_button.clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
             }
             description { state: "clicked" 0.0;
-               color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC;
+               inherit: "default" 0.0;
+               text {
+                  style: "btn_base_exapandable_number_pressed";
+                  min: 0 0;
+                  fit: 1 1;
+                  size_range: 28 32;
+               }
             }
             description { state: "disabled" 0.0;
-               color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC;
+               inherit: "default" 0.0;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "btn_base_exapandable_number_dim";
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               text {
+                  style: "btn_base_exapandable_number_focus";
+               }
             }
          }
          part { name: "over2";
             type: RECT;
+            repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
@@ -7823,40 +5458,91 @@ group { name: "elm/button/base/bubble_circle/sent";
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
-            target: "rename_button.clipper";
+            target: "arrow_expand.shadow.proxy";
+            target: "arrow_expand.shadow.clipper";
+            target: "icon_clipper";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "clicked", 0.0);
+            }
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
-            source: "over1";
+            source: "over2";
             after: "button_click_anim";
          }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over3";
+         program { name: "button_unpress";
             action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
          }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "rename_button.clipper";
+         program { name: "button_mouseout_clicked";
+            signal: "mouse,up,1";
+            source: "over3";
+            script {
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 {
+                    set_state(PART:"button_image", "default", 0.0);
+                    set_state(PART:"elm.text", "visible", 0.0);
+                    set_state(PART:"arrow_expand.shadow.proxy", "visible", 0.0);
+                    set_state(PART:"arrow_expand.shadow.clipper", "visible", 0.0);
+                    set_state(PART:"icon_clipper", "default", 0.0);
+                 }
+            }
+            after: button_unpress;
          }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: "button_unclick3";
+            after: button_unclick3;
          }
          program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               if (get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+            }
+         }
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "rename_button.clipper";
+            target: "arrow_expand.shadow.proxy";
+            target: "arrow_expand.shadow.clipper";
+            target: "icon_clipper";
+            after: "disable_text";
+         }
+         program { name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(button_state, BUTTON_STATE_DISABLED);
+            }
          }
          program { name: "enable";
             signal: "elm,state,enabled";
@@ -7864,15 +5550,53 @@ group { name: "elm/button/base/bubble_circle/sent";
             action: STATE_SET "default" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "rename_button.clipper";
+            target: "arrow_expand.shadow.proxy";
+            target: "arrow_expand.shadow.clipper";
+            target: "icon_clipper";
+            after: "enable_text";
+         }
+         program { name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "default", 0.0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
+            }
+         }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
          }
       }
    }
+
+//////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/editfield_clear";
       images {
          image: "00_edit_field_clear.png" COMP;
       }
       parts {
+         part { name: "bg";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
+               max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
+            }
+         }
          part { name: "button_image";
             type: RECT;
             scale: 1;
@@ -7894,10 +5618,9 @@ group { name: "elm/button/base/bubble_circle/sent";
             mouse_events: 0;
             clip_to: "clear_button.clipper";
             description { state: "default" 0.0;
-               min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
-               max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.0 0.5;
+               min: BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
+               max: BUTTON_EDITFIELD_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
+               align: 0.5 0.5;
                image.normal: "00_edit_field_clear.png";
             }
          }
@@ -8079,129 +5802,42 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_top", "00_list_group_bg_top_focus.png")
 BUTTON_DEFAULT_FOCUS_STYLES("focus_center", "00_list_group_bg_center_focus.png")
 BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
 
-   group { name: "elm/button/base/search_icon";
+   group { name: "elm/button/base/search_clear";
+      inherit: "elm/button/base/editfield_clear";
       images {
-         image: "00_search_icon.png" COMP;
+         image: "00_field_btn_clear.png" COMP;
       }
       parts {
-         part { name: "search_icon";
+         part { name: "bg";
+            type: SPACER;
             scale: 1;
             mouse_events: 0;
-            clip_to: "search_icon.clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_SEARCH_ICON_MIN_MAX_INC;
-               max: BUTTON_SEARCH_ICON_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.5 0.5;
-               image.normal: "00_search_icon.png";
-            }
-         }
-         part { name: "search_icon.clipper";
-            type: RECT;
             description { state: "default" 0.0;
-               color: BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC;
+               min: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
+               max: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
             }
          }
-         part { name: "over2";
-            type: RECT;
-            ignore_flags: ON_HOLD;
+         part { name: "clear_button";
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "clear_button.clipper";
             description { state: "default" 0.0;
-               color: 0 0 0 0;
+               min: BUTTON_SEARCH_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
+               max: BUTTON_SEARCH_CLEAR_BUTTON_IMAGE_MIN_MAX_INC;
+               align: 0.5 0.5;
+               image.normal: "00_field_btn_clear.png";
             }
          }
-         part { name: "over3";
+         part { name: "clear_button.clipper";
             type: RECT;
-            repeat_events: 1;
             description { state: "default" 0.0;
-               color: 0 0 0 0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC;
             }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
+            description { state: "clicked" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over1";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over3";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: "button_unclick3";
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "search_icon.clipper";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "search_icon.clipper";
-         }
-      }
-   }
-   group { name: "elm/button/base/search_rename";
-      inherit: "elm/button/base/editfield_rename";
-      parts {
-         part { name: "rename_button";
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "rename_button.clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC;
-               max: BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.5 0.5;
-               image.normal: "00_edit_field_rename.png";
-            }
-         }
-      }
-   }
-
-   group { name: "elm/button/base/search_clear";
-      inherit: "elm/button/base/editfield_clear";
-      parts {
-         part { name: "clear_button";
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "clear_button.clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
-               max: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.5 0.5;
-               image.normal: "00_edit_field_clear.png";
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
       }