diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index 89f5a194fa..cb90d3a8c1 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -343,7 +343,6 @@ ICO1(CTX, "preferences-other", 128)
 
 ////  devices  ////////////////////////////////////////////////////////////////
 #define CTX "devices"
-ICO1(CTX, "multimedia-player", 128)
 ICO1(CTX, "media-optical", 128)
 ICO1(CTX, "media-optical-cd", 128)
 ICO1(CTX, "media-optical-audio", 128)
@@ -363,10 +362,6 @@ ICO1(CTX, "input-mouse", 128)
 ICO1(CTX, "input-tablet", 128)
 ICO1(CTX, "input-keyboard", 128)
 ICO1(CTX, "input-gaming", 128)
-ICO1(CTX, "pda", 128)
-ICO1(CTX, "phone", 128)
-ICO1(CTX, "printer", 128)
-ICO1(CTX, "scanner", 128)
 ICO1(CTX, "modem", 128)
 ICO1(CTX, "video-display", 128)
 ICO1(CTX, "network-wired", 128)
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index a167af9e2a..02a45a9f04 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -513,5 +513,10 @@ ICON("drive-removable-media-usb", "i-drive-usb-media")
 ICON("drive-removable-media-ieee1394", "i-drive-usb-media")
 ICON("computer", "i-desktop-pc")
 ICON("computer-laptop", "i-laptop-pc")
+ICON("multimedia-player", "i-media-player")
+ICON("pda", "i-pda")
+ICON("phone", "i-phone")
+ICON("printer", "i-printer")
+ICON("scanner", "i-scanner")
 
 #undef ICON
diff --git a/data/elementary/themes/edc/winlist.edc b/data/elementary/themes/edc/winlist.edc
index 462e2c5846..153d481383 100644
--- a/data/elementary/themes/edc/winlist.edc
+++ b/data/elementary/themes/edc/winlist.edc
@@ -27,7 +27,7 @@ group { name: "e/widgets/winlist/main";
          scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            FIXED_SIZE(48, 48)
+            FIXED_SIZE(80, 80)
             rel1.relative: 0.0 1.0;
             rel1.offset: 8 8;
             rel1.to_y: "e.text.title";
@@ -37,14 +37,32 @@ group { name: "e/widgets/winlist/main";
             offscale;
          }
       }
+      part { name: "win"; type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            rel.to: "e.swallow.icon";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 8 0;
+            rel2.relative: 2.0 1.0;
+            FIXED_SIZE(80, 80)
+            offscale;
+         }
+      }
+      part { name: "e.swallow.win"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel.to: "win";
+         }
+      }
       part { name: "e.text.label"; type: TEXT;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.0;
             rel1.offset: 8 0;
-            rel1.to: "e.swallow.icon";
+            rel1.to: "win";
             rel2.offset: -9 -9;
-            rel2.to_y: "e.swallow.icon";
+            rel2.to_y: "win";
             align: 0.0 0.5;
             color: 160 160 160 255;
             text { font: FNBD; size: 10;
@@ -91,10 +109,11 @@ group { name: "e/widgets/winlist/item";
          description { state: "default" 0.0;
             rel1.offset: 8 8;
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "icon";
+            rel1.to_x: "win";
             rel2.offset: -9 -9;
             color: 160 160 160 255;
             offscale;
+            min: 0 40;
             text { font: FN; size: 10;
                min: 0 1;
                align: 0.0 0.5;
@@ -114,14 +133,36 @@ group { name: "e/widgets/winlist/item";
             rel1.offset: 8 8;
             rel2.relative: 0.0 1.0;
             rel2.offset: 8 -9;
+            FIXED_SIZE(40, 40)
+            offscale;
+         }
+      }
+      part { name: "win"; type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            rel.to: "icon";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 8 0;
+            rel2.relative: 2.0 1.0;
+            FIXED_SIZE(40, 40)
             offscale;
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            align: 0.5 0.5;
-            rel1.to: "icon";
-            rel2.to: "icon";
+            rel.to: "icon";
+         }
+         description { state: "iconified" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.25 0.25;
+            rel2.relative: 0.75 0.75;
+        }
+      }
+      part { name: "e.swallow.win"; type: SWALLOW; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel.to: "win";
          }
          description { state: "iconified" 0.0;
             inherit: "default" 0.0;
@@ -132,8 +173,7 @@ group { name: "e/widgets/winlist/item";
       part { name: "label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "e.text.label";
-            rel2.to: "e.text.label";
+            rel.to: "e.text.label";
             color: 255 255 255 255;
             text { font: FN; size: 10;
                text_source: "e.text.label";
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index f4c733b859..33a83a7e7a 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -137,6 +137,9 @@ I160("i-efm-exe", "efm-exe")
 I160("i-efm-trash", "efm-trash")
 
 I160("i-mobile", "mobile-phone")
+I160("i-pda", "pda")
+I160("i-phone", "phone")
+I160("i-media-player", "media-player")
 I160("i-battery", "battery")
 I160("i-tools", "tools")
 I160("i-atom", "atom")
@@ -242,6 +245,8 @@ I160("i-here", "here")
 I160("i-server", "server")
 I160("i-sound-card", "sound-card")
 I160("i-microphone", "microphone")
+I160("i-printer", "printer")
+I160("i-scanner", "scanner")
 I160("i-server-group", "server-group")
 I160("i-folder-dropin", "folder-dropin")
 I160("i-folder-world", "folder-world")
diff --git a/data/elementary/themes/img/ic/media-player-040.png b/data/elementary/themes/img/ic/media-player-040.png
new file mode 100644
index 0000000000..f8b0383286
Binary files /dev/null and b/data/elementary/themes/img/ic/media-player-040.png differ
diff --git a/data/elementary/themes/img/ic/media-player-080.png b/data/elementary/themes/img/ic/media-player-080.png
new file mode 100644
index 0000000000..c4334a0012
Binary files /dev/null and b/data/elementary/themes/img/ic/media-player-080.png differ
diff --git a/data/elementary/themes/img/ic/media-player-160.png b/data/elementary/themes/img/ic/media-player-160.png
new file mode 100644
index 0000000000..c2c2ecfd32
Binary files /dev/null and b/data/elementary/themes/img/ic/media-player-160.png differ
diff --git a/data/elementary/themes/img/ic/pda-040.png b/data/elementary/themes/img/ic/pda-040.png
new file mode 100644
index 0000000000..2ab4e5b4ed
Binary files /dev/null and b/data/elementary/themes/img/ic/pda-040.png differ
diff --git a/data/elementary/themes/img/ic/pda-080.png b/data/elementary/themes/img/ic/pda-080.png
new file mode 100644
index 0000000000..37c7e49f99
Binary files /dev/null and b/data/elementary/themes/img/ic/pda-080.png differ
diff --git a/data/elementary/themes/img/ic/pda-160.png b/data/elementary/themes/img/ic/pda-160.png
new file mode 100644
index 0000000000..99b09fafbb
Binary files /dev/null and b/data/elementary/themes/img/ic/pda-160.png differ
diff --git a/data/elementary/themes/img/ic/phone-040.png b/data/elementary/themes/img/ic/phone-040.png
new file mode 100644
index 0000000000..75b3eca263
Binary files /dev/null and b/data/elementary/themes/img/ic/phone-040.png differ
diff --git a/data/elementary/themes/img/ic/phone-080.png b/data/elementary/themes/img/ic/phone-080.png
new file mode 100644
index 0000000000..f566ac01d4
Binary files /dev/null and b/data/elementary/themes/img/ic/phone-080.png differ
diff --git a/data/elementary/themes/img/ic/phone-160.png b/data/elementary/themes/img/ic/phone-160.png
new file mode 100644
index 0000000000..bb350c4142
Binary files /dev/null and b/data/elementary/themes/img/ic/phone-160.png differ
diff --git a/data/elementary/themes/img/ic/printer-040.png b/data/elementary/themes/img/ic/printer-040.png
new file mode 100644
index 0000000000..3c9d04b511
Binary files /dev/null and b/data/elementary/themes/img/ic/printer-040.png differ
diff --git a/data/elementary/themes/img/ic/printer-080.png b/data/elementary/themes/img/ic/printer-080.png
new file mode 100644
index 0000000000..3f0f7f92a2
Binary files /dev/null and b/data/elementary/themes/img/ic/printer-080.png differ
diff --git a/data/elementary/themes/img/ic/printer-160.png b/data/elementary/themes/img/ic/printer-160.png
new file mode 100644
index 0000000000..c189a4f2b7
Binary files /dev/null and b/data/elementary/themes/img/ic/printer-160.png differ
diff --git a/data/elementary/themes/img/ic/scanner-040.png b/data/elementary/themes/img/ic/scanner-040.png
new file mode 100644
index 0000000000..b8a4fdf0d8
Binary files /dev/null and b/data/elementary/themes/img/ic/scanner-040.png differ
diff --git a/data/elementary/themes/img/ic/scanner-080.png b/data/elementary/themes/img/ic/scanner-080.png
new file mode 100644
index 0000000000..6e52c3ce31
Binary files /dev/null and b/data/elementary/themes/img/ic/scanner-080.png differ
diff --git a/data/elementary/themes/img/ic/scanner-160.png b/data/elementary/themes/img/ic/scanner-160.png
new file mode 100644
index 0000000000..2a4974fe7f
Binary files /dev/null and b/data/elementary/themes/img/ic/scanner-160.png differ
diff --git a/data/elementary/themes/img/media-player.svg b/data/elementary/themes/img/media-player.svg
new file mode 100644
index 0000000000..8557bd25a9
--- /dev/null
+++ b/data/elementary/themes/img/media-player.svg
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="media-player.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/media-player-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <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>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient872">
+      <stop
+         style="stop-color:#202020;stop-opacity:1"
+         offset="0"
+         id="stop868" />
+      <stop
+         style="stop-color:#101010;stop-opacity:1"
+         offset="1"
+         id="stop870" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask947">
+      <rect
+         style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
+         id="rect949"
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient872"
+       id="linearGradient874"
+       x1="40"
+       y1="50"
+       x2="40"
+       y2="48"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.0875"
+     inkscape:cx="40"
+     inkscape:cy="40.26512"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       style="fill:url(#linearGradient874);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+       id="rect866"
+       width="56"
+       height="5"
+       x="12"
+       y="47" />
+    <rect
+       style="fill:#202020;stroke-width:2.82843;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+       id="rect864"
+       width="64"
+       height="16"
+       x="8"
+       y="32" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke-width:2.19089;stroke-linecap:round;stroke-linejoin:round"
+       id="rect876"
+       width="24"
+       height="2"
+       x="44"
+       y="36" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect878"
+       width="20"
+       height="8"
+       x="12"
+       y="36" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4px;line-height:2.5px;font-family:BenchNine;-inkscape-font-specification:BenchNine;letter-spacing:0px;word-spacing:0px;fill:#00ff00;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="12.683594"
+       y="39.634766"
+       id="text882"><tspan
+         sodipodi:role="line"
+         x="12.683594"
+         y="39.634766"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';fill:#00ffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="tspan884">PLAY ▶</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4px;line-height:2.5px;font-family:BenchNine;-inkscape-font-specification:BenchNine;letter-spacing:0px;word-spacing:0px;fill:#00ff00;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="12.683594"
+       y="43"
+       id="text890"><tspan
+         sodipodi:role="line"
+         x="12.683594"
+         y="43"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';fill:#00ffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="tspan888">   17:13</tspan></text>
+    <circle
+       style="fill:#ff3817;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path892"
+       cx="42"
+       cy="37"
+       r="1" />
+    <circle
+       style="fill:#5bff3c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path894"
+       cx="38"
+       cy="37"
+       r="1" />
+    <rect
+       style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect896"
+       width="20"
+       height="1"
+       x="12"
+       y="44" />
+    <rect
+       style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2.19089;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect898"
+       width="24"
+       height="1"
+       x="44"
+       y="38" />
+    <rect
+       style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:3.57771;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect900"
+       width="64"
+       height="1"
+       x="8"
+       y="32" />
+    <rect
+       style="fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect904"
+       width="20"
+       height="1"
+       x="12"
+       y="43" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/pda.svg b/data/elementary/themes/img/pda.svg
new file mode 100644
index 0000000000..0a43de3d16
--- /dev/null
+++ b/data/elementary/themes/img/pda.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="pda.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/pda-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <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>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient964">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop960" />
+      <stop
+         style="stop-color:#fefefe;stop-opacity:0"
+         offset="1"
+         id="stop962" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask947">
+      <rect
+         style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
+         id="rect949"
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
+    </mask>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient964"
+       id="radialGradient966"
+       cx="20"
+       cy="2"
+       fx="20"
+       fy="2"
+       r="16"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,3.375,-3.75,0,27.5,-65.5)" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1875"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       id="rect942"
+       style="fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 20 8 L 20 64 C 20 68 28 72 32 72 L 48 72 C 52 72 60 68 60 64 L 60 8 L 20 8 z " />
+    <ellipse
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="ellipse1010"
+       cx="40"
+       cy="66"
+       rx="8"
+       ry="4" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.92154;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect946"
+       width="32"
+       height="48"
+       x="24"
+       y="12" />
+    <circle
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path952"
+       cx="28"
+       cy="66"
+       r="2" />
+    <circle
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="circle954"
+       cx="52"
+       cy="66"
+       r="2" />
+    <path
+       style="fill:url(#radialGradient966);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 26,14 H 54 V 32 L 26,44 Z"
+       id="path958"
+       sodipodi:nodetypes="ccccc" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path988"
+       cx="40"
+       cy="66"
+       rx="7"
+       ry="3" />
+    <ellipse
+       style="fill:#dcdcdc;fill-opacity:1;stroke:none;stroke-width:2.82843;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="circle1076"
+       cx="40"
+       cy="66"
+       rx="4"
+       ry="2" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/phone.svg b/data/elementary/themes/img/phone.svg
new file mode 100644
index 0000000000..247322057b
--- /dev/null
+++ b/data/elementary/themes/img/phone.svg
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="phone.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/phone-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <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>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient964">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.5"
+         offset="0"
+         id="stop960" />
+      <stop
+         style="stop-color:#fefefe;stop-opacity:0"
+         offset="1"
+         id="stop962" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask947">
+      <rect
+         style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
+         id="rect949"
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
+    </mask>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient964"
+       id="radialGradient966"
+       cx="20"
+       cy="2"
+       fx="20"
+       fy="2"
+       r="16"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,4.8214288,-5.3571431,0,22.142859,-105.57143)" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask1215">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.48069;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         id="rect1217"
+         width="40"
+         height="64"
+         x="20"
+         y="8"
+         ry="8.3382845" />
+    </mask>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1875"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1235"
+       width="8"
+       height="8"
+       x="24"
+       y="16"
+       ry="2" />
+    <rect
+       style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:2.48069;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect946"
+       width="40"
+       height="64"
+       x="20"
+       y="8"
+       ry="8.3382845" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1237"
+       width="8"
+       height="8"
+       x="24"
+       y="16"
+       ry="2" />
+    <path
+       id="path958"
+       style="fill:url(#radialGradient966);fill-opacity:1;stroke:none;stroke-width:2.85714;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 28,10 c -3,0 -6,3 -6,6 V 50 L 58,34 V 16 c 0,-3 -3,-6 -6,-6 z"
+       sodipodi:nodetypes="ssccsss" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1239"
+       width="8"
+       height="8"
+       x="36"
+       y="16"
+       ry="2" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="path988"
+       cx="40"
+       cy="66"
+       rx="7"
+       ry="3" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1241"
+       width="8"
+       height="8"
+       x="48"
+       y="16"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1243"
+       width="8"
+       height="8"
+       x="24"
+       y="28"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1245"
+       width="8"
+       height="8"
+       x="36"
+       y="28"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1247"
+       width="8"
+       height="8"
+       x="48"
+       y="28"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1249"
+       width="8"
+       height="8"
+       x="24"
+       y="40"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1251"
+       width="8"
+       height="8"
+       x="36"
+       y="40"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1253"
+       width="8"
+       height="8"
+       x="48"
+       y="40"
+       ry="2" />
+    <rect
+       style="fill:#80ce5d;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1255"
+       width="8"
+       height="8"
+       x="24"
+       y="52"
+       ry="2" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1257"
+       width="8"
+       height="8"
+       x="36"
+       y="52"
+       ry="2" />
+    <rect
+       style="fill:#cb5d4c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1259"
+       width="8"
+       height="8"
+       x="48"
+       y="52"
+       ry="2" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="26.555664"
+       y="22.15625"
+       id="text1263"><tspan
+         sodipodi:role="line"
+         id="tspan1261"
+         x="26.555664"
+         y="22.15625">1</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="38.399158"
+       y="22.15625"
+       id="text1267"><tspan
+         sodipodi:role="line"
+         id="tspan1265"
+         x="38.399158"
+         y="22.15625">2</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="50.341797"
+       y="22.118164"
+       id="text1271"><tspan
+         sodipodi:role="line"
+         id="tspan1269"
+         x="50.341797"
+         y="22.118164">3</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="26.438477"
+       y="34.147461"
+       id="text1275"><tspan
+         sodipodi:role="line"
+         id="tspan1273"
+         x="26.438477"
+         y="34.147461">4</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="38.327148"
+       y="34.081543"
+       id="text1279"><tspan
+         sodipodi:role="line"
+         id="tspan1277"
+         x="38.327148"
+         y="34.081543">5</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="50.356445"
+       y="34.119629"
+       id="text1283"><tspan
+         sodipodi:role="line"
+         id="tspan1281"
+         x="50.356445"
+         y="34.119629">6</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="26.325684"
+       y="46.119629"
+       id="text1287"><tspan
+         sodipodi:role="line"
+         id="tspan1285"
+         x="26.325684"
+         y="46.119629">7</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="38.341797"
+       y="46.119629"
+       id="text1291"><tspan
+         sodipodi:role="line"
+         id="tspan1289"
+         x="38.341797"
+         y="46.119629">8</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="50.338867"
+       y="46.119629"
+       id="text1295"><tspan
+         sodipodi:role="line"
+         id="tspan1293"
+         x="50.338867"
+         y="46.119629">9</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="38.350586"
+       y="58.119629"
+       id="text1299"><tspan
+         sodipodi:role="line"
+         id="tspan1297"
+         x="38.350586"
+         y="58.119629">0</tspan></text>
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 26.994462,52.994462 c 1,0 2,1 2.011076,2.078571 l -0.01108,1.921429 c 0,1 -1,2 -2,2 v -2 h 1 v -2 h -1 z"
+       id="path1301"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 49,57 c 0,-1 1,-2 2.078571,-2.011076 L 53,55 c 1,0 2,1 2,2 h -2 v -1 h -2 v 1 z"
+       id="path1303"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76383;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1223"
+       width="14"
+       height="2"
+       x="32"
+       y="12"
+       ry="1"
+       rx="1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1227"
+       width="2"
+       height="2"
+       x="52"
+       y="12"
+       rx="1"
+       ry="0.78449798" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1229"
+       width="4"
+       height="2"
+       x="26"
+       y="12"
+       rx="1"
+       ry="0.78449798" />
+    <rect
+       style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       id="rect1231"
+       width="8"
+       height="4"
+       x="36"
+       y="64"
+       ry="2" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/printer.svg b/data/elementary/themes/img/printer.svg
new file mode 100644
index 0000000000..dc02847947
--- /dev/null
+++ b/data/elementary/themes/img/printer.svg
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="printer.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/printer-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <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>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient919">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop915" />
+      <stop
+         style="stop-color:#c8c8c8;stop-opacity:1"
+         offset="1"
+         id="stop917" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient887">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.25"
+         offset="0"
+         id="stop883" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1"
+         id="stop885" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask947">
+      <rect
+         style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
+         id="rect949"
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
+    </mask>
+    <mask
+       id="mask3567"
+       maskUnits="userSpaceOnUse">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 40,10 C 19,10 20,17.832395 20,30 20,42.167605 19,70 40,70 61,70 60,42.167605 60,30 60,17.832395 61,10 40,10 Z"
+         id="path3569"
+         sodipodi:nodetypes="zzzzz" />
+    </mask>
+    <clipPath
+       id="clipPath922"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path924"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 -0.5291667,0.52917 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       id="clipPath922-6"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path924-7"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 -0.5291667,0.52917 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient887"
+       id="linearGradient889"
+       x1="40"
+       y1="28"
+       x2="40"
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient887"
+       id="linearGradient889-3"
+       x1="40"
+       y1="28"
+       x2="40"
+       y2="24"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8,0,0,1,8,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient919"
+       id="linearGradient921"
+       x1="40"
+       y1="48"
+       x2="40"
+       y2="72"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="10.45"
+     inkscape:cx="40"
+     inkscape:cy="39.760766"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     inkscape:bbox-paths="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:3.77953"
+       id="rect927"
+       width="56"
+       height="2"
+       x="12"
+       y="52" />
+    <path
+       style="fill:#a0a0a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8,52 V 32 c 0,-2 2,-4 4,-4 h 56 c 2,0 4,2 4,4 v 20 z"
+       id="path923"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 20,50 v -2 c 0,-1 1,-2 2,-2 h 36 c 1,0 2,1 2,2 v 2 z"
+       id="path925"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="fill:#a0a0a0;fill-opacity:1;stroke-width:5.63419"
+       id="rect861"
+       width="40"
+       height="16"
+       x="20"
+       y="12" />
+    <rect
+       style="fill:url(#linearGradient889);fill-opacity:1;stroke:none;stroke-width:3.77953"
+       id="rect881"
+       width="40"
+       height="4"
+       x="20"
+       y="24" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke-width:4.22564"
+       id="rect863"
+       width="32"
+       height="20"
+       x="24"
+       y="8" />
+    <rect
+       style="fill:#c8c8c8;fill-opacity:1;stroke:none;stroke-width:3.45022"
+       id="rect935"
+       width="40"
+       height="2"
+       x="20"
+       y="50" />
+    <path
+       style="fill:url(#linearGradient921);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 24,48 c -2,0 -4,12 -4,24 H 60 C 60,60 58,48 56,48 Z"
+       id="path865"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:3.77953"
+       id="rect869"
+       width="16"
+       height="2"
+       x="26"
+       y="49" />
+    <rect
+       style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:4.90975"
+       id="rect873"
+       width="27"
+       height="2"
+       x="24"
+       y="52" />
+    <rect
+       style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:4.22564"
+       id="rect875"
+       width="20"
+       height="2"
+       x="23"
+       y="56" />
+    <rect
+       style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:3.40682"
+       id="rect877"
+       width="13"
+       height="2"
+       x="22"
+       y="61" />
+    <rect
+       style="fill:#000000;fill-opacity:0.5;stroke:none;stroke-width:4.81797"
+       id="rect879"
+       width="26"
+       height="2"
+       x="22"
+       y="67" />
+    <rect
+       style="fill:url(#linearGradient889-3);fill-opacity:1;stroke:none;stroke-width:3.38051"
+       id="rect881-5"
+       width="32"
+       height="4"
+       x="24"
+       y="24" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:3.77953"
+       id="rect929"
+       width="16"
+       height="8"
+       x="12"
+       y="32"
+       ry="2" />
+    <circle
+       style="fill:#aade87;fill-opacity:1;stroke:none;stroke-width:3.77953"
+       id="path931"
+       cx="15"
+       cy="35"
+       r="1" />
+    <circle
+       style="fill:#ff9d49;fill-opacity:1;stroke:none;stroke-width:3.77953"
+       id="circle933"
+       cx="19"
+       cy="35"
+       r="1" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/scanner.svg b/data/elementary/themes/img/scanner.svg
new file mode 100644
index 0000000000..862972fcc3
--- /dev/null
+++ b/data/elementary/themes/img/scanner.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="scanner.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/scanner-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <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>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient929">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop925" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop927" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient911">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.63999999"
+         offset="0"
+         id="stop907" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop909" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient893">
+      <stop
+         style="stop-color:#808080;stop-opacity:1;"
+         offset="0"
+         id="stop889" />
+      <stop
+         style="stop-color:#606060;stop-opacity:1"
+         offset="1"
+         id="stop891" />
+    </linearGradient>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask947">
+      <rect
+         style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
+         id="rect949"
+         width="60"
+         height="40"
+         x="10"
+         y="5" />
+    </mask>
+    <mask
+       id="mask3567"
+       maskUnits="userSpaceOnUse">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 40,10 C 19,10 20,17.832395 20,30 20,42.167605 19,70 40,70 61,70 60,42.167605 60,30 60,17.832395 61,10 40,10 Z"
+         id="path3569"
+         sodipodi:nodetypes="zzzzz" />
+    </mask>
+    <clipPath
+       id="clipPath922"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path924"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 -0.5291667,0.52917 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       id="clipPath922-6"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path924-7"
+         d="m 1.3229166,295.4125 h 7.9375003 v -6.08542 c 0,-0.52917 0,-0.52917 -0.529167,-0.52917 H 1.8520833 c -0.5291666,0 -0.5291666,0 -0.5291667,0.52917 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient893"
+       id="linearGradient895"
+       x1="40"
+       y1="56"
+       x2="40"
+       y2="52"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient911"
+       id="linearGradient913"
+       x1="64"
+       y1="34"
+       x2="48"
+       y2="40"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient929"
+       id="linearGradient931"
+       x1="15"
+       y1="34"
+       x2="21"
+       y2="42"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="10.4625"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     inkscape:bbox-paths="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       style="fill:#a0a0a0;stroke-width:3.77953;fill-opacity:1"
+       id="rect875"
+       width="64"
+       height="12"
+       x="8"
+       y="40" />
+    <rect
+       style="fill:url(#linearGradient895);stroke-width:3.77953;fill-opacity:1"
+       id="rect877"
+       width="56"
+       height="4"
+       x="12"
+       y="52" />
+    <path
+       style="fill:#c8c8c8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 8,40 20,28 h 40 l 12,12 z"
+       id="path881" />
+    <path
+       style="fill:#a0a0a0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 70,40 72,38 41,7 39,9 Z"
+       id="path883" />
+    <circle
+       style="fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:3.77953"
+       id="path885"
+       cx="72"
+       cy="40"
+       r="2" />
+    <path
+       style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12,38 9,-9 h 36 l 9,9 z"
+       id="path887"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient913);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 70,40 58,28 H 40 v 12 z"
+       id="path897" />
+    <path
+       style="fill:url(#linearGradient931);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 21,29 -9,9 h 12 l 8,-9 z"
+       id="path915"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>