diff --git a/legacy/elementary/data/themes/edc/battery.edc b/legacy/elementary/data/themes/edc/battery.edc
index d190376203..3ef55a599a 100644
--- a/legacy/elementary/data/themes/edc/battery.edc
+++ b/legacy/elementary/data/themes/edc/battery.edc
@@ -224,6 +224,7 @@ group { name: "e/modules/battery/main";
             color_class: "module_label";
             text { font: "Sans"; size: 6;
                min: 0 1;
+               fit: 1 1;
                text_class: "module_small";
             }
          }
@@ -242,6 +243,7 @@ group { name: "e/modules/battery/main";
             color_class: "module_label";
             text { font: "Sans"; size: 6;
                min: 0 1;
+               fit: 1 1;
                text_class: "module_small";
             }
          }
diff --git a/legacy/elementary/data/themes/edc/music_control.edc b/legacy/elementary/data/themes/edc/music_control.edc
index f00d243180..bdf3cb7d06 100644
--- a/legacy/elementary/data/themes/edc/music_control.edc
+++ b/legacy/elementary/data/themes/edc/music_control.edc
@@ -29,6 +29,14 @@ group { name: "modules/music-control/popup";
    images.image: "icon_next.png" COMP;
    images.image: "icon_pause.png" COMP;
    images.image: "icon_play.png" COMP;
+   styles {
+      style { name: "music_control_metadata_style";
+         base: "font="FN" font_size=10 align=left text_class=tb_plain color=#ffff style=shadow,bottom shadow_color=#00000080";
+         tag: "title" "+ font_size=12 font="FNBD" text_class=tb_big";
+         tag: "tag" "+ font_size=8 color=#888f";
+         tag: "br" "\n";
+      }
+   }
    script {
       public message(Msg_Type:type, id, ...) {
          new txt[128];
@@ -37,31 +45,57 @@ group { name: "modules/music-control/popup";
       }
    }
    parts {
+      part { name: "cover_bg";
+         description { state: "default" 0;
+            min: 90 90;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.35 1.0;
+            image.normal: "music_control_icon.png";
+         }
+      }
+      part { name: "cover_swallow"; type: SWALLOW;
+         description { state: "default" 0;
+            rel1.to: "cover_bg";
+            rel2.to: "cover_bg";
+         }
+      }
       part { name: "player_name"; type: TEXT;
          description { state: "default" 0;
             text.size: 12;
             text.text: "Music player";
             text.font: FN;
-            rel1.relative: 0.0 0.0;
+            rel1.relative: 1.0 0.0;
             rel2.relative: 1.0 0.0;
-            rel2.offset: 0 16;
+            rel2.offset: 0 12;
+         }
+      }
+      part { name: "metadata"; type: TEXTBLOCK;
+         description { state: "default" 0;
+            text {
+               style: "music_control_metadata_style";
+               text: "Song Title";
+               align: 0.0 0.0;
+            }
+            rel1.to: "player_name";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 3 0;
          }
       }
       part { name: "previous_btn";
          description { state: "default" 0;
+            max: 32 32;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            rel1.to: "player_name";
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 0.33 1.0;
+            align: 0.1 1.0;
+            rel1.relative: 0.35 0.0;
             image.normal: "icon_prev.png";
          }
       }
       part { name: "play_btn";
          description { state: "default" 0;
+            max: 32 32;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            rel1.to: "player_name";
-            rel1.relative: 0.33 1.0;
-            rel2.relative: 0.66 1.0;
+            align: 0.5 1.0;
+            rel1.relative: 0.35 0.0;
             image.normal: "icon_pause.png";
          }
          description { state: "play" 0.0;
@@ -71,10 +105,11 @@ group { name: "modules/music-control/popup";
       }
       part { name: "next_btn";
          description { state: "default" 0;
+            max: 32 32;
             aspect: 1.0 1.0; aspect_preference: BOTH;
+            align: 0.9 1.0;
+            rel1.relative: 0.35 0.0;
             rel1.to: "player_name";
-            rel1.relative: 0.66 1.0;
-            rel2.relative: 1.0 1.0;
             image.normal: "icon_next.png";
          }
       }