diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 80891b255..3c4c7f65f 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -660,7 +660,6 @@ group { name: "e/comp/border/everything/fast";
 }
 
 group { name: "e/comp/border/fullscreen";
-   images.image: "win_shadow.png" COMP;
    images.image: "screen_circular_shadow.png" COMP;
    data.item: "screen.bg" "fullscreen.bg";
    parts {
@@ -684,26 +683,6 @@ group { name: "e/comp/border/fullscreen";
             visible: 1;
          }
       }
-      part { name: "clipper_sh"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: -1.0  -1.0;
-            rel1.offset: -9999 -9999;
-            rel2.relative: 2.0   2.0;
-            rel2.offset: 9999  9999;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "visible1" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 100;
-            visible: 1;
-         }
-         description { state: "visible2" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
       part { name: "clipper_all"; type: RECT;
          description { state: "default" 0.0;
          }
@@ -737,23 +716,6 @@ group { name: "e/comp/border/fullscreen";
             visible: 1;
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         clip_to: "clipper_sh";
-         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;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
       part { name: "shower"; type: RECT;
          description { state: "default" 0.0;
             rel1.relative: 0.5 0.5;
@@ -800,16 +762,6 @@ group { name: "e/comp/border/fullscreen";
       }
    }
    programs {
-      program {
-         signal: "e,state,shadow,on"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "shadow";
-      }
-      program {
-         signal: "e,state,shadow,off"; source: "e";
-         action: STATE_SET "hidden" 0.0;
-         target: "shadow";
-      }
       program {
          name: "visible_on";
          signal: "e,state,visible,on"; source: "e";
@@ -824,7 +776,6 @@ group { name: "e/comp/border/fullscreen";
          action: STATE_SET "visible1" 0.0;
          transition: DECELERATE 0.05;
          target: "clipper";
-         target: "clipper_sh";
          target: "shower";
          target: "fader";
          after: "show2";
@@ -833,7 +784,6 @@ group { name: "e/comp/border/fullscreen";
          action: STATE_SET "visible2" 0.0;
          transition: DECELERATE 0.20;
          target: "clipper";
-         target: "clipper_sh";
          target: "shower";
          target: "fader";
          after: "show3";
@@ -855,7 +805,6 @@ group { name: "e/comp/border/fullscreen";
          action: STATE_SET "visible1" 0.0;
          transition: DECELERATE 0.2;
          target: "clipper";
-         target: "clipper_sh";
          target: "shower";
          target: "fader";
          after: "hide2";
@@ -864,7 +813,6 @@ group { name: "e/comp/border/fullscreen";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.05;
          target: "clipper";
-         target: "clipper_sh";
          target: "shower";
          target: "fader";
          after: "hide3";
diff --git a/data/themes/edc/deskmirror.edc b/data/themes/edc/deskmirror.edc
index e79de0373..e388165b3 100644
--- a/data/themes/edc/deskmirror.edc
+++ b/data/themes/edc/deskmirror.edc
@@ -1,5 +1,6 @@
 group { name: "e/deskmirror/frame/default";
    alias: "e/deskmirror/frame/dialog";
+   images.image: "win_shadow.png" COMP;
    script {
       public message(Msg_Type:type, id, ...) {
          /* set scale */