diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc
index 25f4a78d58..d9128419f7 100644
--- a/legacy/elementary/data/themes/default.edc
+++ b/legacy/elementary/data/themes/default.edc
@@ -1560,6 +1560,7 @@ collections {
 	 part { name: "button_image";
 	    mouse_events: 1;
 	    description { state: "default" 0.0;
+          min: 15 15;
 	       image {
 		  normal: "bt_base2.png";
 		  border: 7 7 7 7;
@@ -2352,6 +2353,7 @@ collections {
 	 part { name: "button_image";
 	    mouse_events: 1;
 	    description { state: "default" 0.0;
+          min: 15 15;
            color: 255 255 255 0;
 	       image {
 		  normal: "bt_base2.png";
@@ -2881,10 +2883,8 @@ collections {
 	    }
 	    description { state: "visible" 0.0;
 	       inherit: "default" 0.0;
-               fixed: 1 1;
 	       visible: 1;
 	       aspect: 1.0 1.0;
-	       aspect_preference: VERTICAL;
 	       rel2.offset: 4 -5;
 	    }
 	    description { state: "disabled" 0.0;
@@ -2894,7 +2894,6 @@ collections {
 	    description { state: "disabled_visible" 0.0;
 	       inherit: "default" 0.0;
 	       color: 128 128 128 128;
-               fixed: 1 1;
 	       visible: 1;
 	       aspect: 1.0 1.0;
 	    }
@@ -2932,6 +2931,7 @@ collections {
 	       inherit: "default" 0.0;
 	       color: 128 128 128 128;
 	       visible: 1;
+	       text.min: 1 1;
 	    }
 	 }
  	 part { name: "disabler";
@@ -21965,21 +21965,19 @@ collections {
 	    description { state: "default" 0.0;
                fixed: 1 0;
 	       visible: 0;
-               color: 255 255 255 255;
 	       align: 0.0 0.5;
-               rel1.to_x: "bg";
-               rel1.relative: 1.0 0.0;
+          rel1.to_x: "bg";
+	       rel1.relative: 1.0 0.0;
 	       rel1.offset: 1 1;
-               rel2.to_x: "bg";
+          rel2.to_x: "bg";
+	       rel2.offset: 1 -2;
 	       rel2.relative: 1.0 1.0;
-	       rel2.offset: 2 -2;
 	    }
 	    description { state: "visible" 0.0;
 	       inherit: "default" 0.0;
-               fixed: 1 1;
+          fixed: 1 0;
 	       visible: 1;
 	       aspect: 1.0 1.0;
-	       aspect_preference: VERTICAL;
 	    }
 	    description { state: "disabled" 0.0;
 	       inherit: "default" 0.0;
@@ -21988,7 +21986,7 @@ collections {
 	    description { state: "disabled_visible" 0.0;
 	       inherit: "default" 0.0;
 	       color: 128 128 128 128;
-               fixed: 1 1;
+          fixed: 1 0;
 	       visible: 1;
 	       aspect: 1.0 1.0;
 	    }
@@ -22008,7 +22006,7 @@ collections {
 	       text {
 		  font: "Sans,Edje-Vera";
 		  size: 10;
-		  min: 0 0;
+		  min: 0 1;
 		  align: 0.0 0.5;
 	       }
 	    }
@@ -22206,11 +22204,9 @@ collections {
 	    }
 	    description { state: "visible" 0.0;
 	       inherit: "default" 0.0;
-               fixed: 1 1;
 	       visible: 1;
                color: 255 255 255 255;
 	       aspect: 1.0 1.0;
-	       aspect_preference: VERTICAL;
 	    }
 	    description { state: "disabled" 0.0;
 	       inherit: "default" 0.0;
@@ -22220,6 +22216,7 @@ collections {
 	       inherit: "default" 0.0;
 	       color: 128 128 128 128;
 	       visible: 1;
+	       aspect: 1.0 1.0;
 	    }
 	 }
          part { name: "elm.text";
@@ -30971,6 +30968,7 @@ collections {
                   font: "Sans,Edje-Vera";
                   size: 13;
                   align: 0.5 0.5;
+                  min: 0 1;
                }
             }
             description { state: "show" 0.0;