diff --git a/NEWS.md b/NEWS.md
index a912ff215..1e55e4b8b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -51,6 +51,7 @@ Many bugs have been fixed, and numerous features that were only partially implem
 * Expanded the metadata for folders and made it possible to mark them as favorites
 * Added new component GuiComplexTextEditPopup to handle changes to configuration file entries and similar
 * Speed improvements and optimizations, the application now starts faster and feels more responsive
+* Replaced the on and off button icons with new graphics
 * Added metadata entry to mark games as broken/not working
 * Added metadata entry to indicate whether the file should be counted as a game (for example useful to exclude setup files and similar for DOS games)
 * Added metadata entry to hide the metadata values from the gamelist views (useful for general folders, DOS game configuration utilities etc.)
diff --git a/resources/graphics/off.svg b/resources/graphics/off.svg
index 5dacfb38a..e7344de64 100644
--- a/resources/graphics/off.svg
+++ b/resources/graphics/off.svg
@@ -1,9 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64" height="32" version="1.1" viewBox="0 0 64 32" xmlns="http://www.w3.org/2000/svg">
- <path id="outline" d="m8 2h48a6 6 90 0 1 6 6v16a6 6 90 0 1-6 6h-48a6 6 90 0 1-6-6v-16a6 6 90 0 1 6-6z" fill="none" stroke="#777" stroke-linejoin="round" stroke-width="3"/>
- <g id="label_off" fill="#777">
-  <path d="m18.283203 7.673828q1.136719-0.480469 2.578125-0.480469t2.566406 0.480469q1.125 0.46875 1.839844 1.277344 0.726563 0.808594 1.183594 1.957031 0.46875 1.136719 0.65625 2.390625 0.199219 1.242188 0.199219 2.695313t-0.199219 2.707031q-0.1875 1.242187-0.65625 2.390625-0.46875 1.148437-1.195313 1.957031-0.726562 0.796875-1.851562 1.277344t-2.566406 0.480469q-1.441407 0-2.578125-0.480469-1.125-0.480469-1.851563-1.277344-0.726562-0.808594-1.195312-1.957031-0.855469-2.109375-0.855469-5.121094 0-4.78125 2.0625-7.03125 0.738281-0.796875 1.863281-1.265625zm2.578125 2.742188q-1.160156 0-1.757812 1.417968-0.585938 1.417969-0.585938 4.160157 0 2.730468 0.585938 4.160156 0.597656 1.417969 1.734375 1.417969 2.296875 0 2.296875-5.578125t-2.273438-5.578125z"/>
-  <path d="m38.626953 10.626953h-4.371094v4.113281h4.078125v3.175782h-4.078125v6.667968h-4.078125v-17.132812h8.449219z"/>
-  <path d="m49.642578 10.626953h-4.371094v4.113281h4.078125v3.175782h-4.078125v6.667968h-4.078125v-17.132812h8.449219z"/>
- </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="43.916"
+   height="21.959"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="off.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1139"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="16.21277"
+     inkscape:cx="19.031461"
+     inkscape:cy="7.2502934"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     inkscape:pagecheckerboard="false" />
+  <path
+     style="fill:#b3b3b3;fill-opacity:1;stroke-width:0.74354357"
+     d="M 10.433594 0.15820312 C 4.9009198 0.15820313 0.40039062 5.0035554 0.40039062 10.958984 C 0.40039062 16.914414 4.9009208 21.759766 10.433594 21.759766 L 33.367188 21.759766 C 38.899858 21.759766 43.400391 16.914414 43.400391 10.958984 C 43.400391 5.0035554 38.899858 0.15820312 33.367188 0.15820312 L 10.433594 0.15820312 z M 10.433594 3.2441406 C 14.385295 3.2441406 17.599609 6.7053283 17.599609 10.958984 C 17.599609 15.212638 14.385295 18.673828 10.433594 18.673828 C 6.4818917 18.673828 3.2675781 15.212638 3.2675781 10.958984 C 3.2675781 6.7053283 6.4818918 3.2441406 10.433594 3.2441406 z M 10.433594 4.7871094 C 7.2723748 4.7871094 4.6992188 7.5562136 4.6992188 10.958984 C 4.6992187 14.361753 7.2723747 17.130859 10.433594 17.130859 C 13.594809 17.130859 16.166016 14.361753 16.166016 10.958984 C 16.166016 7.5562136 13.594809 4.7871094 10.433594 4.7871094 z "
+     id="path6" />
 </svg>
diff --git a/resources/graphics/on.svg b/resources/graphics/on.svg
index ab4d5d9d5..244bd0dcd 100644
--- a/resources/graphics/on.svg
+++ b/resources/graphics/on.svg
@@ -1,5 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64" height="32" version="1.1" viewBox="0 0 64 32" xmlns="http://www.w3.org/2000/svg">
- <path id="outline" d="m8 2h48a6 6 90 0 1 6 6v16a6 6 90 0 1-6 6h-48a6 6 90 0 1-6-6v-16a6 6 90 0 1 6-6z" fill="none" stroke="#777" stroke-linejoin="round" stroke-width="3"/>
- <path id="label_on" d="m8 2a6 6 0 0 0-6 6v16a6 6 0 0 0 6 6h48a6 6 0 0 0 6-6v-16a6 6 0 0 0-6-6h-48zm16.271484 5.1933594c0.960938 0 1.816407 0.1601562 2.566407 0.4804687 0.75 0.3125 1.363281 0.7382813 1.839843 1.2773438 0.484375 0.5390625 0.878907 1.1914061 1.183594 1.9570311 0.3125 0.757813 0.53125 1.554688 0.65625 2.390625 0.132813 0.828125 0.199219 1.726563 0.199219 2.695313s-0.066406 1.871093-0.199219 2.707031c-0.125 0.828125-0.34375 1.625-0.65625 2.390625s-0.710937 1.417969-1.195312 1.957031c-0.484375 0.53125-1.101563 0.957031-1.851563 1.277344-0.75 0.320312-1.605469 0.480469-2.566406 0.480469-0.960938 0-1.820313-0.160157-2.578125-0.480469-0.75-0.320313-1.367188-0.746094-1.851563-1.277344-0.484375-0.539062-0.882812-1.191406-1.195312-1.957031-0.570313-1.40625-0.855469-3.113281-0.855469-5.121094 0-3.1875 0.6875-5.53125 2.0625-7.0312499 0.492188-0.53125 1.113281-0.953125 1.863281-1.265625 0.757813-0.3203125 1.617188-0.4804687 2.578125-0.4804687zm9.316407 0.2578125h4.6875l4.113281 9.6210941v-9.6210941h3.84375v17.1328121h-4.664063l-4.113281-9.632812v9.632812h-3.867187v-17.1328121zm-9.316407 2.9648441c-0.773437 0-1.359375 0.472656-1.757812 1.417968-0.390625 0.945313-0.585938 2.332032-0.585938 4.160157 0 1.820312 0.195313 3.207031 0.585938 4.160156 0.398437 0.945312 0.976562 1.417969 1.734375 1.417969 1.53125 0 2.296875-1.859375 2.296875-5.578125s-0.757813-5.578125-2.273438-5.578125z" fill="#777"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="43.916"
+   height="21.959"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="on.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1139"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="16.21277"
+     inkscape:cx="18.215088"
+     inkscape:cy="9.5704457"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     inkscape:pagecheckerboard="false" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 10.433337,21.759 H 33.366664 C 38.899337,21.759 43.4,16.91443 43.4,10.959 43.4,5.003571 38.899337,0.159 33.366663,0.159 H 10.433337 C 4.9006667,0.159 0.4,5.003571 0.4,10.959 c 0,5.95543 4.5006667,10.8 10.033337,10.8 z M 33.366664,3.2447141 c 3.9517,0 7.166673,3.4606284 7.166673,7.7142859 0,4.253657 -3.214973,7.714287 -7.166673,7.714287 -3.9517,0 -7.166663,-3.46063 -7.166663,-7.714287 0,-4.2536575 3.214963,-7.7142859 7.166663,-7.7142859 z"
+     id="path6"
+     style="fill:#808080;stroke-width:0.74354357;fill-opacity:1" />
 </svg>