diff --git a/data/themes/default/images/find.png b/data/themes/default/images/find.png
index c3f5b48..b4ae9d5 100644
Binary files a/data/themes/default/images/find.png and b/data/themes/default/images/find.png differ
diff --git a/data/themes/default/images/goto.png b/data/themes/default/images/goto.png
index 98a7ee2..780c72a 100644
Binary files a/data/themes/default/images/goto.png and b/data/themes/default/images/goto.png differ
diff --git a/data/themes/default/images/highlight.png b/data/themes/default/images/highlight.png
index 1c61d99..c737838 100644
Binary files a/data/themes/default/images/highlight.png and b/data/themes/default/images/highlight.png differ
diff --git a/data/themes/default/images/lines.png b/data/themes/default/images/lines.png
index a1f871f..b58c703 100644
Binary files a/data/themes/default/images/lines.png and b/data/themes/default/images/lines.png differ
diff --git a/data/themes/default/images/live_edit.png b/data/themes/default/images/live_edit.png
index 0d0498b..b802354 100644
Binary files a/data/themes/default/images/live_edit.png and b/data/themes/default/images/live_edit.png differ
diff --git a/data/themes/default/images/menu.png b/data/themes/default/images/menu.png
index a194018..af312ac 100644
Binary files a/data/themes/default/images/menu.png and b/data/themes/default/images/menu.png differ
diff --git a/data/themes/default/images/swallow_s.png b/data/themes/default/images/swallow_s.png
index 0a6a66f..ced2823 100644
Binary files a/data/themes/default/images/swallow_s.png and b/data/themes/default/images/swallow_s.png differ
diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc
index 4e8897f..e51a650 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -1185,8 +1185,6 @@ group { name: "elm/button/base/enventor";
    parts {
       spacer { "base";
          desc { "default";
-            rel1.offset: 0 0;
-            rel2.offset: 0 0;
          }
       }
       rect { "icon_clip";
@@ -1206,8 +1204,8 @@ group { name: "elm/button/base/enventor";
             rel1.offset: 0 4;
             rel1.to: "base";
             rel2.relative: 0.0 1.0;
-            rel2.offset: 0 -5;
             rel2.to: "base";
+            min: 16 16;
             max: 16 16;
             visible: 0;
          }
@@ -1219,10 +1217,8 @@ group { name: "elm/button/base/enventor";
          }
          desc { "icononly";
             inherit: "default";
-            fixed: 0 0;
-            align: 0.5 0.5;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -5;
+            fixed: 1 1;
+            align: 0 0.5;
             visible: 1;
          }
       }