diff --git a/src/assets/gnome-shell/assets-Dark/toggle-off.svg b/src/assets/gnome-shell/assets-Dark/toggle-off.svg
index 7ae4ff16..8522010b 100644
--- a/src/assets/gnome-shell/assets-Dark/toggle-off.svg
+++ b/src/assets/gnome-shell/assets-Dark/toggle-off.svg
@@ -1,4 +1,69 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ffffff" opacity=".45" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="10" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg1878"
+   sodipodi:docname="toggle-off.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs1882">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1830"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur1832" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1880"
+     pagecolor="#4d4d4d"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#6b6b6b"
+     showgrid="false"
+     inkscape:zoom="4.17193"
+     inkscape:cx="-13.662741"
+     inkscape:cy="-9.2283427"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1878" />
+  <rect
+     x="0"
+     y="0"
+     width="46"
+     height="24"
+     rx="12"
+     ry="12"
+     id="rect2"
+     style="opacity:0.45;fill:#ffffff" />
+  <circle
+     cx="12"
+     cy="13"
+     r="9"
+     id="circle1465"
+     style="opacity:0.1;fill:#000000;filter:url(#filter1830)" />
+  <circle
+     cx="12"
+     cy="12.089559"
+     r="9"
+     id="circle4"
+     style="fill:#ffffff" />
 </svg>
diff --git a/src/assets/gnome-shell/assets/toggle-off.svg b/src/assets/gnome-shell/assets/toggle-off.svg
index e3f6927d..b00adfa0 100644
--- a/src/assets/gnome-shell/assets/toggle-off.svg
+++ b/src/assets/gnome-shell/assets/toggle-off.svg
@@ -1,4 +1,73 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#000000" opacity=".5" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="10" cy="9.98" r="9" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg1266"
+   sodipodi:docname="toggle-off.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs1270">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter1830"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur1832" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1268"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="8.34386"
+     inkscape:cx="-16.658956"
+     inkscape:cy="-10.127207"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1266">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1463" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="0"
+     width="46"
+     height="24"
+     rx="12"
+     ry="12"
+     id="rect2"
+     style="fill:#000000;opacity:0.5" />
+  <circle
+     cx="12"
+     cy="13"
+     r="9"
+     id="circle1465"
+     style="fill:#000000;filter:url(#filter1830);opacity:0.15" />
+  <circle
+     cx="12"
+     cy="12.089559"
+     r="9"
+     id="circle4"
+     style="fill:#ffffff" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Dracula/toggle-on-dark.svg
index bb5d7e69..5999f60a 100644
--- a/src/assets/gnome-shell/theme-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#bd93f9" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#a679ec"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#bd93f9;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Dracula/toggle-on.svg
index ee15aac0..954305f4 100644
--- a/src/assets/gnome-shell/theme-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a679ec" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#a679ec"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Green-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Green-Dracula/toggle-on-dark.svg
index e97d3e5c..a940c2e1 100644
--- a/src/assets/gnome-shell/theme-Green-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Green-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#50fa7b" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#4be772"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#50fa7b;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Green-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Green-Dracula/toggle-on.svg
index 318357ad..01dae21c 100644
--- a/src/assets/gnome-shell/theme-Green-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Green-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4be772" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#4be772"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Green-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Green-Nord/toggle-on-dark.svg
index 1d9afa76..8404cc50 100644
--- a/src/assets/gnome-shell/theme-Green-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Green-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a0c082" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#82ac5d"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#a0c082;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Green-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Green-Nord/toggle-on.svg
index 3b04fe25..44a706c3 100644
--- a/src/assets/gnome-shell/theme-Green-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Green-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#82ac5d" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#82ac5d"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Green/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Green/toggle-on-dark.svg
index bfaf44c7..938b185c 100644
--- a/src/assets/gnome-shell/theme-Green/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Green/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#66BB6A" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#4CAF50"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#66BB6A;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Green/toggle-on.svg b/src/assets/gnome-shell/theme-Green/toggle-on.svg
index 02a63c43..221836c5 100644
--- a/src/assets/gnome-shell/theme-Green/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Green/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4CAF50" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#4CAF50"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on-dark.svg
index c6ab88a8..627c3c54 100644
--- a/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d9dae3" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#3c3f51"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#d9dae3;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on.svg
index 79049a12..3a4b1b83 100644
--- a/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Grey-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3c3f51" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#3c3f51"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Grey-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Grey-Nord/toggle-on-dark.svg
index 56eff700..80cd7173 100644
--- a/src/assets/gnome-shell/theme-Grey-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Grey-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d9dce3" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#3a4150"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#d9dce3;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Grey-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Grey-Nord/toggle-on.svg
index 59f1f592..ad054fea 100644
--- a/src/assets/gnome-shell/theme-Grey-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Grey-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3a4150" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#3a4150"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Grey/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Grey/toggle-on-dark.svg
index c3563d92..82474731 100644
--- a/src/assets/gnome-shell/theme-Grey/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Grey/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#DDDDDD" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#464646"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#DDDDDD;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Grey/toggle-on.svg b/src/assets/gnome-shell/theme-Grey/toggle-on.svg
index e2c9cd4f..ac2c45ab 100644
--- a/src/assets/gnome-shell/theme-Grey/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Grey/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#464646" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#464646"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Nord/toggle-on-dark.svg
index 1905213c..a3a96fb0 100644
--- a/src/assets/gnome-shell/theme-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#89a3c2" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#5e81ac"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#89a3c2;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Nord/toggle-on.svg
index e7600239..669cebb6 100644
--- a/src/assets/gnome-shell/theme-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#5e81ac" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#5e81ac"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on-dark.svg
index eb449b6b..d8d63b0d 100644
--- a/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ffb86c" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#f8a854"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#ffb86c;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on.svg
index 056beeff..5b48381f 100644
--- a/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Orange-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f8a854" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#f8a854"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Orange-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Orange-Nord/toggle-on-dark.svg
index 2f45f5d3..dd8d60fe 100644
--- a/src/assets/gnome-shell/theme-Orange-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Orange-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dca493" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#d0846c"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#dca493;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Orange-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Orange-Nord/toggle-on.svg
index cb224782..b815de0f 100644
--- a/src/assets/gnome-shell/theme-Orange-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Orange-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d0846c" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#d0846c"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Orange/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Orange/toggle-on-dark.svg
index c7f9b27f..062fcc56 100644
--- a/src/assets/gnome-shell/theme-Orange/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Orange/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FB8C00" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#F57C00"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#FB8C00;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Orange/toggle-on.svg b/src/assets/gnome-shell/theme-Orange/toggle-on.svg
index 458fe696..61230e55 100644
--- a/src/assets/gnome-shell/theme-Orange/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Orange/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F57C00" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#F57C00"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on-dark.svg
index b38c1f31..2637e23d 100644
--- a/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ff79c6" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#f04cab"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#ff79c6;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on.svg
index b1effa1e..dcc1f345 100644
--- a/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Pink-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f04cab" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#f04cab"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Pink-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Pink-Nord/toggle-on-dark.svg
index 846a71af..56abd40f 100644
--- a/src/assets/gnome-shell/theme-Pink-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Pink-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#dc98b1" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#cd7092"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#dc98b1;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Pink-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Pink-Nord/toggle-on.svg
index f8f3eeee..85b2d2ea 100644
--- a/src/assets/gnome-shell/theme-Pink-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Pink-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#cd7092" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#cd7092"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Pink/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Pink/toggle-on-dark.svg
index 6c2403d1..fd4c7e9e 100644
--- a/src/assets/gnome-shell/theme-Pink/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Pink/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F06292" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#EC407A"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#F06292;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Pink/toggle-on.svg b/src/assets/gnome-shell/theme-Pink/toggle-on.svg
index 9e76e172..243fc2d7 100644
--- a/src/assets/gnome-shell/theme-Pink/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Pink/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#EC407A" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#EC407A"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on-dark.svg
index bb5d7e69..5999f60a 100644
--- a/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#bd93f9" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#a679ec"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#bd93f9;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on.svg
index ee15aac0..954305f4 100644
--- a/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Purple-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#a679ec" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#a679ec"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Purple-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Purple-Nord/toggle-on-dark.svg
index 0048c920..0608c5bb 100644
--- a/src/assets/gnome-shell/theme-Purple-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Purple-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#c89dbf" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#b57daa"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#c89dbf;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Purple-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Purple-Nord/toggle-on.svg
index 3c260ffc..36a87db3 100644
--- a/src/assets/gnome-shell/theme-Purple-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Purple-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#b57daa" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#b57daa"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Purple/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Purple/toggle-on-dark.svg
index 07e04679..fdd76753 100644
--- a/src/assets/gnome-shell/theme-Purple/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Purple/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#BA68C8" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#AB47BC"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#BA68C8;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Purple/toggle-on.svg b/src/assets/gnome-shell/theme-Purple/toggle-on.svg
index 8d2fe5a3..aa9aeff4 100644
--- a/src/assets/gnome-shell/theme-Purple/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Purple/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#AB47BC" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#AB47BC"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Red-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Red-Dracula/toggle-on-dark.svg
index 31445aa5..b514decc 100644
--- a/src/assets/gnome-shell/theme-Red-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Red-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#ff5555" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#f44d4d"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#ff5555;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Red-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Red-Dracula/toggle-on.svg
index 26f23bfa..4bc17e79 100644
--- a/src/assets/gnome-shell/theme-Red-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Red-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f44d4d" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#f44d4d"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Red-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Red-Nord/toggle-on-dark.svg
index 2f74847b..813ea667 100644
--- a/src/assets/gnome-shell/theme-Red-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Red-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#d4878f" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#c35b65"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#d4878f;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Red-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Red-Nord/toggle-on.svg
index 9e89a79e..cfb4c6c4 100644
--- a/src/assets/gnome-shell/theme-Red-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Red-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#c35b65" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#c35b65"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Red/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Red/toggle-on-dark.svg
index cea36cea..782804a6 100644
--- a/src/assets/gnome-shell/theme-Red/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Red/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#F44336" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#E53935"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#F44336;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Red/toggle-on.svg b/src/assets/gnome-shell/theme-Red/toggle-on.svg
index 29a48401..e47c1591 100644
--- a/src/assets/gnome-shell/theme-Red/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Red/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#E53935" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#E53935"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on-dark.svg
index df00727e..1686b52c 100644
--- a/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#50fae9" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#20eed9"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#50fae9;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on.svg
index 8bfe72c4..1210403c 100644
--- a/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Teal-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#20eed9" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#20eed9"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Teal-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Teal-Nord/toggle-on-dark.svg
index 1ecc04ed..7be1870a 100644
--- a/src/assets/gnome-shell/theme-Teal-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Teal-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#83b9b8" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#63a6a5"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#83b9b8;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Teal-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Teal-Nord/toggle-on.svg
index 91d16f1f..02ac9dee 100644
--- a/src/assets/gnome-shell/theme-Teal-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Teal-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#63a6a5" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#63a6a5"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Teal/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Teal/toggle-on-dark.svg
index 258431de..85ecfdb9 100644
--- a/src/assets/gnome-shell/theme-Teal/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Teal/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#4DB6AC" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#009688"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#4DB6AC;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Teal/toggle-on.svg b/src/assets/gnome-shell/theme-Teal/toggle-on.svg
index 2bcdf67e..7447a74a 100644
--- a/src/assets/gnome-shell/theme-Teal/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Teal/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#009688" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#009688"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on-dark.svg
index 00a0d099..31d74177 100644
--- a/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#f1fa8c" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#e8f467"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#f1fa8c;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on.svg b/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on.svg
index 5adff487..3efa1101 100644
--- a/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Yellow-Dracula/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e8f467" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#e8f467"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on-dark.svg
index c3d286bb..d3eb9258 100644
--- a/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#eac985" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#e4b558"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#eac985;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on.svg b/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on.svg
index 646896a9..e4c092d9 100644
--- a/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Yellow-Nord/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#e4b558" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#e4b558"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Yellow/toggle-on-dark.svg b/src/assets/gnome-shell/theme-Yellow/toggle-on-dark.svg
index 62c3d581..177ab53b 100644
--- a/src/assets/gnome-shell/theme-Yellow/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme-Yellow/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FFD600" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#FBC02D"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#FFD600;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme-Yellow/toggle-on.svg b/src/assets/gnome-shell/theme-Yellow/toggle-on.svg
index e1c96741..389cf21e 100644
--- a/src/assets/gnome-shell/theme-Yellow/toggle-on.svg
+++ b/src/assets/gnome-shell/theme-Yellow/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#FBC02D" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#FBC02D"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme/toggle-on-dark.svg b/src/assets/gnome-shell/theme/toggle-on-dark.svg
index b9ebff23..ad4cf265 100644
--- a/src/assets/gnome-shell/theme/toggle-on-dark.svg
+++ b/src/assets/gnome-shell/theme/toggle-on-dark.svg
@@ -1,4 +1,75 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#5b9bf8" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg160"
+   sodipodi:docname="toggle-on-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs164">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview162"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="8.34386"
+     inkscape:cx="21.093355"
+     inkscape:cy="12.164634"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#3c84f7"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#5b9bf8;fill-opacity:1"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="opacity:0.15;fill:#000000;paint-order:stroke fill markers;filter:url(#filter898)"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/assets/gnome-shell/theme/toggle-on.svg b/src/assets/gnome-shell/theme/toggle-on.svg
index edec9220..66a0efed 100644
--- a/src/assets/gnome-shell/theme/toggle-on.svg
+++ b/src/assets/gnome-shell/theme/toggle-on.svg
@@ -1,4 +1,81 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <rect transform="scale(-1,1)" x="-40" y="-.019988" width="40" height="20" rx="10" ry="10" fill="#3c84f7" stroke-width="0" style="paint-order:stroke fill markers"/>
- <circle cx="30" cy="9.98" r="8.98" fill="#ffffff" stroke-width="0" style="paint-order:stroke fill markers"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="46"
+   height="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="toggle-on.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   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="defs10">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter898"
+       x="-0.108"
+       y="-0.108"
+       width="1.216"
+       height="1.216">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.81"
+         id="feGaussianBlur900" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="5.9"
+     inkscape:cx="18.38983"
+     inkscape:cy="-12.79661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid340"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <rect
+     x="0"
+     y="-0.019988"
+     width="46"
+     height="24.019987"
+     rx="12.009994"
+     ry="12.009994"
+     fill="#3c84f7"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="rect2" />
+  <circle
+     cx="34"
+     cy="13"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers;fill:#000000;filter:url(#filter898);opacity:0.15"
+     id="circle342" />
+  <circle
+     cx="34"
+     cy="12"
+     r="9"
+     fill="#ffffff"
+     stroke-width="0"
+     style="paint-order:stroke fill markers"
+     id="circle4" />
 </svg>
diff --git a/src/sass/gnome-shell/common/_switches.scss b/src/sass/gnome-shell/common/_switches.scss
index aa652dc9..c1b54a48 100644
--- a/src/sass/gnome-shell/common/_switches.scss
+++ b/src/sass/gnome-shell/common/_switches.scss
@@ -1,8 +1,8 @@
 /* Switches */
 
 .toggle-switch {
-  width: 40px;
-  height: 20px;
+  width: 46px;
+  height: 24px;
   background-size: contain;
 
   &, .popup-sub-menu & {