[naviframe] Apply Naviframe dark theme GUI v0.7
[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / button.edc
index 3db0e40..d247bc2 100644 (file)
 #define BUTTON_LANDSCAPE_DISABLED 0
 #define BUTTON_LANDSCAPE_ENABLED 1
 
-   sounds {
-      sample {
-         name: "touch_sound" AS_IS;
-         source: "S_Touch_30ms.wav";
-      }
-   }
-
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/style1";
       alias: "elm/button/base/text_only/style1";
       alias: "elm/button/base/icon_and_text/center";
       alias: "elm/button/base/nocontents/search_button";
       alias: "elm/button/base/style1/multiline";
+      alias: "elm/button/base/sweep";
+      alias: "elm/button/base/text_only/sweep";
+      alias: "elm/button/base/hidden";
+      alias: "elm/button/base/sweep/multiline";
+      alias: "elm/button/base/style2";
+      alias: "elm/button/base/text_only/style2";
+      alias: "elm/button/base/style2/multiline";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_button_01.png" COMP;
          image: "00_button_01_press.png" COMP;
          image: "00_button_01_dim.png" COMP;
+         image: "00_button_01_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_style1";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_style1_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_STYLE1_FONT_SIZE_INC" align=center color="BUTTON_TEXT_STYLE1_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
                image.normal: "00_button_01_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_TEXT_STYLE1_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_left_top";
             type: RECT;
             scale: 1;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                rel2 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
-               }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
+               } 
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
+                  style: "btn_base_style1";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
       inherit: "elm/button/base/style1";
       parts {
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
+                  style: "btn_base_style1";
                   min: 1 0;
                   max: 1 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text.size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC;
-               text.min: 1 1;
+               text {
+                  style: "btn_base_style1";
+                  size: BUTTON_DATETIME_AMPM_TEXT_FONT_SIZE_INC;
+                  min: 1 1;
+               }
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/style1/delete";
+      alias: "elm/button/base/sweep/delete";
+      alias: "elm/button/base/sweep/delete/multiline";
       inherit: "elm/button/base/style1";
       images {
          image: "00_button_01_delete.png" COMP;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             clip_to: "clipper";
             description { state: "default" 0.0;
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_DELETE_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
-                  min: 0 0;
-                  max: 1 0;
-                  text_class: "tizen";
+                  style: "btn_base_style1";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_style1_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/style2";
+/*   group { name: "elm/button/base/style2";
       alias: "elm/button/base/text_only/style2";
       alias: "elm/button/base/style2/multiline";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_button_01.png" COMP;
          image: "00_button_01_press.png" COMP;
          image: "00_button_01_dim.png" COMP;
+         image: "00_button_01_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
                image.normal: "00_button_01_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_TEXT_STYLE2_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_left_top";
             type: RECT;
             scale: 1;
                inherit: "default" 0.0;
                visible: 1;
                color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
       alias: "elm/button/base/text_only/sweep";
       alias: "elm/button/base/hidden";
       alias: "elm/button/base/sweep/multiline";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_button_01.png" COMP;
          image: "00_button_01_press.png" COMP;
          image: "00_button_01_dim.png" COMP;
+         image: "00_button_01_focus.png" COMP;
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
                image.normal: "00_button_01_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_SWEEP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_left_top";
             type: RECT;
             scale: 1;
                visible: 1;
                min: 0 0;
                color: BUTTON_SWEEP_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_SWEEP_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
                min: BUTTON_SWEEP_TEXT_MIN_INC;
             }
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
                visible: 1;
                min: 0 0;
                color: BUTTON_DELETE_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_DELETE_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
                min: BUTTON_SWEEP_TEXT_MIN_INC;
             }
          }
       }
    }
-
+*/
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/popup_button/default";
       alias: "elm/button/base/popup_button/menustyle";
       alias: "elm/button/base/popup_button/customstyle";
       alias: "elm/button/base/popup_button/verticalbuttonstyle";
       alias: "elm/button/base/popup_button/default/multiline";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
-         image: "00_button_01.png" COMP;
-         image: "00_button_01_dim.png" COMP;
-         image: "00_button_01_press.png" COMP;
+         image: "00_popup_button.png" COMP;
+         image: "00_popup_button_dim.png" COMP;
+         image: "00_popup_button_press.png" COMP;
+         image: "00_popup_button_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_popup_button";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_popup_button_pressed";
+            base: "font=Tizen:style=Bold font_size="BUTTON_POPUP_TEXT_FONT_SIZE_INC" align=center color="BUTTON_POPUP_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_POPUP_BUTTON_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
             description { state: "default" 0.0;
                min: BUTTON_POPUP_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_01.png";
+                  normal: "00_popup_button.png";
                   border: BUTTON_POPUP_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
+               image.normal: "00_popup_button_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_dim.png";
+               image.normal: "00_popup_button_dim.png";
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_01_press.png";
+               image.normal: "00_popup_button_focus.png";
+            }
+         }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_popup_button_focus.png";
+                  border: BUTTON_POPUP_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
             }
          }
          part { name: "padding_left_top";
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "clipper";
-            effect: SHADOW BOTTOM;
             description { state: "default" 0.0;
                visible: 0;
                rel1 {
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_POPUP_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_POPUP_TEXT_FONT_SIZE_INC;
+                  style: "btn_base_popup_button";
                   min: 0 0;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               min: 0 0;
-               color: BUTTON_POPUP_BUTTON_TEXT_PRESSED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_popup_button_pressed";
+                  min: 0 0;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_POPUP_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                visible: 1;
                min: BUTTON_POPUP_TEXT_MIN_INC;
             }
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
 ///////////////////////////////////////////////////////////////////////////////////////
 #define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
    group { name: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
       images { \
          image: "00_circle_button.png" COMP; \
          image: "00_circle_button_press.png" COMP; \
          image: "00_circle_button_dim.png" COMP; \
          image: image_normal COMP; \
          image: image_press COMP; \
+         image: 00_circle_button_focus.png COMP; \
       } \
       parts { \
          part { name: "button_image"; \
                color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC; \
             } \
          } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+              description { state: "default" 0.0; \
+                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 visible: 0; \
+                 rel1.to : "button_image"; \
+                 rel2.to : "button_image"; \
+                 image { \
+                  normal: "00_circle_button_focus.png"; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "over1"; \
             type: RECT; \
             ignore_flags: ON_HOLD; \
             target: "button_center_part"; \
             target: "icon_clipper"; \
          } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
       } \
    }
 
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/circle/empty";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_circle_button.png" COMP;
          image: "00_circle_button_press.png" COMP;
          image: "00_circle_button_dim.png" COMP;
+         image: 00_circle_button_focus.png COMP;
       }
       parts {
          part { name: "button_image";
                color: BUTTON_CIRCLE_STYLE_DISABLED_COLOR_INC;
             }
          }
-         part { name: "over1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+              description { state: "default" 0.0;
+                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
+                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC;
+                 visible: 0;
+                 rel1.to : "button_image";
+                 rel2.to : "button_image";
+                 image {
+                  normal: "00_circle_button_focus.png";
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "over1";
+            type: RECT;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
          }
          part { name: "over2";
             type: RECT;
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.content";
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
       }
    }
 
 #define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
    group { name: "elm/button/base/contacts/"style_name; \
    alias: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
       images { \
          image: "00_circle_button.png" COMP; \
          image: "00_circle_button_press.png" COMP; \
          image: "00_circle_button_dim.png" COMP; \
-         image: edit_normal COMP; \
-         image: edit_press COMP; \
+         image: image_normal COMP; \
+         image: image_press COMP; \
+         image: 00_circle_button_focus.png COMP;\
       } \
       parts { \
          part { name: "button_image"; \
                inherit: "default" 0.0; \
             } \
          } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+              description { state: "default" 0.0; \
+                 min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
+                 visible: 0; \
+                 rel1.to : "button_image"; \
+                 rel2.to : "button_image"; \
+                 image { \
+                  normal: "00_circle_button_focus.png"; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "icon_clipper"; \
             scale: 1; \
             type: RECT; \
             target: "button_center_part"; \
             target: "icon_clipper"; \
          } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
       } \
    }
 ///////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////
 #define BUTTON_SCROLL_JUMPTO(style_name, image_normal)\
    group { name: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
       images { \
          image: "00_button_01.png" COMP; \
          image: "00_button_01_press.png" COMP; \
          image: "00_button_01_dim.png" COMP; \
          image: image_normal COMP; \
+         image: "00_button_01_focus.png" COMP; \
       }\
       parts { \
          part { name: "button_image";\
                image.normal: "00_button_01_dim.png"; \
             } \
          } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               visible: 0; \
+               rel1.to : "button_image"; \
+               rel2.to : "button_image"; \
+               image { \
+                  normal: "00_button_01_focus.png"; \
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "padding_left_top"; \
             type: SPACER; \
             scale: 1; \
             scale: 1; \
             description { state: "default" 0.0; \
                min: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
-               max: 45 45; \
+               max: BUTTON_DEFAULT_STYLE_ICONONLY_ICON_MIN_INC; \
                rel1 { \
                   relative: 1.0 0.0; \
                   to_x: "padding_left_top"; \
             target: "button_image"; \
             target: "jump_image"; \
          } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
       } \
    }
 
@@ -3284,10 +3495,28 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
 
 ////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/default";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_button_01.png" COMP;
          image: "00_button_01_press.png" COMP;
          image: "00_button_01_dim.png" COMP;
+         image: "00_button_01_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_default";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_default_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_DEFAULT_STYLE_FONT_SIZE_INC" align=center color="BUTTON_DEFAULT_STYLE_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3316,6 +3545,25 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                image.normal: "00_button_01_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_DEFAULT_STYLE_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_left_top";
             type: RECT;
             scale: 1;
@@ -3402,11 +3650,10 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             clip_to: "disclip";
-            effect: SHADOW BOTTOM;
             description { state: "default" 0.0;
                visible: 0;
                align: 0.0 0.5;
@@ -3419,13 +3666,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                   relative: 0.0 0.0;
                   to: "padding_right_bottom";
                }
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_DEFAULT_STYLE_FONT_SIZE_INC;
-                  min: 0 0;
-                  text_class: "tizen";
+                  style: "btn_base_default";
                }
             }
             description { state: "visible" 0.0;
@@ -3437,7 +3679,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                inherit: "default" 0.0;
                visible: 1;
                min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
-               color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_default_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -3445,7 +3689,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_DEFAULT_STYLE_BUTTON_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
                visible: 1;
                min: BUTTON_DEFAULT_STYLE_TEXT_MIN_INC;
             }
@@ -3649,23 +3892,17 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
@@ -3784,12 +4021,16 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
 ///////////////////////////////////////////////////////////////////////////////////////
 #define BUTTON_COLORSELECTOR_STYLES(style_name, image_normal, image_press) \
    group { name: "elm/button/base/"style_name; \
+      data { \
+         item: "focus_highlight" "on"; \
+      } \
       images { \
          image: image_normal COMP; \
          image: image_press COMP; \
          image: image_dim COMP; \
          image: "00_button_01.png" COMP; \
          image: "00_button_01_press.png" COMP; \
+         image: "00_button_01_focus.png" COMP; \
       } \
       parts { \
          part { name: "button_image"; \
@@ -3819,6 +4060,27 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                image.normal: "00_button_01_press.png"; \
             } \
          } \
+         part { name: "focus_image"; \
+            scale: 1; \
+            mouse_events: 0; \
+            repeat_events: 1; \
+            description { state: "default" 0.0; \
+               min: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
+               max: BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC; \
+               visible: 0; \
+               rel1.to : "button_image"; \
+               rel2.to : "button_image"; \
+               image { \
+                  normal: "00_button_01_focus.png"; \
+                  border: BUTTON_COLORSELECTOR_BG_BORDER_INC; \
+                  border_scale: 1; \
+               } \
+            } \
+            description { state: "focused" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+            } \
+         } \
          part { name: "button_center_part"; \
             scale: 1; \
             clip_to: "icon_clipper"; \
@@ -3933,6 +4195,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             target: "button_center_part"; \
             target: ""icon_clipper""; \
          } \
+         program { name: "action_focus"; \
+            signal: "elm,action,focus_highlight,show"; \
+            source: "elm"; \
+            action: STATE_SET "focused" 0.0; \
+            target: "focus_image"; \
+         } \
+         program { name: "action_unfocus"; \
+            signal: "elm,action,focus_highlight,hide"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "focus_image"; \
+         } \
       } \
    }
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -3943,9 +4217,27 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
 
    group { name: "elm/button/base/multibuttonentry";
       alias: "elm/button/base/text_only/multibuttonentry";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_contacts_button.png" COMP;
          image: "00_contacts_button_press.png" COMP;
+         image: "00_contacts_button_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_multibuttonentry";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_multibuttonentry_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_CONTACT_FONT_SIZE_INC" align=center color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_CONTACT_BUTTON_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -3981,6 +4273,25 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                image.normal: "00_contacts_button_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_contacts_button_focus.png";
+                  border: BUTTON_CONTACT_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding.left";
             type: RECT;
             scale: 1;
@@ -4011,19 +4322,16 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                align: 0.0 0.0;
             }
          }
-         part {   name: "elm.text";
-            type: TEXT;
+         part { name: "elm.text";
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_CONTACT_FONT_SIZE_INC;
+                  style: "btn_base_multibuttonentry";
                   min: 1 1;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
@@ -4035,7 +4343,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                inherit: "default" 0.0;
                visible: 1;
                min: 1 1;
-               color: BUTTON_CONTACT_BUTTON_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_multibuttonentry_pressed";
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -4196,20 +4506,17 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
@@ -4218,9 +4525,13 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
    group { name: "elm/button/base/naviframe/back_btn/default";
       alias: "elm/button/base/naviframe/prev_btn/default";
       alias: "elm/button/base/naviframe/end_btn/default";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_icon_back.png" COMP;
          image: "00_icon_SIP_close.png" COMP;
+         image: "00_icon_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
@@ -4237,6 +4548,24 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                visible: 0;
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_icon_focus.png";
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "back_button";
             scale: 1;
             mouse_events: 0;
@@ -4387,32 +4716,48 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             action: STATE_SET "default" 0.0;
             target: "back_button";
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
       }
    }
 
 //////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/toolbar/default";
+/*   group { name: "elm/button/base/naviframe/toolbar/default";
       alias: "elm/button/base/naviframe/title/default";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_toolbar_button.png" COMP;
          image: "00_toolbar_button_press.png" COMP;
          image: "00_toolbar_button_dim.png" COMP;
+         image: "00_toolbar_button_focus.png" COMP;
       }
       styles{
          style { name: "btn_naviframe_toolbar";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
          style { name: "btn_naviframe_toolbar_pressed";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_PRESSED_COLOR_INC" style=shadow,top shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_PRESSED_COLOR_INC" style=shadow,top shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
          }
          style { name: "btn_naviframe_toolbar_disabled";
-            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_DISABLED_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TOOLBAR_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_DISABLED_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TEXTBLOCK_SHADOW_DIM_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -4427,16 +4772,16 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
                fixed: 1 1;
                rel1.to: "padding_text_left_top";
                rel2.to: "padding_text_right_bottom";
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
             }
          }
          part { name: "button_image";
@@ -4446,7 +4791,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                rel2.to: "button_bg";
                image {
                   normal: "00_toolbar_button.png";
-                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  border: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_PRESSED_BORDER_INC;
                   border_scale: 1;
                }
             }
@@ -4463,6 +4808,25 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                image.normal: "00_toolbar_button_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_toolbar_button_focus.png";
+                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_left_top";
             type: RECT;
             scale: 1;
@@ -4471,7 +4835,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                visible: 0;
                align: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
             }
          }
@@ -4482,7 +4846,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             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_TOOLBAR_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -4493,7 +4857,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             mouse_events: 0;
             description { state: "default" 0.0;
                visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                rel1.to: "elm.text";
                rel2 {
@@ -4508,7 +4872,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             scale: 1;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_PADDING_MIN_INC;
                fixed: 1 1;
                visible: 0;
                rel1 {
@@ -4527,7 +4891,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -4545,7 +4909,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -4787,18 +5151,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                if (get_int(landscape_state) != BUTTON_LANDSCAPE_DISABLED)
                  {
                     get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "landscape_disabled_visible"))
-                      set_state(PART:"elm.text", "landscape_visible", 0.0);
-                    else
+                    if (!strcmp(st, "landscape_disabled"))
                       set_state(PART:"elm.text", "landscape", 0.0);
+                    else
+                      set_state(PART:"elm.text", "landscape_visible", 0.0);
                  }
                else
                  {
                     get_state(PART:"elm.text", st, 30, vl);
-                    if (!strcmp(st, "disabled_visible"))
-                      set_state(PART:"elm.text", "visible", 0.0);
-                    else
+                    if (!strcmp(st, "disabled"))
                       set_state(PART:"elm.text", "default", 0.0);
+                    else
+                      set_state(PART:"elm.text", "visible", 0.0);
                  }
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
@@ -4865,20 +5229,17 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             signal: "elm,state,orient,180";
             action: SIGNAL_EMIT "elm,state,portrait" "elm";
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
@@ -4891,8 +5252,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
                fixed: 1 1;
                rel1.to: "padding_text_left_top";
                rel2.to: "padding_text_right_bottom";
@@ -4900,8 +5261,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
             }
          }
          part { name: "elm.text";
@@ -4912,7 +5273,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -4931,7 +5292,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -5001,8 +5362,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_BG_NORMAL_MAX_INC;
                fixed: 1 1;
                rel1.to: "padding_text_left_top";
                rel2.to: "padding_text_right_bottom";
@@ -5010,8 +5371,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
-               max: BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC;
+               max: BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC;
             }
          }
          part { name: "elm.text";
@@ -5022,7 +5383,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "default" 0.0;
                visible: 0;
                fixed: 1 1;
-               min: BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_TEXTBLOCK_MIN_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -5041,7 +5402,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "landscape" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC;
+               min: BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC;
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
@@ -5102,234 +5463,80 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          }
       }
    }
-
+*/
 ////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/toolbar/segmentedcontrol";
-      images {
-         image: "00_toolbar_button.png" COMP;
-         image: "00_toolbar_button_press.png" COMP;
-         image: "00_toolbar_button_dim.png" COMP;
-         image: "00_button_icon_arrow.png" COMP;
-         image: "00_button_icon_arrow_press.png" COMP;
-      }
-      styles{
-         style { name: "btn_toolbar_segmentedcontrol";
-            base: "font=Tizen:style=Bold font_size="BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC" align=center color=#ffffff ellipsis=1.0 wrap=none text_class=tizen";
-            tag: "br" "\n";
-            tag: "ps" "ps";
-            tag: "tab" "\t";
-         }
+   group { name: "elm/button/base/naviframe/title_icon";
+      data {
+         item: "focus_highlight" "on";
       }
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
+      images {
+         image: "00_icon_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC;
-               max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC;
-               fixed: 1 1;
-               rel1.to: "padding_text_left_top";
-               rel2.to: "padding_text_right_bottom";
-               image {
-                  normal: "00_toolbar_button.png";
-                  border: BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC;
-                  border_scale: 1;
-               }
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_dim.png";
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_toolbar_button_press.png";
-            }
-         }
-         part { name: "padding_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.0;
-               rel2.relative: 0.0 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC;
-               fixed: 1 1;
-            }
-         }
-         part { name: "padding_right_bottom";
             type: RECT;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1.relative: 1.0 1.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC;
-               fixed: 1 1;
                visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
             }
-         }
-         part { name: "padding_text_left_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
+            description { state: "landscape" 0.0;
                visible: 0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC;
-               fixed: 1 1;
-               rel1.to: "elm.text";
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "elm.text";
-               }
-               align: 1.0 0.0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
             }
          }
-         part { name: "padding_text_right_bottom";
-            type: RECT;
+         part { name: "focus_image";
             scale: 1;
             mouse_events: 0;
-            description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC;
-               fixed: 1 1;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "icon";
-                  to_y: "elm.text";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "icon";
-                  to_y: "elm.text";
-               }
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            clip_to: "disclip";
-            mouse_events: 0;
-            effect: FAR_SHADOW BOTTOM;
-            scale: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
                visible: 0;
-               fixed: 1 1;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to: "padding_left_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to: "padding_right_bottom";
-               }
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
-               text {
-                  min: 0 1;
-                  max: 1 1;
-                  style: "btn_toolbar_segmentedcontrol";
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_icon_focus.png";
+                  border_scale: 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;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
-               visible: 1;
-            }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: BUTTON_NAVIFRAME_TITLE_TEXT_FOCUSED_COLOR_INC;
             }
          }
-         part { name: "icon_padding";
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
             scale: 1;
-            type: RECT;
+            clip_to: "elm.icon.clipper";
             description { state: "default" 0.0;
-               min: 6 5;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "elm.text";
-               }
                visible: 0;
-               rel2.to: "elm.text";
-            }
-         }
-         part { name: "icon";
-            scale: 1;
-            clip_to: "icon_clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC;
-               max: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "icon_padding";
-                  to_y: "elm.text";
-                  offset: 0 6;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "icon_padding";
-                  to_y: "elm.text";
-               }
-               image.normal: "00_button_icon_arrow.png";
+               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
+               align: 0.5 0.5;
+               rel1 { to: "button_image"; }
+               rel2 { to: "button_image"; }
             }
-            description { state: "clicked" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_icon_arrow_press.png";
+               visible: 1;
             }
          }
-         part { name: "icon_clipper";
+         part { name: "elm.icon.clipper";
             type: RECT;
             description { state: "default" 0.0;
-               color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC;
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: BUTTON_DISCLIP_NORMAL_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_DISCLIP_DISABLED_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
          part { name: "over2";
             type: RECT;
-            repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
@@ -5337,16 +5544,12 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
             }
          }
          part { name: "disabler";
             type: RECT;
             description { state: "default" 0.0;
-               rel1.to: "button_image";
-               rel2.to: "button_image";
                color: 0 0 0 0;
                visible: 0;
             }
@@ -5364,11 +5567,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             after: "button_click_anim";
          }
          program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "elm.text";
-            target: "icon";
-            target: "icon_clipper";
+            script {
+               set_state(PART:"elm.icon.clipper", "clicked", 0.0);
+            }
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
@@ -5381,20 +5582,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_mouseout_clicked";
             signal: "mouse,up,1";
             source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "clicked") || !strcmp(st, "focused"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-               set_state(PART:"icon", "default", 0.0);
-               set_state(PART:"icon_clipper", "default", 0.0);
-            }
+            action: STATE_SET "default" 0.0;
+            target: "elm.icon.clipper";
             after: button_unpress;
          }
          program { name: "touch_snd";
@@ -5406,166 +5595,171 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
+         program { name: "icon_show";
+            signal: "elm,state,icon,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);
-            }
+            action: STATE_SET "visible" 0.0;
+            target: "elm.swallow.content";
          }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "elm.text";
+            target: "elm.swallow.content";
          }
          program { name: "disable";
             signal: "elm,state,disabled";
             source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
+               set_state(PART:"disabler", "disabled", 0.0);
+               set_state(PART:"elm.icon.clipper", "disabled", 0.0);
             }
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disclip";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
             script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
+               set_state(PART:"disabler", "default", 0.0);
+               set_state(PART:"elm.icon.clipper", "default", 0.0);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
-            action: STATE_SET "focused" 0.0;
+         program { name: "change_to_landscape";
+            signal: "elm,state,landscape";
+            source: "elm";
+            action: STATE_SET "landscape" 0.0;
             target: "button_image";
-            target: "elm.text";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "change_to_portrait";
+            signal: "elm,state,portrait";
+            source: "elm";
             action: STATE_SET "default" 0.0;
             target: "button_image";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+         }
+         program { name: "landscape_mode";
+            source: "elm";
+            signal: "elm,state,orient,90";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "landscape_mode2";
+            source: "elm";
+            signal: "elm,state,orient,270";
+            action: SIGNAL_EMIT "elm,state,landscape" "elm";
+         }
+         program { name: "portrait_mode";
+            source: "elm";
+            signal: "elm,state,orient,0";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "portrait_mode2";
+            source: "elm";
+            signal: "elm,state,orient,180";
+            action: SIGNAL_EMIT "elm,state,portrait" "elm";
+         }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
          }
       }
    }
 
 ////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/naviframe/title_icon";
-      parts {
-         part { name: "button_image";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC;
-            }
-            description { state: "landscape" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
-            }
+   group { name: "elm/button/base/naviframe/title_text";
+      images {
+         image: "00_title_press.png" COMP;
+      }
+      styles{
+         style { name: "btn_naviframe_title_text";
+            base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
          }
-         part { name: "top_padding";
+      }
+      parts {
+         part { name: "button_bg";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-               min: BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC;
-               fixed: 0 1;
-               align: 0 0;
-               rel1 { relative: 0.0 0.0; to: "button_image"; }
-               rel2 { relative: 1.0 0.0; to: "button_image"; }
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_BG_MAX_INC;
             }
             description { state: "landscape" 0.0;
-               inherit: "default" 0.0;
-               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MIN_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_MAX_INC;
             }
          }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
+         part { name: "button_image";
+            type: IMAGE;
             scale: 1;
-            clip_to: "elm.icon.clipper";
             description { state: "default" 0.0;
                visible: 0;
-               max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.5 0.0;
-               rel1 { relative: 0.0 1.0; to: "top_padding"; }
-               rel2 { relative: 1.0 1.0; to: "button_image"; }
+               rel1 { to: "button_bg"; }
+               rel2 { to: "button_bg"; }
             }
-            description { state: "visible" 0.0;
+            description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                visible: 1;
+               image {
+                  normal: "00_title_press.png";
+                  border: BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC;
+                  border_scale: 1;
+               }
             }
          }
-         part { name: "elm.swallow.icon.proxy";
-            type: PROXY;
+         part { name: "left_padding";
+            type: RECT;
             scale: 1;
-            clip_to: "elm.icon.proxy.clipper";
             description { state: "default" 0.0;
-                source: "elm.swallow.content";
-                rel1.to: "elm.swallow.content";
-                rel1.offset: 0 -2;
-                rel2.to: "elm.swallow.content";
-                rel2.offset: 0 -2;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC -1;
+               align: 0.0 0.5;
+               fixed: 1 0;
+               rel1 { relative: 0.0 0.0; to: "button_bg"; }
+               rel2 { relative: 0.0 1.0; to: "button_bg"; }
             }
          }
-         part { name: "elm.icon.proxy.clipper";
+         part { name: "right_padding";
             type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
+               visible: 0;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC 0;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_LEFT_PADDING_INC -1;
+               align: 1.0 0.5;
+               fixed: 1 0;
+               rel1 { relative: 1.0 0.0; to: "button_bg"; }
+               rel2 { relative: 1.0 1.0; to: "button_bg"; }
             }
          }
-         part { name: "elm.icon.clipper";
-            type: RECT;
+         part { name: "elm.text";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            clip_to: "button_bg";
             description { state: "default" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC;
+               min: BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MIN_INC;
+               max: BUTTON_NAVIFRAME_TITLE_TEXT_TEXTBLOCK_MAX_INC;
+               rel1 { relative: 1.0 0.0; to: "left_padding"; }
+               rel2 { relative: 0.0 1.0; to: "right_padding"; }
+               text {
+                  style: "btn_naviframe_title_text";
+                  size: BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC;
+                  min: 1 0;
+               }
             }
-            description { state: "disabled" 0.0;
-               color: BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC;
+            description { state: "landscape" 0.0;
+               inherit: "default" 0.0;
+               min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MIN_INC;
+               max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_TEXT_TEXTBLOCK_MAX_INC;
             }
          }
          part { name: "over2";
@@ -5603,8 +5797,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
          }
          program { name: "button_click_anim";
             script {
-               set_state(PART:"elm.icon.clipper", "clicked", 0.0);
-               set_state(PART:"elm.icon.proxy.clipper", "clicked", 0.0);
+               set_state(PART:"button_image", "clicked", 0.0);
             }
          }
          program { name: "button_double_click";
@@ -5612,71 +5805,43 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             source: "over2";
             after: "button_click_anim";
          }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            action: STATE_SET "default" 0.0;
-            target: "elm.icon.clipper";
-            target: "elm.icon.proxy.clipper";
-            after: button_unpress;
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            script {
-               set_state(PART:"disabler", "disabled", 0.0);
-               set_state(PART:"elm.icon.clipper", "disabled", 0.0);
-               set_state(PART:"elm.icon.proxy.clipper", "disabled", 0.0);
-            }
+         program { name: "button_unclick";
+            signal: "mouse,up,1";
+            source: "over3";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+            after: "button_unclick_anim";
          }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
+         program { name: "button_unclick_anim";
             script {
-               set_state(PART:"disabler", "default", 0.0);
-               set_state(PART:"elm.icon.clipper", "default", 0.0);
-               set_state(PART:"elm.icon.proxy.clipper", "default", 0.0);
+               set_state(PART:"button_image", "default", 0.0);
             }
          }
+         program { name: "touch_snd";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: "button_unclick3";
+         }
+         program { name: "button_unclick3";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
          program { name: "change_to_landscape";
             signal: "elm,state,landscape";
             source: "elm";
-            action: STATE_SET "landscape" 0.0;
-            target: "button_image";
-            target: "top_padding";
+            script {
+               set_state(PART:"button_bg", "landscape", 0.0);
+               set_state(PART:"elm.text", "landscape", 0.0);
+            }
          }
          program { name: "change_to_portrait";
             signal: "elm,state,portrait";
             source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "top_padding";
+            script {
+               set_state(PART:"button_bg", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+            }
          }
-/*         program { name: "landscape_mode";
+         program { name: "landscape_mode";
             source: "elm";
             signal: "elm,state,orient,90";
             action: SIGNAL_EMIT "elm,state,landscape" "elm";
@@ -5695,14 +5860,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             source: "elm";
             signal: "elm,state,orient,180";
             action: SIGNAL_EMIT "elm,state,portrait" "elm";
-         } */
+         }
       }
    }
 
 /////////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe/more/default";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_icon_more.png" COMP;
+         image: "00_icon_focus.png" COMP;
       }
       parts {
          part { name: "button_image";
@@ -5719,6 +5888,24 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                visible: 0;
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_icon_focus.png";
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "more_image";
             scale: 1;
             mouse_events: 0;
@@ -5855,6 +6042,18 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             signal: "elm,state,orient,180";
             action: SIGNAL_EMIT "elm,state,portrait" "elm";
          }
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "focus_image";
+         }
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "focus_image";
+         }
       }
    }
 
@@ -6319,11 +6518,29 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/expandable_number";
       alias: "elm/button/base/text_only/expandable_number";
+      data {
+         item: "focus_highlight" "on";
+      }
       images {
          image: "00_button_01.png" COMP;
          image: "00_button_01_press.png" COMP;
          image: "00_button_01_dim.png" COMP;
          image: "00_arrow_expand.png" COMP;
+         image: "00_button_01_focus.png" COMP;
+      }
+      styles{
+         style { name: "btn_base_exapandable_number";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
+         style { name: "btn_base_exapandable_number_pressed";
+            base: "font=Tizen:style=Regular font_size="BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC" align=center color="BUTTON_NUMBER_TEXTBLOCK_PRESSED_COLOR_INC" style=far_shadow,top shadow_color="BUTTON_TEXT_SHADOW_TEXTBLOCK_PRESSED_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen";
+            tag: "br" "\n";
+            tag: "ps" "ps";
+            tag: "tab" "\t";
+         }
       }
       script {
          public button_state = BUTTON_STATE_ENABLED;
@@ -6353,6 +6570,27 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                image.normal: "00_button_01_press.png";
             }
          }
+         part { name: "focus_image";
+            scale: 1;
+            mouse_events: 0;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               min: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
+               max: BUTTON_EXPANDABLE_NUMBER_BG_NORMAL_MIN_MAX_INC;
+               visible: 0;
+               rel1.to : "button_image";
+               rel2.to : "button_image";
+               image {
+                  normal: "00_button_01_focus.png";
+                  border: BUTTON_EXPANDABLE_NUMBER_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
          part { name: "padding_left_top";
             type: RECT;
             scale: 1;
@@ -6413,9 +6651,8 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
-            effect: SHADOW BOTTOM;
             scale: 1;
             description { state: "default" 0.0;
                min: BUTTON_EXPANDABLE_NUMBER_TEXT_MIN_MAX_INC;
@@ -6431,15 +6668,11 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                   to_y:"padding_right_bottom";
                }
                align: 0.0 0.5;
-               color: BUTTON_NUMBER_TEXT_NORMAL_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC;
                text {
-                  font: "Tizen:style=Regular";
-                  size: BUTTON_EXPANDABLE_NUMBER_FONT_SIZE_INC;
+                  style: "btn_base_exapandable_number";
                   min: 0 0;
                   fit: 1 1;
                   size_range: 28 32;
-                  text_class: "tizen";
                }
             }
             description { state: "visible" 0.0;
@@ -6447,7 +6680,12 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NUMBER_TEXT_PRESSED_COLOR_INC;
+               text {
+                  style: "btn_base_exapandable_number_pressed";
+                  min: 0 0;
+                  fit: 1 1;
+                  size_range: 28 32;
+               }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -6455,7 +6693,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_NUMBER_TEXT_DISABLE_VISIBLE_COLOR_INC;
-               color2: BUTTON_TEXT_SHADOW_DIM_COLOR_INC;
             }
             description { state: "focused" 0.0;
                inherit: "default" 0.0;
@@ -6613,23 +6850,17 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                set_int(button_state, BUTTON_STATE_ENABLED);
             }
          }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
+         program { name: "action_focus";
+            signal: "elm,action,focus_highlight,show";
+            source: "elm";
             action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
+            target: "focus_image";
          }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
+         program { name: "action_unfocus";
+            signal: "elm,action,focus_highlight,hide";
+            source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
+            target: "focus_image";
          }
       }
    }
@@ -6918,164 +7149,20 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
                visible: 1;
             }
             description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////
-group { name: "elm/button/base/bubble_circle/receive";
-      images {
-         image: "00_messagebubble_circle_receive.png" COMP;
-         image: "00_messagebubble_circle_receive_press.png" COMP;
-         image: "00_messagebubble_circle_receive_dim.png" COMP;
-         image: "00_button_right.png" COMP;
-         image: "00_button_right_press.png" COMP;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               max: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               image.normal: "00_messagebubble_circle_receive.png";
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_receive_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_receive_dim.png";
-            }
-         }
-         part { name: "image";
-            scale: 1;
-            clip_to: "icon_clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
-               max: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
-               image.normal: "00_button_right.png";
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "00_button_right_press.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "icon_clipper";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_NORMAL_COLOR_INC;
-            }
-            description { state: "clicked" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_DISABLED_COLOR_INC;
-            }
-         }
-         part { name: "over1";
-            type: RECT;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over1";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            target: "image";
-            target: "icon_clipper";
-         }
-         program { name: "button_double_click";
-            signal: "mouse,down,1,double";
-            source: "over1";
-            after: "button_click_anim";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-            after: "button_unclick_anim";
-         }
-         program { name: "button_unclick_anim";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "image";
-            target: "icon_clipper";
-         }
-         program { name: "touch_snd";
-            signal: "mouse,clicked,1";
-            source: "over1";
-            action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: button_unclick3;
-         }
-         program { name: "button_unclick3";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
-            
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disabler";
-            target: "button_image";
-            target: "icon_clipper";
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_RECEIVE_BUBBLE_TEXT_FOCUSED_COLOR_INC;
+            }
          }
       }
    }
 
 ///////////////////////////////////////////////////////////////////////
-group { name: "elm/button/base/bubble_circle/sent";
+group { name: "elm/button/base/bubble_circle/receive";
       images {
-         image: "00_messagebubble_circle_sent.png" COMP;
-         image: "00_messagebubble_circle_sent_press.png" COMP;
-         image: "00_messagebubble_circle_sent_dim.png" COMP;
+         image: "00_messagebubble_circle_receive.png" COMP;
+         image: "00_messagebubble_circle_receive_press.png" COMP;
+         image: "00_messagebubble_circle_receive_dim.png" COMP;
          image: "00_button_right.png" COMP;
          image: "00_button_right_press.png" COMP;
       }
@@ -7085,17 +7172,17 @@ group { name: "elm/button/base/bubble_circle/sent";
             description { state: "default" 0.0;
                min: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
                max: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
-               image.normal: "00_messagebubble_circle_sent.png";
+               image.normal: "00_messagebubble_circle_receive.png";
             }
             description {
                state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_sent_press.png";
+               image.normal: "00_messagebubble_circle_receive_press.png";
             }
             description {
                state: "disabled" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_messagebubble_circle_sent_dim.png";
+               image.normal: "00_messagebubble_circle_receive_dim.png";
             }
          }
          part { name: "image";
@@ -7120,13 +7207,13 @@ group { name: "elm/button/base/bubble_circle/sent";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_NORMAL_COLOR_INC;
+               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_NORMAL_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC;
+               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC;
+               color: BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_DISABLED_COLOR_INC;
             }
          }
          part { name: "over1";
@@ -7201,6 +7288,7 @@ group { name: "elm/button/base/bubble_circle/sent";
             target: "disabler";
             target: "button_image";
             target: "icon_clipper";
+            
          }
          program { name: "enable";
             signal: "elm,state,enabled";
@@ -7213,60 +7301,73 @@ group { name: "elm/button/base/bubble_circle/sent";
       }
    }
 
-//////////////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/button/base/editfield_rename";
+///////////////////////////////////////////////////////////////////////
+group { name: "elm/button/base/bubble_circle/sent";
       images {
-         image: "00_edit_field_rename.png" COMP;
+         image: "00_messagebubble_circle_sent.png" COMP;
+         image: "00_messagebubble_circle_sent_press.png" COMP;
+         image: "00_messagebubble_circle_sent_dim.png" COMP;
+         image: "00_button_right.png" COMP;
+         image: "00_button_right_press.png" COMP;
       }
       parts {
          part { name: "button_image";
-            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
+               min: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
+               max: BUTTON_BUBBLE_CIRCLE_BG_MIN_MAX_INC;
+               image.normal: "00_messagebubble_circle_sent.png";
             }
-            description { state: "disabled" 0.0;
+            description {
+               state: "clicked" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_messagebubble_circle_sent_press.png";
             }
-            description { state: "focused" 0.0;
+            description {
+               state: "disabled" 0.0;
                inherit: "default" 0.0;
+               image.normal: "00_messagebubble_circle_sent_dim.png";
             }
          }
-         part { name: "rename_button";
+         part { name: "image";
             scale: 1;
-            mouse_events: 0;
-            clip_to: "rename_button.clipper";
+            clip_to: "icon_clipper";
             description { state: "default" 0.0;
-               min: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC;
-               max: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               image.normal: "00_edit_field_rename.png";
+               min: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
+               max: BUTTON_BUBBLE_CIRCLE_IMAGE_MIN_MAX_INC;
+               image.normal: "00_button_right.png";
+            }
+            description {
+               state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_right_press.png";
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
             }
          }
-         part { name: "rename_button.clipper";
+         part { name: "icon_clipper";
             type: RECT;
+            scale: 1;
             description { state: "default" 0.0;
-               color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC;
+               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_NORMAL_COLOR_INC;
             }
             description { state: "clicked" 0.0;
-               color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC;
+               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_PRESSED_COLOR_INC;
             }
             description { state: "disabled" 0.0;
-               color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC;
+               color: BUTTON_BUBBLE_CIRCLE_SENT_ICON_DISABLED_COLOR_INC;
             }
          }
-         part { name: "over2";
+         part { name: "over1";
             type: RECT;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
                color: 0 0 0 0;
             }
          }
-         part { name: "over3";
+         part { name: "over2";
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
@@ -7288,14 +7389,15 @@ group { name: "elm/button/base/bubble_circle/sent";
       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: "rename_button.clipper";
+            target: "image";
+            target: "icon_clipper";
          }
          program { name: "button_double_click";
             signal: "mouse,down,1,double";
@@ -7304,20 +7406,21 @@ group { name: "elm/button/base/bubble_circle/sent";
          }
          program { name: "button_unclick";
             signal: "mouse,up,1";
-            source: "over3";
+            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: "rename_button.clipper";
+            target: "image";
+            target: "icon_clipper";
          }
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
-            source: "over2";
+            source: "over1";
             action: PLAY_SAMPLE "touch_sound" 1.0;
-            after: "button_unclick3";
+            after: button_unclick3;
          }
          program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
@@ -7326,20 +7429,22 @@ group { name: "elm/button/base/bubble_circle/sent";
             signal: "elm,state,disabled";
             source: "elm";
             action: STATE_SET "disabled" 0.0;
-            target: "button_image";
             target: "disabler";
-            target: "rename_button.clipper";
+            target: "button_image";
+            target: "icon_clipper";
          }
          program { name: "enable";
             signal: "elm,state,enabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "button_image";
             target: "disabler";
-            target: "rename_button.clipper";
+            target: "button_image";
+            target: "icon_clipper";
          }
       }
    }
+
+//////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/editfield_clear";
       images {
          image: "00_edit_field_clear.png" COMP;
@@ -7369,7 +7474,7 @@ group { name: "elm/button/base/bubble_circle/sent";
                min: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
                max: BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC;
                fixed: 1 1;
-               align: 0.0 0.5;
+               align: 0.5 0.5;
                image.normal: "00_edit_field_clear.png";
             }
          }
@@ -7467,160 +7572,6 @@ group { name: "elm/button/base/bubble_circle/sent";
       }
    }
 
-   group { name: "elm/button/base/focus";
-      parts {
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         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;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-         }
-         program { name: "button_unclick";
-            signal: "mouse,up,1";
-            source: "over3";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_click3";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-      }
-   }
-
-#define BUTTON_DIALOGUE_FOCUS_STYLES(style_name, image_normal) \
-   group { name: "elm/button/base/"style_name; \
-      data { \
-         item: "focus_highlight" "on"; \
-      } \
-      images { \
-         image: image_normal COMP; \
-      } \
-      parts { \
-         part { name: "focus_image_left_padding"; \
-            type: SPACER; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               fixed: 1 0; \
-               min: BUTTON_FOCUS_DIALOGUE_LEFT_PADDING_INC; \
-               rel2.relative: 0.0 1.0; \
-               align: 0.0 0.5; \
-            } \
-         } \
-         part { name: "focus_image_right_padding"; \
-            type: SPACER; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               fixed: 1 0; \
-               min: BUTTON_FOCUS_DIALOGUE_RIGHT_PADDING_INC; \
-               rel1.relative: 1.0 0.0; \
-               align: 1.0 0.5; \
-            } \
-         } \
-         part { name: "elm.swallow.content"; \
-            type: SWALLOW; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-            } \
-         } \
-         part { name: "focus_image"; \
-            scale: 1; \
-            mouse_events: 0; \
-            repeat_events: 1; \
-            description { state: "default" 0.0; \
-               visible: 0; \
-               rel1 { \
-                  relative: 1.0 0.0; \
-                  to_x: "focus_image_left_padding"; \
-               } \
-               rel2 { \
-                  relative: 0.0 1.0; \
-                  to_x: "focus_image_right_padding"; \
-               } \
-               image { \
-                  normal: image_normal; \
-                  border: 6 6 6 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "focused" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
-         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; \
-            } \
-         } \
-      } \
-      programs { \
-         program { name: "button_click"; \
-            signal: "mouse,down,1"; \
-            source: "over2"; \
-            action: SIGNAL_EMIT "elm,action,press" ""; \
-         } \
-         program { name: "button_unclick"; \
-            signal: "mouse,up,1"; \
-            source: "over3"; \
-            action: SIGNAL_EMIT "elm,action,unpress" ""; \
-         } \
-         program { name: "button_click3"; \
-            signal: "mouse,clicked,1"; \
-            source: "over2"; \
-            action: SIGNAL_EMIT "elm,action,click" ""; \
-         } \
-         program { name: "action_focus"; \
-            signal: "elm,action,focus_highlight,show"; \
-            source: "elm"; \
-            action: STATE_SET "focused" 0.0; \
-            target: "focus_image"; \
-         } \
-         program { name: "action_unfocus"; \
-            signal: "elm,action,focus_highlight,hide"; \
-            source: "elm"; \
-            action: STATE_SET "default" 0.0; \
-            target: "focus_image"; \
-         } \
-      } \
-   } \
-
-BUTTON_DIALOGUE_FOCUS_STYLES("dialogue_focus_top", "00_list_group_bg_top_focus.png")
-BUTTON_DIALOGUE_FOCUS_STYLES("dialogue_focus_center", "00_list_group_bg_center_focus.png")
-BUTTON_DIALOGUE_FOCUS_STYLES("dialogue_focus_bottom", "00_list_group_bg_bottom_focus.png")
-
 #define BUTTON_DEFAULT_FOCUS_STYLES(style_name, image_normal) \
    group { name: "elm/button/base/"style_name; \
       data { \
@@ -7700,6 +7651,7 @@ BUTTON_DIALOGUE_FOCUS_STYLES("dialogue_focus_bottom", "00_list_group_bg_bottom_f
       } \
    } \
 
+BUTTON_DEFAULT_FOCUS_STYLES("focus", "00_focus.png")
 BUTTON_DEFAULT_FOCUS_STYLES("focus_top", "00_list_group_bg_top_focus.png")
 BUTTON_DEFAULT_FOCUS_STYLES("focus_center", "00_list_group_bg_center_focus.png")
 BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
@@ -7774,6 +7726,7 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
          program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
             after: "button_unclick3";
          }
          program { name: "button_unclick3";
@@ -7795,26 +7748,12 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
          }
       }
    }
-   group { name: "elm/button/base/search_rename";
-      inherit: "elm/button/base/editfield_rename";
-      parts {
-         part { name: "rename_button";
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "rename_button.clipper";
-            description { state: "default" 0.0;
-               min: BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC;
-               max: BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC;
-               fixed: 1 1;
-               align: 0.5 0.5;
-               image.normal: "00_edit_field_rename.png";
-            }
-         }
-      }
-   }
 
    group { name: "elm/button/base/search_clear";
       inherit: "elm/button/base/editfield_clear";
+      images {
+         image: "00_field_btn_clear.png" COMP;
+      }
       parts {
          part { name: "clear_button";
             scale: 1;
@@ -7825,7 +7764,19 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png")
                max: BUTTON_SEARCH_CLEAR_BUTTON_MIN_MAX_INC;
                fixed: 1 1;
                align: 0.5 0.5;
-               image.normal: "00_edit_field_clear.png";
+               image.normal: "00_field_btn_clear.png";
+            }
+         }
+         part { name: "clear_button.clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC;
+            }
+            description { state: "clicked" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               color: BUTTON_SEARCH_CLEAR_BUTTON_CLIPPER_DISABLED_COLOR_INC;
             }
          }
       }