diff --git a/data/elementary/themes/edc/O/icons.edc b/data/elementary/themes/edc/O/icons.edc
index e68a3dad86..a9afcefe99 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -37,12 +37,9 @@
    //Standard Action Icons
    ICON("edit-swap","icon_swap.png",64)                     // *** // "widget/swap"
    ICON("edit-select-all","icon_efm_select.png",16)                // EFMBUTTON("select"
-   ICON("view-sort","icon_efm_sort.png",16)                 // *** // EFMBUTTON("sort",
-   ICON("view-order","icon_efm_sort.png",16)                // *** // EFMBUTTON("ordering"
    ICON("view-hidden-files","icon_efm_view.png",16)         // *** // EFMBUTTON("hidden_files"
    ICON("window-close","icon_close.png",64)                        // "widget/close"
    ICON("dialog-ok-apply","icon_check.png",64)                     // "enlightenment/check"
-   ICON("view-inherit","icon_dummy.png",64)                 // *** // EFMBUTTON("inherit"
    //Standard Application Icons
    ICON("preferences-desktop-color","icon_colors.png",64)                     // "enlightenment/colors"
    ICON("preferences-desktop-pointer","icon_mouse.png",64)             // *** // "enlightenment/mouse"
@@ -60,7 +57,6 @@
    ICON("preferences-engine","icon_engine.png",64)               // *** // "enlightenment/engine"
    ICON("preferences-dialogs","icon_dummy.png",64)               // *** // "enlightenment/dialogs"
    ICON("preferences-icon-theme","icon_icon_theme.png",64)       // *** // "enlightenment/icon_theme"
-   ICON("preferences-toolbar","icon_toolbar.png",64)             // *** // "enlightenment/toolbar"
    ICON("preferences-startup","icon_startup.png",64)             // *** // "enlightenment/startup"
    ICON("preferences-utils","icon_gadget.png",64)                // *** // "enlightenment/utils"
    ICON("preferences-screen-normal","icon_screen_normal.png",64) // *** // "enlightenment/screen_normal"
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index c808963b17..9730a7e8f2 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -108,6 +108,8 @@
    ICON("document-properties", "i-file-properties")
    ICON("document-new", "i-file")
    ICON("folder-new", "i-folder")
+   ICON("security-high", "i-shield-up")
+   ICON("preferences-toolbar", "i-toolbar")
 #undef ICON
 
 // mono color default fg color icons
@@ -149,6 +151,10 @@
    ICON("transform-move", "i-move")
    ICON("transform-scale", "i-resize")
    ICON("add", "i-plus")
+   ICON("view-order", "i-sort")
+   ICON("view-sort", "i-sort")
+   ICON("view-inherit", "i-win-nest")
+   ICON("access", "i-stick-man")
 
    ICON("preferences-position-top-left", "i-shelf-tl")
    ICON("preferences-position-top", "i-shelf-tc")
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 8ec183ce00..bbfce88f67 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -67,6 +67,9 @@ I060("i-shelf-rc", "shelf-rc")
 I060("i-shelf-rb", "shelf-rb")
 I060("i-refresh", "refresh")
 I060("i-rename", "rename")
+I060("i-sort", "sort")
+I060("i-win-nest", "win-nest")
+I060("i-stick-man", "stick-man")
 // lock double
 // exclam
 // folder
@@ -256,6 +259,8 @@ I160("i-fill-stretch", "fill-stretch")
 I160("i-fill-fill", "fill-fill")
 I160("i-fill-within", "fill-within")
 I160("i-fill-pan", "fill-pan")
+I160("i-shield-up", "shield-up")
+I160("i-toolbar", "toolbar")
 
 ///////////////////////////////////////////////////////////////////////////////
 // larger mono icons (mostly efm or settings)
diff --git a/data/elementary/themes/img/ic/shield-up-040.png b/data/elementary/themes/img/ic/shield-up-040.png
new file mode 100644
index 0000000000..6dd986b2ca
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-up-040.png differ
diff --git a/data/elementary/themes/img/ic/shield-up-080.png b/data/elementary/themes/img/ic/shield-up-080.png
new file mode 100644
index 0000000000..ab0b2d4820
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-up-080.png differ
diff --git a/data/elementary/themes/img/ic/shield-up-160.png b/data/elementary/themes/img/ic/shield-up-160.png
new file mode 100644
index 0000000000..1b0d494354
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-up-160.png differ
diff --git a/data/elementary/themes/img/ic/sort-015.png b/data/elementary/themes/img/ic/sort-015.png
new file mode 100644
index 0000000000..d7d859c391
Binary files /dev/null and b/data/elementary/themes/img/ic/sort-015.png differ
diff --git a/data/elementary/themes/img/ic/sort-030.png b/data/elementary/themes/img/ic/sort-030.png
new file mode 100644
index 0000000000..adebae84d2
Binary files /dev/null and b/data/elementary/themes/img/ic/sort-030.png differ
diff --git a/data/elementary/themes/img/ic/sort-060.png b/data/elementary/themes/img/ic/sort-060.png
new file mode 100644
index 0000000000..8ccf1c07b9
Binary files /dev/null and b/data/elementary/themes/img/ic/sort-060.png differ
diff --git a/data/elementary/themes/img/ic/stick-man-015.png b/data/elementary/themes/img/ic/stick-man-015.png
new file mode 100644
index 0000000000..b38ddbacf6
Binary files /dev/null and b/data/elementary/themes/img/ic/stick-man-015.png differ
diff --git a/data/elementary/themes/img/ic/stick-man-030.png b/data/elementary/themes/img/ic/stick-man-030.png
new file mode 100644
index 0000000000..0f0263c0ac
Binary files /dev/null and b/data/elementary/themes/img/ic/stick-man-030.png differ
diff --git a/data/elementary/themes/img/ic/stick-man-060.png b/data/elementary/themes/img/ic/stick-man-060.png
new file mode 100644
index 0000000000..f513e0b2ca
Binary files /dev/null and b/data/elementary/themes/img/ic/stick-man-060.png differ
diff --git a/data/elementary/themes/img/ic/toolbar-040.png b/data/elementary/themes/img/ic/toolbar-040.png
new file mode 100644
index 0000000000..13ae60498b
Binary files /dev/null and b/data/elementary/themes/img/ic/toolbar-040.png differ
diff --git a/data/elementary/themes/img/ic/toolbar-080.png b/data/elementary/themes/img/ic/toolbar-080.png
new file mode 100644
index 0000000000..28bf4940c0
Binary files /dev/null and b/data/elementary/themes/img/ic/toolbar-080.png differ
diff --git a/data/elementary/themes/img/ic/toolbar-160.png b/data/elementary/themes/img/ic/toolbar-160.png
new file mode 100644
index 0000000000..00b963cd64
Binary files /dev/null and b/data/elementary/themes/img/ic/toolbar-160.png differ
diff --git a/data/elementary/themes/img/ic/win-nest-015.png b/data/elementary/themes/img/ic/win-nest-015.png
new file mode 100644
index 0000000000..0c2a33ddcb
Binary files /dev/null and b/data/elementary/themes/img/ic/win-nest-015.png differ
diff --git a/data/elementary/themes/img/ic/win-nest-030.png b/data/elementary/themes/img/ic/win-nest-030.png
new file mode 100644
index 0000000000..3ecfca1fc0
Binary files /dev/null and b/data/elementary/themes/img/ic/win-nest-030.png differ
diff --git a/data/elementary/themes/img/ic/win-nest-060.png b/data/elementary/themes/img/ic/win-nest-060.png
new file mode 100644
index 0000000000..0e204cc9d7
Binary files /dev/null and b/data/elementary/themes/img/ic/win-nest-060.png differ
diff --git a/data/elementary/themes/img/shield-up.svg b/data/elementary/themes/img/shield-up.svg
new file mode 100644
index 0000000000..1c84bdd0e1
--- /dev/null
+++ b/data/elementary/themes/img/shield-up.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="shield-up.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/shield-up-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">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1625"
+     inkscape:cx="40"
+     inkscape:cy="40.065952"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path3230"
+       d="M 40,70 C 29,65 10,60 10,40 c 0,-8.333333 0,-16.666667 0,-25 5,10 10,10 15,10 5,0 10,-5 15,-15 5,10 10,15 15,15 5,0 10,0 15,-10 0,8.333333 0,16.666667 0,25 0,20 -20,25 -30,30 z"
+       style="fill:#c8c8c8;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <path
+       style="fill:#a0a0a0;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round"
+       d="m 40,70 c 0,-10 0,-45 0,-60 5,10 10,15 15,15 5,0 10,0 15,-10 V 40 C 70,60 50,65 40,70 Z"
+       id="path3232"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path3234"
+       d="M 40,68 C 30,63 12,50 12,40 c 0,-6.333333 0,-9 0,-19 0,5 2,17 2,19 0,10 16,21 26,28 z"
+       style="fill:#fafafa;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <path
+       id="path3236"
+       d="m 40,25 -15,15 5,5 10,-10 10,10 5,-5 z"
+       style="fill:#fafafa;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/sort.svg b/data/elementary/themes/img/sort.svg
new file mode 100644
index 0000000000..92ee9d7242
--- /dev/null
+++ b/data/elementary/themes/img/sort.svg
@@ -0,0 +1,108 @@
+<?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="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="sort.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/sort-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <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" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="81"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       y="2"
+       x="2"
+       height="2"
+       width="11"
+       id="rect4008"
+       style="fill:#fafafa;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <rect
+       style="fill:#fafafa;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round"
+       id="rect4008-3"
+       width="11"
+       height="2"
+       x="2"
+       y="2" />
+    <rect
+       y="5"
+       x="2"
+       height="2"
+       width="9"
+       id="rect4027"
+       style="fill:#fafafa;stroke-width:0.994989;stroke-linecap:round;stroke-linejoin:round" />
+    <rect
+       style="fill:#fafafa;stroke-width:0.877496;stroke-linecap:round;stroke-linejoin:round"
+       id="rect4029"
+       width="7"
+       height="2"
+       x="2"
+       y="8" />
+    <rect
+       y="11"
+       x="2"
+       height="2"
+       width="5"
+       id="rect4031"
+       style="fill:#fafafa;stroke-width:0.74162;stroke-linecap:round;stroke-linejoin:round" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/stick-man.svg b/data/elementary/themes/img/stick-man.svg
new file mode 100644
index 0000000000..eabfb59fdc
--- /dev/null
+++ b/data/elementary/themes/img/stick-man.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   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="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="stick-man.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/stick-man-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <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
+       osb:paint="solid"
+       id="linearGradient4128">
+      <stop
+         id="stop4126"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="80.933333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5061779"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <circle
+       r="1"
+       cy="3"
+       cx="7.5"
+       id="path4112"
+       style="fill:#fefefe;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <rect
+       y="3"
+       x="7"
+       height="2.5"
+       width="1"
+       id="rect4114"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.777817;stroke-linecap:round;stroke-linejoin:round" />
+    <rect
+       y="4.5"
+       x="6"
+       height="4"
+       width="3"
+       id="rect4116"
+       style="fill:#fdfdfd;fill-opacity:1;stroke-width:1.08872;stroke-linecap:round;stroke-linejoin:round" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path4124"
+       d="m 9,5 1.5,3"
+       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6,5 4.5,8"
+       id="path4132"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.5,8.5 v 4"
+       id="path4134"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path4136"
+       d="m 6.5,8.5 v 4"
+       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/toolbar.svg b/data/elementary/themes/img/toolbar.svg
new file mode 100644
index 0000000000..34d729b9c5
--- /dev/null
+++ b/data/elementary/themes/img/toolbar.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: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="toolbar.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/toolbar-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">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="15.1625"
+     inkscape:cx="40"
+     inkscape:cy="40.065952"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       y="30"
+       x="10"
+       height="20"
+       width="60"
+       id="rect4156"
+       style="fill:#a0a0a0;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <circle
+       r="5"
+       cy="40"
+       cx="35"
+       id="path4160"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round"
+       id="circle4162"
+       cx="20"
+       cy="40"
+       r="5" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round"
+       id="circle4164"
+       cx="50"
+       cy="40"
+       r="5" />
+    <circle
+       r="5"
+       cy="40"
+       cx="60"
+       id="circle4166"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+    <rect
+       y="35"
+       x="50"
+       height="10"
+       width="10"
+       id="rect4168"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/win-nest.svg b/data/elementary/themes/img/win-nest.svg
new file mode 100644
index 0000000000..5dac83db3e
--- /dev/null
+++ b/data/elementary/themes/img/win-nest.svg
@@ -0,0 +1,81 @@
+<?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="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="win-nest.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/win-nest-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <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" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="81"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       d="M 2 2 L 2 13 L 13 13 L 13 2 L 2 2 z M 3 4 L 12 4 L 12 12 L 3 12 L 3 4 z "
+       style="fill:#fafafa;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round"
+       id="rect4064" />
+    <path
+       d="M 4 5 L 4 7 L 4 11 L 5 11 L 10 11 L 11 11 L 11 7 L 11 5 L 4 5 z M 5 7 L 10 7 L 10 10 L 5 10 L 5 7 z "
+       style="fill:#fafafa;stroke-width:1.1;stroke-linecap:round;stroke-linejoin:round"
+       id="rect4071" />
+  </g>
+</svg>