diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc
index 206af36e60..74ef580e93 100644
--- a/data/elementary/themes/edc/fileman.edc
+++ b/data/elementary/themes/edc/fileman.edc
@@ -1,16 +1,9 @@
 group { name: "e/fileman/default/list/variable";
    alias: "e/fileman/default/list/fixed";
 //   data.item: "stacking" "above";
-   data.item: "stacking" "below";
-   data.item: "selectraise" "on";
-   images.image: "bevel_curved_horiz_out.png" COMP;
-   images.image: "shadow_rounded_horiz.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_horiz_out.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "shadow_square_tiny.png" COMP;
-   images.image: "ball_small_glow.png" COMP;
-   images.image: "ball_small_glow_intense.png" COMP;
+//   data.item: "stacking" "below";
+//   data.item: "selectraise" "on";
+   images.image: "speaker_vol.png" COMP;
    images.image: "sym_icon_op_ask.png" COMP;
    images.image: "sym_icon_op_copy.png" COMP;
    images.image: "sym_icon_op_move.png" COMP;
@@ -21,49 +14,11 @@ group { name: "e/fileman/default/list/variable";
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color: 64 64 64 255;
-            color_class: "ilist_item_base";
          }
       }
-      part { name: "bevel"; mouse_events: 0;
+      part { name: "sel_base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bevel_curved_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "sel_shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shadow_rounded_horiz.png";
-            image.border: 0 0 9 9;
-            rel1.offset: 0 -4;
-            rel2.offset: -1 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_base"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "vgrad_med_dark.png";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "selected" 0.0;
@@ -72,95 +27,41 @@ group { name: "e/fileman/default/list/variable";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 3;
+            rel1.offset: 4 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "icon0";
-            rel2.offset: -3 -3;
+            rel2.offset: -5 -5;
             rel2.relative: 1.0 1.0;
-            color2: 255 255 255 255;
-            color3: 255 255 255 255;
-            color_class: "ilist_item";
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 0 1;
                align: 0.0 0.5;
                text_class: "ilist_item";
                ellipsis: 0.0;
             }
+            offscale;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "e.text.label";
-            rel2.to: "e.text.label";
-            color2: 255 255 255 255;
-            color3: 255 255 255 255;
-            color_class: "ilist_item_disabled";
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.0 0.5;
-               text_class: "ilist_item";
-               ellipsis: 0.0;
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "label3"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: -2 -3;
-            rel1.to: "e.text.label";
-            rel2.offset: 2 1;
-            rel2.to: "e.text.label";
-            color2: 255 255 255 255;
-            color3: 255 255 255 255;
-            color_class: "ilist_item_selected";
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.0 0.5;
-               text_class: "ilist_item";
-               ellipsis: 0.0;
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+            color: 80 80 80 255;
          }
       }
 //////////////////////////
       part { name: "icon0"; type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             rel1.offset: 4 4;
             rel2.relative: 0.0 1.0;
             rel2.offset: 4 -5;
+            offscale;
          }
       }
       part { name: "icon"; type: SPACER;
@@ -178,14 +79,10 @@ group { name: "e/fileman/default/list/variable";
          }
       }
       part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "icon_base";
-            rel2.offset: 2 4;
-            rel2.to: "icon_base";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            rel.to: "icon_base";
+            WIN_SHADOW_SMALL;
             visible: 0;
          }
          description { state: "start" 0.0;
@@ -213,37 +110,41 @@ group { name: "e/fileman/default/list/variable";
          }
       }
       part { name: "vol"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "ball_small_glow.png";
-            min: 14 14;
-            max: 14 14;
+            image.normal: "speaker_vol.png";
+            FIXED_SIZE(7, 7)
             rel1.relative: 1.0 1.0;
             rel1.to: "e.swallow.icon";
             rel2.to: "e.swallow.icon";
+            color: 255 255 255 128;
             visible: 0;
             fixed: 1 1;
          }
          description { state: "unmounted" 0.0;
             inherit: "default" 0.0;
-            image.normal: "ball_small_glow.png";
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "mounted" 0.0;
             inherit: "default" 0.0;
-            image.normal: "ball_small_glow_intense.png";
+            color: 255 153 51 255;
             visible: 1;
          }
       }
       part { name: "op";
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.5;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
             rel1.relative: 1.0 0.0;
-            rel1.offset: -5 4;
-            rel2.offset: -5 -5;
+            rel2.relative: 1.0 1.0;
+            rel1.offset: -5 0;
+            rel2.offset: -5 -1;
             image.normal: "sym_icon_op_ask.png";
-            max: 32 32;
+            FIXED_SIZE(15, 15)
             visible: 0;
+            color: 255 255 255 255;
+            offscale;
          }
          description { state: "ask" 0.0;
             inherit: "default" 0.0;
@@ -262,22 +163,6 @@ group { name: "e/fileman/default/list/variable";
          }
       }
 //////////////////////////
-      part { name: "sel_shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "sel_base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "sel_base";
-            FIXED_SIZE(69, 5)
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 0;
@@ -311,24 +196,14 @@ group { name: "e/fileman/default/list/variable";
       program {
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "selected" 0.0;
-         target: "sel_shadow";
          target: "sel_base";
-         target: "sel_bevel";
-         target: "sel_shine";
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "sel_shadow";
          target: "sel_base";
-         target: "sel_bevel";
-         target: "sel_shine";
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "mouse,down,1"; source: "label_event";
@@ -523,13 +398,8 @@ group { name: "e/fileman/default/icon/fixed";
       }
       part { name: "icon_shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "icon_base";
-            rel2.offset: 2 4;
-            rel2.to: "icon_base";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            rel.to: "icon_base";
+            WIN_SHADOW_SMALL;
             visible: 0;
          }
          description { state: "start" 0.0;
@@ -556,38 +426,41 @@ group { name: "e/fileman/default/icon/fixed";
          }
       }
       part { name: "vol"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "ball_small_glow.png";
-            min: 14 14;
-            max: 14 14;
+            image.normal: "speaker_vol.png";
+            FIXED_SIZE(7, 7)
             rel1.relative: 1.0 1.0;
             rel1.to: "e.swallow.icon";
             rel2.to: "e.swallow.icon";
+            color: 255 255 255 128;
             visible: 0;
             fixed: 1 1;
          }
          description { state: "unmounted" 0.0;
             inherit: "default" 0.0;
-            image.normal: "ball_small_glow.png";
+            color: 255 255 255 128;
             visible: 1;
          }
          description { state: "mounted" 0.0;
             inherit: "default" 0.0;
-            image.normal: "ball_small_glow_intense.png";
+            color: 255 153 51 255;
             visible: 1;
          }
       }
       part { name: "op";
+         scale: 1;
          description { state: "default" 0.0;
-            align: 1.0 0.0;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.relative: 0.5 0.0;
-            rel1.offset: 0 4;
-            rel2.relative: 1.0 0.5;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+            rel1.offset: -5 0;
             rel2.offset: -5 -1;
             image.normal: "sym_icon_op_ask.png";
-            max: 32 32;
+            FIXED_SIZE(15, 15)
             visible: 0;
+            color: 255 255 255 255;
+            offscale;
          }
          description { state: "ask" 0.0;
             inherit: "default" 0.0;
@@ -605,7 +478,7 @@ group { name: "e/fileman/default/icon/fixed";
             visible: 1;
          }
       }
-//////////////////////////////      
+//////////////////////////////
       part { name: "event"; type: RECT;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
diff --git a/data/elementary/themes/img/sym_icon_op_ask.png b/data/elementary/themes/img/sym_icon_op_ask.png
index 4e51b9abf0..b30fb5a490 100644
Binary files a/data/elementary/themes/img/sym_icon_op_ask.png and b/data/elementary/themes/img/sym_icon_op_ask.png differ
diff --git a/data/elementary/themes/img/sym_icon_op_copy.png b/data/elementary/themes/img/sym_icon_op_copy.png
index a45a0d3b06..0ac918298f 100644
Binary files a/data/elementary/themes/img/sym_icon_op_copy.png and b/data/elementary/themes/img/sym_icon_op_copy.png differ
diff --git a/data/elementary/themes/img/sym_icon_op_move.png b/data/elementary/themes/img/sym_icon_op_move.png
index 3831cfd918..340e7c9687 100644
Binary files a/data/elementary/themes/img/sym_icon_op_move.png and b/data/elementary/themes/img/sym_icon_op_move.png differ
diff --git a/data/elementary/themes/orig/icon-efm-sym-op-ask.svg b/data/elementary/themes/orig/icon-efm-sym-op-ask.svg
new file mode 100644
index 0000000000..c8e99b1a6b
--- /dev/null
+++ b/data/elementary/themes/orig/icon-efm-sym-op-ask.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333333 4.2333333"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon-efm-sym-op-ask.svg"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/sym_icon_op_ask.png"
+   inkscape:export-xdpi="192.00002"
+   inkscape:export-ydpi="192.00002"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#404040"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="75.1875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid815"
+       color="#1a1f73"
+       opacity="0.20392157"
+       empcolor="#00002b"
+       empopacity="0.21176471"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76667)">
+    <path
+       style="fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4 2 L 4 14 L 12 14 L 12 5 L 9 2 L 4 2 z M 8 4 A 3 3 0 0 1 11 7 A 3 3 0 0 1 9 9.8242188 L 9 11 L 8 11 L 8 10 L 8 9 A 1.9999999 1.9999999 0 0 0 10 7 A 1.9999999 1.9999999 0 0 0 8 5 A 1.9999999 1.9999999 0 0 0 6.5859375 5.5859375 L 5.8808594 4.8808594 A 3 3 0 0 1 8 4 z M 8.5 12 A 0.49999996 0.49999996 0 0 1 9 12.5 A 0.49999996 0.49999996 0 0 1 8.5 13 A 0.49999996 0.49999996 0 0 1 8 12.5 A 0.49999996 0.49999996 0 0 1 8.5 12 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,292.76667)"
+       id="path817" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/orig/icon-efm-sym-op-copy.svg b/data/elementary/themes/orig/icon-efm-sym-op-copy.svg
new file mode 100644
index 0000000000..a7f32fe156
--- /dev/null
+++ b/data/elementary/themes/orig/icon-efm-sym-op-copy.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333333 4.2333333"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon-efm-sym-op-copy.svg"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/sym_icon_op_move.png"
+   inkscape:export-xdpi="192.00002"
+   inkscape:export-ydpi="192.00002"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#404040"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="75.1875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid815"
+       color="#1a1f73"
+       opacity="0.20392157"
+       empcolor="#00002b"
+       empopacity="0.21176471"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76667)">
+    <path
+       style="fill:#f9f9f9;fill-opacity:0.50196078;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.8520833,296.47084 H 3.96875 v -2.38125 L 3.175,293.29584 H 1.8520833 Z"
+       id="path817-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0.2645833,296.47084 H 2.38125 v -2.38125 L 1.5875,293.29584 H 0.2645833 Z"
+       id="path817"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.33467591"
+       id="rect933"
+       width="0.52916676"
+       height="1.0583428"
+       x="2.9104166"
+       y="294.61874" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.33467358"
+       id="rect935"
+       width="1.0583334"
+       height="0.52916402"
+       x="2.6458333"
+       y="294.88333" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/orig/icon-efm-sym-op-move.svg b/data/elementary/themes/orig/icon-efm-sym-op-move.svg
new file mode 100644
index 0000000000..f696463462
--- /dev/null
+++ b/data/elementary/themes/orig/icon-efm-sym-op-move.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333333 4.2333333"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="icon-efm-sym-op-move.svg"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/sym_icon_op_ask.png"
+   inkscape:export-xdpi="192.00002"
+   inkscape:export-ydpi="192.00002"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#404040"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="75.1875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid815"
+       color="#1a1f73"
+       opacity="0.20392157"
+       empcolor="#00002b"
+       empopacity="0.21176471"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76667)">
+    <path
+       style="fill:#f9f9f9;fill-opacity:0.50196078;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7 2 L 7 14 L 9 14 L 9 11 L 8 11 L 8 7 L 9 7 L 9 4 L 14 9 L 9 14 L 15 14 L 15 5 L 12 2 L 7 2 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,292.76667)"
+       id="path817-6" />
+    <path
+       style="fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.8520833,294.88334 h 0.79375 v -0.52917 l 0.79375,0.79375 -0.79375,0.79375 v -0.52917 h -0.79375 z"
+       id="path908"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0.2645833,296.47084 H 2.38125 v -2.38125 L 1.5875,293.29584 H 0.2645833 Z"
+       id="path817"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/orig/spanner.svg b/data/elementary/themes/orig/spanner.svg
new file mode 100644
index 0000000000..57739ae956
--- /dev/null
+++ b/data/elementary/themes/orig/spanner.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666667 8.4666667"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="spanner.svg"
+   inkscape:export-filename="/home/raster/spanner.png"
+   inkscape:export-xdpi="384"
+   inkscape:export-ydpi="384">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#404040"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.59375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid815"
+       empspacing="4"
+       color="#000047"
+       opacity="0.14901961"
+       empcolor="#29003d"
+       empopacity="0.36862745" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-288.53333)">
+    <path
+       style="fill:#cecece;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       d="M 21.541016 2.34375 A 7.9999994 7.9999994 0 0 0 16 4.6855469 A 7.9999994 7.9999994 0 0 0 13.935547 12.408203 L 4.6855469 21.65625 A 3.9999999 3.9999999 0 0 0 4.6855469 27.314453 A 3.9999999 3.9999999 0 0 0 10.34375 27.314453 L 19.595703 18.0625 A 7.9999994 7.9999994 0 0 0 27.314453 16 A 7.9999994 7.9999994 0 0 0 29.376953 8.28125 L 25.193359 12.464844 L 20.949219 11.050781 L 19.535156 6.8066406 L 23.720703 2.6210938 A 7.9999994 7.9999994 0 0 0 21.541016 2.34375 z "
+       transform="matrix(0.26458333,0,0,0.26458333,0,288.53333)"
+       id="path817" />
+  </g>
+</svg>