diff --git a/scripts/render-assets.sh b/scripts/render-assets.sh
new file mode 100755
index 0000000..4b2f513
--- /dev/null
+++ b/scripts/render-assets.sh
@@ -0,0 +1,34 @@
+#! /bin/bash
+
+INKSCAPE="/usr/bin/inkscape"
+OPTIPNG="/usr/bin/optipng"
+
+SRC_FILE="../src/assets/all-assets.svg"
+ASSETS_DIR="../src/assets"
+INDEX="../src/assets/all-assets.txt"
+
+for i in `cat $INDEX`
+do 
+if [ -f $ASSETS_DIR/$i.png ]; then
+    echo $ASSETS_DIR/$i.png exists.
+else
+    echo
+    echo Rendering $ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\
+    # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png 
+fi
+if [ -f $ASSETS_DIR/$i@2.png ]; then
+    echo $ASSETS_DIR/$i@2.png exists.
+else
+    echo
+    echo Rendering $ASSETS_DIR/$i@2.png
+    $INKSCAPE --export-id=$i \
+              --export-dpi=180 \
+              --export-id-only \
+              --export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null #\
+    # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png 
+fi
+done
+exit 0
diff --git a/src/assets/all-assets.svg b/src/assets/all-assets.svg
index 9810f3b..6b2b9d7 100644
--- a/src/assets/all-assets.svg
+++ b/src/assets/all-assets.svg
@@ -1981,16 +1981,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.82442525"
-     inkscape:cx="8.5411068"
-     inkscape:cy="116.23605"
+     inkscape:zoom="6.595402"
+     inkscape:cx="23.649497"
+     inkscape:cy="148.54955"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="969"
-     inkscape:window-x="2560"
-     inkscape:window-y="29"
+     inkscape:window-width="1440"
+     inkscape:window-height="852"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -2061,7 +2061,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -2104,8 +2104,9 @@
        id="g4227"
        transform="matrix(1.25,0,0,-1.25,0,463.79076)" />
     <g
-       id="g5656"
-       transform="matrix(0.8,0,0,0.8,6,59.329592)">
+       id="checkbox-unchecked"
+       transform="matrix(0.8,0,0,0.8,6,59.329592)"
+       inkscape:label="#g5656">
       <g
          transform="matrix(1.25,0,0,-1.25,0,463.79076)"
          id="g4179">
@@ -2191,8 +2192,9 @@
        id="g4295"
        transform="matrix(1.25,0,0,-1.25,0,463.79076)" />
     <g
-       id="g5670"
-       transform="matrix(0.8,0,0,0.8,4,59.329597)">
+       id="checkbox-mixed"
+       transform="matrix(0.8,0,0,0.8,4,59.329597)"
+       inkscape:label="#g5670">
       <g
          transform="matrix(1.25,0,0,-1.25,0,463.79076)"
          id="g4247">
@@ -2274,8 +2276,9 @@
        id="g4361"
        transform="matrix(1.25,0,0,-1.25,0,463.79076)" />
     <g
-       id="g5683"
-       transform="matrix(0.8,0,0,0.8,2,59.329592)">
+       id="checkbox-checked"
+       transform="matrix(0.8,0,0,0.8,2,59.329592)"
+       inkscape:label="#g5683">
       <g
          transform="matrix(1.25,0,0,-1.25,0,463.79076)"
          id="g4313">
@@ -2328,8 +2331,9 @@
       </g>
     </g>
     <g
-       id="g5630"
-       transform="matrix(0.8,0,0,0.8,6,59.329592)">
+       id="checkbox-unchecked-insensitive"
+       transform="matrix(0.8,0,0,0.8,6,59.329592)"
+       inkscape:label="#g5630">
       <g
          transform="matrix(1.25,0,0,-1.25,0,463.79076)"
          id="g4379">
@@ -2349,8 +2353,9 @@
       </g>
     </g>
     <g
-       id="g5636"
-       transform="matrix(0.8,0,0,0.8,4,59.329597)">
+       id="checkbox-mixed-insensitive"
+       transform="matrix(0.8,0,0,0.8,4,59.329597)"
+       inkscape:label="#g5636">
       <g
          transform="matrix(1.25,0,0,-1.25,0,463.79076)"
          id="g4395">
@@ -2387,8 +2392,9 @@
       </g>
     </g>
     <g
-       id="g5646"
-       transform="matrix(0.8,0,0,0.8,2,59.329592)">
+       id="checkbox-checked-insensitive"
+       transform="matrix(0.8,0,0,0.8,2,59.329592)"
+       inkscape:label="#g5646">
       <g
          transform="matrix(1.25,0,0,-1.25,0,463.79076)"
          id="g4427">
@@ -2457,8 +2463,9 @@
        id="g4698"
        transform="matrix(1.25,0,0,-1.25,230.00003,926.64794)" />
     <g
-       id="g5902"
-       transform="matrix(0.8,0,0,0.8,-178.00002,-422.95615)">
+       id="grid-selection-unchecked"
+       transform="matrix(0.8,0,0,0.8,-178.00002,-422.95615)"
+       inkscape:label="#g5902">
       <g
          transform="matrix(1.25,0,0,-1.25,230.00003,926.64794)"
          id="g4650">
@@ -2544,8 +2551,9 @@
        id="g4766"
        transform="matrix(1.25,0,0,-1.25,230.00003,926.64794)" />
     <g
-       id="g5916"
-       transform="matrix(0.8,0,0,0.8,-184.00002,-422.95615)">
+       id="grid-selection-checked"
+       transform="matrix(0.8,0,0,0.8,-184.00002,-422.95615)"
+       inkscape:label="#g5916">
       <g
          transform="matrix(1.25,0,0,-1.25,230.00003,926.64794)"
          id="g4718">
@@ -2630,8 +2638,9 @@
        id="g4950"
        transform="matrix(1.25,0,0,-1.25,0,583.79078)" />
     <g
-       id="g5603"
-       transform="matrix(0.8,0,0,0.8,6,23.329581)">
+       id="checkbox-unchecked-dark"
+       transform="matrix(0.8,0,0,0.8,6,23.329581)"
+       inkscape:label="#g5603">
       <g
          transform="matrix(1.25,0,0,-1.25,0,583.79078)"
          id="g4902">
@@ -2717,8 +2726,9 @@
        id="g5018"
        transform="matrix(1.25,0,0,-1.25,0,583.79078)" />
     <g
-       id="g5617"
-       transform="matrix(0.8,0,0,0.8,4,23.329581)">
+       id="checkbox-mixed-dark"
+       transform="matrix(0.8,0,0,0.8,4,23.329581)"
+       inkscape:label="#g5617">
       <g
          transform="matrix(1.25,0,0,-1.25,0,583.79078)"
          id="g4970">
@@ -2770,45 +2780,12 @@
         </g>
       </g>
     </g>
-    <g
-       id="g5036"
-       transform="matrix(1,0,0,-1,2,490.3622)">
-      <g
-         id="g5038"
-         clip-path="url(#clipPath5040)">
-        <g
-           id="g5044"
-           clip-path="url(#clipPath5046)">
-          <path
-             d="m 83,69 26,0 0,-26 -26,0 0,26 z"
-             style="fill:#f1544d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path5050"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
     <g
        id="g5052"
        transform="matrix(1.25,0,0,-1.25,0,583.79078)" />
     <g
        id="g5054"
        transform="matrix(1.25,0,0,-1.25,0,583.79078)" />
-    <g
-       id="g5056"
-       transform="matrix(1,0,0,-1,2,490.3622)">
-      <g
-         id="g5058"
-         transform="matrix(16,0,0,16,88,48)">
-        <image
-           width="1"
-           height="1"
-           preserveAspectRatio="none"
-           transform="matrix(1,0,0,-1,0,1)"
-           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFUOI1jZGBg+M9AAWCiRPOoAaMGjBowmAwAAE1AAR+AZEpMAAAAAElFTkSuQmCC"
-           mask="url(#mask5060)"
-           id="image5064" />
-      </g>
-    </g>
     <g
        id="g5066"
        transform="matrix(1.25,0,0,-1.25,0,583.79078)" />
@@ -2833,25 +2810,64 @@
        id="g5084"
        transform="matrix(1.25,0,0,-1.25,0,583.79078)" />
     <g
-       id="g5086"
-       transform="matrix(1,0,0,-1,1.670925,490.3622)">
+       id="checkbox-checked-dark"
+       inkscape:label="#g5096">
       <g
-         id="g5088"
-         clip-path="url(#clipPath5090)">
+         transform="matrix(1,0,0,-1,2,490.3622)"
+         id="g5036">
         <g
-           id="g5094"
-           clip-path="url(#clipPath5096)">
-          <path
-             d="m 86,65 20.6581,0 0,-17.83035 -20.6581,0 L 86,65 Z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path5100"
-             inkscape:connector-curvature="0" />
+           clip-path="url(#clipPath5040)"
+           id="g5038">
+          <g
+             clip-path="url(#clipPath5046)"
+             id="g5044">
+            <path
+               inkscape:connector-curvature="0"
+               id="path5050"
+               style="fill:#f1544d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 83,69 26,0 0,-26 -26,0 0,26 z" />
+          </g>
+        </g>
+      </g>
+      <g
+         inkscape:label="#g5056"
+         transform="matrix(1,0,0,-1,2,490.3622)"
+         id="5056">
+        <g
+           transform="matrix(16,0,0,16,88,48)"
+           id="g5058">
+          <image
+             id="image5064"
+             mask="url(#mask5060)"
+             xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAB1JREFUOI1jZGBg+M9AAWCiRPOoAaMGjBowmAwAAE1AAR+AZEpMAAAAAElFTkSuQmCC"
+             transform="matrix(1,0,0,-1,0,1)"
+             preserveAspectRatio="none"
+             height="1"
+             width="1" />
+        </g>
+      </g>
+      <g
+         transform="matrix(1,0,0,-1,1.670925,490.3622)"
+         id="g5086">
+        <g
+           clip-path="url(#clipPath5090)"
+           id="g5088">
+          <g
+             clip-path="url(#clipPath5096)"
+             id="g5094">
+            <path
+               inkscape:connector-curvature="0"
+               id="path5100"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 86,65 20.6581,0 0,-17.83035 -20.6581,0 L 86,65 Z" />
+          </g>
         </g>
       </g>
     </g>
     <g
-       id="g5696"
-       transform="matrix(0.8,0,0,0.8,6,23.329581)">
+       id="checkbox-unchecked-insensitive-dark"
+       transform="matrix(0.8,0,0,0.8,6,23.329581)"
+       inkscape:label="#g5696">
       <g
          transform="matrix(1.25,0,0,-1.25,0,583.79078)"
          id="g5102">
@@ -2871,8 +2887,9 @@
       </g>
     </g>
     <g
-       id="g5702"
-       transform="matrix(0.8,0,0,0.8,4,23.329581)">
+       id="checkbox-mixed-insensitive-dark"
+       transform="matrix(0.8,0,0,0.8,4,23.329581)"
+       inkscape:label="#g5702">
       <g
          transform="matrix(1.25,0,0,-1.25,0,583.79078)"
          id="g5118">
@@ -2909,8 +2926,9 @@
       </g>
     </g>
     <g
-       id="g5712"
-       transform="matrix(0.8,0,0,0.8,2,23.329581)">
+       id="checkbox-checked-insensitive-dark"
+       transform="matrix(0.8,0,0,0.8,2,23.329581)"
+       inkscape:label="#g5712">
       <g
          transform="matrix(1.25,0,0,-1.25,0,583.79078)"
          id="g5150">
@@ -2979,8 +2997,9 @@
        id="g5421"
        transform="matrix(1.25,0,0,-1.25,230,1052.3622)" />
     <g
-       id="g5929"
-       transform="matrix(0.8,0,0,0.8,-178,-463.52756)">
+       id="grid-selection-unchecked-dark"
+       transform="matrix(0.8,0,0,0.8,-178,-463.52756)"
+       inkscape:label="#g5929">
       <g
          transform="matrix(1.25,0,0,-1.25,230,1052.3622)"
          id="g5373">
@@ -3066,8 +3085,9 @@
        id="g5489"
        transform="matrix(1.25,0,0,-1.25,230,1052.3622)" />
     <g
-       id="g6494"
-       transform="translate(-252.5,-667.5)">
+       id="grid-selection-checked-dark"
+       transform="translate(-252.5,-667.5)"
+       inkscape:label="#g6494">
       <g
          transform="matrix(1,0,0,-1,252.5,1045.8622)"
          id="g5441">
@@ -3123,8 +3143,9 @@
        id="g5611"
        transform="matrix(1.25,0,0,-1.25,0,794.14796)" />
     <g
-       id="g5772"
-       transform="matrix(0.8,0,0,0.8,6,-18.956163)">
+       id="menuitem-checkbox-mixed"
+       transform="matrix(0.8,0,0,0.8,6,-18.956163)"
+       inkscape:label="#g5772">
       <g
          transform="matrix(1.25,0,0,-1.25,0,794.14796)"
          id="g5625">
@@ -3161,8 +3182,9 @@
       </g>
     </g>
     <g
-       id="g5762"
-       transform="matrix(0.8,0,0,0.8,4,-18.956163)">
+       id="menuitem-checkbox-mixed-insensitive"
+       transform="matrix(0.8,0,0,0.8,4,-18.956163)"
+       inkscape:label="#g5762">
       <g
          transform="matrix(1.25,0,0,-1.25,0,794.14796)"
          id="g5657">
@@ -3202,8 +3224,9 @@
       </g>
     </g>
     <g
-       id="g5752"
-       transform="matrix(0.8,0,0,0.8,3,-18.956163)">
+       id="menuitem-checkbox-mixed-hover"
+       transform="matrix(0.8,0,0,0.8,3,-18.956163)"
+       inkscape:label="#g5752">
       <g
          transform="matrix(1.25,0,0,-1.25,0,794.14796)"
          id="g5689">
@@ -3243,8 +3266,9 @@
       </g>
     </g>
     <g
-       id="g5722"
-       transform="matrix(0.8,0,0,0.8,6,-18.956163)">
+       id="menuitem-checkbox-checked"
+       transform="matrix(0.8,0,0,0.8,6,-18.956163)"
+       inkscape:label="#g5722">
       <g
          transform="matrix(1.25,0,0,-1.25,0,794.14796)"
          id="g5721">
@@ -3284,8 +3308,9 @@
       </g>
     </g>
     <g
-       id="g5732"
-       transform="matrix(0.8,0,0,0.8,4,-18.956163)">
+       id="menuitem-checkbox-checked-insensitive"
+       transform="matrix(0.8,0,0,0.8,4,-18.956163)"
+       inkscape:label="#g5732">
       <g
          transform="matrix(1.25,0,0,-1.25,0,794.14796)"
          id="g5753">
@@ -3325,8 +3350,9 @@
       </g>
     </g>
     <g
-       id="g5742"
-       transform="matrix(0.8,0,0,0.8,3,-18.956163)">
+       id="menuitem-checkbox-checked-hover"
+       transform="matrix(0.8,0,0,0.8,3,-18.956163)"
+       inkscape:label="#g5742">
       <g
          transform="matrix(1.25,0,0,-1.25,0,794.14796)"
          id="g5785">
@@ -3366,8 +3392,9 @@
       </g>
     </g>
     <g
-       id="g6472"
-       transform="matrix(0.8,0,0,0.8,5.8463904,-18.970443)">
+       id="menuitem-radio-checked"
+       transform="matrix(0.8,0,0,0.8,5.8463904,-18.970443)"
+       inkscape:label="#g6472">
       <path
          inkscape:connector-curvature="0"
          id="rect6429-7-9"
@@ -3393,8 +3420,9 @@
       </g>
     </g>
     <g
-       id="g6479"
-       transform="matrix(0.8,0,0,0.8,2.3340224,-17.961035)">
+       id="menuitem-radio-checked-insensitive"
+       transform="matrix(0.8,0,0,0.8,2.3340224,-17.961035)"
+       inkscape:label="#g6479">
       <path
          inkscape:connector-curvature="0"
          id="rect6429-7"
@@ -3424,28 +3452,32 @@
     <g
        id="g6486"
        transform="matrix(0.8,0,0,0.8,2.44964,-18.303531)">
-      <path
-         inkscape:connector-curvature="0"
-         id="rect6429"
-         d="m 109.43795,725.83217 c 6.66666,0 13.33334,0 20,0 0,-6.66667 0,-13.33334 0,-20 -6.66666,0 -13.33334,0 -20,0 0,6.66666 0,13.33333 0,20 z"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1.65014911;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <g
-         style="fill:#8b8b8b;fill-opacity:1"
-         transform="matrix(1.25,0,0,-1.25,0.68795,793.33217)"
-         id="g5849">
+         id="menuitem-radio-checked-hover"
+         inkscape:label="#g5121">
+        <path
+           style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1.65014911;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 109.43795,725.83217 c 6.66666,0 13.33334,0 20,0 0,-6.66667 0,-13.33334 0,-20 -6.66666,0 -13.33334,0 -20,0 0,6.66666 0,13.33333 0,20 z"
+           id="rect6429"
+           inkscape:connector-curvature="0" />
         <g
-           style="fill:#8b8b8b;fill-opacity:1"
-           clip-path="url(#clipPath5853)"
-           id="g5851">
+           id="g5849"
+           transform="matrix(1.25,0,0,-1.25,0.68795,793.33217)"
+           style="fill:#ffffff;fill-opacity:1">
           <g
-             style="fill:#8b8b8b;fill-opacity:1"
-             clip-path="url(#clipPath5859)"
-             id="g5857">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5863"
-               style="fill:#8b8b8b;fill-opacity:1;fill-rule:nonzero;stroke:none"
-               d="m 87,70 16,0 0,-16 -16,0 0,16 z" />
+             id="g5851"
+             clip-path="url(#clipPath5853)"
+             style="fill:#ffffff;fill-opacity:1">
+            <g
+               id="g5857"
+               clip-path="url(#clipPath5859)"
+               style="fill:#ffffff;fill-opacity:1">
+              <path
+                 d="m 87,70 16,0 0,-16 -16,0 0,16 z"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path5863"
+                 inkscape:connector-curvature="0" />
+            </g>
           </g>
         </g>
       </g>
@@ -3465,8 +3497,9 @@
       </g>
     </g>
     <g
-       id="g5782"
-       transform="matrix(0.8,0,0,0.8,6,-64.098995)">
+       id="radio-unchecked"
+       transform="matrix(0.8,0,0,0.8,6,-64.098995)"
+       inkscape:label="#g5782">
       <g
          transform="matrix(1.25,0,0,-1.25,0,918.0765)"
          id="g6038"
@@ -3527,8 +3560,9 @@
       </g>
     </g>
     <g
-       id="g5794"
-       transform="matrix(0.8,0,0,0.8,4,-64.098995)">
+       id="radio-mixed"
+       transform="matrix(0.8,0,0,0.8,4,-64.098995)"
+       inkscape:label="#g5794">
       <g
          transform="matrix(1.25,0,0,-1.25,0,918.0765)"
          id="g6106"
@@ -3586,8 +3620,9 @@
       </g>
     </g>
     <g
-       id="g5804"
-       transform="matrix(0.8,0,0,0.8,2,-64.098995)">
+       id="radio-checked"
+       transform="matrix(0.8,0,0,0.8,2,-64.098995)"
+       inkscape:label="#g5804">
       <g
          transform="matrix(1.25,0,0,-1.25,0,918.0765)"
          id="g6172"
@@ -3630,8 +3665,9 @@
       </g>
     </g>
     <g
-       id="g5814"
-       transform="matrix(0.8,0,0,0.8,6,-64.098995)">
+       id="radio-unchecked-insensitive"
+       transform="matrix(0.8,0,0,0.8,6,-64.098995)"
+       inkscape:label="#g5814">
       <g
          transform="matrix(1.25,0,0,-1.25,0,918.0765)"
          id="g6238"
@@ -3648,8 +3684,9 @@
       </g>
     </g>
     <g
-       id="g5820"
-       transform="matrix(0.8,0,0,0.8,4,-64.098995)">
+       id="radio-mixed-insensitive"
+       transform="matrix(0.8,0,0,0.8,4,-64.098995)"
+       inkscape:label="#g5820">
       <g
          transform="matrix(1.25,0,0,-1.25,0,918.0765)"
          id="g6254"
@@ -3680,8 +3717,9 @@
       </g>
     </g>
     <g
-       id="g5828"
-       transform="matrix(0.8,0,0,0.8,2,-64.098995)">
+       id="radio-checked-insensitive"
+       transform="matrix(0.8,0,0,0.8,2,-64.098995)"
+       inkscape:label="#g5828">
       <g
          transform="matrix(1.25,0,0,-1.25,0,918.0765)"
          id="g6286"
@@ -3744,8 +3782,9 @@
        id="g6555"
        transform="matrix(1.25,0,0,-1.25,0,1052.3622)" />
     <g
-       id="g5836"
-       transform="matrix(0.8,0,0,0.8,6,-111.52756)">
+       id="radio-unchecked-dark"
+       transform="matrix(0.8,0,0,0.8,6,-111.52756)"
+       inkscape:label="#g5836">
       <g
          transform="matrix(1.25,0,0,-1.25,0,1052.3622)"
          id="g6507">
@@ -3831,8 +3870,9 @@
        id="g6623"
        transform="matrix(1.25,0,0,-1.25,0,1052.3622)" />
     <g
-       id="g5850"
-       transform="matrix(0.8,0,0,0.8,4,-111.52756)">
+       id="radio-mixed-dark"
+       transform="matrix(0.8,0,0,0.8,4,-111.52756)"
+       inkscape:label="#g5850">
       <g
          transform="matrix(1.25,0,0,-1.25,0,1052.3622)"
          id="g6575">
@@ -3914,8 +3954,9 @@
        id="g6689"
        transform="matrix(1.25,0,0,-1.25,0,1052.3622)" />
     <g
-       id="g5863"
-       transform="matrix(0.8,0,0,0.8,2,-111.52756)">
+       id="radio-checked-dark"
+       transform="matrix(0.8,0,0,0.8,2,-111.52756)"
+       inkscape:label="#g5863">
       <g
          transform="matrix(1.25,0,0,-1.25,0,1052.3622)"
          id="g6641">
@@ -3968,8 +4009,9 @@
       </g>
     </g>
     <g
-       id="g5876"
-       transform="matrix(0.8,0,0,0.8,6,-111.52756)">
+       id="radio-unchecked-insensitive-dark"
+       transform="matrix(0.8,0,0,0.8,6,-111.52756)"
+       inkscape:label="#g5876">
       <g
          transform="matrix(1.25,0,0,-1.25,0,1052.3622)"
          id="g6707">
@@ -3989,8 +4031,9 @@
       </g>
     </g>
     <g
-       id="g5882"
-       transform="matrix(0.8,0,0,0.8,4,-111.52756)">
+       id="radio-mixed-insensitive-dark"
+       transform="matrix(0.8,0,0,0.8,4,-111.52756)"
+       inkscape:label="#g5882">
       <g
          transform="matrix(1.25,0,0,-1.25,0,1052.3622)"
          id="g6723">
@@ -4027,8 +4070,9 @@
       </g>
     </g>
     <g
-       id="g5892"
-       transform="matrix(0.8,0,0,0.8,2,-111.52756)">
+       id="radio-checked-insensitive-dark"
+       transform="matrix(0.8,0,0,0.8,2,-111.52756)"
+       inkscape:label="#g5892">
       <g
          transform="matrix(1.25,0,0,-1.25,0,1052.3622)"
          id="g6755">
@@ -4065,9 +4109,10 @@
       </g>
     </g>
     <g
-       id="g5066-3"
+       id="pane-handle"
        transform="translate(30,-549.99986)"
-       style="color:#000000">
+       style="color:#000000"
+       inkscape:label="#g5066-3">
       <rect
          id="rect5068"
          transform="matrix(0,1,-1,0,0,0)"
diff --git a/src/assets/all-assets.txt b/src/assets/all-assets.txt
new file mode 100644
index 0000000..6e738e3
--- /dev/null
+++ b/src/assets/all-assets.txt
@@ -0,0 +1,38 @@
+checkbox-checked-dark
+checkbox-checked-insensitive-dark
+checkbox-checked-insensitive
+checkbox-checked
+checkbox-mixed-dark
+checkbox-mixed-insensitive-dark
+checkbox-mixed-insensitive
+checkbox-mixed
+checkbox-unchecked-dark
+checkbox-unchecked-insensitive-dark
+checkbox-unchecked-insensitive
+checkbox-unchecked
+grid-selection-checked-dark
+grid-selection-checked
+grid-selection-unchecked-dark
+grid-selection-unchecked
+menuitem-checkbox-checked-hover
+menuitem-checkbox-checked-insensitive
+menuitem-checkbox-checked
+menuitem-checkbox-mixed-hover
+menuitem-checkbox-mixed-insensitive
+menuitem-checkbox-mixed
+menuitem-radio-checked-hover
+menuitem-radio-checked-insensitive
+menuitem-radio-checked
+pane-handle
+radio-checked-dark
+radio-checked-insensitive-dark
+radio-checked-insensitive
+radio-checked
+radio-mixed-dark
+radio-mixed-insensitive-dark
+radio-mixed-insensitive
+radio-mixed
+radio-unchecked-dark
+radio-unchecked-insensitive-dark
+radio-unchecked-insensitive
+radio-unchecked
diff --git a/src/assets/checkbox-checked-dark.png b/src/assets/checkbox-checked-dark.png
index 8d3df52..9729a49 100644
Binary files a/src/assets/checkbox-checked-dark.png and b/src/assets/checkbox-checked-dark.png differ
diff --git a/src/assets/checkbox-checked-dark@2.png b/src/assets/checkbox-checked-dark@2.png
new file mode 100644
index 0000000..d252e4c
Binary files /dev/null and b/src/assets/checkbox-checked-dark@2.png differ
diff --git a/src/assets/checkbox-checked-insensitive-dark.png b/src/assets/checkbox-checked-insensitive-dark.png
index bd03ec9..d7b14aa 100644
Binary files a/src/assets/checkbox-checked-insensitive-dark.png and b/src/assets/checkbox-checked-insensitive-dark.png differ
diff --git a/src/assets/checkbox-checked-insensitive-dark@2.png b/src/assets/checkbox-checked-insensitive-dark@2.png
new file mode 100644
index 0000000..c5f162b
Binary files /dev/null and b/src/assets/checkbox-checked-insensitive-dark@2.png differ
diff --git a/src/assets/checkbox-checked-insensitive.png b/src/assets/checkbox-checked-insensitive.png
index e73b148..6203911 100644
Binary files a/src/assets/checkbox-checked-insensitive.png and b/src/assets/checkbox-checked-insensitive.png differ
diff --git a/src/assets/checkbox-checked-insensitive@2.png b/src/assets/checkbox-checked-insensitive@2.png
new file mode 100644
index 0000000..8715a3e
Binary files /dev/null and b/src/assets/checkbox-checked-insensitive@2.png differ
diff --git a/src/assets/checkbox-checked.png b/src/assets/checkbox-checked.png
index 8d3df52..4779ff0 100644
Binary files a/src/assets/checkbox-checked.png and b/src/assets/checkbox-checked.png differ
diff --git a/src/assets/checkbox-checked@2.png b/src/assets/checkbox-checked@2.png
new file mode 100644
index 0000000..3d50662
Binary files /dev/null and b/src/assets/checkbox-checked@2.png differ
diff --git a/src/assets/checkbox-mixed-dark.png b/src/assets/checkbox-mixed-dark.png
index 080fdfa..72b0761 100644
Binary files a/src/assets/checkbox-mixed-dark.png and b/src/assets/checkbox-mixed-dark.png differ
diff --git a/src/assets/checkbox-mixed-dark@2.png b/src/assets/checkbox-mixed-dark@2.png
new file mode 100644
index 0000000..2b25729
Binary files /dev/null and b/src/assets/checkbox-mixed-dark@2.png differ
diff --git a/src/assets/checkbox-mixed-insensitive-dark.png b/src/assets/checkbox-mixed-insensitive-dark.png
index 3646c7d..fc00b44 100644
Binary files a/src/assets/checkbox-mixed-insensitive-dark.png and b/src/assets/checkbox-mixed-insensitive-dark.png differ
diff --git a/src/assets/checkbox-mixed-insensitive-dark@2.png b/src/assets/checkbox-mixed-insensitive-dark@2.png
new file mode 100644
index 0000000..db0cb49
Binary files /dev/null and b/src/assets/checkbox-mixed-insensitive-dark@2.png differ
diff --git a/src/assets/checkbox-mixed-insensitive.png b/src/assets/checkbox-mixed-insensitive.png
index f6ef803..a580627 100644
Binary files a/src/assets/checkbox-mixed-insensitive.png and b/src/assets/checkbox-mixed-insensitive.png differ
diff --git a/src/assets/checkbox-mixed-insensitive@2.png b/src/assets/checkbox-mixed-insensitive@2.png
new file mode 100644
index 0000000..2d0dc67
Binary files /dev/null and b/src/assets/checkbox-mixed-insensitive@2.png differ
diff --git a/src/assets/checkbox-mixed.png b/src/assets/checkbox-mixed.png
index 080fdfa..72b0761 100644
Binary files a/src/assets/checkbox-mixed.png and b/src/assets/checkbox-mixed.png differ
diff --git a/src/assets/checkbox-mixed@2.png b/src/assets/checkbox-mixed@2.png
new file mode 100644
index 0000000..2b25729
Binary files /dev/null and b/src/assets/checkbox-mixed@2.png differ
diff --git a/src/assets/checkbox-unchecked-dark.png b/src/assets/checkbox-unchecked-dark.png
index 439d96e..5a6a059 100644
Binary files a/src/assets/checkbox-unchecked-dark.png and b/src/assets/checkbox-unchecked-dark.png differ
diff --git a/src/assets/checkbox-unchecked-dark@2.png b/src/assets/checkbox-unchecked-dark@2.png
new file mode 100644
index 0000000..3dfe21e
Binary files /dev/null and b/src/assets/checkbox-unchecked-dark@2.png differ
diff --git a/src/assets/checkbox-unchecked-insensitive-dark.png b/src/assets/checkbox-unchecked-insensitive-dark.png
index 123b3c1..57660fd 100644
Binary files a/src/assets/checkbox-unchecked-insensitive-dark.png and b/src/assets/checkbox-unchecked-insensitive-dark.png differ
diff --git a/src/assets/checkbox-unchecked-insensitive-dark@2.png b/src/assets/checkbox-unchecked-insensitive-dark@2.png
new file mode 100644
index 0000000..37e459c
Binary files /dev/null and b/src/assets/checkbox-unchecked-insensitive-dark@2.png differ
diff --git a/src/assets/checkbox-unchecked-insensitive.png b/src/assets/checkbox-unchecked-insensitive.png
index b3f42cf..98a75fe 100644
Binary files a/src/assets/checkbox-unchecked-insensitive.png and b/src/assets/checkbox-unchecked-insensitive.png differ
diff --git a/src/assets/checkbox-unchecked-insensitive@2.png b/src/assets/checkbox-unchecked-insensitive@2.png
new file mode 100644
index 0000000..3977da7
Binary files /dev/null and b/src/assets/checkbox-unchecked-insensitive@2.png differ
diff --git a/src/assets/checkbox-unchecked.png b/src/assets/checkbox-unchecked.png
index 6a03e25..bf4966f 100644
Binary files a/src/assets/checkbox-unchecked.png and b/src/assets/checkbox-unchecked.png differ
diff --git a/src/assets/checkbox-unchecked@2.png b/src/assets/checkbox-unchecked@2.png
new file mode 100644
index 0000000..82bdd17
Binary files /dev/null and b/src/assets/checkbox-unchecked@2.png differ
diff --git a/src/assets/grid-selection-checked-dark.png b/src/assets/grid-selection-checked-dark.png
index 036b9de..0f7d4bc 100644
Binary files a/src/assets/grid-selection-checked-dark.png and b/src/assets/grid-selection-checked-dark.png differ
diff --git a/src/assets/grid-selection-checked-dark@2.png b/src/assets/grid-selection-checked-dark@2.png
new file mode 100644
index 0000000..e093105
Binary files /dev/null and b/src/assets/grid-selection-checked-dark@2.png differ
diff --git a/src/assets/grid-selection-checked.png b/src/assets/grid-selection-checked.png
index 53ea861..0f7d4bc 100644
Binary files a/src/assets/grid-selection-checked.png and b/src/assets/grid-selection-checked.png differ
diff --git a/src/assets/grid-selection-checked@2.png b/src/assets/grid-selection-checked@2.png
new file mode 100644
index 0000000..e093105
Binary files /dev/null and b/src/assets/grid-selection-checked@2.png differ
diff --git a/src/assets/grid-selection-unchecked-dark.png b/src/assets/grid-selection-unchecked-dark.png
index b0abbfd..09561c2 100644
Binary files a/src/assets/grid-selection-unchecked-dark.png and b/src/assets/grid-selection-unchecked-dark.png differ
diff --git a/src/assets/grid-selection-unchecked-dark@2.png b/src/assets/grid-selection-unchecked-dark@2.png
new file mode 100644
index 0000000..709a058
Binary files /dev/null and b/src/assets/grid-selection-unchecked-dark@2.png differ
diff --git a/src/assets/grid-selection-unchecked.png b/src/assets/grid-selection-unchecked.png
index 675ed59..0ce5c35 100644
Binary files a/src/assets/grid-selection-unchecked.png and b/src/assets/grid-selection-unchecked.png differ
diff --git a/src/assets/grid-selection-unchecked@2.png b/src/assets/grid-selection-unchecked@2.png
new file mode 100644
index 0000000..f843151
Binary files /dev/null and b/src/assets/grid-selection-unchecked@2.png differ
diff --git a/src/assets/menuitem-checkbox-checked-hover.png b/src/assets/menuitem-checkbox-checked-hover.png
index a9a4586..39e2b46 100644
Binary files a/src/assets/menuitem-checkbox-checked-hover.png and b/src/assets/menuitem-checkbox-checked-hover.png differ
diff --git a/src/assets/menuitem-checkbox-checked-hover@2.png b/src/assets/menuitem-checkbox-checked-hover@2.png
new file mode 100644
index 0000000..f461920
Binary files /dev/null and b/src/assets/menuitem-checkbox-checked-hover@2.png differ
diff --git a/src/assets/menuitem-checkbox-checked-insensitive.png b/src/assets/menuitem-checkbox-checked-insensitive.png
index c0c78f9..71451fa 100644
Binary files a/src/assets/menuitem-checkbox-checked-insensitive.png and b/src/assets/menuitem-checkbox-checked-insensitive.png differ
diff --git a/src/assets/menuitem-checkbox-checked-insensitive@2.png b/src/assets/menuitem-checkbox-checked-insensitive@2.png
new file mode 100644
index 0000000..a664650
Binary files /dev/null and b/src/assets/menuitem-checkbox-checked-insensitive@2.png differ
diff --git a/src/assets/menuitem-checkbox-checked.png b/src/assets/menuitem-checkbox-checked.png
index 6483d99..6a63954 100644
Binary files a/src/assets/menuitem-checkbox-checked.png and b/src/assets/menuitem-checkbox-checked.png differ
diff --git a/src/assets/menuitem-checkbox-checked@2.png b/src/assets/menuitem-checkbox-checked@2.png
new file mode 100644
index 0000000..f4c7d6e
Binary files /dev/null and b/src/assets/menuitem-checkbox-checked@2.png differ
diff --git a/src/assets/menuitem-checkbox-mixed-hover.png b/src/assets/menuitem-checkbox-mixed-hover.png
index 34f1d0e..64a588e 100644
Binary files a/src/assets/menuitem-checkbox-mixed-hover.png and b/src/assets/menuitem-checkbox-mixed-hover.png differ
diff --git a/src/assets/menuitem-checkbox-mixed-hover@2.png b/src/assets/menuitem-checkbox-mixed-hover@2.png
new file mode 100644
index 0000000..e1586e9
Binary files /dev/null and b/src/assets/menuitem-checkbox-mixed-hover@2.png differ
diff --git a/src/assets/menuitem-checkbox-mixed-insensitive.png b/src/assets/menuitem-checkbox-mixed-insensitive.png
index 63d7193..0a4379a 100644
Binary files a/src/assets/menuitem-checkbox-mixed-insensitive.png and b/src/assets/menuitem-checkbox-mixed-insensitive.png differ
diff --git a/src/assets/menuitem-checkbox-mixed-insensitive@2.png b/src/assets/menuitem-checkbox-mixed-insensitive@2.png
new file mode 100644
index 0000000..ccbd812
Binary files /dev/null and b/src/assets/menuitem-checkbox-mixed-insensitive@2.png differ
diff --git a/src/assets/menuitem-checkbox-mixed.png b/src/assets/menuitem-checkbox-mixed.png
index a69e753..e981c77 100644
Binary files a/src/assets/menuitem-checkbox-mixed.png and b/src/assets/menuitem-checkbox-mixed.png differ
diff --git a/src/assets/menuitem-checkbox-mixed@2.png b/src/assets/menuitem-checkbox-mixed@2.png
new file mode 100644
index 0000000..f9c52e7
Binary files /dev/null and b/src/assets/menuitem-checkbox-mixed@2.png differ
diff --git a/src/assets/menuitem-radio-checked-hover.png b/src/assets/menuitem-radio-checked-hover.png
index 46a4578..c999625 100644
Binary files a/src/assets/menuitem-radio-checked-hover.png and b/src/assets/menuitem-radio-checked-hover.png differ
diff --git a/src/assets/menuitem-radio-checked-hover@2.png b/src/assets/menuitem-radio-checked-hover@2.png
new file mode 100644
index 0000000..6e3baba
Binary files /dev/null and b/src/assets/menuitem-radio-checked-hover@2.png differ
diff --git a/src/assets/menuitem-radio-checked-insensitive.png b/src/assets/menuitem-radio-checked-insensitive.png
index 04e72d4..a60bbbc 100644
Binary files a/src/assets/menuitem-radio-checked-insensitive.png and b/src/assets/menuitem-radio-checked-insensitive.png differ
diff --git a/src/assets/menuitem-radio-checked-insensitive@2.png b/src/assets/menuitem-radio-checked-insensitive@2.png
new file mode 100644
index 0000000..8b298c9
Binary files /dev/null and b/src/assets/menuitem-radio-checked-insensitive@2.png differ
diff --git a/src/assets/menuitem-radio-checked.png b/src/assets/menuitem-radio-checked.png
index 4affb3e..1dcd316 100644
Binary files a/src/assets/menuitem-radio-checked.png and b/src/assets/menuitem-radio-checked.png differ
diff --git a/src/assets/menuitem-radio-checked@2.png b/src/assets/menuitem-radio-checked@2.png
new file mode 100644
index 0000000..766d263
Binary files /dev/null and b/src/assets/menuitem-radio-checked@2.png differ
diff --git a/src/assets/pane-handle.png b/src/assets/pane-handle.png
index 9fb3b6a..e67a9dc 100644
Binary files a/src/assets/pane-handle.png and b/src/assets/pane-handle.png differ
diff --git a/src/assets/pane-handle@2.png b/src/assets/pane-handle@2.png
new file mode 100644
index 0000000..8a2cd07
Binary files /dev/null and b/src/assets/pane-handle@2.png differ
diff --git a/src/assets/radio-checked-dark.png b/src/assets/radio-checked-dark.png
index 36c150d..57911a5 100644
Binary files a/src/assets/radio-checked-dark.png and b/src/assets/radio-checked-dark.png differ
diff --git a/src/assets/radio-checked-dark@2.png b/src/assets/radio-checked-dark@2.png
new file mode 100644
index 0000000..fd8cf1a
Binary files /dev/null and b/src/assets/radio-checked-dark@2.png differ
diff --git a/src/assets/radio-checked-insensitive-dark.png b/src/assets/radio-checked-insensitive-dark.png
index b893739..ec46e52 100644
Binary files a/src/assets/radio-checked-insensitive-dark.png and b/src/assets/radio-checked-insensitive-dark.png differ
diff --git a/src/assets/radio-checked-insensitive-dark@2.png b/src/assets/radio-checked-insensitive-dark@2.png
new file mode 100644
index 0000000..0cc0e82
Binary files /dev/null and b/src/assets/radio-checked-insensitive-dark@2.png differ
diff --git a/src/assets/radio-checked-insensitive.png b/src/assets/radio-checked-insensitive.png
index f95b5f5..8600f8b 100644
Binary files a/src/assets/radio-checked-insensitive.png and b/src/assets/radio-checked-insensitive.png differ
diff --git a/src/assets/radio-checked-insensitive@2.png b/src/assets/radio-checked-insensitive@2.png
new file mode 100644
index 0000000..74fa1aa
Binary files /dev/null and b/src/assets/radio-checked-insensitive@2.png differ
diff --git a/src/assets/radio-checked.png b/src/assets/radio-checked.png
index 36c150d..57911a5 100644
Binary files a/src/assets/radio-checked.png and b/src/assets/radio-checked.png differ
diff --git a/src/assets/radio-checked@2.png b/src/assets/radio-checked@2.png
new file mode 100644
index 0000000..fd8cf1a
Binary files /dev/null and b/src/assets/radio-checked@2.png differ
diff --git a/src/assets/radio-mixed-dark.png b/src/assets/radio-mixed-dark.png
index 044085f..96028af 100644
Binary files a/src/assets/radio-mixed-dark.png and b/src/assets/radio-mixed-dark.png differ
diff --git a/src/assets/radio-mixed-dark@2.png b/src/assets/radio-mixed-dark@2.png
new file mode 100644
index 0000000..30fce94
Binary files /dev/null and b/src/assets/radio-mixed-dark@2.png differ
diff --git a/src/assets/radio-mixed-insensitive-dark.png b/src/assets/radio-mixed-insensitive-dark.png
index ff19d99..12a90ac 100644
Binary files a/src/assets/radio-mixed-insensitive-dark.png and b/src/assets/radio-mixed-insensitive-dark.png differ
diff --git a/src/assets/radio-mixed-insensitive-dark@2.png b/src/assets/radio-mixed-insensitive-dark@2.png
new file mode 100644
index 0000000..0aece34
Binary files /dev/null and b/src/assets/radio-mixed-insensitive-dark@2.png differ
diff --git a/src/assets/radio-mixed-insensitive.png b/src/assets/radio-mixed-insensitive.png
index 7ab9561..c613d2a 100644
Binary files a/src/assets/radio-mixed-insensitive.png and b/src/assets/radio-mixed-insensitive.png differ
diff --git a/src/assets/radio-mixed-insensitive@2.png b/src/assets/radio-mixed-insensitive@2.png
new file mode 100644
index 0000000..548d19c
Binary files /dev/null and b/src/assets/radio-mixed-insensitive@2.png differ
diff --git a/src/assets/radio-mixed.png b/src/assets/radio-mixed.png
index 044085f..96028af 100644
Binary files a/src/assets/radio-mixed.png and b/src/assets/radio-mixed.png differ
diff --git a/src/assets/radio-mixed@2.png b/src/assets/radio-mixed@2.png
new file mode 100644
index 0000000..30fce94
Binary files /dev/null and b/src/assets/radio-mixed@2.png differ
diff --git a/src/assets/radio-unchecked-dark.png b/src/assets/radio-unchecked-dark.png
index 84bcdbe..2cca072 100644
Binary files a/src/assets/radio-unchecked-dark.png and b/src/assets/radio-unchecked-dark.png differ
diff --git a/src/assets/radio-unchecked-dark@2.png b/src/assets/radio-unchecked-dark@2.png
new file mode 100644
index 0000000..f1ecb22
Binary files /dev/null and b/src/assets/radio-unchecked-dark@2.png differ
diff --git a/src/assets/radio-unchecked-insensitive-dark.png b/src/assets/radio-unchecked-insensitive-dark.png
index b3bcec8..533fb9d 100644
Binary files a/src/assets/radio-unchecked-insensitive-dark.png and b/src/assets/radio-unchecked-insensitive-dark.png differ
diff --git a/src/assets/radio-unchecked-insensitive-dark@2.png b/src/assets/radio-unchecked-insensitive-dark@2.png
new file mode 100644
index 0000000..460d96a
Binary files /dev/null and b/src/assets/radio-unchecked-insensitive-dark@2.png differ
diff --git a/src/assets/radio-unchecked-insensitive.png b/src/assets/radio-unchecked-insensitive.png
index 4ea0649..e48050d 100644
Binary files a/src/assets/radio-unchecked-insensitive.png and b/src/assets/radio-unchecked-insensitive.png differ
diff --git a/src/assets/radio-unchecked-insensitive@2.png b/src/assets/radio-unchecked-insensitive@2.png
new file mode 100644
index 0000000..eebaebf
Binary files /dev/null and b/src/assets/radio-unchecked-insensitive@2.png differ
diff --git a/src/assets/radio-unchecked.png b/src/assets/radio-unchecked.png
index 896e45f..f10110d 100644
Binary files a/src/assets/radio-unchecked.png and b/src/assets/radio-unchecked.png differ
diff --git a/src/assets/radio-unchecked@2.png b/src/assets/radio-unchecked@2.png
new file mode 100644
index 0000000..96250ef
Binary files /dev/null and b/src/assets/radio-unchecked@2.png differ
diff --git a/src/gtk-3.0/gtk.gresource.xml b/src/gtk-3.0/gtk.gresource.xml
index ea2a8e2..02405e8 100644
--- a/src/gtk-3.0/gtk.gresource.xml
+++ b/src/gtk-3.0/gtk.gresource.xml
@@ -2,43 +2,81 @@
 <gresources>
 	<gresource prefix='/org/numixproject/gtk'>
 		<file preprocess='to-pixdata'>assets/checkbox-checked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-checked.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-checked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-checked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-checked.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-unchecked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-unchecked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-unchecked.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-unchecked@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-hover.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-hover@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-hover.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-hover@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-radio-checked.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-radio-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/pane-handle.png</file>
+		<file preprocess='to-pixdata'>assets/pane-handle@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked@2.png</file>
 		<file>dist/gtk.css</file>
 		<file>dist/gtk-dark.css</file>
 	</gresource>
diff --git a/src/gtk-3.0/scss/apps/_mate-applications.scss b/src/gtk-3.0/scss/apps/_mate-applications.scss
index b070204..a7a3e1f 100644
--- a/src/gtk-3.0/scss/apps/_mate-applications.scss
+++ b/src/gtk-3.0/scss/apps/_mate-applications.scss
@@ -21,7 +21,8 @@
     PanelSeparator, MatePanelAppletFrameDBus {
         border-width: 0;
         color: transparent;
-        background-image: -gtk-scaled(url("../assets/pane-handle.png"));
+        background-image: -gtk-scaled(url("../assets/pane-handle.png"),
+                                      url("../assets/pane-handle@2.png"));
         background-color: transparent;
         background-repeat: no-repeat;
         background-position: left;
diff --git a/src/gtk-3.0/scss/widgets/_toggle.scss b/src/gtk-3.0/scss/widgets/_toggle.scss
index fd72ba7..f46e972 100644
--- a/src/gtk-3.0/scss/widgets/_toggle.scss
+++ b/src/gtk-3.0/scss/widgets/_toggle.scss
@@ -7,41 +7,54 @@ $suffix: if($variant == "dark", "-dark", "");
 @mixin toggle($type) {
     background-image: none;
 
-    -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.png");
+    -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-unchecked#{$suffix}.png"),
+                                  url("../assets/#{$type}-unchecked#{$suffix}@2.png"));
 
-    &:insensitive { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"); }
+    &:insensitive { -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"),
+                                                  url("../assets/#{$type}-unchecked-insensitive#{$suffix}@2.png")); }
 
     &:checked, &:active {
-        -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.png");
+        -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-checked#{$suffix}.png"),
+                                      url("../assets/#{$type}-checked#{$suffix}@2.png"));
 
-        &:insensitive { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.png"); }
+        &:insensitive { -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-checked-insensitive#{$suffix}.png"),
+                                                      url("../assets/#{$type}-checked-insensitive#{$suffix}@2.png")); }
     }
 
     &:inconsistent {
-        -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.png");
+        -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-mixed#{$suffix}.png"),
+                                      url("../assets/#{$type}-mixed#{$suffix}@2.png"));
 
-        &:insensitive { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"); }
+        &:insensitive { -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"),
+                                                      url("../assets/#{$type}-mixed-insensitive#{$suffix}@2.png")); }
     }
 
     &.menuitem {
-        -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png");
+        -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked-insensitive.png"),
+                                      url("../assets/menuitem-#{$type}-checked-insensitive@2.png"));
 
         &:insensitive { -gtk-icon-source: none; }
 
         &:checked, &:active {
-            -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.png");
+            -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked.png"),
+                                          url("../assets/menuitem-#{$type}-checked@2.png"));
 
-            &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.png"); }
+            &:hover { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked-hover.png"),
+                                                    url("../assets/menuitem-#{$type}-checked-hover@2.png")); }
 
-            &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png"); }
+            &:insensitive { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked-insensitive.png"),
+                                                          url("../assets/menuitem-#{$type}-checked-insensitive@2.png")); }
         }
 
         &:inconsistent {
-            -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.png");
+            -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-mixed.png"),
+                                          url("../assets/menuitem-#{$type}-mixed@2.png"));
 
-            &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.png"); }
+            &:hover { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-mixed-hover.png"),
+                                                    url("../assets/menuitem-#{$type}-mixed-hover@2.png")); }
 
-            &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.png"); }
+            &:insensitive { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-mixed-insensitive.png"),
+                                                          url("../assets/menuitem-#{$type}-mixed-insensitive@2.png")); }
         }
     }
 }
@@ -67,7 +80,8 @@ $suffix: if($variant == "dark", "-dark", "");
                   (':backdrop:checked', '-checked') {
         .view.content-view.check#{$s}:not(list) {
             icon-shadow: none;
-            -gtk-icon-source: url("../assets/grid-selection#{$as}#{$suffix}.png");
+            -gtk-icon-source: -gtk-scaled(url("../assets/grid-selection#{$as}#{$suffix}.png"),
+                                          url("../assets/grid-selection#{$as}#{$suffix}@2.png"));
             background-color: transparent;
         }
     }
diff --git a/src/gtk-3.20/gtk.gresource.xml b/src/gtk-3.20/gtk.gresource.xml
index ed98bcc..641f7ac 100644
--- a/src/gtk-3.20/gtk.gresource.xml
+++ b/src/gtk-3.20/gtk.gresource.xml
@@ -2,43 +2,81 @@
 <gresources>
 	<gresource prefix='/org/numixproject/gtk-3.20'>
 		<file preprocess='to-pixdata'>assets/checkbox-checked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-checked.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-mixed.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-mixed@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/checkbox-unchecked.png</file>
+		<file preprocess='to-pixdata'>assets/checkbox-unchecked@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-checked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-checked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-checked.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-unchecked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-unchecked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/grid-selection-unchecked.png</file>
+		<file preprocess='to-pixdata'>assets/grid-selection-unchecked@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-hover.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-hover@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-hover.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-hover@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/menuitem-radio-checked.png</file>
+		<file preprocess='to-pixdata'>assets/menuitem-radio-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/pane-handle.png</file>
+		<file preprocess='to-pixdata'>assets/pane-handle@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-checked.png</file>
+		<file preprocess='to-pixdata'>assets/radio-checked@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-mixed.png</file>
+		<file preprocess='to-pixdata'>assets/radio-mixed@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive-dark.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive-dark@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked-insensitive@2.png</file>
 		<file preprocess='to-pixdata'>assets/radio-unchecked.png</file>
+		<file preprocess='to-pixdata'>assets/radio-unchecked@2.png</file>
 		<file>dist/gtk.css</file>
 		<file>dist/gtk-dark.css</file>
 	</gresource>
diff --git a/src/gtk-3.20/scss/apps/_mate-applications.scss b/src/gtk-3.20/scss/apps/_mate-applications.scss
index 3970858..87e76a0 100644
--- a/src/gtk-3.20/scss/apps/_mate-applications.scss
+++ b/src/gtk-3.20/scss/apps/_mate-applications.scss
@@ -21,7 +21,8 @@
     PanelSeparator, MatePanelAppletFrameDBus {
         border-width: 0;
         color: transparent;
-        background-image: -gtk-scaled(url("../assets/pane-handle.png"));
+        background-image: -gtk-scaled(url("../assets/pane-handle.png"),
+                                      url("../assets/pane-handle@2.png"));
         background-color: transparent;
         background-repeat: no-repeat;
         background-position: left;
diff --git a/src/gtk-3.20/scss/widgets/_toggle.scss b/src/gtk-3.20/scss/widgets/_toggle.scss
index bde09d3..e779904 100644
--- a/src/gtk-3.20/scss/widgets/_toggle.scss
+++ b/src/gtk-3.20/scss/widgets/_toggle.scss
@@ -7,41 +7,54 @@ $suffix: if($variant == "dark", "-dark", "");
 @mixin toggle($type) {
     background-image: none;
 
-    -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.png");
+    -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-unchecked#{$suffix}.png"),
+                                  url("../assets/#{$type}-unchecked#{$suffix}@2.png"));
 
-    &:disabled { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"); }
+    &:disabled { -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"),
+                                               url("../assets/#{$type}-unchecked-insensitive#{$suffix}@2.png")); }
 
     &:checked, &:active {
-        -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.png");
+        -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-checked#{$suffix}.png"),
+                                      url("../assets/#{$type}-checked#{$suffix}@2.png"));
 
-        &:disabled { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.png"); }
+        &:disabled { -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-checked-insensitive#{$suffix}.png"),
+                                                   url("../assets/#{$type}-checked-insensitive#{$suffix}@2.png")); }
     }
 
     &:indeterminate {
-        -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.png");
+        -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-mixed#{$suffix}.png"),
+                                      url("../assets/#{$type}-mixed#{$suffix}@2.png"));
 
-        &:disabled { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"); }
+        &:disabled { -gtk-icon-source: -gtk-scaled(url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"),
+                                                   url("../assets/#{$type}-mixed-insensitive#{$suffix}@2.png")); }
     }
 
     menuitem &, modelbutton & {
-        -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png");
+        -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked-insensitive.png"),
+                                      url("../assets/menuitem-#{$type}-checked-insensitive@2.png"));
 
         &:disabled { -gtk-icon-source: none; }
 
         &:checked, &:active {
-            -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.png");
+            -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked.png"),
+                                          url("../assets/menuitem-#{$type}-checked@2.png"));
 
-            &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.png"); }
+            &:hover { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked-hover.png"),
+                                                    url("../assets/menuitem-#{$type}-checked-hover@2.png")); }
 
-            &:disabled { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png"); }
+            &:disabled { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-checked-insensitive.png"),
+                                                       url("../assets/menuitem-#{$type}-checked-insensitive@2.png")); }
         }
 
         &:indeterminate {
-            -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.png");
+            -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-mixed.png"),
+                                          url("../assets/menuitem-#{$type}-mixed@2.png"));
 
-            &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.png"); }
+            &:hover { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-mixed-hover.png"),
+                                                    url("../assets/menuitem-#{$type}-mixed-hover@2.png")); }
 
-            &:disabled { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.png"); }
+            &:disabled { -gtk-icon-source: -gtk-scaled(url("../assets/menuitem-#{$type}-mixed-insensitive.png"),
+                                                       url("../assets/menuitem-#{$type}-mixed-insensitive@2.png")); }
         }
     }
 }
@@ -77,7 +90,8 @@ $suffix: if($variant == "dark", "-dark", "");
                   (':backdrop:checked', '-checked') {
         .view.content-view.check#{$s}:not(list) {
             -gtk-icon-shadow: none;
-            -gtk-icon-source: url("../assets/grid-selection#{$as}#{$suffix}.png");
+            -gtk-icon-source: -gtk-scaled(url("../assets/grid-selection#{$as}#{$suffix}.png"),
+                                          url("../assets/grid-selection#{$as}#{$suffix}@2.png"));
             background-color: transparent;
         }
     }