diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2abd64a41..f0c4efa00 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -324,7 +324,6 @@ img/spanner_glow.png \
 img/spanner_hilight.png \
 img/spanner_inset.png \
 img/speaker.png \
-img/speaker_shadow.png \
 img/split_h_glow.png \
 img/split_h_hilight.png \
 img/split_h_inset.png \
diff --git a/data/themes/edc/mixer.edc b/data/themes/edc/mixer.edc
index 13829a24a..c9b5cc6ac 100644
--- a/data/themes/edc/mixer.edc
+++ b/data/themes/edc/mixer.edc
@@ -1,6 +1,8 @@
 group { name: "e/modules/mixer/main";
    images.image: "speaker.png" COMP;
-   images.image: "speaker_shadow.png" COMP;
+   images.image: "inset_round_hilight.png" COMP;
+   images.image: "inset_round_shadow.png" COMP;
+   images.image: "inset_round_shading.png" COMP;
    images.image: "led_dot_white.png" COMP;
    max: 160 160;
    min: 16 16;
@@ -98,21 +100,29 @@ group { name: "e/modules/mixer/main";
       }
    }
    parts {
-      part { name: "speaker_shadow";
+      part { name: "base-sh";
          description { state: "default" 0.0;
-            rel1.to: "speaker";
-            rel1.relative: 0.0 (4/160);
-            rel1.offset: 0 1;
-            rel2.to: "speaker";
-            rel2.relative: 1.0 (164/160);
-            rel2.offset: -1 0;
-            image.normal: "speaker_shadow.png";
-            color: 255 255 255 128;
+            rel1.to: "base";
+            rel1.offset: 0 -1;
+            rel2.to: "base";
+            rel2.offset: -1 -2;
+            image.normal: "inset_round_shadow.png";
          }
       }
-      part { name: "speaker";
+      part { name: "base-hi";
          description { state: "default" 0.0;
-            aspect: 1 1; aspect_preference: BOTH;
+            rel1.to: "base";
+            rel1.offset: 0 1;
+            rel2.to: "base";
+            rel2.offset: -1 0;
+            image.normal: "inset_round_hilight.png";
+         }
+      }
+      part { name: "base";
+         description { state: "default" 0.0;
+            rel1.relative: (25/380) (25/380);
+            rel2.relative: (365/380) (365/380);
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "speaker.png";
          }
       }
@@ -173,8 +183,6 @@ group { name: "e/modules/mixer/main";
 #undef LED
       part { name: "over"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "speaker";
-            rel2.to: "speaker";
             color: 255 255 255 0;
          }
       }
diff --git a/data/themes/img/speaker.png b/data/themes/img/speaker.png
index 92f9b4477..f6622f51c 100644
Binary files a/data/themes/img/speaker.png and b/data/themes/img/speaker.png differ
diff --git a/data/themes/img/speaker_shadow.png b/data/themes/img/speaker_shadow.png
deleted file mode 100644
index 55ed44d10..000000000
Binary files a/data/themes/img/speaker_shadow.png and /dev/null differ