raster pushed a commit to branch feature/themes/flat.

http://git.enlightenment.org/core/efl.git/commit/?id=4f7af6ad14720ab8c2a129a52fb7916fd81d571c

commit 4f7af6ad14720ab8c2a129a52fb7916fd81d571c
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sun Jul 26 02:18:19 2020 +0100

    TH - icons
---
 data/elementary/themes/edc/O/icons.edc             |   8 +-
 data/elementary/themes/edc/icons.edc               |  11 +-
 data/elementary/themes/ic.edc                      |   8 +-
 data/elementary/themes/img/bulb.svg                |  99 +++++
 data/elementary/themes/img/desks.svg               | 228 +++++------
 data/elementary/themes/img/desktop-pc.svg          | 429 ++++++++++-----------
 data/elementary/themes/img/fingerprint.svg         | 204 ++++++++++
 data/elementary/themes/img/gesture.svg             | 120 ++++++
 data/elementary/themes/img/ic/bulb-040.png         | Bin 0 -> 701 bytes
 data/elementary/themes/img/ic/bulb-080.png         | Bin 0 -> 1448 bytes
 data/elementary/themes/img/ic/bulb-160.png         | Bin 0 -> 2847 bytes
 data/elementary/themes/img/ic/desks-040.png        | Bin 816 -> 746 bytes
 data/elementary/themes/img/ic/desks-080.png        | Bin 1256 -> 1284 bytes
 data/elementary/themes/img/ic/desks-160.png        | Bin 2701 -> 2741 bytes
 data/elementary/themes/img/ic/desktop-pc-040.png   | Bin 711 -> 641 bytes
 data/elementary/themes/img/ic/desktop-pc-080.png   | Bin 975 -> 935 bytes
 data/elementary/themes/img/ic/desktop-pc-160.png   | Bin 1949 -> 1833 bytes
 data/elementary/themes/img/ic/fingerprint-040.png  | Bin 0 -> 2459 bytes
 data/elementary/themes/img/ic/fingerprint-080.png  | Bin 0 -> 5835 bytes
 data/elementary/themes/img/ic/fingerprint-160.png  | Bin 0 -> 12638 bytes
 data/elementary/themes/img/ic/gesture-040.png      | Bin 0 -> 1147 bytes
 data/elementary/themes/img/ic/gesture-080.png      | Bin 0 -> 2351 bytes
 data/elementary/themes/img/ic/gesture-160.png      | Bin 0 -> 4710 bytes
 data/elementary/themes/img/ic/key-040.png          | Bin 0 -> 1034 bytes
 data/elementary/themes/img/ic/key-080.png          | Bin 0 -> 2006 bytes
 data/elementary/themes/img/ic/key-160.png          | Bin 0 -> 3775 bytes
 data/elementary/themes/img/ic/keyboard-040.png     | Bin 0 -> 689 bytes
 data/elementary/themes/img/ic/keyboard-080.png     | Bin 0 -> 597 bytes
 data/elementary/themes/img/ic/keyboard-160.png     | Bin 0 -> 1241 bytes
 data/elementary/themes/img/ic/mouse-040.png        | Bin 0 -> 905 bytes
 data/elementary/themes/img/ic/mouse-080.png        | Bin 0 -> 1718 bytes
 data/elementary/themes/img/ic/mouse-160.png        | Bin 0 -> 3411 bytes
 data/elementary/themes/img/ic/screen-040.png       | Bin 302 -> 354 bytes
 data/elementary/themes/img/ic/screen-080.png       | Bin 394 -> 364 bytes
 data/elementary/themes/img/ic/screen-160.png       | Bin 689 -> 584 bytes
 data/elementary/themes/img/ic/screen-bulb-040.png  | Bin 595 -> 0 bytes
 data/elementary/themes/img/ic/screen-bulb-080.png  | Bin 964 -> 0 bytes
 data/elementary/themes/img/ic/screen-bulb-160.png  | Bin 1896 -> 0 bytes
 data/elementary/themes/img/ic/screen-edges-040.png | Bin 0 -> 589 bytes
 data/elementary/themes/img/ic/screen-edges-080.png | Bin 0 -> 562 bytes
 data/elementary/themes/img/ic/screen-edges-160.png | Bin 0 -> 890 bytes
 data/elementary/themes/img/ic/screen-lock-040.png  | Bin 503 -> 535 bytes
 data/elementary/themes/img/ic/screen-lock-080.png  | Bin 785 -> 734 bytes
 data/elementary/themes/img/ic/screen-lock-160.png  | Bin 1375 -> 1277 bytes
 .../themes/img/ic/screen-resolution-040.png        | Bin 497 -> 579 bytes
 .../themes/img/ic/screen-resolution-080.png        | Bin 663 -> 659 bytes
 .../themes/img/ic/screen-resolution-160.png        | Bin 1147 -> 1103 bytes
 data/elementary/themes/img/key.svg                 | 112 ++++++
 data/elementary/themes/img/keyboard.svg            | 218 +++++++++++
 data/elementary/themes/img/mouse.svg               | 139 +++++++
 .../img/{screen-bulb.svg => screen-edges.svg}      | 101 +++--
 data/elementary/themes/img/screen-lock.svg         | 215 +++++------
 data/elementary/themes/img/screen-resolution.svg   | 223 +++++------
 data/elementary/themes/img/screen.svg              | 211 +++++-----
 54 files changed, 1568 insertions(+), 758 deletions(-)

diff --git a/data/elementary/themes/edc/O/icons.edc 
b/data/elementary/themes/edc/O/icons.edc
index 8ee0621e32..ea2bd3c128 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -78,10 +78,10 @@
 //   ICON("preferences-desktop-font","icon_fonts.png",64)                      
 // "enlightenment/fonts"
 //   ICON("preferences-desktop-screensaver","icon_screensaver.png",64)         
 // "enlightenment/screensaver"
 //   ICON("preferences-desktop-display","icon_screen_setup.png",64)            
 // "enlightenment/screen_setup"
-   ICON("preferences-desktop-keyboard","icon_keyboard.png",64)                
// "enlightenment/keys"
-   ICON("preferences-desktop-keyboard-shortcuts","icon_keys.png",64)          
// "enlightenment/keys"
+//   ICON("preferences-desktop-keyboard","icon_keyboard.png",64)               
 // "enlightenment/keys"
+//   ICON("preferences-desktop-keyboard-shortcuts","icon_keys.png",64)         
 // "enlightenment/keys"
    ICON("preferences-desktop-pointer","icon_mouse.png",64)             // *** 
// "enlightenment/mouse"
-   ICON("preferences-desktop-mouse","icon_mouse_clean.png",64)                
// "enlightenment/mouse_clean"
+//   ICON("preferences-desktop-mouse","icon_mouse_clean.png",64)               
 // "enlightenment/mouse_clean"
    ICON("preferences-desktop-mouse-left","icon_mouse_left.png",64)     // *** 
// "enlightenment/mouse_left"
    ICON("preferences-desktop-mouse-right","icon_mouse_right.png",64)   // *** 
// "enlightenment/mouse_right"
    ICON("preferences-desktop-mouse-middle","icon_mouse_middle.png",64) // *** 
// "enlightenment/mouse_middle"
@@ -123,7 +123,7 @@
 //   ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** // 
"enlightenment/desklock"
    ICON("preferences-icon-theme","icon_icon_theme.png",64)       // *** // 
"enlightenment/icon_theme"
 //   ICON("preferences-transitions","icon_transitions.png",64)     // *** // 
"enlightenment/transitions"
-   ICON("preferences-desktop-edge-bindings","icon_shelf_right.png",64)  // *** 
// "enlightenment/edges"
+//   ICON("preferences-desktop-edge-bindings","icon_shelf_right.png",64)  // 
*** // "enlightenment/edges"
    ICON("preferences-toolbar","icon_toolbar.png",64)             // *** // 
"enlightenment/toolbar"
    ICON("preferences-profiles","icon_profiles.png",64)           // *** // 
"enlightenment/profiles"
    ICON("preferences-startup","icon_startup.png",64)             // *** // 
"enlightenment/startup"
diff --git a/data/elementary/themes/edc/icons.edc 
b/data/elementary/themes/edc/icons.edc
index 4abd44b75f..2f24d06bd8 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -56,7 +56,15 @@
    ICON("preferences-system-lock-screen", "i-screen-lock")
    ICON("preferences-desktop-screensaver", "i-screen")
    ICON("preferences-system-screen-resolution", "i-screen-resolution")
-   ICON("preferences-system-power-management", "i-screen-bulb")
+   ICON("preferences-system-power-management", "i-bulb") // this is wrong but 
it works for backlight settings - FIXME
+   ICON("preferences-desktop-edge-bindings", "i-screen-edges")
+   ICON("preferences-desktop-keyboard-shortcuts", "i-key")
+   ICON("preferences-desktop-swipe-bindings", "i-gesture")
+   ICON("preferences-desktop-mouse", "i-mouse")
+   ICON("preferences-desktop-keyboard", "i-keyboard")
+//   ICON("preferences-desktop-signal-bindings", "i-")
+//   ICON("preferences-behavior", "i-")
+   ICON("preferences-interaction", "i-fingerprint") // pretty bad for touch 
icon - FIXME
 #undef ICON
 
 // mono color default fg color icons
@@ -157,7 +165,6 @@
    ICON("preferences-desklock-locale",            
"icon_preferences-desklock-locale.png")
    ICON("preferences-desktop-signal-bindings",    
"icon_preferences-desktop-signal-bindings.png")
    ICON("preferences-variables",                  
"icon_preferences-variables.png")
-   ICON("preferences-interaction",                
"icon_preferences-interaction.png")
 
    ICON("enlightenment/wallpaper_stretch",          
"icon_wallpaper_stretch.png")
    ICON("enlightenment/wallpaper_center",           
"icon_wallpaper_center.png")
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 3c4f577ce8..e21d7c1cd7 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -190,7 +190,13 @@ I160("i-palette", "palette")
 I160("i-screen", "screen")
 I160("i-screen-lock", "screen-lock")
 I160("i-screen-resolution", "screen-resolution")
-I160("i-screen-bulb", "screen-bulb")
+I160("i-screen-edges", "screen-edges")
+I160("i-bulb", "bulb")
+I160("i-key", "key")
+I160("i-gesture", "gesture")
+I160("i-fingerprint", "fingerprint")
+I160("i-mouse", "mouse")
+I160("i-keyboard", "keyboard")
 
 ///////////////////////////////////////////////////////////////////////////////
 // larger mono icons (mostly efm or settings)
diff --git a/data/elementary/themes/img/bulb.svg 
b/data/elementary/themes/img/bulb.svg
new file mode 100644
index 0000000000..67f774688c
--- /dev/null
+++ b/data/elementary/themes/img/bulb.svg
@@ -0,0 +1,99 @@
+<?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: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="bulb.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bulb-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">
+    <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>
+  </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="1354"
+     inkscape:window-height="1372"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="8.1375"
+     inkscape:cx="36.805474"
+     inkscape:cy="45.565146"
+     inkscape:window-x="1206"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     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" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <circle
+       r="23.097198"
+       cy="33.044487"
+       cx="40"
+       id="path4643"
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.15486;stroke-opacity:1"
 />
+    <path
+       
style="fill:none;fill-opacity:1;stroke:#505050;stroke-width:1.155;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round;stroke-linejoin:round"
+       d="m 38.845141,51.522244 -2.30972,-20.787479 c 0,-2.309719 
2.30972,-2.309719 2.30972,0 v 4.61944 c 0,2.30972 2.30972,2.30972 2.30972,0 v 
-4.61944 c 0,-2.309719 2.30972,-2.309719 2.30972,0 l -2.30972,20.787479"
+       id="path2838"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       
style="fill:#a0a0a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.15486px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 30,69 V 55 L 26.141682,51.522244 H 53.85832 L 50,55 v 14 h -4 l 
-1,1 H 35 l -1,-1 z"
+       id="path4244"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/desks.svg 
b/data/elementary/themes/img/desks.svg
index f5367ce049..3f6f6982cb 100644
--- a/data/elementary/themes/img/desks.svg
+++ b/data/elementary/themes/img/desks.svg
@@ -7,16 +7,16 @@
    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";
-   inkscape:export-ydpi="48"
-   inkscape:export-xdpi="48"
-   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/desks-040.png"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="desks.svg"
-   viewBox="0 0 80 80"
-   height="80"
-   width="80"
+   version="1.1"
    id="svg2"
-   version="1.1">
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="desks.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/desks-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -32,172 +32,144 @@
   <defs
      id="defs6">
     <filter
-       height="1.5548975"
-       y="-0.27744874"
-       width="1.508656"
-       x="-0.25432801"
-       id="filter5686"
+       inkscape:collect="always"
        style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
+       id="filter5686"
+       x="-0.25432801"
+       width="1.508656"
+       y="-0.27744874"
+       height="1.5548975">
       <feGaussianBlur
-         id="feGaussianBlur5688"
+         inkscape:collect="always"
          stdDeviation="1.2716401"
-         inkscape:collect="always" />
+         id="feGaussianBlur5688" />
     </filter>
   </defs>
   <sodipodi:namedview
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:current-layer="g10"
-     inkscape:window-maximized="0"
-     inkscape:window-y="0"
-     inkscape:window-x="1206"
-     inkscape:cy="40"
-     inkscape:cx="40"
-     inkscape:zoom="8.1375"
-     showgrid="true"
-     id="namedview4"
-     inkscape:window-height="1372"
-     inkscape:window-width="1354"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
+     inkscape:document-rotation="0"
      pagecolor="#404040"
-     inkscape:document-rotation="0">
+     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="8.1375"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true">
     <inkscape:grid
-       id="grid837"
-       type="xygrid" />
+       type="xygrid"
+       id="grid837" />
   </sodipodi:namedview>
   <g
-     id="g10"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g10">
     <rect
        y="10"
        x="10"
-       height="29"
-       width="29"
-       id="rect5242"
-       
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:3.52162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
-    <rect
-       
style="opacity:1;fill:#566ba7;fill-opacity:1;stroke:none;stroke-width:3.03588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       height="30"
+       width="30"
        id="rect5252"
-       width="25"
-       height="25"
-       x="12"
-       y="12" />
-    <rect
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:3.52162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5242-4"
-       width="29"
-       height="29"
-       x="41"
-       y="10" />
+       
style="opacity:1;fill:#48598c;fill-opacity:1;stroke:none;stroke-width:3.64306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
     <rect
-       y="12"
-       x="43"
-       height="25"
-       width="25"
+       
style="opacity:1;fill:#734e2f;fill-opacity:1;stroke:none;stroke-width:3.64306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5252-0"
-       
style="opacity:1;fill:#734e2f;fill-opacity:1;stroke:none;stroke-width:3.03588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
-    <rect
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:3.52162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5242-5"
-       width="29"
-       height="29"
-       x="41"
-       y="41" />
+       width="30"
+       height="30"
+       x="40"
+       y="10" />
     <rect
-       y="43"
-       x="43"
-       height="25"
-       width="25"
+       
style="opacity:0.5;fill:#8163a3;fill-opacity:1;stroke:none;stroke-width:3.64306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5252-9"
-       
style="opacity:0.5;fill:#664d82;fill-opacity:1;stroke:none;stroke-width:3.03588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
-    <rect
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:3.52162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5242-46"
-       width="29"
-       height="29"
-       x="10"
-       y="41" />
+       width="30"
+       height="30"
+       x="40"
+       y="40" />
     <rect
-       y="43"
-       x="12"
-       height="25"
-       width="25"
+       
style="opacity:0.5;fill:#347278;fill-opacity:1;stroke:none;stroke-width:3.64306;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5252-92"
-       
style="opacity:0.5;fill:#347278;fill-opacity:1;stroke:none;stroke-width:3.03588;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+       width="30"
+       height="30"
+       x="10"
+       y="40" />
     <rect
-       
style="opacity:0.5;fill:#090909;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5686)"
+       y="17"
+       x="15"
+       height="11"
+       width="12"
        id="rect5292"
+       
style="opacity:0.5;fill:#090909;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5686)"
 />
+    <rect
+       
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5288"
        width="12"
        height="11"
        x="15"
-       y="17" />
+       y="16" />
     <rect
-       y="16"
-       x="15"
+       
style="opacity:0.5;fill:#090909;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5686)"
+       id="rect5690"
+       width="12"
+       height="11"
+       x="22"
+       y="21" />
+    <rect
+       y="20"
+       x="22"
        height="11"
        width="12"
-       id="rect5288"
+       id="rect5692"
        
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
     <rect
-       y="21"
+       y="20"
        x="22"
+       height="2"
+       width="12"
+       id="rect5694"
+       
style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       y="17"
+       x="49"
        height="11"
        width="12"
-       id="rect5690"
+       id="rect5696"
        
style="opacity:0.5;fill:#090909;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5686)"
 />
     <rect
        
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5692"
+       id="rect5698"
        width="12"
        height="11"
-       x="22"
-       y="20" />
-    <rect
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5694"
-       width="12"
-       height="2"
-       x="22"
-       y="20" />
+       x="49"
+       y="16" />
     <rect
        
style="opacity:0.5;fill:#090909;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5686)"
-       id="rect5696"
+       id="rect5702"
        width="12"
        height="11"
-       x="49"
-       y="17" />
-    <rect
-       y="16"
-       x="49"
-       height="11"
-       width="12"
-       id="rect5698"
-       
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+       x="21"
+       y="53" />
     <rect
-       y="53"
+       y="52"
        x="21"
        height="11"
        width="12"
-       id="rect5702"
-       
style="opacity:0.5;fill:#090909;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5686)"
 />
-    <rect
-       
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5704"
-       width="12"
-       height="11"
-       x="21"
-       y="52" />
+       
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/desktop-pc.svg 
b/data/elementary/themes/img/desktop-pc.svg
index 54ba9796d6..dec82e6e82 100644
--- a/data/elementary/themes/img/desktop-pc.svg
+++ b/data/elementary/themes/img/desktop-pc.svg
@@ -8,16 +8,16 @@
    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";
-   inkscape:export-ydpi="48"
-   inkscape:export-xdpi="48"
-   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/desktop-pc-040.png"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="desktop-pc.svg"
-   viewBox="0 0 80 80"
-   height="80"
-   width="80"
+   version="1.1"
    id="svg2"
-   version="1.1">
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="desktop-pc.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/desktop-pc-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -32,6 +32,53 @@
   </metadata>
   <defs
      id="defs6">
+    <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>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter975"
+       x="-0.0432"
+       width="1.0864"
+       y="-0.054"
+       height="1.108">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.45"
+         id="feGaussianBlur977" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1003"
+       x="-0.0272"
+       width="1.0544"
+       y="-0.204"
+       height="1.408">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.34"
+         id="feGaussianBlur1005" />
+    </filter>
+    <linearGradient
+       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,0)"
+       gradientUnits="userSpaceOnUse"
+       y2="54"
+       x2="40"
+       y1="50"
+       x1="40"
+       id="linearGradient856"
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
     <linearGradient
        id="linearGradient854"
        inkscape:collect="always">
@@ -44,16 +91,6 @@
          offset="1"
          style="stop-color:#040404;stop-opacity:0" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="54"
-       x2="40"
-       y1="50"
-       x1="40"
-       id="linearGradient856"
-       xlink:href="#linearGradient854"
-       inkscape:collect="always" />
     <linearGradient
        gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-72.5)"
        y2="54"
@@ -64,278 +101,232 @@
        id="linearGradient860"
        xlink:href="#linearGradient854"
        inkscape:collect="always" />
-    <filter
-       height="1.12"
-       y="-0.06"
-       width="1.08"
-       x="-0.04"
-       id="filter943"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur945"
-         stdDeviation="1"
-         inkscape:collect="always" />
-    </filter>
-    <mask
-       id="mask947"
-       maskUnits="userSpaceOnUse">
-      <rect
-         y="5"
-         x="10"
-         height="40"
-         width="60"
-         id="rect949"
-         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
 />
-    </mask>
-    <filter
-       height="1.108"
-       y="-0.054"
-       width="1.0864"
-       x="-0.0432"
-       id="filter975"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur977"
-         stdDeviation="0.45"
-         inkscape:collect="always" />
-    </filter>
-    <filter
-       height="1.408"
-       y="-0.204"
-       width="1.0544"
-       x="-0.0272"
-       id="filter1003"
-       style="color-interpolation-filters:sRGB"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur1005"
-         stdDeviation="0.34"
-         inkscape:collect="always" />
-    </filter>
   </defs>
   <sodipodi:namedview
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     showguides="false"
-     inkscape:current-layer="g10"
-     inkscape:window-maximized="0"
-     inkscape:window-y="0"
-     inkscape:window-x="1206"
-     inkscape:cy="40.122888"
-     inkscape:cx="40"
-     inkscape:zoom="8.1375"
-     showgrid="true"
-     id="namedview4"
-     inkscape:window-height="1372"
-     inkscape:window-width="1354"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
+     inkscape:document-rotation="0"
      pagecolor="#404040"
-     inkscape:document-rotation="0">
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="10.4"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="false">
     <inkscape:grid
-       id="grid837"
-       type="xygrid" />
+       type="xygrid"
+       id="grid837" />
   </sodipodi:namedview>
   <g
-     id="g10"
+     inkscape:groupmode="layer"
      inkscape:label="Image"
-     inkscape:groupmode="layer">
+     id="g10">
     <rect
-       
style="opacity:1;fill:#28303e;fill-opacity:1;stroke-width:3.63052;stroke-linecap:round;stroke-linejoin:round"
-       id="rect838"
-       width="56"
-       height="36"
-       x="12"
-       y="12" />
+       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.80615;stroke-linecap:round;stroke-linejoin:round"
+       id="rect838-3"
+       width="60"
+       height="36.929558"
+       x="10"
+       y="8" />
     <rect
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter1003)"
-       id="rect1001"
-       width="30"
+       y="50"
+       x="35"
+       height="10"
+       width="10"
+       id="rect840"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="60"
+       x="28"
+       height="2"
+       width="25"
+       id="rect842-6"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       y="50"
+       x="35"
        height="4"
-       x="25"
-       y="45" />
+       width="10"
+       id="rect848"
+       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       transform="scale(1,-1)"
+       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
+       id="rect858"
+       width="10"
+       height="1"
+       x="35"
+       y="-60" />
+    <rect
+       y="8"
+       x="10"
+       height="36.929558"
+       width="60"
+       id="rect838"
+       
style="opacity:1;fill:#28303e;fill-opacity:1;stroke-width:3.80616;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       y="44"
-       x="25"
+       y="41.816002"
+       x="25.184002"
        height="4"
        width="30"
+       id="rect1001"
+       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter1003)"
 />
+    <rect
+       
style="opacity:1;fill:#808080;fill-opacity:1;stroke-width:4.0784;stroke-linecap:round;stroke-linejoin:round"
        id="rect965"
-       
style="opacity:1;fill:#808080;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
+       width="29.815998"
+       height="4.1839981"
+       x="25.184002"
+       y="40.816002" />
     <path
-       d="m 19,17 a 2,2 0 0 1 -1.996448,1.999997 2,2 0 0 1 -2.003539,-1.992894 
2,2 0 0 1 1.989332,-2.007075 2,2 0 0 1 2.010605,1.985765 L 17,17 Z"
-       sodipodi:arc-type="slice"
-       sodipodi:end="6.2760818"
-       sodipodi:start="0"
-       sodipodi:ry="2"
-       sodipodi:rx="2"
-       sodipodi:cy="17"
-       sodipodi:cx="17"
-       sodipodi:type="arc"
+       
style="opacity:1;fill:#f2e884;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
        id="path967"
-       
style="opacity:1;fill:#f2e884;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
-    <path
-       
style="opacity:1;fill:#84c7f2;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
-       id="path969"
        sodipodi:type="arc"
-       sodipodi:cx="17"
-       sodipodi:cy="23"
+       sodipodi:cx="14"
+       sodipodi:cy="12"
        sodipodi:rx="2"
        sodipodi:ry="2"
        sodipodi:start="0"
        sodipodi:end="6.2760818"
        sodipodi:arc-type="slice"
-       d="m 19,23 a 2,2 0 0 1 -1.996448,1.999997 2,2 0 0 1 -2.003539,-1.992894 
2,2 0 0 1 1.989332,-2.007075 2,2 0 0 1 2.010605,1.985765 L 17,23 Z" />
+       d="m 16,12 a 2,2 0 0 1 -1.996448,1.999997 2,2 0 0 1 -2.003539,-1.992894 
2,2 0 0 1 1.989332,-2.007075 2,2 0 0 1 2.010605,1.985765 L 14,12 Z" />
     <path
-       d="m 19,29 a 2,2 0 0 1 -1.996448,1.999997 2,2 0 0 1 -2.003539,-1.992894 
2,2 0 0 1 1.989332,-2.007075 2,2 0 0 1 2.010605,1.985765 L 17,29 Z"
+       d="m 16,18 a 2,2 0 0 1 -1.996448,1.999997 2,2 0 0 1 -2.003539,-1.992894 
2,2 0 0 1 1.989332,-2.007075 2,2 0 0 1 2.010605,1.985765 L 14,18 Z"
        sodipodi:arc-type="slice"
        sodipodi:end="6.2760818"
        sodipodi:start="0"
        sodipodi:ry="2"
        sodipodi:rx="2"
-       sodipodi:cy="29"
-       sodipodi:cx="17"
+       sodipodi:cy="18"
+       sodipodi:cx="14"
        sodipodi:type="arc"
+       id="path969"
+       
style="opacity:1;fill:#84c7f2;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
+    <path
+       
style="opacity:1;fill:#da84f2;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
        id="path971"
-       
style="opacity:1;fill:#da84f2;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
+       sodipodi:type="arc"
+       sodipodi:cx="14"
+       sodipodi:cy="24"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       sodipodi:start="0"
+       sodipodi:end="6.2760818"
+       sodipodi:arc-type="slice"
+       d="m 16,24 a 2,2 0 0 1 -1.996448,1.999997 2,2 0 0 1 -2.003539,-1.992894 
2,2 0 0 1 1.989332,-2.007075 2,2 0 0 1 2.010605,1.985765 L 14,24 Z" />
     <rect
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:8.16496;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter975)"
+       y="15"
+       x="30"
+       height="20"
+       width="25"
        id="rect973"
+       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:8.16496;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter975)"
 />
+    <rect
+       
style="opacity:1;mix-blend-mode:normal;fill:#808080;fill-opacity:1;stroke-width:8.16496;stroke-linecap:round;stroke-linejoin:round"
+       id="rect979"
        width="25"
        height="20"
-       x="33"
-       y="17" />
+       x="30"
+       y="14" />
     <rect
-       y="16"
-       x="33"
-       height="20"
+       y="14"
+       x="30"
+       height="4"
        width="25"
-       id="rect979"
-       
style="opacity:1;mix-blend-mode:normal;fill:#808080;fill-opacity:1;stroke-width:8.16496;stroke-linecap:round;stroke-linejoin:round"
 />
-    <rect
-       
style="opacity:1;mix-blend-mode:normal;fill:#212121;fill-opacity:1;stroke-width:3.65148;stroke-linecap:round;stroke-linejoin:round"
        id="rect1007"
-       width="25"
-       height="4"
-       x="33"
-       y="16" />
-    <path
-       d="m 57,18 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 56,18 Z"
-       sodipodi:arc-type="slice"
-       sodipodi:end="6.2760818"
-       sodipodi:start="0"
-       sodipodi:ry="1.0000001"
-       sodipodi:rx="1.0000005"
-       sodipodi:cy="18"
-       sodipodi:cx="56"
-       sodipodi:type="arc"
-       id="path1009"
-       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:4.94529;stroke-linecap:round;stroke-linejoin:round"
 />
+       
style="opacity:1;mix-blend-mode:normal;fill:#212121;fill-opacity:1;stroke-width:3.65148;stroke-linecap:round;stroke-linejoin:round"
 />
     <path
        
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:4.94529;stroke-linecap:round;stroke-linejoin:round"
-       id="path1013"
+       id="path1009"
        sodipodi:type="arc"
-       sodipodi:cx="52"
-       sodipodi:cy="18"
+       sodipodi:cx="53"
+       sodipodi:cy="16"
        sodipodi:rx="1.0000005"
        sodipodi:ry="1.0000001"
        sodipodi:start="0"
        sodipodi:end="6.2760818"
        sodipodi:arc-type="slice"
-       d="m 53,18 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 52,18 Z" />
+       d="m 54,16 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 53,16 Z" />
     <path
-       d="m 50,18 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 49,18 Z"
+       d="m 50,16 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 49,16 Z"
        sodipodi:arc-type="slice"
        sodipodi:end="6.2760818"
        sodipodi:start="0"
        sodipodi:ry="1.0000001"
        sodipodi:rx="1.0000005"
-       sodipodi:cy="18"
+       sodipodi:cy="16"
        sodipodi:cx="49"
        sodipodi:type="arc"
-       id="path1015"
+       id="path1013"
        
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:4.94529;stroke-linecap:round;stroke-linejoin:round"
 />
     <path
-       
style="opacity:1;fill:#d58282;fill-opacity:1;stroke-width:4.94529;stroke-linecap:round;stroke-linejoin:round"
-       id="path1017"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:4.94529;stroke-linecap:round;stroke-linejoin:round"
+       id="path1015"
        sodipodi:type="arc"
-       sodipodi:cx="35"
-       sodipodi:cy="18"
+       sodipodi:cx="46"
+       sodipodi:cy="16"
        sodipodi:rx="1.0000005"
        sodipodi:ry="1.0000001"
        sodipodi:start="0"
        sodipodi:end="6.2760818"
        sodipodi:arc-type="slice"
-       d="m 36,18 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 35,18 Z" />
+       d="m 47,16 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 46,16 Z" />
+    <path
+       d="m 33,16 a 1.0000005,1.0000001 0 0 1 -0.998224,0.999999 
1.0000005,1.0000001 0 0 1 -1.00177,-0.996447 1.0000005,1.0000001 0 0 1 
0.994666,-1.003538 1.0000005,1.0000001 0 0 1 1.005303,0.992883 L 32,16 Z"
+       sodipodi:arc-type="slice"
+       sodipodi:end="6.2760818"
+       sodipodi:start="0"
+       sodipodi:ry="1.0000001"
+       sodipodi:rx="1.0000005"
+       sodipodi:cy="16"
+       sodipodi:cx="32"
+       sodipodi:type="arc"
+       id="path1017"
+       
style="opacity:1;fill:#d58282;fill-opacity:1;stroke-width:4.94529;stroke-linecap:round;stroke-linejoin:round"
 />
     <g
        id="g963">
       <path
-         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
-         d="m 16,64 -4,4 h 56 l -4,-4 z"
+         sodipodi:nodetypes="ccccc"
          id="path844"
-         sodipodi:nodetypes="ccccc" />
+         d="m 16,64 -4,4 h 56 l -4,-4 z"
+         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
       <rect
-         
style="opacity:1;fill:#808080;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
-         id="rect846"
-         width="56"
-         height="2"
+         y="68"
          x="12"
-         y="68" />
+         height="2"
+         width="56"
+         id="rect846"
+         
style="opacity:1;fill:#808080;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
       <path
-         
style="opacity:1;fill:#000000;fill-opacity:0.25;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
+         id="path862"
          d="m 17,65 -2,2 h 40 l -2,-2 z"
-         id="path862" />
+         
style="opacity:1;fill:#000000;fill-opacity:0.25;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
       <path
-         
style="opacity:1;fill:#000000;fill-opacity:0.25;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
+         id="path864"
          d="m 65,67 -2,-2 h -7 l 2,2 z"
-         id="path864" />
+         
style="opacity:1;fill:#000000;fill-opacity:0.25;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
 />
     </g>
     <rect
-       y="50"
-       x="35"
-       height="10"
-       width="10"
-       id="rect840"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
 />
-    <rect
-       y="60"
-       x="28"
-       height="2"
-       width="25"
-       id="rect842"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
 />
-    <rect
-       y="50"
-       x="35"
-       height="4"
-       width="10"
-       id="rect848"
-       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
 />
-    <rect
-       transform="scale(1,-1)"
-       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
-       id="rect858"
-       width="10"
-       height="1"
-       x="35"
-       y="-60" />
-    <path
-       transform="translate(0,5)"
-       mask="url(#mask947)"
-       id="path873"
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter943)"
-       d="M 10,5 V 45 H 70 V 5 Z m 2,2 H 68 V 43 H 12 Z" />
-    <path
-       d="M 10,10 V 50 H 70 V 10 Z m 2,2 H 68 V 48 H 12 Z"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
-       id="rect866" />
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:11.0314;stroke-linecap:round;stroke-linejoin:round"
+       id="rect847"
+       width="60"
+       height="5.0704441"
+       x="10"
+       y="44.929558" />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/fingerprint.svg 
b/data/elementary/themes/img/fingerprint.svg
new file mode 100644
index 0000000000..b8010a256a
--- /dev/null
+++ b/data/elementary/themes/img/fingerprint.svg
@@ -0,0 +1,204 @@
+<?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: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="fingerprint.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/fingerprint-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">
+    <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>
+  </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="1354"
+     inkscape:window-height="1372"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="8.1375"
+     inkscape:cx="40"
+     inkscape:cy="40.061444"
+     inkscape:window-x="1206"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     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" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <circle
+       r="30"
+       cy="40"
+       cx="40"
+       id="path5067"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke:#a0a0a0;stroke-opacity:1"
 />
+    <path
+       d="m 43.975455,43.03245 a 5,5 0 0 1 -6.464136,1.304192 5,5 0 0 1 
-2.135227,-6.239133 5,5 0 0 1 5.90778,-2.929866"
+       sodipodi:arc-type="arc"
+       sodipodi:open="true"
+       sodipodi:end="4.9720722"
+       sodipodi:start="0.65163863"
+       sodipodi:ry="5"
+       sodipodi:rx="5"
+       sodipodi:cy="40"
+       sodipodi:cx="40"
+       sodipodi:type="arc"
+       id="path5069"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5071"
+       sodipodi:type="arc"
+       sodipodi:cx="40"
+       sodipodi:cy="40"
+       sodipodi:rx="10"
+       sodipodi:ry="10"
+       sodipodi:start="2.6954195"
+       sodipodi:end="5.9000004"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="m 30.978949,44.315165 a 10,10 0 0 1 0.894023,-10.141949 10,10 0 0 1 
9.31837,-4.101998 10,10 0 0 1 8.083444,6.190019" />
+    <path
+       d="M 54.96884,40.966349 A 15,15 0 0 1 44.144681,54.41602 15,15 0 0 1 
27.83009,48.768881 15,15 0 0 1 27.6369,31.505662"
+       sodipodi:arc-type="arc"
+       sodipodi:open="true"
+       sodipodi:end="3.7435892"
+       sodipodi:start="0.064467936"
+       sodipodi:ry="15"
+       sodipodi:rx="15"
+       sodipodi:cy="40"
+       sodipodi:cx="40"
+       sodipodi:type="arc"
+       id="path5073"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       sodipodi:open="true"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5075"
+       sodipodi:type="arc"
+       sodipodi:cx="40"
+       sodipodi:cy="40"
+       sodipodi:rx="20"
+       sodipodi:ry="20"
+       sodipodi:start="1.4555675"
+       sodipodi:end="4.4180899"
+       sodipodi:arc-type="arc"
+       d="M 42.29948,59.86737 A 20,20 0 0 1 20.41782,44.066721 20,20 0 0 1 
34.198617,20.859886" />
+    <path
+       d="M 45.46173,15.603904 A 25,25 0 0 1 64.900594,42.227205 25,25 0 0 1 
41.04551,64.978129 25,25 0 0 1 15.372628,44.300298"
+       sodipodi:arc-type="arc"
+       sodipodi:open="true"
+       sodipodi:end="2.968721"
+       sodipodi:start="4.9326345"
+       sodipodi:ry="25"
+       sodipodi:rx="25"
+       sodipodi:cy="40"
+       sodipodi:cx="40"
+       sodipodi:type="arc"
+       id="path5077"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       d="m 47.923024,46.101286 a 10,10 0 0 1 -9.499196,3.773717"
+       sodipodi:arc-type="arc"
+       sodipodi:open="true"
+       sodipodi:end="1.7290736"
+       sodipodi:start="0.65622285"
+       sodipodi:ry="10"
+       sodipodi:rx="10"
+       sodipodi:cy="40"
+       sodipodi:cx="40"
+       sodipodi:type="arc"
+       id="path5079"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5081"
+       sodipodi:type="arc"
+       sodipodi:cx="40"
+       sodipodi:cy="40"
+       sodipodi:rx="15"
+       sodipodi:ry="15"
+       sodipodi:start="4.9434339"
+       sodipodi:end="5.6642139"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="m 43.434922,25.398585 a 15,15 0 0 1 8.782213,5.898449" />
+    <path
+       d="m 52.406889,24.31341 a 20,20 0 0 1 5.301636,24.982189"
+       sodipodi:arc-type="arc"
+       sodipodi:end="0.48338606"
+       sodipodi:start="5.3815708"
+       sodipodi:ry="20"
+       sodipodi:rx="20"
+       sodipodi:cy="40"
+       sodipodi:cx="40"
+       sodipodi:type="arc"
+       id="path5083"
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:open="true" />
+    <path
+       
style="opacity:1;fill:none;fill-opacity:1;stroke:#a0a0a0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5085"
+       sodipodi:type="arc"
+       sodipodi:cx="40"
+       sodipodi:cy="40"
+       sodipodi:rx="25"
+       sodipodi:ry="25"
+       sodipodi:start="3.7973554"
+       sodipodi:end="4.1880314"
+       sodipodi:open="true"
+       sodipodi:arc-type="arc"
+       d="m 20.185423,24.755901 a 25,25 0 0 1 7.298152,-6.397045" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/gesture.svg 
b/data/elementary/themes/img/gesture.svg
new file mode 100644
index 0000000000..a021fe7a36
--- /dev/null
+++ b/data/elementary/themes/img/gesture.svg
@@ -0,0 +1,120 @@
+<?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: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="gesture.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/gesture-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">
+    <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>
+  </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="1354"
+     inkscape:window-height="1372"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="8.1375"
+     inkscape:cx="40"
+     inkscape:cy="40"
+     inkscape:window-x="1206"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     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" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       id="path5039"
+       
style="opacity:0.5;fill:#3399ff;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:transform-center-x="-12.073501"
+       inkscape:transform-center-y="5.2728684"
+       d="m 13.281233,20.020281 c -3.535534,3.535534 0,7.071068 0,7.071068 l 
5.656854,5.656854 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535533,3.535534 
0,7.071068 0,7.071068 l 14.151804,14.151803 c -0.05374,0.05297 -0.11264,0.09366 
-0.164348,0.150536 -0.671387,0.738526 -1.157335,1.81283 -1.157334,3.375331 0,5 
4.999466,4.999465 4.999466,4.999465 h 4.748111 c 28,0 30,-27 
28.33399,-28.333989 l -8.485282,-8.485282 c 0,0 -3.535534,-3.535533 -7.071067,0 
-3.535534,3.535534 0,7.071068 0,7.071068 [...]
+       sodipodi:nodetypes="sccscccsccccsccsccs" />
+    <path
+       sodipodi:nodetypes="sccscccsccccsccsccs"
+       d="m 16.343146,20.272078 c -3.535534,3.535534 0,7.071068 0,7.071068 L 
22,33 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535533,3.535534 0,7.071068 
0,7.071068 l 14.151804,14.151803 c -0.05374,0.05297 -0.11264,0.09366 
-0.164348,0.150536 -0.671387,0.738526 -1.157335,1.81283 -1.157334,3.375331 0,5 
4.999466,4.999465 4.999466,4.999465 h 4.748111 c 28,0 30,-27 
28.33399,-28.333989 l -8.485282,-8.485282 c 0,0 -3.535534,-3.535533 -7.071067,0 
-3.535534,3.535534 0,7.071068 0,7.071068 L 35.435029 [...]
+       inkscape:transform-center-y="5.2728684"
+       inkscape:transform-center-x="-12.073501"
+       
style="opacity:0.5;fill:#3399ff;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path5041" />
+    <path
+       sodipodi:nodetypes="sccscccsccccsccsccs"
+       d="m 20.058874,20.272078 c -3.535534,3.535534 0,7.071068 0,7.071068 L 
25.715728,33 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535533,3.535534 
0,7.071068 0,7.071068 l 14.151804,14.151803 c -0.05374,0.05297 -0.11264,0.09366 
-0.164348,0.150536 -0.671387,0.738526 -1.157335,1.81283 -1.157334,3.375331 0,5 
4.999466,4.999465 4.999466,4.999465 h 4.748111 c 28,0 30,-27 
28.33399,-28.333989 l -8.485282,-8.485282 c 0,0 -3.535534,-3.535533 -7.071067,0 
C 50.464466,29.464466 54,33 54,33 L 39.150757 [...]
+       inkscape:transform-center-y="5.2728684"
+       inkscape:transform-center-x="-12.073501"
+       
style="fill:#c8c8c8;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path5020" />
+    <circle
+       r="5"
+       cy="23.505486"
+       cx="23.453703"
+       id="path5043"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:1.28333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    <circle
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:1.28333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="circle5045"
+       cx="22"
+       cy="36"
+       r="5" />
+    <circle
+       r="5"
+       cy="21.510441"
+       cx="35.539734"
+       id="circle5047"
+       
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:1.28333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/ic/bulb-040.png 
b/data/elementary/themes/img/ic/bulb-040.png
new file mode 100644
index 0000000000..1fe6050dec
Binary files /dev/null and b/data/elementary/themes/img/ic/bulb-040.png differ
diff --git a/data/elementary/themes/img/ic/bulb-080.png 
b/data/elementary/themes/img/ic/bulb-080.png
new file mode 100644
index 0000000000..09967ddd2a
Binary files /dev/null and b/data/elementary/themes/img/ic/bulb-080.png differ
diff --git a/data/elementary/themes/img/ic/bulb-160.png 
b/data/elementary/themes/img/ic/bulb-160.png
new file mode 100644
index 0000000000..d049ba9f8e
Binary files /dev/null and b/data/elementary/themes/img/ic/bulb-160.png differ
diff --git a/data/elementary/themes/img/ic/desks-040.png 
b/data/elementary/themes/img/ic/desks-040.png
index c459a29721..b468416a12 100644
Binary files a/data/elementary/themes/img/ic/desks-040.png and 
b/data/elementary/themes/img/ic/desks-040.png differ
diff --git a/data/elementary/themes/img/ic/desks-080.png 
b/data/elementary/themes/img/ic/desks-080.png
index 7fda827db6..68c6a31508 100644
Binary files a/data/elementary/themes/img/ic/desks-080.png and 
b/data/elementary/themes/img/ic/desks-080.png differ
diff --git a/data/elementary/themes/img/ic/desks-160.png 
b/data/elementary/themes/img/ic/desks-160.png
index 7b30d3c39a..523f947aa0 100644
Binary files a/data/elementary/themes/img/ic/desks-160.png and 
b/data/elementary/themes/img/ic/desks-160.png differ
diff --git a/data/elementary/themes/img/ic/desktop-pc-040.png 
b/data/elementary/themes/img/ic/desktop-pc-040.png
index ef4bdd7960..a1390b7660 100644
Binary files a/data/elementary/themes/img/ic/desktop-pc-040.png and 
b/data/elementary/themes/img/ic/desktop-pc-040.png differ
diff --git a/data/elementary/themes/img/ic/desktop-pc-080.png 
b/data/elementary/themes/img/ic/desktop-pc-080.png
index 5d01991c10..6e2e20f1a9 100644
Binary files a/data/elementary/themes/img/ic/desktop-pc-080.png and 
b/data/elementary/themes/img/ic/desktop-pc-080.png differ
diff --git a/data/elementary/themes/img/ic/desktop-pc-160.png 
b/data/elementary/themes/img/ic/desktop-pc-160.png
index b954f68269..86653574a8 100644
Binary files a/data/elementary/themes/img/ic/desktop-pc-160.png and 
b/data/elementary/themes/img/ic/desktop-pc-160.png differ
diff --git a/data/elementary/themes/img/ic/fingerprint-040.png 
b/data/elementary/themes/img/ic/fingerprint-040.png
new file mode 100644
index 0000000000..9ce6eb4038
Binary files /dev/null and b/data/elementary/themes/img/ic/fingerprint-040.png 
differ
diff --git a/data/elementary/themes/img/ic/fingerprint-080.png 
b/data/elementary/themes/img/ic/fingerprint-080.png
new file mode 100644
index 0000000000..85cca0d154
Binary files /dev/null and b/data/elementary/themes/img/ic/fingerprint-080.png 
differ
diff --git a/data/elementary/themes/img/ic/fingerprint-160.png 
b/data/elementary/themes/img/ic/fingerprint-160.png
new file mode 100644
index 0000000000..e3d40b39f2
Binary files /dev/null and b/data/elementary/themes/img/ic/fingerprint-160.png 
differ
diff --git a/data/elementary/themes/img/ic/gesture-040.png 
b/data/elementary/themes/img/ic/gesture-040.png
new file mode 100644
index 0000000000..acd7930074
Binary files /dev/null and b/data/elementary/themes/img/ic/gesture-040.png 
differ
diff --git a/data/elementary/themes/img/ic/gesture-080.png 
b/data/elementary/themes/img/ic/gesture-080.png
new file mode 100644
index 0000000000..3e731eacb5
Binary files /dev/null and b/data/elementary/themes/img/ic/gesture-080.png 
differ
diff --git a/data/elementary/themes/img/ic/gesture-160.png 
b/data/elementary/themes/img/ic/gesture-160.png
new file mode 100644
index 0000000000..d42811b192
Binary files /dev/null and b/data/elementary/themes/img/ic/gesture-160.png 
differ
diff --git a/data/elementary/themes/img/ic/key-040.png 
b/data/elementary/themes/img/ic/key-040.png
new file mode 100644
index 0000000000..0b9f93f92f
Binary files /dev/null and b/data/elementary/themes/img/ic/key-040.png differ
diff --git a/data/elementary/themes/img/ic/key-080.png 
b/data/elementary/themes/img/ic/key-080.png
new file mode 100644
index 0000000000..e864392bcf
Binary files /dev/null and b/data/elementary/themes/img/ic/key-080.png differ
diff --git a/data/elementary/themes/img/ic/key-160.png 
b/data/elementary/themes/img/ic/key-160.png
new file mode 100644
index 0000000000..8903fcddd1
Binary files /dev/null and b/data/elementary/themes/img/ic/key-160.png differ
diff --git a/data/elementary/themes/img/ic/keyboard-040.png 
b/data/elementary/themes/img/ic/keyboard-040.png
new file mode 100644
index 0000000000..02b6891b65
Binary files /dev/null and b/data/elementary/themes/img/ic/keyboard-040.png 
differ
diff --git a/data/elementary/themes/img/ic/keyboard-080.png 
b/data/elementary/themes/img/ic/keyboard-080.png
new file mode 100644
index 0000000000..c5ccc62e7d
Binary files /dev/null and b/data/elementary/themes/img/ic/keyboard-080.png 
differ
diff --git a/data/elementary/themes/img/ic/keyboard-160.png 
b/data/elementary/themes/img/ic/keyboard-160.png
new file mode 100644
index 0000000000..4bcf4e8917
Binary files /dev/null and b/data/elementary/themes/img/ic/keyboard-160.png 
differ
diff --git a/data/elementary/themes/img/ic/mouse-040.png 
b/data/elementary/themes/img/ic/mouse-040.png
new file mode 100644
index 0000000000..30ff6bc64b
Binary files /dev/null and b/data/elementary/themes/img/ic/mouse-040.png differ
diff --git a/data/elementary/themes/img/ic/mouse-080.png 
b/data/elementary/themes/img/ic/mouse-080.png
new file mode 100644
index 0000000000..c9ec35a7a8
Binary files /dev/null and b/data/elementary/themes/img/ic/mouse-080.png differ
diff --git a/data/elementary/themes/img/ic/mouse-160.png 
b/data/elementary/themes/img/ic/mouse-160.png
new file mode 100644
index 0000000000..d9b2fd6ba6
Binary files /dev/null and b/data/elementary/themes/img/ic/mouse-160.png differ
diff --git a/data/elementary/themes/img/ic/screen-040.png 
b/data/elementary/themes/img/ic/screen-040.png
index 0b7ce3e6b8..5f7946bb3e 100644
Binary files a/data/elementary/themes/img/ic/screen-040.png and 
b/data/elementary/themes/img/ic/screen-040.png differ
diff --git a/data/elementary/themes/img/ic/screen-080.png 
b/data/elementary/themes/img/ic/screen-080.png
index 066ca8058e..a40b04581b 100644
Binary files a/data/elementary/themes/img/ic/screen-080.png and 
b/data/elementary/themes/img/ic/screen-080.png differ
diff --git a/data/elementary/themes/img/ic/screen-160.png 
b/data/elementary/themes/img/ic/screen-160.png
index 553542b23a..1bb1662d89 100644
Binary files a/data/elementary/themes/img/ic/screen-160.png and 
b/data/elementary/themes/img/ic/screen-160.png differ
diff --git a/data/elementary/themes/img/ic/screen-bulb-040.png 
b/data/elementary/themes/img/ic/screen-bulb-040.png
deleted file mode 100644
index d5fb4b1805..0000000000
Binary files a/data/elementary/themes/img/ic/screen-bulb-040.png and /dev/null 
differ
diff --git a/data/elementary/themes/img/ic/screen-bulb-080.png 
b/data/elementary/themes/img/ic/screen-bulb-080.png
deleted file mode 100644
index 4f09f6916f..0000000000
Binary files a/data/elementary/themes/img/ic/screen-bulb-080.png and /dev/null 
differ
diff --git a/data/elementary/themes/img/ic/screen-bulb-160.png 
b/data/elementary/themes/img/ic/screen-bulb-160.png
deleted file mode 100644
index 45b925db3e..0000000000
Binary files a/data/elementary/themes/img/ic/screen-bulb-160.png and /dev/null 
differ
diff --git a/data/elementary/themes/img/ic/screen-edges-040.png 
b/data/elementary/themes/img/ic/screen-edges-040.png
new file mode 100644
index 0000000000..4187e90128
Binary files /dev/null and b/data/elementary/themes/img/ic/screen-edges-040.png 
differ
diff --git a/data/elementary/themes/img/ic/screen-edges-080.png 
b/data/elementary/themes/img/ic/screen-edges-080.png
new file mode 100644
index 0000000000..60145732c4
Binary files /dev/null and b/data/elementary/themes/img/ic/screen-edges-080.png 
differ
diff --git a/data/elementary/themes/img/ic/screen-edges-160.png 
b/data/elementary/themes/img/ic/screen-edges-160.png
new file mode 100644
index 0000000000..c7d3e4873c
Binary files /dev/null and b/data/elementary/themes/img/ic/screen-edges-160.png 
differ
diff --git a/data/elementary/themes/img/ic/screen-lock-040.png 
b/data/elementary/themes/img/ic/screen-lock-040.png
index 331a97e79a..ec6823b0c2 100644
Binary files a/data/elementary/themes/img/ic/screen-lock-040.png and 
b/data/elementary/themes/img/ic/screen-lock-040.png differ
diff --git a/data/elementary/themes/img/ic/screen-lock-080.png 
b/data/elementary/themes/img/ic/screen-lock-080.png
index 6d26bc4ef5..c379aadbc1 100644
Binary files a/data/elementary/themes/img/ic/screen-lock-080.png and 
b/data/elementary/themes/img/ic/screen-lock-080.png differ
diff --git a/data/elementary/themes/img/ic/screen-lock-160.png 
b/data/elementary/themes/img/ic/screen-lock-160.png
index e09acfd7f7..5c77034b7e 100644
Binary files a/data/elementary/themes/img/ic/screen-lock-160.png and 
b/data/elementary/themes/img/ic/screen-lock-160.png differ
diff --git a/data/elementary/themes/img/ic/screen-resolution-040.png 
b/data/elementary/themes/img/ic/screen-resolution-040.png
index 0e322f278b..7bb86bc32f 100644
Binary files a/data/elementary/themes/img/ic/screen-resolution-040.png and 
b/data/elementary/themes/img/ic/screen-resolution-040.png differ
diff --git a/data/elementary/themes/img/ic/screen-resolution-080.png 
b/data/elementary/themes/img/ic/screen-resolution-080.png
index 7364d7f251..9c2a0e02d2 100644
Binary files a/data/elementary/themes/img/ic/screen-resolution-080.png and 
b/data/elementary/themes/img/ic/screen-resolution-080.png differ
diff --git a/data/elementary/themes/img/ic/screen-resolution-160.png 
b/data/elementary/themes/img/ic/screen-resolution-160.png
index 6cbc631aff..fc1b2982c7 100644
Binary files a/data/elementary/themes/img/ic/screen-resolution-160.png and 
b/data/elementary/themes/img/ic/screen-resolution-160.png differ
diff --git a/data/elementary/themes/img/key.svg 
b/data/elementary/themes/img/key.svg
new file mode 100644
index 0000000000..7168ff5e7c
--- /dev/null
+++ b/data/elementary/themes/img/key.svg
@@ -0,0 +1,112 @@
+<?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: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="key.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/key-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">
+    <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>
+  </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="1354"
+     inkscape:window-height="1372"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="8.1375"
+     inkscape:cx="40"
+     inkscape:cy="44.915515"
+     inkscape:window-x="1206"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     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" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4986"
+       d="M 10,70 15,25 22,10 35,50 Z"
+       
style="fill:#c8c8c8;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4988"
+       d="M 58,10 65,25 70,70 45,50 Z"
+       
style="fill:#808080;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4982"
+       d="M 10,70 20,50 h 40 l 10,20 z"
+       
style="fill:#606060;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4990"
+       d="m 22,10 -2,40 c 15,3 25,3 40,0 L 58,10 c -15,2 -21,2 -36,0 z"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    <text
+       id="text4994"
+       y="45.925335"
+       x="32.208"
+       
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.3333px;line-height:21.875px;font-family:Asap;-inkscape-font-specification:Asap;letter-spacing:0px;word-spacing:0px;fill:#202020;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       xml:space="preserve"><tspan
+         
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.3333px;font-family:Asap;-inkscape-font-specification:Asap;fill:#202020;fill-opacity:1;"
+         y="45.925335"
+         x="32.208"
+         id="tspan4992"
+         sodipodi:role="line">?</tspan></text>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/keyboard.svg 
b/data/elementary/themes/img/keyboard.svg
new file mode 100644
index 0000000000..b453878e21
--- /dev/null
+++ b/data/elementary/themes/img/keyboard.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="keyboard.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/keyboard-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
+       id="linearGradient3678"
+       inkscape:collect="always">
+      <stop
+         id="stop3674"
+         offset="0"
+         style="stop-color:#c8c8c8;stop-opacity:1;" />
+      <stop
+         id="stop3676"
+         offset="1"
+         style="stop-color:#c8c8c8;stop-opacity:0;" />
+    </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>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="40"
+       x2="70"
+       y1="40"
+       x1="50"
+       id="linearGradient3680"
+       xlink:href="#linearGradient3678"
+       inkscape:collect="always" />
+  </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="0"
+     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" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       y="10"
+       x="10"
+       height="60"
+       width="60"
+       id="rect3618"
+       
style="fill:url(#linearGradient3680);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3620"
+       width="10"
+       height="10"
+       x="14"
+       y="14" />
+    <rect
+       y="14"
+       x="28"
+       height="10"
+       width="10"
+       id="rect3622"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3624"
+       width="10"
+       height="10"
+       x="42"
+       y="14" />
+    <rect
+       y="14"
+       x="56"
+       height="10"
+       width="10"
+       id="rect3626"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3628"
+       width="10"
+       height="10"
+       x="14"
+       y="28" />
+    <rect
+       y="42"
+       x="14"
+       height="10"
+       width="17"
+       id="rect3630"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       y="28"
+       x="28"
+       height="10"
+       width="10"
+       id="rect3658"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3660"
+       width="10"
+       height="10"
+       x="42"
+       y="28" />
+    <rect
+       y="28"
+       x="56"
+       height="10"
+       width="10"
+       id="rect3662"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3664"
+       width="10"
+       height="10"
+       x="35"
+       y="42" />
+    <rect
+       y="42"
+       x="49"
+       height="10"
+       width="10"
+       id="rect3666"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3668"
+       width="24"
+       height="10"
+       x="14"
+       y="56" />
+    <rect
+       y="56"
+       x="42"
+       height="10"
+       width="10"
+       id="rect3670"
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <rect
+       
style="fill:#dcdcdc;fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3672"
+       width="10"
+       height="10"
+       x="56"
+       y="56" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/mouse.svg 
b/data/elementary/themes/img/mouse.svg
new file mode 100644
index 0000000000..d28a3add76
--- /dev/null
+++ b/data/elementary/themes/img/mouse.svg
@@ -0,0 +1,139 @@
+<?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="mouse.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/mouse-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
+       id="linearGradient3575"
+       inkscape:collect="always">
+      <stop
+         id="stop3571"
+         offset="0"
+         style="stop-color:#a0a0a0;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.27272728"
+         id="stop3579" />
+      <stop
+         id="stop3573"
+         offset="1"
+         style="stop-color:#a0a0a0;stop-opacity:1" />
+    </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>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28"
+       x2="40"
+       y1="17"
+       x1="40"
+       id="linearGradient3577"
+       xlink:href="#linearGradient3575"
+       inkscape:collect="always" />
+  </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.3875"
+     inkscape:cx="40"
+     inkscape:cy="40.192539"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     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" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="zzzzz"
+       id="path3546"
+       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"
+       
style="fill:#c8c8c8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
 />
+    <path
+       d="M 39 10 L 39 34 L 20 34 L 20 36 L 60 36 L 60 34 L 41 34 L 41 10 L 39 
10 z "
+       
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-
 [...]
+       id="path3562" />
+    <rect
+       y="17"
+       x="37"
+       height="11"
+       width="6"
+       id="rect3552"
+       
style="fill:url(#linearGradient3577);fill-opacity:1;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    <path
+       mask="url(#mask3567)"
+       sodipodi:nodetypes="czzccccc"
+       id="path3554"
+       d="M 45,9 C 49,11 54.578805,8.5025863 55,30 55.421195,51.497414 51,60 
40,60 29,60 25,58 20,50 V 75 H 65 V 9 Z"
+       
style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.125"
 />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/screen-bulb.svg 
b/data/elementary/themes/img/screen-edges.svg
similarity index 61%
rename from data/elementary/themes/img/screen-bulb.svg
rename to data/elementary/themes/img/screen-edges.svg
index 85ac98b2a2..225f05647c 100644
--- a/data/elementary/themes/img/screen-bulb.svg
+++ b/data/elementary/themes/img/screen-edges.svg
@@ -13,9 +13,9 @@
    width="80"
    height="80"
    viewBox="0 0 80 80"
-   sodipodi:docname="screen-bulb.svg"
+   sodipodi:docname="screen-edges.svg"
    inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-bulb-040.png"
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-edges-040.png"
    inkscape:export-xdpi="48"
    inkscape:export-ydpi="48">
   <metadata
@@ -53,7 +53,7 @@
        x2="40"
        y2="54"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,4)" />
+       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,5)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient854"
@@ -63,20 +63,7 @@
        y1="50"
        x2="40"
        y2="54"
-       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-76.5)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter943"
-       x="-0.04"
-       width="1.08"
-       y="-0.06"
-       height="1.12">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1"
-         id="feGaussianBlur945" />
-    </filter>
+       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-77.5)" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask947">
@@ -99,22 +86,23 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1354"
-     inkscape:window-height="1372"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="true"
-     inkscape:zoom="8.1375"
+     inkscape:zoom="10.3875"
      inkscape:cx="40"
-     inkscape:cy="40"
-     inkscape:window-x="1206"
+     inkscape:cy="40.192539"
+     inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="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-nodes="true"
+     inkscape:bbox-paths="true">
     <inkscape:grid
        type="xygrid"
        id="grid837" />
@@ -124,68 +112,67 @@
      inkscape:label="Image"
      id="g10">
     <rect
-       y="16"
-       x="12"
-       height="36"
-       width="56"
+       y="13"
+       x="10"
+       height="36.929558"
+       width="60"
        id="rect838"
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.63052;stroke-linecap:round;stroke-linejoin:round"
 />
+       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.80615;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
        
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
        id="rect840"
        width="10"
        height="10"
        x="35"
-       y="54" />
+       y="55" />
     <rect
        
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
        id="rect842"
        width="25"
        height="2"
        x="28"
-       y="64" />
+       y="65" />
     <rect
        
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
        id="rect848"
        width="10"
        height="4"
        x="35"
-       y="54" />
+       y="55" />
     <rect
-       y="-64"
+       y="-65"
        x="35"
        height="1"
        width="10"
        id="rect858"
        
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
        transform="scale(1,-1)" />
+    <rect
+       y="49.929558"
+       x="10"
+       height="5.0704441"
+       width="60"
+       id="rect847"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:11.0314;stroke-linecap:round;stroke-linejoin:round"
 />
     <path
-       d="M 10,5 V 45 H 70 V 5 Z m 2,2 H 68 V 43 H 12 Z"
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter943)"
-       id="path873"
-       mask="url(#mask947)"
-       transform="translate(0,9)" />
+       sodipodi:nodetypes="ccccc"
+       id="path4912"
+       d="m 69,19 -4,4 v 17 l 4,4 z"
+       style="fill:#3399ff;fill-opacity:1" />
     <path
-       id="rect866"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
-       d="M 10,14 V 54 H 70 V 14 Z m 2,2 H 68 V 52 H 12 Z" />
-    <circle
-       r="8.8461542"
-       cy="30.846155"
-       cx="39.908283"
-       id="path4643"
-       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.442308;stroke-opacity:1"
 />
+       style="fill:#3399ff;fill-opacity:1"
+       d="m 11,19 4,4 v 17 l -4,4 z"
+       id="path4914"
+       sodipodi:nodetypes="ccccc" />
     <path
-       
style="fill:none;fill-opacity:1;stroke:#505050;stroke-width:0.442308;stroke-opacity:1"
-       d="m 39.465976,37.923077 -0.884615,-7.961538 c 0,-0.884616 
0.884615,-0.884616 0.884615,0 v 1.769231 c 0,0.884615 0.884616,0.884615 
0.884616,0 v -1.769231 c 0,-0.884616 0.884615,-0.884616 0.884615,0 l 
-0.884615,7.961538"
-       id="path2838"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0" />
+       sodipodi:nodetypes="ccccc"
+       id="path4916"
+       d="m 64,14 -4,4 H 20 l -4,-4 z"
+       style="fill:#3399ff;fill-opacity:1" />
     <path
-       
style="fill:#a0a0a0;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.442308px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 35.927515,44.557693 v -5.75 l -1.326923,-0.884616 h 10.615384 l 
-1.326923,0.884616 v 5.75 h -1.76923 L 41.677515,45 h -3.538462 l 
-0.442307,-0.442307 z"
-       id="path4244"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
+       style="fill:#3399ff;fill-opacity:1"
+       d="M 64,49 60,45 H 20 l -4,4 z"
+       id="path4918"
+       sodipodi:nodetypes="ccccc" />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/screen-lock.svg 
b/data/elementary/themes/img/screen-lock.svg
index b35a605a99..c118c84473 100644
--- a/data/elementary/themes/img/screen-lock.svg
+++ b/data/elementary/themes/img/screen-lock.svg
@@ -8,16 +8,16 @@
    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="screen-lock.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-lock-040.png"
+   inkscape:export-ydpi="48"
    inkscape:export-xdpi="48"
-   inkscape:export-ydpi="48">
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-lock-040.png"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="screen-lock.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -33,145 +33,130 @@
   <defs
      id="defs6">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient854">
+       id="linearGradient854"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#000000;stop-opacity:0.25"
+         id="stop850"
          offset="0"
-         id="stop850" />
+         style="stop-color:#000000;stop-opacity:0.25" />
       <stop
-         style="stop-color:#040404;stop-opacity:0"
+         id="stop852"
          offset="1"
-         id="stop852" />
+         style="stop-color:#040404;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854"
-       id="linearGradient856"
-       x1="40"
-       y1="50"
+       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,5)"
+       gradientUnits="userSpaceOnUse"
+       y2="54"
        x2="40"
+       y1="50"
+       x1="40"
+       id="linearGradient856"
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-77.5)"
        y2="54"
+       x2="40"
+       y1="50"
+       x1="40"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,4)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854"
        id="linearGradient860"
-       gradientUnits="userSpaceOnUse"
-       x1="40"
-       y1="50"
-       x2="40"
-       y2="54"
-       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-76.5)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter943"
-       x="-0.04"
-       width="1.08"
-       y="-0.06"
-       height="1.12">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1"
-         id="feGaussianBlur945" />
-    </filter>
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
     <mask
-       maskUnits="userSpaceOnUse"
-       id="mask947">
+       id="mask947"
+       maskUnits="userSpaceOnUse">
       <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"
+         y="5"
          x="10"
-         y="5" />
+         height="40"
+         width="60"
+         id="rect949"
+         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
 />
     </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="1354"
-     inkscape:window-height="1372"
-     id="namedview4"
-     showgrid="true"
-     inkscape:zoom="8.1375"
-     inkscape:cx="40"
-     inkscape:cy="40"
-     inkscape:window-x="1206"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g10"
-     showguides="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-nodes="true"
      inkscape:snap-others="false"
-     inkscape:snap-nodes="false">
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="g10"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="10.4625"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
     <inkscape:grid
-       type="xygrid"
-       id="grid837" />
+       id="grid837"
+       type="xygrid" />
   </sodipodi:namedview>
   <g
-     inkscape:groupmode="layer"
+     id="g10"
      inkscape:label="Image"
-     id="g10">
+     inkscape:groupmode="layer">
     <rect
-       y="16"
-       x="12"
-       height="36"
-       width="56"
+       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.80615;stroke-linecap:round;stroke-linejoin:round"
        id="rect838"
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.63052;stroke-linecap:round;stroke-linejoin:round"
 />
+       width="60"
+       height="36.929558"
+       x="10"
+       y="13" />
     <rect
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
-       id="rect840"
-       width="10"
-       height="10"
+       y="55"
        x="35"
-       y="54" />
+       height="10"
+       width="10"
+       id="rect840"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
-       id="rect842"
-       width="25"
-       height="2"
+       y="65"
        x="28"
-       y="64" />
+       height="2"
+       width="25"
+       id="rect842"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
+       y="55"
+       x="35"
+       height="4"
+       width="10"
        id="rect848"
+       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       transform="scale(1,-1)"
+       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
+       id="rect858"
        width="10"
-       height="4"
+       height="1"
        x="35"
-       y="54" />
+       y="-65" />
     <rect
-       y="-64"
-       x="35"
-       height="1"
-       width="10"
-       id="rect858"
-       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
-       transform="scale(1,-1)" />
-    <path
-       d="M 10,5 V 45 H 70 V 5 Z m 2,2 H 68 V 43 H 12 Z"
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter943)"
-       id="path873"
-       mask="url(#mask947)"
-       transform="translate(0,9)" />
-    <path
-       id="rect866"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
-       d="M 10,14 V 54 H 70 V 14 Z m 2,2 H 68 V 52 H 12 Z" />
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:11.0314;stroke-linecap:round;stroke-linejoin:round"
+       id="rect847"
+       width="60"
+       height="5.0704441"
+       x="10"
+       y="49.929558" />
     <path
-       d="M 40.398438 21.628906 C 38.651403 21.571726 36.882491 22.100387 
35.419922 23.222656 C 33.463448 24.723912 32.420901 27.026852 32.416016 
29.376953 L 32.376953 29.376953 L 32.376953 31.59375 L 31.269531 31.59375 L 
31.269531 46 L 49 46 L 49 31.59375 L 47.892578 31.59375 L 47.892578 29.376953 C 
47.889678 27.201786 46.980821 25.056201 45.259766 23.546875 C 43.873728 
22.331354 42.14547 21.686097 40.398438 21.628906 z M 40.251953 26.048828 C 
40.996924 26.073208 41.732655 26.353505 42. [...]
-       
style="fill:#a0a0a0;fill-opacity:1;stroke:none;stroke-width:7.54854;stroke-linecap:round;stroke-linejoin:round"
+       d="m 40.398438,19.628906 c -1.747035,-0.05718 -3.515947,0.471481 
-4.978516,1.59375 -1.956474,1.501256 -2.999021,3.804196 -3.003906,6.154297 h 
-0.03906 V 29.59375 H 31.269531 V 44 H 49 V 29.59375 h -1.107422 v -2.216797 c 
-0.0029,-2.175167 -0.911757,-4.320752 -2.632812,-5.830078 -1.386038,-1.215521 
-3.114296,-1.860778 -4.861328,-1.917969 z m -0.146485,4.419922 c 
0.744971,0.02438 1.480702,0.304677 2.082031,0.832031 0.747004,0.655103 
1.090834,1.567319 1.089844,2.496094 h 0.03516 v 2. [...]
+       
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:7.54854;stroke-linecap:round;stroke-linejoin:round"
        id="rect884" />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/screen-resolution.svg 
b/data/elementary/themes/img/screen-resolution.svg
index bc29543719..f446d6d014 100644
--- a/data/elementary/themes/img/screen-resolution.svg
+++ b/data/elementary/themes/img/screen-resolution.svg
@@ -8,16 +8,16 @@
    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="screen-resolution.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-resolution-040.png"
+   inkscape:export-ydpi="48"
    inkscape:export-xdpi="48"
-   inkscape:export-ydpi="48">
+   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-resolution-040.png"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="screen-resolution.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -33,155 +33,140 @@
   <defs
      id="defs6">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient854">
+       id="linearGradient854"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#000000;stop-opacity:0.25"
+         id="stop850"
          offset="0"
-         id="stop850" />
+         style="stop-color:#000000;stop-opacity:0.25" />
       <stop
-         style="stop-color:#040404;stop-opacity:0"
+         id="stop852"
          offset="1"
-         id="stop852" />
+         style="stop-color:#040404;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854"
-       id="linearGradient856"
-       x1="40"
-       y1="50"
+       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,5)"
+       gradientUnits="userSpaceOnUse"
+       y2="54"
        x2="40"
+       y1="50"
+       x1="40"
+       id="linearGradient856"
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-77.5)"
        y2="54"
+       x2="40"
+       y1="50"
+       x1="40"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,4)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854"
        id="linearGradient860"
-       gradientUnits="userSpaceOnUse"
-       x1="40"
-       y1="50"
-       x2="40"
-       y2="54"
-       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-76.5)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter943"
-       x="-0.04"
-       width="1.08"
-       y="-0.06"
-       height="1.12">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1"
-         id="feGaussianBlur945" />
-    </filter>
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
     <mask
-       maskUnits="userSpaceOnUse"
-       id="mask947">
+       id="mask947"
+       maskUnits="userSpaceOnUse">
       <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"
+         y="5"
          x="10"
-         y="5" />
+         height="40"
+         width="60"
+         id="rect949"
+         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
 />
     </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="1354"
-     inkscape:window-height="1372"
-     id="namedview4"
-     showgrid="true"
-     inkscape:zoom="8.1375"
-     inkscape:cx="40"
-     inkscape:cy="40.122888"
-     inkscape:window-x="1206"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g10"
-     showguides="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-nodes="true"
      inkscape:snap-others="false"
-     inkscape:snap-nodes="true">
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="g10"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="10.4625"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
     <inkscape:grid
-       type="xygrid"
-       id="grid837" />
+       id="grid837"
+       type="xygrid" />
   </sodipodi:namedview>
   <g
-     inkscape:groupmode="layer"
+     id="g10"
      inkscape:label="Image"
-     id="g10">
+     inkscape:groupmode="layer">
     <rect
-       y="16"
-       x="12"
-       height="36"
-       width="56"
+       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.80615;stroke-linecap:round;stroke-linejoin:round"
        id="rect838"
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.63052;stroke-linecap:round;stroke-linejoin:round"
 />
+       width="60"
+       height="36.929558"
+       x="10"
+       y="13" />
     <rect
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
-       id="rect840"
-       width="10"
-       height="10"
+       y="55"
        x="35"
-       y="54" />
+       height="10"
+       width="10"
+       id="rect840"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
-       id="rect842"
-       width="25"
-       height="2"
+       y="65"
        x="28"
-       y="64" />
+       height="2"
+       width="25"
+       id="rect842"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
+       y="55"
+       x="35"
+       height="4"
+       width="10"
        id="rect848"
+       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       transform="scale(1,-1)"
+       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
+       id="rect858"
        width="10"
-       height="4"
+       height="1"
        x="35"
-       y="54" />
+       y="-65" />
     <rect
-       y="-64"
-       x="35"
-       height="1"
-       width="10"
-       id="rect858"
-       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
-       transform="scale(1,-1)" />
-    <path
-       d="M 10,5 V 45 H 70 V 5 Z m 2,2 H 68 V 43 H 12 Z"
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter943)"
-       id="path873"
-       mask="url(#mask947)"
-       transform="translate(0,9)" />
-    <path
-       id="rect866"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
-       d="M 10,14 V 54 H 70 V 14 Z m 2,2 H 68 V 52 H 12 Z" />
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:11.0314;stroke-linecap:round;stroke-linejoin:round"
+       id="rect847"
+       width="60"
+       height="5.0704441"
+       x="10"
+       y="49.929558" />
     <path
        sodipodi:nodetypes="ccccccc"
        id="path3541"
-       d="m 40,18 -5,5 2,2 3,-3 3,3 2,-2 z"
-       style="fill:#a0a0a0;fill-opacity:1" />
+       d="m 40,16 -5,5 2,2 3,-3 3,3 2,-2 z"
+       style="fill:#ffffff;fill-opacity:1" />
     <path
-       style="fill:#a0a0a0;fill-opacity:1"
-       d="m 40,50 -5,-5 2,-2 3,3 3,-3 2,2 z"
+       style="fill:#ffffff;fill-opacity:1"
+       d="m 40,48 -5,-5 2,-2 3,3 3,-3 2,2 z"
        id="path3543"
        sodipodi:nodetypes="ccccccc" />
     <path
-       d="m 56,34 -5,-5 -2,2 3,3 -3,3 2,2 z m -25,-3 -2,-2 -5,5 5,5 2,-2 -3,-3 
z"
-       style="fill:#a0a0a0;fill-opacity:1"
+       d="m 56,32 -5,-5 -2,2 3,3 -3,3 2,2 z m -25,-3 -2,-2 -5,5 5,5 2,-2 -3,-3 
z"
+       style="fill:#ffffff;fill-opacity:1"
        id="path3559" />
   </g>
 </svg>
diff --git a/data/elementary/themes/img/screen.svg 
b/data/elementary/themes/img/screen.svg
index de3a056ba7..9f0f8787a8 100644
--- a/data/elementary/themes/img/screen.svg
+++ b/data/elementary/themes/img/screen.svg
@@ -8,16 +8,16 @@
    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="screen.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   
inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/desktop-pc-040.png"
+   inkscape:export-ydpi="48"
    inkscape:export-xdpi="48"
-   inkscape:export-ydpi="48">
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/screen-040.png"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="screen.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -33,141 +33,126 @@
   <defs
      id="defs6">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient854">
+       id="linearGradient854"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#000000;stop-opacity:0.25"
+         id="stop850"
          offset="0"
-         id="stop850" />
+         style="stop-color:#000000;stop-opacity:0.25" />
       <stop
-         style="stop-color:#040404;stop-opacity:0"
+         id="stop852"
          offset="1"
-         id="stop852" />
+         style="stop-color:#040404;stop-opacity:0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854"
-       id="linearGradient856"
-       x1="40"
-       y1="50"
+       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,5)"
+       gradientUnits="userSpaceOnUse"
+       y2="54"
        x2="40"
+       y1="50"
+       x1="40"
+       id="linearGradient856"
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-77.5)"
        y2="54"
+       x2="40"
+       y1="50"
+       x1="40"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6666666,0,0,1,-26.666666,4)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854"
        id="linearGradient860"
-       gradientUnits="userSpaceOnUse"
-       x1="40"
-       y1="50"
-       x2="40"
-       y2="54"
-       gradientTransform="matrix(1.6666666,0,0,0.25,-26.666666,-76.5)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter943"
-       x="-0.04"
-       width="1.08"
-       y="-0.06"
-       height="1.12">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1"
-         id="feGaussianBlur945" />
-    </filter>
+       xlink:href="#linearGradient854"
+       inkscape:collect="always" />
     <mask
-       maskUnits="userSpaceOnUse"
-       id="mask947">
+       id="mask947"
+       maskUnits="userSpaceOnUse">
       <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"
+         y="5"
          x="10"
-         y="5" />
+         height="40"
+         width="60"
+         id="rect949"
+         
style="opacity:1;fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
 />
     </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="1354"
-     inkscape:window-height="1372"
-     id="namedview4"
-     showgrid="true"
-     inkscape:zoom="8.1375"
-     inkscape:cx="40"
-     inkscape:cy="39.631336"
-     inkscape:window-x="1206"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g10"
-     showguides="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-nodes="true"
      inkscape:snap-others="false"
-     inkscape:snap-nodes="false">
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="g10"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="10.4625"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
     <inkscape:grid
-       type="xygrid"
-       id="grid837" />
+       id="grid837"
+       type="xygrid" />
   </sodipodi:namedview>
   <g
-     inkscape:groupmode="layer"
+     id="g10"
      inkscape:label="Image"
-     id="g10">
+     inkscape:groupmode="layer">
     <rect
-       y="16"
-       x="12"
-       height="36"
-       width="56"
+       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.80615;stroke-linecap:round;stroke-linejoin:round"
        id="rect838"
-       
style="opacity:1;fill:#202020;fill-opacity:1;stroke-width:3.63052;stroke-linecap:round;stroke-linejoin:round"
 />
+       width="60"
+       height="36.929558"
+       x="10"
+       y="13" />
     <rect
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
-       id="rect840"
-       width="10"
-       height="10"
+       y="55"
        x="35"
-       y="54" />
+       height="10"
+       width="10"
+       id="rect840"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.92367;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
-       id="rect842"
-       width="25"
-       height="2"
+       y="65"
        x="28"
-       y="64" />
+       height="2"
+       width="25"
+       id="rect842"
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:4.47215;stroke-linecap:round;stroke-linejoin:round"
 />
     <rect
-       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
+       y="55"
+       x="35"
+       height="4"
+       width="10"
        id="rect848"
+       
style="fill:url(#linearGradient856);fill-opacity:1;stroke-width:5.16398;stroke-linecap:round;stroke-linejoin:round"
 />
+    <rect
+       transform="scale(1,-1)"
+       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
+       id="rect858"
        width="10"
-       height="4"
+       height="1"
        x="35"
-       y="54" />
+       y="-65" />
     <rect
-       y="-64"
-       x="35"
-       height="1"
-       width="10"
-       id="rect858"
-       
style="fill:url(#linearGradient860);fill-opacity:1;stroke-width:2.58199;stroke-linecap:round;stroke-linejoin:round"
-       transform="scale(1,-1)" />
-    <path
-       d="M 10,5 V 45 H 70 V 5 Z m 2,2 H 68 V 43 H 12 Z"
-       
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter943)"
-       id="path873"
-       mask="url(#mask947)"
-       transform="translate(0,9)" />
-    <path
-       id="rect866"
-       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:3.96122;stroke-linecap:round;stroke-linejoin:round"
-       d="M 10,14 V 54 H 70 V 14 Z m 2,2 H 68 V 52 H 12 Z" />
+       
style="fill:#a0a0a0;fill-opacity:1;stroke-width:11.0314;stroke-linecap:round;stroke-linejoin:round"
+       id="rect847"
+       width="60"
+       height="5.0704441"
+       x="10"
+       y="49.929558" />
   </g>
 </svg>

-- 


Reply via email to