diff --git a/data/elementary/themes/edc/elm/colorclass.edc b/data/elementary/themes/edc/elm/colorclass.edc
index 03110b2ffd..bb21a4e105 100644
--- a/data/elementary/themes/edc/elm/colorclass.edc
+++ b/data/elementary/themes/edc/elm/colorclass.edc
@@ -164,8 +164,25 @@ group { "elm/layout/colorclass/base"; program_source: "elm"; nobroadcast;
 }
 
 group { "colorclass/colors"; program_source: "elm"; nobroadcast;
-   images.image: "box_glow.png" COMP;
    parts {
+      rect { "glow"; nomouse;
+         desc {
+            rel1.offset: -7 -7;
+            rel1.to: "color1";
+            rel2.offset: 8 8;
+            rel2.to: "color1";
+            rel2.relative: 1 1;
+            fixed: 1 1;
+         }
+         desc { "color2"; inherit: "default";
+            rel1.to: "color2";
+            rel2.to: "color2";
+         }
+         desc { "color3"; inherit: "default";
+            rel1.to: "color3";
+            rel2.to: "color3";
+         }
+      }
       group { "color1"; source: "colorclass/color1";
          desc { min: 1 1; max: 1 1; hid;
             link.base: "hide" "";
@@ -229,28 +246,6 @@ group { "colorclass/colors"; program_source: "elm"; nobroadcast;
             }
          }
       }
-      image { "glow"; nomouse;
-         desc {
-            image.normal: "box_glow.png";
-            image.border: 12 12 12 12;
-            image.middle: 0;
-            fill.smooth: 0;
-            rel1.offset: -7 -8;
-            rel1.to: "color1";
-            rel2.offset: 7 7;
-            rel2.to: "color1";
-            rel2.relative: 1 1;
-            fixed: 1 1;
-         }
-         desc { "color2"; inherit: "default";
-            rel1.to: "color2";
-            rel2.to: "color2";
-         }
-         desc { "color3"; inherit: "default";
-            rel1.to: "color3";
-            rel2.to: "color3";
-         }
-      }
       swallow { "colors";
          desc { align: 0 0;
             rel1.to_y: "color1";
diff --git a/data/elementary/themes/img/box_glow.png b/data/elementary/themes/img/box_glow.png
deleted file mode 100644
index 785eb6d93d..0000000000
Binary files a/data/elementary/themes/img/box_glow.png and /dev/null differ
diff --git a/data/elementary/themes/img/bt_base.png b/data/elementary/themes/img/bt_base.png
deleted file mode 100644
index a60b8d9295..0000000000
Binary files a/data/elementary/themes/img/bt_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/bt_sig_1.png b/data/elementary/themes/img/bt_sig_1.png
deleted file mode 100644
index b1f3a51ac8..0000000000
Binary files a/data/elementary/themes/img/bt_sig_1.png and /dev/null differ
diff --git a/data/elementary/themes/img/bt_sig_2.png b/data/elementary/themes/img/bt_sig_2.png
deleted file mode 100644
index aa23c336d3..0000000000
Binary files a/data/elementary/themes/img/bt_sig_2.png and /dev/null differ
diff --git a/data/elementary/themes/img/cell_base.png b/data/elementary/themes/img/cell_base.png
deleted file mode 100644
index 21cfc9b2ac..0000000000
Binary files a/data/elementary/themes/img/cell_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/cell_sig_1.png b/data/elementary/themes/img/cell_sig_1.png
deleted file mode 100644
index fb03cd43dc..0000000000
Binary files a/data/elementary/themes/img/cell_sig_1.png and /dev/null differ
diff --git a/data/elementary/themes/img/cell_sig_2.png b/data/elementary/themes/img/cell_sig_2.png
deleted file mode 100644
index 31459b578e..0000000000
Binary files a/data/elementary/themes/img/cell_sig_2.png and /dev/null differ
diff --git a/data/elementary/themes/img/cell_sig_3.png b/data/elementary/themes/img/cell_sig_3.png
deleted file mode 100644
index 6475d888c7..0000000000
Binary files a/data/elementary/themes/img/cell_sig_3.png and /dev/null differ
diff --git a/data/elementary/themes/img/cell_sig_4.png b/data/elementary/themes/img/cell_sig_4.png
deleted file mode 100644
index 7bbfa03778..0000000000
Binary files a/data/elementary/themes/img/cell_sig_4.png and /dev/null differ