diff --git a/data/elementary/themes/edc/cslider.edc b/data/elementary/themes/edc/cslider.edc
index 92c2acd8c4..cd4a687560 100644
--- a/data/elementary/themes/edc/cslider.edc
+++ b/data/elementary/themes/edc/cslider.edc
@@ -1,8 +1,4 @@
 group { name: "e/widgets/cslider";
-   images.image: "col_sel_end_bottom.png" COMP;
-   images.image: "col_sel_end_top.png" COMP;
-   images.image: "col_sel_end_left.png" COMP;
-   images.image: "col_sel_end_right.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
          scale: 1;
diff --git a/data/elementary/themes/edc/edgebindings.edc b/data/elementary/themes/edc/edgebindings.edc
index 3422ae7dc4..62e453084b 100644
--- a/data/elementary/themes/edc/edgebindings.edc
+++ b/data/elementary/themes/edc/edgebindings.edc
@@ -1,12 +1,4 @@
 group { name: "e/modules/conf_edgebindings/selection";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "dot_pattern.png" COMP;
-   images.image: "darken_square.png" COMP;
-   images.image: "downlight_glow.png" COMP;
-   images.image: "downlight_glow_left.png" COMP;
-   images.image: "downlight_glow_right.png" COMP;
-   images.image: "downlight_glow_up.png" COMP;
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
diff --git a/data/elementary/themes/edc/elm/colorclass.edc b/data/elementary/themes/edc/elm/colorclass.edc
index 372a31673b..03110b2ffd 100644
--- a/data/elementary/themes/edc/elm/colorclass.edc
+++ b/data/elementary/themes/edc/elm/colorclass.edc
@@ -280,8 +280,6 @@ group { "colorclass/colors"; program_source: "elm"; nobroadcast;
 }
 
 group { "colorclass/color1"; nomouse; nobroadcast;
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
    parts {
       rect { "event"; mouse;
          desc { color: 0 0 0 0; fixed: 1 1; }
@@ -295,15 +293,6 @@ group { "colorclass/color1"; nomouse; nobroadcast;
             fixed: 1 1;
          }
       }
-      image { "pat"; clip: "clip";
-         desc {
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
-            fixed: 1 1;
-         }
-      }
       rect { "color"; clip: "clip";
          desc { align: 0 0;
             min: 40 20;
@@ -313,33 +302,7 @@ group { "colorclass/color1"; nomouse; nobroadcast;
             fixed: 1 1;
          }
       }
-      image { "shadow"; clip: "clip";
-         desc {
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-            fixed: 1 1;
-         }
-      }
-      image { "inset"; clip: "clip";
-         desc {
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: 1 1;
-            rel2.to: "bg";
-            rel2.offset: -2 -2;
-            fill.smooth: 0;
-            fixed: 1 1;
-         }
-      }
       text { "text"; clip: "clip";
-         effect: SHADOW BOTTOM;
          scale: 1;
          desc { align: 0 0.5;
             rel1.offset: 2 2;
diff --git a/data/elementary/themes/edc/elm/ews.edc b/data/elementary/themes/edc/elm/ews.edc
index aa6e34b8b9..947ae74774 100644
--- a/data/elementary/themes/edc/elm/ews.edc
+++ b/data/elementary/themes/edc/elm/ews.edc
@@ -17,7 +17,6 @@ group { name: "elm/ews/decoration/default";
    images.image: "sym_up_dark_selected.png" COMP;
    images.image: "sym_up_light_normal.png" COMP;
    images.image: "sym_up_light_selected.png" COMP;
-   images.image: "glow_round_corners_small.png" COMP;
    images.image: "knob_round_small_busy.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
diff --git a/data/elementary/themes/edc/elm/gengrid.edc b/data/elementary/themes/edc/elm/gengrid.edc
index 055f213bee..93293ad54e 100644
--- a/data/elementary/themes/edc/elm/gengrid.edc
+++ b/data/elementary/themes/edc/elm/gengrid.edc
@@ -324,7 +324,6 @@ IC("ic-arrow-u", "arrow-u")
 
 group { name: "elm/gengrid/item/up/default";
    inherit: "elm/gengrid/item/default/default";
-   images.image: "icon_arrow_up.png" COMP;
    parts {
       part { name: "icon_area"; type: RECT;
          description { state: "default" 0.0;
diff --git a/data/elementary/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc
index 11d2b8ccf2..b4d14f6582 100644
--- a/data/elementary/themes/edc/elm/menu.edc
+++ b/data/elementary/themes/edc/elm/menu.edc
@@ -492,9 +492,6 @@ group { name: "elm/hover/base/menu/default";
 //and no part should interact except the bottom area
 group { name: "elm/hover/base/submenu/default";
    inherit: "elm/hover/base/menu/default";
-   images {
-      image: "vgrad_med.png" COMP;
-   }
    parts {
       part { name: "elm.swallow.offset";
          repeat_events: 1;
diff --git a/data/elementary/themes/edc/elm/player.edc b/data/elementary/themes/edc/elm/player.edc
index 91419f399e..1cf05d7261 100644
--- a/data/elementary/themes/edc/elm/player.edc
+++ b/data/elementary/themes/edc/elm/player.edc
@@ -1,8 +1,5 @@
 #define BSZ 24
 group { name: "elm/player/base/default";
-   images.image: "bevel_out.png" COMP;
-   images.image: "vgrad_shadow_bi.png" COMP;
-   images.image: "shadow_square_tiny.png" COMP;
    script {
       public in_control;
       public in_volume;
diff --git a/data/elementary/themes/edc/luncher.edc b/data/elementary/themes/edc/luncher.edc
index 0a3ec45467..e9ee605a00 100644
--- a/data/elementary/themes/edc/luncher.edc
+++ b/data/elementary/themes/edc/luncher.edc
@@ -465,7 +465,6 @@ group { name: "elm/tooltip/base/luncher";
    data.item: "hide_timeout" "0.35";
    // if in a window... it's transparent!
    data.item: "transparent" "enabled";
-   images.image: "tooltip-base.png" COMP;
    images.image: "tooltip-corner-top-left-tip.png" COMP;
    images.image: "tooltip-corner-top-right-tip.png" COMP;
    images.image: "tooltip-corner-bottom-left-tip.png" COMP;
diff --git a/data/elementary/themes/edc/menu.edc b/data/elementary/themes/edc/menu.edc
index fa97e61bbd..ed4613770c 100644
--- a/data/elementary/themes/edc/menu.edc
+++ b/data/elementary/themes/edc/menu.edc
@@ -66,7 +66,6 @@ group { name: "e/widgets/menu/default/background";
 }
 
 group { name: "e/widgets/menu/default/separator";
-   images.image: "separator_horiz.png" COMP;
    parts {
       part { name: "base"; type: RECT;
          scale: 1;
diff --git a/data/elementary/themes/edc/randr.edc b/data/elementary/themes/edc/randr.edc
index c0823415f0..0b0526d774 100644
--- a/data/elementary/themes/edc/randr.edc
+++ b/data/elementary/themes/edc/randr.edc
@@ -60,7 +60,6 @@ group { name: "e/conf/randr/main/monitor";
 
 group { name: "e/conf/randr/main/frame";
    images.image: "hole_tiny.png" COMP;
-   images.image: "led_tiny_orange.png" COMP;
    images.image: "led_tiny_green.png" COMP;
    images.image: "screen_bg.png" COMP;
    images.image: "mini_blue_glow_arrow_0.png" COMP;
@@ -70,7 +69,6 @@ group { name: "e/conf/randr/main/frame";
    images.image: "sym_up_light_normal.png" COMP;
    images.image: "sym_up_light_selected.png" COMP;
    images.image: "icon_system-shutdown.png" COMP;
-   images.image: "icon_arrow_up.png" COMP;
    styles {
       style { name: "randr_name_style";
          base: "font="FNBD" font_size=10 text_class=randr_monitor align=center color=#ffff wrap=word";
diff --git a/data/elementary/themes/img/O/about_bot.png b/data/elementary/themes/img/O/about_bot.png
deleted file mode 100644
index ef0c7cd689..0000000000
Binary files a/data/elementary/themes/img/O/about_bot.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/about_mid.png b/data/elementary/themes/img/O/about_mid.png
deleted file mode 100644
index 2162f0a090..0000000000
Binary files a/data/elementary/themes/img/O/about_mid.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/about_top.png b/data/elementary/themes/img/O/about_top.png
deleted file mode 100644
index db2c27ef10..0000000000
Binary files a/data/elementary/themes/img/O/about_top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/arrow_down.png b/data/elementary/themes/img/O/arrow_down.png
deleted file mode 100644
index 3e181396a7..0000000000
Binary files a/data/elementary/themes/img/O/arrow_down.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/arrow_up.png b/data/elementary/themes/img/O/arrow_up.png
deleted file mode 100644
index 1b499b8e8b..0000000000
Binary files a/data/elementary/themes/img/O/arrow_up.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/batt_base.png b/data/elementary/themes/img/O/batt_base.png
deleted file mode 100644
index 610db36b2e..0000000000
Binary files a/data/elementary/themes/img/O/batt_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/batt_level.png b/data/elementary/themes/img/O/batt_level.png
deleted file mode 100644
index 260402642d..0000000000
Binary files a/data/elementary/themes/img/O/batt_level.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/batt_over.png b/data/elementary/themes/img/O/batt_over.png
deleted file mode 100644
index c79adb50db..0000000000
Binary files a/data/elementary/themes/img/O/batt_over.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/batt_power.png b/data/elementary/themes/img/O/batt_power.png
deleted file mode 100644
index f64625ebb7..0000000000
Binary files a/data/elementary/themes/img/O/batt_power.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bg_shadow.png b/data/elementary/themes/img/O/bg_shadow.png
deleted file mode 100644
index ae502f8aef..0000000000
Binary files a/data/elementary/themes/img/O/bg_shadow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/big_arrow_up.png b/data/elementary/themes/img/O/big_arrow_up.png
deleted file mode 100644
index 7d714ff634..0000000000
Binary files a/data/elementary/themes/img/O/big_arrow_up.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bnw.png b/data/elementary/themes/img/O/bnw.png
deleted file mode 100644
index 3baf7bcf04..0000000000
Binary files a/data/elementary/themes/img/O/bnw.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_base1.png b/data/elementary/themes/img/O/bt_base1.png
deleted file mode 100644
index 2d1f179097..0000000000
Binary files a/data/elementary/themes/img/O/bt_base1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_base2.png b/data/elementary/themes/img/O/bt_base2.png
deleted file mode 100644
index dd3e3ce066..0000000000
Binary files a/data/elementary/themes/img/O/bt_base2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_dis_base.png b/data/elementary/themes/img/O/bt_dis_base.png
deleted file mode 100644
index 06f3dd51af..0000000000
Binary files a/data/elementary/themes/img/O/bt_dis_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_dis_hilight.png b/data/elementary/themes/img/O/bt_dis_hilight.png
deleted file mode 100644
index e5cf7d3b02..0000000000
Binary files a/data/elementary/themes/img/O/bt_dis_hilight.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_dis_shine.png b/data/elementary/themes/img/O/bt_dis_shine.png
deleted file mode 100644
index 20285bebb1..0000000000
Binary files a/data/elementary/themes/img/O/bt_dis_shine.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_glow.png b/data/elementary/themes/img/O/bt_glow.png
deleted file mode 100644
index 25891a158e..0000000000
Binary files a/data/elementary/themes/img/O/bt_glow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_hilight.png b/data/elementary/themes/img/O/bt_hilight.png
deleted file mode 100644
index 3a6750e784..0000000000
Binary files a/data/elementary/themes/img/O/bt_hilight.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_shine.png b/data/elementary/themes/img/O/bt_shine.png
deleted file mode 100644
index a58bdeed46..0000000000
Binary files a/data/elementary/themes/img/O/bt_shine.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_sm_base1.png b/data/elementary/themes/img/O/bt_sm_base1.png
deleted file mode 100644
index c37e182ed2..0000000000
Binary files a/data/elementary/themes/img/O/bt_sm_base1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_sm_base2.png b/data/elementary/themes/img/O/bt_sm_base2.png
deleted file mode 100644
index f159648ec4..0000000000
Binary files a/data/elementary/themes/img/O/bt_sm_base2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_sm_hilight.png b/data/elementary/themes/img/O/bt_sm_hilight.png
deleted file mode 100644
index 63899caac8..0000000000
Binary files a/data/elementary/themes/img/O/bt_sm_hilight.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bt_sm_shine.png b/data/elementary/themes/img/O/bt_sm_shine.png
deleted file mode 100644
index 23bf3110e1..0000000000
Binary files a/data/elementary/themes/img/O/bt_sm_shine.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bulb-0.png b/data/elementary/themes/img/O/bulb-0.png
deleted file mode 100644
index 6b54be1613..0000000000
Binary files a/data/elementary/themes/img/O/bulb-0.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bulb-1.png b/data/elementary/themes/img/O/bulb-1.png
deleted file mode 100644
index ca46a4f068..0000000000
Binary files a/data/elementary/themes/img/O/bulb-1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/bulb-2.png b/data/elementary/themes/img/O/bulb-2.png
deleted file mode 100644
index bacc911138..0000000000
Binary files a/data/elementary/themes/img/O/bulb-2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-1.png b/data/elementary/themes/img/O/busy-1.png
deleted file mode 100644
index 48d00e04fe..0000000000
Binary files a/data/elementary/themes/img/O/busy-1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-2.png b/data/elementary/themes/img/O/busy-2.png
deleted file mode 100644
index 75d840444c..0000000000
Binary files a/data/elementary/themes/img/O/busy-2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-3.png b/data/elementary/themes/img/O/busy-3.png
deleted file mode 100644
index b383fcbad2..0000000000
Binary files a/data/elementary/themes/img/O/busy-3.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-4.png b/data/elementary/themes/img/O/busy-4.png
deleted file mode 100644
index 8aa8a0f2cf..0000000000
Binary files a/data/elementary/themes/img/O/busy-4.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-5.png b/data/elementary/themes/img/O/busy-5.png
deleted file mode 100644
index 7da0e041b8..0000000000
Binary files a/data/elementary/themes/img/O/busy-5.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-6.png b/data/elementary/themes/img/O/busy-6.png
deleted file mode 100644
index 45b27bd83c..0000000000
Binary files a/data/elementary/themes/img/O/busy-6.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-7.png b/data/elementary/themes/img/O/busy-7.png
deleted file mode 100644
index 53bed1a979..0000000000
Binary files a/data/elementary/themes/img/O/busy-7.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-8.png b/data/elementary/themes/img/O/busy-8.png
deleted file mode 100644
index 75d684a251..0000000000
Binary files a/data/elementary/themes/img/O/busy-8.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/busy-9.png b/data/elementary/themes/img/O/busy-9.png
deleted file mode 100644
index 4af4a4ae9c..0000000000
Binary files a/data/elementary/themes/img/O/busy-9.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/dia_botshad.png b/data/elementary/themes/img/O/dia_botshad.png
deleted file mode 100644
index 89a598e0f2..0000000000
Binary files a/data/elementary/themes/img/O/dia_botshad.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/dia_grad.png b/data/elementary/themes/img/O/dia_grad.png
deleted file mode 100644
index 1385d12d47..0000000000
Binary files a/data/elementary/themes/img/O/dia_grad.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_0.png b/data/elementary/themes/img/O/digit_0.png
deleted file mode 100644
index 9cdc3b189c..0000000000
Binary files a/data/elementary/themes/img/O/digit_0.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_1.png b/data/elementary/themes/img/O/digit_1.png
deleted file mode 100644
index e68ef0a625..0000000000
Binary files a/data/elementary/themes/img/O/digit_1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_2.png b/data/elementary/themes/img/O/digit_2.png
deleted file mode 100644
index 463a6a1ac9..0000000000
Binary files a/data/elementary/themes/img/O/digit_2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_3.png b/data/elementary/themes/img/O/digit_3.png
deleted file mode 100644
index 1f9c5f443e..0000000000
Binary files a/data/elementary/themes/img/O/digit_3.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_4.png b/data/elementary/themes/img/O/digit_4.png
deleted file mode 100644
index 58b1c0723e..0000000000
Binary files a/data/elementary/themes/img/O/digit_4.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_5.png b/data/elementary/themes/img/O/digit_5.png
deleted file mode 100644
index d9f6483238..0000000000
Binary files a/data/elementary/themes/img/O/digit_5.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_6.png b/data/elementary/themes/img/O/digit_6.png
deleted file mode 100644
index 0f5a55d423..0000000000
Binary files a/data/elementary/themes/img/O/digit_6.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_7.png b/data/elementary/themes/img/O/digit_7.png
deleted file mode 100644
index 0d36ec28e1..0000000000
Binary files a/data/elementary/themes/img/O/digit_7.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_8.png b/data/elementary/themes/img/O/digit_8.png
deleted file mode 100644
index cd24056eb3..0000000000
Binary files a/data/elementary/themes/img/O/digit_8.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_9.png b/data/elementary/themes/img/O/digit_9.png
deleted file mode 100644
index 4691191f4b..0000000000
Binary files a/data/elementary/themes/img/O/digit_9.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_am.png b/data/elementary/themes/img/O/digit_am.png
deleted file mode 100644
index a779563324..0000000000
Binary files a/data/elementary/themes/img/O/digit_am.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_na.png b/data/elementary/themes/img/O/digit_na.png
deleted file mode 100644
index e8652ef030..0000000000
Binary files a/data/elementary/themes/img/O/digit_na.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_nm.png b/data/elementary/themes/img/O/digit_nm.png
deleted file mode 100644
index 292a2a3b6d..0000000000
Binary files a/data/elementary/themes/img/O/digit_nm.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/digit_pm.png b/data/elementary/themes/img/O/digit_pm.png
deleted file mode 100644
index e3ccf77770..0000000000
Binary files a/data/elementary/themes/img/O/digit_pm.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/e17_mini_button_shadow2.png b/data/elementary/themes/img/O/e17_mini_button_shadow2.png
deleted file mode 100644
index dcdc6ea263..0000000000
Binary files a/data/elementary/themes/img/O/e17_mini_button_shadow2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/everything_box.png b/data/elementary/themes/img/O/everything_box.png
deleted file mode 100644
index 60961a712e..0000000000
Binary files a/data/elementary/themes/img/O/everything_box.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/everything_item_bg.png b/data/elementary/themes/img/O/everything_item_bg.png
deleted file mode 100644
index 1bd167b83b..0000000000
Binary files a/data/elementary/themes/img/O/everything_item_bg.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/exq-bglight.png b/data/elementary/themes/img/O/exq-bglight.png
deleted file mode 100644
index 5eeeca2451..0000000000
Binary files a/data/elementary/themes/img/O/exq-bglight.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/exq-dot-glow.png b/data/elementary/themes/img/O/exq-dot-glow.png
deleted file mode 100644
index 8e0d0f711b..0000000000
Binary files a/data/elementary/themes/img/O/exq-dot-glow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/exq-dot.png b/data/elementary/themes/img/O/exq-dot.png
deleted file mode 100644
index 005d896c9c..0000000000
Binary files a/data/elementary/themes/img/O/exq-dot.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/exq-logo.png b/data/elementary/themes/img/O/exq-logo.png
deleted file mode 100644
index e9bdf3650a..0000000000
Binary files a/data/elementary/themes/img/O/exq-logo.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/exq-vgrad.png b/data/elementary/themes/img/O/exq-vgrad.png
deleted file mode 100644
index 708fe70e7d..0000000000
Binary files a/data/elementary/themes/img/O/exq-vgrad.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/gadman_border.png b/data/elementary/themes/img/O/gadman_border.png
deleted file mode 100644
index 9c1cc00f2b..0000000000
Binary files a/data/elementary/themes/img/O/gadman_border.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/gadman_bottom.png b/data/elementary/themes/img/O/gadman_bottom.png
deleted file mode 100644
index fbfb1e9655..0000000000
Binary files a/data/elementary/themes/img/O/gadman_bottom.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/gadman_frame.png b/data/elementary/themes/img/O/gadman_frame.png
deleted file mode 100644
index 6b8b51f29d..0000000000
Binary files a/data/elementary/themes/img/O/gadman_frame.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/gadman_left.png b/data/elementary/themes/img/O/gadman_left.png
deleted file mode 100644
index 374be1fd52..0000000000
Binary files a/data/elementary/themes/img/O/gadman_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/gadman_right.png b/data/elementary/themes/img/O/gadman_right.png
deleted file mode 100644
index c27ebb34e2..0000000000
Binary files a/data/elementary/themes/img/O/gadman_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/gadman_top.png b/data/elementary/themes/img/O/gadman_top.png
deleted file mode 100644
index 300c4b68ef..0000000000
Binary files a/data/elementary/themes/img/O/gadman_top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/glow.png b/data/elementary/themes/img/O/glow.png
deleted file mode 100644
index b423e0aa49..0000000000
Binary files a/data/elementary/themes/img/O/glow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_active.png b/data/elementary/themes/img/O/icon_active.png
deleted file mode 100644
index 2ad17e9aa4..0000000000
Binary files a/data/elementary/themes/img/O/icon_active.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_add.png b/data/elementary/themes/img/O/icon_add.png
deleted file mode 100644
index f6f4108ee7..0000000000
Binary files a/data/elementary/themes/img/O/icon_add.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_add_fav.png b/data/elementary/themes/img/O/icon_add_fav.png
deleted file mode 100644
index 9d468a4679..0000000000
Binary files a/data/elementary/themes/img/O/icon_add_fav.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_advanced.png b/data/elementary/themes/img/O/icon_advanced.png
deleted file mode 100644
index 91a80500a9..0000000000
Binary files a/data/elementary/themes/img/O/icon_advanced.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_applications.png b/data/elementary/themes/img/O/icon_applications.png
deleted file mode 100644
index d2fd238961..0000000000
Binary files a/data/elementary/themes/img/O/icon_applications.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_applications_ibar.png b/data/elementary/themes/img/O/icon_applications_ibar.png
deleted file mode 100644
index 094abda084..0000000000
Binary files a/data/elementary/themes/img/O/icon_applications_ibar.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_applications_new.png b/data/elementary/themes/img/O/icon_applications_new.png
deleted file mode 100644
index e1027c4c5d..0000000000
Binary files a/data/elementary/themes/img/O/icon_applications_new.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_applications_restart.png b/data/elementary/themes/img/O/icon_applications_restart.png
deleted file mode 100644
index 92ecd7d0e3..0000000000
Binary files a/data/elementary/themes/img/O/icon_applications_restart.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_applications_startup.png b/data/elementary/themes/img/O/icon_applications_startup.png
deleted file mode 100644
index 987b0c9042..0000000000
Binary files a/data/elementary/themes/img/O/icon_applications_startup.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_autoscroll.png b/data/elementary/themes/img/O/icon_autoscroll.png
deleted file mode 100644
index d6d81129ef..0000000000
Binary files a/data/elementary/themes/img/O/icon_autoscroll.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_behavior.png b/data/elementary/themes/img/O/icon_behavior.png
deleted file mode 100644
index f82ff56dd7..0000000000
Binary files a/data/elementary/themes/img/O/icon_behavior.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_border.png b/data/elementary/themes/img/O/icon_border_border.png
deleted file mode 100644
index da50fe5cdd..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_border.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_close.png b/data/elementary/themes/img/O/icon_border_close.png
deleted file mode 100644
index 718acccbba..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_close.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_kill.png b/data/elementary/themes/img/O/icon_border_kill.png
deleted file mode 100644
index 5f1f0703a1..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_kill.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_lock.png b/data/elementary/themes/img/O/icon_border_lock.png
deleted file mode 100644
index cf6705e317..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_lock.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_maximize.png b/data/elementary/themes/img/O/icon_border_maximize.png
deleted file mode 100644
index bc70cc76dc..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_maximize.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_minimize.png b/data/elementary/themes/img/O/icon_border_minimize.png
deleted file mode 100644
index 43099b1b06..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_minimize.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_more.png b/data/elementary/themes/img/O/icon_border_more.png
deleted file mode 100644
index a27b0fb64f..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_more.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_pager.png b/data/elementary/themes/img/O/icon_border_pager.png
deleted file mode 100644
index 5ea60a9460..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_pager.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_pin.png b/data/elementary/themes/img/O/icon_border_pin.png
deleted file mode 100644
index cb1ed8d314..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_pin.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_properties.png b/data/elementary/themes/img/O/icon_border_properties.png
deleted file mode 100644
index f051a35bbd..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_properties.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_remember.png b/data/elementary/themes/img/O/icon_border_remember.png
deleted file mode 100644
index d27b3bfe30..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_remember.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_sendto.png b/data/elementary/themes/img/O/icon_border_sendto.png
deleted file mode 100644
index 495aff746b..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_sendto.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_shaded.png b/data/elementary/themes/img/O/icon_border_shaded.png
deleted file mode 100644
index cf83cef181..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_shaded.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_skip.png b/data/elementary/themes/img/O/icon_border_skip.png
deleted file mode 100644
index 8a5e53a416..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_skip.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_stack_bot.png b/data/elementary/themes/img/O/icon_border_stack_bot.png
deleted file mode 100644
index 5f12280386..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_stack_bot.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_stack_norm.png b/data/elementary/themes/img/O/icon_border_stack_norm.png
deleted file mode 100644
index f0035f7e32..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_stack_norm.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_border_stack_top.png b/data/elementary/themes/img/O/icon_border_stack_top.png
deleted file mode 100644
index 351d29816f..0000000000
Binary files a/data/elementary/themes/img/O/icon_border_stack_top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_check.png b/data/elementary/themes/img/O/icon_check.png
deleted file mode 100644
index c698b1e88f..0000000000
Binary files a/data/elementary/themes/img/O/icon_check.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_close.png b/data/elementary/themes/img/O/icon_close.png
deleted file mode 100644
index 688c548595..0000000000
Binary files a/data/elementary/themes/img/O/icon_close.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_colors.png b/data/elementary/themes/img/O/icon_colors.png
deleted file mode 100644
index 0584ad50f0..0000000000
Binary files a/data/elementary/themes/img/O/icon_colors.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_config.png b/data/elementary/themes/img/O/icon_config.png
deleted file mode 100644
index b7f6c56435..0000000000
Binary files a/data/elementary/themes/img/O/icon_config.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_configuration.png b/data/elementary/themes/img/O/icon_configuration.png
deleted file mode 100644
index 43602b0bfc..0000000000
Binary files a/data/elementary/themes/img/O/icon_configuration.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_del.png b/data/elementary/themes/img/O/icon_del.png
deleted file mode 100644
index 39f8f3b192..0000000000
Binary files a/data/elementary/themes/img/O/icon_del.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_desklock.png b/data/elementary/themes/img/O/icon_desklock.png
deleted file mode 100644
index 4d8b5911f8..0000000000
Binary files a/data/elementary/themes/img/O/icon_desklock.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_desklock_menu.png b/data/elementary/themes/img/O/icon_desklock_menu.png
deleted file mode 100644
index d050151f39..0000000000
Binary files a/data/elementary/themes/img/O/icon_desklock_menu.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_desktops.png b/data/elementary/themes/img/O/icon_desktops.png
deleted file mode 100644
index ea6853a6d9..0000000000
Binary files a/data/elementary/themes/img/O/icon_desktops.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_directories.png b/data/elementary/themes/img/O/icon_directories.png
deleted file mode 100644
index e30a9bbb5a..0000000000
Binary files a/data/elementary/themes/img/O/icon_directories.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_down_arrow.png b/data/elementary/themes/img/O/icon_down_arrow.png
deleted file mode 100644
index 305b79e627..0000000000
Binary files a/data/elementary/themes/img/O/icon_down_arrow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_dummy.png b/data/elementary/themes/img/O/icon_dummy.png
deleted file mode 100644
index fc12873a7c..0000000000
Binary files a/data/elementary/themes/img/O/icon_dummy.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_arrange.png b/data/elementary/themes/img/O/icon_efm_arrange.png
deleted file mode 100644
index 72b43b676f..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_arrange.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_arrange_name.png b/data/elementary/themes/img/O/icon_efm_arrange_name.png
deleted file mode 100644
index 293173e6db..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_arrange_name.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_arrange_time.png b/data/elementary/themes/img/O/icon_efm_arrange_time.png
deleted file mode 100644
index 52612de6b5..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_arrange_time.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_cd.png b/data/elementary/themes/img/O/icon_efm_cd.png
deleted file mode 100644
index 8cc29f00fd..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_cd.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_copy.png b/data/elementary/themes/img/O/icon_efm_copy.png
deleted file mode 100644
index d2af9e34d9..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_copy.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_cut.png b/data/elementary/themes/img/O/icon_efm_cut.png
deleted file mode 100644
index 7fb4753226..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_cut.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_delete.png b/data/elementary/themes/img/O/icon_efm_delete.png
deleted file mode 100644
index ddf87823d3..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_delete.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_desktop.png b/data/elementary/themes/img/O/icon_efm_desktop.png
deleted file mode 100644
index a1e2ab40ec..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_desktop.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_dnd_ask.png b/data/elementary/themes/img/O/icon_efm_dnd_ask.png
deleted file mode 100644
index 56a6884c5e..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_dnd_ask.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_dnd_copy.png b/data/elementary/themes/img/O/icon_efm_dnd_copy.png
deleted file mode 100644
index 7224892f41..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_dnd_copy.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_dnd_move.png b/data/elementary/themes/img/O/icon_efm_dnd_move.png
deleted file mode 100644
index b0a65a1ee6..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_dnd_move.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_eject.png b/data/elementary/themes/img/O/icon_efm_eject.png
deleted file mode 100644
index 0162356e22..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_eject.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_file.png b/data/elementary/themes/img/O/icon_efm_file.png
deleted file mode 100644
index 102f6c0723..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_file.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_file_del.png b/data/elementary/themes/img/O/icon_efm_file_del.png
deleted file mode 100644
index 019e3d6100..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_file_del.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_flash.png b/data/elementary/themes/img/O/icon_efm_flash.png
deleted file mode 100644
index f5152a72d5..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_flash.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_folder.png b/data/elementary/themes/img/O/icon_efm_folder.png
deleted file mode 100644
index 2bee581914..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_folder.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_hdd.png b/data/elementary/themes/img/O/icon_efm_hdd.png
deleted file mode 100644
index f77673d212..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_hdd.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_home.png b/data/elementary/themes/img/O/icon_efm_home.png
deleted file mode 100644
index e7a13849ed..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_home.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_new.png b/data/elementary/themes/img/O/icon_efm_new.png
deleted file mode 100644
index 44e9146d56..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_new.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_new_dir.png b/data/elementary/themes/img/O/icon_efm_new_dir.png
deleted file mode 100644
index 317e0bf768..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_new_dir.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_open.png b/data/elementary/themes/img/O/icon_efm_open.png
deleted file mode 100644
index ee313035d2..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_open.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_paste.png b/data/elementary/themes/img/O/icon_efm_paste.png
deleted file mode 100644
index 8724658439..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_paste.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_properties.png b/data/elementary/themes/img/O/icon_efm_properties.png
deleted file mode 100644
index 92cc8382b7..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_properties.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_refresh.png b/data/elementary/themes/img/O/icon_efm_refresh.png
deleted file mode 100644
index 74b606072a..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_refresh.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_rename.png b/data/elementary/themes/img/O/icon_efm_rename.png
deleted file mode 100644
index 5ac3198aa6..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_rename.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_root.png b/data/elementary/themes/img/O/icon_efm_root.png
deleted file mode 100644
index eec2a1e09d..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_root.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_select.png b/data/elementary/themes/img/O/icon_efm_select.png
deleted file mode 100644
index 442c4be912..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_select.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_sort.png b/data/elementary/themes/img/O/icon_efm_sort.png
deleted file mode 100644
index 0a0588f1ca..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_sort.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_tmp.png b/data/elementary/themes/img/O/icon_efm_tmp.png
deleted file mode 100644
index bd6550684c..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_tmp.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_usbmedia.png b/data/elementary/themes/img/O/icon_efm_usbmedia.png
deleted file mode 100644
index 6989e97dd5..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_usbmedia.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_view.png b/data/elementary/themes/img/O/icon_efm_view.png
deleted file mode 100644
index 38b701626d..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_view.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_view_details.png b/data/elementary/themes/img/O/icon_efm_view_details.png
deleted file mode 100644
index 29fc7867fb..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_view_details.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_view_name.png b/data/elementary/themes/img/O/icon_efm_view_name.png
deleted file mode 100644
index 22d78c115b..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_view_name.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_vol_mounted.png b/data/elementary/themes/img/O/icon_efm_vol_mounted.png
deleted file mode 100644
index f52b563f50..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_vol_mounted.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_efm_vol_unmounted.png b/data/elementary/themes/img/O/icon_efm_vol_unmounted.png
deleted file mode 100644
index 793d9a1215..0000000000
Binary files a/data/elementary/themes/img/O/icon_efm_vol_unmounted.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_engine.png b/data/elementary/themes/img/O/icon_engine.png
deleted file mode 100644
index dfbe46ffc0..0000000000
Binary files a/data/elementary/themes/img/O/icon_engine.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_evry_clipboard.png b/data/elementary/themes/img/O/icon_evry_clipboard.png
deleted file mode 100644
index a42602b29c..0000000000
Binary files a/data/elementary/themes/img/O/icon_evry_clipboard.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_extensions.png b/data/elementary/themes/img/O/icon_extensions.png
deleted file mode 100644
index 55ba93e7d4..0000000000
Binary files a/data/elementary/themes/img/O/icon_extensions.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_favorites.png b/data/elementary/themes/img/O/icon_favorites.png
deleted file mode 100644
index fad7df5d0e..0000000000
Binary files a/data/elementary/themes/img/O/icon_favorites.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_file_icons.png b/data/elementary/themes/img/O/icon_file_icons.png
deleted file mode 100644
index 7d74638db4..0000000000
Binary files a/data/elementary/themes/img/O/icon_file_icons.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_fonts.png b/data/elementary/themes/img/O/icon_fonts.png
deleted file mode 100644
index 9171dbf3ae..0000000000
Binary files a/data/elementary/themes/img/O/icon_fonts.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_gadget.png b/data/elementary/themes/img/O/icon_gadget.png
deleted file mode 100644
index 0f84136857..0000000000
Binary files a/data/elementary/themes/img/O/icon_gadget.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_globe.png b/data/elementary/themes/img/O/icon_globe.png
deleted file mode 100644
index 946d2241cb..0000000000
Binary files a/data/elementary/themes/img/O/icon_globe.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_gradient.png b/data/elementary/themes/img/O/icon_gradient.png
deleted file mode 100644
index a523b0956d..0000000000
Binary files a/data/elementary/themes/img/O/icon_gradient.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_halt.png b/data/elementary/themes/img/O/icon_halt.png
deleted file mode 100644
index 63ed9c85d1..0000000000
Binary files a/data/elementary/themes/img/O/icon_halt.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_hibernate.png b/data/elementary/themes/img/O/icon_hibernate.png
deleted file mode 100644
index 45cfa63d5b..0000000000
Binary files a/data/elementary/themes/img/O/icon_hibernate.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_icon_theme.png b/data/elementary/themes/img/O/icon_icon_theme.png
deleted file mode 100644
index 89d49e7ffb..0000000000
Binary files a/data/elementary/themes/img/O/icon_icon_theme.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_illume.png b/data/elementary/themes/img/O/icon_illume.png
deleted file mode 100644
index babb896340..0000000000
Binary files a/data/elementary/themes/img/O/icon_illume.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_imc.png b/data/elementary/themes/img/O/icon_imc.png
deleted file mode 100644
index 7ddd968bce..0000000000
Binary files a/data/elementary/themes/img/O/icon_imc.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_interaction.png b/data/elementary/themes/img/O/icon_interaction.png
deleted file mode 100644
index 1c82af9f9c..0000000000
Binary files a/data/elementary/themes/img/O/icon_interaction.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_intl.png b/data/elementary/themes/img/O/icon_intl.png
deleted file mode 100644
index 826c7492f0..0000000000
Binary files a/data/elementary/themes/img/O/icon_intl.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_keyboard.png b/data/elementary/themes/img/O/icon_keyboard.png
deleted file mode 100644
index 84b14bab59..0000000000
Binary files a/data/elementary/themes/img/O/icon_keyboard.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_keys.png b/data/elementary/themes/img/O/icon_keys.png
deleted file mode 100644
index 4bbd8b10d8..0000000000
Binary files a/data/elementary/themes/img/O/icon_keys.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_left_arrow.png b/data/elementary/themes/img/O/icon_left_arrow.png
deleted file mode 100644
index e9338019b7..0000000000
Binary files a/data/elementary/themes/img/O/icon_left_arrow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_logout.png b/data/elementary/themes/img/O/icon_logout.png
deleted file mode 100644
index 29ee4e71e9..0000000000
Binary files a/data/elementary/themes/img/O/icon_logout.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_look.png b/data/elementary/themes/img/O/icon_look.png
deleted file mode 100644
index bb8a366ad7..0000000000
Binary files a/data/elementary/themes/img/O/icon_look.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_lost_windows.png b/data/elementary/themes/img/O/icon_lost_windows.png
deleted file mode 100644
index e19cb82645..0000000000
Binary files a/data/elementary/themes/img/O/icon_lost_windows.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_menu_settings.png b/data/elementary/themes/img/O/icon_menu_settings.png
deleted file mode 100644
index f75bb19c52..0000000000
Binary files a/data/elementary/themes/img/O/icon_menu_settings.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_menus.png b/data/elementary/themes/img/O/icon_menus.png
deleted file mode 100644
index 0ed330fc2d..0000000000
Binary files a/data/elementary/themes/img/O/icon_menus.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_audio_generic.png b/data/elementary/themes/img/O/icon_mime_audio_generic.png
deleted file mode 100644
index 874b6cfaf3..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_audio_generic.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_bdf.png b/data/elementary/themes/img/O/icon_mime_bdf.png
deleted file mode 100644
index b850a65466..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_bdf.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_c.png b/data/elementary/themes/img/O/icon_mime_c.png
deleted file mode 100644
index 2c0e5c4899..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_c.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_css.png b/data/elementary/themes/img/O/icon_mime_css.png
deleted file mode 100644
index 96558d8ebd..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_css.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_deb.png b/data/elementary/themes/img/O/icon_mime_deb.png
deleted file mode 100644
index 08d79d739a..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_deb.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_doc.png b/data/elementary/themes/img/O/icon_mime_doc.png
deleted file mode 100644
index 929d2a33ac..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_doc.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_executable_generic.png b/data/elementary/themes/img/O/icon_mime_executable_generic.png
deleted file mode 100644
index 655407a218..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_executable_generic.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_font_generic.png b/data/elementary/themes/img/O/icon_mime_font_generic.png
deleted file mode 100644
index 5272104644..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_font_generic.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_h.png b/data/elementary/themes/img/O/icon_mime_h.png
deleted file mode 100644
index 074f5bb761..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_h.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_html.png b/data/elementary/themes/img/O/icon_mime_html.png
deleted file mode 100644
index 1b24ebd243..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_html.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_image_generic.png b/data/elementary/themes/img/O/icon_mime_image_generic.png
deleted file mode 100644
index 887e310588..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_image_generic.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_o.png b/data/elementary/themes/img/O/icon_mime_o.png
deleted file mode 100644
index 4153cfaf1e..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_o.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_package.png b/data/elementary/themes/img/O/icon_mime_package.png
deleted file mode 100644
index 40d11bdcb7..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_package.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_patch.png b/data/elementary/themes/img/O/icon_mime_patch.png
deleted file mode 100644
index 2b9c67e59e..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_patch.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_pcf.png b/data/elementary/themes/img/O/icon_mime_pcf.png
deleted file mode 100644
index 2d887d44ad..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_pcf.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_pdf.png b/data/elementary/themes/img/O/icon_mime_pdf.png
deleted file mode 100644
index ba537a9054..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_pdf.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_plain.png b/data/elementary/themes/img/O/icon_mime_plain.png
deleted file mode 100644
index 7c25d34848..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_plain.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_sh.png b/data/elementary/themes/img/O/icon_mime_sh.png
deleted file mode 100644
index e46ae4eb8a..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_sh.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_text_generic.png b/data/elementary/themes/img/O/icon_mime_text_generic.png
deleted file mode 100644
index 9415847b25..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_text_generic.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_ttf.png b/data/elementary/themes/img/O/icon_mime_ttf.png
deleted file mode 100644
index 9c150111f1..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_ttf.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_video_generic.png b/data/elementary/themes/img/O/icon_mime_video_generic.png
deleted file mode 100644
index fcfedbe111..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_video_generic.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mime_xcf.png b/data/elementary/themes/img/O/icon_mime_xcf.png
deleted file mode 100644
index f1e71a6d92..0000000000
Binary files a/data/elementary/themes/img/O/icon_mime_xcf.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mixer.png b/data/elementary/themes/img/O/icon_mixer.png
deleted file mode 100644
index e5e3b0e236..0000000000
Binary files a/data/elementary/themes/img/O/icon_mixer.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_modules.png b/data/elementary/themes/img/O/icon_modules.png
deleted file mode 100644
index 50101e8f17..0000000000
Binary files a/data/elementary/themes/img/O/icon_modules.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse.png b/data/elementary/themes/img/O/icon_mouse.png
deleted file mode 100644
index 0af8dbc397..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse_clean.png b/data/elementary/themes/img/O/icon_mouse_clean.png
deleted file mode 100644
index 190193c686..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse_clean.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse_extra.png b/data/elementary/themes/img/O/icon_mouse_extra.png
deleted file mode 100644
index 94f83b1684..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse_extra.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse_left.png b/data/elementary/themes/img/O/icon_mouse_left.png
deleted file mode 100644
index ba0198daac..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse_middle.png b/data/elementary/themes/img/O/icon_mouse_middle.png
deleted file mode 100644
index ced1ef6d1d..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse_middle.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse_right.png b/data/elementary/themes/img/O/icon_mouse_right.png
deleted file mode 100644
index de9b9adf08..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_mouse_wheel.png b/data/elementary/themes/img/O/icon_mouse_wheel.png
deleted file mode 100644
index 7b5259edf8..0000000000
Binary files a/data/elementary/themes/img/O/icon_mouse_wheel.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_new.png b/data/elementary/themes/img/O/icon_new.png
deleted file mode 100644
index 911c7b55f7..0000000000
Binary files a/data/elementary/themes/img/O/icon_new.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_pager.png b/data/elementary/themes/img/O/icon_pager.png
deleted file mode 100644
index 147f26f53e..0000000000
Binary files a/data/elementary/themes/img/O/icon_pager.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_performance.png b/data/elementary/themes/img/O/icon_performance.png
deleted file mode 100644
index da327ddc5a..0000000000
Binary files a/data/elementary/themes/img/O/icon_performance.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_power_management.png b/data/elementary/themes/img/O/icon_power_management.png
deleted file mode 100644
index 7ddef134a4..0000000000
Binary files a/data/elementary/themes/img/O/icon_power_management.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_profiles.png b/data/elementary/themes/img/O/icon_profiles.png
deleted file mode 100644
index 37c0255a1e..0000000000
Binary files a/data/elementary/themes/img/O/icon_profiles.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_reboot.png b/data/elementary/themes/img/O/icon_reboot.png
deleted file mode 100644
index 1fc38a0dc2..0000000000
Binary files a/data/elementary/themes/img/O/icon_reboot.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_reset.png b/data/elementary/themes/img/O/icon_reset.png
deleted file mode 100644
index 1fc38a0dc2..0000000000
Binary files a/data/elementary/themes/img/O/icon_reset.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_resize.png b/data/elementary/themes/img/O/icon_resize.png
deleted file mode 100644
index 7362a7e3c2..0000000000
Binary files a/data/elementary/themes/img/O/icon_resize.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_right_arrow.png b/data/elementary/themes/img/O/icon_right_arrow.png
deleted file mode 100644
index 5da3a7d00a..0000000000
Binary files a/data/elementary/themes/img/O/icon_right_arrow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_run.png b/data/elementary/themes/img/O/icon_run.png
deleted file mode 100644
index 525e60f3a4..0000000000
Binary files a/data/elementary/themes/img/O/icon_run.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_scale.png b/data/elementary/themes/img/O/icon_scale.png
deleted file mode 100644
index fb6a85e74b..0000000000
Binary files a/data/elementary/themes/img/O/icon_scale.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_around.png b/data/elementary/themes/img/O/icon_screen_around.png
deleted file mode 100644
index 5885668f87..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_around.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_hflip.png b/data/elementary/themes/img/O/icon_screen_hflip.png
deleted file mode 100644
index f22d996f12..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_hflip.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_left.png b/data/elementary/themes/img/O/icon_screen_left.png
deleted file mode 100644
index 2debe427cd..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_normal.png b/data/elementary/themes/img/O/icon_screen_normal.png
deleted file mode 100644
index 1b773344e1..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_normal.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_resolution.png b/data/elementary/themes/img/O/icon_screen_resolution.png
deleted file mode 100644
index bb363d4c1c..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_resolution.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_right.png b/data/elementary/themes/img/O/icon_screen_right.png
deleted file mode 100644
index 42ca3fd526..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_setup.png b/data/elementary/themes/img/O/icon_screen_setup.png
deleted file mode 100644
index 1b773344e1..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_setup.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screen_vflip.png b/data/elementary/themes/img/O/icon_screen_vflip.png
deleted file mode 100644
index 198465fe09..0000000000
Binary files a/data/elementary/themes/img/O/icon_screen_vflip.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screensaver.png b/data/elementary/themes/img/O/icon_screensaver.png
deleted file mode 100644
index 8b749b6a99..0000000000
Binary files a/data/elementary/themes/img/O/icon_screensaver.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_screenshot.png b/data/elementary/themes/img/O/icon_screenshot.png
deleted file mode 100644
index bcd2a695d2..0000000000
Binary files a/data/elementary/themes/img/O/icon_screenshot.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf.png b/data/elementary/themes/img/O/icon_shelf.png
deleted file mode 100644
index 9a51d029b7..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_bottom.png b/data/elementary/themes/img/O/icon_shelf_bottom.png
deleted file mode 100644
index cc600ecb93..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_bottom.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_bottom_desk.png b/data/elementary/themes/img/O/icon_shelf_bottom_desk.png
deleted file mode 100644
index 316461be02..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_bottom_desk.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_bottom_left.png b/data/elementary/themes/img/O/icon_shelf_bottom_left.png
deleted file mode 100644
index 1f76067ac1..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_bottom_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_bottom_right.png b/data/elementary/themes/img/O/icon_shelf_bottom_right.png
deleted file mode 100644
index 025a6bcf93..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_bottom_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_custom.png b/data/elementary/themes/img/O/icon_shelf_custom.png
deleted file mode 100644
index 5187f36f01..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_custom.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_dock.png b/data/elementary/themes/img/O/icon_shelf_dock.png
deleted file mode 100644
index e7a2aea7ba..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_dock.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_left.png b/data/elementary/themes/img/O/icon_shelf_left.png
deleted file mode 100644
index 4500993e5a..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_left_bottom.png b/data/elementary/themes/img/O/icon_shelf_left_bottom.png
deleted file mode 100644
index 6c5a383e53..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_left_bottom.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_left_top.png b/data/elementary/themes/img/O/icon_shelf_left_top.png
deleted file mode 100644
index 659c52b462..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_left_top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_menu_bar.png b/data/elementary/themes/img/O/icon_shelf_menu_bar.png
deleted file mode 100644
index 5762bb2330..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_menu_bar.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_panel.png b/data/elementary/themes/img/O/icon_shelf_panel.png
deleted file mode 100644
index 2a4fc8a4f9..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_panel.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_right.png b/data/elementary/themes/img/O/icon_shelf_right.png
deleted file mode 100644
index 26fa5cff40..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_right_bottom.png b/data/elementary/themes/img/O/icon_shelf_right_bottom.png
deleted file mode 100644
index 1f26807b71..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_right_bottom.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_right_top.png b/data/elementary/themes/img/O/icon_shelf_right_top.png
deleted file mode 100644
index 236c5da181..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_right_top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_top.png b/data/elementary/themes/img/O/icon_shelf_top.png
deleted file mode 100644
index 8291263b40..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_top_desk.png b/data/elementary/themes/img/O/icon_shelf_top_desk.png
deleted file mode 100644
index 49f595d998..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_top_desk.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_top_left.png b/data/elementary/themes/img/O/icon_shelf_top_left.png
deleted file mode 100644
index 563687b17b..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_top_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_shelf_top_right.png b/data/elementary/themes/img/O/icon_shelf_top_right.png
deleted file mode 100644
index edac6f2052..0000000000
Binary files a/data/elementary/themes/img/O/icon_shelf_top_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_startup.png b/data/elementary/themes/img/O/icon_startup.png
deleted file mode 100644
index 63645f46a2..0000000000
Binary files a/data/elementary/themes/img/O/icon_startup.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_suspend.png b/data/elementary/themes/img/O/icon_suspend.png
deleted file mode 100644
index cb0e038681..0000000000
Binary files a/data/elementary/themes/img/O/icon_suspend.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_swap.png b/data/elementary/themes/img/O/icon_swap.png
deleted file mode 100644
index 3250eae7cc..0000000000
Binary files a/data/elementary/themes/img/O/icon_swap.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_system.png b/data/elementary/themes/img/O/icon_system.png
deleted file mode 100644
index b9b35959d5..0000000000
Binary files a/data/elementary/themes/img/O/icon_system.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_theme.png b/data/elementary/themes/img/O/icon_theme.png
deleted file mode 100644
index 6743559162..0000000000
Binary files a/data/elementary/themes/img/O/icon_theme.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_toolbar.png b/data/elementary/themes/img/O/icon_toolbar.png
deleted file mode 100644
index c759dba47d..0000000000
Binary files a/data/elementary/themes/img/O/icon_toolbar.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_transitions.png b/data/elementary/themes/img/O/icon_transitions.png
deleted file mode 100644
index 7d0b62f2f2..0000000000
Binary files a/data/elementary/themes/img/O/icon_transitions.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_up_arrow.png b/data/elementary/themes/img/O/icon_up_arrow.png
deleted file mode 100644
index 7ee536cd4e..0000000000
Binary files a/data/elementary/themes/img/O/icon_up_arrow.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_wallpaper.png b/data/elementary/themes/img/O/icon_wallpaper.png
deleted file mode 100644
index ae9f97a92b..0000000000
Binary files a/data/elementary/themes/img/O/icon_wallpaper.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_wallpaper_center.png b/data/elementary/themes/img/O/icon_wallpaper_center.png
deleted file mode 100644
index ee96012247..0000000000
Binary files a/data/elementary/themes/img/O/icon_wallpaper_center.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_wallpaper_center_flat.png b/data/elementary/themes/img/O/icon_wallpaper_center_flat.png
deleted file mode 100644
index dd3dc874f4..0000000000
Binary files a/data/elementary/themes/img/O/icon_wallpaper_center_flat.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_wallpaper_grad_screen.png b/data/elementary/themes/img/O/icon_wallpaper_grad_screen.png
deleted file mode 100644
index 732adcbcd4..0000000000
Binary files a/data/elementary/themes/img/O/icon_wallpaper_grad_screen.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_wallpaper_screen.png b/data/elementary/themes/img/O/icon_wallpaper_screen.png
deleted file mode 100644
index ca9f878931..0000000000
Binary files a/data/elementary/themes/img/O/icon_wallpaper_screen.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_warning.png b/data/elementary/themes/img/O/icon_warning.png
deleted file mode 100644
index ef79dac6b2..0000000000
Binary files a/data/elementary/themes/img/O/icon_warning.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_win_move.png b/data/elementary/themes/img/O/icon_win_move.png
deleted file mode 100644
index 4f58e4c109..0000000000
Binary files a/data/elementary/themes/img/O/icon_win_move.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_win_resize.png b/data/elementary/themes/img/O/icon_win_resize.png
deleted file mode 100644
index 3d45fec27a..0000000000
Binary files a/data/elementary/themes/img/O/icon_win_resize.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_window_focus.png b/data/elementary/themes/img/O/icon_window_focus.png
deleted file mode 100644
index fd2633ca57..0000000000
Binary files a/data/elementary/themes/img/O/icon_window_focus.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_window_geometry.png b/data/elementary/themes/img/O/icon_window_geometry.png
deleted file mode 100644
index 75d8f095e9..0000000000
Binary files a/data/elementary/themes/img/O/icon_window_geometry.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_window_manipulation.png b/data/elementary/themes/img/O/icon_window_manipulation.png
deleted file mode 100644
index 108a80a494..0000000000
Binary files a/data/elementary/themes/img/O/icon_window_manipulation.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_window_process_management.png b/data/elementary/themes/img/O/icon_window_process_management.png
deleted file mode 100644
index 71f1f388af..0000000000
Binary files a/data/elementary/themes/img/O/icon_window_process_management.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_window_remembers.png b/data/elementary/themes/img/O/icon_window_remembers.png
deleted file mode 100644
index bf9c94753f..0000000000
Binary files a/data/elementary/themes/img/O/icon_window_remembers.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_windows.png b/data/elementary/themes/img/O/icon_windows.png
deleted file mode 100644
index 9b19d4ae54..0000000000
Binary files a/data/elementary/themes/img/O/icon_windows.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/icon_winlist.png b/data/elementary/themes/img/O/icon_winlist.png
deleted file mode 100644
index 97ad69ab17..0000000000
Binary files a/data/elementary/themes/img/O/icon_winlist.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/illume-home.png b/data/elementary/themes/img/O/illume-home.png
deleted file mode 100644
index 62b51fd8e3..0000000000
Binary files a/data/elementary/themes/img/O/illume-home.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/illume-kbd-on.png b/data/elementary/themes/img/O/illume-kbd-on.png
deleted file mode 100644
index 0dbecb242d..0000000000
Binary files a/data/elementary/themes/img/O/illume-kbd-on.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/illume-kbd.png b/data/elementary/themes/img/O/illume-kbd.png
deleted file mode 100644
index 3bbe26fd8a..0000000000
Binary files a/data/elementary/themes/img/O/illume-kbd.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/illume-mode-dual-left.png b/data/elementary/themes/img/O/illume-mode-dual-left.png
deleted file mode 100644
index 5319f0135a..0000000000
Binary files a/data/elementary/themes/img/O/illume-mode-dual-left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/illume-mode-dual-top.png b/data/elementary/themes/img/O/illume-mode-dual-top.png
deleted file mode 100644
index e8833d13e6..0000000000
Binary files a/data/elementary/themes/img/O/illume-mode-dual-top.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/illume-mode-single.png b/data/elementary/themes/img/O/illume-mode-single.png
deleted file mode 100644
index 9f7acc0f84..0000000000
Binary files a/data/elementary/themes/img/O/illume-mode-single.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/inset_raised.png b/data/elementary/themes/img/O/inset_raised.png
deleted file mode 100644
index 5f392b99e6..0000000000
Binary files a/data/elementary/themes/img/O/inset_raised.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/inset_sunk.png b/data/elementary/themes/img/O/inset_sunk.png
deleted file mode 100644
index bb1989dd78..0000000000
Binary files a/data/elementary/themes/img/O/inset_sunk.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/logo_black_128.png b/data/elementary/themes/img/O/logo_black_128.png
deleted file mode 100644
index 0b79b69ab3..0000000000
Binary files a/data/elementary/themes/img/O/logo_black_128.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/logo_white_128.png b/data/elementary/themes/img/O/logo_white_128.png
deleted file mode 100644
index 9f0c7a7b91..0000000000
Binary files a/data/elementary/themes/img/O/logo_white_128.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer.png b/data/elementary/themes/img/O/mixer.png
deleted file mode 100644
index 61d5dd356c..0000000000
Binary files a/data/elementary/themes/img/O/mixer.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer_high_left.png b/data/elementary/themes/img/O/mixer_high_left.png
deleted file mode 100644
index e46adec069..0000000000
Binary files a/data/elementary/themes/img/O/mixer_high_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer_high_right.png b/data/elementary/themes/img/O/mixer_high_right.png
deleted file mode 100644
index 7ee672e22c..0000000000
Binary files a/data/elementary/themes/img/O/mixer_high_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer_low_left.png b/data/elementary/themes/img/O/mixer_low_left.png
deleted file mode 100644
index eaea3f1c01..0000000000
Binary files a/data/elementary/themes/img/O/mixer_low_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer_low_right.png b/data/elementary/themes/img/O/mixer_low_right.png
deleted file mode 100644
index ce0dc15fde..0000000000
Binary files a/data/elementary/themes/img/O/mixer_low_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer_med_left.png b/data/elementary/themes/img/O/mixer_med_left.png
deleted file mode 100644
index d5a1d8a047..0000000000
Binary files a/data/elementary/themes/img/O/mixer_med_left.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/mixer_med_right.png b/data/elementary/themes/img/O/mixer_med_right.png
deleted file mode 100644
index 11c2ab8e25..0000000000
Binary files a/data/elementary/themes/img/O/mixer_med_right.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/outline.png b/data/elementary/themes/img/O/outline.png
deleted file mode 100644
index 8adc831f10..0000000000
Binary files a/data/elementary/themes/img/O/outline.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/randr_icon_off.png b/data/elementary/themes/img/O/randr_icon_off.png
deleted file mode 100644
index 47448b9408..0000000000
Binary files a/data/elementary/themes/img/O/randr_icon_off.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/randr_icon_on.png b/data/elementary/themes/img/O/randr_icon_on.png
deleted file mode 100644
index d7324a6336..0000000000
Binary files a/data/elementary/themes/img/O/randr_icon_on.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/randr_monitor.png b/data/elementary/themes/img/O/randr_monitor.png
deleted file mode 100644
index da03c17b6e..0000000000
Binary files a/data/elementary/themes/img/O/randr_monitor.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/randr_stand.png b/data/elementary/themes/img/O/randr_stand.png
deleted file mode 100644
index 84b5351e47..0000000000
Binary files a/data/elementary/themes/img/O/randr_stand.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/sb_runnerh.png b/data/elementary/themes/img/O/sb_runnerh.png
deleted file mode 100644
index a483ce8b1d..0000000000
Binary files a/data/elementary/themes/img/O/sb_runnerh.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/sb_runnerv.png b/data/elementary/themes/img/O/sb_runnerv.png
deleted file mode 100644
index cb2da6fc3a..0000000000
Binary files a/data/elementary/themes/img/O/sb_runnerv.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/silk.png b/data/elementary/themes/img/O/silk.png
deleted file mode 100644
index 4e7a4d8117..0000000000
Binary files a/data/elementary/themes/img/O/silk.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/t0-sh.png b/data/elementary/themes/img/O/t0-sh.png
deleted file mode 100644
index 0ed57229a1..0000000000
Binary files a/data/elementary/themes/img/O/t0-sh.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/t0.png b/data/elementary/themes/img/O/t0.png
deleted file mode 100644
index ed6ccf0715..0000000000
Binary files a/data/elementary/themes/img/O/t0.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/t1-sh.png b/data/elementary/themes/img/O/t1-sh.png
deleted file mode 100644
index cf647492a4..0000000000
Binary files a/data/elementary/themes/img/O/t1-sh.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/t1.png b/data/elementary/themes/img/O/t1.png
deleted file mode 100644
index a41aa73455..0000000000
Binary files a/data/elementary/themes/img/O/t1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/t2.png b/data/elementary/themes/img/O/t2.png
deleted file mode 100644
index 4c018a4efd..0000000000
Binary files a/data/elementary/themes/img/O/t2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/tacho_bg.png b/data/elementary/themes/img/O/tacho_bg.png
deleted file mode 100644
index 4f3124d9b9..0000000000
Binary files a/data/elementary/themes/img/O/tacho_bg.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/tacho_fg.png b/data/elementary/themes/img/O/tacho_fg.png
deleted file mode 100644
index da7d80c954..0000000000
Binary files a/data/elementary/themes/img/O/tacho_fg.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/temp_base.png b/data/elementary/themes/img/O/temp_base.png
deleted file mode 100644
index 2cd854705b..0000000000
Binary files a/data/elementary/themes/img/O/temp_base.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/temp_mid.png b/data/elementary/themes/img/O/temp_mid.png
deleted file mode 100644
index e4ac06f1f0..0000000000
Binary files a/data/elementary/themes/img/O/temp_mid.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/temp_over.png b/data/elementary/themes/img/O/temp_over.png
deleted file mode 100644
index daa845d635..0000000000
Binary files a/data/elementary/themes/img/O/temp_over.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/theme-label.png b/data/elementary/themes/img/O/theme-label.png
deleted file mode 100644
index 6dd6c1162b..0000000000
Binary files a/data/elementary/themes/img/O/theme-label.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/toolbar_sel.png b/data/elementary/themes/img/O/toolbar_sel.png
deleted file mode 100644
index d1205e72cb..0000000000
Binary files a/data/elementary/themes/img/O/toolbar_sel.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/topsh.png b/data/elementary/themes/img/O/topsh.png
deleted file mode 100644
index 4ea369d584..0000000000
Binary files a/data/elementary/themes/img/O/topsh.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/transition_vswipe.png b/data/elementary/themes/img/O/transition_vswipe.png
deleted file mode 100644
index 1e8eecc96c..0000000000
Binary files a/data/elementary/themes/img/O/transition_vswipe.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/vgrad_dark.png b/data/elementary/themes/img/O/vgrad_dark.png
deleted file mode 100644
index 18c12e3624..0000000000
Binary files a/data/elementary/themes/img/O/vgrad_dark.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/vgrad_light.png b/data/elementary/themes/img/O/vgrad_light.png
deleted file mode 100644
index 2ffbe95a62..0000000000
Binary files a/data/elementary/themes/img/O/vgrad_light.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wizard_bt1.png b/data/elementary/themes/img/O/wizard_bt1.png
deleted file mode 100644
index 26cfc0f4af..0000000000
Binary files a/data/elementary/themes/img/O/wizard_bt1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wizard_bt2.png b/data/elementary/themes/img/O/wizard_bt2.png
deleted file mode 100644
index b929d45bb2..0000000000
Binary files a/data/elementary/themes/img/O/wizard_bt2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wizard_pattern.png b/data/elementary/themes/img/O/wizard_pattern.png
deleted file mode 100644
index 662c9e05f2..0000000000
Binary files a/data/elementary/themes/img/O/wizard_pattern.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wp-bot1.png b/data/elementary/themes/img/O/wp-bot1.png
deleted file mode 100644
index a04e5553f4..0000000000
Binary files a/data/elementary/themes/img/O/wp-bot1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wp-bot2.png b/data/elementary/themes/img/O/wp-bot2.png
deleted file mode 100644
index cb86fb25cb..0000000000
Binary files a/data/elementary/themes/img/O/wp-bot2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wp-tb1.png b/data/elementary/themes/img/O/wp-tb1.png
deleted file mode 100644
index 6ed8e9ff2d..0000000000
Binary files a/data/elementary/themes/img/O/wp-tb1.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wp-tb2.png b/data/elementary/themes/img/O/wp-tb2.png
deleted file mode 100644
index 8c6f8c393f..0000000000
Binary files a/data/elementary/themes/img/O/wp-tb2.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wp-tb3.png b/data/elementary/themes/img/O/wp-tb3.png
deleted file mode 100644
index 404e8cde1a..0000000000
Binary files a/data/elementary/themes/img/O/wp-tb3.png and /dev/null differ
diff --git a/data/elementary/themes/img/O/wp-tbs.png b/data/elementary/themes/img/O/wp-tbs.png
deleted file mode 100644
index 02f1f25efc..0000000000
Binary files a/data/elementary/themes/img/O/wp-tbs.png and /dev/null differ
diff --git a/data/elementary/themes/img/bevel_in.png b/data/elementary/themes/img/bevel_in.png
deleted file mode 100644
index 152e5acd0b..0000000000
Binary files a/data/elementary/themes/img/bevel_in.png and /dev/null differ
diff --git a/data/elementary/themes/img/big_arrow_down_shadow.png b/data/elementary/themes/img/big_arrow_down_shadow.png
deleted file mode 100644
index 12891095c1..0000000000
Binary files a/data/elementary/themes/img/big_arrow_down_shadow.png and /dev/null differ
diff --git a/data/elementary/themes/img/big_arrow_left_shadow.png b/data/elementary/themes/img/big_arrow_left_shadow.png
deleted file mode 100644
index 42964d05e6..0000000000
Binary files a/data/elementary/themes/img/big_arrow_left_shadow.png and /dev/null differ
diff --git a/data/elementary/themes/img/big_arrow_right_shadow.png b/data/elementary/themes/img/big_arrow_right_shadow.png
deleted file mode 100644
index a57b7e04cc..0000000000
Binary files a/data/elementary/themes/img/big_arrow_right_shadow.png and /dev/null differ
diff --git a/data/elementary/themes/img/big_arrow_up_shadow.png b/data/elementary/themes/img/big_arrow_up_shadow.png
deleted file mode 100644
index 5a1db285a5..0000000000
Binary files a/data/elementary/themes/img/big_arrow_up_shadow.png and /dev/null differ
diff --git a/data/elementary/themes/img/bub_base_b0.png b/data/elementary/themes/img/bub_base_b0.png
deleted file mode 100644
index f63247a79e..0000000000
Binary files a/data/elementary/themes/img/bub_base_b0.png and /dev/null differ
diff --git a/data/elementary/themes/img/bub_base_b1.png b/data/elementary/themes/img/bub_base_b1.png
deleted file mode 100644
index e9dd16b850..0000000000
Binary files a/data/elementary/themes/img/bub_base_b1.png and /dev/null differ
diff --git a/data/elementary/themes/img/bub_base_b2.png b/data/elementary/themes/img/bub_base_b2.png
deleted file mode 100644
index f739858871..0000000000
Binary files a/data/elementary/themes/img/bub_base_b2.png and /dev/null differ
diff --git a/data/elementary/themes/img/dot_pattern.png b/data/elementary/themes/img/dot_pattern.png
deleted file mode 100644
index 391f2ea560..0000000000
Binary files a/data/elementary/themes/img/dot_pattern.png and /dev/null differ
diff --git a/data/elementary/themes/img/inset_shadow.png b/data/elementary/themes/img/inset_shadow.png
deleted file mode 100644
index dad255c61a..0000000000
Binary files a/data/elementary/themes/img/inset_shadow.png and /dev/null differ
diff --git a/data/elementary/themes/img/about-triangles.xcf b/data/elementary/themes/img/xcf/about-triangles.xcf
similarity index 100%
rename from data/elementary/themes/img/about-triangles.xcf
rename to data/elementary/themes/img/xcf/about-triangles.xcf
diff --git a/data/elementary/themes/img/shadows.xcf b/data/elementary/themes/img/xcf/shadows.xcf
similarity index 100%
rename from data/elementary/themes/img/shadows.xcf
rename to data/elementary/themes/img/xcf/shadows.xcf
diff --git a/data/elementary/themes/img/win_shadow.xcf b/data/elementary/themes/img/xcf/win_shadow.xcf
similarity index 100%
rename from data/elementary/themes/img/win_shadow.xcf
rename to data/elementary/themes/img/xcf/win_shadow.xcf