diff --git a/theme/bundled-icons.go b/theme/bundled-icons.go
index bc8de972a9..e5b6d6570e 100644
--- a/theme/bundled-icons.go
+++ b/theme/bundled-icons.go
@@ -17,7 +17,7 @@ var cancelIconRes = &fyne.StaticResource{
 
 var checkIconRes = &fyne.StaticResource{
 	StaticName:    "check.svg",
-	StaticContent: []byte("<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" width=\"24px\"\n\t height=\"24px\" viewBox=\"0 0 24 24\" enable-background=\"new 0 0 24 24\" xml:space=\"preserve\">\n    <path d=\"M9,16.17L4.83,12l-1.42,1.41L9,19L21,7l-1.41-1.41L9,16.17z\"/>\n</svg>\n"),
+	StaticContent: []byte("<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" x=\"0px\" y=\"0px\" width=\"24px\"\n\t height=\"24px\" viewBox=\"0 0 24 24\" enable-background=\"new 0 0 24 24\" xml:space=\"preserve\">\n    <path d=\"M9,16.17L4.83,12l-1.42,1.41L9,19L21,7l-1.41-1.41L9,16.17z\"/>\n</svg>\n"),
 }
 
 var deleteIconRes = &fyne.StaticResource{
@@ -47,7 +47,7 @@ var menuexpandIconRes = &fyne.StaticResource{
 
 var checkboxIconRes = &fyne.StaticResource{
 	StaticName:    "check-box.svg",
-	StaticContent: []byte("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n   xmlns:cc=\"http://creativecommons.org/ns#\"\n   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n   xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n   width=\"24\"\n   height=\"24\"\n   viewBox=\"0 0 24 24\"\n   version=\"1.1\"\n   id=\"svg4\"\n   sodipodi:docname=\"check-box.svg\"\n   inkscape:version=\"1.0.2 (e86c870879, 2021-01-15)\">\n  <metadata\n     id=\"metadata10\">\n    <rdf:RDF>\n      <cc:Work\n         rdf:about=\"\">\n        <dc:format>image/svg+xml</dc:format>\n        <dc:type\n           rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" />\n      </cc:Work>\n    </rdf:RDF>\n  </metadata>\n  <defs\n     id=\"defs8\" />\n  <sodipodi:namedview\n     pagecolor=\"#ffffff\"\n     bordercolor=\"#666666\"\n     borderopacity=\"1\"\n     objecttolerance=\"10\"\n     gridtolerance=\"10\"\n     guidetolerance=\"10\"\n     inkscape:pageopacity=\"0\"\n     inkscape:pageshadow=\"2\"\n     inkscape:window-width=\"1235\"\n     inkscape:window-height=\"952\"\n     id=\"namedview6\"\n     showgrid=\"true\"\n     inkscape:zoom=\"30.625\"\n     inkscape:cx=\"12\"\n     inkscape:cy=\"12\"\n     inkscape:window-x=\"0\"\n     inkscape:window-y=\"0\"\n     inkscape:window-maximized=\"0\"\n     inkscape:current-layer=\"svg4\">\n    <inkscape:grid\n       type=\"xygrid\"\n       id=\"grid847\" />\n  </sodipodi:namedview>\n  <path\n     d=\"M 19.914286,3 H 4.0857143 C 2.9757143,3 3,2.9857143 3,4.0857143 V 19.914286 C 3,21.014286 2.9757143,21 4.0857143,21 H 19.914286 C 21.024286,21 21,21.014286 21,19.914286 V 4.0857143 C 21,2.9857143 21.024286,3 19.914286,3 Z M 10,17 5,12 6.41,10.59 10,14.17 17.59,6.58 19,8 Z\"\n     id=\"path2\"\n     sodipodi:nodetypes=\"sssssssssccccccc\" />\n</svg>\n"),
+	StaticContent: []byte("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   width=\"24\"\n   height=\"24\"\n   viewBox=\"0 0 24 24\">\n  <path\n     d=\"M 20,4 V 20 H 4 V 4 H 20 M 19.914286,3 H 4.0857143 C 2.9857143,3 3,2.9857143 3,4.0857143 V 19.914286 C 3,21.014286 2.9857143,21 4.0857143,21 H 19.914286 C 21.014286,21 21,21.014286 21,19.914286 V 4.0857143 C 21,2.9857143 21.014286,3 19.914286,3 Z\" />\n</svg>\n"),
 }
 
 var checkboxblankIconRes = &fyne.StaticResource{
@@ -57,12 +57,12 @@ var checkboxblankIconRes = &fyne.StaticResource{
 
 var radiobuttonIconRes = &fyne.StaticResource{
 	StaticName:    "radio-button.svg",
-	StaticContent: []byte("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n   xmlns:cc=\"http://creativecommons.org/ns#\"\n   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n   xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n   width=\"24\"\n   height=\"24\"\n   viewBox=\"0 0 24 24\"\n   version=\"1.1\"\n   id=\"svg4\"\n   sodipodi:docname=\"radio-button.svg\"\n   inkscape:version=\"1.0.2 (e86c870879, 2021-01-15)\">\n  <metadata\n     id=\"metadata10\">\n    <rdf:RDF>\n      <cc:Work\n         rdf:about=\"\">\n        <dc:format>image/svg+xml</dc:format>\n        <dc:type\n           rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" />\n      </cc:Work>\n    </rdf:RDF>\n  </metadata>\n  <defs\n     id=\"defs8\" />\n  <sodipodi:namedview\n     pagecolor=\"#ffffff\"\n     bordercolor=\"#666666\"\n     borderopacity=\"1\"\n     objecttolerance=\"10\"\n     gridtolerance=\"10\"\n     guidetolerance=\"10\"\n     inkscape:pageopacity=\"0\"\n     inkscape:pageshadow=\"2\"\n     inkscape:window-width=\"1503\"\n     inkscape:window-height=\"1050\"\n     id=\"namedview6\"\n     showgrid=\"true\"\n     inkscape:zoom=\"30.625\"\n     inkscape:cx=\"11.510204\"\n     inkscape:cy=\"12.489796\"\n     inkscape:window-x=\"0\"\n     inkscape:window-y=\"0\"\n     inkscape:window-maximized=\"0\"\n     inkscape:current-layer=\"svg4\">\n    <inkscape:grid\n       type=\"xygrid\"\n       id=\"grid835\" />\n  </sodipodi:namedview>\n  <path\n     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 0.0097,19.024071 C 6.9997372,21.048238 3,17 2.992626,12.037976 2.985139,7.0000002 6.9673493,2.9584714 12.036063,2.9795211 16.967347,3 21.069769,7.0000004 21.034853,12.004484 21,17 17,21 12.009738,21.024071 Z\"\n     id=\"path2\"\n     sodipodi:nodetypes=\"ssssssssss\" />\n</svg>\n"),
+	StaticContent: []byte("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   width=\"24\"\n   height=\"24\"\n   viewBox=\"0 0 24 24\">\n  <path\n     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 0.0097,19.024071 C 6.9997372,21.048238 3,17 2.992626,12.037976 2.985139,7.0000002 6.9673493,2.9584714 12.036063,2.9795211 16.967347,3 21.069769,7.0000004 21.034853,12.004484 21,17 17,21 12.009738,21.024071 Z\" />\n</svg>\n"),
 }
 
 var radiobuttoncheckedIconRes = &fyne.StaticResource{
 	StaticName:    "radio-button-checked.svg",
-	StaticContent: []byte("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n   xmlns:cc=\"http://creativecommons.org/ns#\"\n   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n   xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n   width=\"24\"\n   height=\"24\"\n   viewBox=\"0 0 24 24\"\n   version=\"1.1\"\n   id=\"svg4\"\n   sodipodi:docname=\"radio-button-checked.svg\"\n   inkscape:version=\"1.0.2 (e86c870879, 2021-01-15)\">\n  <metadata\n     id=\"metadata10\">\n    <rdf:RDF>\n      <cc:Work\n         rdf:about=\"\">\n        <dc:format>image/svg+xml</dc:format>\n        <dc:type\n           rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" />\n      </cc:Work>\n    </rdf:RDF>\n  </metadata>\n  <defs\n     id=\"defs8\" />\n  <sodipodi:namedview\n     pagecolor=\"#ffffff\"\n     bordercolor=\"#666666\"\n     borderopacity=\"1\"\n     objecttolerance=\"10\"\n     gridtolerance=\"10\"\n     guidetolerance=\"10\"\n     inkscape:pageopacity=\"0\"\n     inkscape:pageshadow=\"2\"\n     inkscape:window-width=\"1362\"\n     inkscape:window-height=\"1084\"\n     id=\"namedview6\"\n     showgrid=\"true\"\n     inkscape:zoom=\"30.625\"\n     inkscape:cx=\"12\"\n     inkscape:cy=\"12\"\n     inkscape:window-x=\"0\"\n     inkscape:window-y=\"0\"\n     inkscape:window-maximized=\"0\"\n     inkscape:current-layer=\"svg4\"\n     inkscape:document-rotation=\"0\">\n    <inkscape:grid\n       type=\"xygrid\"\n       id=\"grid835\" />\n  </sodipodi:namedview>\n  <path\n     d=\"m 12,5 c -4,0 -7,3 -7,7 1e-7,4 3,7 7,7 4.000133,0 7,-3 7,-7 C 19,8 16.000133,5.0000001 12,5 Z 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 0,19.012245 C 6.9998134,21.02449 3,17 2.9709368,12.01188 2.9417352,7.0000008 7,3 12,2.9877551 17,2.9755102 21.02449,7 21.012245,12 21,17 17,21 12,21.012245 Z\"\n     id=\"path2\"\n     sodipodi:nodetypes=\"sssssssssssssss\" />\n</svg>\n"),
+	StaticContent: []byte("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   width=\"24\"\n   height=\"24\"\n   viewBox=\"0 0 24 24\">\n  <path\n     d=\"m 12,5 c -4,0 -7,3 -7,7 1e-7,4 3,7 7,7 4.000133,0 7,-3 7,-7 C 19,8 16.000133,5.0000001 12,5 Z 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 0,19.012245 C 6.9998134,21.02449 3,17 2.9709368,12.01188 2.9417352,7.0000008 7,3 12,2.9877551 17,2.9755102 21.02449,7 21.012245,12 21,17 17,21 12,21.012245 Z\" />\n</svg>\n"),
 }
 
 var contentaddIconRes = &fyne.StaticResource{
diff --git a/theme/gen.go b/theme/gen.go
index 0f8f155287..b843b73918 100644
--- a/theme/gen.go
+++ b/theme/gen.go
@@ -88,7 +88,7 @@ func main() {
 	bundleIcon("menu-expand", f)
 
 	bundleIcon("check-box", f)
-	bundleIcon("check-box-blank", f)
+	bundleIcon("check-box-checked", f)
 	bundleIcon("radio-button", f)
 	bundleIcon("radio-button-checked", f)
 
diff --git a/theme/icons.go b/theme/icons.go
index 4b272e489f..2985f43515 100644
--- a/theme/icons.go
+++ b/theme/icons.go
@@ -467,8 +467,8 @@ var (
 		IconNameMenu:          NewThemedResource(menuIconRes),
 		IconNameMenuExpand:    NewThemedResource(menuexpandIconRes),
 
-		IconNameCheckButton:        NewThemedResource(checkboxblankIconRes),
-		IconNameCheckButtonChecked: NewThemedResource(checkboxIconRes),
+		IconNameCheckButton:        NewThemedResource(checkboxIconRes),
+		IconNameCheckButtonChecked: NewThemedResource(checkboxcheckedIconRes),
 		IconNameRadioButton:        NewThemedResource(radiobuttonIconRes),
 		IconNameRadioButtonChecked: NewThemedResource(radiobuttoncheckedIconRes),
 
diff --git a/theme/icons/check-box-blank.svg b/theme/icons/check-box-blank.svg
deleted file mode 100644
index e102f477ef..0000000000
--- a/theme/icons/check-box-blank.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg14"
-   sodipodi:docname="check-box-blank.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata20">
-    <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>
-  <defs
-     id="defs18" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1396"
-     inkscape:window-height="974"
-     id="namedview16"
-     showgrid="true"
-     inkscape:zoom="30.625"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="219"
-     inkscape:window-y="188"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg14">
-    <inkscape:grid
-       type="xygrid"
-       id="grid845" />
-  </sodipodi:namedview>
-  <path
-     d="M 20,4 V 20 H 4 V 4 H 20 M 19.914286,3 H 4.0857143 C 2.9857143,3 3,2.9857143 3,4.0857143 V 19.914286 C 3,21.014286 2.9857143,21 4.0857143,21 H 19.914286 C 21.014286,21 21,21.014286 21,19.914286 V 4.0857143 C 21,2.9857143 21.014286,3 19.914286,3 Z"
-     id="path12"
-     sodipodi:nodetypes="cccccsssssssss" />
-</svg>
diff --git a/theme/icons/check-box-checked.svg b/theme/icons/check-box-checked.svg
new file mode 100644
index 0000000000..3917b1fc44
--- /dev/null
+++ b/theme/icons/check-box-checked.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24">
+  <path
+     d="M 19.914286,3 H 4.0857143 C 2.9757143,3 3,2.9857143 3,4.0857143 V 19.914286 C 3,21.014286 2.9757143,21 4.0857143,21 H 19.914286 C 21.024286,21 21,21.014286 21,19.914286 V 4.0857143 C 21,2.9857143 21.024286,3 19.914286,3 Z M 10,17 5,12 6.41,10.59 10,14.17 17.59,6.58 19,8 Z" />
+</svg>
diff --git a/theme/icons/check-box.svg b/theme/icons/check-box.svg
index ce6a56b5af..2997acd961 100644
--- a/theme/icons/check-box.svg
+++ b/theme/icons/check-box.svg
@@ -1,58 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="check-box.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata10">
-    <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>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1235"
-     inkscape:window-height="952"
-     id="namedview6"
-     showgrid="true"
-     inkscape:zoom="30.625"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4">
-    <inkscape:grid
-       type="xygrid"
-       id="grid847" />
-  </sodipodi:namedview>
+   viewBox="0 0 24 24">
   <path
-     d="M 19.914286,3 H 4.0857143 C 2.9757143,3 3,2.9857143 3,4.0857143 V 19.914286 C 3,21.014286 2.9757143,21 4.0857143,21 H 19.914286 C 21.024286,21 21,21.014286 21,19.914286 V 4.0857143 C 21,2.9857143 21.024286,3 19.914286,3 Z M 10,17 5,12 6.41,10.59 10,14.17 17.59,6.58 19,8 Z"
-     id="path2"
-     sodipodi:nodetypes="sssssssssccccccc" />
+     d="M 20,4 V 20 H 4 V 4 H 20 M 19.914286,3 H 4.0857143 C 2.9857143,3 3,2.9857143 3,4.0857143 V 19.914286 C 3,21.014286 2.9857143,21 4.0857143,21 H 19.914286 C 21.014286,21 21,21.014286 21,19.914286 V 4.0857143 C 21,2.9857143 21.014286,3 19.914286,3 Z" />
 </svg>
diff --git a/theme/icons/check.svg b/theme/icons/check.svg
index a289558f4d..b09aeb73ba 100644
--- a/theme/icons/check.svg
+++ b/theme/icons/check.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
     <path d="M9,16.17L4.83,12l-1.42,1.41L9,19L21,7l-1.41-1.41L9,16.17z"/>
 </svg>
diff --git a/theme/icons/radio-button-checked.svg b/theme/icons/radio-button-checked.svg
index 1fbe01c629..d3344f810b 100644
--- a/theme/icons/radio-button-checked.svg
+++ b/theme/icons/radio-button-checked.svg
@@ -1,59 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="radio-button-checked.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata10">
-    <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>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1362"
-     inkscape:window-height="1084"
-     id="namedview6"
-     showgrid="true"
-     inkscape:zoom="30.625"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4"
-     inkscape:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid835" />
-  </sodipodi:namedview>
+   viewBox="0 0 24 24">
   <path
-     d="m 12,5 c -4,0 -7,3 -7,7 1e-7,4 3,7 7,7 4.000133,0 7,-3 7,-7 C 19,8 16.000133,5.0000001 12,5 Z 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 0,19.012245 C 6.9998134,21.02449 3,17 2.9709368,12.01188 2.9417352,7.0000008 7,3 12,2.9877551 17,2.9755102 21.02449,7 21.012245,12 21,17 17,21 12,21.012245 Z"
-     id="path2"
-     sodipodi:nodetypes="sssssssssssssss" />
+     d="m 12,5 c -4,0 -7,3 -7,7 1e-7,4 3,7 7,7 4.000133,0 7,-3 7,-7 C 19,8 16.000133,5.0000001 12,5 Z 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 0,19.012245 C 6.9998134,21.02449 3,17 2.9709368,12.01188 2.9417352,7.0000008 7,3 12,2.9877551 17,2.9755102 21.02449,7 21.012245,12 21,17 17,21 12,21.012245 Z" />
 </svg>
diff --git a/theme/icons/radio-button.svg b/theme/icons/radio-button.svg
index 856db38832..1d4e9fdaf7 100644
--- a/theme/icons/radio-button.svg
+++ b/theme/icons/radio-button.svg
@@ -1,58 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="radio-button.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata10">
-    <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>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1503"
-     inkscape:window-height="1050"
-     id="namedview6"
-     showgrid="true"
-     inkscape:zoom="30.625"
-     inkscape:cx="11.510204"
-     inkscape:cy="12.489796"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4">
-    <inkscape:grid
-       type="xygrid"
-       id="grid835" />
-  </sodipodi:namedview>
+   viewBox="0 0 24 24">
   <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 m 0.0097,19.024071 C 6.9997372,21.048238 3,17 2.992626,12.037976 2.985139,7.0000002 6.9673493,2.9584714 12.036063,2.9795211 16.967347,3 21.069769,7.0000004 21.034853,12.004484 21,17 17,21 12.009738,21.024071 Z"
-     id="path2"
-     sodipodi:nodetypes="ssssssssss" />
+     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 0.0097,19.024071 C 6.9997372,21.048238 3,17 2.992626,12.037976 2.985139,7.0000002 6.9673493,2.9584714 12.036063,2.9795211 16.967347,3 21.069769,7.0000004 21.034853,12.004484 21,17 17,21 12.009738,21.024071 Z" />
 </svg>