diff --git a/legacy/elementary/data/themes/widgets/panel.edc b/legacy/elementary/data/themes/widgets/panel.edc
index 006ca6fa9b..8d57f702d0 100644
--- a/legacy/elementary/data/themes/widgets/panel.edc
+++ b/legacy/elementary/data/themes/widgets/panel.edc
@@ -48,9 +48,6 @@ group {
          {
             state: "default" 0.0;
             color: 255 255 255 0;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 0 0;
-            rel2.relative: 1.0 1.0;
             rel2.offset: -1 -1;
          }
          description
@@ -64,24 +61,6 @@ group {
          }
       }
       part
-      {
-         name: "base";
-         type: IMAGE;
-         mouse_events: 0;
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            rel2.offset: -20 -1;
-            image
-            {
-               normal: "bt_dis_base.png";
-               border: 4 4 4 4;
-            }
-         }
-      }
-      part
       {
          name: "clipper";
          type: RECT;
@@ -102,18 +81,6 @@ group {
          }
       }
       part
-      {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clipper";
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "clipper";
-            rel2.to: "clipper";
-         }
-      }
-      part
       {
          name: "btn";
          type: IMAGE;
@@ -233,6 +200,36 @@ group {
             image.normal: "icon_arrow_right.png";
          }
       }
+      part
+      {
+         name: "base";
+         type: IMAGE;
+         mouse_events: 0;
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            rel2.offset: -20 -1;
+            image
+            {
+               normal: "bt_dis_base.png";
+               border: 4 4 4 4;
+            }
+         }
+      }
+      part
+      {
+         name: "elm.swallow.content";
+         type: SWALLOW;
+         clip_to: "clipper";
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "clipper";
+            rel2.to: "clipper";
+         }
+      }
    }
    programs
    {
@@ -370,30 +367,12 @@ group {
             state: "hidden" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 -1.0;
-            rel1.offset: 0 21;
+            rel1.offset: 0 -21;
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 20;
          }
       }
       part
-      {
-         name: "base";
-         type: IMAGE;
-         mouse_events: 0;
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            rel2.offset: -1 -20;
-            image
-            {
-               normal: "bt_dis_base.png";
-               border: 4 4 4 4;
-            }
-         }
-      }
-      part
       {
          name: "clipper";
          type: RECT;
@@ -414,18 +393,6 @@ group {
          }
       }
       part
-      {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clipper";
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "clipper";
-            rel2.to: "clipper";
-         }
-      }
-      part
       {
          name: "btn";
          type: IMAGE;
@@ -433,20 +400,20 @@ group {
          description
          {
             state: "default" 0.0;
-            max: 32 48;
+            max: 48 32;
             fixed: 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.0;
             rel1
             {
                relative: 0.0 1.0;
-               offset: -2 2;
+               offset: 0 -6;
                to_y: "base";
             }
             rel2.to_y: "bg";
             image
             {
                normal: "bt_base1.png";
-               border: 12 4 5 0;
+               border: 12 4 0 5;
             }
             fill.smooth: 0;
          }
@@ -545,6 +512,36 @@ group {
             image.normal: "icon_arrow_down.png";
          }
       }
+      part
+      {
+         name: "base";
+         type: IMAGE;
+         mouse_events: 0;
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            rel2.offset: -1 -20;
+            image
+            {
+               normal: "bt_dis_base.png";
+               border: 4 4 4 4;
+            }
+         }
+      }
+      part
+      {
+         name: "elm.swallow.content";
+         type: SWALLOW;
+         clip_to: "clipper";
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "clipper";
+            rel2.to: "clipper";
+         }
+      }
    }
    programs
    {
@@ -682,27 +679,9 @@ group {
             state: "hidden" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 20;
+            rel1.offset: -1 -24;
             rel2.relative: 1.0 2.0;
-            rel2.offset: -1 21;
-         }
-      }
-      part
-      {
-         name: "base";
-         type: IMAGE;
-         mouse_events: 0;
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: -1 -20;
-            rel2.to: "bg";
-            image
-            {
-               normal: "bt_dis_base.png";
-               border: 4 4 4 4;
-            }
+            rel2.offset: 0 -21;
          }
       }
       part
@@ -726,18 +705,6 @@ group {
          }
       }
       part
-      {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clipper";
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "clipper";
-            rel2.to: "clipper";
-         }
-      }
-      part
       {
          name: "btn";
          type: IMAGE;
@@ -745,20 +712,19 @@ group {
          description
          {
             state: "default" 0.0;
-            max: 32 48;
+            max: 48 32;
             fixed: 1 1;
             align: 0.5 0.0;
-            rel1
-            {
-               relative: 0.0 -1.0;
-               offset: -2 0;
+            rel1.to_y: "bg";
+            rel2{
+               relative: 1.0 0.0;
+               offset: 0 5;
                to_y: "base";
             }
-            rel2.to_y: "bg";
             image
             {
                normal: "bt_base1.png";
-               border: 12 4 0 5;
+               border: 4 12 5 0;
             }
             fill.smooth: 0;
          }
@@ -857,6 +823,36 @@ group {
             image.normal: "icon_arrow_up.png";
          }
       }
+      part
+      {
+         name: "base";
+         type: IMAGE;
+         mouse_events: 0;
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.offset: -1 20;
+            rel2.to: "bg";
+            image
+            {
+               normal: "bt_dis_base.png";
+               border: 4 4 4 4;
+            }
+         }
+      }
+      part
+      {
+         name: "elm.swallow.content";
+         type: SWALLOW;
+         clip_to: "clipper";
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "clipper";
+            rel2.to: "clipper";
+         }
+      }
    }
    programs
    {
@@ -1000,24 +996,6 @@ group {
          }
       }
       part
-      {
-         name: "base";
-         type: IMAGE;
-         mouse_events: 0;
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: 20 0;
-            rel2.to: "bg";
-            image
-            {
-               normal: "bt_dis_base.png";
-               border: 4 4 4 4;
-            }
-         }
-      }
-      part
       {
          name: "clipper";
          type: RECT;
@@ -1038,18 +1016,6 @@ group {
          }
       }
       part
-      {
-         name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clipper";
-         description
-         {
-            state: "default" 0.0;
-            rel1.to: "clipper";
-            rel2.to: "clipper";
-         }
-      }
-      part
       {
          name: "btn";
          type: IMAGE;
@@ -1172,6 +1138,36 @@ group {
             image.normal: "icon_arrow_left.png";
          }
       }
+      part
+      {
+         name: "base";
+         type: IMAGE;
+         mouse_events: 0;
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "bg";
+            rel1.offset: 20 0;
+            rel2.to: "bg";
+            image
+            {
+               normal: "bt_dis_base.png";
+               border: 4 4 4 4;
+            }
+         }
+      }
+      part
+      {
+         name: "elm.swallow.content";
+         type: SWALLOW;
+         clip_to: "clipper";
+         description
+         {
+            state: "default" 0.0;
+            rel1.to: "clipper";
+            rel2.to: "clipper";
+         }
+      }
    }
    programs
    {