diff --git a/data/elementary/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc
index b4d14f6582..6a4ee992c2 100644
--- a/data/elementary/themes/edc/elm/menu.edc
+++ b/data/elementary/themes/edc/elm/menu.edc
@@ -379,7 +379,7 @@ group { name: "elm/menu/main_menu_submenu/default";
 
 //In the hover used by the menu only the bottom part is used.
 group { name: "elm/hover/base/menu/default";
-   images.image: "win_menu_shadow.png" COMP;
+   images.image: "win_shad_angle.png" COMP;
    parts {
       part { name: "elm.swallow.offset"; type: SWALLOW;
          description { state: "default" 0.0;
@@ -431,11 +431,13 @@ group { name: "elm/hover/base/menu/default";
             color: 255 255 255 255;
          }
       }
-      part { name: "shadow";
+      WIN_SHAD("bg", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5)
+      part { name: "shadow"; type: RECT;
          clip_to: "bottomclip";
          description { state: "default" 0.0;
             rel.to: "bg";
-            WIN_MENU_SHADOW;
+            rel1.offset: -1000 -1000;
+            rel2.offset: 1000 1000;
          }
       }
       part { name: "bg"; type: RECT; mouse_events: 0;
@@ -565,7 +567,7 @@ group { name: "elm/hover/base/main_menu/default";
 }
 
 group { name: "elm/hover/base/main_menu_submenu/default";
-   images.image: "win_menu_shadow.png" COMP;
+   images.image: "win_shad_angle.png" COMP;
    parts {
       part { name: "elm.swallow.offset"; type: SWALLOW;
          repeat_events:1;
@@ -601,11 +603,13 @@ group { name: "elm/hover/base/main_menu_submenu/default";
             color: 255 255 255 255;
          }
       }
-      part { name: "shadow";
+      WIN_SHAD("bg", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5)
+      part { name: "shadow"; type: RECT;
          clip_to: "bottomclip";
          description { state: "default" 0.0;
             rel.to: "bg";
-            WIN_MENU_SHADOW;
+            rel1.offset: -1000 -1000;
+            rel2.offset: 1000 1000;
          }
       }
       part { name: "bg"; type: RECT; mouse_events: 0;
diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index dbda5b9ff8..ddf7c84fbe 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -1329,12 +1329,14 @@ group { name: "elm/toolbar/object/default";
 // === item: the more PANEL that slides out under the toolbar
 // XXX: vert vs horiz (should emit)
 group { name: "elm/toolbar/more/default";
-   images.image: "win_menu_shadow.png" COMP;
+   images.image: "win_shad_angle.png" COMP;
    parts {
-      part { name: "shadow"; mouse_events: 0;
+      WIN_SHAD("base", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5)
+      part { name: "shadow"; type: RECT;
          description { state: "default" 0.0;
-            WIN_MENU_SHADOW;
             rel.to: "base";
+            rel1.offset: -1000 -1000;
+            rel2.offset: 1000 1000;
             color: 0 0 0 0;
             visible: 0;
          }
diff --git a/data/elementary/themes/edc/randr.edc b/data/elementary/themes/edc/randr.edc
index 1040405a6c..55f348712b 100644
--- a/data/elementary/themes/edc/randr.edc
+++ b/data/elementary/themes/edc/randr.edc
@@ -80,7 +80,7 @@ group { name: "e/conf/randr/main/frame";
       public refresh_open;
    }
    parts {
-      part { name: "primary";
+      part { name: "primary"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             color: 48 48 48 255;
diff --git a/data/elementary/themes/img/screen_base.png b/data/elementary/themes/img/screen_base.png
deleted file mode 100644
index cbd262e907..0000000000
Binary files a/data/elementary/themes/img/screen_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/win_menu_shadow.png b/data/elementary/themes/img/win_menu_shadow.png
deleted file mode 100644
index f05c750e29..0000000000
Binary files a/data/elementary/themes/img/win_menu_shadow.png and /dev/null differ