diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index fcdcdff292..0bfc070e9f 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -669,6 +669,7 @@ elementary/themes/img/wifi_sig_2.png \
 elementary/themes/img/wifi_sig_3.png \
 elementary/themes/img/win_glow.png \
 elementary/themes/img/win_shadow.png \
+elementary/themes/img/win_menu_shadow.png \
 \
 elementary/themes/img/O/about_bot.png \
 elementary/themes/img/O/about_mid.png \
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index f7ee515743..33e48fd3af 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -34,14 +34,9 @@ group { name: "e/widgets/border/default/border";
       }
       part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip";
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "top";
-            rel1.offset: -7 -3;
             rel2.to: "bottom";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
          description { state: "shaded";
             inherit: "default";
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index 2b18e8ebbb..0eb3bc8328 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -270,13 +270,8 @@ group { name: "e/comp/frame/default";
       part { name: "shadow"; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel.to: "e.swallow.content";
-            rel1.offset: -7  -3;
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
          description { state: "hidden" 0.0;
             inherit;
@@ -613,7 +608,13 @@ group { name: "e/comp/frame/still/fast";
 
 group { name: "e/comp/frame/menu";
    inherit: "e/comp/frame/popup";
+   images.image: "win_menu_shadow.png" COMP;
    parts {
+      part { name: "shadow";
+         description { state: "default" 0.0;
+            WIN_MENU_SHADOW;
+         }
+      }
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.0;
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index 5b9f7ebefd..e5a0f0a0be 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -20,14 +20,9 @@ group { name: "e/comp/border/default";
       part { name: "shadow"; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "e.swallow.content";
-            rel1.offset: -7  -3;
             rel2.to: "e.swallow.content";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index 7a0345e78f..2576d0e0d9 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -44,14 +44,9 @@ group { name: "elm/ews/decoration/default";
    parts {
       part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
-            rel1.offset: -7  -3;
             rel1.to: "top";
-            rel2.offset: 6 11;
             rel2.to: "bottom";
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -665,12 +660,7 @@ group { name: "elm/ews/decoration/borderless";
    parts {
       part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
-            rel1.offset: -7  -3;
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -819,8 +809,7 @@ group { name: "elm/border/base/default";
       }
       part { name: "shadow_spacer"; type: SPACER;
          description { state: "default";
-            rel1.offset: 7 5;
-            rel2.offset: -8 -12;
+            WIN_SHADOW_SPACER;
          }
          description { state: "max";
             rel1.offset: 0 0;
@@ -829,14 +818,9 @@ group { name: "elm/border/base/default";
       }
       part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip";
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "shadow_spacer";
-            rel1.offset: -7 -3;
             rel2.to: "shadow_spacer";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
          description { state: "shaded";
             inherit: "default";
diff --git a/data/elementary/themes/edc/elm/flipselector.edc b/data/elementary/themes/edc/elm/flipselector.edc
index dff2880f7b..6aba3a56d5 100644
--- a/data/elementary/themes/edc/elm/flipselector.edc
+++ b/data/elementary/themes/edc/elm/flipselector.edc
@@ -154,14 +154,9 @@ group { name: "elm/flipselector/base/default";
    parts {
       part { name: "base_shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "base";
-            rel1.offset: -7  -3;
             rel2.to: "base";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
       }
       part { name: "base"; type: RECT;
diff --git a/data/elementary/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc
index 784025558d..c4c510ebb1 100644
--- a/data/elementary/themes/edc/elm/menu.edc
+++ b/data/elementary/themes/edc/elm/menu.edc
@@ -770,14 +770,9 @@ group { name: "elm/hover/base/menu/default";
       part { name: "shadow";
          clip_to: "bottomclip";
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "bottom";
-            rel1.offset: -7  -3;
             rel2.to: "bottom";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
       }
       part { name: "top";
@@ -1030,14 +1025,9 @@ group { name: "elm/hover/base/main_menu_submenu/default";
       part { name: "shadow";
          clip_to: "bottomclip";
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "bottom";
-            rel1.offset: -7  -3;
             rel2.to: "bottom";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
       }
       part { name: "top";
diff --git a/data/elementary/themes/edc/elm/photo.edc b/data/elementary/themes/edc/elm/photo.edc
index 55dcfb704c..40eb10edfa 100644
--- a/data/elementary/themes/edc/elm/photo.edc
+++ b/data/elementary/themes/edc/elm/photo.edc
@@ -3,14 +3,9 @@ group { name: "elm/photo/base/default";
    parts {
       part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
             rel1.to: "base";
-            rel1.offset: -7  -3;
             rel2.to: "base";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
+            WIN_SHADOW;
          }
       }
       part { name: "base"; type: RECT;
diff --git a/data/elementary/themes/img/win_menu_shadow.png b/data/elementary/themes/img/win_menu_shadow.png
new file mode 100644
index 0000000000..f05c750e29
Binary files /dev/null and b/data/elementary/themes/img/win_menu_shadow.png differ
diff --git a/data/elementary/themes/img/win_shadow.png b/data/elementary/themes/img/win_shadow.png
index 98f158e93b..9d1e0a6cfc 100644
Binary files a/data/elementary/themes/img/win_shadow.png and b/data/elementary/themes/img/win_shadow.png differ
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index a298742ed0..5f2e33ee66 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -9,3 +9,21 @@
 
 #define DARK_GREY_BG_COLOR 48 48 48 255
 #define DARK_GREY_BG_DISABLED_COLOR 64 64 64 255
+
+#define WIN_SHADOW \
+   image.normal: "win_shadow.png"; \
+   image.border: 44 44 44 44; \
+   image.middle: 0; \
+   rel1.offset: -21 -14; \
+   rel2.offset: 20 27; \
+   fill.smooth: 0
+#define WIN_SHADOW_SPACER \
+   rel1.offset: 21 14; \
+   rel2.offset: -21 -28
+#define WIN_MENU_SHADOW \
+   image.normal: "win_menu_shadow.png"; \
+   image.border: 44 44 16 29; \
+   image.middle: 0; \
+   rel1.offset: -21 -14; \
+   rel2.offset: 20 27; \
+   fill.smooth: 0