[button.edc] Disabled state of button is changed in naviframe/title style.

[framework/uifw/efl-theme-tizen.git] / themes / widgets / button.edc

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 74af454..8ec3be4 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -19,6 +19,13 @@
 #define BUTTON_STATE_ENABLED 0
 #define BUTTON_STATE_DISABLED 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";
@@ -29,6 +36,7 @@
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -53,7 +61,7 @@
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -248,6 +256,7 @@
                   size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -348,9 +357,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -485,11 +498,11 @@
 
 //////////////////////////////////////////////////////////////
    group { name: "elm/button/base/style1/auto_expand";
-      alias: "elm/button/base/datetime_ampm/default";
       images {
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -514,7 +527,7 @@
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -709,6 +722,7 @@
                   size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
                   min: 1 0;
                   max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -809,9 +823,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -944,13 +962,47 @@
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/style2";
-      alias: "elm/button/base/text_only/style2";
+//////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/datetime_ampm/default";
+      inherit: "elm/button/base/style1/auto_expand";
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: 0 0;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_DATETIME_AMPM_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+      }
+   }
+
+//////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/style1/multiline";
       images {
-         image: "00_button_04_normal.png" COMP;
-         image: "00_button_04_press.png" COMP;
-         image: "00_button_04_dim.png" COMP;
+         image: "00_button_01_normal.png" COMP;
+         image: "00_button_01_normal_press.png" COMP;
+         image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_style1_multiline";
+            base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE1_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_roman";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -960,22 +1012,22 @@
             scale: 1;
             description { state: "default" 0.0;
                image {
-                  normal: "00_button_04_normal.png";
-                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
+                  normal: "00_button_01_normal.png";
+                  border: BUTTON_TEXT_STYLE1_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_01_normal_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_dim.png";
+               image.normal: "00_button_01_normal_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -985,7 +1037,7 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -995,16 +1047,16 @@
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_BG_MIN_INC;
                visible: 0;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC;
             }
          }
          part { name: "padding_right_bottom";
@@ -1014,7 +1066,7 @@
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -1040,8 +1092,8 @@
             }
             description { state: "visible" 0.0;
                visible: 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
@@ -1070,7 +1122,7 @@
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: 0 0;
+               min: 5 0;
                visible: 0;
             }
             description { state: "visible" 0.0;
@@ -1082,7 +1134,7 @@
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
@@ -1105,7 +1157,7 @@
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
@@ -1129,8 +1181,8 @@
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               min: BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 {
                   relative: 0.0 1.0;
@@ -1144,12 +1196,12 @@
                }
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+               min: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -1166,10 +1218,9 @@
                }
                color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_TEXT_STYLE2_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
+                   style: "btn_style1_multiline";
+                   min: 0 0;
+                   max: 0 1;
                }
             }
             description { state: "visible" 0.0;
@@ -1270,9 +1321,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -1406,12 +1461,13 @@
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep";
-      alias: "elm/button/base/text_only/sweep";
+   group { name: "elm/button/base/style2";
+      alias: "elm/button/base/text_only/style2";
       images {
-         image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
-         image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_04_normal.png" COMP;
+         image: "00_button_04_press.png" COMP;
+         image: "00_button_04_dim.png" COMP;
+         image: "00_button_04_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -1420,24 +1476,23 @@
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_sweep.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  normal: "00_button_04_normal.png";
+                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_04_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_dim.png";
+               image.normal: "00_button_04_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_04_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -1447,11 +1502,28 @@
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+            }
+         }
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
@@ -1459,7 +1531,7 @@
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_SWEEP_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -1469,23 +1541,41 @@
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_SWEEP_ICON_RECT_MIN_INC;
+               visible: 0;
+               min: 0 0;
                fixed: 1 0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_left_top";
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
+                  to_x: "padding_left_top";
                   to_y: "padding_right_bottom";
                }
                align: 0.0 0.5;
-               color: 0 0 0 0;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               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: "icononly" 0.0;
+               inherit: "default" 0.0;
             }
          }
-         part { name: "padding_icon_text";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
@@ -1498,12 +1588,10 @@
                rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
+               visible: 0;
             }
-            description { state: "visible" 0.0; //when icon is visible
+            description { state: "visible" 0.0;
+               visible: 0;
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
@@ -1511,8 +1599,31 @@
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-               color: 0 0 0 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               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";
+               }
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
             }
          }
          part { name: "elm.swallow.content";
@@ -1535,30 +1646,23 @@
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               align: 0.0 0.5;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
                   to_y: "padding_right_bottom";
                }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
-               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";
-               }
+               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
@@ -1570,30 +1674,30 @@
                visible: 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
+                  to_x: "padding_after_icon";
                   to_y: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_SWEEP_FONT_SIZE_INC;
+                  size: BUTTON_TEXT_STYLE2_FONT_SIZE_INC;
                   min: 0 0;
+                  max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             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;
+               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -1601,15 +1705,13 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color: BUTTON_TEXT_STYLE1_DISABLED_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;
+               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -1686,9 +1788,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -1701,7 +1807,9 @@
                if (!strcmp(st, "icononly"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "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);
@@ -1719,7 +1827,9 @@
                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:"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);
             }
@@ -1734,12 +1844,16 @@
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "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:"padding_icon_text", "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);
                  }
             }
          }
@@ -1748,7 +1862,9 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
-            target: "padding_icon_text";
+            target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -1810,12 +1926,22 @@
          }
       }
    }
+
 ///////////////////////////////////////////////////////////////////////////////////////
-group { name: "elm/button/base/searchbar/default";
+   group { name: "elm/button/base/style2/multiline";
       images {
-         image: "00_search_input_field_bg.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
-         image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_04_normal.png" COMP;
+         image: "00_button_04_press.png" COMP;
+         image: "00_button_04_dim.png" COMP;
+         image: "00_button_04_normal_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_style2_multiline";
+            base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_roman";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -1824,36 +1950,23 @@ group { name: "elm/button/base/searchbar/default";
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_search_input_field_bg.png";
-                  border: BUTTON_SEARCHBAR_BG_BORDER_INC;
+                  normal: "00_button_04_normal.png";
+                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_press.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_04_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_dim.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_04_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image {
-                  normal: "00_button_sweep_press.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_04_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -1863,11 +1976,28 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_SEARCHBAR_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_TEXT_STYLE2_ICONONLY_BG_MIN_INC;
+            }
+         }
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
@@ -1875,7 +2005,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_SEARCHBAR_PADDING_MIN_INC;
+               min: BUTTON_TEXT_STYLE2_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -1885,23 +2015,41 @@ group { name: "elm/button/base/searchbar/default";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_SEARCHBAR_ICON_RECT_MIN_INC;
+               visible: 0;
+               min: 0 0;
                fixed: 1 0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_left_top";
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
+                  to_x: "padding_left_top";
                   to_y: "padding_right_bottom";
                }
                align: 0.0 0.5;
-               color: 0 0 0 0;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               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: "icononly" 0.0;
+               inherit: "default" 0.0;
             }
          }
-         part { name: "padding_icon_text";
+         part { name: "padding_after_icon";
             type: RECT;
             scale: 1;
             mouse_events: 0;
@@ -1914,12 +2062,10 @@ group { name: "elm/button/base/searchbar/default";
                rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
+               visible: 0;
             }
-            description { state: "visible" 0.0; //when icon is visible
+            description { state: "visible" 0.0;
+               visible: 0;
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
@@ -1927,8 +2073,31 @@ group { name: "elm/button/base/searchbar/default";
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_SEARCHBAR_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
-               color: 0 0 0 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               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";
+               }
+               fixed: 1 0;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
             }
          }
          part { name: "elm.swallow.content";
@@ -1951,34 +2120,27 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               align: 0.0 0.5;
+               min: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_VISIBLE_ICON_MIN_MAX_INC;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
+                  relative: 0.0 0.0;
+                  to_x: "padding_before_text";
                   to_y: "padding_right_bottom";
                }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_SEARCHBAR_ICONONLY_ICON_MIN_INC;
-               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";
-               }
+               min: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_TEXT_STYLE2_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -1986,30 +2148,28 @@ group { name: "elm/button/base/searchbar/default";
                visible: 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
+                  to_x: "padding_after_icon";
                   to_y: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_SEARCHBAR_FONT_SIZE_INC;
+                  style: "btn_style2_multiline";
                   min: 0 0;
+                  max: 1 0;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: BUTTON_SEARCHBAR_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;
+               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2017,15 +2177,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color: BUTTON_TEXT_STYLE1_DISABLED_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;
+               color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -2102,9 +2260,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -2117,7 +2279,9 @@ group { name: "elm/button/base/searchbar/default";
                if (!strcmp(st, "icononly"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "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);
@@ -2135,7 +2299,9 @@ group { name: "elm/button/base/searchbar/default";
                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:"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);
             }
@@ -2150,12 +2316,16 @@ group { name: "elm/button/base/searchbar/default";
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "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:"padding_icon_text", "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);
                  }
             }
          }
@@ -2164,7 +2334,9 @@ group { name: "elm/button/base/searchbar/default";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
-            target: "padding_icon_text";
+            target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -2228,12 +2400,13 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/sweep/delete";
+   group { name: "elm/button/base/sweep";
+      alias: "elm/button/base/text_only/sweep";
       images {
          image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         image: "00_button_sweep_press.png" COMP;
          image: "00_button_sweep_dim.png" COMP;
-         image: "00_button_sweep_delete.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -2244,7 +2417,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_sweep_delete.png";
+                  normal: "00_button_sweep.png";
                   border: BUTTON_SWEEP_BG_BORDER_INC;
                   border_scale: 1;
                }
@@ -2259,7 +2432,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -2389,6 +2562,7 @@ group { name: "elm/button/base/searchbar/default";
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
+               visible: 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "padding_icon_text";
@@ -2402,16 +2576,19 @@ group { name: "elm/button/base/searchbar/default";
                text {
                   font: "SLP:style=Medium";
                   size: BUTTON_SWEEP_FONT_SIZE_INC;
-                  min: 1 0;
-                  text: "Delete";
-                  max: 1 0;
+                  min: 0 0;
+                  text_class: "slp_medium";
                }
             }
             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;
             }
             description { state: "disabled" 0.0;
@@ -2421,6 +2598,8 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               visible: 1;
+               min: BUTTON_SWEEP_TEXT_MIN_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
@@ -2503,9 +2682,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -2629,17 +2812,20 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   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";
+   group { name: "elm/button/base/sweep/multiline";
       images {
-         image: "00_button_popup_normal.png" COMP;
-         image: "00_button_popup_press.png" COMP;
-         image: "00_button_popup_focus.png" COMP;
-         image: "00_button_popup_dim.png" COMP;
+         image: "00_button_sweep.png" COMP;
+         image: "00_button_sweep_press.png" COMP;
+         image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_sweep_multiline";
+            base: "font=SLP:style=Roman font_size="BUTTON_SWEEP_MULTILINE_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_roman";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -2648,24 +2834,24 @@ group { name: "elm/button/base/searchbar/default";
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_POPUP_BG_NORMAL_MIN_INC;
+               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_popup_normal.png";
-                  border: BUTTON_POPUP_BG_BORDER_INC;
+                  normal: "00_button_sweep.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_press.png";
+               image.normal: "00_button_sweep_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_dim.png";
+               image.normal: "00_button_sweep_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_focus.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -2675,7 +2861,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_POPUP_PADDING_MIN_INC;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -2683,34 +2869,64 @@ group { name: "elm/button/base/searchbar/default";
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 0.0;
+               align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_POPUP_PADDING_MIN_INC;
+               min: BUTTON_SWEEP_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part { name: "padding_icon_text";
+         part { name: "icon_rect";
             type: RECT;
             scale: 1;
-            description { state: "default" 0.0; //when only icon or no icon is there
+            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
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to: "elm.swallow.content";
+                  to: "icon_rect";
                }
-               rel2.to: "elm.swallow.content";
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
-               visible: 0;
+               color: 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_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.content";
@@ -2732,14 +2948,22 @@ group { name: "elm/button/base/searchbar/default";
                fixed: 1 0;
             }
             description { state: "visible" 0.0;
-               inherit: "default" 0.0;
                fixed: 1 0;
-               visible: 1;
+               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";
+               }
                aspect: 1.0 1.0;
                aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
+               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -2752,7 +2976,7 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -2767,23 +2991,23 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               color: BUTTON_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
+                  style: "btn_sweep_multiline";
                   min: 0 0;
+                  max: 0 1;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: BUTTON_POPUP_TEXT_MIN_INC;
+               min: BUTTON_SWEEP_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;
+               color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2791,15 +3015,15 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
                visible: 1;
-               min: BUTTON_POPUP_TEXT_MIN_INC;
+               min: BUTTON_SWEEP_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;
+               color: BUTTON_SWEEP_BUTTON_TEXT_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -2876,9 +3100,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -2981,11 +3209,15 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
             action: STATE_SET "focused" 0.0;
             target: "button_image";
             target: "elm.text";
          }
          program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
             after: "unfocus_text";
@@ -2996,212 +3228,1790 @@ group { name: "elm/button/base/searchbar/default";
          }
       }
    }
-
-///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
-   group { name: "elm/button/base/"style_name; \
-      images { \
-         image: "00_btn_circle_bg_normal.png" COMP; \
-         image: "00_btn_circle_bg_press.png" COMP; \
-         image: image_normal COMP; \
-         image: image_press 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_btn_circle_bg_normal.png"; \
-               color: 255 255 255 255; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_btn_circle_bg_press.png"; \
-            } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               color: 255 255 255 128; \
-            } \
-         } \
-         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; \
-               color: 255 255 255 255; \
-            } \
-            description { \
-               state: "clicked" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: image_press; \
-            } \
-            description { \
-               state: "disabled" 0.0; \
-               inherit: "default" 0.0; \
-               color: 255 255 255 128; \
-            } \
-         } \
-         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"; \
-            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"; \
-         } \
-         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"; \
-         } \
-         program { name: "button_unclick2"; \
-            signal: "mouse,clicked,1"; \
-            source: "over1"; \
-            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"; \
-         } \
-         program { name: "enable"; \
-            signal: "elm,state,enabled"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "disabler"; \
-            target: "button_image"; \
-            target: "button_center_part"; \
-         } \
-      } \
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal", "00_button_reveal.png", "00_button_reveal_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_reveal.png", "00_button_reveal_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", "00_button_info_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", "00_button_info_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", "00_button_rename_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", "00_button_rename_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", "00_button_call_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", "00_button_call_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("warning", "00_button_warning.png", "00_button_warning_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("warning/extended", "00_button_warning.png", "00_button_warning_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus", "00_button_plus.png", "00_button_plus_press.png", 40, 40)
-
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_plus.png", "00_button_plus_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus", "00_button_minus.png", "00_button_minus_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_minus.png", "00_button_minus_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel", "00_button_cancel.png", "00_button_cancel_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_cancel.png", "00_button_cancel_press.png", 60, 70)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send", "00_button_send.png", "00_button_send_press.png", 40, 40)
-
-///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send/extended", "00_button_send.png", "00_button_send_press.png", 60, 70)
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/circle/empty";
+group { name: "elm/button/base/searchbar/default";
       images {
-         image: "00_btn_circle_bg_normal.png" COMP;
-         image: "00_btn_circle_bg_press.png" COMP;
+         image: "00_button_01_normal.png" COMP;
+         image: "00_button_01_normal_press.png" COMP;
+         image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
       }
       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_btn_circle_bg_normal.png";
-               color: 255 255 255 255;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_btn_circle_bg_press.png";
+               min: BUTTON_SEARCHBAR_BG_NORMAL_MIN_INC;
+               image {
+                  normal: "00_button_01_normal.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_normal_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_01_normal_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_01_normal_Focus.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_SEARCHBAR_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_SEARCHBAR_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_SEARCHBAR_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
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               color: 0 0 0 0;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_SEARCHBAR_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               color: 0 0 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;
+               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";
+               }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_SEARCHBAR_ICONONLY_ICON_MIN_INC;
+               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";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            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_SWEEP_BUTTON_TEXT_NORMAL_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_SEARCHBAR_FONT_SIZE_INC;
+                  min: 0 0;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: BUTTON_SEARCHBAR_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;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_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: 255 255 255 255;
+            }
+         }
+         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_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";
+            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: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //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";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/sweep/delete";
+      images {
+         image: "00_button_sweep_dim.png" COMP;
+         image: "00_button_sweep_delete.png" COMP;
+         image: "00_button_sweep_delete_press.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_SWEEP_BG_NORMAL_MIN_INC;
+               image {
+                  normal: "00_button_sweep_delete.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_sweep_delete_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_sweep_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_sweep_focus.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_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
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               color: 0 0 0 0;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_SWEEP_PADDING_ICON_TEXT_VISIBLE_MIN_INC;
+               color: 0 0 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;
+               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";
+               }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_SWEEP_ICONONLY_ICON_MIN_INC;
+               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";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.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;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_SWEEP_FONT_SIZE_INC;
+                  min: 1 0;
+                  text: "Delete";
+                  max: 1 0;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_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: 255 255 255 255;
+            }
+         }
+         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_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";
+            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: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //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";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   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";
+      images {
+         image: "00_button_popup_normal.png" COMP;
+         image: "00_button_popup_press.png" COMP;
+         image: "00_button_popup_normal_focus.png" COMP;
+         image: "00_button_popup_dim.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_popup_normal.png";
+                  border: BUTTON_POPUP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_popup_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_popup_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_popup_normal_focus.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_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;
+               min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
+               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";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            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;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
+                  min: 0 0;
+                  text_class: "slp_medium";
+               }
+            }
+            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;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_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: 255 255 255 255;
+            }
+         }
+         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_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";
+            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: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //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";
+         }
+      }
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/popup_button/default/multiline";
+      images {
+         image: "00_button_popup_normal.png" COMP;
+         image: "00_button_popup_press.png" COMP;
+         image: "00_button_popup_normal_focus.png" COMP;
+         image: "00_button_popup_dim.png" COMP;
+      }
+      styles{
+         style { name: "btn_popup_multiline_style";
+            base: "font=SLP:style=Roman font_size="BUTTON_POPUP_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed text_class=slp_roman";
+            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_button_popup_normal.png";
+                  border: BUTTON_POPUP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_popup_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_popup_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_popup_normal_focus.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_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;
+               min: BUTTON_POPUP_ICON_ICONONLY_MIN_INC;
+               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";
+               }
+            }
+         }
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "clipper";
+            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;
+               text {
+                  style: "btn_popup_multiline_style";
+                  min: 0 0;
+                  max: 0 1;
+               }
+            }
+            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;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_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: 255 255 255 255;
+            }
+         }
+         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_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";
+            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: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //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";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_CIRCLE_STYLES(style_name, circle_normal, circle_press, image_normal, image_press, min_width, min_height) \
+   group { name: "elm/button/base/"style_name; \
+      images { \
+         image: circle_normal COMP; \
+         image: circle_press COMP; \
+         image: image_normal COMP; \
+         image: image_press 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: circle_normal; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: circle_press; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         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; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_press; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         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"; \
+            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"; \
+         } \
+         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"; \
+         } \
+         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"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+      } \
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("reveal", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_reveal.png", "00_button_reveal_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("reveal/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_reveal.png", "00_button_reveal_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("expand/closed", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "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_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_call.png", "00_button_call_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("warning", "00_btn_circle_bg_normal_01.png", "00_btn_circle_bg_press_01.png", "00_button_warning.png", "00_button_warning_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("warning/extended", "00_btn_circle_bg_normal_01.png", "00_btn_circle_bg_press_01.png", "00_button_warning.png", "00_button_warning_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("plus", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_plus.png", "00_button_plus_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("plus/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_plus.png", "00_button_plus_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("minus", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_minus.png", "00_button_minus_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("minus/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_minus.png", "00_button_minus_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("cancel", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_cancel.png", "00_button_cancel_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("cancel/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_cancel.png", "00_button_cancel_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("send", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_send.png", "00_button_send_press.png", BUTTON_CIRCLE_NORMAL_MIN_WIDTH_INC, BUTTON_CIRCLE_NORMAL_MIN_HEIGHT_INC)
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CIRCLE_STYLES("send/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_send.png", "00_button_send_press.png", BUTTON_CIRCLE_EXTENEDED_MIN_WIDTH_INC, BUTTON_CIRCLE_EXTENEDED_MIN_HEIGHT_INC)
+///////////////////////////////////////////////////////////////////////////////////////
+
+   group { name: "elm/button/base/circle/empty";
+      images {
+         image: "00_btn_circle_bg_normal.png" COMP;
+         image: "00_btn_circle_bg_press.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_btn_circle_bg_normal.png";
+               color: 255 255 255 255;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_btn_circle_bg_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3259,6 +5069,15 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
          }
+         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";
@@ -3269,11 +5088,6 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "default" 0.0;
             target: "button_image";
          }
-         program { name: "button_unclick2";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
@@ -3291,28 +5105,29 @@ group { name: "elm/button/base/searchbar/default";
          program { name: "icon_show";
             signal: "elm,state,icon,visible";
             source: "elm";
-            action:  STATE_SET "visible" 0.0;
+            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;
+            action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+#define BUTTON_EDIT_STYLES(style_name, edit_normal, edit_press, image_normal, image_press, min_width, min_height) \
    group { name: "elm/button/base/contacts/"style_name; \
    alias: "elm/button/base/"style_name; \
       images { \
          image: image_normal COMP; \
          image: image_press COMP; \
-         image: "00_button_edit.png" COMP; \
-         image: "00_button_edit_press.png" COMP; \
+         image: edit_normal COMP; \
+         image: edit_press COMP; \
          image: "00_button_edit_dim.png" COMP; \
+         image: "00_button_edit_focus.png" COMP; \
       } \
       parts { \
          part { name: "button_image"; \
@@ -3321,7 +5136,7 @@ group { name: "elm/button/base/searchbar/default";
                min: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
                max: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
                image { \
-                  normal: "00_button_edit.png"; \
+                  normal: edit_normal; \
                   border: BUTTON_EDIT_STYLE_BORDER_INC; \
                   border_scale: 1; \
                } \
@@ -3329,13 +5144,18 @@ group { name: "elm/button/base/searchbar/default";
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_button_edit_press.png"; \
+               image.normal: edit_press; \
             } \
             description { \
                state: "disabled" 0.0; \
                inherit: "default" 0.0; \
                image.normal: "00_button_edit_dim.png"; \
             } \
+            description { \
+               state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_edit_focus.png"; \
+            } \
          } \
          part { name: "button_center_part"; \
             mouse_events: 0; \
@@ -3405,9 +5225,13 @@ group { name: "elm/button/base/searchbar/default";
             target: "button_image"; \
             target: "button_center_part"; \
          } \
-         program { name: "button_unclick2"; \
+         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"; \
@@ -3427,35 +5251,36 @@ group { name: "elm/button/base/searchbar/default";
       } \
    }
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_plus", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_minus", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_minus", "00_button_edit_Delete.png", "00_button_edit_Delete_press.png", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_minus/extended", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_minus/extended", "00_button_edit_Delete.png", "00_button_edit_Delete_press.png", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_icon_expand_closed.png", "00_button_icon_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand_closed.png", "00_button_icon_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_icon_expand_opened.png", "00_button_icon_expand_opened_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand_opened.png", "00_button_icon_expand_opened_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/contacts/delete";
       images {
-         image: "00_button_edit.png" COMP;
-         image: "00_button_edit_press.png" COMP;
+         image: "00_button_edit_Delete.png" COMP;
+         image: "00_button_edit_Delete_press.png" COMP;
          image: "00_button_edit_dim.png" COMP;
+         image: "00_button_edit_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3466,14 +5291,14 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                min: BUTTON_CONTACT_DELETE_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_edit.png";
+                  normal: "00_button_edit_Delete.png";
                   border: BUTTON_CONTACT_DELETE_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_edit_press.png";
+               image.normal: "00_button_edit_Delete_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3481,7 +5306,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_edit_press.png";
+               image.normal: "00_button_edit_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -3600,6 +5425,7 @@ group { name: "elm/button/base/searchbar/default";
                   min: 1 0;
                   text: "Delete";
                   max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -3697,9 +5523,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -3829,13 +5659,14 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_04_normal.png" COMP;
          image: "00_button_04_press.png" COMP;
          image: "00_button_04_dim.png" COMP;
+         image: "00_button_04_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       styles{
          style { name: "btn_multiline_style";
-            base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=mixed";
+            base: "font=SLP:style=Medium font_size=18 align=center color=#ffffff wrap=mixed text_class=slp_medium";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -3862,7 +5693,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_04_press.png";
+               image.normal: "00_button_04_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4113,9 +5944,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -4244,6 +6079,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_01_normal.png" COMP;
          image: "00_button_01_normal_press.png" COMP;
          image: "00_button_01_normal_dim.png" COMP;
+         image: "00_button_01_normal_Focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -4269,7 +6105,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_normal_press.png";
+               image.normal: "00_button_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4388,6 +6224,7 @@ group { name: "elm/button/base/searchbar/default";
                   font: "SLP:style=Medium";
                   size: BUTTON_DEFAULT_STYLE_FONT_SIZE_INC;
                   min: 0 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -4491,9 +6328,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -4623,44 +6464,65 @@ group { name: "elm/button/base/searchbar/default";
          image: image_normal COMP; \
          image: image_press COMP; \
          image: image_disable COMP; \
-      } \
-      script { \
-         public button_state = BUTTON_STATE_ENABLED; \
+         image: "00_button_01_normal.png" COMP; \
+         image: "00_button_01_normal_press.png" COMP; \
+         image: "00_button_01_normal_dim.png" COMP; \
+         image: "00_button_01_normal_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: image_normal; \
-                  border: COLORSELECTOR_BUTTON_BORDER; \
+                  normal: "00_button_01_normal.png"; \
+                  border: BUTTON_COLORSELECTOR_BG_BORDER_INC; \
                   border_scale: 1; \
                } \
             } \
-            description { state: "clicked" 0.0; \
+            description { \
+               state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: image_press; \
+               image.normal: "00_button_01_normal_press.png"; \
             } \
-            description { state: "disabled" 0.0; \
+            description { \
+               state: "disabled" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: image_disable; \
+               image.normal: "00_button_01_normal_dim.png"; \
             } \
-            description { state: "focused" 0.0; \
+            description { \
+               state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_button_01_normal_Focus.png"; \
+            } \
+         } \
+         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; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
                inherit: "default" 0.0; \
                image.normal: image_press; \
             } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_disable; \
+            } \
          } \
-         part { name: "over2"; \
+         part { name: "over1"; \
             type: RECT; \
-            repeat_events: 1; \
             ignore_flags: ON_HOLD; \
             description { state: "default" 0.0; \
                color: 0 0 0 0; \
             } \
          } \
-         part { name: "over3"; \
-            type: RECT; \
+         part { name: "over2"; \
             repeat_events: 1; \
             description { state: "default" 0.0; \
                color: 0 0 0 0; \
@@ -4681,50 +6543,50 @@ group { name: "elm/button/base/searchbar/default";
       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: "button_center_part"; \
          } \
-         program { name: "button_unpress"; \
+         program { name: "button_unclick"; \
+            signal: "mouse,up,1"; \
+            source: "over2"; \
             action: SIGNAL_EMIT "elm,action,unpress" ""; \
+            after: "button_unclick_anim"; \
          } \
-         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); \
-            } \
-            after: button_unpress; \
+         program { name: "button_unclick_anim"; \
+            action: STATE_SET "default" 0.0; \
+            target: "button_image"; \
+            target: "button_center_part"; \
          } \
-         program { name: "button_unclick3"; \
+         program { name: "touch_snd"; \
             signal: "mouse,clicked,1"; \
-            source: "over2"; \
+            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: "disabler"; \
-            script { \
-               set_int(button_state, BUTTON_STATE_DISABLED); \
-            } \
+            target: "button_image"; \
+            target: "button_center_part"; \
          } \
          program { name: "enable"; \
             signal: "elm,state,enabled"; \
             source: "elm"; \
             action: STATE_SET "default" 0.0; \
-            target: "button_image"; \
             target: "disabler"; \
-            script { \
-               set_int(button_state, BUTTON_STATE_ENABLED); \
-            } \
+            target: "button_image"; \
+            target: "button_center_part"; \
          } \
       } \
    }
@@ -4736,7 +6598,9 @@ group { name: "elm/button/base/searchbar/default";
    group { name: "elm/button/base/hidden";
       images {
          image: "00_button_sweep.png" COMP;
-         image: "00_button_sweep_press.png" COMP;//focus image is missing, so using press
+         image: "00_button_sweep_press.png" COMP;
+         image: "00_button_sweep_focus.png" COMP;
+         image: "00_button_sweep_dim.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -4758,10 +6622,11 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_button_sweep_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4908,6 +6773,7 @@ group { name: "elm/button/base/searchbar/default";
                   font: "SLP:style=Medium";
                   size: BUTTON_HIDDEN_FONT_SIZE_INC;
                   min: 0 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -5012,9 +6878,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -5142,6 +7012,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -5166,7 +7037,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -5314,6 +7185,7 @@ group { name: "elm/button/base/searchbar/default";
                   size: BUTTON_PICKER_BAR_DEFAULT_TEXT_FONT_SIZE_INC;
                   min: 1 0;
                   max: 0 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -5418,9 +7290,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -5549,6 +7425,7 @@ group { name: "elm/button/base/searchbar/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -5574,7 +7451,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -5722,6 +7599,7 @@ group { name: "elm/button/base/searchbar/default";
                   size: BUTTON_PICKER_PREV_TEXT_DEFAULT_TEXT_FONT_SIZE_INC;
                   min: 1 0;
                   max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -5826,9 +7704,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -5952,14 +7834,147 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_CONTACT_STYLES(style_name, image_normal, image_press) \
+   group { name: "elm/button/base/contact/"style_name; \
+      images { \
+         image: "00_contacts_circle_bg.png" COMP; \
+         image: image_normal COMP; \
+         image: image_press COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC; \
+               max: BUTTON_CONTACT_STYLE_BG_MIN_MAX_INC; \
+               image.normal: "00_contacts_circle_bg.png"; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: "00_contacts_circle_bg.png"; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         part { name: "button_center_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC; \
+               max: BUTTON_CONTACT_STYLE_IMAGE_MIN_MAX_INC; \
+               image.normal: image_normal; \
+               color: 255 255 255 255; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               inherit: "default" 0.0; \
+               image.normal: image_press; \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: 255 255 255 128; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "over2"; \
+            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"; \
+         } \
+         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"; \
+         } \
+         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"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "button_center_part"; \
+         } \
+      } \
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_CONTACT_STYLES("expand_closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png")
+
+   BUTTON_CONTACT_STYLES("expand_opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png")
+
+   BUTTON_CONTACT_STYLES("plus", "00_button_plus.png", "00_button_plus_press.png")
+
+///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/contact";
       alias: "elm/button/base/text_only/contact";
+      images {
+         image: "00_contacts_button_bg.png" COMP;
+         image: "00_contacts_button_bg_press.png" COMP;
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
@@ -5970,12 +7985,16 @@ group { name: "elm/button/base/searchbar/default";
                   to_x: "padding.right";
                   to_y: "elm.text";
                }
-               min: BUTTON_CONTACT_BG_NORMAL_MIN_INC;
-               color: BUTTON_CONTACT_BUTTON_BG_NORMAL_COLOR_INC;
+               min: BUTTON_CONTACT_BG_MIN_INC;
+               image {
+                  normal: "00_contacts_button_bg.png";
+                  border: BUTTON_CONTACT_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_CONTACT_BUTTON_BG_PRESSED_COLOR_INC ;
+               image.normal: "00_contacts_button_bg_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -6027,6 +8046,7 @@ group { name: "elm/button/base/searchbar/default";
                   font: "SLP:style=Medium";
                   size: BUTTON_CONTACT_FONT_SIZE_INC;
                   min: 1 1;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -6125,9 +8145,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -6209,9 +8233,8 @@ group { name: "elm/button/base/searchbar/default";
       alias: "elm/button/base/naviframe/prev_btn/default";
       alias: "elm/button/base/naviframe/end_btn/default";
       images {
-         image: "00_winset_Back_btn_normal.png" COMP;
-         image: "00_winset_Back_btn_press.png" COMP;
-         image: "00_winset_Back.png" COMP;
+         image: "00_winset_toolbar_press.png" COMP;
+        image: "00_winset_Back.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -6222,40 +8245,228 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               color: 0 0 0 0;
+            }
+            description { state: "clicked" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
                image {
-                  normal: "00_winset_Back_btn_normal.png";
+                  normal: "00_winset_toolbar_press.png";
+                  border: BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 127 127 127 127;
+            }
+            description { state: "focused" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               image {
+                  normal: "00_winset_toolbar_press.png";
                   border: BUTTON_NAVIFRAME_BACK_BUTTON_BG_BORDER_INC;
+               }
+            }
+         }
+         part { name: "back_button";
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
+               rel1.to: "button_image";
+               rel2.to: "button_image";
+               image.normal: "00_winset_Back.png";
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 127 127 127 127;
+            }
+         }
+         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: "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";
+         }
+         program { name: "button_unpress";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+         }
+         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);
+            }
+            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: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "disabler";
+            target: "back_button";
+            after: "disable_button";
+         }
+         program { name: "disable_button";
+            script {
+               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: "back_button";
+            after: "enable_button";
+         }
+         program { name: "enable_button";
+            script {
+               set_int(button_state, BUTTON_STATE_ENABLED);
+            }
+         }
+         program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/picker/prev/icon/default";
+      images {
+         image: "00_picker_btn_normal.png" COMP;
+         image: "00_picker_btn_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
+         image: "00_picker_arrow_left.png" COMP;
+         image: "00_picker_arrow_left_press.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
+               max: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
+               image {
+                  normal: "00_picker_btn_normal.png";
+                  border: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_winset_Back_btn_press.png";
+               image.normal: "00_picker_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_winset_Back_btn_press.png";
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_picker_btn_normal_focus.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_PICKER_PREV_ICON_DEFAULT_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_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
             }
          }
-         part { name: "back_button";
+         part { name: "left_arrow";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_BACK_BUTTON_MIN_MAX_INC;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
-               image.normal: "00_winset_Back.png";
+               min: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
+               max: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               image.normal: "00_picker_arrow_left.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 127 127 127 127;
+               image.normal: "00_picker_arrow_left_press.png";
             }
          }
          part { name: "over2";
@@ -6308,9 +8519,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -6319,7 +8534,6 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "back_button";
             after: "disable_button";
          }
          program { name: "disable_button";
@@ -6333,7 +8547,6 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "default" 0.0;
             target: "button_image";
             target: "disabler";
-            target: "back_button";
             after: "enable_button";
          }
          program { name: "enable_button";
@@ -6341,16 +8554,29 @@ group { name: "elm/button/base/searchbar/default";
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
+         program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+         }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/picker/prev/icon/default";
+   group { name: "elm/button/base/picker/next/icon/default";
       images {
          image: "00_picker_btn_normal.png" COMP;
          image: "00_picker_btn_press.png" COMP;
-         image: "00_picker_arrow_left.png" COMP;
-         image: "00_picker_arrow_left_press.png" COMP;
+         image: "00_picker_btn_normal_focus.png" COMP;
+         image: "00_picker_arrow_right.png" COMP;
+         image: "00_picker_arrow_right_press.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -6376,7 +8602,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_picker_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -6403,7 +8629,7 @@ group { name: "elm/button/base/searchbar/default";
                visible: 0;
             }
          }
-         part { name: "left_arrow";
+         part { name: "right_arrow";
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
@@ -6417,11 +8643,11 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               image.normal: "00_picker_arrow_left.png";
+               image.normal: "00_picker_arrow_right.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_arrow_left_press.png";
+               image.normal: "00_picker_arrow_right_press.png";
             }
          }
          part { name: "over2";
@@ -6474,9 +8700,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -6521,83 +8751,247 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/picker/next/icon/default";
-      images {
-         image: "00_picker_btn_normal.png" COMP;
-         image: "00_picker_btn_press.png" COMP;
-         image: "00_picker_arrow_right.png" COMP;
-         image: "00_picker_arrow_right_press.png" COMP;
-      }
+   group { name: "elm/button/base/naviframe_control/default";
+      alias: "elm/button/base/naviframe_control/center";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
+      images {
+         image: "00_Option_header_bt.png" COMP;
+         image: "00_Option_header_bt_dim.png" COMP;
+         image: "00_Option_header_bt_press.png" COMP;
+         image: "00_Option_header_bt_focus.png" COMP;
+      }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
-               max: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
+               color: 0 0 0 0;
+               rel1.offset: 0 0;
+               rel2.offset: -1 -1;
                image {
-                  normal: "00_picker_btn_normal.png";
-                  border: BUTTON_PICKER_PREV_ICON_DEFAULT_BG_DEFAULT_BORDER_INC;
-                  border_scale: 1;
+                  normal: "00_Option_header_bt.png";
+                  border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
                }
+               color: 255 255 255 255;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_Option_header_bt_dim.png";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+               image.normal: "00_Option_header_bt_press.png";
             }
-            description { state: "disabled" 0.0;
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_Option_header_bt_focus.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_NAVIFRAME_CENTER_PADDING_MIN_MAX_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_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.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;
+               color: 0 0 0 0;
+            }
+            description { state: "visible" 0.0;
+               min: BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
+               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;
+               color: 0 0 0 0;
+            }
+            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
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: 0 0;
+               color: 0 0 0 0;
+            }
+            description { state: "visible" 0.0;
+               align: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
+               }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
+               color: 0 0 0 0;
+            }
+            description { state: "icononly" 0.0;
                inherit: "default" 0.0;
             }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_picker_btn_press.png";
+         }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               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";
+               }
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
+               color: 0 0 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;
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_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";
+               }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
             }
          }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
+         part { name: "elm.text";
+            type: TEXT;
             mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-            }
-         }
-         part { name: "padding_right_bottom";
-            type: RECT;
             scale: 1;
-            mouse_events: 0;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_PICKER_PREV_ICON_DEFAULT_PADDING_MIN_INC;
-               fixed: 1 1;
                visible: 0;
-            }
-         }
-         part { name: "right_arrow";
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
-               max: BUTTON_PICKER_PREV_ICON_DEFAULT_IMAGE_MIN_MAX_INC;
                rel1 {
                   relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  to_x: "padding_after_icon";
+                  to_y: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               image.normal: "00_picker_arrow_right.png";
+               color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC;
+                  min: 0 0;
+                  max: 1 0;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_picker_arrow_right_press.png";
+               visible: 1;
+               min: 0 0;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -6615,6 +9009,15 @@ group { name: "elm/button/base/searchbar/default";
                color: 0 0 0 0;
             }
          }
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description { state: "disabled" 0.0;
+               color: 255 255 255 127;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -6637,6 +9040,16 @@ group { name: "elm/button/base/searchbar/default";
          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_unpress";
             action: SIGNAL_EMIT "elm,action,unpress" "";
@@ -6645,27 +9058,106 @@ group { name: "elm/button/base/searchbar/default";
             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: "button_unclick3";
+         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:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "visible", 0.0);
+                 }
+               set_state(PART:"elm.text", "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:"icon_rect", "icononly", 0.0);
+                    set_state(PART:"padding_after_icon", "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);
+                 }
+               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);
+                 }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+            target: "icon_rect";
+            target: "padding_after_icon";
+         }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
-            after: "disable_button";
+            after: "disable_text";
          }
-         program { name: "disable_button";
+         program { name: "disable_text";
             script {
+               new st[31];
+               new Float:vl;
                set_int(button_state, BUTTON_STATE_DISABLED);
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
+                 set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "enable";
@@ -6673,12 +9165,18 @@ group { name: "elm/button/base/searchbar/default";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
+            target: "clipper";
             target: "disabler";
-            after: "enable_button";
+            after: "enable_text";
          }
-         program { name: "enable_button";
+         program { name: "enable_text";
             script {
+               new st[31];
+               new Float:vl;
                set_int(button_state, BUTTON_STATE_ENABLED);
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
+                 set_state(PART:"elm.text", "visible", 0.0);
             }
          }
          program { name: "focused";
@@ -6686,19 +9184,24 @@ group { name: "elm/button/base/searchbar/default";
             //source: "elm";
             action: STATE_SET "focused" 0.0;
             target: "button_image";
+            target: "elm.text";
          }
          program { name: "unfocused";
             //signal: "elm,action,unfocus";
             //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";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe_control/default";
-      alias: "elm/button/base/naviframe_control/center";
+   group { name: "elm/button/base/naviframe_control/multiline";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
@@ -6706,13 +9209,21 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_Option_header_bt.png" COMP;
          image: "00_Option_header_bt_dim.png" COMP;
          image: "00_Option_header_bt_press.png" COMP;
+         image: "00_Option_header_bt_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_multiline_naviframe_controlbar_style";
+            base: "font=SLP:style=Medium font_size="BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed text_class=slp_medium";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
-               color: 0 0 0 0;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
                image {
@@ -6729,6 +9240,10 @@ group { name: "elm/button/base/searchbar/default";
                inherit: "default" 0.0;
                image.normal: "00_Option_header_bt_press.png";
             }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_Option_header_bt_focus.png";
+            }
          }
          part { name: "padding_left_top";
             type: RECT;
@@ -6759,88 +9274,54 @@ group { name: "elm/button/base/searchbar/default";
             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";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left_top";
-                  to_y: "padding_right_bottom";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-            description { state: "visible" 0.0;
-               min: BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  relative: 0.0 1.0;
+                  to_x: "elm.swallow.content";
+                  to_y: "padding_left_top";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "padding_left_top";
+                  to_x: "elm.swallow.content";
                   to_y: "padding_right_bottom";
                }
                align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
             }
          }
-         part { name: "padding_after_icon";
+         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;
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2.to: "icon_rect";
-               fixed: 1 0;
-               min: 0 0;
-               color: 0 0 0 0;
-            }
-            description { state: "visible" 0.0;
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
+               rel2 {
+                  relative: 1.0 1.0;
                   to: "icon_rect";
                }
-               rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_before_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               align: 1.0 0.5;
+               min: 0 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text";
-                  to_y: "padding_left_top";
+                  relative: 1.0 0.0;
+                  to: "icon_rect";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text";
-                  to_y: "padding_right_bottom";
+                  relative: 1.0 1.0;
+                  to: "icon_rect";
                }
-               fixed: 1 0;
-               min: BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
-               color: 0 0 0 0;
+           }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
             }
          }
          part { name: "elm.swallow.content";
@@ -6865,19 +9346,16 @@ group { name: "elm/button/base/searchbar/default";
                fixed: 1 0;
                min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
-               align: 1.0 0.5;
+               align: 0.0 0.5;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "padding_before_text";
-                  to_y: "padding_left_top";
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "padding_before_text";
+                  to_x: "padding_left_top";
                   to_y: "padding_right_bottom";
                }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
             }
             description { state: "icononly" 0.0;
                min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
@@ -6890,12 +9368,10 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -6903,24 +9379,24 @@ group { name: "elm/button/base/searchbar/default";
                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";
+                   relative: 0.0 0.0;
+                   to: "padding_right_bottom";
                }
                color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC;
+                  style: "btn_multiline_naviframe_controlbar_style";
                   min: 0 0;
-                  max: 1 0;
+                  max: 0 1;
                }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               min: 80 0;
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
@@ -7011,9 +9487,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -7026,8 +9506,7 @@ group { name: "elm/button/base/searchbar/default";
                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:"padding_icon_text", "visible", 0.0);
                  }
                set_state(PART:"elm.text", "visible", 0.0);
             }
@@ -7042,8 +9521,7 @@ group { name: "elm/button/base/searchbar/default";
                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:"padding_icon_text", "icononly", 0.0);
                  }
                set_state(PART:"elm.text", "default", 0.0);
             }
@@ -7058,14 +9536,12 @@ group { name: "elm/button/base/searchbar/default";
                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:"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:"padding_icon_text", "icononly", 0.0);
                  }
             }
          }
@@ -7074,8 +9550,7 @@ group { name: "elm/button/base/searchbar/default";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
-            target: "icon_rect";
-            target: "padding_after_icon";
+            target: "padding_icon_text";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -7116,11 +9591,15 @@ group { name: "elm/button/base/searchbar/default";
             }
          }
          program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
             action: STATE_SET "focused" 0.0;
             target: "button_image";
             target: "elm.text";
          }
          program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
             after: "unfocus_text";
@@ -7132,44 +9611,38 @@ group { name: "elm/button/base/searchbar/default";
       }
    }
 
-///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe_control/multiline";
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
+/////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/title1/default";
       images {
-         image: "00_Option_header_bt.png" COMP;
-         image: "00_Option_header_bt_dim.png" COMP;
-         image: "00_Option_header_bt_press.png" COMP;
+         image: "00_winset_Back_btn_normal.png" COMP;
+         image: "00_winset_Back_btn_press.png" COMP;
+         image: "00_winset_Back_btn_normal_focus.png" COMP;
       }
-      styles{
-         style { name: "btn_multiline_naviframe_controlbar_style";
-            base: "font=SLP:style=Medium font_size="BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed";
-            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_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
-               rel1.offset: 0 0;
-               rel2.offset: -1 -1;
+               min: BUTTON_NAVIFRAME_TITLE1_BG_MIN_INC;
                image {
-                  normal: "00_Option_header_bt.png";
-                  border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
+                  normal: "00_winset_Back_btn_normal.png";
+                  border: BUTTON_NAVIFRAME_TITLE1_BG_BORDER_INC;
+                  border_scale: 1;
                }
-               color: 255 255 255 255;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_winset_Back_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Option_header_bt_dim.png";
+               color: 127 127 127 127;
             }
-            description { state: "clicked" 0.0;
+            description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Option_header_bt_press.png";
+               image.normal: "00_winset_Back_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -7179,11 +9652,28 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE1_BG_MIN_INC;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE1_BG_MIN_INC;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE1_BG_MIN_INC;
+            }
+         }
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
@@ -7191,7 +9681,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7205,52 +9695,87 @@ group { name: "elm/button/base/searchbar/default";
                min: 0 0;
                fixed: 1 0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_left_top";
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
                }
                rel2 {
                   relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
+                  to_x: "padding_left_top";
                   to_y: "padding_right_bottom";
                }
                align: 0.0 0.5;
             }
+            description { state: "visible" 0.0;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               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: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
          }
-         part { name: "padding_icon_text";
+         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;
                align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to: "icon_rect";
-               }
+               rel2.to: "icon_rect";
                fixed: 1 0;
                min: 0 0;
+               visible: 0;
             }
             description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
+               visible: 0;
+               align: 0.0 0.0;
                rel1 {
                   relative: 1.0 0.0;
                   to: "icon_rect";
                }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to: "icon_rect";
-               }
-           }
+               rel2.to: "icon_rect";
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_TITLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+            }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
             }
          }
+         part { name: "padding_before_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 1.0 0.5;
+               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";
+               }
+               fixed: 1 0;
+               min: BUTTON_NAVIFRAME_TITLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
+            }
+         }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
@@ -7271,34 +9796,27 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
-               align: 0.0 0.5;
+               min: BUTTON_NAVIFRAME_TITLE1_VISIBLE_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE1_VISIBLE_ICON_MIN_MAX_INC;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
+                  relative: 0.0 1.0;
+                  to_x: "padding_before_text";
+                  to_y: "padding_left_top";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "padding_left_top";
+                  to_x: "padding_before_text";
                   to_y: "padding_right_bottom";
                }
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
+               min: BUTTON_NAVIFRAME_TITLE1_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE1_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -7306,35 +9824,44 @@ group { name: "elm/button/base/searchbar/default";
                visible: 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
+                  to_x: "padding_after_icon";
                   to_y: "padding_left_top";
                }
                rel2 {
-                   relative: 0.0 0.0;
-                   to: "padding_right_bottom";
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
                }
-               color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE1_NORMAL_COLOR_INC;
                text {
-                  style: "btn_multiline_naviframe_controlbar_style";
-                  min: 0 0;
-                  max: 0 1;
+                  font: "SLP:style=Medium";
+                  size: BUTTON_NAVIFRAME_TITLE1_FONT_SIZE_INC;
+                  min: 1 0;
+                  max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             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_NAVIFRAME_TITLE1_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_NAVIFRAME_TITLE1_DISABLED_COLOR_INC;
+               visible: 1;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE1_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -7357,9 +9884,6 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                color: 255 255 255 255;
             }
-            description { state: "disabled" 0.0;
-               color: 255 255 255 127;
-            }
          }
          part { name: "disabler";
             type: RECT;
@@ -7414,9 +9938,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -7429,9 +9957,14 @@ group { name: "elm/button/base/searchbar/default";
                if (!strcmp(st, "icononly"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "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:"elm.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";
@@ -7444,7 +9977,9 @@ group { name: "elm/button/base/searchbar/default";
                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:"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);
             }
@@ -7459,12 +9994,16 @@ group { name: "elm/button/base/searchbar/default";
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "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:"padding_icon_text", "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);
                  }
             }
          }
@@ -7473,14 +10012,15 @@ group { name: "elm/button/base/searchbar/default";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
-            target: "padding_icon_text";
+            target: "padding_after_icon";
+            target: "icon_rect";
+            target: "bg";
          }
          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";
          }
@@ -7488,10 +10028,12 @@ group { name: "elm/button/base/searchbar/default";
             script {
                new st[31];
                new Float:vl;
-               set_int(button_state, BUTTON_STATE_DISABLED);
                get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                 set_state(PART:"elm.text", "visible", 0.0);
+               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";
@@ -7499,7 +10041,6 @@ group { name: "elm/button/base/searchbar/default";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            target: "clipper";
             target: "disabler";
             after: "enable_text";
          }
@@ -7507,18 +10048,24 @@ group { name: "elm/button/base/searchbar/default";
             script {
                new st[31];
                new Float:vl;
-               set_int(button_state, BUTTON_STATE_ENABLED);
                get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
+               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: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
             action: STATE_SET "focused" 0.0;
             target: "button_image";
             target: "elm.text";
          }
          program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
             after: "unfocus_text";
@@ -7532,36 +10079,42 @@ group { name: "elm/button/base/searchbar/default";
 
 //////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe/title/default";
-      images {
-         image: "00_Title_btn.png" COMP;
-         image: "00_Title_btn_press.png" COMP;
-      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
+      images {
+         image: "00_title_btn_bg_press.png" COMP;
+      }
+      styles{
+         style { name: "btn_naviframe_style";
+            base: "font=SLP:style=Medium font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipise=1.0 text_class=slp_medium";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+      }
       parts {
          part { name: "button_image";
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_BUTTON_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
+               color: 0 0 0 0;
+            }
+            description { state: "clicked" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_MIN_INC;
                image {
-                  normal: "00_Title_btn.png";
-                  border: BUTTON_NAVIFRAME_BG_BORDER_INC;
+                  normal: "00_title_btn_bg_press.png";
+                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
                   border_scale: 1;
                }
             }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
-            }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 0 0 0 128;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
             }
          }
          part { name: "padding_left_top";
@@ -7571,28 +10124,11 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIFRAME_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
          }
-         part { name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_BG_MIN_INC;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC;
-            }
-         }
          part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
@@ -7600,7 +10136,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
-               min: BUTTON_NAVIFRAME_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -7626,8 +10162,8 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                visible: 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
@@ -7668,7 +10204,7 @@ group { name: "elm/button/base/searchbar/default";
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
@@ -7691,14 +10227,14 @@ group { name: "elm/button/base/searchbar/default";
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
          part { name: "elm.swallow.content";
             type: SWALLOW;
             scale: 1;
-            clip_to: "clipper";
+            clip_to: "icon_disabler";
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
@@ -7715,8 +10251,8 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_VISIBLE_ICON_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 {
                   relative: 0.0 1.0;
@@ -7730,12 +10266,12 @@ group { name: "elm/button/base/searchbar/default";
                }
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_ICONONLY_ICON_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
@@ -7750,12 +10286,11 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_TEXT_NAVIFRAME_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
+                   style: "btn_naviframe_style";
+                   min: 0 0;
+                   max: 0 1;
                }
             }
             description { state: "visible" 0.0;
@@ -7765,7 +10300,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -7773,13 +10308,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_TEXT_NAVIFRAME_DISABLED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_NAVIFRAME_FOCUSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -7803,6 +10338,20 @@ group { name: "elm/button/base/searchbar/default";
                color: 255 255 255 255;
             }
          }
+         part { name: "icon_disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to: "icon_rect";
+               rel2.to: "icon_rect";
+               color: 0 0 0 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 127 127 127 127;
+            }
+         }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
@@ -7856,9 +10405,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -7873,7 +10426,6 @@ group { name: "elm/button/base/searchbar/default";
                     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);
@@ -7893,7 +10445,6 @@ group { name: "elm/button/base/searchbar/default";
                     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);
             }
@@ -7910,14 +10461,12 @@ group { name: "elm/button/base/searchbar/default";
                     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);
                  }
             }
          }
@@ -7928,7 +10477,6 @@ group { name: "elm/button/base/searchbar/default";
             target: "elm.swallow.content";
             target: "padding_after_icon";
             target: "icon_rect";
-            target: "bg";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
@@ -7936,6 +10484,7 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "disabled" 0.0;
             target: "button_image";
             target: "disabler";
+            target: "icon_disabler";
             after: "disable_text";
          }
          program { name: "disable_text";
@@ -7956,6 +10505,7 @@ group { name: "elm/button/base/searchbar/default";
             action: STATE_SET "default" 0.0;
             target: "button_image";
             target: "disabler";
+            target: "icon_disabler";
             after: "enable_text";
          }
          program { name: "enable_text";
@@ -7991,15 +10541,152 @@ group { name: "elm/button/base/searchbar/default";
       }
    }
 
+///////////////////////////////////////////////////////////////////////////////////////
+#define BUTTON_NAVIFRAME_TITLE_ICON_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+   group { name: "elm/button/base/naviframe/title/icon/"style_name; \
+      images { \
+         image: image_normal COMP; \
+         image: image_press COMP; \
+         image: "00_title_btn_bg_press.png" COMP; \
+      } \
+      parts { \
+         part { name: "button_image"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC; \
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_NORMAL_MIN_INC; \
+               color: 0 0 0 0; \
+            } \
+            description { \
+               state: "clicked" 0.0; \
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_MIN_INC; \
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_MIN_INC; \
+               image { \
+                  normal: "00_title_btn_bg_press.png"; \
+                  border: BUTTON_NAVIFRAME_TITLE_ICON_BG_PRESSED_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { \
+               state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0;\
+            } \
+         } \
+         part { name: "icon_part"; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: min_width min_height; \
+               max: min_width min_height; \
+               rel1.to: "button_image"; \
+               rel2.to: "button_image"; \
+               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; \
+               color: 127 127 127 127; \
+            } \
+         } \
+         part { name: "over1"; \
+            type: RECT; \
+            ignore_flags: ON_HOLD; \
+            description { state: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         } \
+         part { name: "over2"; \
+            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_part"; \
+         } \
+         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_part"; \
+         } \
+         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: "icon_part"; \
+         } \
+         program { name: "enable"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disabler"; \
+            target: "button_image"; \
+            target: "icon_part"; \
+         } \
+      } \
+   }
+///////////////////////////////////////////////////////////////////////////////////////
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("cancel", "00_button_cancel.png", "00_button_cancel_pressed.png", BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_CANCEL_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("plus", "00_button_plus.png", "00_button_plus_pressed.png", BUTTON_NAVIFRAME_TITLE_ICON_PLUS_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_PLUS_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("more", "00_winset_more.png", "00_winset_more_press.png", BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_MORE_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("search", "00_title_icon_search.png", "00_title_icon_search_press.png", BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_SEARCH_MIN_HEIGHT_INC)
+
+   BUTTON_NAVIFRAME_TITLE_ICON_STYLES("previous", "00_winset_Back.png", "00_winset_Back.png", BUTTON_NAVIFRAME_TITLE_ICON_PREV_MIN_WIDTH_INC, BUTTON_NAVIFRAME_TITLE_ICON_PREV_MIN_HEIGHT_INC)
+
 /////////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe/more/default";
       images {
-         image: "00_Title_btn.png" COMP;
-         image: "00_Title_btn_press.png" COMP;
          image: "00_winset_more.png" COMP;
-      }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
+         image: "00_winset_more_press.png" COMP;
+         image: "00_title_btn_bg_press.png" COMP;
       }
       parts {
          part { name: "button_image";
@@ -8007,22 +10694,22 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
                max: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
+               color: 0 0 0 0;
+            }
+            description { state: "clicked" 0.0;
+               min: BUTTON_NAVIFRAME_MORE_BG_PRESSED_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_MORE_BG_PRESSED_MIN_MAX_INC;
                image {
-                  normal: "00_Title_btn.png";
-                  border: BUTTON_NAVIFRAME_MORE_BG_BORDER_INC;
+                  normal: "00_title_btn_bg_press.png";
+                  border: BUTTON_NAVIFRAME_MORE_BG_PRESSED_BORDER_INC;
                   border_scale: 1;
                }
             }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
-            }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_Title_btn_press.png";
             }
          }
          part { name: "more_image";
@@ -8037,6 +10724,11 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_winset_more_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 127;
             }
          }
          part { name: "over2";
@@ -8076,49 +10768,43 @@ group { name: "elm/button/base/searchbar/default";
          program { name: "button_click_anim";
             action: STATE_SET "clicked" 0.0;
             target: "button_image";
+            target: "more_image";
          }
-         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";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         program { name: "button_unclick3";
+         program { name: "button_unclick_anim";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "more_image";
+         }
+         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: "button_image";
             target: "disabler";
-            after: "disable_button";
-         }
-         program { name: "disable_button";
-            script {
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
+            target: "button_image";
+            target: "more_image";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
             target: "disabler";
-            after: "enable_button";
-         }
-         program { name: "enable_button";
-            script {
-               set_int(button_state, BUTTON_STATE_ENABLED);
-            }
+            target: "button_image";
+            target: "more_image";
          }
       }
    }
@@ -8129,6 +10815,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_06_normal.png" COMP;
          image: "00_button_06_press.png" COMP;
          image: "00_button_06_dim.png" COMP;
+         image: "00_button_06_normal_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -8153,7 +10840,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_06_press.png";
+               image.normal: "00_button_06_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -8348,6 +11035,7 @@ group { name: "elm/button/base/searchbar/default";
                   size: BUTTON_TICKERNOTI_FONT_SIZE_INC;
                   min: 1 0;
                   max: 1 0;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -8448,9 +11136,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";
@@ -8590,6 +11282,7 @@ group { name: "elm/button/base/searchbar/default";
          image: "00_button_05_normal.png" COMP;
          image: "00_button_05_press.png" COMP;
          image: "00_button_05_dim.png" COMP;
+         image: "00_button_05_normal_focus.png" COMP;
          image: "00_arrow_expand.png" COMP;
          image: "00_arrow_expand_press.png" COMP;
          image: "00_arrow_expand_dim.png" COMP;
@@ -8619,7 +11312,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_05_press.png";
+               image.normal: "00_button_05_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -8714,6 +11407,7 @@ group { name: "elm/button/base/searchbar/default";
                   min: 0 0;
                   fit: 1 1;
                   size_range: 14 20;
+                  text_class: "slp_medium";
                }
             }
             description { state: "visible" 0.0;
@@ -8801,9 +11495,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         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";