diff --git a/icons-dark/applets/64/osd-duplicate.svg b/icons-dark/applets/64/osd-duplicate.svg
--- a/icons-dark/applets/64/osd-duplicate.svg
+++ b/icons-dark/applets/64/osd-duplicate.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-duplicate.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,11 +13,13 @@
       </style>
   </defs>
   <path
-     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 10 L 25 12 L 27 12 L 27 25 L 28 25 L 28 12 L 59 12 L 59 30 L 44 30 L 43 30 L 41 30 L 41 31 L 41 32 L 43 32 L 43 37 L 41 38.841797 L 41 40.203125 L 43 38.361328 L 43 43 L 44 43 L 44 38.363281 L 49.033203 43 L 50.509766 43 L 44 37.003906 L 44 32 L 46 32 L 46 31 L 60 31 L 60 12 L 62 12 L 62 10 L 25 10 z M 5.8164062 26 C 4.8104562 26 4 26.810456 4 27.816406 L 4 49 L 2 49 L 2 52 C 2 53.108 2.892 54 4 54 L 40 54 C 41.108 54 42 53.108 42 52 L 42 49 L 40 49 L 40 27.816406 C 40 26.810456 39.189544 26 38.183594 26 L 5.8164062 26 z M 5.8164062 27 L 21.5 27 C 21.223 27 21 27.223 21 27.5 C 21 27.777 21.223 28 21.5 28 L 6 28 L 6 48 L 38 48 L 38 28 L 22.5 28 C 22.777 28 23 27.777 23 27.5 C 23 27.223 22.777 27 22.5 27 L 38.183594 27 C 38.652434 27 39 27.347566 39 27.816406 L 39 49 L 25 49 L 19 49 L 5 49 L 5 27.816406 C 5 27.347566 5.3475663 27 5.8164062 27 z M 7 29 L 37 29 L 37 47 L 7 47 L 7 29 z M 3 50 L 4 50 L 5 50 L 18 50 C 18 50.554 18.446 51 19 51 L 25 51 C 25.554 51 26 50.554 26 50 L 39 50 L 40 50 L 41 50 L 41 52 C 41 52.5713 40.5713 53 40 53 L 4 53 C 3.4287 53 3 52.5713 3 52 L 3 50 z "
-     id="path3434" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 22 9 L 22 16 L 24 16 L 24 24 L 6 24 L 6 50 L 4 50 L 4 52 C 4 53 5 54 6 54 L 40 54 C 41 54 42 53 42 52 L 42 50 L 40 50 L 40 37 C 45 37 53 37 58 37 L 58 16 L 60 16 L 60 9 L 58 9 L 24 9 L 22 9 z M 24 12 L 58 12 L 58 14 L 56 14 L 26 14 L 24 14 L 24 12 z M 26 16 L 56 16 L 56 35 L 40 35 L 40 24 L 26 24 L 26 16 z M 8 26 L 24 26 L 26 26 L 38 26 L 38 48 L 8 48 L 8 26 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="M 37 15 L 37 17 L 37 18 L 37 25 L 38 25 L 38 18 L 52 18 L 52 26 L 41.310547 26 C 41.559517 26.29046 41.747941 26.62732 41.863281 27 L 53 27 L 53 18 L 53 17 L 53 15 L 37 15 z M 47 16 L 48 16 L 48 17 L 47 17 L 47 16 z M 49 16 L 50 16 L 50 17 L 49 17 L 49 16 z M 51 16 L 52 16 L 52 17 L 51 17 L 51 16 z M 14 32 L 14 34 L 14 35 L 14 44 L 30 44 L 30 35 L 30 34 L 30 32 L 14 32 z M 24 33 L 25 33 L 25 34 L 24 34 L 24 33 z M 26 33 L 27 33 L 27 34 L 26 34 L 26 33 z M 28 33 L 29 33 L 29 34 L 28 34 L 28 33 z M 15 35 L 29 35 L 29 43 L 15 43 L 15 35 z "
-     id="path3436" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 30 18 L 30 24 L 32 24 L 32 22 L 50 22 L 50 31 L 40 31 L 40 33 L 52 33 L 52 18 L 30 18 z M 12 31 L 12 46 L 34 46 L 34 31 L 12 31 z M 14 35 L 32 35 L 32 44 L 14 44 L 14 35 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-ccw.svg b/icons-dark/applets/64/osd-rotate-ccw.svg
--- a/icons-dark/applets/64/osd-rotate-ccw.svg
+++ b/icons-dark/applets/64/osd-rotate-ccw.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-ccw.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1007"
-     inkscape:window-height="700"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="765"
-     inkscape:window-y="264"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     style="opacity:0.98999999;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="M 9,9.996 C 7.338,9.99572 6,11.36187 6,13.0585 V 47.996 H 5 2 v 3 c 0,1.662 1.338,2.99976 3,3 l 54,0.008 c 1.662,2.4e-4 3,-1.338 3,-3 v -3 H 59 58 V 13.0665 c 0,-1.69662 -1.338,-3.06222 -3,-3.0625 z m 0,1 46,0.008 c 1.11412,1.9e-4 2,0.89163 2,2.0625 V 48.00381 H 39 38 26 25 l -18,-0.008 v -34.9375 c -0.002,-1.17088 0.88588,-2.06269 2,-2.0625 z m 22.5,0.008 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 L 9,11.99609 c -0.56623,-10e-5 -1,0.41737 -1,1.0625 v 32.875 c 0,0.64512 0.43377,1.06241 1,1.0625 l 46,0.008 c 0.56623,9e-5 1,-0.41738 1,-1.0625 v -32.875 c 0,-0.64513 -0.43377,-1.0624 -1,-1.0625 l -22.48047,-0.004 C 32.78687,11.98929 33,11.77408 33,11.504 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z M 9,12.99619 l 46,0.008 c 0.0183,0 0,-0.0569 0,0.0625 v 32.875 c 0,0.1194 0.0183,0.0625 0,0.0625 l -46,-0.008 c -0.0183,0 0,0.0569 0,-0.0625 v -32.875 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m -6,36 h 2 1 1 l 18,0.008 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 h 18 1 1 2 v 2 c 0,1.1253 -0.8747,2.00016 -2,2 l -54,-0.008 c -1.1253,-1.6e-4 -2,-0.8747 -2,-2 z m 23,0.008 h 12 c 0,0.56413 -0.43587,1 -1,1 H 27 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path914"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     inkscape:connector-curvature="0"
-     id="path924"
-     d="m 32,17.00381 a 13,12.5 0 0 1 13,12.5 13,12.5 0 0 1 -13,12.5 13,12.5 0 0 1 -0.008,0 V 40.00967 H 32 c 2.90159,0 5.77988,-1.15095 7.81055,-3.10352 2.03066,-1.95256 3.19531,-4.6726 3.19531,-7.40234 0,-2.72974 -1.16465,-5.44978 -3.19531,-7.40234 C 37.77988,20.1489 34.90159,18.99795 32,18.99795 c -2.90159,0 -5.77987,1.15095 -7.81054,3.10352 -0.0865,0.0832 -0.15917,0.17756 -0.24219,0.26367 l 3.35937,2.81836 -8.97265,2.91406 1.3125,-9.3418 2.77539,2.32813 A 13,12.5 0 0 1 32,17.00381 Z"
-     style="opacity:0.98999999;fill:#3daee9;fill-opacity:1;stroke:none;stroke-width:1.274755;stroke-opacity:0.35714291" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 32.691406 19 A 13.311049 13.330146 0 0 0 19.949219 28.566406 L 18 27.736328 L 19.691406 31.929688 L 23.880859 30.236328 L 21.916016 29.400391 A 11.181282 11.197323 0 0 1 32.691406 21.132812 A 11.181282 11.197323 0 0 1 43.873047 32.330078 A 11.181282 11.197323 0 0 1 38.564453 41.839844 L 39.945312 43.5 A 13.311049 13.330146 0 0 0 46 32.330078 A 13.311049 13.330146 0 0 0 32.691406 19 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-cw.svg b/icons-dark/applets/64/osd-rotate-cw.svg
--- a/icons-dark/applets/64/osd-rotate-cw.svg
+++ b/icons-dark/applets/64/osd-rotate-cw.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-cw.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     style="opacity:0.98999999;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="m 55.00001,9.99619 -46,0.008 c -1.662,2.8e-4 -3,1.36588 -3,3.0625 V 48.004 h -1 -3 v 3 c 0,1.662 1.338,3.00024 3,3 l 54,-0.008 c 1.662,-2.4e-4 3,-1.338 3,-3 v -3 h -3 -1 V 13.0585 c 0,-1.69663 -1.338,-3.06278 -3,-3.0625 z m 0,1 c 1.11412,-1.9e-4 2.00162,0.89162 2,2.0625 v 34.9375 l -18,0.008 h -1 -12 -1 -18 v -34.9375 c 0,-1.17087 0.88588,-2.06231 2,-2.0625 z m -23.5,0.008 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 L 9.00001,12.004 c -0.56623,10e-5 -1,0.41737 -1,1.0625 v 32.875 c 0,0.64512 0.43377,1.06259 1,1.0625 l 46,-0.008 c 0.56623,-9e-5 1,-0.41738 1,-1.0625 v -32.875 c 0,-0.64513 -0.43377,-1.0626 -1,-1.0625 L 32.51954,12 c 0.26734,-0.0108 0.48047,-0.22601 0.48047,-0.49609 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 23.5,1.99219 c 0.0183,-10e-6 0,-0.0569 0,0.0625 v 32.875 c 0,0.11937 0.0183,0.0625 0,0.0625 l -46,0.008 c -0.0183,0 0,0.0569 0,-0.0625 v -32.875 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m 2,36 h 1 1 2 v 2 c 0,1.1253 -0.8747,1.99984 -2,2 l -54,0.008 c -1.1253,1.6e-4 -2,-0.8747 -2,-2 v -2 h 2 1 1 18 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 z m -31,0.008 h 12 c 0,0.56413 -0.43587,1 -1,1 h -10 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path4952"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="opacity:0.98999999;fill:#3daee9;fill-opacity:1;stroke:none;stroke-width:1.274755;stroke-opacity:0.35714291"
-     d="m 31.81837,17.00986 a 13,12.5 0 0 0 -13,12.5 13,12.5 0 0 0 13,12.5 13,12.5 0 0 0 0.008,0 v -1.99414 h -0.008 c -2.90159,0 -5.77988,-1.15095 -7.81055,-3.10352 -2.03066,-1.95256 -3.19531,-4.6726 -3.19531,-7.40234 0,-2.72974 1.16465,-5.44978 3.19531,-7.40234 2.03067,-1.95257 4.90896,-3.10352 7.81055,-3.10352 2.90159,0 5.77987,1.15095 7.81054,3.10352 0.0865,0.0832 0.15917,0.17756 0.24219,0.26367 l -3.35937,2.81836 8.97265,2.91406 -1.3125,-9.3418 -2.77539,2.32813 a 13,12.5 0 0 0 -9.57812,-4.08008 z"
-     id="path4991"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 31.308594 19 A 13.311049 13.330146 0 0 0 18 32.330078 A 13.311049 13.330146 0 0 0 24.054688 43.5 L 25.435547 41.839844 A 11.181282 11.197323 0 0 1 20.126953 32.330078 A 11.181282 11.197323 0 0 1 31.308594 21.132812 A 11.181282 11.197323 0 0 1 42.083984 29.400391 L 40.119141 30.236328 L 44.308594 31.929688 L 46 27.736328 L 44.050781 28.566406 A 13.311049 13.330146 0 0 0 31.308594 19 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-flip.svg b/icons-dark/applets/64/osd-rotate-flip.svg
--- a/icons-dark/applets/64/osd-rotate-flip.svg
+++ b/icons-dark/applets/64/osd-rotate-flip.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-flip.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     style="opacity:0.98999999;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="m 8.99999,9.996002 c -1.662,-2.8e-4 -3,1.36587 -3,3.0625 v 34.9375 h -1 -3 v 3 c 0,1.662 1.338,2.99976 3,3 l 54,0.008 c 1.662,2.4e-4 3,-1.338 3,-3 v -3 h -3 -1 v -34.9375 c 0,-1.69662 -1.338,-3.06222 -3,-3.0625 z m 0,1 46,0.008 c 1.11412,1.9e-4 2,0.89163 2,2.0625 v 34.93731 h -18 -1 -12 -1 l -18,-0.008 v -34.9375 c -0.002,-1.17088 0.88588,-2.06269 2,-2.0625 z m 22.5,0.008 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 l -22.48047,-0.004 c -0.56623,-1e-4 -1,0.41737 -1,1.0625 v 32.875 c 0,0.64512 0.43377,1.06241 1,1.0625 l 46,0.008 c 0.56623,9e-5 1,-0.41738 1,-1.0625 v -32.875 c 0,-0.64513 -0.43377,-1.0624 -1,-1.0625 l -22.48047,-0.004 c 0.26734,-0.0108 0.48047,-0.22601 0.48047,-0.49609 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -22.5,1.99219 46,0.008 c 0.0183,0 0,-0.0569 0,0.0625 v 32.875 c 0,0.1194 0.0183,0.0625 0,0.0625 l -46,-0.008 c -0.0183,0 0,0.0569 0,-0.0625 v -32.875 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m -6,36 h 2 1 1 l 18,0.008 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 h 18 1 1 2 v 2 c 0,1.1253 -0.8747,2.00016 -2,2 l -54,-0.008 c -1.1253,-1.6e-4 -2,-0.8747 -2,-2 z m 23,0.008 h 12 c 0,0.56413 -0.43587,1 -1,1 h -10 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path937"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     inkscape:connector-curvature="0"
-     style="fill:#3daee9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 31.99218,17.003922 -4,7 h 3 v 11 h -3 l 4,7 4,-7 h -3 v -11 h 3 z"
-     id="path967" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 32 20.798828 L 28.638672 24.160156 L 30.878906 24.160156 L 30.878906 39.839844 L 28.638672 39.839844 L 32 43.199219 L 35.359375 39.839844 L 33.119141 39.839844 L 33.119141 24.160156 L 35.359375 24.160156 L 32 20.798828 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-normal.svg b/icons-dark/applets/64/osd-rotate-normal.svg
--- a/icons-dark/applets/64/osd-rotate-normal.svg
+++ b/icons-dark/applets/64/osd-rotate-normal.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-normal.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.98999999;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="m 9.0000001,9.9997996 c -1.662,-2.8e-4 -3,1.3658804 -3,3.0625004 v 34.93751 h -1 -3 v 3 c 0,1.662 1.338,2.99976 3,3 L 59,54.00781 c 1.662,2.4e-4 3,-1.338 3,-3 v -3 h -3 -1 v -34.9377 c 0,-1.69662 -1.338,-3.06222 -3,-3.0625 z m 0,1.0000004 L 55,11.0078 c 1.11412,1.9e-4 2,0.89163 2,2.0625 V 48.00761 H 39 38 26 25 L 7.0000001,47.99961 V 13.0623 c -0.002,-1.17087 0.88588,-2.06269 2,-2.0625 z M 31.5,11.0078 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 L 9.0000001,11.99979 c -0.56623,-9e-5 -1,0.41738 -1,1.0625 V 45.9373 c 0,0.64512 0.43377,1.06241 1,1.0625 L 55,47.0078 c 0.56623,9e-5 1,-0.41738 1,-1.0625 V 13.07011 c 0,-0.64512 -0.43377,-1.0624 -1,-1.0625 l -22.48047,-0.004 C 32.78687,11.99291 33,11.77769 33,11.50761 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z M 9.0000001,12.99999 55,13.00799 c 0.0183,0 0,-0.0569 0,0.0625 v 32.875 c 0,0.1194 0.0183,0.0625 0,0.0625 l -45.9999999,-0.008 c -0.0183,0 0,0.0569 0,-0.0625 V 13.0627 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m -6,36.00001 h 2 1 1 L 25,49.008 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 h 18 1 1 2 v 2 c 0,1.1253 -0.8747,2.00016 -2,2 L 5.0000001,53 c -1.1253,-1.6e-4 -2,-0.8747 -2,-2 z M 26,49.008 h 12 c 0,0.56413 -0.43587,1 -1,1 H 27 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path2197" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     inkscape:connector-curvature="0"
-     id="path2850"
-     d="m 20,20 v 2 1 9 h 16 v -9 -1 -2 z m 10,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -13,2 h 14 v 8 H 21 Z m 16,3 v 3 h 7 v 8 H 30 v -4 h -1 v 5 h 16 v -9 -1 -2 z m 2,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
-     style="fill:#3daee9;fill-opacity:1;stroke:none" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 14 19 L 14 36.144531 L 37 36 L 37 19 L 14 19 z M 16 23 L 35 23 L 35 34 L 16 34 L 16 23 z M 49 25.855469 L 38 26 L 38 30 L 47 30 L 47 41 L 28 41 L 28 37 L 26 37 L 26 43 L 49 43 L 49 25.855469 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-sbs-left.svg b/icons-dark/applets/64/osd-sbs-left.svg
--- a/icons-dark/applets/64/osd-sbs-left.svg
+++ b/icons-dark/applets/64/osd-sbs-left.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-sbs-left.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,11 +13,13 @@
       </style>
   </defs>
   <path
-     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 2 13 L 2 15 L 4 15 L 4 34 L 18 34 L 18 35 L 20 35 L 20 40 L 13.486328 46 L 14.964844 46 L 20 41.361328 L 20 46 L 21 46 L 21 44 L 21 41.363281 L 21 41 A 1.0001 1.0001 0 0 1 21.302734 40.283203 L 21 40.003906 L 21 35 L 23 35 L 23 34 L 23 33 L 21 33 L 20 33 L 5 33 L 5 15 L 36 15 L 36 17 L 37 17 L 37 15 L 39 15 L 39 13 L 2 13 z M 25.816406 18 C 24.810456 18 24 18.810456 24 19.816406 L 24 41 L 22 41 L 22 44 C 22 45.108 22.892 46 24 46 L 60 46 C 61.108 46 62 45.108 62 44 L 62 41 L 60 41 L 60 19.816406 C 60 18.810456 59.189544 18 58.183594 18 L 25.816406 18 z M 25.816406 19 L 41.5 19 C 41.223 19 41 19.223 41 19.5 C 41 19.777 41.223 20 41.5 20 L 26 20 L 26 40 L 58 40 L 58 20 L 42.5 20 C 42.777 20 43 19.777 43 19.5 C 43 19.223 42.777 19 42.5 19 L 58.183594 19 C 58.652434 19 59 19.347566 59 19.816406 L 59 41 L 45 41 L 39 41 L 25 41 L 25 19.816406 C 25 19.347566 25.347566 19 25.816406 19 z M 27 21 L 57 21 L 57 39 L 27 39 L 27 21 z M 23 42 L 24 42 L 25 42 L 38 42 C 38 42.554 38.446 43 39 43 L 45 43 C 45.554 43 46 42.554 46 42 L 59 42 L 60 42 L 61 42 L 61 44 C 61 44.5713 60.5713 45 60 45 L 24 45 C 23.4287 45 23 44.5713 23 44 L 23 42 z "
-     id="path2581" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4 19 L 4 24 L 6 24 L 6 45 L 26 45 L 26 42 L 8 42 L 8 24 L 28 24 L 28 23 L 8 23 L 6 23 L 6 21 L 28 21 L 28 19 L 6 19 L 4 19 z M 29 19 L 29 41 L 27 41 L 27 43 C 27 44.000593 27.999407 45 29 45 L 58 45 C 59.000593 45 60 44.000593 60 43 L 60 41 L 58 41 L 58 19 L 56 19 L 31 19 L 29 19 z M 31 21 L 56 21 L 56 39 L 31 39 L 31 21 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="M 15 18 L 15 20 L 15 21 L 15 30 L 22 30 L 22 29 L 16 29 L 16 21 L 22 21 L 22 18 L 15 18 z M 28 24 L 28 27 L 35 27 L 35 35 L 28 35 L 28 36 L 36 36 L 36 27 L 36 26 L 36 24 L 28 24 z M 30 25 L 31 25 L 31 26 L 30 26 L 30 25 z M 32 25 L 33 25 L 33 26 L 32 26 L 32 25 z M 34 25 L 35 25 L 35 26 L 34 26 L 34 25 z "
-     id="path2799" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18 27 L 18 38 L 27 38 L 27 37 L 20 37 L 20 30 L 27 30 L 27 27 L 18 27 z M 31 27 L 31 30 L 40 30 L 40 37 L 31 37 L 31 38 L 42 38 L 42 27 L 31 27 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-sbs-sright.svg b/icons-dark/applets/64/osd-sbs-sright.svg
--- a/icons-dark/applets/64/osd-sbs-sright.svg
+++ b/icons-dark/applets/64/osd-sbs-sright.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-sbs-sright.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="-21.624106"
-     inkscape:cy="65.429716"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,11 +13,13 @@
       </style>
   </defs>
   <path
-     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 13 L 25 15 L 27 15 L 27 17 L 28 17 L 28 15 L 59 15 L 59 33 L 44 33 L 43 33 L 41 33 L 41 34 L 41 35 L 43 35 L 43 40.003906 L 42.697266 40.283203 A 1.0001 1.0001 0 0 1 43 41 L 43 41.363281 L 43 44 L 43 46 L 44 46 L 44 41.361328 L 49.035156 46 L 50.513672 46 L 44 40 L 44 35 L 46 35 L 46 34 L 60 34 L 60 15 L 62 15 L 62 13 L 25 13 z M 5.8164062 18 C 4.8104562 18 4 18.810456 4 19.816406 L 4 41 L 2 41 L 2 44 C 2 45.108 2.892 46 4 46 L 40 46 C 41.108 46 42 45.108 42 44 L 42 41 L 40 41 L 40 19.816406 C 40 18.810456 39.189544 18 38.183594 18 L 5.8164062 18 z M 5.8164062 19 L 21.5 19 C 21.223 19 21 19.223 21 19.5 C 21 19.777 21.223 20 21.5 20 L 6 20 L 6 40 L 38 40 L 38 20 L 22.5 20 C 22.777 20 23 19.777 23 19.5 C 23 19.223 22.777 19 22.5 19 L 38.183594 19 C 38.652434 19 39 19.347566 39 19.816406 L 39 41 L 25 41 L 19 41 L 5 41 L 5 19.816406 C 5 19.347566 5.3475662 19 5.8164062 19 z M 7 21 L 37 21 L 37 39 L 7 39 L 7 21 z M 3 42 L 4 42 L 5 42 L 18 42 C 18 42.554 18.446 43 19 43 L 25 43 C 25.554 43 26 42.554 26 42 L 39 42 L 40 42 L 41 42 L 41 44 C 41 44.5713 40.5713 45 40 45 L 4 45 C 3.4287 45 3 44.5713 3 44 L 3 42 z "
-     id="path3301" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 6 19 L 6 40 L 4 40 L 4 42.193359 C 4 43.194134 4.8058664 44 5.8066406 44 L 35 44 C 36.000774 44 37 43.000774 37 42 L 37 40 L 35 40 L 35 19 L 33 19 L 8 19 L 6 19 z M 37 19 L 37 21 L 58 21 L 58 23 L 56 23 L 37 23 L 37 24 L 56 24 L 56 42 L 38 42 L 38 44 C 43.506245 43.999819 48.064516 43.999819 58 44 L 58 24 L 60 24 L 60 19 L 58 19 L 37 19 z M 8 21 L 33 21 L 33 39 L 8 39 L 8 21 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="M 42 18 L 42 21 L 49 21 L 49 29 L 42 29 L 42 30 L 50 30 L 50 21 L 50 20 L 50 18 L 42 18 z M 44 19 L 45 19 L 45 20 L 44 20 L 44 19 z M 46 19 L 47 19 L 47 20 L 46 20 L 46 19 z M 48 19 L 49 19 L 49 20 L 48 20 L 48 19 z M 29 24 L 29 26 L 29 27 L 29 36 L 36 36 L 36 35 L 30 35 L 30 27 L 36 27 L 36 24 L 29 24 z "
-     id="path3321" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 22.064453 25.935547 L 22 38 L 33 38 L 33 37 L 24 37 L 24 29 L 33 29 L 33 26 L 22.064453 25.935547 z M 37 26 L 37 29 L 44 29 L 44 37 L 37 37 L 37 38 L 46 38 L 46 26 L 37 26 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-shutd-laptop.svg b/icons-dark/applets/64/osd-shutd-laptop.svg
--- a/icons-dark/applets/64/osd-shutd-laptop.svg
+++ b/icons-dark/applets/64/osd-shutd-laptop.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="osd-shutd-laptop.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata14">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="14.575195"
-     inkscape:cy="135.66597"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -61,18 +16,18 @@
       </style>
   </defs>
   <path
-     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 10 L 25 12 L 27 12 L 27 25 L 28 25 L 28 12 L 59 12 L 59 30 L 44 30 L 43 30 L 41 30 L 41 31 L 41 32 L 43 32 L 43 37 L 41 38.841797 L 41 40.203125 L 43 38.361328 L 43 43 L 44 43 L 44 38.363281 L 49.033203 43 L 50.509766 43 L 44 37.003906 L 44 32 L 46 32 L 46 31 L 60 31 L 60 12 L 62 12 L 62 10 L 25 10 z M 5.8164062 26 C 4.8104562 26 4 26.810456 4 27.816406 L 4 49 L 2 49 L 2 52 C 2 53.108 2.892 54 4 54 L 40 54 C 41.108 54 42 53.108 42 52 L 42 49 L 40 49 L 40 27.816406 C 40 26.810456 39.189544 26 38.183594 26 L 5.8164062 26 z M 5.8164062 27 L 21.5 27 C 21.223 27 21 27.223 21 27.5 C 21 27.777 21.223 28 21.5 28 L 6 28 L 6 48 L 38 48 L 38 28 L 22.5 28 C 22.777 28 23 27.777 23 27.5 C 23 27.223 22.777 27 22.5 27 L 38.183594 27 C 38.652434 27 39 27.347566 39 27.816406 L 39 49 L 25 49 L 19 49 L 5 49 L 5 27.816406 C 5 27.347566 5.3475663 27 5.8164062 27 z M 7 29 L 37 29 L 37 47 L 7 47 L 7 29 z M 3 50 L 4 50 L 5 50 L 18 50 C 18 50.554 18.446 51 19 51 L 25 51 C 25.554 51 26 50.554 26 50 L 39 50 L 40 50 L 41 50 L 41 52 C 41 52.5713 40.5713 53 40 53 L 4 53 C 3.4287 53 3 52.5713 3 52 L 3 50 z "
-     id="path3410" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 21 9 L 21 15 L 24 15 L 24 24 L 8.5722656 24 L 6 24 L 6 50 L 4 50 L 4 52 C 4 53.18714 4.8128598 54 6 54 L 41 54 C 42.18714 54 43 53.18714 43 52 L 43 50 L 41 50 L 41 37 C 46.089274 37 52.642869 36.999957 58 37 L 58 15 L 60 15 L 60 9 L 57.857422 9 L 23.572266 9 L 21 9 z M 23 11 L 58 11 L 58 13 L 56 13 L 26 13 L 23 13 L 23 11 z M 26 15 L 56 15 L 56 35 L 41 35 L 41 24 L 39 24 L 26 24 L 26 15 z M 8 26 L 24 26 L 26 26 L 39 26 L 39 48 L 8 48 L 8 26 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="m 35.999999,15 v 2 1 7 h 1 v -7 h 14 v 8 h -10.68945 c 0.24897,0.29046 0.43739,0.62732 0.55273,1 h 11.13672 v -9 -1 -2 z m 10,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
-     id="path3412"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 30 18 L 30 24 L 32 24 L 32 22 L 49 22 L 49 31 L 41 31 L 41 33 L 51 33 L 51 18 L 30 18 z "
+     class="ColorScheme-Highlight"
+     />
   <path
-     inkscape:connector-curvature="0"
-     style="color:#da4453;fill:currentColor;fill-opacity:1;stroke:none"
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.970703 29.939453 L 17.455078 31.455078 L 22 36 L 17.455078 40.544922 L 18.970703 42.060547 L 23.515625 37.515625 L 28.060547 42.060547 L 29.576172 40.544922 L 25.029297 36 L 29.576172 31.455078 L 28.060547 29.939453 L 23.515625 34.484375 L 18.970703 29.939453 z "
      class="ColorScheme-NegativeText"
-     d="m 16.705079,32 -0.70703,0.70703 5.29492,5.29492 -5.29102,5.29102 c 0,0 0.71604,0.70203 0.70704,0.70703 L 21.999999,38.70898 27.291019,44 c -0.009,-0.005 0.70703,-0.70703 0.70703,-0.70703 l -5.29102,-5.29102 5.29492,-5.29492 L 27.294919,32 l -5.29492,5.29492 z"
-     id="path3454" />
+     />
 </svg>
diff --git a/icons-dark/applets/64/osd-shutd-screen.svg b/icons-dark/applets/64/osd-shutd-screen.svg
--- a/icons-dark/applets/64/osd-shutd-screen.svg
+++ b/icons-dark/applets/64/osd-shutd-screen.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="osd-shutd-screen.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata14">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -61,17 +16,18 @@
       </style>
   </defs>
   <path
-     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 10 L 25 12 L 27 12 L 27 25 L 28 25 L 28 12 L 59 12 L 59 30 L 44 30 L 43 30 L 41 30 L 41 31 L 41 32 L 43 32 L 43 37 L 41 38.841797 L 41 40.203125 L 43 38.361328 L 43 43 L 44 43 L 44 38.363281 L 49.033203 43 L 50.509766 43 L 44 37.003906 L 44 32 L 46 32 L 46 31 L 60 31 L 60 12 L 62 12 L 62 10 L 25 10 z M 5.8164062 26 C 4.8104562 26 4 26.810456 4 27.816406 L 4 49 L 2 49 L 2 52 C 2 53.108 2.892 54 4 54 L 40 54 C 41.108 54 42 53.108 42 52 L 42 49 L 40 49 L 40 27.816406 C 40 26.810456 39.189544 26 38.183594 26 L 5.8164062 26 z M 5.8164062 27 L 21.5 27 C 21.223 27 21 27.223 21 27.5 C 21 27.777 21.223 28 21.5 28 L 6 28 L 6 48 L 38 48 L 38 28 L 22.5 28 C 22.777 28 23 27.777 23 27.5 C 23 27.223 22.777 27 22.5 27 L 38.183594 27 C 38.652434 27 39 27.347566 39 27.816406 L 39 49 L 25 49 L 19 49 L 5 49 L 5 27.816406 C 5 27.347566 5.3475663 27 5.8164062 27 z M 7 29 L 37 29 L 37 47 L 7 47 L 7 29 z M 3 50 L 4 50 L 5 50 L 18 50 C 18 50.554 18.446 51 19 51 L 25 51 C 25.554 51 26 50.554 26 50 L 39 50 L 40 50 L 41 50 L 41 52 C 41 52.5713 40.5713 53 40 53 L 4 53 C 3.4287 53 3 52.5713 3 52 L 3 50 z "
-     id="path3091" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 21 9 L 21 15 L 24 15 L 24 24 L 8.5722656 24 L 6 24 L 6 50 L 4 50 L 4 52 C 4 53.18714 4.8128598 54 6 54 L 41 54 C 42.18714 54 43 53.18714 43 52 L 43 50 L 41 50 L 41 37 C 46.089274 37 52.642869 36.999957 58 37 L 58 15 L 60 15 L 60 9 L 57.857422 9 L 23.572266 9 L 21 9 z M 23 11 L 58 11 L 58 13 L 56 13 L 26 13 L 23 13 L 23 11 z M 26 15 L 56 15 L 56 35 L 41 35 L 41 24 L 39 24 L 26 24 L 26 15 z M 8 26 L 24 26 L 26 26 L 39 26 L 39 48 L 8 48 L 8 26 z "
+     class="ColorScheme-Text"
+     />
   <path
-     id="path3097"
-     d="m 14,31.99991 v 2 1 9 h 16 v -9 -1 -2 z m 10,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -13,2 h 14 v 8 H 15 Z"
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 12 30 L 12 45 L 34 45 L 34 30 L 12 30 z M 14 34 L 32 34 L 32 43 L 14 43 L 14 34 z "
+     class="ColorScheme-Highlight"
+     />
   <path
-     inkscape:connector-curvature="0"
-     style="color:#da4453;fill:currentColor;fill-opacity:1;stroke:none"
-     d="m 38.29102,15 -0.70704,0.70703 5.29493,5.29492 -4.07422,4.07422 c 0.3567,0.082 0.6863,0.23102 0.97851,0.43555 L 43.58594,21.70898 48.87695,27 c -0.009,-0.005 0.70703,-0.70703 0.70703,-0.70703 L 44.29297,21.00195 49.58789,15.70703 48.88086,15 43.58594,20.29492 Z"
-     id="path3380" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 43.939453 15.939453 L 42.423828 17.455078 L 46.970703 22 L 42.423828 26.544922 L 43.939453 28.060547 L 48.484375 23.515625 L 53.029297 28.060547 L 54.544922 26.544922 L 50 22 L 54.544922 17.455078 L 53.029297 15.939453 L 48.484375 20.484375 L 43.939453 15.939453 z "
+     class="ColorScheme-NegativeText"
+     />
 </svg>
diff --git a/icons/applets/64/osd-duplicate.svg b/icons/applets/64/osd-duplicate.svg
--- a/icons/applets/64/osd-duplicate.svg
+++ b/icons/applets/64/osd-duplicate.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-duplicate.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,11 +13,13 @@
       </style>
   </defs>
   <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 10 L 25 12 L 27 12 L 27 25 L 28 25 L 28 12 L 59 12 L 59 30 L 44 30 L 43 30 L 41 30 L 41 31 L 41 32 L 43 32 L 43 37 L 41 38.841797 L 41 40.203125 L 43 38.361328 L 43 43 L 44 43 L 44 38.363281 L 49.033203 43 L 50.509766 43 L 44 37.003906 L 44 32 L 46 32 L 46 31 L 60 31 L 60 12 L 62 12 L 62 10 L 25 10 z M 5.8164062 26 C 4.8104562 26 4 26.810456 4 27.816406 L 4 49 L 2 49 L 2 52 C 2 53.108 2.892 54 4 54 L 40 54 C 41.108 54 42 53.108 42 52 L 42 49 L 40 49 L 40 27.816406 C 40 26.810456 39.189544 26 38.183594 26 L 5.8164062 26 z M 5.8164062 27 L 21.5 27 C 21.223 27 21 27.223 21 27.5 C 21 27.777 21.223 28 21.5 28 L 6 28 L 6 48 L 38 48 L 38 28 L 22.5 28 C 22.777 28 23 27.777 23 27.5 C 23 27.223 22.777 27 22.5 27 L 38.183594 27 C 38.652434 27 39 27.347566 39 27.816406 L 39 49 L 25 49 L 19 49 L 5 49 L 5 27.816406 C 5 27.347566 5.3475663 27 5.8164062 27 z M 7 29 L 37 29 L 37 47 L 7 47 L 7 29 z M 3 50 L 4 50 L 5 50 L 18 50 C 18 50.554 18.446 51 19 51 L 25 51 C 25.554 51 26 50.554 26 50 L 39 50 L 40 50 L 41 50 L 41 52 C 41 52.5713 40.5713 53 40 53 L 4 53 C 3.4287 53 3 52.5713 3 52 L 3 50 z "
-     id="path3434" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 22 9 L 22 16 L 24 16 L 24 24 L 6 24 L 6 50 L 4 50 L 4 52 C 4 53 5 54 6 54 L 40 54 C 41 54 42 53 42 52 L 42 50 L 40 50 L 40 37 C 45 37 53 37 58 37 L 58 16 L 60 16 L 60 9 L 58 9 L 24 9 L 22 9 z M 24 12 L 58 12 L 58 14 L 56 14 L 26 14 L 24 14 L 24 12 z M 26 16 L 56 16 L 56 35 L 40 35 L 40 24 L 26 24 L 26 16 z M 8 26 L 24 26 L 26 26 L 38 26 L 38 48 L 8 48 L 8 26 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="M 37 15 L 37 17 L 37 18 L 37 25 L 38 25 L 38 18 L 52 18 L 52 26 L 41.310547 26 C 41.559517 26.29046 41.747941 26.62732 41.863281 27 L 53 27 L 53 18 L 53 17 L 53 15 L 37 15 z M 47 16 L 48 16 L 48 17 L 47 17 L 47 16 z M 49 16 L 50 16 L 50 17 L 49 17 L 49 16 z M 51 16 L 52 16 L 52 17 L 51 17 L 51 16 z M 14 32 L 14 34 L 14 35 L 14 44 L 30 44 L 30 35 L 30 34 L 30 32 L 14 32 z M 24 33 L 25 33 L 25 34 L 24 34 L 24 33 z M 26 33 L 27 33 L 27 34 L 26 34 L 26 33 z M 28 33 L 29 33 L 29 34 L 28 34 L 28 33 z M 15 35 L 29 35 L 29 43 L 15 43 L 15 35 z "
-     id="path3436" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 30 18 L 30 24 L 32 24 L 32 22 L 50 22 L 50 31 L 40 31 L 40 33 L 52 33 L 52 18 L 30 18 z M 12 31 L 12 46 L 34 46 L 34 31 L 12 31 z M 14 35 L 32 35 L 32 44 L 14 44 L 14 35 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-rotate-ccw.svg b/icons/applets/64/osd-rotate-ccw.svg
--- a/icons/applets/64/osd-rotate-ccw.svg
+++ b/icons/applets/64/osd-rotate-ccw.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-ccw.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1007"
-     inkscape:window-height="700"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="765"
-     inkscape:window-y="264"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     style="opacity:0.98999999;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="M 9,9.996 C 7.338,9.99572 6,11.36187 6,13.0585 V 47.996 H 5 2 v 3 c 0,1.662 1.338,2.99976 3,3 l 54,0.008 c 1.662,2.4e-4 3,-1.338 3,-3 v -3 H 59 58 V 13.0665 c 0,-1.69662 -1.338,-3.06222 -3,-3.0625 z m 0,1 46,0.008 c 1.11412,1.9e-4 2,0.89163 2,2.0625 V 48.00381 H 39 38 26 25 l -18,-0.008 v -34.9375 c -0.002,-1.17088 0.88588,-2.06269 2,-2.0625 z m 22.5,0.008 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 L 9,11.99609 c -0.56623,-10e-5 -1,0.41737 -1,1.0625 v 32.875 c 0,0.64512 0.43377,1.06241 1,1.0625 l 46,0.008 c 0.56623,9e-5 1,-0.41738 1,-1.0625 v -32.875 c 0,-0.64513 -0.43377,-1.0624 -1,-1.0625 l -22.48047,-0.004 C 32.78687,11.98929 33,11.77408 33,11.504 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z M 9,12.99619 l 46,0.008 c 0.0183,0 0,-0.0569 0,0.0625 v 32.875 c 0,0.1194 0.0183,0.0625 0,0.0625 l -46,-0.008 c -0.0183,0 0,0.0569 0,-0.0625 v -32.875 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m -6,36 h 2 1 1 l 18,0.008 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 h 18 1 1 2 v 2 c 0,1.1253 -0.8747,2.00016 -2,2 l -54,-0.008 c -1.1253,-1.6e-4 -2,-0.8747 -2,-2 z m 23,0.008 h 12 c 0,0.56413 -0.43587,1 -1,1 H 27 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path914"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     inkscape:connector-curvature="0"
-     id="path924"
-     d="m 32,17.00381 a 13,12.5 0 0 1 13,12.5 13,12.5 0 0 1 -13,12.5 13,12.5 0 0 1 -0.008,0 V 40.00967 H 32 c 2.90159,0 5.77988,-1.15095 7.81055,-3.10352 2.03066,-1.95256 3.19531,-4.6726 3.19531,-7.40234 0,-2.72974 -1.16465,-5.44978 -3.19531,-7.40234 C 37.77988,20.1489 34.90159,18.99795 32,18.99795 c -2.90159,0 -5.77987,1.15095 -7.81054,3.10352 -0.0865,0.0832 -0.15917,0.17756 -0.24219,0.26367 l 3.35937,2.81836 -8.97265,2.91406 1.3125,-9.3418 2.77539,2.32813 A 13,12.5 0 0 1 32,17.00381 Z"
-     style="opacity:0.98999999;fill:#3daee9;fill-opacity:1;stroke:none;stroke-width:1.274755;stroke-opacity:0.35714291" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 32.691406 19 A 13.311049 13.330146 0 0 0 19.949219 28.566406 L 18 27.736328 L 19.691406 31.929688 L 23.880859 30.236328 L 21.916016 29.400391 A 11.181282 11.197323 0 0 1 32.691406 21.132812 A 11.181282 11.197323 0 0 1 43.873047 32.330078 A 11.181282 11.197323 0 0 1 38.564453 41.839844 L 39.945312 43.5 A 13.311049 13.330146 0 0 0 46 32.330078 A 13.311049 13.330146 0 0 0 32.691406 19 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-rotate-cw.svg b/icons/applets/64/osd-rotate-cw.svg
--- a/icons/applets/64/osd-rotate-cw.svg
+++ b/icons/applets/64/osd-rotate-cw.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-cw.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     style="opacity:0.98999999;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="m 55.00001,9.99619 -46,0.008 c -1.662,2.8e-4 -3,1.36588 -3,3.0625 V 48.004 h -1 -3 v 3 c 0,1.662 1.338,3.00024 3,3 l 54,-0.008 c 1.662,-2.4e-4 3,-1.338 3,-3 v -3 h -3 -1 V 13.0585 c 0,-1.69663 -1.338,-3.06278 -3,-3.0625 z m 0,1 c 1.11412,-1.9e-4 2.00162,0.89162 2,2.0625 v 34.9375 l -18,0.008 h -1 -12 -1 -18 v -34.9375 c 0,-1.17087 0.88588,-2.06231 2,-2.0625 z m -23.5,0.008 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 L 9.00001,12.004 c -0.56623,10e-5 -1,0.41737 -1,1.0625 v 32.875 c 0,0.64512 0.43377,1.06259 1,1.0625 l 46,-0.008 c 0.56623,-9e-5 1,-0.41738 1,-1.0625 v -32.875 c 0,-0.64513 -0.43377,-1.0626 -1,-1.0625 L 32.51954,12 c 0.26734,-0.0108 0.48047,-0.22601 0.48047,-0.49609 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 23.5,1.99219 c 0.0183,-10e-6 0,-0.0569 0,0.0625 v 32.875 c 0,0.11937 0.0183,0.0625 0,0.0625 l -46,0.008 c -0.0183,0 0,0.0569 0,-0.0625 v -32.875 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m 2,36 h 1 1 2 v 2 c 0,1.1253 -0.8747,1.99984 -2,2 l -54,0.008 c -1.1253,1.6e-4 -2,-0.8747 -2,-2 v -2 h 2 1 1 18 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 z m -31,0.008 h 12 c 0,0.56413 -0.43587,1 -1,1 h -10 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path4952"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="opacity:0.98999999;fill:#3daee9;fill-opacity:1;stroke:none;stroke-width:1.274755;stroke-opacity:0.35714291"
-     d="m 31.81837,17.00986 a 13,12.5 0 0 0 -13,12.5 13,12.5 0 0 0 13,12.5 13,12.5 0 0 0 0.008,0 v -1.99414 h -0.008 c -2.90159,0 -5.77988,-1.15095 -7.81055,-3.10352 -2.03066,-1.95256 -3.19531,-4.6726 -3.19531,-7.40234 0,-2.72974 1.16465,-5.44978 3.19531,-7.40234 2.03067,-1.95257 4.90896,-3.10352 7.81055,-3.10352 2.90159,0 5.77987,1.15095 7.81054,3.10352 0.0865,0.0832 0.15917,0.17756 0.24219,0.26367 l -3.35937,2.81836 8.97265,2.91406 -1.3125,-9.3418 -2.77539,2.32813 a 13,12.5 0 0 0 -9.57812,-4.08008 z"
-     id="path4991"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 31.308594 19 A 13.311049 13.330146 0 0 0 18 32.330078 A 13.311049 13.330146 0 0 0 24.054688 43.5 L 25.435547 41.839844 A 11.181282 11.197323 0 0 1 20.126953 32.330078 A 11.181282 11.197323 0 0 1 31.308594 21.132812 A 11.181282 11.197323 0 0 1 42.083984 29.400391 L 40.119141 30.236328 L 44.308594 31.929688 L 46 27.736328 L 44.050781 28.566406 A 13.311049 13.330146 0 0 0 31.308594 19 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-rotate-flip.svg b/icons/applets/64/osd-rotate-flip.svg
--- a/icons/applets/64/osd-rotate-flip.svg
+++ b/icons/applets/64/osd-rotate-flip.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-flip.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     style="opacity:0.98999999;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="m 8.99999,9.996002 c -1.662,-2.8e-4 -3,1.36587 -3,3.0625 v 34.9375 h -1 -3 v 3 c 0,1.662 1.338,2.99976 3,3 l 54,0.008 c 1.662,2.4e-4 3,-1.338 3,-3 v -3 h -3 -1 v -34.9375 c 0,-1.69662 -1.338,-3.06222 -3,-3.0625 z m 0,1 46,0.008 c 1.11412,1.9e-4 2,0.89163 2,2.0625 v 34.93731 h -18 -1 -12 -1 l -18,-0.008 v -34.9375 c -0.002,-1.17088 0.88588,-2.06269 2,-2.0625 z m 22.5,0.008 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 l -22.48047,-0.004 c -0.56623,-1e-4 -1,0.41737 -1,1.0625 v 32.875 c 0,0.64512 0.43377,1.06241 1,1.0625 l 46,0.008 c 0.56623,9e-5 1,-0.41738 1,-1.0625 v -32.875 c 0,-0.64513 -0.43377,-1.0624 -1,-1.0625 l -22.48047,-0.004 c 0.26734,-0.0108 0.48047,-0.22601 0.48047,-0.49609 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -22.5,1.99219 46,0.008 c 0.0183,0 0,-0.0569 0,0.0625 v 32.875 c 0,0.1194 0.0183,0.0625 0,0.0625 l -46,-0.008 c -0.0183,0 0,0.0569 0,-0.0625 v -32.875 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m -6,36 h 2 1 1 l 18,0.008 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 h 18 1 1 2 v 2 c 0,1.1253 -0.8747,2.00016 -2,2 l -54,-0.008 c -1.1253,-1.6e-4 -2,-0.8747 -2,-2 z m 23,0.008 h 12 c 0,0.56413 -0.43587,1 -1,1 h -10 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path937"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     inkscape:connector-curvature="0"
-     style="fill:#3daee9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 31.99218,17.003922 -4,7 h 3 v 11 h -3 l 4,7 4,-7 h -3 v -11 h 3 z"
-     id="path967" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 32 20.798828 L 28.638672 24.160156 L 30.878906 24.160156 L 30.878906 39.839844 L 28.638672 39.839844 L 32 43.199219 L 35.359375 39.839844 L 33.119141 39.839844 L 33.119141 24.160156 L 35.359375 24.160156 L 32 20.798828 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-rotate-normal.svg b/icons/applets/64/osd-rotate-normal.svg
--- a/icons/applets/64/osd-rotate-normal.svg
+++ b/icons/applets/64/osd-rotate-normal.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-rotate-normal.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,13 +13,13 @@
       </style>
   </defs>
   <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.98999999;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-opacity:0.35714291"
-     d="m 9.0000001,9.9997996 c -1.662,-2.8e-4 -3,1.3658804 -3,3.0625004 v 34.93751 h -1 -3 v 3 c 0,1.662 1.338,2.99976 3,3 L 59,54.00781 c 1.662,2.4e-4 3,-1.338 3,-3 v -3 h -3 -1 v -34.9377 c 0,-1.69662 -1.338,-3.06222 -3,-3.0625 z m 0,1.0000004 L 55,11.0078 c 1.11412,1.9e-4 2,0.89163 2,2.0625 V 48.00761 H 39 38 26 25 L 7.0000001,47.99961 V 13.0623 c -0.002,-1.17087 0.88588,-2.06269 2,-2.0625 z M 31.5,11.0078 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.27008 0.21313,0.48533 0.48047,0.49609 L 9.0000001,11.99979 c -0.56623,-9e-5 -1,0.41738 -1,1.0625 V 45.9373 c 0,0.64512 0.43377,1.06241 1,1.0625 L 55,47.0078 c 0.56623,9e-5 1,-0.41738 1,-1.0625 V 13.07011 c 0,-0.64512 -0.43377,-1.0624 -1,-1.0625 l -22.48047,-0.004 C 32.78687,11.99291 33,11.77769 33,11.50761 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z M 9.0000001,12.99999 55,13.00799 c 0.0183,0 0,-0.0569 0,0.0625 v 32.875 c 0,0.1194 0.0183,0.0625 0,0.0625 l -45.9999999,-0.008 c -0.0183,0 0,0.0569 0,-0.0625 V 13.0627 c 0,-0.11938 -0.0183,-0.0625 0,-0.0625 z m -6,36.00001 h 2 1 1 L 25,49.008 c 0,1.10457 0.89543,2 2,2 h 10 c 1.10457,0 2,-0.89543 2,-2 h 18 1 1 2 v 2 c 0,1.1253 -0.8747,2.00016 -2,2 L 5.0000001,53 c -1.1253,-1.6e-4 -2,-0.8747 -2,-2 z M 26,49.008 h 12 c 0,0.56413 -0.43587,1 -1,1 H 27 c -0.56413,0 -1,-0.43587 -1,-1 z"
-     id="path2197" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 5 11 L 5 50 L 58 50 L 58 11 L 5 11 z M 8 14 L 55 14 L 55 48 L 8 48 L 8 14 z M 2 52 L 1.9335938 54.400391 C 1.8822262 56.243621 3.3550959 58 5.1992188 58 L 58.533203 58 C 60.377326 58 62 56.244337 62 54.400391 L 62 52 L 2 52 z "
+     class="ColorScheme-Text"
+     />
   <path
-     inkscape:connector-curvature="0"
-     id="path2850"
-     d="m 20,20 v 2 1 9 h 16 v -9 -1 -2 z m 10,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -13,2 h 14 v 8 H 21 Z m 16,3 v 3 h 7 v 8 H 30 v -4 h -1 v 5 h 16 v -9 -1 -2 z m 2,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
-     style="fill:#3daee9;fill-opacity:1;stroke:none" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 14 19 L 14 36.144531 L 37 36 L 37 19 L 14 19 z M 16 23 L 35 23 L 35 34 L 16 34 L 16 23 z M 49 25.855469 L 38 26 L 38 30 L 47 30 L 47 41 L 28 41 L 28 37 L 26 37 L 26 43 L 49 43 L 49 25.855469 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-sbs-left.svg b/icons/applets/64/osd-sbs-left.svg
--- a/icons/applets/64/osd-sbs-left.svg
+++ b/icons/applets/64/osd-sbs-left.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-sbs-left.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,11 +13,13 @@
       </style>
   </defs>
   <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 2 13 L 2 15 L 4 15 L 4 34 L 18 34 L 18 35 L 20 35 L 20 40 L 13.486328 46 L 14.964844 46 L 20 41.361328 L 20 46 L 21 46 L 21 44 L 21 41.363281 L 21 41 A 1.0001 1.0001 0 0 1 21.302734 40.283203 L 21 40.003906 L 21 35 L 23 35 L 23 34 L 23 33 L 21 33 L 20 33 L 5 33 L 5 15 L 36 15 L 36 17 L 37 17 L 37 15 L 39 15 L 39 13 L 2 13 z M 25.816406 18 C 24.810456 18 24 18.810456 24 19.816406 L 24 41 L 22 41 L 22 44 C 22 45.108 22.892 46 24 46 L 60 46 C 61.108 46 62 45.108 62 44 L 62 41 L 60 41 L 60 19.816406 C 60 18.810456 59.189544 18 58.183594 18 L 25.816406 18 z M 25.816406 19 L 41.5 19 C 41.223 19 41 19.223 41 19.5 C 41 19.777 41.223 20 41.5 20 L 26 20 L 26 40 L 58 40 L 58 20 L 42.5 20 C 42.777 20 43 19.777 43 19.5 C 43 19.223 42.777 19 42.5 19 L 58.183594 19 C 58.652434 19 59 19.347566 59 19.816406 L 59 41 L 45 41 L 39 41 L 25 41 L 25 19.816406 C 25 19.347566 25.347566 19 25.816406 19 z M 27 21 L 57 21 L 57 39 L 27 39 L 27 21 z M 23 42 L 24 42 L 25 42 L 38 42 C 38 42.554 38.446 43 39 43 L 45 43 C 45.554 43 46 42.554 46 42 L 59 42 L 60 42 L 61 42 L 61 44 C 61 44.5713 60.5713 45 60 45 L 24 45 C 23.4287 45 23 44.5713 23 44 L 23 42 z "
-     id="path2581" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4 19 L 4 24 L 6 24 L 6 45 L 26 45 L 26 42 L 8 42 L 8 24 L 28 24 L 28 23 L 8 23 L 6 23 L 6 21 L 28 21 L 28 19 L 6 19 L 4 19 z M 29 19 L 29 41 L 27 41 L 27 43 C 27 44.000593 27.999407 45 29 45 L 58 45 C 59.000593 45 60 44.000593 60 43 L 60 41 L 58 41 L 58 19 L 56 19 L 31 19 L 29 19 z M 31 21 L 56 21 L 56 39 L 31 39 L 31 21 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="M 15 18 L 15 20 L 15 21 L 15 30 L 22 30 L 22 29 L 16 29 L 16 21 L 22 21 L 22 18 L 15 18 z M 28 24 L 28 27 L 35 27 L 35 35 L 28 35 L 28 36 L 36 36 L 36 27 L 36 26 L 36 24 L 28 24 z M 30 25 L 31 25 L 31 26 L 30 26 L 30 25 z M 32 25 L 33 25 L 33 26 L 32 26 L 32 25 z M 34 25 L 35 25 L 35 26 L 34 26 L 34 25 z "
-     id="path2799" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18 27 L 18 38 L 27 38 L 27 37 L 20 37 L 20 30 L 27 30 L 27 27 L 18 27 z M 31 27 L 31 30 L 40 30 L 40 37 L 31 37 L 31 38 L 42 38 L 42 27 L 31 27 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-sbs-sright.svg b/icons/applets/64/osd-sbs-sright.svg
--- a/icons/applets/64/osd-sbs-sright.svg
+++ b/icons/applets/64/osd-sbs-sright.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="osd-sbs-sright.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata12">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="-21.624106"
-     inkscape:cy="65.429716"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -58,11 +13,13 @@
       </style>
   </defs>
   <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 13 L 25 15 L 27 15 L 27 17 L 28 17 L 28 15 L 59 15 L 59 33 L 44 33 L 43 33 L 41 33 L 41 34 L 41 35 L 43 35 L 43 40.003906 L 42.697266 40.283203 A 1.0001 1.0001 0 0 1 43 41 L 43 41.363281 L 43 44 L 43 46 L 44 46 L 44 41.361328 L 49.035156 46 L 50.513672 46 L 44 40 L 44 35 L 46 35 L 46 34 L 60 34 L 60 15 L 62 15 L 62 13 L 25 13 z M 5.8164062 18 C 4.8104562 18 4 18.810456 4 19.816406 L 4 41 L 2 41 L 2 44 C 2 45.108 2.892 46 4 46 L 40 46 C 41.108 46 42 45.108 42 44 L 42 41 L 40 41 L 40 19.816406 C 40 18.810456 39.189544 18 38.183594 18 L 5.8164062 18 z M 5.8164062 19 L 21.5 19 C 21.223 19 21 19.223 21 19.5 C 21 19.777 21.223 20 21.5 20 L 6 20 L 6 40 L 38 40 L 38 20 L 22.5 20 C 22.777 20 23 19.777 23 19.5 C 23 19.223 22.777 19 22.5 19 L 38.183594 19 C 38.652434 19 39 19.347566 39 19.816406 L 39 41 L 25 41 L 19 41 L 5 41 L 5 19.816406 C 5 19.347566 5.3475662 19 5.8164062 19 z M 7 21 L 37 21 L 37 39 L 7 39 L 7 21 z M 3 42 L 4 42 L 5 42 L 18 42 C 18 42.554 18.446 43 19 43 L 25 43 C 25.554 43 26 42.554 26 42 L 39 42 L 40 42 L 41 42 L 41 44 C 41 44.5713 40.5713 45 40 45 L 4 45 C 3.4287 45 3 44.5713 3 44 L 3 42 z "
-     id="path3301" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 6 19 L 6 40 L 4 40 L 4 42.193359 C 4 43.194134 4.8058664 44 5.8066406 44 L 35 44 C 36.000774 44 37 43.000774 37 42 L 37 40 L 35 40 L 35 19 L 33 19 L 8 19 L 6 19 z M 37 19 L 37 21 L 58 21 L 58 23 L 56 23 L 37 23 L 37 24 L 56 24 L 56 42 L 38 42 L 38 44 C 43.506245 43.999819 48.064516 43.999819 58 44 L 58 24 L 60 24 L 60 19 L 58 19 L 37 19 z M 8 21 L 33 21 L 33 39 L 8 39 L 8 21 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="M 42 18 L 42 21 L 49 21 L 49 29 L 42 29 L 42 30 L 50 30 L 50 21 L 50 20 L 50 18 L 42 18 z M 44 19 L 45 19 L 45 20 L 44 20 L 44 19 z M 46 19 L 47 19 L 47 20 L 46 20 L 46 19 z M 48 19 L 49 19 L 49 20 L 48 20 L 48 19 z M 29 24 L 29 26 L 29 27 L 29 36 L 36 36 L 36 35 L 30 35 L 30 27 L 36 27 L 36 24 L 29 24 z "
-     id="path3321" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 22.064453 25.935547 L 22 38 L 33 38 L 33 37 L 24 37 L 24 29 L 33 29 L 33 26 L 22.064453 25.935547 z M 37 26 L 37 29 L 44 29 L 44 37 L 37 37 L 37 38 L 46 38 L 46 26 L 37 26 z "
+     class="ColorScheme-Highlight"
+     />
 </svg>
diff --git a/icons/applets/64/osd-shutd-laptop.svg b/icons/applets/64/osd-shutd-laptop.svg
--- a/icons/applets/64/osd-shutd-laptop.svg
+++ b/icons/applets/64/osd-shutd-laptop.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="osd-shutd-laptop.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata14">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="14.575195"
-     inkscape:cy="135.66597"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -61,18 +16,18 @@
       </style>
   </defs>
   <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 10 L 25 12 L 27 12 L 27 25 L 28 25 L 28 12 L 59 12 L 59 30 L 44 30 L 43 30 L 41 30 L 41 31 L 41 32 L 43 32 L 43 37 L 41 38.841797 L 41 40.203125 L 43 38.361328 L 43 43 L 44 43 L 44 38.363281 L 49.033203 43 L 50.509766 43 L 44 37.003906 L 44 32 L 46 32 L 46 31 L 60 31 L 60 12 L 62 12 L 62 10 L 25 10 z M 5.8164062 26 C 4.8104562 26 4 26.810456 4 27.816406 L 4 49 L 2 49 L 2 52 C 2 53.108 2.892 54 4 54 L 40 54 C 41.108 54 42 53.108 42 52 L 42 49 L 40 49 L 40 27.816406 C 40 26.810456 39.189544 26 38.183594 26 L 5.8164062 26 z M 5.8164062 27 L 21.5 27 C 21.223 27 21 27.223 21 27.5 C 21 27.777 21.223 28 21.5 28 L 6 28 L 6 48 L 38 48 L 38 28 L 22.5 28 C 22.777 28 23 27.777 23 27.5 C 23 27.223 22.777 27 22.5 27 L 38.183594 27 C 38.652434 27 39 27.347566 39 27.816406 L 39 49 L 25 49 L 19 49 L 5 49 L 5 27.816406 C 5 27.347566 5.3475663 27 5.8164062 27 z M 7 29 L 37 29 L 37 47 L 7 47 L 7 29 z M 3 50 L 4 50 L 5 50 L 18 50 C 18 50.554 18.446 51 19 51 L 25 51 C 25.554 51 26 50.554 26 50 L 39 50 L 40 50 L 41 50 L 41 52 C 41 52.5713 40.5713 53 40 53 L 4 53 C 3.4287 53 3 52.5713 3 52 L 3 50 z "
-     id="path3410" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 21 9 L 21 15 L 24 15 L 24 24 L 8.5722656 24 L 6 24 L 6 50 L 4 50 L 4 52 C 4 53.18714 4.8128598 54 6 54 L 41 54 C 42.18714 54 43 53.18714 43 52 L 43 50 L 41 50 L 41 37 C 46.089274 37 52.642869 36.999957 58 37 L 58 15 L 60 15 L 60 9 L 57.857422 9 L 23.572266 9 L 21 9 z M 23 11 L 58 11 L 58 13 L 56 13 L 26 13 L 23 13 L 23 11 z M 26 15 L 56 15 L 56 35 L 41 35 L 41 24 L 39 24 L 26 24 L 26 15 z M 8 26 L 24 26 L 26 26 L 39 26 L 39 48 L 8 48 L 8 26 z "
+     class="ColorScheme-Text"
+     />
   <path
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     d="m 35.999999,15 v 2 1 7 h 1 v -7 h 14 v 8 h -10.68945 c 0.24897,0.29046 0.43739,0.62732 0.55273,1 h 11.13672 v -9 -1 -2 z m 10,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"
-     id="path3412"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 30 18 L 30 24 L 32 24 L 32 22 L 49 22 L 49 31 L 41 31 L 41 33 L 51 33 L 51 18 L 30 18 z "
+     class="ColorScheme-Highlight"
+     />
   <path
-     inkscape:connector-curvature="0"
-     style="color:#da4453;fill:currentColor;fill-opacity:1;stroke:none"
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.970703 29.939453 L 17.455078 31.455078 L 22 36 L 17.455078 40.544922 L 18.970703 42.060547 L 23.515625 37.515625 L 28.060547 42.060547 L 29.576172 40.544922 L 25.029297 36 L 29.576172 31.455078 L 28.060547 29.939453 L 23.515625 34.484375 L 18.970703 29.939453 z "
      class="ColorScheme-NegativeText"
-     d="m 16.705079,32 -0.70703,0.70703 5.29492,5.29492 -5.29102,5.29102 c 0,0 0.71604,0.70203 0.70704,0.70703 L 21.999999,38.70898 27.291019,44 c -0.009,-0.005 0.70703,-0.70703 0.70703,-0.70703 l -5.29102,-5.29102 5.29492,-5.29492 L 27.294919,32 l -5.29492,5.29492 z"
-     id="path3454" />
+     />
 </svg>
diff --git a/icons/applets/64/osd-shutd-screen.svg b/icons/applets/64/osd-shutd-screen.svg
--- a/icons/applets/64/osd-shutd-screen.svg
+++ b/icons/applets/64/osd-shutd-screen.svg
@@ -1,49 +1,4 @@
-<?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"
-   viewBox="0 0 64 64"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="osd-shutd-screen.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata14">
-    <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>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="960"
-     inkscape:window-height="964"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="960"
-     inkscape:window-y="34"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs
      id="defs3051">
     <style
@@ -61,17 +16,18 @@
       </style>
   </defs>
   <path
-     style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.63827002"
-     d="M 25 10 L 25 12 L 27 12 L 27 25 L 28 25 L 28 12 L 59 12 L 59 30 L 44 30 L 43 30 L 41 30 L 41 31 L 41 32 L 43 32 L 43 37 L 41 38.841797 L 41 40.203125 L 43 38.361328 L 43 43 L 44 43 L 44 38.363281 L 49.033203 43 L 50.509766 43 L 44 37.003906 L 44 32 L 46 32 L 46 31 L 60 31 L 60 12 L 62 12 L 62 10 L 25 10 z M 5.8164062 26 C 4.8104562 26 4 26.810456 4 27.816406 L 4 49 L 2 49 L 2 52 C 2 53.108 2.892 54 4 54 L 40 54 C 41.108 54 42 53.108 42 52 L 42 49 L 40 49 L 40 27.816406 C 40 26.810456 39.189544 26 38.183594 26 L 5.8164062 26 z M 5.8164062 27 L 21.5 27 C 21.223 27 21 27.223 21 27.5 C 21 27.777 21.223 28 21.5 28 L 6 28 L 6 48 L 38 48 L 38 28 L 22.5 28 C 22.777 28 23 27.777 23 27.5 C 23 27.223 22.777 27 22.5 27 L 38.183594 27 C 38.652434 27 39 27.347566 39 27.816406 L 39 49 L 25 49 L 19 49 L 5 49 L 5 27.816406 C 5 27.347566 5.3475663 27 5.8164062 27 z M 7 29 L 37 29 L 37 47 L 7 47 L 7 29 z M 3 50 L 4 50 L 5 50 L 18 50 C 18 50.554 18.446 51 19 51 L 25 51 C 25.554 51 26 50.554 26 50 L 39 50 L 40 50 L 41 50 L 41 52 C 41 52.5713 40.5713 53 40 53 L 4 53 C 3.4287 53 3 52.5713 3 52 L 3 50 z "
-     id="path3091" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 21 9 L 21 15 L 24 15 L 24 24 L 8.5722656 24 L 6 24 L 6 50 L 4 50 L 4 52 C 4 53.18714 4.8128598 54 6 54 L 41 54 C 42.18714 54 43 53.18714 43 52 L 43 50 L 41 50 L 41 37 C 46.089274 37 52.642869 36.999957 58 37 L 58 15 L 60 15 L 60 9 L 57.857422 9 L 23.572266 9 L 21 9 z M 23 11 L 58 11 L 58 13 L 56 13 L 26 13 L 23 13 L 23 11 z M 26 15 L 56 15 L 56 35 L 41 35 L 41 24 L 39 24 L 26 24 L 26 15 z M 8 26 L 24 26 L 26 26 L 39 26 L 39 48 L 8 48 L 8 26 z "
+     class="ColorScheme-Text"
+     />
   <path
-     id="path3097"
-     d="m 14,31.99991 v 2 1 9 h 16 v -9 -1 -2 z m 10,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m -13,2 h 14 v 8 H 15 Z"
-     style="fill:#3daee9;fill-opacity:1;stroke:none"
-     inkscape:connector-curvature="0" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 12 30 L 12 45 L 34 45 L 34 30 L 12 30 z M 14 34 L 32 34 L 32 43 L 14 43 L 14 34 z "
+     class="ColorScheme-Highlight"
+     />
   <path
-     inkscape:connector-curvature="0"
-     style="color:#da4453;fill:currentColor;fill-opacity:1;stroke:none"
-     d="m 38.29102,15 -0.70704,0.70703 5.29493,5.29492 -4.07422,4.07422 c 0.3567,0.082 0.6863,0.23102 0.97851,0.43555 L 43.58594,21.70898 48.87695,27 c -0.009,-0.005 0.70703,-0.70703 0.70703,-0.70703 L 44.29297,21.00195 49.58789,15.70703 48.88086,15 43.58594,20.29492 Z"
-     id="path3380" />
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 43.939453 15.939453 L 42.423828 17.455078 L 46.970703 22 L 42.423828 26.544922 L 43.939453 28.060547 L 48.484375 23.515625 L 53.029297 28.060547 L 54.544922 26.544922 L 50 22 L 54.544922 17.455078 L 53.029297 15.939453 L 48.484375 20.484375 L 43.939453 15.939453 z "
+     class="ColorScheme-NegativeText"
+     />
 </svg>