diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index b4add7ea9..bfc85cb55 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -225,6 +225,12 @@ img/icon_system-restart.png \
 img/icon_system-shutdown.png \
 img/icon_system-suspend-hibernate.png \
 img/icon_system-suspend.png \
+img/icon_wallpaper_center.png \
+img/icon_wallpaper_fill.png \
+img/icon_wallpaper_pan.png \
+img/icon_wallpaper_stretch.png \
+img/icon_wallpaper_tile.png \
+img/icon_wallpaper_within.png \
 img/ic_win_move.png \
 img/ic_win_resize.png \
 img/inset_circle_tiny.png \
diff --git a/data/themes/edc/O/icons.edc b/data/themes/edc/O/icons.edc
index 1bec6210d..742fb8478 100644
--- a/data/themes/edc/O/icons.edc
+++ b/data/themes/edc/O/icons.edc
@@ -1,180 +1,3 @@
-   // Custom icons with actions or specific behaviours
-   images {
-      image: "O/icon_wallpaper_center_flat.png" COMP;
-      image: "O/icon_wallpaper_center.png" COMP;
-      image: "O/icon_wallpaper_screen.png" COMP;
-      image: "O/icon_wallpaper_grad_screen.png" COMP;
-   }
-   group {
-      name: "e/icons/enlightenment/wallpaper_stretch";
-      max: 24 24;
-      parts {
-         part {
-            name: "bg";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               rel1.to: "screen";
-               rel2.to: "screen";
-               image {
-                  normal: "O/icon_wallpaper_center_flat.png";
-                  border: 5 5 5 5;
-               }
-            }
-         }
-         part {
-            name: "screen";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "O/icon_wallpaper_screen.png";
-                  border: 2 2 2 2;
-               }
-            }
-         }
-      }
-   }
-   group {
-      name: "e/icons/enlightenment/wallpaper_tile";
-      max: 24 24;
-      parts {
-         part {
-            name: "bg";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               rel1.to: "screen";
-               rel2.to: "screen";
-               image {
-                  normal: "O/icon_wallpaper_center_flat.png";
-                  border: 5 5 5 5;
-               }
-               fill {
-                  size {
-                     relative: 0.33 0.33;
-                  }
-               }
-            }
-         }
-         part {
-            name: "screen";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "O/icon_wallpaper_screen.png";
-                  border: 2 2 2 2;
-               }
-            }
-         }
-      }
-   }
-   group {
-      name: "e/icons/enlightenment/wallpaper_center";
-      max: 24 24;
-      parts {
-         part {
-            name: "bg";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               rel1.to: "screen";
-               rel2.to: "screen";
-               rel1.relative: 0.125 0.125;
-               rel2.relative: 0.875 0.875;
-               image {
-                  normal: "O/icon_wallpaper_center.png";
-                  border: 5 5 5 5;
-               }
-            }
-         }
-         part {
-            name: "screen";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "O/icon_wallpaper_screen.png";
-                  border: 2 2 2 2;
-               }
-            }
-         }
-      }
-   }
-   group {
-      name: "e/icons/enlightenment/wallpaper_scale_aspect_in";
-      max: 24 24;
-      parts {
-         part {
-            name: "bg";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.5 1.5;
-               aspect_preference: BOTH;
-               rel1.to: "screen";
-               rel2.to: "screen";
-               image {
-                  normal: "O/icon_wallpaper_center.png";
-                  border: 5 5 5 5;
-               }
-            }
-         }
-         part {
-            name: "screen";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "O/icon_wallpaper_screen.png";
-                  border: 2 2 2 2;
-               }
-            }
-         }
-      }
-   }
-   group {
-      name: "e/icons/enlightenment/wallpaper_scale_aspect_out";
-      max: 24 24;
-      parts {
-         part {
-            name: "bg";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.5 1.5;
-               aspect_preference: NONE;
-               image {
-                  normal: "O/icon_wallpaper_center.png";
-                  border: 5 5 5 5;
-               }
-            }
-         }
-         part {
-            name: "screen";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               image {
-                  normal: "O/icon_wallpaper_screen.png";
-                  border: 2 2 2 2;
-               }
-            }
-         }
-      }
-   }
-
 /////////////////////////////////////////////////////////////////////////////
 /*** ICONS ***/
 
diff --git a/data/themes/edc/icons.edc b/data/themes/edc/icons.edc
index 1c6d2ba00..f02cc2759 100644
--- a/data/themes/edc/icons.edc
+++ b/data/themes/edc/icons.edc
@@ -32,6 +32,13 @@
    ICON("preferences-desktop-signal-bindings",    80, "icon_preferences-desktop-signal-bindings.png")
    ICON("preferences-variables",                  80, "icon_preferences-variables.png")
    ICON("preferences-interaction",                80, "icon_preferences-interaction.png")
+
+   ICON("enlightenment/wallpaper_stretch",          80, "icon_wallpaper_stretch.png")
+   ICON("enlightenment/wallpaper_center",           80, "icon_wallpaper_center.png")
+   ICON("enlightenment/wallpaper_tile",             80, "icon_wallpaper_tile.png")
+   ICON("enlightenment/wallpaper_scale_aspect_in",  80, "icon_wallpaper_within.png")
+   ICON("enlightenment/wallpaper_scale_aspect_out", 80, "icon_wallpaper_fill.png")
+   ICON("enlightenment/wallpaper_pan",              80, "icon_wallpaper_pan.png")
 #if 0
 //   ICON("", 80, "")
 #endif
diff --git a/data/themes/img/icon_wallpaper_center.png b/data/themes/img/icon_wallpaper_center.png
new file mode 100644
index 000000000..920a06085
Binary files /dev/null and b/data/themes/img/icon_wallpaper_center.png differ
diff --git a/data/themes/img/icon_wallpaper_fill.png b/data/themes/img/icon_wallpaper_fill.png
new file mode 100644
index 000000000..a2daaeaac
Binary files /dev/null and b/data/themes/img/icon_wallpaper_fill.png differ
diff --git a/data/themes/img/icon_wallpaper_pan.png b/data/themes/img/icon_wallpaper_pan.png
new file mode 100644
index 000000000..a60f7a1b3
Binary files /dev/null and b/data/themes/img/icon_wallpaper_pan.png differ
diff --git a/data/themes/img/icon_wallpaper_stretch.png b/data/themes/img/icon_wallpaper_stretch.png
new file mode 100644
index 000000000..6d271e3b4
Binary files /dev/null and b/data/themes/img/icon_wallpaper_stretch.png differ
diff --git a/data/themes/img/icon_wallpaper_tile.png b/data/themes/img/icon_wallpaper_tile.png
new file mode 100644
index 000000000..5885d9172
Binary files /dev/null and b/data/themes/img/icon_wallpaper_tile.png differ
diff --git a/data/themes/img/icon_wallpaper_within.png b/data/themes/img/icon_wallpaper_within.png
new file mode 100644
index 000000000..f0cb50e47
Binary files /dev/null and b/data/themes/img/icon_wallpaper_within.png differ