[button.edc] Disabled state of button is changed in naviframe/title style.
[framework/uifw/efl-theme-tizen.git] / themes / widgets / button.edc
index 730d56d..8ec3be4 100644 (file)
@@ -36,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;
@@ -60,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";
 
 //////////////////////////////////////////////////////////////
    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;
             }
             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";
    }
 
 //////////////////////////////////////////////////////////////////////////////////////
+   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_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";
             }
             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";
          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;
             }
             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";
          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";
+            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";
@@ -1936,7 +1966,7 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             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";
@@ -2374,8 +2404,9 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
       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_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -2401,7 +2432,7 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             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";
@@ -2784,8 +2815,9 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
    group { name: "elm/button/base/sweep/multiline";
       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_focus.png" COMP;
       }
       styles{
          style { name: "btn_sweep_multiline";
@@ -2819,7 +2851,7 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             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";
@@ -3199,9 +3231,10 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
 ///////////////////////////////////////////////////////////////////////////////////////
 group { name: "elm/button/base/searchbar/default";
       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_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;
@@ -3212,34 +3245,22 @@ group { name: "elm/button/base/searchbar/default";
             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_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_sweep_press.png";
-                  border: BUTTON_SWEEP_BG_BORDER_INC;
-                  border_scale: 1;
-               }
+               image.normal: "00_button_01_normal_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_01_normal_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_01_normal_Focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -3621,10 +3642,10 @@ group { name: "elm/button/base/searchbar/default";
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/sweep/delete";
       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_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;
@@ -3642,7 +3663,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_sweep_press.png";
+               image.normal: "00_button_sweep_delete_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3650,7 +3671,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";
@@ -4034,7 +4055,7 @@ group { name: "elm/button/base/searchbar/default";
       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_normal_focus.png" COMP;
          image: "00_button_popup_dim.png" COMP;
       }
       script {
@@ -4061,7 +4082,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_focus.png";
+               image.normal: "00_button_popup_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4382,11 +4403,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";
@@ -4402,7 +4427,7 @@ group { name: "elm/button/base/searchbar/default";
       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_normal_focus.png" COMP;
          image: "00_button_popup_dim.png" COMP;
       }
       styles{
@@ -4437,7 +4462,7 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_popup_focus.png";
+               image.normal: "00_button_popup_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -4757,11 +4782,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";
@@ -4774,11 +4803,11 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+#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: "00_btn_circle_bg_normal.png" COMP; \
-         image: "00_btn_circle_bg_press.png" COMP; \
+         image: circle_normal COMP; \
+         image: circle_press COMP; \
          image: image_normal COMP; \
          image: image_press COMP; \
       } \
@@ -4788,13 +4817,13 @@ group { name: "elm/button/base/searchbar/default";
             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"; \
+               image.normal: circle_normal; \
                color: 255 255 255 255; \
             } \
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_btn_circle_bg_press.png"; \
+               image.normal: circle_press; \
             } \
             description { \
                state: "disabled" 0.0; \
@@ -4899,80 +4928,77 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal", "00_button_reveal.png", "00_button_reveal_press.png", 40, 40)
+   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_button_reveal.png", "00_button_reveal_press.png", 60, 70)
+   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_button_expand_closed.png", "00_button_expand_closed_press.png", 40, 40)
+   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_button_expand_closed.png", "00_button_expand_closed_press.png", 60, 70)
+   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_button_expand_opened.png", "00_button_expand_opened_press.png", 40, 40)
+   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_button_expand_opened.png", "00_button_expand_opened_press.png", 60, 70)
+   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_button_info.png", "00_button_info_press.png", 40, 40)
+   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_button_info.png", "00_button_info_press.png", 60, 70)
+   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_button_rename.png", "00_button_rename_press.png", 40, 40)
+   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_button_rename.png", "00_button_rename_press.png", 60, 70)
+   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_button_call.png", "00_button_call_press.png", 40, 40)
+   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_button_call.png", "00_button_call_press.png", 60, 70)
+   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_button_warning.png", "00_button_warning_press.png", 40, 40)
+   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_button_warning.png", "00_button_warning_press.png", 60, 70)
+   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_button_plus.png", "00_button_plus_press.png", 40, 40)
+   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_button_plus.png", "00_button_plus_press.png", 60, 70)
+   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_button_minus.png", "00_button_minus_press.png", 40, 40)
+   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_button_minus.png", "00_button_minus_press.png", 60, 70)
+   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_button_cancel.png", "00_button_cancel_press.png", 40, 40)
+   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_button_cancel.png", "00_button_cancel_press.png", 60, 70)
+   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_button_send.png", "00_button_send_press.png", 40, 40)
+   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_button_send.png", "00_button_send_press.png", 60, 70)
+   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";
-      alias: "elm/button/base/expand_text";
       images {
          image: "00_btn_circle_bg_normal.png" COMP;
          image: "00_btn_circle_bg_press.png" COMP;
       }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
       parts {
          part { name: "button_image";
             scale: 1;
@@ -5007,45 +5033,6 @@ group { name: "elm/button/base/searchbar/default";
                color: 255 255 255 128;
             }
          }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: BUTTON_EXPAND_BUTTON_NORMAL_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: BUTTON_EXPAND_BUTTON_TEXT_SIZE_INC;
-                  min: 1 1;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_EXPAND_BUTTON_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_EXPAND_BUTTON_DISABLED_COLOR_INC;
-               visible: 1;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_EXPAND_BUTTON_FOCUSED_COLOR_INC;
-            }
-         }
          part { name: "over1";
             type: RECT;
             ignore_flags: ON_HOLD;
@@ -5082,122 +5069,65 @@ group { name: "elm/button/base/searchbar/default";
             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: "over2";
-            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: "over1";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
+            after: button_unclick2;
          }
-         program { name: "button_unclick3";
+         program { name: "button_unclick2";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "icononly" 0.0;
-            target: "elm.swallow.content";
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
+         program { name: "button_unclick_anim";
             action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
+            target: "button_image";
          }
          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);
-            }
+            target: "button_image";
          }
          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";
-            action: STATE_SET "focused" 0.0;
             target: "button_image";
-            target: "elm.text";
-         }
-         program { name: "unfocused";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
          }
-         program { name: "unfocus_text";
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
             action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "elm.swallow.content";
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#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"; \
@@ -5206,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; \
                } \
@@ -5214,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; \
@@ -5316,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;
@@ -5355,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;
@@ -5370,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";
@@ -5723,6 +5659,7 @@ 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;
@@ -5756,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";
@@ -6142,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;
@@ -6167,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";
@@ -6526,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; \
@@ -6584,29 +6543,29 @@ 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: "touch_snd"; \
             signal: "mouse,clicked,1"; \
-            source: "over2"; \
+            source: "over1"; \
             action: PLAY_SAMPLE "touch_sound" 1.0; \
             after: button_unclick3; \
          } \
@@ -6617,21 +6576,17 @@ group { name: "elm/button/base/searchbar/default";
             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"; \
          } \
       } \
    }
@@ -6643,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;
@@ -6665,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";
@@ -7054,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;
@@ -7078,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";
@@ -7466,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;
@@ -7491,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";
@@ -7874,6 +7834,136 @@ 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 {
@@ -8143,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;
@@ -8156,22 +8245,27 @@ 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;
-                  border_scale: 1;
                }
             }
-            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;
+               color: 127 127 127 127;
             }
             description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_winset_Back_btn_press.png";
+               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";
@@ -8279,6 +8373,18 @@ 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";
+         }
       }
    }
 
@@ -8287,6 +8393,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;
          image: "00_picker_arrow_left.png" COMP;
          image: "00_picker_arrow_left_press.png" COMP;
       }
@@ -8314,7 +8421,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";
@@ -8467,6 +8574,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;
          image: "00_picker_arrow_right.png" COMP;
          image: "00_picker_arrow_right_press.png" COMP;
       }
@@ -8494,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";
@@ -8652,6 +8760,7 @@ 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;
       }
       parts {
          part { name: "button_image";
@@ -8675,6 +8784,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;
@@ -9067,11 +9180,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";
@@ -9092,6 +9209,7 @@ 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";
@@ -9122,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;
@@ -9469,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";
@@ -9485,37 +9611,38 @@ group { name: "elm/button/base/searchbar/default";
       }
    }
 
-//////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/title/default";
+/////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/title1/default";
+      images {
+         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;
+      }
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
-      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";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
-               color: 0 0 0 0;
+               min: BUTTON_NAVIFRAME_TITLE1_BG_MIN_INC;
+               image {
+                  normal: "00_winset_Back_btn_normal.png";
+                  border: BUTTON_NAVIFRAME_TITLE1_BG_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_BG_COLOR_PRESSED_INC;
+               image.normal: "00_winset_Back_btn_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
+               color: 127 127 127 127;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_winset_Back_btn_normal_focus.png";
             }
          }
          part { name: "padding_left_top";
@@ -9525,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_TITLE_TEXT_PADDING_MIN_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;
@@ -9537,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_TITLE_TEXT_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE1_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -9563,8 +9707,8 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               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;
@@ -9605,7 +9749,7 @@ group { name: "elm/button/base/searchbar/default";
                }
                rel2.to: "icon_rect";
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
@@ -9628,7 +9772,7 @@ group { name: "elm/button/base/searchbar/default";
                   to_y: "padding_right_bottom";
                }
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               min: BUTTON_NAVIFRAME_TITLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
                visible: 0;
             }
          }
@@ -9652,8 +9796,8 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "visible" 0.0;
                fixed: 1 0;
-               min: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_VISIBLE_ICON_RECT_MIN_MAX_INC;
+               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: 0.0 1.0;
@@ -9667,12 +9811,12 @@ group { name: "elm/button/base/searchbar/default";
                }
             }
             description { state: "icononly" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
+               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";
@@ -9687,11 +9831,13 @@ group { name: "elm/button/base/searchbar/default";
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE1_NORMAL_COLOR_INC;
                text {
-                   style: "btn_naviframe_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;
@@ -9701,7 +9847,7 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE1_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -9709,13 +9855,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE1_DISABLED_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE1_FOCUSED_COLOR_INC;
             }
          }
          part { name: "over2";
@@ -9813,6 +9959,7 @@ 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);
@@ -9832,6 +9979,7 @@ 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);
             }
@@ -9848,12 +9996,14 @@ 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);
                  }
             }
          }
@@ -9864,6 +10014,7 @@ 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";
@@ -9926,27 +10077,497 @@ 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; \
-      } \
-      parts { \
-         part { name: "button_image"; \
-            scale: 1; \
-            type: RECT; \
-            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; \
-               inherit: "default" 0.0; \
-            } \
-            description { \
+//////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/naviframe/title/default";
+      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_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_bg_press.png";
+                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+            }
+         }
+         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_TITLE_TEXT_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_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part { name: "icon_rect";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: 0 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to: "padding_left_top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "padding_left_top";
+                  to_y: "padding_right_bottom";
+               }
+               align: 0.0 0.5;
+            }
+            description { state: "visible" 0.0;
+               visible: 0;
+               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;
+                  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_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;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               visible: 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_TITLE_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_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "icon_disabler";
+            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_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;
+                  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";
+               }
+            }
+            description { state: "icononly" 0.0;
+               min: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICONONLY_ICON_MIN_MAX_INC;
+            }
+         }
+         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_after_icon";
+                  to_y: "padding_left_top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to: "padding_right_bottom";
+               }
+               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
+               text {
+                   style: "btn_naviframe_style";
+                   min: 0 0;
+                   max: 0 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_NAVIFRAME_TITLE_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_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
+               visible: 1;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_NAVIFRAME_TITLE_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: "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;
+               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:"icon_rect", "visible", 0.0);
+                    set_state(PART:"padding_after_icon", "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:"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: "padding_after_icon";
+            target: "icon_rect";
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "disabler";
+            target: "icon_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";
+            target: "icon_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_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; \
             } \
@@ -9979,7 +10600,6 @@ group { name: "elm/button/base/searchbar/default";
             ignore_flags: ON_HOLD; \
             description { state: "default" 0.0; \
                color: 0 0 0 0; \
-               min: min_width min_height; \
             } \
          } \
          part { name: "over2"; \
@@ -10059,15 +10679,17 @@ group { name: "elm/button/base/searchbar/default";
 
    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_winset_more.png" COMP;
          image: "00_winset_more_press.png" COMP;
+         image: "00_title_btn_bg_press.png" COMP;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC;
@@ -10075,7 +10697,13 @@ group { name: "elm/button/base/searchbar/default";
                color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 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_bg_press.png";
+                  border: BUTTON_NAVIFRAME_MORE_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -10187,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;
@@ -10211,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";
@@ -10653,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;
@@ -10682,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";