diff --git a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
index 42a6784ef..8710ec044 100644
--- a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
+++ b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml
@@ -26,8 +26,8 @@ PlasmaCore.FrameSvgItem {
     property Item control
     imagePath: "widgets/button"
     prefix: "normal"
-    implicitWidth: units.gridUnit
-    implicitHeight: units.gridUnit
+    implicitWidth: units.iconSizes.small
+    implicitHeight: implicitWidth
     opacity: control.enabled ? 1 : 0.6
 
     PlasmaCore.SvgItem {
diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
index bf495688b..955e7bf6a 100644
--- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
+++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
@@ -27,7 +27,9 @@ T.RadioButton {
 
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentItem.implicitWidth + leftPadding + rightPadding)
-    implicitHeight: units.gridUnit * 1.6
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             Math.max(contentItem.implicitHeight,
+                                      indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
     padding: 1
diff --git a/src/declarativeimports/plasmacomponents3/RadioIndicator.qml b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml
index 61b47cb5a..79697168d 100644
--- a/src/declarativeimports/plasmacomponents3/RadioIndicator.qml
+++ b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml
@@ -31,7 +31,7 @@ PlasmaCore.SvgItem {
     opacity: control.enabled ? 1 : 0.6
 
     implicitWidth: implicitHeight
-    implicitHeight: units.gridUnit
+    implicitHeight: units.iconSizes.small
 
     PlasmaCore.SvgItem {
         id: checkmark
diff --git a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml
index dc8aa20f1..7d4373bfa 100644
--- a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml
+++ b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml
@@ -45,8 +45,8 @@ QtQuickControlStyle.CheckBoxStyle {
     indicator: PlasmaCore.FrameSvgItem {
         imagePath: "widgets/button"
         prefix: "normal"
-        width: theme.mSize(theme.defaultFont).height + margins.left
-        height: theme.mSize(theme.defaultFont).height + margins.top
+        width: units.iconSizes.small
+        height: width
         opacity: control.enabled ? 1 : 0.6
 
         PlasmaCore.SvgItem {
diff --git a/src/declarativeimports/plasmastyle/RadioButtonStyle.qml b/src/declarativeimports/plasmastyle/RadioButtonStyle.qml
index 0468c4c14..a225c4161 100644
--- a/src/declarativeimports/plasmastyle/RadioButtonStyle.qml
+++ b/src/declarativeimports/plasmastyle/RadioButtonStyle.qml
@@ -51,8 +51,8 @@ QtQuickControlStyle.RadioButtonStyle {
         elementId: "normal"
         opacity: control.enabled ? 1 : 0.6
 
-        width: height
-        height: theme.mSize(theme.defaultFont).height * 1.6
+        width: units.iconSizes.small
+        height: width
 
         PlasmaCore.SvgItem {
             id: checkmark
diff --git a/src/desktoptheme/breeze/widgets/actionbutton.svg b/src/desktoptheme/breeze/widgets/actionbutton.svg
index 11f8e11f1..04f98d801 100644
--- a/src/desktoptheme/breeze/widgets/actionbutton.svg
+++ b/src/desktoptheme/breeze/widgets/actionbutton.svg
@@ -1,556 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   version="1.0"
-   sodipodi:docname="actionbutton.svgz"
-   inkscape:output_extension="org.inkscape.output.svgz.inkscape"
-   inkscape:export-filename="arrow-up.png"
-   inkscape:export-xdpi="11.25"
-   inkscape:export-ydpi="11.25">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#9ca3a9"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="263.5098"
-     inkscape:cy="122.9196"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="128px"
-     height="128px"
-     showgrid="true"
-     inkscape:window-width="1613"
-     inkscape:window-height="990"
-     inkscape:window-x="301"
-     inkscape:window-y="0"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="true"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       enabled="true"
-       visible="true"
-       empspacing="2"
-       empopacity="0.03921569"
-       opacity="0.01960784"
-       empcolor="#0000ff"
-       color="#0000ff"
-       spacingy="1px"
-       spacingx="1px"
-       originy="0px"
-       originx="0px"
-       type="xygrid"
-       id="GridFromPre046Settings"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3878">
-      <stop
-         style="stop-color:#232629;stop-opacity:0;"
-         offset="0"
-         id="stop3880" />
-      <stop
-         id="stop3888"
-         offset="0.79000002"
-         style="stop-color:#232629;stop-opacity:0;" />
-      <stop
-         style="stop-color:#232629;stop-opacity:0.40000001;"
-         offset="1"
-         id="stop3882" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3798">
-      <stop
-         id="stop3800"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3802"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3647">
-      <stop
-         id="stop3649"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.15686275;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.15686275;"
-         offset="0.72972971"
-         id="stop3653" />
-      <stop
-         id="stop3651"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4254">
-      <stop
-         style="stop-color:#29d7f5;stop-opacity:1;"
-         offset="0"
-         id="stop4256" />
-      <stop
-         id="stop4272"
-         offset="0.75999999"
-         style="stop-color:#29d7f5;stop-opacity:1;" />
-      <stop
-         id="stop4270"
-         offset="0.85537487"
-         style="stop-color:#38c2e9;stop-opacity:0.45614034;" />
-      <stop
-         style="stop-color:#31a7f2;stop-opacity:0.13157895;"
-         offset="0.93000001"
-         id="stop3222" />
-      <stop
-         style="stop-color:#2a8dfc;stop-opacity:0;"
-         offset="1"
-         id="stop4258" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3610">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3612" />
-      <stop
-         id="stop3618"
-         offset="0.80000001"
-         style="stop-color:#000000;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.33333334;"
-         offset="0.83999997"
-         id="stop3620" />
-      <stop
-         id="stop3622"
-         offset="0.91000003"
-         style="stop-color:#000000;stop-opacity:0.0877193;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3614" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3272">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop3274" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop3276" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3640"
-       gradientUnits="userSpaceOnUse"
-       x1="48"
-       y1="96"
-       x2="48"
-       y2="116" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4254"
-       id="radialGradient4268"
-       cx="74"
-       cy="34"
-       fx="74"
-       fy="34"
-       r="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0714286,0,0,1.0714286,-10.285692,-25.42856)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4254"
-       id="radialGradient4276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0714286,0,0,1.0714286,-12.285692,6.5714382)"
-       cx="74"
-       cy="34"
-       fx="74"
-       fy="34"
-       r="14" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3647"
-       id="radialGradient3645"
-       cx="48"
-       cy="107"
-       fx="48"
-       fy="107"
-       r="12"
-       gradientTransform="matrix(1,6.8531488e-8,-8.9090919e-8,0.90277782,9.5327284e-6,10.236103)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3272"
-       id="linearGradient3642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6666667,0,0,0.8,23.999999,-6.8)"
-       x1="48"
-       y1="116"
-       x2="48"
-       y2="106" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3840"
-       x1="58.999996"
-       y1="106"
-       x2="37"
-       y2="106"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3798"
-       id="linearGradient3844"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-0.6666667,0.8,0,-50.799999,88)"
-       x1="48.999996"
-       y1="121"
-       x2="36"
-       y2="121" />
-    <linearGradient
-       osb:paint="solid"
-       id="linearGradient6476">
-      <stop
-         id="stop6478"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3765">
-      <stop
-         id="stop3767"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1;" />
-      <stop
-         id="stop3769"
-         offset="1"
-         style="stop-color:#e6e6e6;stop-opacity:0.47058824;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3610"
-       id="radialGradient4614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.1480515e-7,1.203125,-1.25,-2.2317419e-7,150.40707,-44.29169)"
-       cx="48.316662"
-       cy="105.99999"
-       fx="48.316662"
-       fy="105.99999"
-       r="12" />
-    <style
-       id="current-color-scheme"
-       type="text/css">      .ColorScheme-Text {
-        color:#31363b;
-      }
-      .ColorScheme-Background{
-        color:#eff0f1;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground{
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground{
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }</style>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3878"
-       id="radialGradient3886"
-       cx="-32"
-       cy="9.6288862"
-       fx="-32"
-       fy="9.6288862"
-       r="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2462438,0,0,1.24625,7.8798027,-1.97)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3878"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2462438,0,0,1.24625,7.8798027,-1.97)"
-       cx="-32"
-       cy="9.6288862"
-       fx="-32"
-       fy="9.6288862"
-       r="8" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
-    <g
-       id="normal"
-       inkscape:label="#g3805"
-       transform="matrix(1.6,0,0,1.6,78.344238,4.0559999)">
-      <rect
-         y="-1.91"
-         x="-42.090149"
-         height="20"
-         width="20"
-         id="rect3803"
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none" />
-      <path
-         class="ColorScheme-ButtonBackground"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         sodipodi:ry="8"
-         sodipodi:rx="8"
-         sodipodi:cy="8"
-         sodipodi:cx="-32"
-         id="path3031"
-         style="fill:currentColor;fill-opacity:1;stroke:none"
-         sodipodi:type="arc"
-         transform="matrix(1.015625,0,0,1.015625,0.4098513,-0.0349999)" />
-      <path
-         style="opacity:0.2;fill:currentColor;fill-opacity:1;stroke:none"
-         d="m -32.090149,-0.65999994 c -4.822318,0 -8.75,3.92768194 -8.75,8.75000014 0,4.8223178 3.927682,8.7499998 8.75,8.7499998 4.822318,0 8.75,-3.927682 8.75,-8.7499998 0,-4.8223182 -3.927682,-8.75000014 -8.75,-8.75000014 z m 0,0.67307693 c 4.460761,0 8.076923,3.46548801 8.076923,7.74038471 0,4.0077153 -3.183773,7.3019323 -7.25661,7.6983173 -0.02086,0.0023 -0.04219,-0.0022 -0.0631,0 -0.251251,0.02257 -0.499804,0.04206 -0.757212,0.04206 -0.257408,0 -0.505961,-0.0195 -0.757212,-0.04206 -0.02091,-0.0022 -0.04225,0.0023 -0.0631,0 -4.072838,-0.396385 -7.256611,-3.690602 -7.256611,-7.6983173 0,-4.2748967 3.616162,-7.74038471 8.076923,-7.74038471 z"
-         id="path3033"
-         inkscape:connector-curvature="0" />
+<svg id="svg2" version="1.1" viewBox="0 0 104 138" xmlns="http://www.w3.org/2000/svg">
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Background {
+            color:#eff0f1;
+        }
+        .ColorScheme-ButtonText {
+            color:#232629;
+        }
+        .ColorScheme-ButtonHover {
+            color:#93cee9;
+        }
+        .ColorScheme-ButtonFocus{
+            color:#3daee9;
+        }</style>
+    <g id="22-22-pressed">
+        <path id="rect835-3-6-5" d="m62 46h22v22h-22z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-0" class="ColorScheme-ButtonFocus" x="62" y="46" width="22" height="22" rx="11" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-0-3" class="ColorScheme-Background" x="63" y="47" width="20" height="20" rx="10" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       id="hover"
-       transform="matrix(1.0666667,0,0,1.0666667,55.896159,26.904)">
-      <rect
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none"
-         id="rect3803-1"
-         width="30"
-         height="30"
-         x="-42.090149"
-         y="30.09" />
-      <path
-         style="fill:currentColor;fill-opacity:1;stroke:none"
-         d="m -27.090148,31.964999 c -7.233478,0 -13.125,5.891523 -13.125,13.124999 0,7.233477 5.891522,13.125 13.125,13.125 7.233476,0 13.124999,-5.891523 13.124999,-13.125 0,-7.233476 -5.891523,-13.124999 -13.124999,-13.124999 z m 0,1.009615 c 6.666723,0 12.115384,5.448662 12.115384,12.115385 0,6.666722 -5.448661,12.115384 -12.115384,12.115384 -6.666722,0 -12.115385,-5.448662 -12.115385,-12.115384 0,-6.666723 5.448663,-12.115385 12.115385,-12.115385 z"
-         id="path3033-2"
-         inkscape:connector-curvature="0"
-         class="ColorScheme-ButtonHover"
-         sodipodi:nodetypes="ssssssssss" />
+    <g id="22-22-hover">
+        <path id="rect835-3-6-5-1" d="m62 80h22v22h-22z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6" class="ColorScheme-ButtonHover" x="62" y="80" width="22" height="22" rx="11" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5" class="ColorScheme-Background" x="63" y="81" width="20" height="20" rx="10" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       id="focus"
-       transform="matrix(1.0666667,0,0,1.0666667,55.89616,59.903998)"
-       inkscape:label="#g3840">
-      <rect
-         y="30.09"
-         x="-42.090149"
-         height="30"
-         width="30"
-         id="rect3842"
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none" />
-      <path
-         transform="matrix(1.5820312,0,0,1.5820312,23.534849,32.433751)"
-         sodipodi:type="arc"
-         style="color:#3daee9;fill:none;stroke:currentColor;stroke-width:0.5925926;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path3844"
-         sodipodi:cx="-32"
-         sodipodi:cy="8"
-         sodipodi:rx="8"
-         sodipodi:ry="8"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         class="ColorScheme-ButtonHover" />
-      <path
-         class="ColorScheme-ButtonHover"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         sodipodi:ry="8"
-         sodipodi:rx="8"
-         sodipodi:cy="8"
-         sodipodi:cx="-32"
-         id="path3846"
-         style="opacity:0.4;color:#3daee9;fill:none;stroke:currentColor;stroke-width:1.0666666;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc"
-         transform="matrix(1.7578124,0,0,1.7578125,29.159847,31.0275)" />
+    <g id="22-22-normal">
+        <path id="rect835-3-6" d="m62 12h22v22h-22z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-5-3-3" class="ColorScheme-Background" x="62" y="12" width="22" height="22" rx="11" fill="currentColor" fill-rule="evenodd"/>
+        <path id="rect841-6" d="m73 12c-6.094 0-11 4.906-11 11s4.906 11 11 11 11-4.906 11-11-4.906-11-11-11zm0 1c5.54 0 10 4.46 10 10s-4.46 10-10 10-10-4.46-10-10 4.46-10 10-10z" class="ColorScheme-ButtonText" fill="currentColor" fill-rule="evenodd" opacity=".3"/>
     </g>
-    <g
-       transform="matrix(1.6,0,0,1.6,78.344238,34.056)"
-       inkscape:label="#g3805"
-       id="pressed">
-      <rect
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none"
-         id="rect3870"
-         width="20"
-         height="20"
-         x="-42.090149"
-         y="-1.91" />
-      <path
-         sodipodi:type="arc"
-         style="fill:currentColor;fill-opacity:1;stroke:none"
-         id="path3872"
-         sodipodi:cx="-32"
-         sodipodi:cy="8"
-         sodipodi:rx="8"
-         sodipodi:ry="8"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         class="ColorScheme-ButtonFocus"
-         transform="matrix(1.09375,0,0,1.09375,2.9098513,-0.66)" />
-      <path
-         class="ColorScheme-ButtonFocus"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         sodipodi:ry="8"
-         sodipodi:rx="8"
-         sodipodi:cy="8"
-         sodipodi:cx="-32"
-         id="path3876"
-         style="color:#3daee9;fill:url(#radialGradient3886);fill-opacity:1;stroke:none"
-         sodipodi:type="arc"
-         transform="matrix(1.09375,0,0,1.09375,2.9098513,-0.66)" />
+    <g id="22-22-focus">
+        <path id="rect835-3-6-5-1-9" d="m62 114h22v22h-22z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-2" class="ColorScheme-ButtonFocus" x="62" y="114" width="22" height="22" rx="11" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-5" class="ColorScheme-Background" x="63" y="115" width="20" height="20" rx="10" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       transform="matrix(1.1,0,0,1.1,103.29917,13.101)"
-       inkscape:label="#g3805"
-       id="22-22-normal">
-      <rect
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none"
-         id="rect3042"
-         width="20"
-         height="20"
-         x="-42.090149"
-         y="-1.91" />
-      <path
-         sodipodi:type="arc"
-         style="fill:currentColor;fill-opacity:1;stroke:none"
-         id="path3044"
-         sodipodi:cx="-32"
-         sodipodi:cy="8"
-         sodipodi:rx="8"
-         sodipodi:ry="8"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         class="ColorScheme-ButtonBackground"
-         transform="matrix(1.0227273,0,0,1.0227273,0.63711821,-0.0918182)" />
-      <path
-         style="opacity:0.2;fill:currentColor;fill-opacity:1;stroke:none"
-         d="m -32.090154,-1.0009092 c -5.010201,0 -9.09091,4.0807082 -9.09091,9.0909093 0,5.0102009 4.080709,9.0909089 9.09091,9.0909089 5.010199,0 9.090908,-4.080708 9.090908,-9.0909089 0,-5.0102011 -4.080709,-9.0909093 -9.090908,-9.0909093 z m 0,1.01010101 c 4.462906,0 8.080807,3.39178199 8.080807,7.57575779 0,3.9224774 -3.185304,7.1562374 -7.260101,7.5441914 -0.03125,0.0036 -0.06332,-0.0032 -0.0947,0 -0.241157,0.0203 -0.479215,0.03157 -0.72601,0.03157 -0.246795,0 -0.484853,-0.01127 -0.726011,-0.03157 -0.03138,-0.0032 -0.06344,0.0036 -0.0947,0 -4.074796,-0.387954 -7.260101,-3.621714 -7.260101,-7.5441914 0,-4.1839758 3.617901,-7.57575779 8.080809,-7.57575779 z"
-         id="path3046"
-         inkscape:connector-curvature="0" />
+    <g id="24-24-focus">
+        <path id="rect835-3-3-9-0" d="m36 112h24v24h-24z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-2-9" class="ColorScheme-ButtonFocus" x="36.000011" y="112" width="23.999989" height="23.999998" rx="11.999994" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-5-1" class="ColorScheme-Background" x="37.000011" y="113" width="21.999981" height="22" rx="10.99999" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       transform="matrix(0.73333333,0,0,0.73333333,87.866109,46.934)"
-       id="22-22-hover">
-      <rect
-         y="30.09"
-         x="-42.090149"
-         height="30"
-         width="30"
-         id="rect3050"
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none" />
-      <path
-         class="ColorScheme-ButtonHover"
-         inkscape:connector-curvature="0"
-         id="path3052"
-         d="m -27.090149,31.453637 c -7.515301,0 -13.636363,6.121063 -13.636363,13.636364 0,7.5153 6.121062,13.636363 13.636363,13.636363 7.515301,0 13.636364,-6.121063 13.636364,-13.636363 0,-7.515301 -6.121063,-13.636364 -13.636364,-13.636364 z m 0,1.515151 c 6.524701,0 12.121212,5.596512 12.121212,12.121213 0,6.658621 -5.56303,12.121211 -12.121212,12.121211 -6.524699,0 -12.121212,-5.563032 -12.121212,-12.121212 0,-6.524701 5.496072,-12.121212 12.121212,-12.121212 z"
-         style="fill:currentColor;fill-opacity:1;stroke:none"
-         sodipodi:nodetypes="ssssssssss" />
+    <g id="24-24-hover">
+        <path id="rect835-3-3-9" d="m36 78h24v24h-24z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-7" class="ColorScheme-ButtonHover" x="36" y="78" width="24" height="24" rx="12" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-0" class="ColorScheme-Background" x="37" y="79" width="22" height="22" rx="11" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       inkscape:label="#g3840"
-       transform="matrix(0.73333333,0,0,0.73333333,87.866109,79.934)"
-       id="22-22-focus">
-      <rect
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none"
-         id="rect3056"
-         width="30"
-         height="30"
-         x="-42.090149"
-         y="30.09" />
-      <path
-         style="fill:currentColor"
-         d="m -27.090148,31.453637 c -7.523817,0 -13.636364,6.112548 -13.636364,13.636363 0,7.523816 6.112547,13.636364 13.636364,13.636364 7.523816,0 13.636363,-6.112548 13.636363,-13.636364 0,-7.523815 -6.112547,-13.636363 -13.636363,-13.636363 z m 0,1.509561 c 6.704789,0 12.126803,5.422015 12.126803,12.126802 0,6.704789 -5.422014,12.126804 -12.126803,12.126804 -6.704788,0 -12.126803,-5.422015 -12.126803,-12.126804 0,-6.704787 5.422015,-12.126802 12.126803,-12.126802 z"
-         id="path3058"
-         inkscape:connector-curvature="0"
-         class="ColorScheme-ButtonHover" />
-      <path
-         style="opacity:0.4;fill:currentColor"
-         d="m -27.090148,30.09 c -8.279441,0 -15.000001,6.720559 -15.000001,14.999999 0,8.279442 6.72056,15.000001 15.000001,15.000001 8.27944,0 14.999999,-6.720559 14.999999,-15.000001 0,-8.27944 -6.720559,-14.999999 -14.999999,-14.999999 z m 0,2.957747 c 6.655583,0 12.042254,5.386669 12.042254,12.042252 0,6.655585 -5.386671,12.042255 -12.042254,12.042255 -6.655585,0 -12.042254,-5.38667 -12.042254,-12.042255 0,-6.655583 5.386669,-12.042252 12.042254,-12.042252 z"
-         id="path3060"
-         inkscape:connector-curvature="0"
-         class="ColorScheme-ButtonHover" />
+    <g id="24-24-pressed">
+        <path id="rect835-3-3" d="m36 44h24v24h-24z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-0-9" class="ColorScheme-ButtonFocus" x="36" y="44" width="24" height="24" rx="12" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-0-3-3" class="ColorScheme-Background" x="37" y="45" width="22" height="22" rx="11" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       id="22-22-pressed"
-       inkscape:label="#g3805"
-       transform="matrix(1.1,0,0,1.1,103.29917,43.101)">
-      <rect
-         y="-1.91"
-         x="-42.090149"
-         height="20"
-         width="20"
-         id="rect3064"
-         style="fill:#000000;fill-opacity:0.00392157;stroke:none" />
-      <path
-         class="ColorScheme-ButtonFocus"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         sodipodi:ry="8"
-         sodipodi:rx="8"
-         sodipodi:cy="8"
-         sodipodi:cx="-32"
-         id="path3066"
-         style="fill:currentColor;fill-opacity:1;stroke:none"
-         sodipodi:type="arc"
-         transform="matrix(1.1363636,0,0,1.1363636,4.2734818,-1.0009091)" />
-      <path
-         sodipodi:type="arc"
-         style="color:#3daee9;fill:url(#radialGradient3070);fill-opacity:1;stroke:none"
-         id="path3068"
-         sodipodi:cx="-32"
-         sodipodi:cy="8"
-         sodipodi:rx="8"
-         sodipodi:ry="8"
-         d="m -24,8 a 8,8 0 1 1 -16,0 8,8 0 1 1 16,0 z"
-         class="ColorScheme-ButtonFocus"
-         transform="matrix(1.1363636,0,0,1.1363636,4.2734818,-1.0009091)" />
+    <g id="24-24-normal">
+        <path id="rect835-3" d="m36 10h24v24h-24z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-5-3-3-6" class="ColorScheme-Background" x="36" y="10" width="24" height="24" rx="12" fill="currentColor" fill-rule="evenodd"/>
+        <path id="rect841-6-26" d="m48 10c-6.648 0-12 5.352-12 12s5.352 12 12 12 12-5.352 12-12-5.352-12-12-12zm0 1c6.094 0 11 4.906 11 11s-4.906 11-11 11-11-4.906-11-11 4.906-11 11-11z" class="ColorScheme-ButtonText" fill="currentColor" fill-rule="evenodd" opacity=".3"/>
+    </g>
+    <g id="normal">
+        <path id="rect835" d="m2 2h32v32h-32z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-5-3-3-6-8" class="ColorScheme-Background" x="2" y="2" width="32" height="32" rx="16" fill="currentColor" fill-rule="evenodd"/>
+        <path id="rect841-6-26-7" d="m18 2c-8.864 0-16 7.136-16 16s7.136 16 16 16 16-7.136 16-16-7.136-16-16-16zm0 1c8.31 0 15 6.69 15 15s-6.69 15-15 15-15-6.69-15-15 6.69-15 15-15z" class="ColorScheme-ButtonText" fill="currentColor" fill-rule="evenodd" opacity=".3"/>
+    </g>
+    <g id="pressed">
+        <path id="rect835-5" d="m2 36h32v32h-32z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-0-9-0" class="ColorScheme-ButtonFocus" x="2" y="36" width="32" height="32" rx="16" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-0-3-3-2" class="ColorScheme-Background" x="3" y="37" width="30" height="30" rx="15" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="hover">
+        <path id="rect835-5-2" d="m2 70h32v32h-32z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-7-3" class="ColorScheme-ButtonHover" x="2" y="70" width="32" height="32" rx="16" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-0-7" class="ColorScheme-Background" x="3.0000029" y="71" width="29.999996" height="29.999996" rx="14.999998" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="focus">
+        <path id="rect835-5-2-7" d="m2 104h32v32h-32z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-7-3-8" class="ColorScheme-ButtonFocus" x="2" y="104" width="32" height="32" rx="16" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-0-7-9" class="ColorScheme-Background" x="2.9999993" y="105" width="30" height="30" rx="15" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="16-16-pressed" transform="translate(24 6)">
+        <path id="rect835-3-6-5-3" d="m62 46h16v16h-16z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-0-6" class="ColorScheme-ButtonFocus" x="62" y="46" width="16" height="16" rx="14" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-0-3-1" class="ColorScheme-Background" x="63" y="47" width="14" height="14" rx="14" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="16-16-hover" transform="translate(24 6)">
+        <path id="rect835-3-6-5-1-93" d="m62 80h16v16h-16z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-9" class="ColorScheme-ButtonHover" x="62" y="80" width="16" height="16" rx="14" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-4" class="ColorScheme-Background" x="63" y="81" width="14" height="14" rx="14" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="16-16-normal" transform="translate(24 6)">
+        <path id="rect835-3-6-8" d="m62 12h16v16h-16z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-6-5-3-3-5" class="ColorScheme-Background" x="62" y="11.999999" width="15.999999" height="15.999999" rx="13.999999" fill="currentColor" fill-rule="evenodd"/>
+        <path id="rect841-6-03" transform="translate(-24,-6)" d="m94 18c-4.432 0-8 3.568-8 8s3.568 8 8 8 8-3.568 8-8-3.568-8-8-8zm0 1c3.878 0 7 3.122 7 7s-3.122 7-7 7-7-3.122-7-7 3.122-7 7-7z" class="ColorScheme-ButtonText" fill="currentColor" fill-rule="evenodd" opacity=".3"/>
+    </g>
+    <g id="16-16-focus" transform="translate(24 6)">
+        <path id="rect835-3-6-5-1-9-0" d="m62 114h16v16h-16z" fill="none" opacity=".02"/>
+        <rect id="rect841-6-2-3" class="ColorScheme-ButtonFocus" x="62" y="114" width="16" height="16" rx="14" fill="currentColor" fill-rule="evenodd"/>
+        <rect id="rect841-6-6-5-5-2" class="ColorScheme-Background" x="63" y="115" width="14" height="14" rx="14" fill="currentColor" fill-rule="evenodd"/>
     </g>
-  </g>
 </svg>
diff --git a/src/desktoptheme/breeze/widgets/checkmarks.svg b/src/desktoptheme/breeze/widgets/checkmarks.svg
index c62b6296b..f97028e0f 100644
--- a/src/desktoptheme/breeze/widgets/checkmarks.svg
+++ b/src/desktoptheme/breeze/widgets/checkmarks.svg
@@ -1,207 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="34"
-   height="16"
-   viewBox="0 0 34 16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="checkmarks.svgz">
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#31363b;
-        stop-color:#31363b;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-        stop-color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-        stop-color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-        stop-color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-        stop-color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-        stop-color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-        stop-color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-        stop-color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-        stop-color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-        stop-color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-        stop-color:#3daee9;
-      }
-      </style>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#b0dba0"
-     bordercolor="#cc0000"
-     borderopacity="1"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="23.398844"
-     inkscape:cx="29.464882"
-     inkscape:cy="5.929471"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     showguides="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3336"
-       empspacing="2"
-       originx="0"
-       originy="-131.99998" />
-    <sodipodi:guide
-       position="1,15"
-       orientation="14,0"
-       id="guide4140" />
-    <sodipodi:guide
-       position="1,0.99999967"
-       orientation="0,14"
-       id="guide4142" />
-    <sodipodi:guide
-       position="15,0.99999967"
-       orientation="-14,0"
-       id="guide4144" />
-    <sodipodi:guide
-       position="15,15"
-       orientation="0,-14"
-       id="guide4146" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-904.36218)">
-    <g
-       id="radiobutton">
-      <rect
-         y="904.36218"
-         x="0"
-         height="16"
-         width="16"
-         id="rect4134"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:none" />
-      <circle
-         r="7"
-         cy="912.36218"
-         cx="8"
-         id="path4152"
-         style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-         class="ColorScheme-ButtonFocus"
-         d="m 15,912.36218 c 0,3.866 -3.134007,7 -7,7 -3.8659932,0 -7,-3.134 -7,-7 0,-3.86599 3.1340068,-7 7,-7 3.865993,0 7,3.13401 7,7 z" />
-      <circle
-         style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-         id="circle4156"
-         cx="8"
-         cy="912.36218"
-         r="6"
-         class="ColorScheme-Background"
-         d="m 14,912.36218 c 0,3.31371 -2.686292,6 -6,6 -3.3137085,0 -6,-2.68629 -6,-6 0,-3.31371 2.6862915,-6 6,-6 3.313708,0 6,2.68629 6,6 z" />
-      <circle
-         r="5"
-         cy="912.36218"
-         cx="8"
-         id="circle4158"
-         style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-         class="ColorScheme-ButtonFocus"
-         d="m 13,912.36218 c 0,2.76143 -2.238576,5 -5,5 -2.7614237,0 -5,-2.23857 -5,-5 0,-2.76142 2.2385763,-5 5,-5 2.761424,0 5,2.23858 5,5 z" />
+<svg id="svg2" version="1.1" viewBox="0 0 94 64" xmlns="http://www.w3.org/2000/svg">
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Background {
+            color:#eff0f1;
+        }
+        .ColorScheme-ButtonFocus{
+            color:#3daee9;
+        }</style>
+    <g id="16-16-checkbox" transform="translate(60.000001 -888.36218)">
+        <path id="rect4148" d="m17.999999 904.36215h16v15.99999h-16z" fill="none"/>
+        <path id="rect4160" class="ColorScheme-ButtonFocus" transform="translate(-60.000001,888.36218)" d="m80 16c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+        <path id="rect887" class="ColorScheme-ButtonFocus" d="m21 907.36218h10v10h-10z" fill="currentColor" fill-rule="evenodd"/>
     </g>
-    <g
-       id="checkbox">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect4148"
-         width="14"
-         height="13.999998"
-         x="19"
-         y="905.36218" />
-      <rect
-         ry="0.99997997"
-         y="905.36218"
-         x="19"
-         height="14"
-         width="14"
-         id="rect4160"
-         style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-         class="ColorScheme-ButtonFocus" />
-      <rect
-         y="906.36218"
-         x="20"
-         height="12"
-         width="12"
-         id="rect4162"
-         style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-         class="ColorScheme-Background" />
-      <rect
-         ry="0"
-         y="907.36218"
-         x="21"
-         height="10"
-         width="10"
-         id="rect4164"
-         style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-         class="ColorScheme-ButtonFocus" />
+    <g id="22-22-checkbox" transform="translate(41.000001 -891.36218)">
+        <path id="rect4148-2" d="m14.999999 901.36215h22v21.99998h-22z" fill="none"/>
+        <path id="rect4160-9" class="ColorScheme-ButtonFocus" transform="translate(-41.000001,891.36218)" d="m58 10c-1.108 0-2 0.892-2 2v18c0 1.108 0.892 2 2 2h18c1.108 0 2-0.892 2-2v-18c0-1.108-0.892-2-2-2h-18zm0 1h18c0.554 0 1 0.446 1 1v18c0 0.554-0.446 1-1 1h-18c-0.554 0-1-0.446-1-1v-18c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+        <path id="rect887-2" class="ColorScheme-ButtonFocus" d="m17.999999 904.36218h16v16h-16z" fill="currentColor" fill-rule="evenodd"/>
     </g>
-  </g>
+    <g id="24-24-checkbox" transform="translate(18.000001 -892.36218)">
+        <path id="rect4148-2-0" d="m13.999999 900.36216h24v23.99998h-24z" fill="none"/>
+        <path id="rect4160-9-9" class="ColorScheme-ButtonFocus" transform="translate(-18.000001,892.36218)" d="m34 8c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892 2-2v-20c0-1.108-0.892-2-2-2h-20zm0 1h20c0.554 0 1 0.446 1 1v20c0 0.554-0.446 1-1 1h-20c-0.554 0-1-0.446-1-1v-20c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+        <path id="rect887-2-6" class="ColorScheme-ButtonFocus" d="m16.999999 903.36218h18v18h-18z" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="checkbox" transform="matrix(1.3333333 0 0 1.3333333 -18.666665 -1200.4829)">
+        <path id="rect4148-2-0-6" d="m13.999999 900.36216h24v23.99998h-24z" fill="none"/>
+        <path id="rect4160-9-9-2" class="ColorScheme-ButtonFocus" transform="matrix(.75000002 0 0 .75000002 13.999999 900.3622)" d="m2 0c-1.108 0-2 0.89200003-2 2v28c0 1.108 0.89200003 2 2 2h28c1.108 0 2-0.892 2-2v-28c0-1.108-0.892-2-2-2h-28zm0 1h28c0.554 0 1 0.446 1 1v28c0 0.554-0.446 1-1 1h-28c-0.554 0-1-0.446-1-1v-28c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+        <path id="rect887-2-6-1" class="ColorScheme-ButtonFocus" d="m16.249999 902.6122h19.500001v19.5h-19.500001z" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="16-16-radiobutton" transform="translate(60.000001 -856.36215)">
+        <path id="rect4148-7" d="m17.999999 904.36215h16v15.99999h-16z" fill="none"/>
+        <path id="rect4160-92" transform="translate(-60.000001,856.36215)" d="m86 48c-4.432 0-8 3.568-8 8s3.568 8 8 8c4.431999 0 8-3.568 8-8s-3.568001-8-8-8zm0 1c3.878 0 7 3.122 7 7s-3.122 7-7 7-7-3.122-7-7 3.122-7 7-7z" class="ColorScheme-ButtonFocus" fill="currentColor"/>
+        <rect id="rect887-23" class="ColorScheme-ButtonFocus" x="21" y="907.36218" width="10" height="10" rx="200" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="22-22-radiobutton" transform="translate(41.000001 -859.36215)">
+        <path id="rect4148-2-5" d="m14.999999 901.36215h22v21.99998h-22z" fill="none"/>
+        <path id="rect4160-9-92" transform="translate(-41.000001,859.36215)" d="m67 42c-6.094001 0-11 4.90602-11 11 0 6.09397 4.905999 11 11 11s11-4.90603 11-11c0-6.09398-4.905999-11-11-11zm0 1c5.54 0 10 4.46 10 10s-4.46 10-10 10-10-4.46-10-10 4.46-10 10-10z" class="ColorScheme-ButtonFocus" fill="currentColor"/>
+        <rect id="rect887-2-8" class="ColorScheme-ButtonFocus" x="17.999998" y="904.36212" width="16.000002" height="15.999971" rx="8.000001" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="24-24-radiobutton" transform="translate(18.000001 -860.36215)">
+        <path id="rect4148-2-0-7" d="m13.999999 900.36216h24v23.99998h-24z" fill="none"/>
+        <path id="rect4160-9-9-3" transform="translate(-18.000001,860.36215)" d="m44 40c-6.648001 0-12 5.35201-12 12s5.351999 12 12 12 12-5.35201 12-12-5.351999-12-12-12zm0 1c6.094 0 11 4.906 11 11s-4.906 11-11 11-11-4.906-11-11 4.906-11 11-11z" class="ColorScheme-ButtonFocus" fill="currentColor"/>
+        <rect id="rect887-2-6-2" class="ColorScheme-ButtonFocus" x="16.999998" y="903.36212" width="18" height="18.000029" rx="9" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <g id="radiobutton" transform="matrix(1.3333333 0 0 1.3333333 -18.666665 -1168.4829)">
+        <path id="rect4148-2-0-6-3" d="m13.999999 900.36216h24v23.99998h-24z" fill="none"/>
+        <path id="rect4160-9-9-2-1" transform="matrix(.75000002 0 0 .75000002 13.999999 876.3622)" d="m16 32c-8.8639998 0-16 7.136014-16 16-2.3684758e-15 8.864 7.1360002 16 16 16 8.864 0 16-7.136 16-16 0-8.863986-7.136-16-16-16zm0 1c8.31 0 15 6.690014 15 15 0 8.31-6.69 15-15 15-8.3099998 0-15-6.69-15-15 0-8.309986 6.6900002-15 15-15z" class="ColorScheme-ButtonFocus" fill="currentColor"/>
+        <rect id="rect887-2-6-1-4" class="ColorScheme-ButtonFocus" x="16.25" y="902.61218" width="19.5" height="19.499985" rx="9.75" fill="currentColor" fill-rule="evenodd"/>
+    </g>
+    <rect id="rect4160-7" class="ColorScheme-ButtonFocus" x="-54" y="-2.0000584" width="15.999999" height="15.999999" rx="2" ry="2" fill="currentColor"/>
+    <rect id="rect855-5" class="ColorScheme-Background" x="-53" y="-.99999738" width="14" height="14" rx="1" ry="1" fill="currentColor" fill-rule="evenodd"/>
+    <path id="rect887-3" class="ColorScheme-ButtonFocus" d="m-50.999999 1h10v10h-10z" fill="currentColor" fill-rule="evenodd"/>
 </svg>