diff --git a/src/assets/gtk/scalable/checkbox-checked-symbolic.svg b/src/assets/gtk/scalable/checkbox-checked-symbolic.svg
index b9ca53fa..7b89e885 100644
--- a/src/assets/gtk/scalable/checkbox-checked-symbolic.svg
+++ b/src/assets/gtk/scalable/checkbox-checked-symbolic.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="24"
-   height="24"
+   width="20"
+   height="20"
    version="1.1"
-   viewBox="0 0 24 24"
+   viewBox="0 0 20 20"
    id="svg4"
    sodipodi:docname="checkbox-checked-symbolic.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
@@ -21,15 +21,15 @@
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
-     showgrid="true"
+     showgrid="false"
      inkscape:snap-global="false"
-     inkscape:zoom="5.273838"
-     inkscape:cx="39.155545"
-     inkscape:cy="7.9638396"
+     inkscape:zoom="14.916666"
+     inkscape:cx="7.9776538"
+     inkscape:cy="5.1620113"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4">
     <inkscape:grid
@@ -38,6 +38,6 @@
   </sodipodi:namedview>
   <path
      id="path2"
-     d="M 12,2 C 6.48,2 2.0000002,6.4799998 1.9999998,12 2.0000001,17.52 6.4799999,22 12,22 17.52,22 22,17.52 22,12 22,6.4799998 17.52,2 12,2 Z m 6.091797,6.5468751 c 0.127806,-3.5e-6 0.255581,0.04855 0.353515,0.1464844 0.195869,0.1958684 0.195869,0.5111627 0,0.7070308 l -7.072265,7.0722657 c -0.02449,0.02449 -0.05035,0.04611 -0.07815,0.06443 -0.02772,0.01839 -0.05585,0.03268 -0.08593,0.04492 -0.03009,0.01224 -0.06226,0.02122 -0.09376,0.02734 -0.03149,0.0061 -0.06375,0.0098 -0.09571,0.0098 -0.03195,0 -0.06226,-0.0036 -0.09375,-0.0098 -0.03149,-0.0061 -0.06367,-0.0151 -0.09375,-0.02734 -0.03009,-0.01224 -0.05818,-0.02656 -0.08593,-0.04492 -0.01389,-0.0092 -0.02786,-0.02051 -0.04101,-0.03125 -0.01312,-0.01071 -0.02679,-0.02099 -0.03903,-0.03323 L 6.479377,12.283983 c -0.1958683,-0.195869 -0.1958687,-0.511162 5e-7,-0.707032 0.1958681,-0.195867 0.5111624,-0.195868 0.7070307,1e-6 l 3.8331198,3.835099 6.71875,-6.7187499 c 0.09793,-0.097934 0.225707,-0.1464831 0.353516,-0.146484 z"
-     sodipodi:nodetypes="ssssscscscscscsccccsccccc" />
+     d="m 16.091797,6.5468751 c 0.127806,-3.5e-6 0.255581,0.04855 0.353515,0.1464844 0.195869,0.1958684 0.195869,0.5111627 0,0.7070308 L 9.3730471,14.472656 c -0.02449,0.02449 -0.05035,0.04611 -0.07815,0.06443 -0.02772,0.01839 -0.05585,0.03268 -0.08593,0.04492 -0.03009,0.01224 -0.06226,0.02122 -0.09376,0.02734 -0.03149,0.0061 -0.06375,0.0098 -0.09571,0.0098 -0.03195,0 -0.06226,-0.0036 -0.09375,-0.0098 -0.03149,-0.0061 -0.06367,-0.0151 -0.09375,-0.02734 -0.03009,-0.01224 -0.05818,-0.02656 -0.08593,-0.04492 -0.01389,-0.0092 -0.02786,-0.02051 -0.04101,-0.03125 -0.01312,-0.01071 -0.02679,-0.02099 -0.03903,-0.03323 l -4.18665,-4.188623 c -0.1958683,-0.195869 -0.1958687,-0.511162 5e-7,-0.707032 0.1958681,-0.195867 0.5111624,-0.195868 0.7070307,1e-6 l 3.8331198,3.835099 6.7187499,-6.7187499 c 0.09793,-0.097934 0.225707,-0.1464831 0.353516,-0.146484 z"
+     sodipodi:nodetypes="cscscscscsccccsccccc" />
 </svg>
diff --git a/src/assets/gtk/scalable/checkbox-checked-symbolic@2.svg b/src/assets/gtk/scalable/checkbox-checked-symbolic@2.svg
new file mode 100644
index 00000000..17e3c4af
--- /dev/null
+++ b/src/assets/gtk/scalable/checkbox-checked-symbolic@2.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="40"
+   height="40"
+   version="1.1"
+   viewBox="0 0 40 40"
+   id="svg4"
+   sodipodi:docname="checkbox-checked-symbolic@2.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:snap-global="false"
+     inkscape:zoom="7.458333"
+     inkscape:cx="-8.9832406"
+     inkscape:cy="11.061453"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid825" />
+  </sodipodi:namedview>
+  <path
+     id="path2"
+     d="m 32.183594,13.09375 c 0.255612,-7e-6 0.511162,0.0971 0.70703,0.292969 0.391738,0.391737 0.391738,1.022325 0,1.414062 l -14.14453,14.144531 c -0.04898,0.04898 -0.1007,0.09222 -0.1563,0.12886 -0.05544,0.03678 -0.1117,0.06536 -0.17186,0.08984 -0.06018,0.02448 -0.12452,0.04244 -0.18752,0.05468 -0.06298,0.0122 -0.1275,0.0196 -0.19142,0.0196 -0.0639,0 -0.12452,-0.0072 -0.1875,-0.0196 -0.06298,-0.0122 -0.12734,-0.0302 -0.1875,-0.05468 -0.06018,-0.02448 -0.11636,-0.05312 -0.17186,-0.08984 -0.02778,-0.0184 -0.05572,-0.04102 -0.08202,-0.0625 -0.02624,-0.02142 -0.05358,-0.04198 -0.07806,-0.06646 L 8.9587542,20.567966 c -0.3917366,-0.391738 -0.3917374,-1.022324 1e-6,-1.414064 0.3917362,-0.391734 1.0223248,-0.391736 1.4140618,2e-6 l 7.666239,7.670198 13.4375,-13.4375 c 0.19586,-0.195868 0.451414,-0.292966 0.707032,-0.292968 z"
+     sodipodi:nodetypes="cscscscscsccccsccccc"
+     style="stroke-width:2" />
+</svg>
diff --git a/src/assets/gtk/scalable/checkbox-mixed-symbolic.svg b/src/assets/gtk/scalable/checkbox-mixed-symbolic.svg
index ff36f999..b4808a6b 100644
--- a/src/assets/gtk/scalable/checkbox-mixed-symbolic.svg
+++ b/src/assets/gtk/scalable/checkbox-mixed-symbolic.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="24"
-   height="24"
+   width="20"
+   height="20"
    version="1.1"
-   viewBox="0 0 24 24"
+   viewBox="0 0 20 20"
    id="svg4"
    sodipodi:docname="checkbox-mixed-symbolic.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
@@ -21,21 +21,23 @@
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
-     showgrid="true"
+     showgrid="false"
      inkscape:zoom="10.547676"
-     inkscape:cx="0.14221142"
+     inkscape:cx="0.094807614"
      inkscape:cy="19.340753"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg4">
+     inkscape:current-layer="svg4"
+     width="20px">
     <inkscape:grid
        type="xygrid"
        id="grid825" />
   </sodipodi:namedview>
   <path
      id="path2"
-     d="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 z M 7.5 12 L 16.5 12 C 16.777 12 17 12.223 17 12.5 C 17 12.777 16.777 13 16.5 13 L 7.5 13 C 7.223 13 7 12.777 7 12.5 C 7 12.223 7.223 12 7.5 12 z " />
+     d="m 5.5,10 h 9 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -9 C 5.223,11 5,10.777 5,10.5 5,10.223 5.223,10 5.5,10 Z"
+     sodipodi:nodetypes="sssssss" />
 </svg>
diff --git a/src/assets/gtk/scalable/small-checkbox-unchecked-symbolic.svg b/src/assets/gtk/scalable/checkbox-mixed-symbolic@2.svg
similarity index 56%
rename from src/assets/gtk/scalable/small-checkbox-unchecked-symbolic.svg
rename to src/assets/gtk/scalable/checkbox-mixed-symbolic@2.svg
index 5b9c9ec8..3ea0541a 100644
--- a/src/assets/gtk/scalable/small-checkbox-unchecked-symbolic.svg
+++ b/src/assets/gtk/scalable/checkbox-mixed-symbolic@2.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
+   width="40"
+   height="40"
    version="1.1"
+   viewBox="0 0 40 40"
    id="svg4"
-   sodipodi:docname="small-checkbox-unchecked-symbolic.svg"
+   sodipodi:docname="checkbox-mixed-symbolic@2.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -22,17 +22,23 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="44.75"
-     inkscape:cx="7.9888268"
-     inkscape:cy="8"
+     inkscape:zoom="10.547676"
+     inkscape:cx="0"
+     inkscape:cy="19.29335"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1011"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
+     inkscape:current-layer="svg4"
+     width="20px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid825" />
+  </sodipodi:namedview>
   <path
-     d="M 8,0 C 3.581722,0 0,3.581722 0,8 c 0,4.418278 3.581722,8 8,8 4.418278,0 8,-3.581722 8,-8 C 16,3.581722 12.418278,0 8,0 Z"
      id="path2"
-     sodipodi:nodetypes="sssss" />
+     d="m 11,20 h 18 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 H 11 c -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z"
+     sodipodi:nodetypes="sssssss"
+     style="stroke-width:2" />
 </svg>
diff --git a/src/assets/gtk/scalable/radio-checked-symbolic.svg b/src/assets/gtk/scalable/radio-checked-symbolic.svg
index f5454915..67beb46b 100644
--- a/src/assets/gtk/scalable/radio-checked-symbolic.svg
+++ b/src/assets/gtk/scalable/radio-checked-symbolic.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="24"
-   height="24"
+   width="20"
+   height="20"
    version="1.1"
-   viewBox="0 0 24 24"
+   viewBox="0 0 20 20"
    id="svg4"
    sodipodi:docname="radio-checked-symbolic.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
@@ -21,14 +21,14 @@
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
-     showgrid="true"
+     showgrid="false"
      inkscape:zoom="29.833333"
-     inkscape:cx="9.6368715"
+     inkscape:cx="9.6201118"
      inkscape:cy="12"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4">
     <inkscape:grid
@@ -37,5 +37,6 @@
   </sodipodi:namedview>
   <path
      id="path2"
-     d="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 z M 12 10 A 2 2 0 0 1 14 12 A 2 2 0 0 1 12 14 A 2 2 0 0 1 10 12 A 2 2 0 0 1 12 10 z " />
+     d="m 10,8 c 1.104569,0 2,0.895431 2,2 0,1.104569 -0.895431,2 -2,2 C 8.895431,12 8,11.104569 8,10 8,8.895431 8.895431,8 10,8 Z"
+     sodipodi:nodetypes="sssss" />
 </svg>
diff --git a/src/assets/gtk/scalable/small-radio-unchecked-symbolic.svg b/src/assets/gtk/scalable/radio-checked-symbolic@2.svg
similarity index 56%
rename from src/assets/gtk/scalable/small-radio-unchecked-symbolic.svg
rename to src/assets/gtk/scalable/radio-checked-symbolic@2.svg
index dd01e157..bf51d9ec 100644
--- a/src/assets/gtk/scalable/small-radio-unchecked-symbolic.svg
+++ b/src/assets/gtk/scalable/radio-checked-symbolic@2.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
+   width="40"
+   height="40"
    version="1.1"
+   viewBox="0 0 40 40"
    id="svg4"
-   sodipodi:docname="small-radio-unchecked-symbolic.svg"
+   sodipodi:docname="radio-checked-symbolic@2.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -22,17 +22,22 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="44.75"
-     inkscape:cx="7.9888268"
-     inkscape:cy="8"
+     inkscape:zoom="3.7291666"
+     inkscape:cx="-8.3128492"
+     inkscape:cy="25.877095"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1011"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid825" />
+  </sodipodi:namedview>
   <path
-     d="M 8,0 C 3.581722,0 0,3.581722 0,8 c 0,4.418278 3.581722,8 8,8 4.418278,0 8,-3.581722 8,-8 C 16,3.581722 12.418278,0 8,0 Z"
      id="path2"
-     sodipodi:nodetypes="sssss" />
+     d="m 20,16 c 2.209138,0 4,1.790862 4,4 0,2.209138 -1.790862,4 -4,4 -2.209138,0 -4,-1.790862 -4,-4 0,-2.209138 1.790862,-4 4,-4 z"
+     sodipodi:nodetypes="sssss"
+     style="stroke-width:2" />
 </svg>
diff --git a/src/assets/gtk/scalable/radio-mixed-symbolic.svg b/src/assets/gtk/scalable/radio-mixed-symbolic.svg
deleted file mode 100644
index bee19d8f..00000000
--- a/src/assets/gtk/scalable/radio-mixed-symbolic.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="radio-mixed-symbolic.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="29.833333"
-     inkscape:cx="11.98324"
-     inkscape:cy="12"
-     inkscape:window-width="1486"
-     inkscape:window-height="974"
-     inkscape:window-x="901"
-     inkscape:window-y="71"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4" />
-  <path
-     id="path2"
-     d="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 7.5,12 h 9 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -9 C 7.223,13 7,12.777 7,12.5 7,12.223 7.223,12 7.5,12 Z" />
-</svg>
diff --git a/src/assets/gtk/scalable/radio-mixed-symbolic.svg b/src/assets/gtk/scalable/radio-mixed-symbolic.svg
new file mode 120000
index 00000000..79b7355c
--- /dev/null
+++ b/src/assets/gtk/scalable/radio-mixed-symbolic.svg
@@ -0,0 +1 @@
+checkbox-mixed-symbolic.svg
\ No newline at end of file
diff --git a/src/assets/gtk/scalable/radio-mixed-symbolic@2.svg b/src/assets/gtk/scalable/radio-mixed-symbolic@2.svg
new file mode 120000
index 00000000..b68859d4
--- /dev/null
+++ b/src/assets/gtk/scalable/radio-mixed-symbolic@2.svg
@@ -0,0 +1 @@
+checkbox-mixed-symbolic@2.svg
\ No newline at end of file
diff --git a/src/assets/gtk/scalable/small-checkbox-checked-symbolic.svg b/src/assets/gtk/scalable/small-checkbox-checked-symbolic.svg
index d093b2ae..4759e324 100644
--- a/src/assets/gtk/scalable/small-checkbox-checked-symbolic.svg
+++ b/src/assets/gtk/scalable/small-checkbox-checked-symbolic.svg
@@ -21,11 +21,11 @@
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
-     showgrid="true"
+     showgrid="false"
      inkscape:snap-global="false"
-     inkscape:zoom="31.643028"
-     inkscape:cx="10.128613"
-     inkscape:cy="10.492043"
+     inkscape:zoom="15.821514"
+     inkscape:cx="10.176017"
+     inkscape:cy="9.0383259"
      inkscape:window-width="1486"
      inkscape:window-height="974"
      inkscape:window-x="128"
@@ -38,5 +38,6 @@
   </sodipodi:namedview>
   <path
      id="path2"
-     d="M 8 0 C 3.581722 0 0 3.581722 0 8 C 0 12.418278 3.581722 16 8 16 C 12.418278 16 16 12.418278 16 8 C 16 3.581722 12.418278 0 8 0 z M 11.943359 5.4550781 C 12.071169 5.4550781 12.198941 5.5036282 12.296875 5.6015625 C 12.492744 5.7974311 12.492744 6.1127252 12.296875 6.3085938 L 7.3457031 11.257812 C 7.1498345 11.453682 6.8345405 11.453682 6.6386719 11.257812 L 3.8105469 8.4296875 C 3.6146783 8.2338189 3.6146783 7.9185248 3.8105469 7.7226562 C 4.0064155 7.5267877 4.3217095 7.5267877 4.5175781 7.7226562 L 6.9921875 10.197266 L 11.587891 5.6015625 C 11.685825 5.5036282 11.81555 5.4550781 11.943359 5.4550781 z " />
+     d="m 11.943359,5.4550781 c 0.12781,0 0.255582,0.04855 0.353516,0.1464844 0.195869,0.1958686 0.195869,0.5111627 0,0.7070313 L 7.3457031,11.257812 c -0.1958686,0.19587 -0.5111626,0.19587 -0.7070312,0 L 3.8105469,8.4296875 c -0.1958686,-0.1958686 -0.1958686,-0.5111627 0,-0.7070313 0.1958686,-0.1958685 0.5111626,-0.1958685 0.7070312,0 L 6.9921875,10.197266 11.587891,5.6015625 c 0.09793,-0.097934 0.227659,-0.1464844 0.355468,-0.1464844 z"
+     sodipodi:nodetypes="sscccsssccs" />
 </svg>
diff --git a/src/assets/gtk/scalable/small-checkbox-checked-symbolic@2.svg b/src/assets/gtk/scalable/small-checkbox-checked-symbolic@2.svg
new file mode 100644
index 00000000..a44f5c9f
--- /dev/null
+++ b/src/assets/gtk/scalable/small-checkbox-checked-symbolic@2.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32"
+   height="32"
+   version="1.1"
+   viewBox="0 0 32 32"
+   id="svg4"
+   sodipodi:docname="small-checkbox-checked-symbolic@2.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:snap-global="false"
+     inkscape:zoom="7.910757"
+     inkscape:cx="17.191781"
+     inkscape:cy="29.074335"
+     inkscape:window-width="1486"
+     inkscape:window-height="974"
+     inkscape:window-x="128"
+     inkscape:window-y="69"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1068" />
+  </sodipodi:namedview>
+  <path
+     id="path2"
+     d="m 23.886718,10.910156 c 0.25562,0 0.511164,0.0971 0.707032,0.292969 0.391738,0.391737 0.391738,1.022325 0,1.414063 l -9.902344,9.898436 c -0.391737,0.39174 -1.022325,0.39174 -1.414062,0 L 7.6210938,16.859375 c -0.3917372,-0.391737 -0.3917372,-1.022325 0,-1.414063 0.3917372,-0.391737 1.0223252,-0.391737 1.4140624,0 l 4.9492188,4.94922 9.191407,-9.191407 c 0.19586,-0.195868 0.455318,-0.292969 0.710936,-0.292969 z"
+     sodipodi:nodetypes="sscccsssccs"
+     style="stroke-width:2" />
+</svg>
diff --git a/src/assets/gtk/scalable/small-checkbox-mixed-symbolic.svg b/src/assets/gtk/scalable/small-checkbox-mixed-symbolic.svg
index e919c66e..d621934b 100644
--- a/src/assets/gtk/scalable/small-checkbox-mixed-symbolic.svg
+++ b/src/assets/gtk/scalable/small-checkbox-mixed-symbolic.svg
@@ -21,14 +21,14 @@
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
-     showgrid="true"
-     inkscape:zoom="44.75"
-     inkscape:cx="6.424581"
-     inkscape:cy="8"
+     showgrid="false"
+     inkscape:zoom="22.375"
+     inkscape:cx="7.150838"
+     inkscape:cy="13.810056"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4">
     <inkscape:grid
@@ -37,5 +37,6 @@
   </sodipodi:namedview>
   <path
      id="path2"
-     d="M 8 0 C 3.581722 0 0 3.581722 0 8 C 0 12.418278 3.581722 16 8 16 C 12.418278 16 16 12.418278 16 8 C 16 3.581722 12.418278 0 8 0 z M 4.5 8 L 11.5 8 C 11.777 8 12 8.223 12 8.5 C 12 8.777 11.777 9 11.5 9 L 4.5 9 C 4.223 9 4 8.777 4 8.5 C 4 8.223 4.223 8 4.5 8 z " />
+     d="m 4.5,8 h 7 C 11.777,8 12,8.223 12,8.5 12,8.777 11.777,9 11.5,9 h -7 C 4.223,9 4,8.777 4,8.5 4,8.223 4.223,8 4.5,8 Z"
+     sodipodi:nodetypes="sssssss" />
 </svg>
diff --git a/src/assets/gtk/scalable/radio-unchecked-symbolic.svg b/src/assets/gtk/scalable/small-checkbox-mixed-symbolic@2.svg
similarity index 57%
rename from src/assets/gtk/scalable/radio-unchecked-symbolic.svg
rename to src/assets/gtk/scalable/small-checkbox-mixed-symbolic@2.svg
index 3bfc45bb..91c7006b 100644
--- a/src/assets/gtk/scalable/radio-unchecked-symbolic.svg
+++ b/src/assets/gtk/scalable/small-checkbox-mixed-symbolic@2.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
+   width="32"
+   height="32"
    version="1.1"
+   viewBox="0 0 32 32"
    id="svg4"
-   sodipodi:docname="radio-unchecked-symbolic.svg"
+   sodipodi:docname="small-checkbox-mixed-symbolic@2.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -22,17 +22,22 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="29.833333"
-     inkscape:cx="11.98324"
-     inkscape:cy="12"
+     inkscape:zoom="11.1875"
+     inkscape:cx="5.5418994"
+     inkscape:cy="19.843575"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid967" />
+  </sodipodi:namedview>
   <path
-     d="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z"
      id="path2"
-     sodipodi:nodetypes="sssss" />
+     d="m 9,16 h 14 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 H 9 C 8.446,18 8,17.554 8,17 8,16.446 8.446,16 9,16 Z"
+     sodipodi:nodetypes="sssssss"
+     style="stroke-width:2" />
 </svg>
diff --git a/src/assets/gtk/scalable/small-radio-checked-symbolic.svg b/src/assets/gtk/scalable/small-radio-checked-symbolic.svg
index acd2d83a..f2c9cf9f 100644
--- a/src/assets/gtk/scalable/small-radio-checked-symbolic.svg
+++ b/src/assets/gtk/scalable/small-radio-checked-symbolic.svg
@@ -22,16 +22,17 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="44.75"
-     inkscape:cx="6.424581"
-     inkscape:cy="8"
+     inkscape:zoom="22.375"
+     inkscape:cx="8.5363128"
+     inkscape:cy="11.486034"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4" />
   <path
      id="path2"
-     d="M 8 0 C 3.5817 0 0 3.5817 0 8 C 0 12.4183 3.5817 16 8 16 C 12.4183 16 16 12.4183 16 8 C 16 3.5817 12.4183 0 8 0 z M 8 6 A 2 2 0 0 1 10 8 A 2 2 0 0 1 8 10 A 2 2 0 0 1 6 8 A 2 2 0 0 1 8 6 z " />
+     d="m 8,6 c 1.1045695,0 2,0.8954305 2,2 0,1.1045695 -0.8954305,2 -2,2 C 6.8954305,10 6,9.1045695 6,8 6,6.8954305 6.8954305,6 8,6 Z"
+     sodipodi:nodetypes="sssss" />
 </svg>
diff --git a/src/assets/gtk/scalable/checkbox-unchecked-symbolic.svg b/src/assets/gtk/scalable/small-radio-checked-symbolic@2.svg
similarity index 63%
rename from src/assets/gtk/scalable/checkbox-unchecked-symbolic.svg
rename to src/assets/gtk/scalable/small-radio-checked-symbolic@2.svg
index b8b3fc3a..a06db4cd 100644
--- a/src/assets/gtk/scalable/checkbox-unchecked-symbolic.svg
+++ b/src/assets/gtk/scalable/small-radio-checked-symbolic@2.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
+   width="32"
+   height="32"
    version="1.1"
+   viewBox="0 0 32 32"
    id="svg4"
-   sodipodi:docname="checkbox-unchecked-symbolic.svg"
+   sodipodi:docname="small-radio-checked-symbolic@2.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -22,17 +22,18 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="14.916667"
-     inkscape:cx="11.564246"
-     inkscape:cy="17.631285"
+     inkscape:zoom="22.375"
+     inkscape:cx="8.5363128"
+     inkscape:cy="11.486034"
      inkscape:window-width="1920"
-     inkscape:window-height="1010"
+     inkscape:window-height="1012"
      inkscape:window-x="0"
-     inkscape:window-y="34"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4" />
   <path
-     d="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z"
      id="path2"
-     sodipodi:nodetypes="sssss" />
+     d="m 16,12 c 2.209139,0 4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 z"
+     sodipodi:nodetypes="sssss"
+     style="stroke-width:2" />
 </svg>
diff --git a/src/assets/gtk/scalable/small-radio-mixed-symbolic.svg b/src/assets/gtk/scalable/small-radio-mixed-symbolic.svg
deleted file mode 100644
index b2db2d59..00000000
--- a/src/assets/gtk/scalable/small-radio-mixed-symbolic.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="16"
-   height="16"
-   version="1.1"
-   viewBox="0 0 16 16"
-   id="svg4"
-   sodipodi:docname="small-radio-mixed-symbolic.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="44.75"
-     inkscape:cx="7.9888268"
-     inkscape:cy="8"
-     inkscape:window-width="1920"
-     inkscape:window-height="1010"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     id="path2"
-     d="M 8,0 C 3.581722,0 0,3.581722 0,8 c 0,4.418278 3.581722,8 8,8 4.418278,0 8,-3.581722 8,-8 C 16,3.581722 12.418278,0 8,0 Z M 4.5,8 h 7 C 11.777,8 12,8.223 12,8.5 12,8.777 11.777,9 11.5,9 h -7 C 4.223,9 4,8.777 4,8.5 4,8.223 4.223,8 4.5,8 Z" />
-</svg>
diff --git a/src/assets/gtk/scalable/small-radio-mixed-symbolic.svg b/src/assets/gtk/scalable/small-radio-mixed-symbolic.svg
new file mode 120000
index 00000000..86dfcec0
--- /dev/null
+++ b/src/assets/gtk/scalable/small-radio-mixed-symbolic.svg
@@ -0,0 +1 @@
+small-checkbox-mixed-symbolic.svg
\ No newline at end of file
diff --git a/src/assets/gtk/scalable/small-radio-mixed-symbolic@2.svg b/src/assets/gtk/scalable/small-radio-mixed-symbolic@2.svg
new file mode 120000
index 00000000..bafb5588
--- /dev/null
+++ b/src/assets/gtk/scalable/small-radio-mixed-symbolic@2.svg
@@ -0,0 +1 @@
+small-checkbox-mixed-symbolic@2.svg
\ No newline at end of file
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 6fa23f1d..8e7797ff 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -1114,8 +1114,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .nautilus-window headerbar revealer > button, button.titlebutton:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, check,
-radio, button.close, button.circular, .inline-toolbar button:not(.text-button) {
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .nautilus-window headerbar revealer > button, button.titlebutton:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, button.close, button.circular, .inline-toolbar button:not(.text-button) {
   border-radius: 9999px;
 }
 
@@ -1123,8 +1122,7 @@ radio, button.close, button.circular, .inline-toolbar button:not(.text-button) {
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label, .nautilus-window headerbar revealer > button label, button.titlebutton:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, check label,
-radio label, button.close label, button.circular label, .inline-toolbar button:not(.text-button) label {
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label, .nautilus-window headerbar revealer > button label, button.titlebutton:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, button.close label, button.circular label, .inline-toolbar button:not(.text-button) label {
   padding: 0;
 }
 
@@ -1149,8 +1147,7 @@ button:drop(active) {
 
 .budgie-session-dialog .linked.horizontal > button,
 .budgie-polkit-dialog .linked.horizontal > button,
-.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .budgie-panel button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, .gedit-search-slider .linked > button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular, treeview.view header button button.circular, filechooser stack.view scrolledwindow treeview.view header button button.circular, row.activatable button.circular, check,
-radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
+.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .budgie-panel button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, .gedit-search-slider .linked > button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular, treeview.view header button button.circular, filechooser stack.view scrolledwindow treeview.view header button button.circular, row.activatable button.circular, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
 .menuitem.button.flat, .nemo-window .toolbar button, #buttonbox_frame button, .xfce4-panel.background button, .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button, layouttabbar button, filechooser #pathbarbox > stack > box > button, messagedialog .dialog-action-box button, messagedialog .dialog-action-box .linked:not(.vertical) > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
 popover.background button.model, .nemo-window .primary-toolbar button:not(.text-button), headerbar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
@@ -1167,8 +1164,7 @@ popover.background button.model, .nemo-window .primary-toolbar button:not(.text-
 
 .budgie-session-dialog .linked.horizontal > button:focus,
 .budgie-polkit-dialog .linked.horizontal > button:focus,
-.budgie-run-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-panel button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, .gedit-search-slider .linked > button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:focus, treeview.view header button button.circular:focus, filechooser stack.view scrolledwindow treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
-radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
+.budgie-run-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-panel button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, .gedit-search-slider .linked > button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:focus, treeview.view header button button.circular:focus, filechooser stack.view scrolledwindow treeview.view header button button.circular:focus, row.activatable button.circular:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
 .menuitem.button.flat:focus, .nemo-window .toolbar button:focus, #buttonbox_frame button:focus, .xfce4-panel.background button:focus, .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus, layouttabbar button:focus, filechooser #pathbarbox > stack > box > button:focus, messagedialog .dialog-action-box button:focus, messagedialog .dialog-action-box .linked:not(.vertical) > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
 popover.background button.model:focus, .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:focus {
@@ -1178,8 +1174,7 @@ popover.background button.model:focus, .nemo-window .primary-toolbar button:focu
 
 .budgie-session-dialog .linked.horizontal > button:hover,
 .budgie-polkit-dialog .linked.horizontal > button:hover,
-.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-panel button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, .gedit-search-slider .linked > button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:hover, treeview.view header button button.circular:hover, filechooser stack.view scrolledwindow treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
-radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
+.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-panel button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, .gedit-search-slider .linked > button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:hover, treeview.view header button button.circular:hover, filechooser stack.view scrolledwindow treeview.view header button button.circular:hover, row.activatable button.circular:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
 .menuitem.button.flat:hover, .nemo-window .toolbar button:hover, #buttonbox_frame button:hover, .xfce4-panel.background button:hover, .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover, layouttabbar button:hover, filechooser #pathbarbox > stack > box > button:hover, messagedialog .dialog-action-box button:hover, messagedialog .dialog-action-box .linked:not(.vertical) > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
 popover.background button.model:hover, .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:hover {
@@ -1189,8 +1184,7 @@ popover.background button.model:hover, .nemo-window .primary-toolbar button:hove
 
 .budgie-session-dialog .linked.horizontal > button:active,
 .budgie-polkit-dialog .linked.horizontal > button:active,
-.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-panel button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, .gedit-search-slider .linked > button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:active, treeview.view header button button.circular:active, filechooser stack.view scrolledwindow treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
-radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
+.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-panel button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, .gedit-search-slider .linked > button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:active, treeview.view header button button.circular:active, filechooser stack.view scrolledwindow treeview.view header button button.circular:active, row.activatable button.circular:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
 .menuitem.button.flat:active, .nemo-window .toolbar button:active, #buttonbox_frame button:active, .xfce4-panel.background button:active, .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active, layouttabbar button:active, filechooser #pathbarbox > stack > box > button:active, messagedialog .dialog-action-box button:active, messagedialog .dialog-action-box .linked:not(.vertical) > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
 popover.background button.model:active, .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:active {
@@ -1204,8 +1198,7 @@ popover.background button.model:active, .nemo-window .primary-toolbar button:act
 
 .budgie-session-dialog .linked.horizontal > button:disabled,
 .budgie-polkit-dialog .linked.horizontal > button:disabled,
-.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-panel button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, .gedit-search-slider .linked > button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:disabled, treeview.view header button button.circular:disabled, filechooser stack.view scrolledwindow treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
-radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
+.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-panel button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, .gedit-search-slider .linked > button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:disabled, treeview.view header button button.circular:disabled, filechooser stack.view scrolledwindow treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
 .menuitem.button.flat:disabled, .nemo-window .toolbar button:disabled, #buttonbox_frame button:disabled, .xfce4-panel.background button:disabled, .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled, layouttabbar button:disabled, filechooser #pathbarbox > stack > box > button:disabled, messagedialog .dialog-action-box button:disabled, messagedialog .dialog-action-box .linked:not(.vertical) > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
 popover.background button.model:disabled, .nemo-window .primary-toolbar button:disabled:not(.text-button), headerbar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), button.flat:disabled {
@@ -2967,43 +2960,59 @@ radiobutton.text-button label:not(:only-child) {
 
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -4px;
-  padding: 4px;
-}
-
-check, check:focus,
-radio,
-radio:focus {
-  color: alpha(currentColor, 0.08);
+  min-height: 20px;
+  min-width: 20px;
+  margin: 3px;
+  padding: 0;
+  border-radius: 9999px;
+  color: transparent;
+  background-color: rgba(255, 255, 255, 0.12);
+  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
 }
 
 check:hover,
 radio:hover {
-  color: alpha(currentColor, 0.16);
+  box-shadow: 0 0 0 6px rgba(255, 255, 255, 0.04);
+  background-color: rgba(255, 255, 255, 0.15);
+}
+
+check:active,
+radio:active {
+  box-shadow: 0 0 0 6px rgba(255, 255, 255, 0.12);
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
+check:disabled,
+radio:disabled {
+  background-color: rgba(255, 255, 255, 0.04);
 }
 
 check:checked, check:indeterminate,
 radio:checked,
 radio:indeterminate {
-  color: #5b9bf8;
+  color: white;
+  background-color: #5b9bf8;
+}
+
+check:checked:hover, check:indeterminate:hover,
+radio:checked:hover,
+radio:indeterminate:hover {
+  box-shadow: 0 0 0 6px rgba(91, 155, 248, 0.15);
+  background-color: #8cb9fa;
+}
+
+check:checked:active, check:indeterminate:active,
+radio:checked:active,
+radio:indeterminate:active {
+  box-shadow: 0 0 0 6px rgba(91, 155, 248, 0.2);
+  background-color: #5b9bf8;
 }
 
 check:checked:disabled, check:indeterminate:disabled,
 radio:checked:disabled,
 radio:indeterminate:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
-check:disabled,
-radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-check:not(:hover):focus,
-radio:not(:hover):focus {
-  box-shadow: inset 0 0 0 9999px transparent;
+  color: rgba(255, 255, 255, 0.5);
+  background-color: rgba(91, 155, 248, 0.35);
 }
 
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
@@ -3013,13 +3022,13 @@ popover modelbutton.flat check, popover modelbutton.flat check:focus, popover mo
 }
 
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
-  margin-left: -12px;
-  margin-right: -4px;
+  margin-left: -3px;
+  margin-right: 6px;
 }
 
 popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
-  margin-left: -4px;
-  margin-right: -12px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
 menu menuitem check, menu menuitem radio {
@@ -3029,23 +3038,20 @@ menu menuitem check, menu menuitem radio {
 }
 
 menu menuitem check:dir(ltr), menu menuitem radio:dir(ltr) {
-  margin-right: 8px;
+  margin-right: 6px;
+  margin-left: -3px;
 }
 
 menu menuitem check:dir(rtl), menu menuitem radio:dir(rtl) {
-  margin-left: 8px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
-menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled {
+menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked:hover, menu menuitem check:indeterminate:hover, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked:hover, menu menuitem radio:indeterminate:hover {
   box-shadow: none;
 }
 
 
-check {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
-}
-
-
 check:checked {
   -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg"));
 }
@@ -3056,11 +3062,6 @@ check:indeterminate {
 }
 
 
-radio {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
-}
-
-
 radio:checked {
   -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
 }
@@ -3074,8 +3075,6 @@ radio:indeterminate {
 menu menuitem check {
   min-height: 16px;
   min-width: 16px;
-  border-radius: 6px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
 }
 
 #MozillaGtkWidget > widget > checkbutton > check:checked,
@@ -3092,8 +3091,6 @@ menu menuitem check:indeterminate {
 menu menuitem radio {
   min-height: 16px;
   min-width: 16px;
-  border-image: none;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
 }
 
 #MozillaGtkWidget > widget > radiobutton > radio:checked,
@@ -3115,76 +3112,23 @@ radio:not(:checked):indeterminate:active {
   -gtk-icon-transform: scaleX(-1);
 }
 
-check:not(:checked),
-radio:not(:checked) {
-  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1), -gtk-icon-transform 0;
-}
-
-check:not(:checked):active,
-radio:not(:checked):active {
-  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0, -gtk-icon-transform 0;
-}
-
-menu menuitem check:not(:checked), menu menuitem radio:not(:checked) {
-  transition: none;
-}
-
-treeview.view check, filechooser stack.view scrolledwindow treeview.view check,
-treeview.view radio,
-filechooser stack.view scrolledwindow treeview.view radio {
+treeview.view radio, filechooser stack.view scrolledwindow treeview.view radio, treeview.view check, filechooser stack.view scrolledwindow treeview.view check {
   padding: 0;
+  margin: 0;
 }
 
-treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover, treeview.view check:selected, filechooser stack.view scrolledwindow treeview.view check:selected,
-treeview.view radio:hover,
-filechooser stack.view scrolledwindow treeview.view radio:hover,
-treeview.view radio:selected,
-filechooser stack.view scrolledwindow treeview.view radio:selected {
+treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), filechooser stack.view scrolledwindow treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate), filechooser stack.view scrolledwindow treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+treeview.view radio, filechooser stack.view scrolledwindow treeview.view radio, treeview.view radio:hover, filechooser stack.view scrolledwindow treeview.view radio:hover, treeview.view radio:disabled, filechooser stack.view scrolledwindow treeview.view radio:disabled, treeview.view radio:checked:hover, filechooser stack.view scrolledwindow treeview.view radio:checked:hover, treeview.view radio:indeterminate:hover, filechooser stack.view scrolledwindow treeview.view radio:indeterminate:hover, treeview.view check, filechooser stack.view scrolledwindow treeview.view check, treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover, treeview.view check:disabled, filechooser stack.view scrolledwindow treeview.view check:disabled, treeview.view check:checked:hover, filechooser stack.view scrolledwindow treeview.view check:checked:hover, treeview.view check:indeterminate:hover, filechooser stack.view scrolledwindow treeview.view check:indeterminate:hover {
   box-shadow: none;
-  background-color: transparent;
 }
 
-treeview.view check, filechooser stack.view scrolledwindow treeview.view check, treeview.view check:focus, filechooser stack.view scrolledwindow treeview.view check:focus, treeview.view check:selected, filechooser stack.view scrolledwindow treeview.view check:selected,
-treeview.view radio,
-filechooser stack.view scrolledwindow treeview.view radio,
-treeview.view radio:focus,
-filechooser stack.view scrolledwindow treeview.view radio:focus,
-treeview.view radio:selected,
-filechooser stack.view scrolledwindow treeview.view radio:selected {
-  color: alpha(currentColor, 0.08);
-}
-
-treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover,
-treeview.view radio:hover,
-filechooser stack.view scrolledwindow treeview.view radio:hover {
-  color: alpha(currentColor, 0.16);
-}
-
-treeview.view check:checked, filechooser stack.view scrolledwindow treeview.view check:checked, treeview.view check:indeterminate, filechooser stack.view scrolledwindow treeview.view check:indeterminate,
-treeview.view radio:checked,
-filechooser stack.view scrolledwindow treeview.view radio:checked,
-treeview.view radio:indeterminate,
-filechooser stack.view scrolledwindow treeview.view radio:indeterminate {
-  color: #5b9bf8;
-}
-
-treeview.view check:checked:disabled, filechooser stack.view scrolledwindow treeview.view check:checked:disabled, treeview.view check:indeterminate:disabled, filechooser stack.view scrolledwindow treeview.view check:indeterminate:disabled,
-treeview.view radio:checked:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:checked:disabled,
-treeview.view radio:indeterminate:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:indeterminate:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
-treeview.view check:disabled, filechooser stack.view scrolledwindow treeview.view check:disabled,
-treeview.view radio:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-treeview.view radio:checked, filechooser stack.view scrolledwindow treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
+treeview.view:selected radio:checked, filechooser stack.view scrolledwindow treeview.view:selected radio:checked, treeview.view:selected radio:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected radio:indeterminate, treeview.view:selected check:checked, filechooser stack.view scrolledwindow treeview.view:selected check:checked, treeview.view:selected check:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected check:indeterminate, treeview.view:selected:focused radio:checked, filechooser stack.view scrolledwindow treeview.view:selected:focused radio:checked, treeview.view:selected:focused radio:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected:focused radio:indeterminate, treeview.view:selected:focused check:checked, filechooser stack.view scrolledwindow treeview.view:selected:focused check:checked, treeview.view:selected:focused check:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected:focused check:indeterminate {
+  background-color: #5b9bf8;
+  color: white;
+  background-image: none;
 }
 
 /************
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 566fdf00..62f73aca 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -1114,8 +1114,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .nautilus-window headerbar revealer > button, button.titlebutton:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, check,
-radio, button.close, button.circular, .inline-toolbar button:not(.text-button) {
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .nautilus-window headerbar revealer > button, button.titlebutton:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, button.close, button.circular, .inline-toolbar button:not(.text-button) {
   border-radius: 9999px;
 }
 
@@ -1123,8 +1122,7 @@ radio, button.close, button.circular, .inline-toolbar button:not(.text-button) {
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label, .nautilus-window headerbar revealer > button label, button.titlebutton:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, check label,
-radio label, button.close label, button.circular label, .inline-toolbar button:not(.text-button) label {
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label, .nautilus-window headerbar revealer > button label, button.titlebutton:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, button.close label, button.circular label, .inline-toolbar button:not(.text-button) label {
   padding: 0;
 }
 
@@ -1149,8 +1147,7 @@ button:drop(active) {
 
 .budgie-session-dialog .linked.horizontal > button,
 .budgie-polkit-dialog .linked.horizontal > button,
-.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .budgie-panel button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, .gedit-search-slider .linked > button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular, treeview.view header button button.circular, filechooser stack.view scrolledwindow treeview.view header button button.circular, row.activatable button.circular, check,
-radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
+.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .budgie-panel button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, .gedit-search-slider .linked > button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular, treeview.view header button button.circular, filechooser stack.view scrolledwindow treeview.view header button button.circular, row.activatable button.circular, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
 .menuitem.button.flat, .nemo-window .toolbar button, #buttonbox_frame button, .xfce4-panel.background button, .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button, layouttabbar button, filechooser #pathbarbox > stack > box > button, messagedialog .dialog-action-box button, messagedialog .dialog-action-box .linked:not(.vertical) > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
 popover.background button.model, .nemo-window .primary-toolbar button:not(.text-button), headerbar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
@@ -1167,8 +1164,7 @@ popover.background button.model, .nemo-window .primary-toolbar button:not(.text-
 
 .budgie-session-dialog .linked.horizontal > button:focus,
 .budgie-polkit-dialog .linked.horizontal > button:focus,
-.budgie-run-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-panel button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, .gedit-search-slider .linked > button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:focus, treeview.view header button button.circular:focus, filechooser stack.view scrolledwindow treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
-radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
+.budgie-run-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-panel button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, .gedit-search-slider .linked > button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:focus, treeview.view header button button.circular:focus, filechooser stack.view scrolledwindow treeview.view header button button.circular:focus, row.activatable button.circular:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
 .menuitem.button.flat:focus, .nemo-window .toolbar button:focus, #buttonbox_frame button:focus, .xfce4-panel.background button:focus, .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus, layouttabbar button:focus, filechooser #pathbarbox > stack > box > button:focus, messagedialog .dialog-action-box button:focus, messagedialog .dialog-action-box .linked:not(.vertical) > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
 popover.background button.model:focus, .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:focus {
@@ -1178,8 +1174,7 @@ popover.background button.model:focus, .nemo-window .primary-toolbar button:focu
 
 .budgie-session-dialog .linked.horizontal > button:hover,
 .budgie-polkit-dialog .linked.horizontal > button:hover,
-.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-panel button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, .gedit-search-slider .linked > button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:hover, treeview.view header button button.circular:hover, filechooser stack.view scrolledwindow treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
-radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
+.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-panel button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, .gedit-search-slider .linked > button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:hover, treeview.view header button button.circular:hover, filechooser stack.view scrolledwindow treeview.view header button button.circular:hover, row.activatable button.circular:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
 .menuitem.button.flat:hover, .nemo-window .toolbar button:hover, #buttonbox_frame button:hover, .xfce4-panel.background button:hover, .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover, layouttabbar button:hover, filechooser #pathbarbox > stack > box > button:hover, messagedialog .dialog-action-box button:hover, messagedialog .dialog-action-box .linked:not(.vertical) > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
 popover.background button.model:hover, .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:hover {
@@ -1189,8 +1184,7 @@ popover.background button.model:hover, .nemo-window .primary-toolbar button:hove
 
 .budgie-session-dialog .linked.horizontal > button:active,
 .budgie-polkit-dialog .linked.horizontal > button:active,
-.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-panel button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, .gedit-search-slider .linked > button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:active, treeview.view header button button.circular:active, filechooser stack.view scrolledwindow treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
-radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
+.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-panel button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, .gedit-search-slider .linked > button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:active, treeview.view header button button.circular:active, filechooser stack.view scrolledwindow treeview.view header button button.circular:active, row.activatable button.circular:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
 .menuitem.button.flat:active, .nemo-window .toolbar button:active, #buttonbox_frame button:active, .xfce4-panel.background button:active, .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active, layouttabbar button:active, filechooser #pathbarbox > stack > box > button:active, messagedialog .dialog-action-box button:active, messagedialog .dialog-action-box .linked:not(.vertical) > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
 popover.background button.model:active, .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:active {
@@ -1204,8 +1198,7 @@ popover.background button.model:active, .nemo-window .primary-toolbar button:act
 
 .budgie-session-dialog .linked.horizontal > button:disabled,
 .budgie-polkit-dialog .linked.horizontal > button:disabled,
-.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-panel button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, .gedit-search-slider .linked > button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:disabled, treeview.view header button button.circular:disabled, filechooser stack.view scrolledwindow treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
-radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
+.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-panel button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, .gedit-search-slider .linked > button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:disabled, treeview.view header button button.circular:disabled, filechooser stack.view scrolledwindow treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
 .menuitem.button.flat:disabled, .nemo-window .toolbar button:disabled, #buttonbox_frame button:disabled, .xfce4-panel.background button:disabled, .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled, layouttabbar button:disabled, filechooser #pathbarbox > stack > box > button:disabled, messagedialog .dialog-action-box button:disabled, messagedialog .dialog-action-box .linked:not(.vertical) > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
 popover.background button.model:disabled, .nemo-window .primary-toolbar button:disabled:not(.text-button), headerbar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), button.flat:disabled {
@@ -2967,43 +2960,59 @@ radiobutton.text-button label:not(:only-child) {
 
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -4px;
-  padding: 4px;
-}
-
-check, check:focus,
-radio,
-radio:focus {
-  color: alpha(currentColor, 0.08);
+  min-height: 20px;
+  min-width: 20px;
+  margin: 3px;
+  padding: 0;
+  border-radius: 9999px;
+  color: transparent;
+  background-color: rgba(0, 0, 0, 0.12);
+  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
 }
 
 check:hover,
 radio:hover {
-  color: alpha(currentColor, 0.16);
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.04);
+  background-color: rgba(0, 0, 0, 0.15);
+}
+
+check:active,
+radio:active {
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.12);
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+check:disabled,
+radio:disabled {
+  background-color: rgba(0, 0, 0, 0.04);
 }
 
 check:checked, check:indeterminate,
 radio:checked,
 radio:indeterminate {
-  color: #3c84f7;
+  color: white;
+  background-color: #3c84f7;
+}
+
+check:checked:hover, check:indeterminate:hover,
+radio:checked:hover,
+radio:indeterminate:hover {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.15);
+  background-color: #6da3f9;
+}
+
+check:checked:active, check:indeterminate:active,
+radio:checked:active,
+radio:indeterminate:active {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.2);
+  background-color: #3c84f7;
 }
 
 check:checked:disabled, check:indeterminate:disabled,
 radio:checked:disabled,
 radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-check:disabled,
-radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-check:not(:hover):focus,
-radio:not(:hover):focus {
-  box-shadow: inset 0 0 0 9999px transparent;
+  color: rgba(255, 255, 255, 0.5);
+  background-color: rgba(60, 132, 247, 0.35);
 }
 
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
@@ -3013,13 +3022,13 @@ popover modelbutton.flat check, popover modelbutton.flat check:focus, popover mo
 }
 
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
-  margin-left: -12px;
-  margin-right: -4px;
+  margin-left: -3px;
+  margin-right: 6px;
 }
 
 popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
-  margin-left: -4px;
-  margin-right: -12px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
 menu menuitem check, menu menuitem radio {
@@ -3029,23 +3038,20 @@ menu menuitem check, menu menuitem radio {
 }
 
 menu menuitem check:dir(ltr), menu menuitem radio:dir(ltr) {
-  margin-right: 8px;
+  margin-right: 6px;
+  margin-left: -3px;
 }
 
 menu menuitem check:dir(rtl), menu menuitem radio:dir(rtl) {
-  margin-left: 8px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
-menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled {
+menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked:hover, menu menuitem check:indeterminate:hover, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked:hover, menu menuitem radio:indeterminate:hover {
   box-shadow: none;
 }
 
 
-check {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
-}
-
-
 check:checked {
   -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg"));
 }
@@ -3056,11 +3062,6 @@ check:indeterminate {
 }
 
 
-radio {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
-}
-
-
 radio:checked {
   -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
 }
@@ -3074,8 +3075,6 @@ radio:indeterminate {
 menu menuitem check {
   min-height: 16px;
   min-width: 16px;
-  border-radius: 6px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
 }
 
 #MozillaGtkWidget > widget > checkbutton > check:checked,
@@ -3092,8 +3091,6 @@ menu menuitem check:indeterminate {
 menu menuitem radio {
   min-height: 16px;
   min-width: 16px;
-  border-image: none;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
 }
 
 #MozillaGtkWidget > widget > radiobutton > radio:checked,
@@ -3115,76 +3112,23 @@ radio:not(:checked):indeterminate:active {
   -gtk-icon-transform: scaleX(-1);
 }
 
-check:not(:checked),
-radio:not(:checked) {
-  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1), -gtk-icon-transform 0;
-}
-
-check:not(:checked):active,
-radio:not(:checked):active {
-  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0, -gtk-icon-transform 0;
-}
-
-menu menuitem check:not(:checked), menu menuitem radio:not(:checked) {
-  transition: none;
-}
-
-treeview.view check, filechooser stack.view scrolledwindow treeview.view check,
-treeview.view radio,
-filechooser stack.view scrolledwindow treeview.view radio {
+treeview.view radio, filechooser stack.view scrolledwindow treeview.view radio, treeview.view check, filechooser stack.view scrolledwindow treeview.view check {
   padding: 0;
+  margin: 0;
 }
 
-treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover, treeview.view check:selected, filechooser stack.view scrolledwindow treeview.view check:selected,
-treeview.view radio:hover,
-filechooser stack.view scrolledwindow treeview.view radio:hover,
-treeview.view radio:selected,
-filechooser stack.view scrolledwindow treeview.view radio:selected {
+treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), filechooser stack.view scrolledwindow treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate), filechooser stack.view scrolledwindow treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+treeview.view radio, filechooser stack.view scrolledwindow treeview.view radio, treeview.view radio:hover, filechooser stack.view scrolledwindow treeview.view radio:hover, treeview.view radio:disabled, filechooser stack.view scrolledwindow treeview.view radio:disabled, treeview.view radio:checked:hover, filechooser stack.view scrolledwindow treeview.view radio:checked:hover, treeview.view radio:indeterminate:hover, filechooser stack.view scrolledwindow treeview.view radio:indeterminate:hover, treeview.view check, filechooser stack.view scrolledwindow treeview.view check, treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover, treeview.view check:disabled, filechooser stack.view scrolledwindow treeview.view check:disabled, treeview.view check:checked:hover, filechooser stack.view scrolledwindow treeview.view check:checked:hover, treeview.view check:indeterminate:hover, filechooser stack.view scrolledwindow treeview.view check:indeterminate:hover {
   box-shadow: none;
-  background-color: transparent;
 }
 
-treeview.view check, filechooser stack.view scrolledwindow treeview.view check, treeview.view check:focus, filechooser stack.view scrolledwindow treeview.view check:focus, treeview.view check:selected, filechooser stack.view scrolledwindow treeview.view check:selected,
-treeview.view radio,
-filechooser stack.view scrolledwindow treeview.view radio,
-treeview.view radio:focus,
-filechooser stack.view scrolledwindow treeview.view radio:focus,
-treeview.view radio:selected,
-filechooser stack.view scrolledwindow treeview.view radio:selected {
-  color: alpha(currentColor, 0.08);
-}
-
-treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover,
-treeview.view radio:hover,
-filechooser stack.view scrolledwindow treeview.view radio:hover {
-  color: alpha(currentColor, 0.16);
-}
-
-treeview.view check:checked, filechooser stack.view scrolledwindow treeview.view check:checked, treeview.view check:indeterminate, filechooser stack.view scrolledwindow treeview.view check:indeterminate,
-treeview.view radio:checked,
-filechooser stack.view scrolledwindow treeview.view radio:checked,
-treeview.view radio:indeterminate,
-filechooser stack.view scrolledwindow treeview.view radio:indeterminate {
-  color: #3c84f7;
-}
-
-treeview.view check:checked:disabled, filechooser stack.view scrolledwindow treeview.view check:checked:disabled, treeview.view check:indeterminate:disabled, filechooser stack.view scrolledwindow treeview.view check:indeterminate:disabled,
-treeview.view radio:checked:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:checked:disabled,
-treeview.view radio:indeterminate:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-treeview.view check:disabled, filechooser stack.view scrolledwindow treeview.view check:disabled,
-treeview.view radio:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-treeview.view radio:checked, filechooser stack.view scrolledwindow treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
+treeview.view:selected radio:checked, filechooser stack.view scrolledwindow treeview.view:selected radio:checked, treeview.view:selected radio:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected radio:indeterminate, treeview.view:selected check:checked, filechooser stack.view scrolledwindow treeview.view:selected check:checked, treeview.view:selected check:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected check:indeterminate, treeview.view:selected:focused radio:checked, filechooser stack.view scrolledwindow treeview.view:selected:focused radio:checked, treeview.view:selected:focused radio:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected:focused radio:indeterminate, treeview.view:selected:focused check:checked, filechooser stack.view scrolledwindow treeview.view:selected:focused check:checked, treeview.view:selected:focused check:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected:focused check:indeterminate {
+  background-color: #3c84f7;
+  color: white;
+  background-image: none;
 }
 
 /************
diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
index d6320afe..95834e43 100644
--- a/src/main/gtk-3.0/gtk.css
+++ b/src/main/gtk-3.0/gtk.css
@@ -1114,8 +1114,7 @@ actionbar > revealer > box .linked > button:checked:disabled:not(.suggested-acti
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat), window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .nautilus-window headerbar revealer > button, button.titlebutton:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, check,
-radio, button.close, button.circular, .inline-toolbar button:not(.text-button) {
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button, .nautilus-window headerbar revealer > button, button.titlebutton:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, button.close, button.circular, .inline-toolbar button:not(.text-button) {
   border-radius: 9999px;
 }
 
@@ -1123,8 +1122,7 @@ radio, button.close, button.circular, .inline-toolbar button:not(.text-button) {
 window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button:not(.toggle):not(.raised):not(.flat) label, window.background > box.vertical > toolbar.primary-toolbar > toolitem button.flat.scale label, window.background > box.vertical > toolbar.primary-toolbar > toolitem > .linked > button.image-button.raised label, window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
 window.csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label,
 window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > .linked > button label,
-window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label, .nautilus-window headerbar revealer > button label, button.titlebutton:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, check label,
-radio label, button.close label, button.circular label, .inline-toolbar button:not(.text-button) label {
+window.solid-csd > box.vertical > box.vertical > toolbar.horizontal > toolitem > box.horizontal > button label, .nautilus-window headerbar revealer > button label, button.titlebutton:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, button.close label, button.circular label, .inline-toolbar button:not(.text-button) label {
   padding: 0;
 }
 
@@ -1149,8 +1147,7 @@ button:drop(active) {
 
 .budgie-session-dialog .linked.horizontal > button,
 .budgie-polkit-dialog .linked.horizontal > button,
-.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .budgie-panel button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, .gedit-search-slider .linked > button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular, treeview.view header button button.circular, filechooser stack.view scrolledwindow treeview.view header button button.circular, row.activatable button.circular, check,
-radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
+.budgie-run-dialog .linked.horizontal > button, .drop-shadow button, .budgie-panel button, .budgie-popover row button, .budgie-settings-window buttonbox.inline-toolbar button, #mate-menu button, #MatePanelPopupWindow button, popover.messagepopover .popover-action-area button, tabbox > tab button, .gedit-search-slider .linked > button, placessidebar.sidebar row button.sidebar-button, calendar.button, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular, treeview.view header button button.circular, filechooser stack.view scrolledwindow treeview.view header button button.circular, row.activatable button.circular, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical button, spinbutton:not(.vertical) button, modelbutton.flat,
 .menuitem.button.flat, .nemo-window .toolbar button, #buttonbox_frame button, .xfce4-panel.background button, .raven stackswitcher.linked > button, .lock-dialog button, .mate-panel-menu-bar button, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button, layouttabbar button, filechooser #pathbarbox > stack > box > button, messagedialog .dialog-action-box button, messagedialog .dialog-action-box .linked:not(.vertical) > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
 popover.background button.model, .nemo-window .primary-toolbar button:not(.text-button), headerbar button:not(.suggested-action):not(.destructive-action), toolbar button, combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
@@ -1167,8 +1164,7 @@ popover.background button.model, .nemo-window .primary-toolbar button:not(.text-
 
 .budgie-session-dialog .linked.horizontal > button:focus,
 .budgie-polkit-dialog .linked.horizontal > button:focus,
-.budgie-run-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-panel button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, .gedit-search-slider .linked > button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:focus, treeview.view header button button.circular:focus, filechooser stack.view scrolledwindow treeview.view header button button.circular:focus, row.activatable button.circular:focus, check:focus,
-radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
+.budgie-run-dialog .linked.horizontal > button:focus, .drop-shadow button:focus, .budgie-panel button:focus, .budgie-popover row button:focus, .budgie-settings-window buttonbox.inline-toolbar button:focus, #mate-menu button:focus, #MatePanelPopupWindow button:focus, popover.messagepopover .popover-action-area button:focus, tabbox > tab button:focus, .gedit-search-slider .linked > button:focus, placessidebar.sidebar row button.sidebar-button:focus, calendar.button:focus, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:focus, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:focus, treeview.view header button button.circular:focus, filechooser stack.view scrolledwindow treeview.view header button button.circular:focus, row.activatable button.circular:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical button:focus, spinbutton:not(.vertical) button:focus, modelbutton.flat:focus,
 .menuitem.button.flat:focus, .nemo-window .toolbar button:focus, #buttonbox_frame button:focus, .xfce4-panel.background button:focus, .raven stackswitcher.linked > button:focus, .lock-dialog button:focus, .mate-panel-menu-bar button:focus, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:focus, layouttabbar button:focus, filechooser #pathbarbox > stack > box > button:focus, messagedialog .dialog-action-box button:focus, messagedialog .dialog-action-box .linked:not(.vertical) > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
 popover.background button.model:focus, .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), toolbar button:focus, combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:focus {
@@ -1178,8 +1174,7 @@ popover.background button.model:focus, .nemo-window .primary-toolbar button:focu
 
 .budgie-session-dialog .linked.horizontal > button:hover,
 .budgie-polkit-dialog .linked.horizontal > button:hover,
-.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-panel button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, .gedit-search-slider .linked > button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:hover, treeview.view header button button.circular:hover, filechooser stack.view scrolledwindow treeview.view header button button.circular:hover, row.activatable button.circular:hover, check:hover,
-radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
+.budgie-run-dialog .linked.horizontal > button:hover, .drop-shadow button:hover, .budgie-panel button:hover, .budgie-popover row button:hover, .budgie-settings-window buttonbox.inline-toolbar button:hover, #mate-menu button:hover, #MatePanelPopupWindow button:hover, popover.messagepopover .popover-action-area button:hover, tabbox > tab button:hover, .gedit-search-slider .linked > button:hover, placessidebar.sidebar row button.sidebar-button:hover, calendar.button:hover, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:hover, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:hover, treeview.view header button button.circular:hover, filechooser stack.view scrolledwindow treeview.view header button button.circular:hover, row.activatable button.circular:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical button:hover, spinbutton:not(.vertical) button:hover, modelbutton.flat:hover,
 .menuitem.button.flat:hover, .nemo-window .toolbar button:hover, #buttonbox_frame button:hover, .xfce4-panel.background button:hover, .raven stackswitcher.linked > button:hover, .lock-dialog button:hover, .mate-panel-menu-bar button:hover, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:hover, layouttabbar button:hover, filechooser #pathbarbox > stack > box > button:hover, messagedialog .dialog-action-box button:hover, messagedialog .dialog-action-box .linked:not(.vertical) > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
 popover.background button.model:hover, .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), toolbar button:hover, combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:hover {
@@ -1189,8 +1184,7 @@ popover.background button.model:hover, .nemo-window .primary-toolbar button:hove
 
 .budgie-session-dialog .linked.horizontal > button:active,
 .budgie-polkit-dialog .linked.horizontal > button:active,
-.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-panel button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, .gedit-search-slider .linked > button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:active, treeview.view header button button.circular:active, filechooser stack.view scrolledwindow treeview.view header button button.circular:active, row.activatable button.circular:active, check:active,
-radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
+.budgie-run-dialog .linked.horizontal > button:active, .drop-shadow button:active, .budgie-panel button:active, .budgie-popover row button:active, .budgie-settings-window buttonbox.inline-toolbar button:active, #mate-menu button:active, #MatePanelPopupWindow button:active, popover.messagepopover .popover-action-area button:active, tabbox > tab button:active, .gedit-search-slider .linked > button:active, placessidebar.sidebar row button.sidebar-button:active, calendar.button:active, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:active, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:active, treeview.view header button button.circular:active, filechooser stack.view scrolledwindow treeview.view header button button.circular:active, row.activatable button.circular:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical button:active, spinbutton:not(.vertical) button:active, modelbutton.flat:active,
 .menuitem.button.flat:active, .nemo-window .toolbar button:active, #buttonbox_frame button:active, .xfce4-panel.background button:active, .raven stackswitcher.linked > button:active, .lock-dialog button:active, .mate-panel-menu-bar button:active, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:active, layouttabbar button:active, filechooser #pathbarbox > stack > box > button:active, messagedialog .dialog-action-box button:active, messagedialog .dialog-action-box .linked:not(.vertical) > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
 popover.background button.model:active, .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), toolbar button:active, combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:active {
@@ -1204,8 +1198,7 @@ popover.background button.model:active, .nemo-window .primary-toolbar button:act
 
 .budgie-session-dialog .linked.horizontal > button:disabled,
 .budgie-polkit-dialog .linked.horizontal > button:disabled,
-.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-panel button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, .gedit-search-slider .linked > button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:disabled, treeview.view header button button.circular:disabled, filechooser stack.view scrolledwindow treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
-radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
+.budgie-run-dialog .linked.horizontal > button:disabled, .drop-shadow button:disabled, .budgie-panel button:disabled, .budgie-popover row button:disabled, .budgie-settings-window buttonbox.inline-toolbar button:disabled, #mate-menu button:disabled, #MatePanelPopupWindow button:disabled, popover.messagepopover .popover-action-area button:disabled, tabbox > tab button:disabled, .gedit-search-slider .linked > button:disabled, placessidebar.sidebar row button.sidebar-button:disabled, calendar.button:disabled, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item) button.circular:disabled, .budgie-popover scrolledwindow.sidebar:not(.categories) list > row.activatable button.circular:disabled, treeview.view header button button.circular:disabled, filechooser stack.view scrolledwindow treeview.view header button button.circular:disabled, row.activatable button.circular:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical button:disabled, spinbutton:not(.vertical) button:disabled, modelbutton.flat:disabled,
 .menuitem.button.flat:disabled, .nemo-window .toolbar button:disabled, #buttonbox_frame button:disabled, .xfce4-panel.background button:disabled, .raven stackswitcher.linked > button:disabled, .lock-dialog button:disabled, .mate-panel-menu-bar button:disabled, window.background.csd.geary-main-window stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled,
 window#GearyMainWindow.background.csd stack#conversation_viewer .geary-expanded > .geary-composer-embed headerbar button:disabled, layouttabbar button:disabled, filechooser #pathbarbox > stack > box > button:disabled, messagedialog .dialog-action-box button:disabled, messagedialog .dialog-action-box .linked:not(.vertical) > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
 popover.background button.model:disabled, .nemo-window .primary-toolbar button:disabled:not(.text-button), headerbar button:disabled:not(.suggested-action):not(.destructive-action), toolbar button:disabled, combobox > .linked:not(.vertical) > button:disabled:not(:only-child), button.flat:disabled {
@@ -2976,43 +2969,59 @@ radiobutton.text-button label:not(:only-child) {
 
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -4px;
-  padding: 4px;
-}
-
-check, check:focus,
-radio,
-radio:focus {
-  color: alpha(currentColor, 0.08);
+  min-height: 20px;
+  min-width: 20px;
+  margin: 3px;
+  padding: 0;
+  border-radius: 9999px;
+  color: transparent;
+  background-color: rgba(0, 0, 0, 0.12);
+  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
 }
 
 check:hover,
 radio:hover {
-  color: alpha(currentColor, 0.16);
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.04);
+  background-color: rgba(0, 0, 0, 0.15);
+}
+
+check:active,
+radio:active {
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.12);
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+check:disabled,
+radio:disabled {
+  background-color: rgba(0, 0, 0, 0.04);
 }
 
 check:checked, check:indeterminate,
 radio:checked,
 radio:indeterminate {
-  color: #3c84f7;
+  color: white;
+  background-color: #3c84f7;
+}
+
+check:checked:hover, check:indeterminate:hover,
+radio:checked:hover,
+radio:indeterminate:hover {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.15);
+  background-color: #6da3f9;
+}
+
+check:checked:active, check:indeterminate:active,
+radio:checked:active,
+radio:indeterminate:active {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.2);
+  background-color: #3c84f7;
 }
 
 check:checked:disabled, check:indeterminate:disabled,
 radio:checked:disabled,
 radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-check:disabled,
-radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-check:not(:hover):focus,
-radio:not(:hover):focus {
-  box-shadow: inset 0 0 0 9999px transparent;
+  color: rgba(255, 255, 255, 0.5);
+  background-color: rgba(60, 132, 247, 0.35);
 }
 
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
@@ -3022,13 +3031,13 @@ popover modelbutton.flat check, popover modelbutton.flat check:focus, popover mo
 }
 
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
-  margin-left: -12px;
-  margin-right: -4px;
+  margin-left: -3px;
+  margin-right: 6px;
 }
 
 popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
-  margin-left: -4px;
-  margin-right: -12px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
 menu menuitem check, menu menuitem radio {
@@ -3038,23 +3047,20 @@ menu menuitem check, menu menuitem radio {
 }
 
 menu menuitem check:dir(ltr), menu menuitem radio:dir(ltr) {
-  margin-right: 8px;
+  margin-right: 6px;
+  margin-left: -3px;
 }
 
 menu menuitem check:dir(rtl), menu menuitem radio:dir(rtl) {
-  margin-left: 8px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
-menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled {
+menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked:hover, menu menuitem check:indeterminate:hover, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked:hover, menu menuitem radio:indeterminate:hover {
   box-shadow: none;
 }
 
 
-check {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
-}
-
-
 check:checked {
   -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg"));
 }
@@ -3065,11 +3071,6 @@ check:indeterminate {
 }
 
 
-radio {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
-}
-
-
 radio:checked {
   -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
 }
@@ -3083,8 +3084,6 @@ radio:indeterminate {
 menu menuitem check {
   min-height: 16px;
   min-width: 16px;
-  border-radius: 6px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
 }
 
 #MozillaGtkWidget > widget > checkbutton > check:checked,
@@ -3101,8 +3100,6 @@ menu menuitem check:indeterminate {
 menu menuitem radio {
   min-height: 16px;
   min-width: 16px;
-  border-image: none;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
 }
 
 #MozillaGtkWidget > widget > radiobutton > radio:checked,
@@ -3124,76 +3121,23 @@ radio:not(:checked):indeterminate:active {
   -gtk-icon-transform: scaleX(-1);
 }
 
-check:not(:checked),
-radio:not(:checked) {
-  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 300ms cubic-bezier(0, 0, 0.2, 1), background-image 1200ms cubic-bezier(0, 0, 0.2, 1), -gtk-icon-transform 0;
-}
-
-check:not(:checked):active,
-radio:not(:checked):active {
-  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), background-size 0, background-image 0, -gtk-icon-transform 0;
-}
-
-menu menuitem check:not(:checked), menu menuitem radio:not(:checked) {
-  transition: none;
-}
-
-treeview.view check, filechooser stack.view scrolledwindow treeview.view check,
-treeview.view radio,
-filechooser stack.view scrolledwindow treeview.view radio {
+treeview.view radio, filechooser stack.view scrolledwindow treeview.view radio, treeview.view check, filechooser stack.view scrolledwindow treeview.view check {
   padding: 0;
+  margin: 0;
 }
 
-treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover, treeview.view check:selected, filechooser stack.view scrolledwindow treeview.view check:selected,
-treeview.view radio:hover,
-filechooser stack.view scrolledwindow treeview.view radio:hover,
-treeview.view radio:selected,
-filechooser stack.view scrolledwindow treeview.view radio:selected {
+treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), filechooser stack.view scrolledwindow treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate), filechooser stack.view scrolledwindow treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+treeview.view radio, filechooser stack.view scrolledwindow treeview.view radio, treeview.view radio:hover, filechooser stack.view scrolledwindow treeview.view radio:hover, treeview.view radio:disabled, filechooser stack.view scrolledwindow treeview.view radio:disabled, treeview.view radio:checked:hover, filechooser stack.view scrolledwindow treeview.view radio:checked:hover, treeview.view radio:indeterminate:hover, filechooser stack.view scrolledwindow treeview.view radio:indeterminate:hover, treeview.view check, filechooser stack.view scrolledwindow treeview.view check, treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover, treeview.view check:disabled, filechooser stack.view scrolledwindow treeview.view check:disabled, treeview.view check:checked:hover, filechooser stack.view scrolledwindow treeview.view check:checked:hover, treeview.view check:indeterminate:hover, filechooser stack.view scrolledwindow treeview.view check:indeterminate:hover {
   box-shadow: none;
-  background-color: transparent;
 }
 
-treeview.view check, filechooser stack.view scrolledwindow treeview.view check, treeview.view check:focus, filechooser stack.view scrolledwindow treeview.view check:focus, treeview.view check:selected, filechooser stack.view scrolledwindow treeview.view check:selected,
-treeview.view radio,
-filechooser stack.view scrolledwindow treeview.view radio,
-treeview.view radio:focus,
-filechooser stack.view scrolledwindow treeview.view radio:focus,
-treeview.view radio:selected,
-filechooser stack.view scrolledwindow treeview.view radio:selected {
-  color: alpha(currentColor, 0.08);
-}
-
-treeview.view check:hover, filechooser stack.view scrolledwindow treeview.view check:hover,
-treeview.view radio:hover,
-filechooser stack.view scrolledwindow treeview.view radio:hover {
-  color: alpha(currentColor, 0.16);
-}
-
-treeview.view check:checked, filechooser stack.view scrolledwindow treeview.view check:checked, treeview.view check:indeterminate, filechooser stack.view scrolledwindow treeview.view check:indeterminate,
-treeview.view radio:checked,
-filechooser stack.view scrolledwindow treeview.view radio:checked,
-treeview.view radio:indeterminate,
-filechooser stack.view scrolledwindow treeview.view radio:indeterminate {
-  color: #3c84f7;
-}
-
-treeview.view check:checked:disabled, filechooser stack.view scrolledwindow treeview.view check:checked:disabled, treeview.view check:indeterminate:disabled, filechooser stack.view scrolledwindow treeview.view check:indeterminate:disabled,
-treeview.view radio:checked:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:checked:disabled,
-treeview.view radio:indeterminate:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-treeview.view check:disabled, filechooser stack.view scrolledwindow treeview.view check:disabled,
-treeview.view radio:disabled,
-filechooser stack.view scrolledwindow treeview.view radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-treeview.view radio:checked, filechooser stack.view scrolledwindow treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
+treeview.view:selected radio:checked, filechooser stack.view scrolledwindow treeview.view:selected radio:checked, treeview.view:selected radio:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected radio:indeterminate, treeview.view:selected check:checked, filechooser stack.view scrolledwindow treeview.view:selected check:checked, treeview.view:selected check:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected check:indeterminate, treeview.view:selected:focused radio:checked, filechooser stack.view scrolledwindow treeview.view:selected:focused radio:checked, treeview.view:selected:focused radio:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected:focused radio:indeterminate, treeview.view:selected:focused check:checked, filechooser stack.view scrolledwindow treeview.view:selected:focused check:checked, treeview.view:selected:focused check:indeterminate, filechooser stack.view scrolledwindow treeview.view:selected:focused check:indeterminate {
+  background-color: #3c84f7;
+  color: white;
+  background-image: none;
 }
 
 /************
diff --git a/src/main/gtk-4.0/gtk-dark.css b/src/main/gtk-4.0/gtk-dark.css
index 208e2afb..66842575 100644
--- a/src/main/gtk-4.0/gtk-dark.css
+++ b/src/main/gtk-4.0/gtk-dark.css
@@ -493,8 +493,7 @@ button:drop(active) {
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button, calendar > header > button, columnview.view > header > button button.circular,
-treeview.view > header > button button.circular, row.activatable button.circular, check,
-radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical > button, spinbutton:not(.vertical) > button, modelbutton.flat, filechooser #pathbarbox > stack > box > button, window.dialog.message .dialog-action-area > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
+treeview.view > header > button button.circular, row.activatable button.circular, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical > button, spinbutton:not(.vertical) > button, modelbutton.flat, filechooser #pathbarbox > stack > box > button, window.dialog.message .dialog-action-area > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
 popover.background button.model, headerbar button:not(.suggested-action):not(.destructive-action), .toolbar button,
 toolbar button, dropdown > .linked:not(.vertical) > button:not(:only-child),
 combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
@@ -506,8 +505,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:focus, calendar > header > button:focus, columnview.view > header > button button.circular:focus,
-treeview.view > header > button button.circular:focus, row.activatable button.circular:focus, check:focus,
-radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical > button:focus, spinbutton:not(.vertical) > button:focus, modelbutton.flat:focus, filechooser #pathbarbox > stack > box > button:focus, window.dialog.message .dialog-action-area > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
+treeview.view > header > button button.circular:focus, row.activatable button.circular:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical > button:focus, spinbutton:not(.vertical) > button:focus, modelbutton.flat:focus, filechooser #pathbarbox > stack > box > button:focus, window.dialog.message .dialog-action-area > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
 popover.background button.model:focus, headerbar button:focus:not(.suggested-action):not(.destructive-action), .toolbar button:focus,
 toolbar button:focus, dropdown > .linked:not(.vertical) > button:focus:not(:only-child),
 combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:focus {
@@ -516,8 +514,7 @@ combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:f
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:hover, calendar > header > button:hover, columnview.view > header > button button.circular:hover,
-treeview.view > header > button button.circular:hover, row.activatable button.circular:hover, check:hover,
-radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical > button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover, filechooser #pathbarbox > stack > box > button:hover, window.dialog.message .dialog-action-area > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
+treeview.view > header > button button.circular:hover, row.activatable button.circular:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical > button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover, filechooser #pathbarbox > stack > box > button:hover, window.dialog.message .dialog-action-area > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
 popover.background button.model:hover, headerbar button:hover:not(.suggested-action):not(.destructive-action), .toolbar button:hover,
 toolbar button:hover, dropdown > .linked:not(.vertical) > button:hover:not(:only-child),
 combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:hover {
@@ -526,8 +523,7 @@ combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:h
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:active, calendar > header > button:active, columnview.view > header > button button.circular:active,
-treeview.view > header > button button.circular:active, row.activatable button.circular:active, check:active,
-radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical > button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active, filechooser #pathbarbox > stack > box > button:active, window.dialog.message .dialog-action-area > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
+treeview.view > header > button button.circular:active, row.activatable button.circular:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical > button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active, filechooser #pathbarbox > stack > box > button:active, window.dialog.message .dialog-action-area > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
 popover.background button.model:active, headerbar button:active:not(.suggested-action):not(.destructive-action), .toolbar button:active,
 toolbar button:active, dropdown > .linked:not(.vertical) > button:active:not(:only-child),
 combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:active {
@@ -537,8 +533,7 @@ combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:disabled, calendar > header > button:disabled, columnview.view > header > button button.circular:disabled,
-treeview.view > header > button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
-radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical > button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled, filechooser #pathbarbox > stack > box > button:disabled, window.dialog.message .dialog-action-area > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
+treeview.view > header > button button.circular:disabled, row.activatable button.circular:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical > button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled, filechooser #pathbarbox > stack > box > button:disabled, window.dialog.message .dialog-action-area > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
 popover.background button.model:disabled, headerbar button:disabled:not(.suggested-action):not(.destructive-action), .toolbar button:disabled,
 toolbar button:disabled, dropdown > .linked:not(.vertical) > button:disabled:not(:only-child),
 combobox > .linked:not(.vertical) > button:disabled:not(:only-child), button.flat:disabled {
@@ -736,13 +731,11 @@ button.font > box > box > label, button.file > box > box > label {
   font-weight: bold;
 }
 
-windowcontrols button:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, check,
-radio, button.close, button.circular {
+windowcontrols button:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, button.close, button.circular {
   border-radius: 9999px;
 }
 
-windowcontrols button:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, check label,
-radio label, button.close label, button.circular label {
+windowcontrols button:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, button.close label, button.circular label {
   padding: 0;
 }
 
@@ -2533,58 +2526,64 @@ switch:focus slider, switch:hover slider, switch:focus:hover slider {
 checkbutton,
 radiobutton {
   outline: none;
-  border-spacing: 4px;
-}
-
-checkbutton.text-button,
-radiobutton.text-button {
-  padding: 2px;
-}
-
-checkbutton.text-button label:not(:only-child),
-radiobutton.text-button label:not(:only-child) {
-  margin: 0 4px;
+  border-spacing: 3px;
 }
 
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -8px;
-  padding: 8px;
-}
-
-check, check:focus,
-radio,
-radio:focus {
-  color: alpha(currentColor, 0.08);
+  min-height: 20px;
+  min-width: 20px;
+  margin: 3px;
+  padding: 0;
+  border-radius: 9999px;
+  color: transparent;
+  background-color: rgba(255, 255, 255, 0.12);
+  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
 }
 
 check:hover,
 radio:hover {
-  color: alpha(currentColor, 0.16);
+  box-shadow: 0 0 0 6px rgba(255, 255, 255, 0.04);
+  background-color: rgba(255, 255, 255, 0.15);
+}
+
+check:active,
+radio:active {
+  box-shadow: 0 0 0 6px rgba(255, 255, 255, 0.12);
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
+check:disabled,
+radio:disabled {
+  background-color: rgba(255, 255, 255, 0.04);
 }
 
 check:checked, check:indeterminate,
 radio:checked,
 radio:indeterminate {
-  color: #5b9bf8;
+  color: white;
+  background-color: #5b9bf8;
+}
+
+check:checked:hover, check:indeterminate:hover,
+radio:checked:hover,
+radio:indeterminate:hover {
+  box-shadow: 0 0 0 6px rgba(91, 155, 248, 0.15);
+  background-color: #8cb9fa;
+}
+
+check:checked:active, check:indeterminate:active,
+radio:checked:active,
+radio:indeterminate:active {
+  box-shadow: 0 0 0 6px rgba(91, 155, 248, 0.2);
+  background-color: #5b9bf8;
 }
 
 check:checked:disabled, check:indeterminate:disabled,
 radio:checked:disabled,
 radio:indeterminate:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
-check:disabled,
-radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-check:not(:hover):focus,
-radio:not(:hover):focus {
-  box-shadow: inset 0 0 0 9999px transparent;
+  color: rgba(255, 255, 255, 0.7);
+  background-color: rgba(91, 155, 248, 0.35);
 }
 
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
@@ -2593,27 +2592,14 @@ popover modelbutton.flat check, popover modelbutton.flat check:focus, popover mo
   background-image: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled):hover, popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled):hover {
-  color: inherit;
-}
-
-popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
-  box-shadow: none;
-  color: inherit;
-}
-
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
-  margin-left: -12px;
-  margin-right: -4px;
+  margin-left: -3px;
+  margin-right: 6px;
 }
 
 popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
-  margin-left: -4px;
-  margin-right: -12px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
 popover.menu check, popover.menu radio {
@@ -2623,56 +2609,47 @@ popover.menu check, popover.menu radio {
 }
 
 popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
+  margin-right: 6px;
+  margin-left: -3px;
 }
 
 popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(255, 255, 255, 0.7);
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled):hover, popover.menu radio:not(:checked):not(:indeterminate):not(:disabled):hover {
-  color: inherit;
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
+popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu check:checked:hover, popover.menu check:indeterminate:hover, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled, popover.menu radio:checked:hover, popover.menu radio:indeterminate:hover {
   box-shadow: none;
-  color: inherit;
 }
 
 
 check {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 }
 
 
 check:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic@2.svg")));
 }
 
 
 check:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic@2.svg")));
 }
 
 
 radio {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 }
 
 
 radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-checked-symbolic@2.svg")));
 }
 
 
 radio:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-mixed-symbolic@2.svg")));
 }
 
 
@@ -2680,83 +2657,65 @@ popover.menu check {
   min-height: 16px;
   min-width: 16px;
   -gtk-icon-size: 16px;
-  border-radius: 6px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
 }
 
 
 popover.menu check:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic@2.svg")));
 }
 
 
 popover.menu check:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic@2.svg")));
 }
 
 
 popover.menu radio {
   min-height: 16px;
   min-width: 16px;
-  border-image: none;
   -gtk-icon-size: 16px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
 }
 
 
 popover.menu radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic@2.svg")));
 }
 
 
 popover.menu radio:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic@2.svg")));
 }
 
-treeview.view check, treeview.view radio,
-columnview.view check,
-columnview.view radio {
-  padding: 0;
-  box-shadow: none;
-  background: none;
+check:not(:checked):active {
+  -gtk-icon-transform: rotate(90deg);
 }
 
-treeview.view check, treeview.view check:focus, treeview.view check:selected, treeview.view radio, treeview.view radio:focus, treeview.view radio:selected,
-columnview.view check,
-columnview.view check:focus,
-columnview.view check:selected,
+treeview.view radio, treeview.view check,
 columnview.view radio,
-columnview.view radio:focus,
-columnview.view radio:selected {
-  color: alpha(currentColor, 0.08);
+columnview.view check {
+  padding: 0;
+  margin: 0;
+  transition: none;
 }
 
-treeview.view check:hover, treeview.view radio:hover,
+treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate),
+columnview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate),
+columnview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+  background-color: rgba(255, 255, 255, 0.12);
+}
+
+treeview.view radio, treeview.view radio:hover, treeview.view radio:disabled, treeview.view radio:checked:hover, treeview.view radio:indeterminate:hover, treeview.view check, treeview.view check:hover, treeview.view check:disabled, treeview.view check:checked:hover, treeview.view check:indeterminate:hover,
+columnview.view radio,
+columnview.view radio:hover,
+columnview.view radio:disabled,
+columnview.view radio:checked:hover,
+columnview.view radio:indeterminate:hover,
+columnview.view check,
 columnview.view check:hover,
-columnview.view radio:hover {
-  color: alpha(currentColor, 0.16);
-}
-
-treeview.view check:checked, treeview.view check:indeterminate, treeview.view radio:checked, treeview.view radio:indeterminate,
-columnview.view check:checked,
-columnview.view check:indeterminate,
-columnview.view radio:checked,
-columnview.view radio:indeterminate {
-  color: #5b9bf8;
-}
-
-treeview.view check:checked:disabled, treeview.view check:indeterminate:disabled, treeview.view radio:checked:disabled, treeview.view radio:indeterminate:disabled,
-columnview.view check:checked:disabled,
-columnview.view check:indeterminate:disabled,
-columnview.view radio:checked:disabled,
-columnview.view radio:indeterminate:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
-treeview.view check:disabled, treeview.view radio:disabled,
 columnview.view check:disabled,
-columnview.view radio:disabled {
-  color: alpha(currentColor, 0.05);
+columnview.view check:checked:hover,
+columnview.view check:indeterminate:hover {
+  box-shadow: none;
 }
 
 treeview.view:hover check, treeview.view:hover radio, treeview.view:selected check, treeview.view:selected radio, treeview.view:focus check, treeview.view:focus radio, treeview.view:focus-within check, treeview.view:focus-within radio,
@@ -2772,11 +2731,6 @@ columnview.view:focus-within radio {
   background-color: transparent;
 }
 
-treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
-}
-
 /************
  * GtkScale *
  ************/
diff --git a/src/main/gtk-4.0/gtk-light.css b/src/main/gtk-4.0/gtk-light.css
index 4dd3745b..de3f0227 100644
--- a/src/main/gtk-4.0/gtk-light.css
+++ b/src/main/gtk-4.0/gtk-light.css
@@ -493,8 +493,7 @@ button:drop(active) {
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button, calendar > header > button, columnview.view > header > button button.circular,
-treeview.view > header > button button.circular, row.activatable button.circular, check,
-radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical > button, spinbutton:not(.vertical) > button, modelbutton.flat, filechooser #pathbarbox > stack > box > button, window.dialog.message .dialog-action-area > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
+treeview.view > header > button button.circular, row.activatable button.circular, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical > button, spinbutton:not(.vertical) > button, modelbutton.flat, filechooser #pathbarbox > stack > box > button, window.dialog.message .dialog-action-area > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
 popover.background button.model, headerbar button:not(.suggested-action):not(.destructive-action), .toolbar button,
 toolbar button, dropdown > .linked:not(.vertical) > button:not(:only-child),
 combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
@@ -506,8 +505,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:focus, calendar > header > button:focus, columnview.view > header > button button.circular:focus,
-treeview.view > header > button button.circular:focus, row.activatable button.circular:focus, check:focus,
-radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical > button:focus, spinbutton:not(.vertical) > button:focus, modelbutton.flat:focus, filechooser #pathbarbox > stack > box > button:focus, window.dialog.message .dialog-action-area > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
+treeview.view > header > button button.circular:focus, row.activatable button.circular:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical > button:focus, spinbutton:not(.vertical) > button:focus, modelbutton.flat:focus, filechooser #pathbarbox > stack > box > button:focus, window.dialog.message .dialog-action-area > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
 popover.background button.model:focus, headerbar button:focus:not(.suggested-action):not(.destructive-action), .toolbar button:focus,
 toolbar button:focus, dropdown > .linked:not(.vertical) > button:focus:not(:only-child),
 combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:focus {
@@ -516,8 +514,7 @@ combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:f
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:hover, calendar > header > button:hover, columnview.view > header > button button.circular:hover,
-treeview.view > header > button button.circular:hover, row.activatable button.circular:hover, check:hover,
-radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical > button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover, filechooser #pathbarbox > stack > box > button:hover, window.dialog.message .dialog-action-area > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
+treeview.view > header > button button.circular:hover, row.activatable button.circular:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical > button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover, filechooser #pathbarbox > stack > box > button:hover, window.dialog.message .dialog-action-area > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
 popover.background button.model:hover, headerbar button:hover:not(.suggested-action):not(.destructive-action), .toolbar button:hover,
 toolbar button:hover, dropdown > .linked:not(.vertical) > button:hover:not(:only-child),
 combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:hover {
@@ -526,8 +523,7 @@ combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:h
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:active, calendar > header > button:active, columnview.view > header > button button.circular:active,
-treeview.view > header > button button.circular:active, row.activatable button.circular:active, check:active,
-radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical > button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active, filechooser #pathbarbox > stack > box > button:active, window.dialog.message .dialog-action-area > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
+treeview.view > header > button button.circular:active, row.activatable button.circular:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical > button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active, filechooser #pathbarbox > stack > box > button:active, window.dialog.message .dialog-action-area > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
 popover.background button.model:active, headerbar button:active:not(.suggested-action):not(.destructive-action), .toolbar button:active,
 toolbar button:active, dropdown > .linked:not(.vertical) > button:active:not(:only-child),
 combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:active {
@@ -537,8 +533,7 @@ combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:disabled, calendar > header > button:disabled, columnview.view > header > button button.circular:disabled,
-treeview.view > header > button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
-radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical > button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled, filechooser #pathbarbox > stack > box > button:disabled, window.dialog.message .dialog-action-area > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
+treeview.view > header > button button.circular:disabled, row.activatable button.circular:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical > button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled, filechooser #pathbarbox > stack > box > button:disabled, window.dialog.message .dialog-action-area > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
 popover.background button.model:disabled, headerbar button:disabled:not(.suggested-action):not(.destructive-action), .toolbar button:disabled,
 toolbar button:disabled, dropdown > .linked:not(.vertical) > button:disabled:not(:only-child),
 combobox > .linked:not(.vertical) > button:disabled:not(:only-child), button.flat:disabled {
@@ -736,13 +731,11 @@ button.font > box > box > label, button.file > box > box > label {
   font-weight: bold;
 }
 
-windowcontrols button:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, check,
-radio, button.close, button.circular {
+windowcontrols button:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, button.close, button.circular {
   border-radius: 9999px;
 }
 
-windowcontrols button:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, check label,
-radio label, button.close label, button.circular label {
+windowcontrols button:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, button.close label, button.circular label {
   padding: 0;
 }
 
@@ -2541,58 +2534,64 @@ switch:focus slider, switch:hover slider, switch:focus:hover slider {
 checkbutton,
 radiobutton {
   outline: none;
-  border-spacing: 4px;
-}
-
-checkbutton.text-button,
-radiobutton.text-button {
-  padding: 2px;
-}
-
-checkbutton.text-button label:not(:only-child),
-radiobutton.text-button label:not(:only-child) {
-  margin: 0 4px;
+  border-spacing: 3px;
 }
 
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -8px;
-  padding: 8px;
-}
-
-check, check:focus,
-radio,
-radio:focus {
-  color: alpha(currentColor, 0.08);
+  min-height: 20px;
+  min-width: 20px;
+  margin: 3px;
+  padding: 0;
+  border-radius: 9999px;
+  color: transparent;
+  background-color: rgba(0, 0, 0, 0.12);
+  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
 }
 
 check:hover,
 radio:hover {
-  color: alpha(currentColor, 0.16);
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.04);
+  background-color: rgba(0, 0, 0, 0.15);
+}
+
+check:active,
+radio:active {
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.12);
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+check:disabled,
+radio:disabled {
+  background-color: rgba(0, 0, 0, 0.04);
 }
 
 check:checked, check:indeterminate,
 radio:checked,
 radio:indeterminate {
-  color: #3c84f7;
+  color: white;
+  background-color: #3c84f7;
+}
+
+check:checked:hover, check:indeterminate:hover,
+radio:checked:hover,
+radio:indeterminate:hover {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.15);
+  background-color: #6da3f9;
+}
+
+check:checked:active, check:indeterminate:active,
+radio:checked:active,
+radio:indeterminate:active {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.2);
+  background-color: #3c84f7;
 }
 
 check:checked:disabled, check:indeterminate:disabled,
 radio:checked:disabled,
 radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-check:disabled,
-radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-check:not(:hover):focus,
-radio:not(:hover):focus {
-  box-shadow: inset 0 0 0 9999px transparent;
+  color: rgba(255, 255, 255, 0.7);
+  background-color: rgba(60, 132, 247, 0.35);
 }
 
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
@@ -2601,27 +2600,14 @@ popover modelbutton.flat check, popover modelbutton.flat check:focus, popover mo
   background-image: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled):hover, popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled):hover {
-  color: inherit;
-}
-
-popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
-  box-shadow: none;
-  color: inherit;
-}
-
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
-  margin-left: -12px;
-  margin-right: -4px;
+  margin-left: -3px;
+  margin-right: 6px;
 }
 
 popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
-  margin-left: -4px;
-  margin-right: -12px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
 popover.menu check, popover.menu radio {
@@ -2631,56 +2617,47 @@ popover.menu check, popover.menu radio {
 }
 
 popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
+  margin-right: 6px;
+  margin-left: -3px;
 }
 
 popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled):hover, popover.menu radio:not(:checked):not(:indeterminate):not(:disabled):hover {
-  color: inherit;
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
+popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu check:checked:hover, popover.menu check:indeterminate:hover, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled, popover.menu radio:checked:hover, popover.menu radio:indeterminate:hover {
   box-shadow: none;
-  color: inherit;
 }
 
 
 check {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 }
 
 
 check:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic@2.svg")));
 }
 
 
 check:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic@2.svg")));
 }
 
 
 radio {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 }
 
 
 radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-checked-symbolic@2.svg")));
 }
 
 
 radio:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-mixed-symbolic@2.svg")));
 }
 
 
@@ -2688,83 +2665,65 @@ popover.menu check {
   min-height: 16px;
   min-width: 16px;
   -gtk-icon-size: 16px;
-  border-radius: 6px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
 }
 
 
 popover.menu check:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic@2.svg")));
 }
 
 
 popover.menu check:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic@2.svg")));
 }
 
 
 popover.menu radio {
   min-height: 16px;
   min-width: 16px;
-  border-image: none;
   -gtk-icon-size: 16px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
 }
 
 
 popover.menu radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic@2.svg")));
 }
 
 
 popover.menu radio:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic@2.svg")));
 }
 
-treeview.view check, treeview.view radio,
-columnview.view check,
-columnview.view radio {
-  padding: 0;
-  box-shadow: none;
-  background: none;
+check:not(:checked):active {
+  -gtk-icon-transform: rotate(90deg);
 }
 
-treeview.view check, treeview.view check:focus, treeview.view check:selected, treeview.view radio, treeview.view radio:focus, treeview.view radio:selected,
-columnview.view check,
-columnview.view check:focus,
-columnview.view check:selected,
+treeview.view radio, treeview.view check,
 columnview.view radio,
-columnview.view radio:focus,
-columnview.view radio:selected {
-  color: alpha(currentColor, 0.08);
+columnview.view check {
+  padding: 0;
+  margin: 0;
+  transition: none;
 }
 
-treeview.view check:hover, treeview.view radio:hover,
+treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate),
+columnview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate),
+columnview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+treeview.view radio, treeview.view radio:hover, treeview.view radio:disabled, treeview.view radio:checked:hover, treeview.view radio:indeterminate:hover, treeview.view check, treeview.view check:hover, treeview.view check:disabled, treeview.view check:checked:hover, treeview.view check:indeterminate:hover,
+columnview.view radio,
+columnview.view radio:hover,
+columnview.view radio:disabled,
+columnview.view radio:checked:hover,
+columnview.view radio:indeterminate:hover,
+columnview.view check,
 columnview.view check:hover,
-columnview.view radio:hover {
-  color: alpha(currentColor, 0.16);
-}
-
-treeview.view check:checked, treeview.view check:indeterminate, treeview.view radio:checked, treeview.view radio:indeterminate,
-columnview.view check:checked,
-columnview.view check:indeterminate,
-columnview.view radio:checked,
-columnview.view radio:indeterminate {
-  color: #3c84f7;
-}
-
-treeview.view check:checked:disabled, treeview.view check:indeterminate:disabled, treeview.view radio:checked:disabled, treeview.view radio:indeterminate:disabled,
-columnview.view check:checked:disabled,
-columnview.view check:indeterminate:disabled,
-columnview.view radio:checked:disabled,
-columnview.view radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-treeview.view check:disabled, treeview.view radio:disabled,
 columnview.view check:disabled,
-columnview.view radio:disabled {
-  color: alpha(currentColor, 0.05);
+columnview.view check:checked:hover,
+columnview.view check:indeterminate:hover {
+  box-shadow: none;
 }
 
 treeview.view:hover check, treeview.view:hover radio, treeview.view:selected check, treeview.view:selected radio, treeview.view:focus check, treeview.view:focus radio, treeview.view:focus-within check, treeview.view:focus-within radio,
@@ -2780,11 +2739,6 @@ columnview.view:focus-within radio {
   background-color: transparent;
 }
 
-treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
-}
-
 /************
  * GtkScale *
  ************/
diff --git a/src/main/gtk-4.0/gtk.css b/src/main/gtk-4.0/gtk.css
index 4d6970a5..faae408f 100644
--- a/src/main/gtk-4.0/gtk.css
+++ b/src/main/gtk-4.0/gtk.css
@@ -493,8 +493,7 @@ button:drop(active) {
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button, calendar > header > button, columnview.view > header > button button.circular,
-treeview.view > header > button button.circular, row.activatable button.circular, check,
-radio, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical > button, spinbutton:not(.vertical) > button, modelbutton.flat, filechooser #pathbarbox > stack > box > button, window.dialog.message .dialog-action-area > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
+treeview.view > header > button button.circular, row.activatable button.circular, scrollbar button, notebook > header > tabs > arrow, spinbutton.vertical > button, spinbutton:not(.vertical) > button, modelbutton.flat, filechooser #pathbarbox > stack > box > button, window.dialog.message .dialog-action-area > button, .app-notification button, actionbar > revealer > box button:not(.suggested-action):not(.destructive-action), popover.background.menu button,
 popover.background button.model, headerbar button:not(.suggested-action):not(.destructive-action), .toolbar button,
 toolbar button, dropdown > .linked:not(.vertical) > button:not(:only-child),
 combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
@@ -506,8 +505,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child), button.flat {
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:focus, calendar > header > button:focus, columnview.view > header > button button.circular:focus,
-treeview.view > header > button button.circular:focus, row.activatable button.circular:focus, check:focus,
-radio:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical > button:focus, spinbutton:not(.vertical) > button:focus, modelbutton.flat:focus, filechooser #pathbarbox > stack > box > button:focus, window.dialog.message .dialog-action-area > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
+treeview.view > header > button button.circular:focus, row.activatable button.circular:focus, scrollbar button:focus, notebook > header > tabs > arrow:focus, spinbutton.vertical > button:focus, spinbutton:not(.vertical) > button:focus, modelbutton.flat:focus, filechooser #pathbarbox > stack > box > button:focus, window.dialog.message .dialog-action-area > button:focus, .app-notification button:focus, actionbar > revealer > box button:focus:not(.suggested-action):not(.destructive-action), popover.background.menu button:focus,
 popover.background button.model:focus, headerbar button:focus:not(.suggested-action):not(.destructive-action), .toolbar button:focus,
 toolbar button:focus, dropdown > .linked:not(.vertical) > button:focus:not(:only-child),
 combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:focus {
@@ -516,8 +514,7 @@ combobox > .linked:not(.vertical) > button:focus:not(:only-child), button.flat:f
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:hover, calendar > header > button:hover, columnview.view > header > button button.circular:hover,
-treeview.view > header > button button.circular:hover, row.activatable button.circular:hover, check:hover,
-radio:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical > button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover, filechooser #pathbarbox > stack > box > button:hover, window.dialog.message .dialog-action-area > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
+treeview.view > header > button button.circular:hover, row.activatable button.circular:hover, scrollbar button:hover, notebook > header > tabs > arrow:hover, spinbutton.vertical > button:hover, spinbutton:not(.vertical) > button:hover, modelbutton.flat:hover, filechooser #pathbarbox > stack > box > button:hover, window.dialog.message .dialog-action-area > button:hover, .app-notification button:hover, actionbar > revealer > box button:hover:not(.suggested-action):not(.destructive-action), popover.background.menu button:hover,
 popover.background button.model:hover, headerbar button:hover:not(.suggested-action):not(.destructive-action), .toolbar button:hover,
 toolbar button:hover, dropdown > .linked:not(.vertical) > button:hover:not(:only-child),
 combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:hover {
@@ -526,8 +523,7 @@ combobox > .linked:not(.vertical) > button:hover:not(:only-child), button.flat:h
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:active, calendar > header > button:active, columnview.view > header > button button.circular:active,
-treeview.view > header > button button.circular:active, row.activatable button.circular:active, check:active,
-radio:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical > button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active, filechooser #pathbarbox > stack > box > button:active, window.dialog.message .dialog-action-area > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
+treeview.view > header > button button.circular:active, row.activatable button.circular:active, scrollbar button:active, notebook > header > tabs > arrow:active, spinbutton.vertical > button:active, spinbutton:not(.vertical) > button:active, modelbutton.flat:active, filechooser #pathbarbox > stack > box > button:active, window.dialog.message .dialog-action-area > button:active, .app-notification button:active, actionbar > revealer > box button:active:not(.suggested-action):not(.destructive-action), popover.background.menu button:active,
 popover.background button.model:active, headerbar button:active:not(.suggested-action):not(.destructive-action), .toolbar button:active,
 toolbar button:active, dropdown > .linked:not(.vertical) > button:active:not(:only-child),
 combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:active {
@@ -537,8 +533,7 @@ combobox > .linked:not(.vertical) > button:active:not(:only-child), button.flat:
 }
 
 placessidebar .navigation-sidebar > row button.sidebar-button:disabled, calendar > header > button:disabled, columnview.view > header > button button.circular:disabled,
-treeview.view > header > button button.circular:disabled, row.activatable button.circular:disabled, check:disabled,
-radio:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical > button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled, filechooser #pathbarbox > stack > box > button:disabled, window.dialog.message .dialog-action-area > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
+treeview.view > header > button button.circular:disabled, row.activatable button.circular:disabled, scrollbar button:disabled, notebook > header > tabs > arrow:disabled, spinbutton.vertical > button:disabled, spinbutton:not(.vertical) > button:disabled, modelbutton.flat:disabled, filechooser #pathbarbox > stack > box > button:disabled, window.dialog.message .dialog-action-area > button:disabled, .app-notification button:disabled, actionbar > revealer > box button:disabled:not(.suggested-action):not(.destructive-action), popover.background.menu button:disabled,
 popover.background button.model:disabled, headerbar button:disabled:not(.suggested-action):not(.destructive-action), .toolbar button:disabled,
 toolbar button:disabled, dropdown > .linked:not(.vertical) > button:disabled:not(:only-child),
 combobox > .linked:not(.vertical) > button:disabled:not(:only-child), button.flat:disabled {
@@ -736,13 +731,11 @@ button.font > box > box > label, button.file > box > box > label {
   font-weight: bold;
 }
 
-windowcontrols button:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, check,
-radio, button.close, button.circular {
+windowcontrols button:not(.suggested-action):not(.destructive-action), filechooser #pathbarbox > stack > box > button, button.close, button.circular {
   border-radius: 9999px;
 }
 
-windowcontrols button:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, check label,
-radio label, button.close label, button.circular label {
+windowcontrols button:not(.suggested-action):not(.destructive-action) label, filechooser #pathbarbox > stack > box > button label, button.close label, button.circular label {
   padding: 0;
 }
 
@@ -2550,58 +2543,64 @@ switch:focus slider, switch:hover slider, switch:focus:hover slider {
 checkbutton,
 radiobutton {
   outline: none;
-  border-spacing: 4px;
-}
-
-checkbutton.text-button,
-radiobutton.text-button {
-  padding: 2px;
-}
-
-checkbutton.text-button label:not(:only-child),
-radiobutton.text-button label:not(:only-child) {
-  margin: 0 4px;
+  border-spacing: 3px;
 }
 
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -8px;
-  padding: 8px;
-}
-
-check, check:focus,
-radio,
-radio:focus {
-  color: alpha(currentColor, 0.08);
+  min-height: 20px;
+  min-width: 20px;
+  margin: 3px;
+  padding: 0;
+  border-radius: 9999px;
+  color: transparent;
+  background-color: rgba(0, 0, 0, 0.12);
+  transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
 }
 
 check:hover,
 radio:hover {
-  color: alpha(currentColor, 0.16);
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.04);
+  background-color: rgba(0, 0, 0, 0.15);
+}
+
+check:active,
+radio:active {
+  box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.12);
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+check:disabled,
+radio:disabled {
+  background-color: rgba(0, 0, 0, 0.04);
 }
 
 check:checked, check:indeterminate,
 radio:checked,
 radio:indeterminate {
-  color: #3c84f7;
+  color: white;
+  background-color: #3c84f7;
+}
+
+check:checked:hover, check:indeterminate:hover,
+radio:checked:hover,
+radio:indeterminate:hover {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.15);
+  background-color: #6da3f9;
+}
+
+check:checked:active, check:indeterminate:active,
+radio:checked:active,
+radio:indeterminate:active {
+  box-shadow: 0 0 0 6px rgba(60, 132, 247, 0.2);
+  background-color: #3c84f7;
 }
 
 check:checked:disabled, check:indeterminate:disabled,
 radio:checked:disabled,
 radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-check:disabled,
-radio:disabled {
-  color: alpha(currentColor, 0.05);
-}
-
-check:not(:hover):focus,
-radio:not(:hover):focus {
-  box-shadow: inset 0 0 0 9999px transparent;
+  color: rgba(255, 255, 255, 0.7);
+  background-color: rgba(60, 132, 247, 0.35);
 }
 
 popover modelbutton.flat check, popover modelbutton.flat check:focus, popover modelbutton.flat check:hover, popover modelbutton.flat check:focus:hover, popover modelbutton.flat check:active, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:focus, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:focus:hover, popover modelbutton.flat radio:active, popover modelbutton.flat radio:disabled {
@@ -2610,27 +2609,14 @@ popover modelbutton.flat check, popover modelbutton.flat check:focus, popover mo
   background-image: none;
 }
 
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled), popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover modelbutton.flat check:not(:checked):not(:indeterminate):not(:disabled):hover, popover modelbutton.flat radio:not(:checked):not(:indeterminate):not(:disabled):hover {
-  color: inherit;
-}
-
-popover modelbutton.flat check, popover modelbutton.flat check:hover, popover modelbutton.flat check:disabled, popover modelbutton.flat radio, popover modelbutton.flat radio:hover, popover modelbutton.flat radio:disabled {
-  box-shadow: none;
-  color: inherit;
-}
-
 popover modelbutton.flat check.left:dir(rtl), popover modelbutton.flat radio.left:dir(rtl) {
-  margin-left: -12px;
-  margin-right: -4px;
+  margin-left: -3px;
+  margin-right: 6px;
 }
 
 popover modelbutton.flat check.right:dir(ltr), popover modelbutton.flat radio.right:dir(ltr) {
-  margin-left: -4px;
-  margin-right: -12px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
 popover.menu check, popover.menu radio {
@@ -2640,56 +2626,47 @@ popover.menu check, popover.menu radio {
 }
 
 popover.menu check:dir(ltr), popover.menu radio:dir(ltr) {
-  margin-right: 8px;
+  margin-right: 6px;
+  margin-left: -3px;
 }
 
 popover.menu check:dir(rtl), popover.menu radio:dir(rtl) {
-  margin-left: 8px;
+  margin-left: 6px;
+  margin-right: -3px;
 }
 
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled), popover.menu radio:not(:checked):not(:indeterminate):not(:disabled) {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-popover.menu check:not(:checked):not(:indeterminate):not(:disabled):hover, popover.menu radio:not(:checked):not(:indeterminate):not(:disabled):hover {
-  color: inherit;
-}
-
-popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled {
+popover.menu check, popover.menu check:hover, popover.menu check:disabled, popover.menu check:checked:hover, popover.menu check:indeterminate:hover, popover.menu radio, popover.menu radio:hover, popover.menu radio:disabled, popover.menu radio:checked:hover, popover.menu radio:indeterminate:hover {
   box-shadow: none;
-  color: inherit;
 }
 
 
 check {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 }
 
 
 check:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic@2.svg")));
 }
 
 
 check:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic@2.svg")));
 }
 
 
 radio {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 }
 
 
 radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-checked-symbolic@2.svg")));
 }
 
 
 radio:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-mixed-symbolic@2.svg")));
 }
 
 
@@ -2697,83 +2674,65 @@ popover.menu check {
   min-height: 16px;
   min-width: 16px;
   -gtk-icon-size: 16px;
-  border-radius: 6px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
 }
 
 
 popover.menu check:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic@2.svg")));
 }
 
 
 popover.menu check:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic@2.svg")));
 }
 
 
 popover.menu radio {
   min-height: 16px;
   min-width: 16px;
-  border-image: none;
   -gtk-icon-size: 16px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
 }
 
 
 popover.menu radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic@2.svg")));
 }
 
 
 popover.menu radio:indeterminate {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg"));
+  -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic@2.svg")));
 }
 
-treeview.view check, treeview.view radio,
-columnview.view check,
-columnview.view radio {
-  padding: 0;
-  box-shadow: none;
-  background: none;
+check:not(:checked):active {
+  -gtk-icon-transform: rotate(90deg);
 }
 
-treeview.view check, treeview.view check:focus, treeview.view check:selected, treeview.view radio, treeview.view radio:focus, treeview.view radio:selected,
-columnview.view check,
-columnview.view check:focus,
-columnview.view check:selected,
+treeview.view radio, treeview.view check,
 columnview.view radio,
-columnview.view radio:focus,
-columnview.view radio:selected {
-  color: alpha(currentColor, 0.08);
+columnview.view check {
+  padding: 0;
+  margin: 0;
+  transition: none;
 }
 
-treeview.view check:hover, treeview.view radio:hover,
+treeview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate), treeview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate),
+columnview.view radio:not(:hover):not(:disabled):not(:checked):not(:indeterminate),
+columnview.view check:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+  background-color: rgba(0, 0, 0, 0.12);
+}
+
+treeview.view radio, treeview.view radio:hover, treeview.view radio:disabled, treeview.view radio:checked:hover, treeview.view radio:indeterminate:hover, treeview.view check, treeview.view check:hover, treeview.view check:disabled, treeview.view check:checked:hover, treeview.view check:indeterminate:hover,
+columnview.view radio,
+columnview.view radio:hover,
+columnview.view radio:disabled,
+columnview.view radio:checked:hover,
+columnview.view radio:indeterminate:hover,
+columnview.view check,
 columnview.view check:hover,
-columnview.view radio:hover {
-  color: alpha(currentColor, 0.16);
-}
-
-treeview.view check:checked, treeview.view check:indeterminate, treeview.view radio:checked, treeview.view radio:indeterminate,
-columnview.view check:checked,
-columnview.view check:indeterminate,
-columnview.view radio:checked,
-columnview.view radio:indeterminate {
-  color: #3c84f7;
-}
-
-treeview.view check:checked:disabled, treeview.view check:indeterminate:disabled, treeview.view radio:checked:disabled, treeview.view radio:indeterminate:disabled,
-columnview.view check:checked:disabled,
-columnview.view check:indeterminate:disabled,
-columnview.view radio:checked:disabled,
-columnview.view radio:indeterminate:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
-treeview.view check:disabled, treeview.view radio:disabled,
 columnview.view check:disabled,
-columnview.view radio:disabled {
-  color: alpha(currentColor, 0.05);
+columnview.view check:checked:hover,
+columnview.view check:indeterminate:hover {
+  box-shadow: none;
 }
 
 treeview.view:hover check, treeview.view:hover radio, treeview.view:selected check, treeview.view:selected radio, treeview.view:focus check, treeview.view:focus radio, treeview.view:focus-within check, treeview.view:focus-within radio,
@@ -2789,11 +2748,6 @@ columnview.view:focus-within radio {
   background-color: transparent;
 }
 
-treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
-}
-
 /************
  * GtkScale *
  ************/
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 0c608ce3..66c3d1ad 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2244,33 +2244,51 @@ radiobutton.text-button {
   label:not(:only-child) { margin: 0 4px; }
 }
 
-$check_radio_size: 32px;
-
 check,
 radio {
-  min-height: 24px;
-  min-width: 24px;
-  margin: -($check_radio_size - 24px) / 2;
-  padding: ($check_radio_size - 24px) / 2;
+  min-height: 20px;
+  min-width: 20px;
+  margin: $space-size / 2;
+  padding: 0;
+  border-radius: $circular-radius;
+  color: transparent;
+  background-color: $divider;
+  transition: $transition,
+              box-shadow $ripple-fade-out-duration / 2 $ease-out;
 
-  @extend %button-flat-simple;
-  @extend %circular-button;
-
-  &, &:focus { color: $overlay-focus; }
-
-  &:hover { color: $overlay-focus-hover; }
-
-  &:checked, &:indeterminate {
-    color: $primary;
-
-    &:disabled { color: $text-secondary-disabled; }
+  &:hover {
+    box-shadow: 0 0 0 6px $fill;
+    background-color: rgba($text, 0.15);
   }
 
-  &:disabled { color: $overlay-normal; }
+  &:active {
+    box-shadow: 0 0 0 6px $divider;
+    background-color: rgba($text, 0.20);
+  }
 
-  &:not(:hover):focus { box-shadow: inset 0 0 0 9999px transparent; }
+  &:disabled {
+    background-color: $fill;
+  }
 
-  // &:only-child { margin: -12px; }
+  &:checked, &:indeterminate {
+    color: on($primary);
+    background-color: $primary;
+
+    &:hover {
+      box-shadow: 0 0 0 6px rgba($primary, 0.15);
+      background-color: lighten($primary, 10%);
+    }
+
+    &:active {
+      box-shadow: 0 0 0 6px rgba($primary, 0.20);
+      background-color: $primary;
+    }
+
+    &:disabled {
+      color: on($primary, disabled);
+      background-color: rgba($primary, 0.35);
+    }
+  }
 
   popover modelbutton.flat & {
     &, &:focus, &:hover, &:focus:hover, &:active, &:disabled {
@@ -2280,13 +2298,13 @@ radio {
     }
 
     &.left:dir(rtl) {
-      margin-left: -12px;
-      margin-right: -4px;
+      margin-left: -$space-size / 2;
+      margin-right: $space-size;
     }
 
     &.right:dir(ltr) {
-      margin-left: -4px;
-      margin-right: -12px;
+      margin-left: $space-size;
+      margin-right: -$space-size / 2;
     }
   }
 
@@ -2295,11 +2313,17 @@ radio {
     margin: 0; // this is a workaround for a menu check/radio size allocation issue
     padding: 0;
 
-    &:dir(ltr) { margin-right: 8px; }
+    &:dir(ltr) {
+      margin-right: $space-size;
+      margin-left: -$space-size / 2;
+    }
 
-    &:dir(rtl) { margin-left: 8px; }
+    &:dir(rtl) {
+      margin-left: $space-size;
+      margin-right: -$space-size / 2;
+    }
 
-    &, &:hover, &:disabled {
+    &, &:hover, &:disabled, &:checked:hover, &:indeterminate:hover {
       box-shadow: none;
     }
   }
@@ -2307,47 +2331,31 @@ radio {
 
 %check,
 check {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
-
   &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")); }
-
   &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")); }
 }
 
 %radio,
 radio {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
-
   &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")); }
-
   &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")); }
 }
 
 %small_check,
 menu menuitem check {
-  & {
-    min-height: 16px;
-    min-width: 16px;
-    border-radius: $corner-radius;
-    -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
-  }
+  min-height: 16px;
+  min-width: 16px;
 
   &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg")); }
-
   &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg")); }
 }
 
 %small_radio,
 menu menuitem radio {
-  & {
-    min-height: 16px;
-    min-width: 16px;
-    border-image: none;
-    -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
-  }
+  min-height: 16px;
+  min-width: 16px;
 
   &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg")); }
-
   &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg")); }
 }
 
@@ -2361,48 +2369,29 @@ check:not(:checked):active { -gtk-icon-transform: rotate(90deg); }
 check:not(:checked):indeterminate:active,
 radio:not(:checked):indeterminate:active { -gtk-icon-transform: scaleX(-1); } // instead of rotateY(180deg)
 
-check:not(:checked),
-radio:not(:checked) {
-  transition: $transition,
-              background-size $ripple-fade-out-duration $ease-out,
-              background-image $ripple-fade-out-opacity-duration $ease-out,
-              -gtk-icon-transform 0;
+treeview.view {
+  radio, check {
+    padding: 0;
+    margin: 0;
 
-  &:active {
-    transition: $transition,
-                background-size 0,
-                background-image 0,
-                -gtk-icon-transform 0;
+    &:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+      background-color: $divider;
+    }
+
+    &, &:hover, &:disabled, &:checked:hover, &:indeterminate:hover {
+      box-shadow: none;
+    }
   }
 
-  menu menuitem & { transition: none; }
-}
-
-treeview.view check,
-treeview.view radio {
-  padding: 0;
-
-  &:hover, &:selected {
-    box-shadow: none;
-    background-color: transparent;
+  &:selected, &:selected:focused {
+    radio, check {
+      &:checked, &:indeterminate {
+        background-color: $primary;
+        color: on($primary);
+        background-image: none;
+      }
+    }
   }
-
-  &, &:focus, &:selected { color: $overlay-focus; }
-
-  &:hover { color: $overlay-focus-hover; }
-
-  &:checked, &:indeterminate {
-    color: $primary;
-
-    &:disabled { color: $text-secondary-disabled; }
-  }
-
-  &:disabled { color: $overlay-normal; }
-}
-
-treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
 }
 
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 4005f9a3..bdeb3b82 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2424,43 +2424,54 @@ switch {
 checkbutton,
 radiobutton {
   outline: none;
-  border-spacing: 4px;
+  border-spacing: $space-size / 2;
 }
 
-checkbutton.text-button,
-radiobutton.text-button {
-  // this is for a nice focus on check and radios text
-  padding: 2px;
-
-  label:not(:only-child) { margin: 0 4px; }
-}
-
-$check_radio_size: 40px;
-$check_radio_icon_size: ($space-size + 6px) * 2;
-
 check,
 radio {
-  min-height: $check_radio_icon_size;
-  min-width: $check_radio_icon_size;
-  margin: -($space-size + 2px);
-  padding: ($space-size + 2px);
+  min-height: 20px;
+  min-width: 20px;
+  margin: $space-size / 2;
+  padding: 0;
+  border-radius: $circular-radius;
+  color: transparent;
+  background-color: $divider;
+  transition: $transition,
+              box-shadow $ripple-fade-out-duration / 2 $ease-out;
 
-  @extend %button-flat-simple;
-  @extend %circular-button;
-
-  &, &:focus { color: $overlay-focus; }
-
-  &:hover { color: $overlay-focus-hover; }
-
-  &:checked, &:indeterminate {
-    color: $primary;
-
-    &:disabled { color: $text-secondary-disabled; }
+  &:hover {
+    box-shadow: 0 0 0 6px $fill;
+    background-color: rgba($text, 0.15);
   }
 
-  &:disabled { color: $overlay-normal; }
+  &:active {
+    box-shadow: 0 0 0 6px $divider;
+    background-color: rgba($text, 0.20);
+  }
 
-  &:not(:hover):focus { box-shadow: inset 0 0 0 9999px transparent; }
+  &:disabled {
+    background-color: $fill;
+  }
+
+  &:checked, &:indeterminate {
+    color: on($primary);
+    background-color: $primary;
+
+    &:hover {
+      box-shadow: 0 0 0 6px rgba($primary, 0.15);
+      background-color: lighten($primary, 10%);
+    }
+
+    &:active {
+      box-shadow: 0 0 0 6px rgba($primary, 0.20);
+      background-color: $primary;
+    }
+
+    &:disabled {
+      color: on($primary, secondary);
+      background-color: rgba($primary, 0.35);
+    }
+  }
 
   popover modelbutton.flat & {
     &, &:focus, &:hover, &:focus:hover, &:active, &:disabled {
@@ -2469,27 +2480,14 @@ radio {
       background-image: none;
     }
 
-    &:not(:checked):not(:indeterminate):not(:disabled) {
-      color: $text-secondary;
-
-      &:hover {
-        color: inherit;
-      }
-    }
-
-    &, &:hover, &:disabled {
-      box-shadow: none;
-      color: inherit;
-    }
-
     &.left:dir(rtl) {
-      margin-left: -12px;
-      margin-right: -4px;
+      margin-left: -$space-size / 2;
+      margin-right: $space-size;
     }
 
     &.right:dir(ltr) {
-      margin-left: -4px;
-      margin-right: -12px;
+      margin-left: $space-size;
+      margin-right: -$space-size / 2;
     }
   }
 
@@ -2498,98 +2496,79 @@ radio {
     margin: 0; // this is a workaround for a menu check/radio size allocation issue
     padding: 0;
 
-    &:dir(ltr) { margin-right: 8px; }
-
-    &:dir(rtl) { margin-left: 8px; }
-
-    &:not(:checked):not(:indeterminate):not(:disabled) {
-      color: $text-secondary;
-
-      &:hover {
-        color: inherit;
-      }
+    &:dir(ltr) {
+      margin-right: $space-size;
+      margin-left: -$space-size / 2;
     }
 
-    &, &:hover, &:disabled {
+    &:dir(rtl) {
+      margin-left: $space-size;
+      margin-right: -$space-size / 2;
+    }
+
+    &, &:hover, &:disabled, &:checked:hover, &:indeterminate:hover {
       box-shadow: none;
-      color: inherit;
     }
   }
 }
 
 %check,
 check {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 
-  &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")); }
-
-  &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")); }
+  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-checked-symbolic@2.svg"))); }
+  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/checkbox-mixed-symbolic@2.svg"))); }
 }
 
 %radio,
 radio {
-  -gtk-icon-size: 24px;
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-unchecked-symbolic.svg"));
+  -gtk-icon-size: 20px;
 
-  &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")); }
-
-  &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")); }
+  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-checked-symbolic@2.svg"))); }
+  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/radio-mixed-symbolic@2.svg"))); }
 }
 
 %small_check,
 popover.menu check {
-  & {
-    min-height: 16px;
-    min-width: 16px;
-    -gtk-icon-size: 16px;
-    border-radius: $corner-radius;
-    -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-unchecked-symbolic.svg"));
-  }
+  min-height: 16px;
+  min-width: 16px;
+  -gtk-icon-size: 16px;
 
-  &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg")); }
-
-  &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg")); }
+  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-checked-symbolic@2.svg"))); }
+  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-checkbox-mixed-symbolic@2.svg"))); }
 }
 
 %small_radio,
 popover.menu radio {
-  & {
-    min-height: 16px;
-    min-width: 16px;
-    border-image: none;
-    -gtk-icon-size: 16px;
-    -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-unchecked-symbolic.svg"));
-  }
+  min-height: 16px;
+  min-width: 16px;
+  -gtk-icon-size: 16px;
 
-  &:checked { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg")); }
-
-  &:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg")); }
+  &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-checked-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-checked-symbolic@2.svg"))); }
+  &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic.svg")), -gtk-recolor(url("assets/scalable/small-radio-mixed-symbolic@2.svg"))); }
 }
 
 // ANIMATION:
 // this is made with those pretty convoluted transitions, since checks and radios have to animate only on state changes,
 // the transformation is set on the active state and it get reset on the checked state.
+check:not(:checked):active { -gtk-icon-transform: rotate(90deg); }
+
 // radio:not(:checked):active { -gtk-icon-transform: scale(0); }
 
 treeview.view,
 columnview.view {
-  check, radio {
+  radio, check {
     padding: 0;
-    box-shadow: none;
-    background: none;
+    margin: 0;
+    transition: none;
 
-    &, &:focus, &:selected { color: $overlay-focus; }
-
-    &:hover { color: $overlay-focus-hover; }
-
-    &:checked, &:indeterminate {
-      color: $primary;
-
-      &:disabled { color: $text-secondary-disabled; }
+    &:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
+      background-color: $divider;
     }
 
-    &:disabled { color: $overlay-normal; }
+    &, &:hover, &:disabled, &:checked:hover, &:indeterminate:hover {
+      box-shadow: none;
+    }
   }
 
   &:hover, &:selected, &:focus, &:focus-within {
@@ -2600,11 +2579,6 @@ columnview.view {
   }
 }
 
-treeview.view radio:checked {
-  -gtk-icon-source: -gtk-recolor(url("assets/scalable/radio-checked-symbolic.svg"));
-  border-image: none;
-}
-
 
 /************
  * GtkScale *