diff --git a/data/elementary/themes/edc/O/icons.edc b/data/elementary/themes/edc/O/icons.edc
index a9afcefe99..663056d617 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -34,13 +34,6 @@
     * 2. Search for a name in kde (oxygen) and gnome (tango - human) icon set OR
     * 3. Try to follow the naming convention
     */
-   //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-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"
-   //Standard Application Icons
    ICON("preferences-desktop-color","icon_colors.png",64)                     // "enlightenment/colors"
    ICON("preferences-desktop-pointer","icon_mouse.png",64)             // *** // "enlightenment/mouse"
    ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// *** // "enlightenment/shelf_bottom_desk"
@@ -67,22 +60,12 @@
    ICON("preferences-screen-hflip","icon_screen_hflip.png",64)   // *** // "enlightenment/screen_hflip"
    ICON("preferences-applications-add","icon_applications_new.png",64)         // *** // "enlightenment/add_application"
    ICON("preferences-illume","icon_illume.png",64)
-   //Standard Module Category Icons 
    ICON("modules-utils","icon_gadget.png",64)
    ICON("modules-system","icon_gadget.png",64)
    ICON("modules-look","icon_look.png",64)
    ICON("modules-core","logo_white_128.png",64)
    ICON("modules-mobile","icon_globe.png",64)
    ICON("modules-settings","icon_config.png",64)
-   //Standard Place Icons
-   ICON("start-here","logo_white_128.png",128)                     // "enlightenment/e"
-   ICON("network-website","icon_globe.png",64)                     // "enlightenment/website"
-   //Standard Device Icons
-   ICON("media-eject","icon_efm_eject.png", 64)
-   /* End of FreeDesktop.Org icons */
-   //E Specific icons
-   ICON("everything-clipboard","icon_evry_clipboard.png", 256)
-   //EFM Mime icons
    ICONMIME("inode/chardevice","icon_efm_file.png",128)
    ICONMIME("inode/blockdevice","icon_efm_file.png",128)
    ICONMIME("inode/directory-locked","icon_efm_file.png",128)
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index c13c61ef3c..c6bfda3231 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -102,7 +102,6 @@
    ICON("enlightenment/wallpaper_scale_aspect_in", "i-fill-within")
    ICON("enlightenment/wallpaper_scale_aspect_out", "i-fill-fill")
    ICON("enlightenment/wallpaper_pan",  "i-fill-pan")
-   ICON("bookmark-new", "i-favorite")
    ICON("configure", "i-gear")
    ICON("document-open", "i-folder-open")
    ICON("document-properties", "i-file-properties")
@@ -110,6 +109,7 @@
    ICON("folder-new", "i-folder")
    ICON("security-high", "i-shield-up")
    ICON("preferences-toolbar", "i-toolbar")
+   ICON("network-website", "i-globe")
 #undef ICON
 
 // mono color default fg color icons
@@ -148,6 +148,8 @@
    ICON("edit-copy", "i-copy")
    ICON("edit-cut", "i-cut")
    ICON("edit-paste", "i-paste")
+   ICON("edit-swap", "i-swap")
+   ICON("edit-select-all", "i-select-all")
    ICON("transform-move", "i-move")
    ICON("transform-scale", "i-resize")
    ICON("add", "i-plus")
@@ -155,6 +157,13 @@
    ICON("view-sort", "i-sort")
    ICON("view-inherit", "i-win-nest")
    ICON("access", "i-stick-man")
+   ICON("window-close", "i-close")
+   ICON("bookmark-new", "i-bookmark-new")
+   ICON("view-hidden-files", "i-view-hidden-files")
+   ICON("dialog-ok-apply", "i-check")
+   ICON("media-eject", "i-eject")
+   ICON("start-here", "i-enlightenment")
+   ICON("everything-clipboard", "i-paste")
 
    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 69d2daa624..20d3498851 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -38,7 +38,9 @@ I060("i-check", "check")
 I060("i-radio", "radio")
 I060("i-copy", "copy")
 I060("i-cut", "cut")
+I060("i-swap", "swap")
 I060("i-paste", "paste")
+I060("i-select-all", "select-all")
 I060("i-properties", "properties")
 I060("i-stacking", "stacking")
 I060("i-stacking-top", "stacking-top")
@@ -72,6 +74,9 @@ I060("i-sort", "sort")
 I060("i-win-nest", "win-nest")
 I060("i-stick-man", "stick-man")
 I060("i-wifi", "wifi")
+I060("i-bookmark-new", "bookmark-new")
+I060("i-view-hidden-files", "view-hidden-files")
+I060("i-eject", "eject")
 // exclam
 // more
 // chat
@@ -225,6 +230,7 @@ I160("i-fill-within", "fill-within")
 I160("i-fill-pan", "fill-pan")
 I160("i-shield-up", "shield-up")
 I160("i-toolbar", "toolbar")
+I160("i-globe", "globe")
 
 ///////////////////////////////////////////////////////////////////////////////
 // larger mono icons (mostly efm or settings)
@@ -265,12 +271,6 @@ I160("i-unknown", "unknown")
       }                                               \
    }
 # define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
-   ICON("bookmark-new","icon_add_fav.png",64)                      // "widget/add_fav"
-   ICON("edit-swap","icon_swap.png",64)                     // *** // "widget/swap"
-   ICON("edit-select-all","icon_efm_select.png",16)                // EFMBUTTON("select"
-   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("preferences-desktop-color","icon_colors.png",64)                     // "enlightenment/colors"
    ICON("preferences-desktop-pointer","icon_mouse.png",64)             // *** // "enlightenment/mouse"
    ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// *** // "enlightenment/shelf_bottom_desk"
@@ -302,10 +302,7 @@ I160("i-unknown", "unknown")
    ICON("modules-system","icon_gadget.png",64)
    ICON("modules-look","icon_look.png",64)
    ICON("modules-core","logo_white_128.png",64)
-   ICON("start-here","logo_white_128.png",128)                     // "enlightenment/e"
    ICON("network-website","icon_globe.png",64)                     // "enlightenment/website"
-   ICON("media-eject","icon_efm_eject.png", 64)
-   ICON("everything-clipboard","icon_evry_clipboard.png", 256)
 
    ICONMIME("inode/chardevice","icon_efm_file.png",128)
    ICONMIME("inode/blockdevice","icon_efm_file.png",128)
diff --git a/data/elementary/themes/img/bookmark-new.svg b/data/elementary/themes/img/bookmark-new.svg
new file mode 100644
index 0000000000..7f867a3425
--- /dev/null
+++ b/data/elementary/themes/img/bookmark-new.svg
@@ -0,0 +1,93 @@
+<?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="bookmark-new.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bookmark-new-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="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5089713"
+     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 4.5 2 L 4.5 13 L 7.5 10 L 10.5 13 L 10.5 7.5449219 L 7.8515625 9.1660156 L 8.5761719 6.140625 L 6.2109375 4.1191406 L 9.3125 3.875 L 10.089844 2 L 4.5 2 z "
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       id="path3037" />
+    <path
+       inkscape:transform-center-y="-0.23438241"
+       d="M 10.505109,3.0597959 11.153018,4.6225096 12.839462,4.755803 11.553448,5.8549065 11.947819,7.5 10.505109,6.6165696 9.062399,7.4999999 9.4567694,5.8549064 8.1707554,4.7558029 9.8571995,4.6225095 Z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="-0.94247777"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:r2="1.1022893"
+       sodipodi:r1="2.4544845"
+       sodipodi:cy="5.5142803"
+       sodipodi:cx="10.505109"
+       sodipodi:sides="5"
+       id="path3041"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.702382;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       sodipodi:type="star" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/eject.svg b/data/elementary/themes/img/eject.svg
new file mode 100644
index 0000000000..ec311b8fc6
--- /dev/null
+++ b/data/elementary/themes/img/eject.svg
@@ -0,0 +1,84 @@
+<?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="eject.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/eject-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="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.733333"
+     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
+       id="path3101"
+       d="M 7.5,2 2,7.5 h 11 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+    <rect
+       y="10"
+       x="2"
+       height="3"
+       width="11"
+       id="rect3103"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.927274;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/globe.svg b/data/elementary/themes/img/globe.svg
new file mode 100644
index 0000000000..42bd47b068
--- /dev/null
+++ b/data/elementary/themes/img/globe.svg
@@ -0,0 +1,114 @@
+<?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"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/globe-040.png"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="globe.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <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
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="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="41.132583"
+     inkscape:cx="42.141891"
+     inkscape:zoom="10.4375"
+     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
+       id="grid837"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <circle
+       r="30"
+       cy="40"
+       cx="40"
+       id="path3766"
+       style="fill:#3399ff;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2;fill-opacity:1" />
+    <path
+       d="m 39.228516,10.935547 c -1.926722,0.350817 -5.706477,0.951237 -4.258591,3.585053 -1.125074,1.197398 0.455851,1.491996 -0.10453,1.641234 -2.414856,1.725009 2.005383,6.369591 2.943933,3.236294 0.195354,-2.677259 4.797447,-3.452835 3.183106,-6.206237 -0.713223,-0.600457 -1.022619,-1.977438 -1.763918,-2.256344 z m -4.902344,0.486328 c -1.386636,0.573106 -3.813157,2.317719 -4.151673,2.562988 1.641412,0.114838 4.183375,-1.931096 4.700858,-2.512497 z m -2.072266,0.414063 c -1.249453,-0.146605 -3.233257,2.228582 -0.978263,0.663778 0.03216,-0.220521 1.582743,-0.5308 0.978263,-0.663778 z m -3.382812,1.041015 c -1.156689,0.667436 0.852974,0.626606 0,0 z m -1.789063,0.806641 c -1.526221,-0.325656 -2.53004,2.15085 -0.633885,0.609951 -0.127855,-0.01698 1.537606,-0.709211 0.633885,-0.609951 z m 1.587891,0.355468 c -1.662753,1.746232 3.278124,0.268239 0.46979,0.436452 -0.158586,-0.142458 -0.206451,-0.432259 -0.46979,-0.436452 z m -1.046875,0.1875 c -1.30082,0.265735 0.527778,0.591828 0,0 z m -3.84375,0.53711 c -3.653447,2.344457 -6.786046,5.495189 -9.109375,9.162109 2.007577,0.706017 -1.388384,4.10048 -1.333959,5.774145 -0.623777,2.398608 -0.222629,5.654498 0.582237,7.5498 -0.202689,-1.202375 -0.193842,-3.428748 0.439123,-0.866339 0.249216,2.658996 1.530009,5.222075 4.286479,5.567884 0.677487,1.002254 4.222978,3.199979 3.812869,2.167836 -1.416181,-0.491275 -2.22574,-3.078476 -2.849236,-3.57786 1.05734,-3.256504 -2.354975,0.756237 -2.841831,-1.886802 -0.725016,-3.052353 4.27579,-5.278871 5.22502,-1.801782 -0.136563,-2.67714 2.336211,-4.558148 3.766605,-6.599406 0.368481,-1.771749 4.736286,-1.588803 4.256384,-2.280317 -1.084673,0.424989 -1.24259,-1.743327 -2.041891,-1.234805 1.200308,-1.073952 6.019962,-0.472679 3.50997,-3.058921 -0.04105,-1.972724 -2.018182,-1.631116 -2.309028,-1.758305 -0.819247,-2.683762 -3.51118,-0.243121 -3.109078,1.351202 -0.793193,1.138669 -1.756245,3.074464 -2.383803,0.860341 -3.022432,-1.99429 0.335792,-4.914046 2.687071,-5.369365 1.407526,-0.42621 1.391536,-1.489586 0.08574,-0.917781 -0.380341,-3.581249 -1.828122,1.743782 -3.971553,0.143161 -2.519973,0.01002 -1.25596,-2.544918 0.123527,-1.393136 -1.311248,3.024833 4.769,-1.122511 1.174728,-1.831659 z m 27.941406,0.265625 c -1.655855,0.876177 -3.93765,5.222684 -0.739395,4.969613 2.700144,2.196668 -3.142688,3.697639 -2.957165,4.660063 2.550833,2.200146 -2.854164,1.171517 -1.64189,3.513648 2.20862,4.349499 4.006206,-3.53198 7.224607,-1.460256 1.129637,0.509239 1.852072,1.995349 0.930548,2.484876 3.751424,-0.09268 -3.067743,-4.118523 0.533347,-2.565262 1.072131,0.566916 2.81109,4.48902 2.67476,1.492382 1.048854,1.065218 3.146418,1.434304 3.697315,2.030341 0.664929,3.430802 -3.982428,0.277572 -5.344289,1.390113 -2.53702,-0.269884 -2.822908,-2.962278 -5.57994,-1.970525 -3.394476,-0.123977 -5.13046,3.24607 -6.362911,5.879921 -1.530166,3.068433 0.470198,6.836431 3.685789,7.474617 1.94821,-0.161324 5.214229,-1.50313 6.035546,1.127502 0.04722,2.685384 1.625718,4.837215 0.114348,7.457659 0.148323,1.88578 -0.790627,6.229365 1.820629,6.290149 3.344443,-1.225413 4.380678,-5.172452 6.619001,-7.380032 0.02079,-3.207342 2.05865,-5.626048 3.644305,-8.144099 0.78777,-1.316007 0.651071,-2.739144 -0.857708,-2.179266 -1.584916,-1.549647 -3.376919,-5.590382 -3.194131,-6.564008 1.792431,1.401706 2.258609,7.912435 5.20657,4.351506 1.939068,-1.914021 -0.451247,-3.937602 -1.42495,-4.970991 1.354334,0.548713 4.904212,3.838537 3.422554,0.305407 C 67.610092,26.202894 63.376369,19.822779 57.507812,15.638671 56.8353,16.79901 53.98718,18.649029 55.492875,16.538382 54.473892,15.630504 53.01215,15.349145 51.720703,15.029297 Z m -25.175781,0.333984 c -2.093729,0.377984 -0.227855,1.154472 0.461341,0.198276 z m 2.53125,0.0957 c -1.656386,-0.229553 -3.091878,1.886831 -0.631446,1.557241 1.250017,0.428947 -0.613478,1.531961 0.940229,1.040614 -0.460991,1.517056 -2.923592,1.156555 -0.530059,1.948119 0.928264,1.09652 1.316997,-0.393761 2.002271,0.117385 -0.578124,-1.701841 0.198316,-1.487712 1.328872,-1.17603 -0.688623,-1.506416 -1.014641,-3.275356 -3.109867,-3.487329 z m 13.4375,1.181641 c -3.015709,0.08911 -0.140651,2.564885 1.070599,0.721667 0.286462,-0.616933 -0.695997,-0.685726 -1.070599,-0.721667 z m 10.470703,0.191406 c -0.02603,1.739248 1.062334,2.75463 2.489042,2.671003 -1.470221,0.456305 0.427447,2.026288 -1.623988,2.481856 -1.340396,0.773896 -2.639781,-0.48332 -0.888839,-1.055755 0.435776,-1.339301 -2.171026,-3.338377 0.02378,-4.097104 z m -26.878906,2.429688 c -2.906437,0.929195 1.634668,1.17769 0,0 z m 20.822265,1.177734 c 0.018,1.296651 1.034443,4.622552 2.123577,2.503164 -0.44378,-1.026362 -1.431933,-1.662259 -2.123577,-2.503164 z m -0.830078,1.064453 c -2.500287,2.201581 2.263563,1.264665 0,0 z m 17.453125,3.402344 c 0.05066,1.63965 3.136175,3.03848 1.624898,4.606374 -0.55531,-1.39396 -3.174111,-3.078757 -1.624898,-4.606374 z m -3.289062,0.142578 c 0.994893,0.598143 2.871596,3.347662 0.333767,2.402028 -2.857697,1.052043 -2.503828,-3.230796 -0.462914,-1.583261 l 0.06003,-0.326262 z m -28.105469,1.0625 c -3.027842,1.678505 3.907813,2.344446 0,0 z m 20.365234,0.941406 c -0.256029,2.055991 1.114989,1.610192 0,0 z m 8.085938,2.892578 c -0.557051,0.605624 0.887434,0.05963 0,0 z m -38.828125,8.316407 c -2.617158,0.368052 4.533323,2.119599 1.243383,0.326531 -0.377801,-0.210609 -0.807837,-0.340704 -1.243383,-0.326531 z m 3.044922,1.234375 c -2.104161,1.960787 4.029741,0.643533 0,0 z m 2.375,0.78125 c -1.010255,0.484196 0.960628,0.350933 0,0 z m -3.794922,4.208984 c -2.084822,1.236493 -1.380023,4.44479 -1.809182,6.274537 0.947488,3.453743 5.1732,4.457888 5.867565,7.977858 0.931761,3.17337 2.237147,6.919181 5.510955,8.318933 1.462546,-0.193227 -2.322626,-1.611915 -1.462122,-3.232203 0.164724,-2.293425 2.553515,-3.400969 2.79813,-5.539715 2.479665,-1.024477 2.228362,-3.763432 3.487671,-5.558262 -0.136676,-3.020646 -5.163583,-2.296531 -6.169538,-3.598611 -0.184069,-2.203945 -3.800131,-2.766483 -5.209258,-3.891277 -0.952111,-0.540844 -2.904821,0.128326 -2.926327,-0.139932 -0.0293,-0.203776 -0.0586,-0.407552 -0.08789,-0.611328 z m 41.228515,5.773438 c -2.080788,0.31237 -3.019338,6.248465 -0.951013,2.718234 0.471477,-0.833821 0.956269,-1.734484 0.951013,-2.718234 z m -29.630859,15.86719 c -0.715804,0.591497 0.948717,0.196071 0,0 z"
+       style="fill:#006731;fill-opacity:1;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="path3762" />
+    <path
+       d="M 55.615234 14.384766 A 30 30 0 0 1 60 30 A 30 30 0 0 1 30 60 A 30 30 0 0 1 14.384766 55.615234 A 30 30 0 0 0 40 70 A 30 30 0 0 0 70 40 A 30 30 0 0 0 55.615234 14.384766 z "
+       style="fill:#000000;fill-opacity:0.2;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="circle3784" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/ic/bookmark-new-015.png b/data/elementary/themes/img/ic/bookmark-new-015.png
new file mode 100644
index 0000000000..e7e3a7e619
Binary files /dev/null and b/data/elementary/themes/img/ic/bookmark-new-015.png differ
diff --git a/data/elementary/themes/img/ic/bookmark-new-030.png b/data/elementary/themes/img/ic/bookmark-new-030.png
new file mode 100644
index 0000000000..b7275a88f9
Binary files /dev/null and b/data/elementary/themes/img/ic/bookmark-new-030.png differ
diff --git a/data/elementary/themes/img/ic/bookmark-new-060.png b/data/elementary/themes/img/ic/bookmark-new-060.png
new file mode 100644
index 0000000000..9a42cca57f
Binary files /dev/null and b/data/elementary/themes/img/ic/bookmark-new-060.png differ
diff --git a/data/elementary/themes/img/ic/eject-015.png b/data/elementary/themes/img/ic/eject-015.png
new file mode 100644
index 0000000000..efd6ebb57b
Binary files /dev/null and b/data/elementary/themes/img/ic/eject-015.png differ
diff --git a/data/elementary/themes/img/ic/eject-030.png b/data/elementary/themes/img/ic/eject-030.png
new file mode 100644
index 0000000000..cc53412fce
Binary files /dev/null and b/data/elementary/themes/img/ic/eject-030.png differ
diff --git a/data/elementary/themes/img/ic/eject-060.png b/data/elementary/themes/img/ic/eject-060.png
new file mode 100644
index 0000000000..94368a67eb
Binary files /dev/null and b/data/elementary/themes/img/ic/eject-060.png differ
diff --git a/data/elementary/themes/img/ic/globe-040.png b/data/elementary/themes/img/ic/globe-040.png
new file mode 100644
index 0000000000..23fe430c5b
Binary files /dev/null and b/data/elementary/themes/img/ic/globe-040.png differ
diff --git a/data/elementary/themes/img/ic/globe-080.png b/data/elementary/themes/img/ic/globe-080.png
new file mode 100644
index 0000000000..97a0dde833
Binary files /dev/null and b/data/elementary/themes/img/ic/globe-080.png differ
diff --git a/data/elementary/themes/img/ic/globe-160.png b/data/elementary/themes/img/ic/globe-160.png
new file mode 100644
index 0000000000..a704b36a5c
Binary files /dev/null and b/data/elementary/themes/img/ic/globe-160.png differ
diff --git a/data/elementary/themes/img/ic/select-all-015.png b/data/elementary/themes/img/ic/select-all-015.png
new file mode 100644
index 0000000000..1a600bcabd
Binary files /dev/null and b/data/elementary/themes/img/ic/select-all-015.png differ
diff --git a/data/elementary/themes/img/ic/select-all-030.png b/data/elementary/themes/img/ic/select-all-030.png
new file mode 100644
index 0000000000..389db3a786
Binary files /dev/null and b/data/elementary/themes/img/ic/select-all-030.png differ
diff --git a/data/elementary/themes/img/ic/select-all-060.png b/data/elementary/themes/img/ic/select-all-060.png
new file mode 100644
index 0000000000..973fcc1021
Binary files /dev/null and b/data/elementary/themes/img/ic/select-all-060.png differ
diff --git a/data/elementary/themes/img/ic/swap-015.png b/data/elementary/themes/img/ic/swap-015.png
new file mode 100644
index 0000000000..4863be42d5
Binary files /dev/null and b/data/elementary/themes/img/ic/swap-015.png differ
diff --git a/data/elementary/themes/img/ic/swap-030.png b/data/elementary/themes/img/ic/swap-030.png
new file mode 100644
index 0000000000..ca9030ea4d
Binary files /dev/null and b/data/elementary/themes/img/ic/swap-030.png differ
diff --git a/data/elementary/themes/img/ic/swap-060.png b/data/elementary/themes/img/ic/swap-060.png
new file mode 100644
index 0000000000..a4dc3d6e89
Binary files /dev/null and b/data/elementary/themes/img/ic/swap-060.png differ
diff --git a/data/elementary/themes/img/ic/view-hidden-files-015.png b/data/elementary/themes/img/ic/view-hidden-files-015.png
new file mode 100644
index 0000000000..6f393cf948
Binary files /dev/null and b/data/elementary/themes/img/ic/view-hidden-files-015.png differ
diff --git a/data/elementary/themes/img/ic/view-hidden-files-030.png b/data/elementary/themes/img/ic/view-hidden-files-030.png
new file mode 100644
index 0000000000..c463803c89
Binary files /dev/null and b/data/elementary/themes/img/ic/view-hidden-files-030.png differ
diff --git a/data/elementary/themes/img/ic/view-hidden-files-060.png b/data/elementary/themes/img/ic/view-hidden-files-060.png
new file mode 100644
index 0000000000..99897e3b72
Binary files /dev/null and b/data/elementary/themes/img/ic/view-hidden-files-060.png differ
diff --git a/data/elementary/themes/img/select-all.svg b/data/elementary/themes/img/select-all.svg
new file mode 100644
index 0000000000..5f17186077
--- /dev/null
+++ b/data/elementary/themes/img/select-all.svg
@@ -0,0 +1,89 @@
+<?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="select-all.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/select-all-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="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5089713"
+     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 4 L 4 4 L 4 2 L 2 2 z M 5 2 L 5 4 L 13 4 L 13 2 L 5 2 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.895831;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect1034" />
+    <path
+       d="M 2 5 L 2 7 L 4 7 L 4 5 L 2 5 z M 5 5 L 5 7 L 13 7 L 13 5 L 5 5 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.895831;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect1036" />
+    <path
+       d="M 2 8 L 2 10 L 4 10 L 4 8 L 2 8 z M 5 8 L 5 10 L 13 10 L 13 8 L 5 8 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.895831;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect1038" />
+    <path
+       d="M 2 11 L 2 13 L 4 13 L 4 11 L 2 11 z M 5 11 L 5 13 L 13 13 L 13 11 L 5 11 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.895831;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect1040" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/swap.svg b/data/elementary/themes/img/swap.svg
new file mode 100644
index 0000000000..a2bd9be525
--- /dev/null
+++ b/data/elementary/themes/img/swap.svg
@@ -0,0 +1,93 @@
+<?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="swap.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/swap-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="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5089713"
+     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
+       sodipodi:nodetypes="ccccccc"
+       id="path1004"
+       d="m 6.5,12 1,1 L 10,10.5 7.5,8 6.5,9 8,10.5 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <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 8.5,6 7.5,7 5,4.5 7.5,2 8.5,3 7,4.5 Z"
+       id="path1010"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path1012"
+       d="M 13,2 V 13 H 9.5 v 0 L 12,10.5 9.5,8 V 2 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       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 2,13 V 2 H 5.5 V 2 L 3,4.5 5.5,7 v 6 z"
+       id="path1014" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/view-hidden-files.svg b/data/elementary/themes/img/view-hidden-files.svg
new file mode 100644
index 0000000000..a92a570885
--- /dev/null
+++ b/data/elementary/themes/img/view-hidden-files.svg
@@ -0,0 +1,115 @@
+<?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="view-hidden-files.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/view-hidden-files-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="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5089713"
+     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="10"
+       x="2"
+       height="3"
+       width="3"
+       id="rect3071"
+       style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:0.751177;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.751177;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect3073"
+       width="3"
+       height="3"
+       x="2"
+       y="2" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:0.751177;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect3075"
+       width="3"
+       height="3"
+       x="2"
+       y="6" />
+    <rect
+       y="2"
+       x="6"
+       height="3"
+       width="7"
+       id="rect3077"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.14744;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:1.14744;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2"
+       id="rect3079"
+       width="7"
+       height="3"
+       x="6"
+       y="6" />
+    <rect
+       y="10"
+       x="6"
+       height="3"
+       width="7"
+       id="rect3081"
+       style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:1.14744;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.2" />
+  </g>
+</svg>