diff --git a/resources/graphics/controllers/gamepad_nintendo_64.svg b/resources/graphics/controllers/gamepad_nintendo_64.svg
index 48c9bf4e8..df48b2125 100644
--- a/resources/graphics/controllers/gamepad_nintendo_64.svg
+++ b/resources/graphics/controllers/gamepad_nintendo_64.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733334 67.733334"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -50,9 +50,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="14.408843"
-     inkscape:cy="35.16371"
+     inkscape:zoom="2.4942087"
+     inkscape:cx="4.6339592"
+     inkscape:cy="120.56837"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -71,7 +71,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -79,216 +79,220 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26664)">
     <g
-       id="g6500">
-      <path
-         d="m 8.9207505,288.75028 v -0.28673 c 0,0 -0.8945998,-0.5964 -3.3891568,-0.5964 -2.494557,0 -3.3891568,0.5964 -3.3891568,0.5964 v 0.28673"
-         style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path22-9-2"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path26-2-4"
-         d="m 5.5533939,287.39694 c -0.756969,0 -1.6331147,0.34396 -1.6331147,0.34396 l -0.2066758,0.40158 c 0,0 -2.1943939,0.16039 -2.1867555,1.63611 5.085e-4,0.0982 0.0075,0.18881 0.01904,0.27331 -0.1137858,0.538 -0.2468545,1.45365 -0.133525,2.53298 0.092809,0.88393 0.4822912,1.17919 0.7014452,1.18319 0.3958948,0.007 0.6790322,-0.98964 0.7971423,-1.56548 0.1240976,-0.60497 0.1548601,-0.89078 0.1633366,-1.0221 0.084918,0.008 0.1608876,0.0163 0.2189511,0.028 0.7952073,0.16057 0.9046239,0.0698 1.1162999,1.37634 0.2217231,1.36867 0.5245184,2.92843 1.1438567,2.90548 0.6193384,0.023 0.9221336,-1.53681 1.1438567,-2.90548 0.2116761,-1.30655 0.3210926,-1.21577 1.1162999,-1.37634 0.059266,-0.0119 0.1373374,-0.0202 0.2244625,-0.0286 0.00843,0.13111 0.03911,0.417 0.1633365,1.0226 0.1181333,0.57583 0.4012477,1.5727 0.7971423,1.56548 0.2191538,-0.004 0.608887,-0.29924 0.7016953,-1.18319 0.1143159,-1.08873 -0.022366,-2.01198 -0.1367813,-2.548 2.04e-5,-1.6e-4 -2.04e-5,-3.4e-4 0,-5e-4 0.010198,-0.08 0.015807,-0.16573 0.016283,-0.25778 0.00764,-1.47572 -2.1867555,-1.63612 -2.1867555,-1.63612 L 7.1865088,287.7408 c 0,0 -0.8761456,-0.34396 -1.6331147,-0.34396 z"
-         style="fill:#c2c2c2;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.10583333;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="m 7.1595743,287.77369 -0.1162104,1.70489 0.3254908,-1.29954 z"
-         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02235503"
-         id="path226-0-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.6964736,289.83986 c 0,0.45806 -0.3713048,0.82932 -0.829317,0.82932 -0.458035,0 -0.8293398,-0.37126 -0.8293398,-0.82932 0,-0.45802 0.3713048,-0.82932 0.8293398,-0.82932 0.4580122,0 0.829317,0.3713 0.829317,0.82932"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path46-2-8"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.6964736,289.83986 c 0,0.45806 -0.3713048,0.82932 -0.829317,0.82932 -0.458035,0 -0.8293398,-0.37126 -0.8293398,-0.82932 0,-0.45802 0.3713048,-0.82932 0.8293398,-0.82932 0.4580122,0 0.829317,0.3713 0.829317,0.82932 z"
-         style="fill:none;stroke:#a3a3a3;stroke-width:0.02293845;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="path50-4-3"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 3.0196996,290.48209 H 2.7333131 c -0.031632,0 -0.057346,-0.0257 -0.057346,-0.0573 v -0.38906 H 2.2962667 c -0.03154,0 -0.057277,-0.0257 -0.057277,-0.0573 v -0.28636 c 0,-0.0316 0.025667,-0.0573 0.057277,-0.0573 h 0.3797002 v -0.37971 c 0,-0.0317 0.025714,-0.0573 0.057346,-0.0573 h 0.2863866 c 0.031586,0 0.057277,0.0257 0.057277,0.0573 v 0.37971 h 0.3610521 c 0.031609,0 0.057278,0.0257 0.057278,0.0573 v 0.28636 c 0,0.0316 -0.025669,0.0572 -0.057278,0.0572 H 3.076977 v 0.3891 c 0,0.0316 -0.025691,0.0573 -0.057277,0.0573"
-         style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path54-7-1"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.9659651,289.9888 c 0,0.22627 -0.1834388,0.4097 -0.4097038,0.4097 -0.2262878,0 -0.4097265,-0.18343 -0.4097265,-0.40968 0,-0.22629 0.1834387,-0.40971 0.4097265,-0.40971 0.226265,0 0.4097038,0.18342 0.4097038,0.40969"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path58-7-3"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 6.459142,291.72032 c 0,0.49864 -0.4042444,0.90288 -0.9028806,0.90288 -0.498659,0 -0.9029034,-0.40424 -0.9029034,-0.90288 0,-0.49864 0.4042444,-0.90288 0.9029034,-0.90288 0.4986362,0 0.9028806,0.40424 0.9028806,0.90288"
-         style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path66-4-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 7.4576186,290.30537 -0.052965,0.0512 -0.1864895,-0.19306 0.052964,-0.0512 z"
-         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path70-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 8.9056076,289.42315 c 0,0.33271 -0.2697416,0.60245 -0.6024706,0.60245 -0.332729,0 -0.6024705,-0.26974 -0.6024705,-0.60245 0,-0.33275 0.2697415,-0.60247 0.6024705,-0.60247 0.332729,0 0.6024706,0.26972 0.6024706,0.60247"
-         style="fill:#afafaf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02362629"
-         id="path78-3"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.0006584,289.83986 c 0,0.0738 -0.059755,0.1335 -0.1335018,0.1335 -0.073748,0 -0.1335247,-0.0598 -0.1335247,-0.1335 0,-0.0738 0.059778,-0.13351 0.1335247,-0.13351 0.073748,0 0.1335018,0.0597 0.1335018,0.13351"
-         style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path82-1-0"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 2.7653604,290.1433 h 0.2035787 l -0.1018008,0.2189 z"
-         style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path86-2-6"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 2.7653604,290.1433 h 0.2035787 l -0.1018008,0.2189 z"
-         style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="path90-8-4"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 2.9689391,289.53641 H 2.7653604 l 0.1018008,-0.21889 z"
-         style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path94-9-0"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 2.9689391,289.53641 H 2.7653604 l 0.1018008,-0.21889 z"
-         style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="path98-3-6"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 2.5637062,289.73807 v 0.20358 l -0.2189017,-0.1018 z"
-         style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path102-6-6"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 2.5637062,289.73807 v 0.20358 l -0.2189017,-0.1018 z"
-         style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="path106-8-5"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.1705911,289.94165 v -0.20358 l 0.2189017,0.1018 z"
-         style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path110-0-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 3.1705911,289.94165 v -0.20358 l 0.2189017,0.1018 z"
-         style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="path114-2-7"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.8774113,289.9888 c 0,0.17736 -0.1438011,0.32116 -0.3211613,0.32116 -0.1773601,0 -0.3211613,-0.14378 -0.3211613,-0.32114 0,-0.17738 0.1438012,-0.32118 0.3211613,-0.32118 0.1773602,0 0.3211613,0.1438 0.3211613,0.32116"
-         style="fill:#b40519;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path118-1-8"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 7.3836283,289.91383 c 0,0.18788 -0.1523572,0.34024 -0.340269,0.34024 -0.1879118,0 -0.340269,-0.15236 -0.340269,-0.34024 0,-0.18794 0.1523572,-0.34027 0.340269,-0.34027 0.1879118,0 0.340269,0.15233 0.340269,0.34027"
-         style="fill:#0c9655;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path122-0-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 8.0680409,289.42315 c 0,0.12282 -0.099553,0.22234 -0.2223425,0.22234 -0.1228125,0 -0.2223653,-0.0995 -0.2223653,-0.22234 0,-0.12278 0.099553,-0.22234 0.2223653,-0.22234 0.1227893,0 0.2223425,0.0996 0.2223425,0.22234"
-         style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path126-5-6"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 8.9829135,289.42315 c 0,0.12282 -0.099553,0.22234 -0.2223425,0.22234 -0.1228123,0 -0.2223654,-0.0995 -0.2223654,-0.22234 0,-0.12278 0.099553,-0.22234 0.2223654,-0.22234 0.1227894,0 0.2223425,0.0996 0.2223425,0.22234"
-         style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path130-1-2"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 8.303137,289.65823 c 0.1228123,0 0.2223427,0.0996 0.2223427,0.22235 0,0.12281 -0.09953,0.22236 -0.2223427,0.22236 -0.1228123,0 -0.2223426,-0.0995 -0.2223426,-0.22236 0,-0.1228 0.09953,-0.22235 0.2223426,-0.22235"
-         style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path134-1-6"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 8.303137,288.74333 c 0.1228123,0 0.2223427,0.0996 0.2223427,0.22235 0,0.12282 -0.09953,0.22236 -0.2223427,0.22236 -0.1228123,0 -0.2223426,-0.0995 -0.2223426,-0.22236 0,-0.12279 0.09953,-0.22235 0.2223426,-0.22235"
-         style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path138-0-3"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.1694732,292.09916 -0.1545823,-0.38444 0.1625419,-0.38117 0.3844027,-0.15459 0.3811912,0.16255 0.1545823,0.38442 -0.1625419,0.38117 -0.3844256,0.15457 z"
-         style="fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path142-1"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 8.0009272,290.52703 c 0,0.1879 -0.1523573,0.34027 -0.3402691,0.34027 -0.1879118,0 -0.340269,-0.15237 -0.340269,-0.34027 0,-0.18792 0.1523572,-0.34028 0.340269,-0.34028 0.1879118,0 0.3402691,0.15236 0.3402691,0.34028"
-         style="fill:#0356b2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path146-8-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.976639,291.72032 c 0,0.23217 -0.1882258,0.4204 -0.4204033,0.4204 -0.2321489,0 -0.4203747,-0.1882 -0.4203747,-0.4204 0,-0.23215 0.1882258,-0.42037 0.4203747,-0.42037 0.2321775,0 0.4204033,0.18819 0.4204033,0.42037"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02848453"
-         id="path154-9"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 5.5563759,288.61448 H 6.279442 c 0.01273,0 0.02537,-9.1e-4 0.037963,-0.003 0.1009521,-0.0178 0.1681389,-0.118 0.1457739,-0.21756 -0.019131,-0.0852 -0.092029,-0.14386 -0.1792869,-0.14386 -0.4850337,-8e-5 -0.9700444,-3e-5 -1.455078,0 -0.042803,0 -0.081041,0.0133 -0.1146923,0.0398 -0.077922,0.0614 -0.091662,0.1771 -0.02982,0.25462 0.037895,0.0475 0.087855,0.0702 0.1484119,0.0702 z m -2.28e-5,-0.42096 c 0.2412207,0 0.4824645,9e-5 0.7236853,-7e-5 0.044661,-4e-5 0.086753,0.01 0.1250834,0.0326 0.065443,0.0394 0.1051957,0.097 0.1158162,0.17286 0.016217,0.11602 -0.05168,0.22386 -0.1623125,0.26019 -0.025324,0.008 -0.051359,0.0117 -0.077968,0.0117 -0.4283985,-4e-5 -0.8568201,-4e-5 -1.2852186,-4e-5 -0.057438,0 -0.1148759,4.6e-4 -0.1722679,-1.8e-4 -0.1077419,-9.2e-4 -0.2030283,-0.0781 -0.2275494,-0.18292 -0.028398,-0.12164 0.039385,-0.24292 0.1579083,-0.28235 0.025691,-0.008 0.052116,-0.0119 0.079137,-0.0119 0.2412208,8e-5 0.4824416,3e-5 0.7236853,3e-5"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path178-2"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 4.9485735,288.47435 v -0.006 c 0,-0.0466 9.17e-5,-0.093 -1.376e-4,-0.13947 0,-0.005 0.00133,-0.006 0.00624,-0.006 0.018443,2.8e-4 0.036931,2.3e-4 0.05542,5e-5 0.00386,-5e-5 0.00495,9.2e-4 0.00493,0.005 -9.18e-5,0.0702 -9.18e-5,0.14028 2.29e-5,0.21039 0,0.005 -0.0011,0.006 -0.00527,0.006 -0.018671,-2.3e-4 -0.037367,-2.3e-4 -0.056039,0 -0.00399,9e-5 -0.00594,-0.002 -0.00796,-0.005 -0.031655,-0.0492 -0.063425,-0.0984 -0.095172,-0.14754 -0.00117,-0.002 -0.00239,-0.004 -0.0047,-0.006 v 0.006 c 0,0.048 -1.376e-4,0.0961 1.606e-4,0.14422 6.88e-5,0.006 -0.00179,0.007 -0.00755,0.007 -0.017662,-3.6e-4 -0.035371,-2.7e-4 -0.053011,-5e-5 -0.00424,5e-5 -0.00582,-4.8e-4 -0.0058,-0.006 1.606e-4,-0.0699 1.606e-4,-0.13983 -2.3e-5,-0.20978 0,-0.005 0.00161,-0.006 0.00573,-0.006 0.020071,1.8e-4 0.040142,2.3e-4 0.060213,-4e-5 0.00413,-5e-5 0.00631,0.002 0.00842,0.005 0.031012,0.0491 0.062186,0.0982 0.093268,0.14726 4.358e-4,-4e-5 8.483e-4,-9e-5 0.00126,-1.4e-4"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path182-6"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 6.0513672,288.47076 c 0,-0.0106 2.065e-4,-0.0211 -4.58e-5,-0.0316 -3.899e-4,-0.015 -0.010184,-0.0253 -0.024246,-0.0256 -0.014452,-4.5e-4 -0.026104,0.009 -0.026655,0.0239 -8.241e-4,0.022 -5.284e-4,0.044 -1.376e-4,0.0661 1.835e-4,0.009 0.00592,0.0151 0.015529,0.0168 0.00647,9.2e-4 0.013029,0.002 0.019567,2.3e-4 0.010253,-0.002 0.015713,-0.007 0.01592,-0.0183 2.065e-4,-0.0105 4.59e-5,-0.021 6.89e-5,-0.0316 m 4.58e-5,-0.0675 c 0,-0.0217 -6.88e-5,-0.0423 4.59e-5,-0.0628 0,-0.006 -0.00243,-0.0131 9.162e-4,-0.0167 0.00337,-0.004 0.010896,-9.2e-4 0.016584,-9.2e-4 0.014474,-1.8e-4 0.028994,5e-5 0.043514,-1.4e-4 0.00388,-4e-5 0.00544,4.9e-4 0.00541,0.005 -1.147e-4,0.0702 -1.147e-4,0.14031 -2.3e-5,0.21043 2.3e-5,0.004 -7.804e-4,0.006 -0.00484,0.006 -0.018901,-2.1e-4 -0.03778,-4e-5 -0.056635,-1.1e-4 -0.00213,0 -0.00466,9.1e-4 -0.00518,-0.003 -4.129e-4,-0.004 -0.00294,-4.9e-4 -0.00399,-1.8e-4 -0.011745,0.005 -0.023947,0.007 -0.036495,0.008 -0.030004,0.002 -0.051956,-0.0129 -0.067577,-0.0371 -0.035395,-0.0549 7.321e-4,-0.10807 0.043537,-0.11935 0.020645,-0.006 0.040096,-0.002 0.058539,0.008 0.00172,9.2e-4 0.00339,0.002 0.00619,0.004"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path186-0"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.7793768,288.41346 c 0.00748,-0.003 0.013671,-0.006 0.019933,-0.0104 0.038399,-0.0221 0.082625,-0.005 0.1049205,0.0289 0.003,0.005 0.00426,0.01 0.00424,0.0153 -1.376e-4,0.0318 -1.376e-4,0.0635 2.3e-5,0.0953 2.28e-5,0.004 -5.527e-4,0.006 -0.00502,0.006 -0.019268,-2.8e-4 -0.038537,-2.8e-4 -0.057782,-4e-5 -0.00423,4e-5 -0.00527,-9.2e-4 -0.00525,-0.006 1.835e-4,-0.031 9.18e-5,-0.062 9.18e-5,-0.093 0,-0.0152 -0.01842,-0.0291 -0.033284,-0.0253 -0.00464,0.002 -0.00896,0.003 -0.013213,0.006 -0.010093,0.006 -0.015322,0.0119 -0.014956,0.0243 8.725e-4,0.0296 1.835e-4,0.0592 3.9e-4,0.0887 4.58e-5,0.005 -0.00115,0.006 -0.00525,0.006 -0.018671,-2.4e-4 -0.037367,-2.4e-4 -0.056016,0 -0.00424,9e-5 -0.00523,-9.2e-4 -0.00523,-0.006 1.375e-4,-0.0463 1.605e-4,-0.0926 0,-0.13885 0,-0.005 0.0015,-0.006 0.00544,-0.006 0.018443,1.8e-4 0.036931,2.7e-4 0.05542,-5e-5 0.00498,-1.3e-4 0.00608,0.002 0.00559,0.006 -3.211e-4,0.003 -4.59e-5,0.006 -4.59e-5,0.009"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path190-2"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.2250897,288.4088 c 0.00605,-0.004 0.011469,-0.006 0.016424,-0.009 0.031609,-0.0203 0.069871,-0.0129 0.09563,0.0116 0.011515,0.0109 0.01819,0.0229 0.017502,0.0397 -0.0011,0.0284 -4.588e-4,0.0568 -1.377e-4,0.0852 6.89e-5,0.006 -0.00175,0.006 -0.00697,0.006 -0.018282,-2.8e-4 -0.036564,-2.8e-4 -0.054846,0 -0.00489,1.2e-4 -0.00633,-9.2e-4 -0.00631,-0.006 2.753e-4,-0.0304 1.376e-4,-0.0608 1.376e-4,-0.0912 0,-0.0167 -0.018512,-0.0306 -0.034775,-0.026 -0.00438,0.002 -0.00851,0.003 -0.012548,0.006 -0.0095,0.005 -0.014726,0.0116 -0.014383,0.0235 8.727e-4,0.0292 9.17e-5,0.0584 4.588e-4,0.0876 9.17e-5,0.006 -0.0017,0.007 -0.00727,0.007 -0.017869,-3.7e-4 -0.035738,-2.8e-4 -0.053608,-5e-5 -0.00399,5e-5 -0.00548,-9.2e-4 -0.00546,-0.006 1.606e-4,-0.0465 1.147e-4,-0.093 2.29e-5,-0.13947 0,-0.004 8.484e-4,-0.005 0.00461,-0.005 0.018878,1.8e-4 0.037734,1.8e-4 0.056589,0 0.00377,-4e-5 0.00546,9.2e-4 0.00502,0.005 -3.442e-4,0.003 -9.18e-5,0.006 -9.18e-5,0.0102"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path194-2"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 6.2155653,288.47058 h 2.29e-5 c 0,0.0143 -1.835e-4,0.0286 6.89e-5,0.0428 1.606e-4,0.0103 0.00516,0.0161 0.015231,0.0183 0.00527,0.002 0.010644,9.2e-4 0.015988,9.2e-4 0.012937,-9.2e-4 0.019774,-0.007 0.019842,-0.0204 2.295e-4,-0.0275 2.982e-4,-0.0551 0,-0.0828 -1.146e-4,-0.016 -0.00996,-0.0257 -0.025003,-0.0257 -0.016148,4e-5 -0.025874,0.01 -0.026127,0.0258 -2.064e-4,0.0137 -2.29e-5,0.0274 -2.29e-5,0.041 m 0.026563,-0.0817 c 0.023856,9e-5 0.046152,0.006 0.065627,0.0215 0.041679,0.0317 0.042619,0.0856 0.0022,0.11895 -0.037619,0.031 -0.097901,0.0313 -0.1358415,4.9e-4 -0.040991,-0.0331 -0.039684,-0.0896 0.00282,-0.12079 0.019245,-0.014 0.041037,-0.0202 0.065191,-0.0204"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path198-5"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.5903594,288.44518 h 0.00954 c 0.017203,0 0.017203,0 0.016034,-0.0174 -9.645e-4,-0.0139 -0.011217,-0.0238 -0.025347,-0.0241 -0.014153,-3.8e-4 -0.024109,0.008 -0.025623,0.0218 -5.963e-4,0.006 -9.16e-5,0.0111 -3.211e-4,0.0166 -1.147e-4,0.003 0.00147,0.003 0.00372,0.003 0.00734,-5e-5 0.014657,0 0.021998,0 m 0.0356,0.0248 c -0.018671,0 -0.037343,1.4e-4 -0.055993,-5e-5 -0.00397,-4e-5 -0.0055,4.9e-4 -0.00541,0.006 3.441e-4,0.0123 4.58e-5,0.0246 1.835e-4,0.0369 1.376e-4,0.0129 0.00674,0.0197 0.019705,0.0206 0.00516,3.4e-4 0.0103,4.3e-4 0.015391,-9.2e-4 0.010735,-0.003 0.015874,-0.009 0.016103,-0.0197 1.376e-4,-0.006 1.835e-4,-0.0111 0,-0.0167 -9.18e-5,-0.003 6.884e-4,-0.004 0.0036,-0.004 0.020048,6e-5 0.040119,1.1e-4 0.06019,0 0.00477,-6e-5 0.00339,0.003 0.00248,0.005 -0.007,0.0181 -0.019589,0.0314 -0.036059,0.0413 -0.038949,0.0233 -0.092602,0.0191 -0.1264368,-0.01 -0.037046,-0.0319 -0.037183,-0.082 -2.752e-4,-0.11402 0.038881,-0.0336 0.1041177,-0.0332 0.1418972,9.2e-4 0.01468,0.0133 0.02365,0.0295 0.025714,0.0495 4.359e-4,0.005 -3.212e-4,0.006 -0.00509,0.006 -0.018649,-2.7e-4 -0.037344,-1.2e-4 -0.055993,-1.2e-4"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path202-2"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.3941507,288.46808 c 0,-0.0231 -1.147e-4,-0.0461 1.147e-4,-0.0692 4.58e-5,-0.005 -0.00126,-0.006 -0.00535,-0.006 -0.00833,2.6e-4 -0.016699,-4e-5 -0.025025,1.5e-4 -0.00319,8e-5 -0.00449,-4.9e-4 -0.00458,-0.005 -4.817e-4,-0.0159 -6.205e-4,-0.0159 0.015369,-0.0159 0.00516,0 0.010345,-1.9e-4 0.015506,3e-5 0.0031,1.2e-4 0.00413,-9.2e-4 0.00404,-0.004 -2.294e-4,-0.007 9.17e-5,-0.0154 -1.377e-4,-0.0232 -9.17e-5,-0.004 9.369e-4,-0.005 0.00434,-0.005 0.019659,1.4e-4 0.039316,1.4e-4 0.058998,0 0.00358,-3e-5 0.00489,9.2e-4 0.00473,0.005 -2.981e-4,0.007 9.18e-5,0.0151 -1.605e-4,0.0226 -1.147e-4,0.004 0.00101,0.005 0.00434,0.005 0.00872,-2.2e-4 0.017479,7e-5 0.026219,-1.3e-4 0.00332,-9e-5 0.00426,9.2e-4 0.00432,0.005 2.295e-4,0.0158 3.671e-4,0.0157 -0.015483,0.0158 -0.00631,9e-5 -0.014657,-0.003 -0.018236,9.2e-4 -0.00312,0.004 -0.00103,0.0117 -0.00103,0.0178 -4.6e-5,0.0413 -1.148e-4,0.0827 9.17e-5,0.124 2.3e-5,0.005 -0.00119,0.006 -0.00619,0.006 -0.018856,-3.2e-4 -0.037757,-2.7e-4 -0.056635,-5e-5 -0.00411,5e-5 -0.00536,-9.2e-4 -0.00532,-0.006 2.294e-4,-0.0232 1.146e-4,-0.0465 1.146e-4,-0.0697"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path206-0"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.1224492,288.46834 c 0,0.0231 -1.146e-4,0.0461 1.377e-4,0.0692 4.58e-5,0.005 -0.0011,0.006 -0.00558,0.006 -0.018489,-2.4e-4 -0.036954,-2.4e-4 -0.05542,0 -0.00411,3e-5 -0.00539,-9.2e-4 -0.00539,-0.006 1.605e-4,-0.0462 1.605e-4,-0.0926 0,-0.13883 -2.3e-5,-0.005 0.00133,-0.006 0.00536,-0.006 0.018671,1.9e-4 0.037367,1.9e-4 0.056039,0 0.0038,-4e-5 0.00498,9.2e-4 0.00495,0.005 -2.064e-4,0.0232 -1.147e-4,0.0465 -1.147e-4,0.0697"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path210-8"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 5.0891632,288.36212 c -0.00954,0 -0.019085,-9e-5 -0.028627,9e-5 -0.00339,9e-5 -0.00438,-9.2e-4 -0.00432,-0.005 1.835e-4,-0.0106 1.376e-4,-0.0211 0,-0.0316 0,-0.003 6.884e-4,-0.004 0.00367,-0.004 0.019636,1.1e-4 0.039316,1.1e-4 0.058998,0 0.00291,0 0.00367,9.1e-4 0.00365,0.004 -1.605e-4,0.0107 -2.063e-4,0.0214 0,0.0321 9.18e-5,0.004 -0.00131,0.004 -0.00417,0.004 -0.00975,-1.4e-4 -0.019475,-9e-5 -0.029201,-9e-5"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path214-8"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 6.3475509,288.38595 c 0.01546,1.4e-4 0.02904,-0.0132 0.029132,-0.0287 6.88e-5,-0.0164 -0.013144,-0.0304 -0.028811,-0.0304 -0.016309,-4e-5 -0.028581,0.0129 -0.028627,0.03 -6.88e-5,0.0163 0.012272,0.0289 0.028306,0.029 m 1.147e-4,-0.0645 c 0.018351,-7e-5 0.034247,0.0164 0.034293,0.0356 2.29e-5,0.018 -0.016195,0.0344 -0.034178,0.0344 -0.018511,0 -0.034018,-0.0156 -0.034064,-0.0343 -4.58e-5,-0.0196 0.015163,-0.0356 0.033949,-0.0356"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path218-4"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 6.346498,288.35589 c 0.00411,3.9e-4 0.00761,1.8e-4 0.00769,-0.005 1.376e-4,-0.006 -0.00397,-0.006 -0.00815,-0.006 -0.00466,-4.4e-4 -0.00535,0.002 -0.00553,0.006 -2.294e-4,0.006 0.00184,0.006 0.00599,0.006 m -0.01124,-9.2e-4 c -2.3e-5,-9.2e-4 -1.147e-4,-0.002 2.28e-5,-0.003 3.9e-4,-0.004 -0.00199,-0.0102 0.00117,-0.0117 0.0049,-0.002 0.011332,-0.002 0.01686,1.8e-4 0.00656,0.003 0.00876,0.012 0.00348,0.0174 -0.00285,0.003 -0.0023,0.005 -5.527e-4,0.007 0.00103,0.002 0.00314,0.004 -2.294e-4,0.006 -0.00354,0.002 -0.00328,-0.002 -0.00443,-0.003 -8.968e-4,-9.2e-4 -0.00158,-0.003 -0.00211,-0.004 -0.00144,-0.004 -0.00435,-0.002 -0.00672,-0.002 -0.00344,0 -0.00175,0.003 -0.00202,0.005 -2.523e-4,0.002 4.129e-4,0.004 -0.00282,0.004 -0.00319,-5e-5 -0.00264,-0.002 -0.00266,-0.004 -2.3e-5,-0.004 0,-0.007 0,-0.0113"
-         style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
-         id="path222-9"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cccc"
-         d="m 3.947426,287.77302 0.1326142,1.75161 -0.3425676,-1.34569 z"
-         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
-         id="path230-6-2"
-         inkscape:connector-curvature="0" />
+       id="g4834"
+       transform="matrix(5.9344609,0,0,5.9344609,0.89331707,-1466.4279)">
+      <g
+         id="g6500">
+        <path
+           inkscape:connector-curvature="0"
+           id="path22-9-2"
+           style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 8.9207505,288.75028 v -0.28673 c 0,0 -0.8945998,-0.5964 -3.3891568,-0.5964 -2.494557,0 -3.3891568,0.5964 -3.3891568,0.5964 v 0.28673" />
+        <path
+           style="fill:#c2c2c2;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.10583333;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 5.5533939,287.39694 c -0.756969,0 -1.6331147,0.34396 -1.6331147,0.34396 l -0.2066758,0.40158 c 0,0 -2.1943939,0.16039 -2.1867555,1.63611 5.085e-4,0.0982 0.0075,0.18881 0.01904,0.27331 -0.1137858,0.538 -0.2468545,1.45365 -0.133525,2.53298 0.092809,0.88393 0.4822912,1.17919 0.7014452,1.18319 0.3958948,0.007 0.6790322,-0.98964 0.7971423,-1.56548 0.1240976,-0.60497 0.1548601,-0.89078 0.1633366,-1.0221 0.084918,0.008 0.1608876,0.0163 0.2189511,0.028 0.7952073,0.16057 0.9046239,0.0698 1.1162999,1.37634 0.2217231,1.36867 0.5245184,2.92843 1.1438567,2.90548 0.6193384,0.023 0.9221336,-1.53681 1.1438567,-2.90548 0.2116761,-1.30655 0.3210926,-1.21577 1.1162999,-1.37634 0.059266,-0.0119 0.1373374,-0.0202 0.2244625,-0.0286 0.00843,0.13111 0.03911,0.417 0.1633365,1.0226 0.1181333,0.57583 0.4012477,1.5727 0.7971423,1.56548 0.2191538,-0.004 0.608887,-0.29924 0.7016953,-1.18319 0.1143159,-1.08873 -0.022366,-2.01198 -0.1367813,-2.548 2.04e-5,-1.6e-4 -2.04e-5,-3.4e-4 0,-5e-4 0.010198,-0.08 0.015807,-0.16573 0.016283,-0.25778 0.00764,-1.47572 -2.1867555,-1.63612 -2.1867555,-1.63612 L 7.1865088,287.7408 c 0,0 -0.8761456,-0.34396 -1.6331147,-0.34396 z"
+           id="path26-2-4"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path226-0-9"
+           style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02235503"
+           d="m 7.1595743,287.77369 -0.1162104,1.70489 0.3254908,-1.29954 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path46-2-8"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 3.6964736,289.83986 c 0,0.45806 -0.3713048,0.82932 -0.829317,0.82932 -0.458035,0 -0.8293398,-0.37126 -0.8293398,-0.82932 0,-0.45802 0.3713048,-0.82932 0.8293398,-0.82932 0.4580122,0 0.829317,0.3713 0.829317,0.82932" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path50-4-3"
+           style="fill:none;stroke:#a3a3a3;stroke-width:0.02293845;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           d="m 3.6964736,289.83986 c 0,0.45806 -0.3713048,0.82932 -0.829317,0.82932 -0.458035,0 -0.8293398,-0.37126 -0.8293398,-0.82932 0,-0.45802 0.3713048,-0.82932 0.8293398,-0.82932 0.4580122,0 0.829317,0.3713 0.829317,0.82932 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path54-7-1"
+           style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="M 3.0196996,290.48209 H 2.7333131 c -0.031632,0 -0.057346,-0.0257 -0.057346,-0.0573 v -0.38906 H 2.2962667 c -0.03154,0 -0.057277,-0.0257 -0.057277,-0.0573 v -0.28636 c 0,-0.0316 0.025667,-0.0573 0.057277,-0.0573 h 0.3797002 v -0.37971 c 0,-0.0317 0.025714,-0.0573 0.057346,-0.0573 h 0.2863866 c 0.031586,0 0.057277,0.0257 0.057277,0.0573 v 0.37971 h 0.3610521 c 0.031609,0 0.057278,0.0257 0.057278,0.0573 v 0.28636 c 0,0.0316 -0.025669,0.0572 -0.057278,0.0572 H 3.076977 v 0.3891 c 0,0.0316 -0.025691,0.0573 -0.057277,0.0573" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path58-7-3"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 5.9659651,289.9888 c 0,0.22627 -0.1834388,0.4097 -0.4097038,0.4097 -0.2262878,0 -0.4097265,-0.18343 -0.4097265,-0.40968 0,-0.22629 0.1834387,-0.40971 0.4097265,-0.40971 0.226265,0 0.4097038,0.18342 0.4097038,0.40969" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path66-4-9"
+           style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 6.459142,291.72032 c 0,0.49864 -0.4042444,0.90288 -0.9028806,0.90288 -0.498659,0 -0.9029034,-0.40424 -0.9029034,-0.90288 0,-0.49864 0.4042444,-0.90288 0.9029034,-0.90288 0.4986362,0 0.9028806,0.40424 0.9028806,0.90288" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path70-9"
+           style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 7.4576186,290.30537 -0.052965,0.0512 -0.1864895,-0.19306 0.052964,-0.0512 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path78-3"
+           style="fill:#afafaf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02362629"
+           d="m 8.9056076,289.42315 c 0,0.33271 -0.2697416,0.60245 -0.6024706,0.60245 -0.332729,0 -0.6024705,-0.26974 -0.6024705,-0.60245 0,-0.33275 0.2697415,-0.60247 0.6024705,-0.60247 0.332729,0 0.6024706,0.26972 0.6024706,0.60247" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path82-1-0"
+           style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 3.0006584,289.83986 c 0,0.0738 -0.059755,0.1335 -0.1335018,0.1335 -0.073748,0 -0.1335247,-0.0598 -0.1335247,-0.1335 0,-0.0738 0.059778,-0.13351 0.1335247,-0.13351 0.073748,0 0.1335018,0.0597 0.1335018,0.13351" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path86-2-6"
+           style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 2.7653604,290.1433 h 0.2035787 l -0.1018008,0.2189 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path90-8-4"
+           style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           d="m 2.7653604,290.1433 h 0.2035787 l -0.1018008,0.2189 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path94-9-0"
+           style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="M 2.9689391,289.53641 H 2.7653604 l 0.1018008,-0.21889 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path98-3-6"
+           style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           d="M 2.9689391,289.53641 H 2.7653604 l 0.1018008,-0.21889 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path102-6-6"
+           style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 2.5637062,289.73807 v 0.20358 l -0.2189017,-0.1018 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path106-8-5"
+           style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           d="m 2.5637062,289.73807 v 0.20358 l -0.2189017,-0.1018 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path110-0-9"
+           style="fill:#3d3d3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 3.1705911,289.94165 v -0.20358 l 0.2189017,0.1018 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path114-2-7"
+           style="fill:none;stroke:#3d3d3d;stroke-width:0.02293845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+           d="m 3.1705911,289.94165 v -0.20358 l 0.2189017,0.1018 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path118-1-8"
+           style="fill:#b40519;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 5.8774113,289.9888 c 0,0.17736 -0.1438011,0.32116 -0.3211613,0.32116 -0.1773601,0 -0.3211613,-0.14378 -0.3211613,-0.32114 0,-0.17738 0.1438012,-0.32118 0.3211613,-0.32118 0.1773602,0 0.3211613,0.1438 0.3211613,0.32116" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path122-0-9"
+           style="fill:#0c9655;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 7.3836283,289.91383 c 0,0.18788 -0.1523572,0.34024 -0.340269,0.34024 -0.1879118,0 -0.340269,-0.15236 -0.340269,-0.34024 0,-0.18794 0.1523572,-0.34027 0.340269,-0.34027 0.1879118,0 0.340269,0.15233 0.340269,0.34027" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path126-5-6"
+           style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 8.0680409,289.42315 c 0,0.12282 -0.099553,0.22234 -0.2223425,0.22234 -0.1228125,0 -0.2223653,-0.0995 -0.2223653,-0.22234 0,-0.12278 0.099553,-0.22234 0.2223653,-0.22234 0.1227893,0 0.2223425,0.0996 0.2223425,0.22234" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path130-1-2"
+           style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 8.9829135,289.42315 c 0,0.12282 -0.099553,0.22234 -0.2223425,0.22234 -0.1228123,0 -0.2223654,-0.0995 -0.2223654,-0.22234 0,-0.12278 0.099553,-0.22234 0.2223654,-0.22234 0.1227894,0 0.2223425,0.0996 0.2223425,0.22234" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path134-1-6"
+           style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 8.303137,289.65823 c 0.1228123,0 0.2223427,0.0996 0.2223427,0.22235 0,0.12281 -0.09953,0.22236 -0.2223427,0.22236 -0.1228123,0 -0.2223426,-0.0995 -0.2223426,-0.22236 0,-0.1228 0.09953,-0.22235 0.2223426,-0.22235" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path138-0-3"
+           style="fill:#f9c200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 8.303137,288.74333 c 0.1228123,0 0.2223427,0.0996 0.2223427,0.22235 0,0.12282 -0.09953,0.22236 -0.2223427,0.22236 -0.1228123,0 -0.2223426,-0.0995 -0.2223426,-0.22236 0,-0.12279 0.09953,-0.22235 0.2223426,-0.22235" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path142-1"
+           style="fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 5.1694732,292.09916 -0.1545823,-0.38444 0.1625419,-0.38117 0.3844027,-0.15459 0.3811912,0.16255 0.1545823,0.38442 -0.1625419,0.38117 -0.3844256,0.15457 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path146-8-9"
+           style="fill:#0356b2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 8.0009272,290.52703 c 0,0.1879 -0.1523573,0.34027 -0.3402691,0.34027 -0.1879118,0 -0.340269,-0.15237 -0.340269,-0.34027 0,-0.18792 0.1523572,-0.34028 0.340269,-0.34028 0.1879118,0 0.3402691,0.15236 0.3402691,0.34028" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path154-9"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02848453"
+           d="m 5.976639,291.72032 c 0,0.23217 -0.1882258,0.4204 -0.4204033,0.4204 -0.2321489,0 -0.4203747,-0.1882 -0.4203747,-0.4204 0,-0.23215 0.1882258,-0.42037 0.4203747,-0.42037 0.2321775,0 0.4204033,0.18819 0.4204033,0.42037" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path178-2"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="M 5.5563759,288.61448 H 6.279442 c 0.01273,0 0.02537,-9.1e-4 0.037963,-0.003 0.1009521,-0.0178 0.1681389,-0.118 0.1457739,-0.21756 -0.019131,-0.0852 -0.092029,-0.14386 -0.1792869,-0.14386 -0.4850337,-8e-5 -0.9700444,-3e-5 -1.455078,0 -0.042803,0 -0.081041,0.0133 -0.1146923,0.0398 -0.077922,0.0614 -0.091662,0.1771 -0.02982,0.25462 0.037895,0.0475 0.087855,0.0702 0.1484119,0.0702 z m -2.28e-5,-0.42096 c 0.2412207,0 0.4824645,9e-5 0.7236853,-7e-5 0.044661,-4e-5 0.086753,0.01 0.1250834,0.0326 0.065443,0.0394 0.1051957,0.097 0.1158162,0.17286 0.016217,0.11602 -0.05168,0.22386 -0.1623125,0.26019 -0.025324,0.008 -0.051359,0.0117 -0.077968,0.0117 -0.4283985,-4e-5 -0.8568201,-4e-5 -1.2852186,-4e-5 -0.057438,0 -0.1148759,4.6e-4 -0.1722679,-1.8e-4 -0.1077419,-9.2e-4 -0.2030283,-0.0781 -0.2275494,-0.18292 -0.028398,-0.12164 0.039385,-0.24292 0.1579083,-0.28235 0.025691,-0.008 0.052116,-0.0119 0.079137,-0.0119 0.2412208,8e-5 0.4824416,3e-5 0.7236853,3e-5" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path182-6"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 4.9485735,288.47435 v -0.006 c 0,-0.0466 9.17e-5,-0.093 -1.376e-4,-0.13947 0,-0.005 0.00133,-0.006 0.00624,-0.006 0.018443,2.8e-4 0.036931,2.3e-4 0.05542,5e-5 0.00386,-5e-5 0.00495,9.2e-4 0.00493,0.005 -9.18e-5,0.0702 -9.18e-5,0.14028 2.29e-5,0.21039 0,0.005 -0.0011,0.006 -0.00527,0.006 -0.018671,-2.3e-4 -0.037367,-2.3e-4 -0.056039,0 -0.00399,9e-5 -0.00594,-0.002 -0.00796,-0.005 -0.031655,-0.0492 -0.063425,-0.0984 -0.095172,-0.14754 -0.00117,-0.002 -0.00239,-0.004 -0.0047,-0.006 v 0.006 c 0,0.048 -1.376e-4,0.0961 1.606e-4,0.14422 6.88e-5,0.006 -0.00179,0.007 -0.00755,0.007 -0.017662,-3.6e-4 -0.035371,-2.7e-4 -0.053011,-5e-5 -0.00424,5e-5 -0.00582,-4.8e-4 -0.0058,-0.006 1.606e-4,-0.0699 1.606e-4,-0.13983 -2.3e-5,-0.20978 0,-0.005 0.00161,-0.006 0.00573,-0.006 0.020071,1.8e-4 0.040142,2.3e-4 0.060213,-4e-5 0.00413,-5e-5 0.00631,0.002 0.00842,0.005 0.031012,0.0491 0.062186,0.0982 0.093268,0.14726 4.358e-4,-4e-5 8.483e-4,-9e-5 0.00126,-1.4e-4" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path186-0"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 6.0513672,288.47076 c 0,-0.0106 2.065e-4,-0.0211 -4.58e-5,-0.0316 -3.899e-4,-0.015 -0.010184,-0.0253 -0.024246,-0.0256 -0.014452,-4.5e-4 -0.026104,0.009 -0.026655,0.0239 -8.241e-4,0.022 -5.284e-4,0.044 -1.376e-4,0.0661 1.835e-4,0.009 0.00592,0.0151 0.015529,0.0168 0.00647,9.2e-4 0.013029,0.002 0.019567,2.3e-4 0.010253,-0.002 0.015713,-0.007 0.01592,-0.0183 2.065e-4,-0.0105 4.59e-5,-0.021 6.89e-5,-0.0316 m 4.58e-5,-0.0675 c 0,-0.0217 -6.88e-5,-0.0423 4.59e-5,-0.0628 0,-0.006 -0.00243,-0.0131 9.162e-4,-0.0167 0.00337,-0.004 0.010896,-9.2e-4 0.016584,-9.2e-4 0.014474,-1.8e-4 0.028994,5e-5 0.043514,-1.4e-4 0.00388,-4e-5 0.00544,4.9e-4 0.00541,0.005 -1.147e-4,0.0702 -1.147e-4,0.14031 -2.3e-5,0.21043 2.3e-5,0.004 -7.804e-4,0.006 -0.00484,0.006 -0.018901,-2.1e-4 -0.03778,-4e-5 -0.056635,-1.1e-4 -0.00213,0 -0.00466,9.1e-4 -0.00518,-0.003 -4.129e-4,-0.004 -0.00294,-4.9e-4 -0.00399,-1.8e-4 -0.011745,0.005 -0.023947,0.007 -0.036495,0.008 -0.030004,0.002 -0.051956,-0.0129 -0.067577,-0.0371 -0.035395,-0.0549 7.321e-4,-0.10807 0.043537,-0.11935 0.020645,-0.006 0.040096,-0.002 0.058539,0.008 0.00172,9.2e-4 0.00339,0.002 0.00619,0.004" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path190-2"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 5.7793768,288.41346 c 0.00748,-0.003 0.013671,-0.006 0.019933,-0.0104 0.038399,-0.0221 0.082625,-0.005 0.1049205,0.0289 0.003,0.005 0.00426,0.01 0.00424,0.0153 -1.376e-4,0.0318 -1.376e-4,0.0635 2.3e-5,0.0953 2.28e-5,0.004 -5.527e-4,0.006 -0.00502,0.006 -0.019268,-2.8e-4 -0.038537,-2.8e-4 -0.057782,-4e-5 -0.00423,4e-5 -0.00527,-9.2e-4 -0.00525,-0.006 1.835e-4,-0.031 9.18e-5,-0.062 9.18e-5,-0.093 0,-0.0152 -0.01842,-0.0291 -0.033284,-0.0253 -0.00464,0.002 -0.00896,0.003 -0.013213,0.006 -0.010093,0.006 -0.015322,0.0119 -0.014956,0.0243 8.725e-4,0.0296 1.835e-4,0.0592 3.9e-4,0.0887 4.58e-5,0.005 -0.00115,0.006 -0.00525,0.006 -0.018671,-2.4e-4 -0.037367,-2.4e-4 -0.056016,0 -0.00424,9e-5 -0.00523,-9.2e-4 -0.00523,-0.006 1.375e-4,-0.0463 1.605e-4,-0.0926 0,-0.13885 0,-0.005 0.0015,-0.006 0.00544,-0.006 0.018443,1.8e-4 0.036931,2.7e-4 0.05542,-5e-5 0.00498,-1.3e-4 0.00608,0.002 0.00559,0.006 -3.211e-4,0.003 -4.59e-5,0.006 -4.59e-5,0.009" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path194-2"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 5.2250897,288.4088 c 0.00605,-0.004 0.011469,-0.006 0.016424,-0.009 0.031609,-0.0203 0.069871,-0.0129 0.09563,0.0116 0.011515,0.0109 0.01819,0.0229 0.017502,0.0397 -0.0011,0.0284 -4.588e-4,0.0568 -1.377e-4,0.0852 6.89e-5,0.006 -0.00175,0.006 -0.00697,0.006 -0.018282,-2.8e-4 -0.036564,-2.8e-4 -0.054846,0 -0.00489,1.2e-4 -0.00633,-9.2e-4 -0.00631,-0.006 2.753e-4,-0.0304 1.376e-4,-0.0608 1.376e-4,-0.0912 0,-0.0167 -0.018512,-0.0306 -0.034775,-0.026 -0.00438,0.002 -0.00851,0.003 -0.012548,0.006 -0.0095,0.005 -0.014726,0.0116 -0.014383,0.0235 8.727e-4,0.0292 9.17e-5,0.0584 4.588e-4,0.0876 9.17e-5,0.006 -0.0017,0.007 -0.00727,0.007 -0.017869,-3.7e-4 -0.035738,-2.8e-4 -0.053608,-5e-5 -0.00399,5e-5 -0.00548,-9.2e-4 -0.00546,-0.006 1.606e-4,-0.0465 1.147e-4,-0.093 2.29e-5,-0.13947 0,-0.004 8.484e-4,-0.005 0.00461,-0.005 0.018878,1.8e-4 0.037734,1.8e-4 0.056589,0 0.00377,-4e-5 0.00546,9.2e-4 0.00502,0.005 -3.442e-4,0.003 -9.18e-5,0.006 -9.18e-5,0.0102" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path198-5"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 6.2155653,288.47058 h 2.29e-5 c 0,0.0143 -1.835e-4,0.0286 6.89e-5,0.0428 1.606e-4,0.0103 0.00516,0.0161 0.015231,0.0183 0.00527,0.002 0.010644,9.2e-4 0.015988,9.2e-4 0.012937,-9.2e-4 0.019774,-0.007 0.019842,-0.0204 2.295e-4,-0.0275 2.982e-4,-0.0551 0,-0.0828 -1.146e-4,-0.016 -0.00996,-0.0257 -0.025003,-0.0257 -0.016148,4e-5 -0.025874,0.01 -0.026127,0.0258 -2.064e-4,0.0137 -2.29e-5,0.0274 -2.29e-5,0.041 m 0.026563,-0.0817 c 0.023856,9e-5 0.046152,0.006 0.065627,0.0215 0.041679,0.0317 0.042619,0.0856 0.0022,0.11895 -0.037619,0.031 -0.097901,0.0313 -0.1358415,4.9e-4 -0.040991,-0.0331 -0.039684,-0.0896 0.00282,-0.12079 0.019245,-0.014 0.041037,-0.0202 0.065191,-0.0204" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path202-2"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 5.5903594,288.44518 h 0.00954 c 0.017203,0 0.017203,0 0.016034,-0.0174 -9.645e-4,-0.0139 -0.011217,-0.0238 -0.025347,-0.0241 -0.014153,-3.8e-4 -0.024109,0.008 -0.025623,0.0218 -5.963e-4,0.006 -9.16e-5,0.0111 -3.211e-4,0.0166 -1.147e-4,0.003 0.00147,0.003 0.00372,0.003 0.00734,-5e-5 0.014657,0 0.021998,0 m 0.0356,0.0248 c -0.018671,0 -0.037343,1.4e-4 -0.055993,-5e-5 -0.00397,-4e-5 -0.0055,4.9e-4 -0.00541,0.006 3.441e-4,0.0123 4.58e-5,0.0246 1.835e-4,0.0369 1.376e-4,0.0129 0.00674,0.0197 0.019705,0.0206 0.00516,3.4e-4 0.0103,4.3e-4 0.015391,-9.2e-4 0.010735,-0.003 0.015874,-0.009 0.016103,-0.0197 1.376e-4,-0.006 1.835e-4,-0.0111 0,-0.0167 -9.18e-5,-0.003 6.884e-4,-0.004 0.0036,-0.004 0.020048,6e-5 0.040119,1.1e-4 0.06019,0 0.00477,-6e-5 0.00339,0.003 0.00248,0.005 -0.007,0.0181 -0.019589,0.0314 -0.036059,0.0413 -0.038949,0.0233 -0.092602,0.0191 -0.1264368,-0.01 -0.037046,-0.0319 -0.037183,-0.082 -2.752e-4,-0.11402 0.038881,-0.0336 0.1041177,-0.0332 0.1418972,9.2e-4 0.01468,0.0133 0.02365,0.0295 0.025714,0.0495 4.359e-4,0.005 -3.212e-4,0.006 -0.00509,0.006 -0.018649,-2.7e-4 -0.037344,-1.2e-4 -0.055993,-1.2e-4" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path206-0"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 5.3941507,288.46808 c 0,-0.0231 -1.147e-4,-0.0461 1.147e-4,-0.0692 4.58e-5,-0.005 -0.00126,-0.006 -0.00535,-0.006 -0.00833,2.6e-4 -0.016699,-4e-5 -0.025025,1.5e-4 -0.00319,8e-5 -0.00449,-4.9e-4 -0.00458,-0.005 -4.817e-4,-0.0159 -6.205e-4,-0.0159 0.015369,-0.0159 0.00516,0 0.010345,-1.9e-4 0.015506,3e-5 0.0031,1.2e-4 0.00413,-9.2e-4 0.00404,-0.004 -2.294e-4,-0.007 9.17e-5,-0.0154 -1.377e-4,-0.0232 -9.17e-5,-0.004 9.369e-4,-0.005 0.00434,-0.005 0.019659,1.4e-4 0.039316,1.4e-4 0.058998,0 0.00358,-3e-5 0.00489,9.2e-4 0.00473,0.005 -2.981e-4,0.007 9.18e-5,0.0151 -1.605e-4,0.0226 -1.147e-4,0.004 0.00101,0.005 0.00434,0.005 0.00872,-2.2e-4 0.017479,7e-5 0.026219,-1.3e-4 0.00332,-9e-5 0.00426,9.2e-4 0.00432,0.005 2.295e-4,0.0158 3.671e-4,0.0157 -0.015483,0.0158 -0.00631,9e-5 -0.014657,-0.003 -0.018236,9.2e-4 -0.00312,0.004 -0.00103,0.0117 -0.00103,0.0178 -4.6e-5,0.0413 -1.148e-4,0.0827 9.17e-5,0.124 2.3e-5,0.005 -0.00119,0.006 -0.00619,0.006 -0.018856,-3.2e-4 -0.037757,-2.7e-4 -0.056635,-5e-5 -0.00411,5e-5 -0.00536,-9.2e-4 -0.00532,-0.006 2.294e-4,-0.0232 1.146e-4,-0.0465 1.146e-4,-0.0697" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path210-8"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 5.1224492,288.46834 c 0,0.0231 -1.146e-4,0.0461 1.377e-4,0.0692 4.58e-5,0.005 -0.0011,0.006 -0.00558,0.006 -0.018489,-2.4e-4 -0.036954,-2.4e-4 -0.05542,0 -0.00411,3e-5 -0.00539,-9.2e-4 -0.00539,-0.006 1.605e-4,-0.0462 1.605e-4,-0.0926 0,-0.13883 -2.3e-5,-0.005 0.00133,-0.006 0.00536,-0.006 0.018671,1.9e-4 0.037367,1.9e-4 0.056039,0 0.0038,-4e-5 0.00498,9.2e-4 0.00495,0.005 -2.064e-4,0.0232 -1.147e-4,0.0465 -1.147e-4,0.0697" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path214-8"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 5.0891632,288.36212 c -0.00954,0 -0.019085,-9e-5 -0.028627,9e-5 -0.00339,9e-5 -0.00438,-9.2e-4 -0.00432,-0.005 1.835e-4,-0.0106 1.376e-4,-0.0211 0,-0.0316 0,-0.003 6.884e-4,-0.004 0.00367,-0.004 0.019636,1.1e-4 0.039316,1.1e-4 0.058998,0 0.00291,0 0.00367,9.1e-4 0.00365,0.004 -1.605e-4,0.0107 -2.063e-4,0.0214 0,0.0321 9.18e-5,0.004 -0.00131,0.004 -0.00417,0.004 -0.00975,-1.4e-4 -0.019475,-9e-5 -0.029201,-9e-5" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path218-4"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 6.3475509,288.38595 c 0.01546,1.4e-4 0.02904,-0.0132 0.029132,-0.0287 6.88e-5,-0.0164 -0.013144,-0.0304 -0.028811,-0.0304 -0.016309,-4e-5 -0.028581,0.0129 -0.028627,0.03 -6.88e-5,0.0163 0.012272,0.0289 0.028306,0.029 m 1.147e-4,-0.0645 c 0.018351,-7e-5 0.034247,0.0164 0.034293,0.0356 2.29e-5,0.018 -0.016195,0.0344 -0.034178,0.0344 -0.018511,0 -0.034018,-0.0156 -0.034064,-0.0343 -4.58e-5,-0.0196 0.015163,-0.0356 0.033949,-0.0356" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path222-9"
+           style="fill:#a3a3a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02293845"
+           d="m 6.346498,288.35589 c 0.00411,3.9e-4 0.00761,1.8e-4 0.00769,-0.005 1.376e-4,-0.006 -0.00397,-0.006 -0.00815,-0.006 -0.00466,-4.4e-4 -0.00535,0.002 -0.00553,0.006 -2.294e-4,0.006 0.00184,0.006 0.00599,0.006 m -0.01124,-9.2e-4 c -2.3e-5,-9.2e-4 -1.147e-4,-0.002 2.28e-5,-0.003 3.9e-4,-0.004 -0.00199,-0.0102 0.00117,-0.0117 0.0049,-0.002 0.011332,-0.002 0.01686,1.8e-4 0.00656,0.003 0.00876,0.012 0.00348,0.0174 -0.00285,0.003 -0.0023,0.005 -5.527e-4,0.007 0.00103,0.002 0.00314,0.004 -2.294e-4,0.006 -0.00354,0.002 -0.00328,-0.002 -0.00443,-0.003 -8.968e-4,-9.2e-4 -0.00158,-0.003 -0.00211,-0.004 -0.00144,-0.004 -0.00435,-0.002 -0.00672,-0.002 -0.00344,0 -0.00175,0.003 -0.00202,0.005 -2.523e-4,0.002 4.129e-4,0.004 -0.00282,0.004 -0.00319,-5e-5 -0.00264,-0.002 -0.00266,-0.004 -2.3e-5,-0.004 0,-0.007 0,-0.0113" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path230-6-2"
+           style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02293845"
+           d="m 3.947426,287.77302 0.1326142,1.75161 -0.3425676,-1.34569 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/gamepad_nintendo_nes.svg b/resources/graphics/controllers/gamepad_nintendo_nes.svg
index e546a52eb..92259e8c8 100644
--- a/resources/graphics/controllers/gamepad_nintendo_nes.svg
+++ b/resources/graphics/controllers/gamepad_nintendo_nes.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733334 67.733334"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.785627"
-     inkscape:cx="7.8454542"
-     inkscape:cy="25.685359"
+     inkscape:zoom="2.3222159"
+     inkscape:cx="-141.71258"
+     inkscape:cy="91.156289"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -46,7 +46,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,10 +54,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26664)">
     <g
        id="g5404"
-       transform="matrix(0.98413614,0,0,0.98413614,0.08814355,4.6234203)">
+       transform="matrix(5.9544334,0,0,5.9544334,0.78234597,-1472.249)">
       <g
          style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-width:5.20466661;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          transform="matrix(0,-0.02089351,-0.02089351,0,9.9447542,293.31016)"
diff --git a/resources/graphics/controllers/gamepad_nintendo_snes.svg b/resources/graphics/controllers/gamepad_nintendo_snes.svg
index f4e823894..36d08e258 100644
--- a/resources/graphics/controllers/gamepad_nintendo_snes.svg
+++ b/resources/graphics/controllers/gamepad_nintendo_snes.svg
@@ -10,9 +10,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4464068"
-     inkscape:cx="-54.59087"
-     inkscape:cy="43.269643"
+     inkscape:zoom="2.6333877"
+     inkscape:cx="-292.98885"
+     inkscape:cy="56.263201"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -46,7 +46,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -54,10 +54,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
        id="g5490"
-       transform="translate(-1e-7,3.169167e-6)">
+       transform="matrix(6.1525214,0,0,6.1525214,-0.31828098,-1529.9804)">
       <path
          bx:origin="0 0"
          style="fill:#666666;fill-opacity:1;stroke-width:0.02360734"
diff --git a/resources/graphics/controllers/gamepad_playstation.svg b/resources/graphics/controllers/gamepad_playstation.svg
index 9ae7276e1..c6effec6c 100644
--- a/resources/graphics/controllers/gamepad_playstation.svg
+++ b/resources/graphics/controllers/gamepad_playstation.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -50,9 +50,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="14.89669"
-     inkscape:cx="-5.2451591"
-     inkscape:cy="30.03994"
+     inkscape:zoom="2.3222159"
+     inkscape:cx="-192.65889"
+     inkscape:cy="145.56081"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -70,7 +70,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -78,9 +78,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
-       id="g6486">
+       id="g6486"
+       transform="matrix(6.0251718,0,0,6.0251718,0.38930592,-1492.5651)">
       <path
          inkscape:connector-curvature="0"
          d="m 7.6061742,288.87228 c 0,-0.1636 0.13386,-0.29746 0.297458,-0.29746 h 0.484651 c 0.163598,0 0.297459,0.13386 0.297459,0.29746"
diff --git a/resources/graphics/controllers/joycon_left_or_right_nintendo.svg b/resources/graphics/controllers/joycon_left_or_right_nintendo.svg
index 3a8554f7d..59fbedbfa 100644
--- a/resources/graphics/controllers/joycon_left_or_right_nintendo.svg
+++ b/resources/graphics/controllers/joycon_left_or_right_nintendo.svg
@@ -9,15 +9,23 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="joycon_left_or_right_nintendo.svg">
   <defs
-     id="defs4919" />
+     id="defs4919">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 5.55625 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="11.1125 : 5.55625 : 1"
+       inkscape:persp3d-origin="5.55625 : 3.7041667 : 1"
+       id="perspective4841" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,9 +33,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="17.595863"
-     inkscape:cx="-0.77044279"
-     inkscape:cy="30.632636"
+     inkscape:zoom="3.8791661"
+     inkscape:cx="36.845949"
+     inkscape:cy="166.61016"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -53,10 +61,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
        id="g4910"
-       transform="matrix(1.0578414,0,0,1.0578414,-0.32138125,-15.666888)">
+       transform="matrix(6.6685423,0,0,6.6685423,-3.1854213,-1673.2278)">
       <g
          transform="translate(-3.8154512,-1.3888992e-6)"
          id="g5517">
@@ -162,7 +170,7 @@
     </g>
     <g
        id="g4874"
-       transform="matrix(1.0578414,0,0,1.0578414,-0.32138125,-18.048138)">
+       transform="matrix(6.6685423,0,0,6.6685423,-3.1854213,-1687.5153)">
       <g
          transform="translate(-0.02566855,-1.3888992e-6)"
          id="g5474">
diff --git a/resources/graphics/controllers/joycon_pair_nintendo.svg b/resources/graphics/controllers/joycon_pair_nintendo.svg
index 649377f0a..71b1e8d15 100644
--- a/resources/graphics/controllers/joycon_pair_nintendo.svg
+++ b/resources/graphics/controllers/joycon_pair_nintendo.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -33,9 +33,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="14.109375"
-     inkscape:cx="3.8930481"
-     inkscape:cy="14.965158"
+     inkscape:zoom="2.1994829"
+     inkscape:cx="-13.449812"
+     inkscape:cy="145.73207"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -53,7 +53,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -61,10 +61,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
        id="g4910"
-       transform="matrix(1.0578414,0,0,1.0578414,-0.32138125,-16.857513)">
+       transform="matrix(6.6685423,0,0,6.6685423,-3.1854213,-1680.3715)">
       <g
          transform="translate(-3.8154512,-1.3888992e-6)"
          id="g5517">
@@ -170,7 +170,7 @@
     </g>
     <g
        id="g4874"
-       transform="matrix(1.0578414,0,0,1.0578414,-0.32138125,-16.857513)">
+       transform="matrix(6.6685423,0,0,6.6685423,-3.1854213,-1680.3715)">
       <g
          transform="translate(-0.02566855,-1.3888992e-6)"
          id="g5474">
diff --git a/resources/graphics/controllers/joystick_arcade_2_buttons.svg b/resources/graphics/controllers/joystick_arcade_2_buttons.svg
index b6b01c15a..a1b8bfa3f 100644
--- a/resources/graphics/controllers/joystick_arcade_2_buttons.svg
+++ b/resources/graphics/controllers/joystick_arcade_2_buttons.svg
@@ -9,13 +9,13 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="joystick_arcade_2_buttons.svg">
   <defs
      id="defs4919" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.7728148"
-     inkscape:cx="-21.346482"
-     inkscape:cy="-0.76992782"
+     inkscape:zoom="3.7619823"
+     inkscape:cx="-40.92338"
+     inkscape:cy="112.25983"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -53,17 +53,279 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="56.947788"
+       height="33.415451"
+       x="5.3927727"
+       y="246.4256"
+       ry="3.286572"
+       rx="3.1865375" />
     <g
-       aria-label="?"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="text4825"
-       transform="matrix(0.91316098,0,0,0.91316098,1.9388092,25.308702)">
+       id="g4928"
+       transform="matrix(0.99990441,0,0,1.0164462,0.00195324,-4.327527)">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
       <path
-         d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
-         style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4827"
-         inkscape:connector-curvature="0" />
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+    <g
+       id="g5051"
+       transform="translate(-0.21099249)">
+      <g
+         id="g4943"
+         transform="matrix(0.44781227,0,0,0.44052454,36.325934,158.01448)">
+        <ellipse
+           style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="path4799-0-2"
+           cx="238.62199"
+           cy="-10.165825"
+           transform="rotate(90)"
+           rx="10.235035"
+           ry="10.068469" />
+        <g
+           id="g8-8-1-9-1-8-6-2"
+           transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-5-1-4"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-8-1-9-1-5-7"
+           transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-54-7"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-2-7-5"
+           transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-5-6-4"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-5-8"
+           transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-69-1"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+      </g>
+      <g
+         id="g4943-94"
+         transform="matrix(0.44781227,0,0,0.44052453,48.568228,158.01443)">
+        <ellipse
+           style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="path4799-0-2-6"
+           cx="238.62199"
+           cy="-10.165825"
+           transform="rotate(90)"
+           rx="10.235035"
+           ry="10.068469" />
+        <g
+           id="g8-8-1-9-1-8-6-2-9"
+           transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-5-1-4-2"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-8-1-9-1-5-7-2"
+           transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-54-7-4"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-2-7-5-7"
+           transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-5-6-4-7"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-5-8-5"
+           transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-69-1-48"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/joystick_arcade_3_buttons.svg b/resources/graphics/controllers/joystick_arcade_3_buttons.svg
index b6b01c15a..6f5105f46 100644
--- a/resources/graphics/controllers/joystick_arcade_3_buttons.svg
+++ b/resources/graphics/controllers/joystick_arcade_3_buttons.svg
@@ -9,13 +9,13 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="joystick_arcade_3_buttons.svg">
   <defs
      id="defs4919" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.7728148"
-     inkscape:cx="-21.346482"
-     inkscape:cy="-0.76992782"
+     inkscape:zoom="4.2660796"
+     inkscape:cx="-56.328245"
+     inkscape:cy="160.5812"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -53,17 +53,335 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="56.947788"
+       height="33.415451"
+       x="5.3927727"
+       y="246.4256"
+       ry="3.286572"
+       rx="3.1865375" />
     <g
-       aria-label="?"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="text4825"
-       transform="matrix(0.91316098,0,0,0.91316098,1.9388092,25.308702)">
+       id="g4928"
+       transform="matrix(0.99992566,0,0,1.0164679,0.00174674,-4.333237)">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
       <path
-         d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
-         style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4827"
-         inkscape:connector-curvature="0" />
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+    <g
+       id="g5322"
+       transform="translate(0,1.5885417e-5)">
+      <g
+         id="g4943-1"
+         transform="matrix(0.44781227,0,0,0.44052454,48.637747,162.97563)">
+        <ellipse
+           style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="path4799-0-2-59"
+           cx="238.62199"
+           cy="-10.165825"
+           transform="rotate(90)"
+           rx="10.235035"
+           ry="10.068469" />
+        <g
+           id="g8-8-1-9-1-8-6-2-8"
+           transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-5-1-4-4"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-8-1-9-1-5-7-8"
+           transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-54-7-1"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-2-7-5-0"
+           transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-5-6-4-3"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-5-8-0"
+           transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-69-1-4"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+      </g>
+      <g
+         id="g4943-94"
+         transform="matrix(0.44781227,0,0,0.44052453,34.320435,162.97563)">
+        <ellipse
+           style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="path4799-0-2-6"
+           cx="238.62199"
+           cy="-10.165825"
+           transform="rotate(90)"
+           rx="10.235035"
+           ry="10.068469" />
+        <g
+           id="g8-8-1-9-1-8-6-2-9"
+           transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-5-1-4-2"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-8-1-9-1-5-7-2"
+           transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-54-7-4"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-2-7-5-7"
+           transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-5-6-4-7"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-5-8-5"
+           transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-69-1-48"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+      </g>
+      <g
+         id="g4943-1-3"
+         transform="matrix(0.44781227,0,0,0.44052453,41.479088,153.0533)">
+        <ellipse
+           style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="path4799-0-2-59-1"
+           cx="238.62199"
+           cy="-10.165825"
+           transform="rotate(90)"
+           rx="10.235035"
+           ry="10.068469" />
+        <g
+           id="g8-8-1-9-1-8-6-2-8-7"
+           transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-5-1-4-4-5"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-8-1-9-1-5-7-8-9"
+           transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-54-7-1-6"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-2-7-5-0-2"
+           transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-5-6-4-3-1"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-5-8-0-7"
+           transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-69-1-4-8"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/joystick_arcade_4_buttons.svg b/resources/graphics/controllers/joystick_arcade_4_buttons.svg
index b6b01c15a..bff46e70a 100644
--- a/resources/graphics/controllers/joystick_arcade_4_buttons.svg
+++ b/resources/graphics/controllers/joystick_arcade_4_buttons.svg
@@ -9,13 +9,13 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="joystick_arcade_4_buttons.svg">
   <defs
      id="defs4919" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.7728148"
-     inkscape:cx="-21.346482"
-     inkscape:cy="-0.76992782"
+     inkscape:zoom="6.0331475"
+     inkscape:cx="84.295293"
+     inkscape:cy="161.87038"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -53,17 +53,397 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="56.947788"
+       height="33.415451"
+       x="5.3927727"
+       y="246.4256"
+       ry="3.286572"
+       rx="3.1865375" />
     <g
-       aria-label="?"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="text4825"
-       transform="matrix(0.91316098,0,0,0.91316098,1.9388092,25.308702)">
+       id="g4928"
+       transform="matrix(0.99992566,0,0,1.0164679,0.00174674,-4.333237)">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
       <path
-         d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
-         style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4827"
-         inkscape:connector-curvature="0" />
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+    <g
+       id="g5562"
+       transform="translate(-0.17541977)">
+      <g
+         id="g5518">
+        <g
+           transform="matrix(0.44781227,0,0,0.44052453,34.320418,163.41666)"
+           id="g4943-94">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.44781227,0,0,0.44052453,44.963764,163.41666)"
+           id="g4943-1-3">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-59-1"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-8-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-4-5"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-8-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-1-6"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-0-2">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-3-1"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-0-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-4-8"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+      <g
+         id="g5496">
+        <g
+           transform="matrix(0.44781227,0,0,0.44052454,49.606082,152.61225)"
+           id="g4943-1">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-59"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-8">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-4"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-8">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-1"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-0">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-3"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-0">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-4"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.44781227,0,0,0.44052453,38.962734,152.61226)"
+           id="g4943-1-1">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-59-0"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-8-3">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-4-0"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-8-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-1-4"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-0-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-3-4"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-0-76">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-4-3"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/joystick_arcade_6_buttons.svg b/resources/graphics/controllers/joystick_arcade_6_buttons.svg
index b6b01c15a..acf6a6726 100644
--- a/resources/graphics/controllers/joystick_arcade_6_buttons.svg
+++ b/resources/graphics/controllers/joystick_arcade_6_buttons.svg
@@ -9,13 +9,13 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="joystick_arcade_6_buttons.svg">
   <defs
      id="defs4919" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.7728148"
-     inkscape:cx="-21.346482"
-     inkscape:cy="-0.76992782"
+     inkscape:zoom="3.8791661"
+     inkscape:cx="40.651619"
+     inkscape:cy="205.6075"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -53,17 +53,520 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="56.947788"
+       height="33.415451"
+       x="5.3927727"
+       y="246.4256"
+       ry="3.286572"
+       rx="3.1865375" />
+    <rect
+       style="opacity:0.47400004;vector-effect:none;fill:#7b7b7b;fill-opacity:1;stroke:#2a2a2a;stroke-width:0.11244792;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5720"
+       width="0.34024119"
+       height="0.1701206"
+       x="121.80635"
+       y="290.62045"
+       rx="3.3712945"
+       ry="0.1701206" />
     <g
-       aria-label="?"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="text4825"
-       transform="matrix(0.91316098,0,0,0.91316098,1.9388092,25.308702)">
+       transform="matrix(0.88758869,0,0,0.90164635,0.54790817,25.880136)"
+       id="g4928">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
       <path
-         d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
-         style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4827"
-         inkscape:connector-curvature="0" />
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+    <g
+       id="g5642">
+      <g
+         id="g5577">
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,50.252964,172.25636)"
+           id="g4943-94-6-7">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,50.252963,162.50161)"
+           id="g4943-94-6-7-2">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4-2"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8-7"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9-5"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5-8"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8-2"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+      <g
+         id="g5555">
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,40.796484,172.25636)"
+           id="g4943-94-6-7-8">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4-02"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8-05"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9-1"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7-0">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5-85"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3-06">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8-4"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,40.796484,162.50161)"
+           id="g4943-94-6-7-28">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4-4"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8-2"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9-0"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7-6">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5-2"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8-9"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+      <g
+         id="g5533">
+        <g
+           transform="matrix(0.40129561,0,0,0.39476489,31.340006,165.61108)"
+           id="g4943-94-6">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,31.340004,175.36581)"
+           id="g4943-94-6-7-34">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4-03"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8-1"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5-96">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9-9"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7-3">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5-3"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3-8">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8-0"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/joystick_generic.svg b/resources/graphics/controllers/joystick_generic.svg
index ebabd7953..59da0c1b1 100644
--- a/resources/graphics/controllers/joystick_generic.svg
+++ b/resources/graphics/controllers/joystick_generic.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="28.21875"
-     inkscape:cx="6.1924519"
-     inkscape:cy="24.290783"
+     inkscape:zoom="3.1105385"
+     inkscape:cx="-11.977398"
+     inkscape:cy="87.435969"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,9 +53,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
-       id="g4868">
+       id="g4868"
+       transform="matrix(6.1411819,0,0,6.1411819,-0.25527512,-1526.4204)">
       <rect
          ry="0"
          rx="0"
diff --git a/resources/graphics/controllers/mouse_amiga.svg b/resources/graphics/controllers/mouse_amiga.svg
index 696cbd88d..56ef3ccf7 100644
--- a/resources/graphics/controllers/mouse_amiga.svg
+++ b/resources/graphics/controllers/mouse_amiga.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16.892814"
-     inkscape:cx="-25.122961"
-     inkscape:cy="12.292821"
+     inkscape:zoom="5.2667754"
+     inkscape:cx="88.764467"
+     inkscape:cy="125.56991"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -47,7 +47,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -55,9 +55,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
-       id="g5117">
+       id="g5117"
+       transform="matrix(5.9358241,0,0,5.9358241,0.88574371,-1467.7111)">
       <path
          inkscape:connector-curvature="0"
          id="rect4891"
@@ -67,7 +68,7 @@
          transform="matrix(0.05395004,0,0,0.05395004,17.263409,268.3063)"
          style="fill:#868580"
          id="XMLID_697_"
-         points="-216.2,356.8 -209.7,356.8 -210.6,354.4 -216.2,354.4 -216.2,352.8 -211.3,352.8 -212.2,350.4 -222.2,350.4 -223.1,352.8 -217.8,352.8 -217.8,354.4 -223.7,354.4 -224.6,356.8 -217.8,356.8 -217.8,358.4 -225.1,358.4 -225.9,360.4 -217.8,360.4 -217.8,362 -226.5,362 -227.8,365.6 -206.2,365.6 -207.6,362 -216.2,362 -216.2,360.4 -208.3,360.4 -209,358.4 -216.2,358.4 " />
+         points="-217.8,362 -226.5,362 -227.8,365.6 -206.2,365.6 -207.6,362 -216.2,362 -216.2,360.4 -208.3,360.4 -209,358.4 -216.2,358.4 -216.2,356.8 -209.7,356.8 -210.6,354.4 -216.2,354.4 -216.2,352.8 -211.3,352.8 -212.2,350.4 -222.2,350.4 -223.1,352.8 -217.8,352.8 -217.8,354.4 -223.7,354.4 -224.6,356.8 -217.8,356.8 -217.8,358.4 -225.1,358.4 -225.9,360.4 -217.8,360.4 " />
       <path
          style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-width:0.14408384;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:connector-curvature="0"
diff --git a/resources/graphics/controllers/unknown.svg b/resources/graphics/controllers/unknown.svg
index e7b99fea2..2c32c71df 100644
--- a/resources/graphics/controllers/unknown.svg
+++ b/resources/graphics/controllers/unknown.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16.892814"
-     inkscape:cx="-37.558608"
-     inkscape:cy="23.448283"
+     inkscape:zoom="1.8620863"
+     inkscape:cx="-207.82219"
+     inkscape:cy="164.29106"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,12 +53,12 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
        aria-label="?"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="text4825"
-       transform="matrix(0.76718259,0,0,0.76718259,2.5170951,67.853186)">
+       transform="matrix(4.7799158,0,0,4.7799158,14.931273,-1129.9431)">
       <path
          d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
          style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
diff --git a/resources/graphics/controllers/wii_remote_nintendo.svg b/resources/graphics/controllers/wii_remote_nintendo.svg
index c8a5055c7..f3018f35a 100644
--- a/resources/graphics/controllers/wii_remote_nintendo.svg
+++ b/resources/graphics/controllers/wii_remote_nintendo.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-16.659924"
-     inkscape:cy="14.555913"
+     inkscape:zoom="3.5273438"
+     inkscape:cx="69.645015"
+     inkscape:cy="58.021923"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -45,7 +45,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,16 +53,12 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
     <g
-       id="g5266">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6"
-         d="m 4.492749,286.76443 c -0.150954,0 -0.274402,0.12397 -0.274402,0.27492 v 9.05681 c 0,0.15095 0.123448,0.27492 0.274402,0.27492 h 2.1270018 c 0.1509541,0 0.2744021,-0.12397 0.2744021,-0.27492 v -9.05681 c 0,-0.15095 -0.123448,-0.27492 -0.2744021,-0.27492 z"
-         style="fill:#f8f8f8;stroke:#000000;stroke-width:0.079375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
+       id="g5049"
+       transform="translate(-1.0794648,1.6666667e-6)">
       <g
-         transform="matrix(0.03430772,0,0,0.03430772,13.275487,277.84072)"
+         transform="matrix(0.20562542,0,0,0.20562542,81.211852,180.85949)"
          id="g16">
         <polyline
            style="fill:#5c5c5c"
@@ -81,254 +77,251 @@
            id="polyline14"
            points="-248.2,505.2 -253.2,505.2 -253.2,510.2 -248.2,510.2 -248.2,505.2    " />
       </g>
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle18"
-         r="0.051461581"
-         cy="292.64108"
-         cx="5.8135581" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle20"
-         r="0.051461581"
-         cy="292.64108"
-         cx="5.5562501" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle22"
-         r="0.051461581"
-         cy="292.64108"
-         cx="5.2989421" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle24"
-         r="0.051461581"
-         cy="292.43521"
-         cx="5.8135581" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle26"
-         r="0.051461581"
-         cy="292.43521"
-         cx="5.5562501" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle28"
-         r="0.051461581"
-         cy="292.43521"
-         cx="5.2989421" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle30"
-         r="0.034307718"
-         cy="292.22937"
-         cx="5.8135581" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle32"
-         r="0.034307718"
-         cy="292.22937"
-         cx="5.5562501" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle34"
-         r="0.034307718"
-         cy="292.22937"
-         cx="5.2989421" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle36"
-         r="0.017153859"
-         cy="292.02353"
-         cx="5.8135581" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle38"
-         r="0.017153859"
-         cy="292.02353"
-         cx="5.5562501" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle40"
-         r="0.017153859"
-         cy="292.02353"
-         cx="5.2989421" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle42"
-         r="0.017153859"
-         cy="293.05276"
-         cx="5.8135581" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle44"
-         r="0.017153859"
-         cy="293.05276"
-         cx="5.5562501" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle46"
-         r="0.017153859"
-         cy="293.05276"
-         cx="5.2989421" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle48"
-         r="0.034307718"
-         cy="292.84692"
-         cx="5.8135581" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle50"
-         r="0.034307718"
-         cy="292.84692"
-         cx="5.5562501" />
-      <circle
-         style="stroke-width:0.03430772"
-         id="circle52"
-         r="0.034307718"
-         cy="292.84692"
-         cx="5.2989421" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
          inkscape:connector-curvature="0"
-         id="path56"
-         d="M 5.6677502,287.6047 H 5.44475 c -0.024015,0 -0.0446,0.0309 -0.0446,0.072 v 0.40827 H 4.9918881 c -0.041169,0 -0.072046,0.0206 -0.072046,0.0446 v 0.223 c 0,0.024 0.030877,0.0446 0.072046,0.0446 H 5.40015 v 0.40826 c 0,0.0412 0.020585,0.072 0.0446,0.072 h 0.2230002 c 0.024015,0 0.0446,-0.0309 0.0446,-0.072 v -0.40826 H 6.120612 c 0.041169,0 0.072046,-0.0206 0.072046,-0.0446 v -0.223 c 0,-0.024 -0.030877,-0.0446 -0.072046,-0.0446 H 5.7123503 v -0.40827 c -0.00343,-0.0412 -0.020585,-0.072 -0.0446,-0.072" />
-      <rect
-         style="fill:#818285;stroke-width:0.03430772"
-         id="rect58"
-         height="0.034307718"
-         width="0.23672327"
-         y="288.22568"
-         x="5.026196" />
-      <rect
-         style="fill:#818285;stroke-width:0.03430772"
-         id="rect60"
-         height="0.034307718"
-         width="0.23672327"
-         y="288.22568"
-         x="5.8461504" />
-      <rect
-         style="fill:#818285;stroke-width:0.03430772"
-         id="rect62"
-         height="0.23672327"
-         width="0.034307718"
-         y="287.70074"
-         x="5.5373812" />
-      <rect
-         style="fill:#818285;stroke-width:0.03430772"
-         id="rect64"
-         height="0.23672327"
-         width="0.034307718"
-         y="288.54474"
-         x="5.5373812" />
+         id="path6"
+         d="m 28.571974,234.34429 c -0.904753,0 -1.644646,0.74302 -1.644646,1.64775 v 54.28255 c 0,0.90472 0.739893,1.64775 1.644646,1.64775 h 12.748315 c 0.904753,0 1.644646,-0.74303 1.644646,-1.64775 v -54.28255 c 0,-0.90473 -0.739893,-1.64775 -1.644646,-1.64775 z"
+         style="fill:#f8f8f8;fill-opacity:1;stroke:#000000;stroke-width:0.47573891;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         id="g4897">
+        <circle
+           cx="36.488323"
+           cy="269.56638"
+           id="circle18"
+           style="stroke-width:0.20562541"
+           r="0.30843815" />
+        <circle
+           cx="34.946133"
+           cy="269.56638"
+           id="circle20"
+           style="stroke-width:0.20562541"
+           r="0.30843815" />
+        <circle
+           cx="33.403942"
+           cy="269.56638"
+           id="circle22"
+           style="stroke-width:0.20562541"
+           r="0.30843815" />
+        <circle
+           cx="36.488323"
+           cy="268.33246"
+           id="circle24"
+           style="stroke-width:0.20562541"
+           r="0.30843815" />
+        <circle
+           cx="34.946133"
+           cy="268.33246"
+           id="circle26"
+           style="stroke-width:0.20562541"
+           r="0.30843815" />
+        <circle
+           cx="33.403942"
+           cy="268.33246"
+           id="circle28"
+           style="stroke-width:0.20562541"
+           r="0.30843815" />
+        <circle
+           cx="36.488323"
+           cy="267.09875"
+           id="circle30"
+           style="stroke-width:0.20562541"
+           r="0.20562541" />
+        <circle
+           cx="34.946133"
+           cy="267.09875"
+           id="circle32"
+           style="stroke-width:0.20562541"
+           r="0.20562541" />
+        <circle
+           cx="33.403942"
+           cy="267.09875"
+           id="circle34"
+           style="stroke-width:0.20562541"
+           r="0.20562541" />
+        <circle
+           cx="36.488323"
+           cy="265.86502"
+           id="circle36"
+           style="stroke-width:0.20562541"
+           r="0.10281271" />
+        <circle
+           cx="34.946133"
+           cy="265.86502"
+           id="circle38"
+           style="stroke-width:0.20562541"
+           r="0.10281271" />
+        <circle
+           cx="33.403942"
+           cy="265.86502"
+           id="circle40"
+           style="stroke-width:0.20562541"
+           r="0.10281271" />
+        <circle
+           cx="36.488323"
+           cy="272.03381"
+           id="circle42"
+           style="stroke-width:0.20562541"
+           r="0.10281271" />
+        <circle
+           cx="34.946133"
+           cy="272.03381"
+           id="circle44"
+           style="stroke-width:0.20562541"
+           r="0.10281271" />
+        <circle
+           cx="33.403942"
+           cy="272.03381"
+           id="circle46"
+           style="stroke-width:0.20562541"
+           r="0.10281271" />
+        <circle
+           cx="36.488323"
+           cy="270.80008"
+           id="circle48"
+           style="stroke-width:0.20562541"
+           r="0.20562541" />
+        <circle
+           cx="34.946133"
+           cy="270.80008"
+           id="circle50"
+           style="stroke-width:0.20562541"
+           r="0.20562541" />
+        <circle
+           cx="33.403942"
+           cy="270.80008"
+           id="circle52"
+           style="stroke-width:0.20562541"
+           r="0.20562541" />
+      </g>
+      <g
+         id="g5000">
+        <path
+           d="M 35.614415,239.3805 H 34.27785 c -0.143935,0 -0.267313,0.1852 -0.267313,0.43154 v 2.44699 h -2.446943 c -0.246749,0 -0.431812,0.12346 -0.431812,0.26731 v 1.33656 c 0,0.14385 0.185063,0.26732 0.431812,0.26732 h 2.446943 v 2.44693 c 0,0.24693 0.123378,0.43153 0.267313,0.43153 h 1.336565 c 0.143936,0 0.267313,-0.1852 0.267313,-0.43153 v -2.44693 h 2.446942 c 0.246749,0 0.431812,-0.12347 0.431812,-0.26732 v -1.33656 c 0,-0.14385 -0.185063,-0.26731 -0.431812,-0.26731 h -2.446941 v -2.44699 c -0.02056,-0.24694 -0.123378,-0.43154 -0.267313,-0.43154"
+           id="path56"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <rect
+           x="31.76922"
+           y="243.10237"
+           width="1.4188155"
+           height="0.20562541"
+           id="rect58"
+           style="fill:#818285;stroke-width:0.20562541" />
+        <rect
+           x="36.683666"
+           y="243.10237"
+           width="1.4188155"
+           height="0.20562541"
+           id="rect60"
+           style="fill:#818285;stroke-width:0.20562541" />
+        <rect
+           x="34.833042"
+           y="239.95615"
+           width="0.20562541"
+           height="1.4188155"
+           id="rect62"
+           style="fill:#818285;stroke-width:0.20562541" />
+        <rect
+           x="34.833042"
+           y="245.01468"
+           width="0.20562541"
+           height="1.4188155"
+           id="rect64"
+           style="fill:#818285;stroke-width:0.20562541" />
+      </g>
       <path
-         style="fill:#bdbebf;stroke-width:0.03430772"
+         style="fill:#bdbebf;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path66"
-         d="m 4.8426494,287.41257 c -0.1338001,0 -0.240154,-0.10635 -0.240154,-0.24015 0,-0.1338 0.1063539,-0.24015 0.240154,-0.24015 0.1338001,0 0.2401541,0.10635 0.2401541,0.24015 0,0.1338 -0.106354,0.24015 -0.2401541,0.24015 z" />
+         d="m 30.669123,238.22896 c -0.801939,0 -1.439378,-0.63742 -1.439378,-1.43936 0,-0.80194 0.637439,-1.43935 1.439378,-1.43935 0.801939,0 1.439378,0.63741 1.439378,1.43935 0,0.80194 -0.637439,1.43936 -1.439378,1.43936 z" />
       <circle
-         style="fill:#e7e8e9;stroke-width:0.03430772"
+         style="fill:#e7e8e9;stroke-width:0.20562541"
          id="circle68"
-         r="0.22986172"
-         cy="287.16898"
-         cx="4.8426495" />
+         r="1.3776903"
+         cy="236.76897"
+         cx="30.669123" />
       <path
-         style="fill:#bf1e2e;stroke-width:0.03430772"
+         style="fill:#bf1e2e;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path70"
-         d="m 4.8426494,287.30622 c -0.061754,0 -0.1097847,-0.048 -0.1097847,-0.10978 0,-0.0618 0.048031,-0.10979 0.1097847,-0.10979 0.061754,0 0.1097847,0.048 0.1097847,0.10979 0,0.0618 -0.048031,0.10978 -0.1097847,0.10978 z m 0,-0.18526 c -0.041169,0 -0.075477,0.0343 -0.075477,0.0755 0,0.0412 0.034308,0.0755 0.075477,0.0755 0.041169,0 0.075477,-0.0343 0.075477,-0.0755 0,-0.0412 -0.034308,-0.0755 -0.075477,-0.0755 z" />
+         d="m 30.669123,237.59154 c -0.370126,0 -0.658001,-0.28769 -0.658001,-0.65797 0,-0.3704 0.287876,-0.65803 0.658001,-0.65803 0.370126,0 0.658001,0.28769 0.658001,0.65803 0,0.3704 -0.287876,0.65797 -0.658001,0.65797 z m 0,-1.11037 c -0.246749,0 -0.452376,0.20558 -0.452376,0.45252 0,0.24693 0.205627,0.45251 0.452376,0.45251 0.246749,0 0.452376,-0.20558 0.452376,-0.45251 0,-0.24694 -0.205627,-0.45252 -0.452376,-0.45252 z" />
       <rect
-         style="fill:#e7e8e9;stroke-width:0.03430772"
+         style="fill:#e7e8e9;stroke-width:0.20562541"
          id="rect72"
-         height="0.20241556"
-         width="0.075476989"
-         y="287.02832"
-         x="4.8049111" />
+         height="1.2131901"
+         width="0.45237595"
+         y="235.92593"
+         x="30.442936" />
       <rect
-         style="fill:#bf1e2e;stroke-width:0.03430772"
+         style="fill:#bf1e2e;stroke-width:0.20562541"
          id="rect74"
-         height="0.16810784"
-         width="0.034307718"
-         y="287.04205"
-         x="4.8254952" />
+         height="1.0075647"
+         width="0.20562541"
+         y="236.00824"
+         x="30.566309" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path76"
-         d="m 5.55625,290.20522 c -0.2504463,0 -0.4528619,-0.20584 -0.4528619,-0.45629 0,-0.25045 0.2024156,-0.45629 0.4528619,-0.45629 0.2504464,0 0.4528619,0.20584 0.4528619,0.45629 0,0.25045 -0.2024155,0.45629 -0.4528619,0.45629 z" />
+         d="m 34.946132,254.96688 c -1.501065,0 -2.714256,-1.23372 -2.714256,-2.73481 0,-1.50108 1.213191,-2.7348 2.714256,-2.7348 1.501066,0 2.714256,1.23372 2.714256,2.7348 0,1.50109 -1.21319,2.73481 -2.714256,2.73481 z" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path84"
-         d="m 5.5562499,291.35453 c -0.1338001,0 -0.240154,-0.10635 -0.240154,-0.24015 0,-0.1338 0.1063539,-0.24016 0.240154,-0.24016 0.1338001,0 0.2401541,0.10636 0.2401541,0.24016 0,0.1338 -0.106354,0.24015 -0.2401541,0.24015" />
+         d="m 34.946131,261.85534 c -0.801939,0 -1.439377,-0.63742 -1.439377,-1.43936 0,-0.80194 0.637438,-1.43941 1.439377,-1.43941 0.801939,0 1.439379,0.63747 1.439379,1.43941 0,0.80194 -0.63744,1.43936 -1.439379,1.43936" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path92"
-         d="m 4.8460801,291.35453 c -0.1338001,0 -0.240154,-0.10635 -0.240154,-0.24015 0,-0.1338 0.1063539,-0.24016 0.240154,-0.24016 0.1338001,0 0.2401541,0.10636 0.2401541,0.24016 0,0.1338 -0.1097847,0.24015 -0.2401541,0.24015 z" />
+         d="m 30.689685,261.85534 c -0.801939,0 -1.439378,-0.63742 -1.439378,-1.43936 0,-0.80194 0.637439,-1.43941 1.439378,-1.43941 0.801939,0 1.439378,0.63747 1.439378,1.43941 0,0.80194 -0.658001,1.43936 -1.439378,1.43936 z" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path100"
-         d="m 6.2664197,291.35453 c -0.1338001,0 -0.240154,-0.10635 -0.240154,-0.24015 0,-0.1338 0.1063539,-0.24016 0.240154,-0.24016 0.1338002,0 0.2401541,0.10636 0.2401541,0.24016 0,0.1338 -0.1063539,0.24015 -0.2401541,0.24015 z" />
+         d="m 39.202578,261.85534 c -0.801939,0 -1.439378,-0.63742 -1.439378,-1.43936 0,-0.80194 0.637439,-1.43941 1.439378,-1.43941 0.801939,0 1.439378,0.63747 1.439378,1.43941 0,0.80194 -0.637439,1.43936 -1.439378,1.43936 z" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path112"
-         d="m 5.5562499,294.04083 c -0.1886924,0 -0.3396464,-0.15096 -0.3396464,-0.33965 0,-0.18869 0.150954,-0.33965 0.3396464,-0.33965 0.1886925,0 0.3396465,0.15096 0.3396465,0.33965 0,0.18869 -0.150954,0.33965 -0.3396465,0.33965 z" />
+         d="m 34.946131,277.95584 c -1.130939,0 -2.035691,-0.90479 -2.035691,-2.03571 0,-1.13093 0.904752,-2.03572 2.035691,-2.03572 1.13094,0 2.035692,0.90479 2.035692,2.03572 0,1.13092 -0.904752,2.03571 -2.035692,2.03571 z" />
       <path
-         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
          inkscape:connector-curvature="0"
          id="path120"
-         d="m 5.5562499,294.97056 c -0.1886924,0 -0.3396464,-0.15095 -0.3396464,-0.33964 0,-0.18869 0.150954,-0.33965 0.3396464,-0.33965 0.1886925,0 0.3396465,0.15096 0.3396465,0.33965 0,0.18869 -0.150954,0.33964 -0.3396465,0.33964 z" />
+         d="m 34.946131,283.52823 c -1.130939,0 -2.035691,-0.90473 -2.035691,-2.03565 0,-1.13093 0.904752,-2.03571 2.035691,-2.03571 1.13094,0 2.035692,0.90478 2.035692,2.03571 0,1.13092 -0.904752,2.03565 -2.035692,2.03565 z" />
       <rect
-         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541"
          id="rect126"
-         height="0.33278489"
-         width="0.068615437"
-         y="295.66016"
-         x="5.9233427" />
+         height="1.9945667"
+         width="0.41125083"
+         y="287.66138"
+         x="37.146324" />
       <rect
-         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541"
          id="rect128"
-         height="0.072046205"
-         width="0.068615437"
-         y="295.52979"
-         x="5.9233427" />
+         height="0.43181336"
+         width="0.41125083"
+         y="286.87997"
+         x="37.146324" />
       <rect
-         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541"
          id="rect130"
-         height="0.33278489"
-         width="0.068615437"
-         y="295.66016"
-         x="5.7552347" />
+         height="1.9945667"
+         width="0.41125083"
+         y="287.66138"
+         x="36.13876" />
       <rect
-         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541"
          id="rect132"
-         height="0.072046205"
-         width="0.068615437"
-         y="295.52979"
-         x="5.7552347" />
+         height="0.43181336"
+         width="0.41125083"
+         y="286.87997"
+         x="36.13876" />
       <polygon
-         transform="matrix(0.03430772,0,0,0.03430772,13.206872,277.84072)"
+         transform="matrix(0.20562542,0,0,0.20562542,80.800604,180.85949)"
          style="fill:#7a7b7e;fill-opacity:1"
          id="polygon134"
-         points="-226.3,515.5 -223.6,525.3 -220.8,515.5 -218.9,516.1 -222.6,529.2 -224.5,529.2 -227.3,519.5 -230.1,529.2 -232,529.2 -235.7,516.1 -233.8,515.5 -231,525.3 -228.2,515.5 " />
-      <rect
-         y="291.8157"
-         x="3.3556859"
-         height="1.6210666"
-         width="4.0409198"
-         id="rect5212"
-         style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.10874375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-      <rect
-         y="287.48111"
-         x="3.993932"
-         height="1.5779947"
-         width="2.6900308"
-         id="rect5214"
-         style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.10874375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+         points="-218.9,516.1 -222.6,529.2 -224.5,529.2 -227.3,519.5 -230.1,529.2 -232,529.2 -235.7,516.1 -233.8,515.5 -231,525.3 -228.2,515.5 -226.3,515.5 -223.6,525.3 -220.8,515.5 " />
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg b/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
index d9699c383..319e2028d 100644
--- a/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
+++ b/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
@@ -9,9 +9,9 @@
    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="42"
-   height="42"
-   viewBox="0 0 11.1125 11.1125"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="3.7670704"
-     inkscape:cy="20.243876"
+     inkscape:zoom="2.7429847"
+     inkscape:cx="61.039347"
+     inkscape:cy="138.63342"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -36,8 +36,7 @@
      inkscape:window-height="2065"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true" />
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata4922">
     <rdf:RDF>
@@ -54,10 +53,283 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-285.88748)">
+     transform="translate(0,-229.26665)">
+    <g
+       id="g5049"
+       transform="translate(11.125143,1.6666669e-6)">
+      <g
+         id="g4851"
+         transform="translate(-0.42102699)">
+        <g
+           id="g16"
+           transform="matrix(0.20562542,0,0,0.20562542,81.211852,180.85949)">
+          <polyline
+             points="-231.1,505.2 -236.1,505.2 -236.1,510.2 -231.1,510.2 -231.1,505.2    "
+             id="polyline8"
+             style="fill:#5c5c5c" />
+          <polyline
+             points="-196.8,505.2 -201.8,505.2 -201.8,510.2 -196.8,510.2 -196.8,505.2    "
+             id="polyline10"
+             style="fill:#5c5c5c" />
+          <polyline
+             points="-213.9,505.2 -218.9,505.2 -218.9,510.2 -213.9,510.2 -213.9,505.2    "
+             id="polyline12"
+             style="fill:#5c5c5c" />
+          <polyline
+             points="-248.2,505.2 -253.2,505.2 -253.2,510.2 -248.2,510.2 -248.2,505.2    "
+             id="polyline14"
+             style="fill:#11b3ef" />
+        </g>
+        <path
+           style="fill:#f8f8f8;fill-opacity:1;stroke:#000000;stroke-width:0.47573891;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 28.571974,234.34429 c -0.904753,0 -1.644646,0.74302 -1.644646,1.64775 v 54.28255 c 0,0.90472 0.739893,1.64775 1.644646,1.64775 h 12.748315 c 0.904753,0 1.644646,-0.74303 1.644646,-1.64775 v -54.28255 c 0,-0.90473 -0.739893,-1.64775 -1.644646,-1.64775 z"
+           id="path6"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g4897">
+          <circle
+             r="0.30843815"
+             style="stroke-width:0.20562541"
+             id="circle18"
+             cy="269.56638"
+             cx="36.488323" />
+          <circle
+             r="0.30843815"
+             style="stroke-width:0.20562541"
+             id="circle20"
+             cy="269.56638"
+             cx="34.946133" />
+          <circle
+             r="0.30843815"
+             style="stroke-width:0.20562541"
+             id="circle22"
+             cy="269.56638"
+             cx="33.403942" />
+          <circle
+             r="0.30843815"
+             style="stroke-width:0.20562541"
+             id="circle24"
+             cy="268.33246"
+             cx="36.488323" />
+          <circle
+             r="0.30843815"
+             style="stroke-width:0.20562541"
+             id="circle26"
+             cy="268.33246"
+             cx="34.946133" />
+          <circle
+             r="0.30843815"
+             style="stroke-width:0.20562541"
+             id="circle28"
+             cy="268.33246"
+             cx="33.403942" />
+          <circle
+             r="0.20562541"
+             style="stroke-width:0.20562541"
+             id="circle30"
+             cy="267.09875"
+             cx="36.488323" />
+          <circle
+             r="0.20562541"
+             style="stroke-width:0.20562541"
+             id="circle32"
+             cy="267.09875"
+             cx="34.946133" />
+          <circle
+             r="0.20562541"
+             style="stroke-width:0.20562541"
+             id="circle34"
+             cy="267.09875"
+             cx="33.403942" />
+          <circle
+             r="0.10281271"
+             style="stroke-width:0.20562541"
+             id="circle36"
+             cy="265.86502"
+             cx="36.488323" />
+          <circle
+             r="0.10281271"
+             style="stroke-width:0.20562541"
+             id="circle38"
+             cy="265.86502"
+             cx="34.946133" />
+          <circle
+             r="0.10281271"
+             style="stroke-width:0.20562541"
+             id="circle40"
+             cy="265.86502"
+             cx="33.403942" />
+          <circle
+             r="0.10281271"
+             style="stroke-width:0.20562541"
+             id="circle42"
+             cy="272.03381"
+             cx="36.488323" />
+          <circle
+             r="0.10281271"
+             style="stroke-width:0.20562541"
+             id="circle44"
+             cy="272.03381"
+             cx="34.946133" />
+          <circle
+             r="0.10281271"
+             style="stroke-width:0.20562541"
+             id="circle46"
+             cy="272.03381"
+             cx="33.403942" />
+          <circle
+             r="0.20562541"
+             style="stroke-width:0.20562541"
+             id="circle48"
+             cy="270.80008"
+             cx="36.488323" />
+          <circle
+             r="0.20562541"
+             style="stroke-width:0.20562541"
+             id="circle50"
+             cy="270.80008"
+             cx="34.946133" />
+          <circle
+             r="0.20562541"
+             style="stroke-width:0.20562541"
+             id="circle52"
+             cy="270.80008"
+             cx="33.403942" />
+        </g>
+        <g
+           id="g5000">
+          <path
+             style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541"
+             inkscape:connector-curvature="0"
+             id="path56"
+             d="M 35.614415,239.3805 H 34.27785 c -0.143935,0 -0.267313,0.1852 -0.267313,0.43154 v 2.44699 h -2.446943 c -0.246749,0 -0.431812,0.12346 -0.431812,0.26731 v 1.33656 c 0,0.14385 0.185063,0.26732 0.431812,0.26732 h 2.446943 v 2.44693 c 0,0.24693 0.123378,0.43153 0.267313,0.43153 h 1.336565 c 0.143936,0 0.267313,-0.1852 0.267313,-0.43153 v -2.44693 h 2.446942 c 0.246749,0 0.431812,-0.12347 0.431812,-0.26732 v -1.33656 c 0,-0.14385 -0.185063,-0.26731 -0.431812,-0.26731 h -2.446941 v -2.44699 c -0.02056,-0.24694 -0.123378,-0.43154 -0.267313,-0.43154" />
+          <rect
+             style="fill:#818285;stroke-width:0.20562541"
+             id="rect58"
+             height="0.20562541"
+             width="1.4188155"
+             y="243.10237"
+             x="31.76922" />
+          <rect
+             style="fill:#818285;stroke-width:0.20562541"
+             id="rect60"
+             height="0.20562541"
+             width="1.4188155"
+             y="243.10237"
+             x="36.683666" />
+          <rect
+             style="fill:#818285;stroke-width:0.20562541"
+             id="rect62"
+             height="1.4188155"
+             width="0.20562541"
+             y="239.95615"
+             x="34.833042" />
+          <rect
+             style="fill:#818285;stroke-width:0.20562541"
+             id="rect64"
+             height="1.4188155"
+             width="0.20562541"
+             y="245.01468"
+             x="34.833042" />
+        </g>
+        <path
+           d="m 30.669123,238.22896 c -0.801939,0 -1.439378,-0.63742 -1.439378,-1.43936 0,-0.80194 0.637439,-1.43935 1.439378,-1.43935 0.801939,0 1.439378,0.63741 1.439378,1.43935 0,0.80194 -0.637439,1.43936 -1.439378,1.43936 z"
+           id="path66"
+           inkscape:connector-curvature="0"
+           style="fill:#bdbebf;stroke-width:0.20562541" />
+        <circle
+           cx="30.669123"
+           cy="236.76897"
+           r="1.3776903"
+           id="circle68"
+           style="fill:#e7e8e9;stroke-width:0.20562541" />
+        <path
+           d="m 30.669123,237.59154 c -0.370126,0 -0.658001,-0.28769 -0.658001,-0.65797 0,-0.3704 0.287876,-0.65803 0.658001,-0.65803 0.370126,0 0.658001,0.28769 0.658001,0.65803 0,0.3704 -0.287876,0.65797 -0.658001,0.65797 z m 0,-1.11037 c -0.246749,0 -0.452376,0.20558 -0.452376,0.45252 0,0.24693 0.205627,0.45251 0.452376,0.45251 0.246749,0 0.452376,-0.20558 0.452376,-0.45251 0,-0.24694 -0.205627,-0.45252 -0.452376,-0.45252 z"
+           id="path70"
+           inkscape:connector-curvature="0"
+           style="fill:#bf1e2e;stroke-width:0.20562541" />
+        <rect
+           x="30.442936"
+           y="235.92593"
+           width="0.45237595"
+           height="1.2131901"
+           id="rect72"
+           style="fill:#e7e8e9;stroke-width:0.20562541" />
+        <rect
+           x="30.566309"
+           y="236.00824"
+           width="0.20562541"
+           height="1.0075647"
+           id="rect74"
+           style="fill:#bf1e2e;stroke-width:0.20562541" />
+        <path
+           d="m 34.946132,254.96688 c -1.501065,0 -2.714256,-1.23372 -2.714256,-2.73481 0,-1.50108 1.213191,-2.7348 2.714256,-2.7348 1.501066,0 2.714256,1.23372 2.714256,2.7348 0,1.50109 -1.21319,2.73481 -2.714256,2.73481 z"
+           id="path76"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <path
+           d="m 34.946131,261.85534 c -0.801939,0 -1.439377,-0.63742 -1.439377,-1.43936 0,-0.80194 0.637438,-1.43941 1.439377,-1.43941 0.801939,0 1.439379,0.63747 1.439379,1.43941 0,0.80194 -0.63744,1.43936 -1.439379,1.43936"
+           id="path84"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <path
+           d="m 30.689685,261.85534 c -0.801939,0 -1.439378,-0.63742 -1.439378,-1.43936 0,-0.80194 0.637439,-1.43941 1.439378,-1.43941 0.801939,0 1.439378,0.63747 1.439378,1.43941 0,0.80194 -0.658001,1.43936 -1.439378,1.43936 z"
+           id="path92"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <path
+           d="m 39.202578,261.85534 c -0.801939,0 -1.439378,-0.63742 -1.439378,-1.43936 0,-0.80194 0.637439,-1.43941 1.439378,-1.43941 0.801939,0 1.439378,0.63747 1.439378,1.43941 0,0.80194 -0.637439,1.43936 -1.439378,1.43936 z"
+           id="path100"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <path
+           d="m 34.946131,277.95584 c -1.130939,0 -2.035691,-0.90479 -2.035691,-2.03571 0,-1.13093 0.904752,-2.03572 2.035691,-2.03572 1.13094,0 2.035692,0.90479 2.035692,2.03572 0,1.13092 -0.904752,2.03571 -2.035692,2.03571 z"
+           id="path112"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <path
+           d="m 34.946131,283.52823 c -1.130939,0 -2.035691,-0.90473 -2.035691,-2.03565 0,-1.13093 0.904752,-2.03571 2.035691,-2.03571 1.13094,0 2.035692,0.90478 2.035692,2.03571 0,1.13092 -0.904752,2.03565 -2.035692,2.03565 z"
+           id="path120"
+           inkscape:connector-curvature="0"
+           style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.20562541" />
+        <rect
+           x="37.146324"
+           y="287.66138"
+           width="0.41125083"
+           height="1.9945667"
+           id="rect126"
+           style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541" />
+        <rect
+           x="37.146324"
+           y="286.87997"
+           width="0.41125083"
+           height="0.43181336"
+           id="rect128"
+           style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541" />
+        <rect
+           x="36.13876"
+           y="287.66138"
+           width="0.41125083"
+           height="1.9945667"
+           id="rect130"
+           style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541" />
+        <rect
+           x="36.13876"
+           y="286.87997"
+           width="0.41125083"
+           height="0.43181336"
+           id="rect132"
+           style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.20562541" />
+        <polygon
+           points="-231,525.3 -228.2,515.5 -226.3,515.5 -223.6,525.3 -220.8,515.5 -218.9,516.1 -222.6,529.2 -224.5,529.2 -227.3,519.5 -230.1,529.2 -232,529.2 -235.7,516.1 -233.8,515.5 "
+           id="polygon134"
+           style="fill:#7a7b7e;fill-opacity:1"
+           transform="matrix(0.20562542,0,0,0.20562542,80.800604,180.85949)" />
+      </g>
+    </g>
     <g
        id="g5629"
-       transform="matrix(0.97763205,0,0,0.97763205,0.12423766,6.4933408)">
+       transform="matrix(6.0575792,0,0,6.0575792,-0.67909296,-1502.7706)">
       <path
          id="path188"
          d="m 3.330473,296.25878 c -0.6814899,0 -0.8835396,-1.82872 -1.0821648,-3.5958 -0.034246,-0.29793 -0.068491,-0.60615 -0.1027371,-0.89723 -0.1678041,-1.35271 0.1335583,-2.01708 0.4177977,-2.33556 0.2260218,-0.25684 0.5239596,-0.3904 0.8629922,-0.3904 0.3390326,0 0.6369704,0.13356 0.8629921,0.3904 0.2808149,0.31848 0.5821773,0.98285 0.4177978,2.33556 -0.034246,0.29108 -0.068491,0.5993 -0.1027372,0.89723 -0.1952006,1.76708 -0.4006749,3.5958 -1.0821647,3.5958 z"
@@ -66,7 +338,7 @@
       <polygon
          transform="matrix(0.03424572,0,0,0.03424572,15.149569,277.85171)"
          id="polygon192"
-         points="-326.6,358.3 -320.1,374.1 -326.6,389.8 -342.3,396.4 -358.1,389.8 -364.6,374.1 -358.1,358.3 -342.3,351.8 "
+         points="-342.3,396.4 -358.1,389.8 -364.6,374.1 -358.1,358.3 -342.3,351.8 -326.6,358.3 -320.1,374.1 -326.6,389.8 "
          style="fill:#b0b2b4;fill-opacity:1" />
       <circle
          style="fill:#efefef;fill-opacity:1;stroke-width:0.03424572"
@@ -75,294 +347,5 @@
          r="0.51368582"
          id="circle198" />
     </g>
-    <g
-       id="g5624"
-       transform="matrix(0.97763205,0,0,0.97763205,0.12423766,6.4932822)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6"
-         d="m 6.6137471,286.68123 c -0.150954,0 -0.274402,0.12359 -0.274402,0.27409 v 9.02943 c 0,0.1505 0.123448,0.27409 0.274402,0.27409 h 2.1270018 c 0.1509541,0 0.2744021,-0.12359 0.2744021,-0.27409 v -9.02943 c 0,-0.1505 -0.123448,-0.27409 -0.2744021,-0.27409 z"
-         style="fill:#fefefe;fill-opacity:1;stroke:#000000;stroke-width:0.10556875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         transform="matrix(0.03430772,0,0,0.03420402,15.396485,277.78449)"
-         id="g16">
-        <polyline
-           style="fill:#5c5c5c"
-           id="polyline8"
-           points="-231.1,505.2 -236.1,505.2 -236.1,510.2 -231.1,510.2 -231.1,505.2    " />
-        <polyline
-           style="fill:#5c5c5c"
-           id="polyline10"
-           points="-196.8,505.2 -201.8,505.2 -201.8,510.2 -196.8,510.2 -196.8,505.2    " />
-        <polyline
-           style="fill:#5c5c5c"
-           id="polyline12"
-           points="-213.9,505.2 -218.9,505.2 -218.9,510.2 -213.9,510.2 -213.9,505.2    " />
-        <polyline
-           style="fill:#11b3ef"
-           id="polyline14"
-           points="-248.2,505.2 -253.2,505.2 -253.2,510.2 -248.2,510.2 -248.2,505.2    " />
-      </g>
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path56"
-         d="M 7.7887483,287.51896 H 7.5657481 c -0.024015,0 -0.0446,0.0308 -0.0446,0.0718 v 0.40704 H 7.1128862 c -0.041169,0 -0.072046,0.0205 -0.072046,0.0445 v 0.22233 c 0,0.0239 0.030877,0.0445 0.072046,0.0445 h 0.4082619 v 0.40703 c 0,0.0411 0.020585,0.0718 0.0446,0.0718 h 0.2230002 c 0.024015,0 0.0446,-0.0308 0.0446,-0.0718 v -0.40703 h 0.4082618 c 0.041169,0 0.072046,-0.0205 0.072046,-0.0445 v -0.22233 c 0,-0.0239 -0.030877,-0.0445 -0.072046,-0.0445 H 7.8333484 v -0.40704 c -0.00343,-0.0411 -0.020585,-0.0718 -0.0446,-0.0718" />
-      <rect
-         style="fill:#818285;stroke-width:0.03425583"
-         id="rect58"
-         height="0.034204017"
-         width="0.23672327"
-         y="288.13806"
-         x="7.1471944" />
-      <rect
-         style="fill:#818285;stroke-width:0.03425583"
-         id="rect60"
-         height="0.034204017"
-         width="0.23672327"
-         y="288.13806"
-         x="7.9671488" />
-      <rect
-         style="fill:#818285;stroke-width:0.03425583"
-         id="rect62"
-         height="0.23600774"
-         width="0.034307718"
-         y="287.61472"
-         x="7.6583796" />
-      <rect
-         style="fill:#818285;stroke-width:0.03425583"
-         id="rect64"
-         height="0.23600774"
-         width="0.034307718"
-         y="288.45615"
-         x="7.6583796" />
-      <path
-         style="fill:#bdbebf;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path66"
-         d="m 6.9636475,287.32741 c -0.1338001,0 -0.240154,-0.10603 -0.240154,-0.23942 0,-0.1334 0.1063539,-0.23943 0.240154,-0.23943 0.1338001,0 0.2401541,0.10603 0.2401541,0.23943 0,0.13339 -0.106354,0.23942 -0.2401541,0.23942 z" />
-      <ellipse
-         ry="0.22916692"
-         rx="0.22986172"
-         style="fill:#e7e8e9;stroke-width:0.03425583"
-         id="circle68"
-         cy="287.08456"
-         cx="6.9636478" />
-      <path
-         style="fill:#bf1e2e;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path70"
-         d="m 6.9636475,287.22138 c -0.061754,0 -0.1097847,-0.0478 -0.1097847,-0.10945 0,-0.0616 0.048031,-0.10945 0.1097847,-0.10945 0.061754,0 0.1097847,0.0478 0.1097847,0.10945 0,0.0616 -0.048031,0.10945 -0.1097847,0.10945 z m 0,-0.1847 c -0.041169,0 -0.075477,0.0342 -0.075477,0.0753 0,0.0411 0.034308,0.0753 0.075477,0.0753 0.041169,0 0.075477,-0.0342 0.075477,-0.0753 0,-0.0411 -0.034308,-0.0753 -0.075477,-0.0753 z" />
-      <rect
-         style="fill:#e7e8e9;stroke-width:0.03425583"
-         id="rect72"
-         height="0.20180373"
-         width="0.075476989"
-         y="286.94434"
-         x="6.9259095" />
-      <rect
-         style="fill:#bf1e2e;stroke-width:0.03425583"
-         id="rect74"
-         height="0.16759971"
-         width="0.034307718"
-         y="286.95801"
-         x="6.9464936" />
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path76"
-         d="m 7.6772481,290.11162 c -0.2504463,0 -0.4528619,-0.20522 -0.4528619,-0.45491 0,-0.24969 0.2024156,-0.45491 0.4528619,-0.45491 0.2504464,0 0.4528619,0.20522 0.4528619,0.45491 0,0.24969 -0.2024155,0.45491 -0.4528619,0.45491 z" />
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path84"
-         d="m 7.677248,291.25746 c -0.1338001,0 -0.240154,-0.10603 -0.240154,-0.23943 0,-0.13339 0.1063539,-0.23943 0.240154,-0.23943 0.1338001,0 0.2401541,0.10604 0.2401541,0.23943 0,0.1334 -0.106354,0.23943 -0.2401541,0.23943" />
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path92"
-         d="m 6.9670782,291.25746 c -0.1338001,0 -0.240154,-0.10603 -0.240154,-0.23943 0,-0.13339 0.1063539,-0.23943 0.240154,-0.23943 0.1338001,0 0.2401541,0.10604 0.2401541,0.23943 0,0.1334 -0.1097847,0.23943 -0.2401541,0.23943 z" />
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path100"
-         d="m 8.3874178,291.25746 c -0.1338001,0 -0.240154,-0.10603 -0.240154,-0.23943 0,-0.13339 0.1063539,-0.23943 0.240154,-0.23943 0.1338002,0 0.2401541,0.10604 0.2401541,0.23943 0,0.1334 -0.1063539,0.23943 -0.2401541,0.23943 z" />
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path112"
-         d="m 7.677248,293.93564 c -0.1886924,0 -0.3396464,-0.15051 -0.3396464,-0.33863 0,-0.18812 0.150954,-0.33862 0.3396464,-0.33862 0.1886925,0 0.3396465,0.1505 0.3396465,0.33862 0,0.18812 -0.150954,0.33863 -0.3396465,0.33863 z" />
-      <path
-         style="fill:#b0b2b4;fill-opacity:1;stroke-width:0.03425583"
-         inkscape:connector-curvature="0"
-         id="path120"
-         d="m 7.677248,294.86256 c -0.1886924,0 -0.3396464,-0.1505 -0.3396464,-0.33862 0,-0.18812 0.150954,-0.33862 0.3396464,-0.33862 0.1886925,0 0.3396465,0.1505 0.3396465,0.33862 0,0.18812 -0.150954,0.33862 -0.3396465,0.33862 z" />
-      <rect
-         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.03425583"
-         id="rect126"
-         height="0.331779"
-         width="0.068615437"
-         y="295.55008"
-         x="8.0443411" />
-      <rect
-         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.03425583"
-         id="rect128"
-         height="0.071828432"
-         width="0.068615437"
-         y="295.4201"
-         x="8.0443411" />
-      <rect
-         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.03425583"
-         id="rect130"
-         height="0.331779"
-         width="0.068615437"
-         y="295.55008"
-         x="7.8762331" />
-      <rect
-         style="fill:#7a7b7e;fill-opacity:1;stroke-width:0.03425583"
-         id="rect132"
-         height="0.071828432"
-         width="0.068615437"
-         y="295.4201"
-         x="7.8762331" />
-      <polygon
-         transform="matrix(0.03430772,0,0,0.03420402,15.32787,277.78449)"
-         style="fill:#7a7b7e;fill-opacity:1"
-         id="polygon134"
-         points="-227.3,519.5 -230.1,529.2 -232,529.2 -235.7,516.1 -233.8,515.5 -231,525.3 -228.2,515.5 -226.3,515.5 -223.6,525.3 -220.8,515.5 -218.9,516.1 -222.6,529.2 -224.5,529.2 " />
-      <rect
-         y="287.39575"
-         x="6.1149302"
-         height="1.573225"
-         width="2.6900308"
-         id="rect5214"
-         style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:none;stroke-width:0.10857928;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-      <ellipse
-         ry="0.051306032"
-         rx="0.051461581"
-         style="stroke-width:0.03425583"
-         id="circle18-5"
-         cy="292.54013"
-         cx="7.934556" />
-      <ellipse
-         ry="0.051306032"
-         rx="0.051461581"
-         style="stroke-width:0.03425583"
-         id="circle20-6"
-         cy="292.54013"
-         cx="7.677248" />
-      <ellipse
-         ry="0.051306032"
-         rx="0.051461581"
-         style="stroke-width:0.03425583"
-         id="circle22-6"
-         cy="292.54013"
-         cx="7.41994" />
-      <ellipse
-         ry="0.051306032"
-         rx="0.051461581"
-         style="stroke-width:0.03425583"
-         id="circle24-4"
-         cy="292.33487"
-         cx="7.934556" />
-      <ellipse
-         ry="0.051306032"
-         rx="0.051461581"
-         style="stroke-width:0.03425583"
-         id="circle26-0"
-         cy="292.33487"
-         cx="7.677248" />
-      <ellipse
-         ry="0.051306032"
-         rx="0.051461581"
-         style="stroke-width:0.03425583"
-         id="circle28-0"
-         cy="292.33487"
-         cx="7.41994" />
-      <ellipse
-         ry="0.034204017"
-         rx="0.034307718"
-         style="stroke-width:0.03425583"
-         id="circle30-4"
-         cy="292.12964"
-         cx="7.934556" />
-      <ellipse
-         ry="0.034204017"
-         rx="0.034307718"
-         style="stroke-width:0.03425583"
-         id="circle32-6"
-         cy="292.12964"
-         cx="7.677248" />
-      <ellipse
-         ry="0.034204017"
-         rx="0.034307718"
-         style="stroke-width:0.03425583"
-         id="circle34-2"
-         cy="292.12964"
-         cx="7.41994" />
-      <ellipse
-         ry="0.017102009"
-         rx="0.017153859"
-         style="stroke-width:0.03425583"
-         id="circle36-6"
-         cy="291.92444"
-         cx="7.934556" />
-      <ellipse
-         ry="0.017102009"
-         rx="0.017153859"
-         style="stroke-width:0.03425583"
-         id="circle38-7"
-         cy="291.92444"
-         cx="7.677248" />
-      <ellipse
-         ry="0.017102009"
-         rx="0.017153859"
-         style="stroke-width:0.03425583"
-         id="circle40-5"
-         cy="291.92444"
-         cx="7.41994" />
-      <ellipse
-         ry="0.017102009"
-         rx="0.017153859"
-         style="stroke-width:0.03425583"
-         id="circle42-6"
-         cy="292.95056"
-         cx="7.934556" />
-      <ellipse
-         ry="0.017102009"
-         rx="0.017153859"
-         style="stroke-width:0.03425583"
-         id="circle44-9"
-         cy="292.95056"
-         cx="7.677248" />
-      <ellipse
-         ry="0.017102009"
-         rx="0.017153859"
-         style="stroke-width:0.03425583"
-         id="circle46-8"
-         cy="292.95056"
-         cx="7.41994" />
-      <ellipse
-         ry="0.034204017"
-         rx="0.034307718"
-         style="stroke-width:0.03425583"
-         id="circle48-7"
-         cy="292.74533"
-         cx="7.934556" />
-      <ellipse
-         ry="0.034204017"
-         rx="0.034307718"
-         style="stroke-width:0.03425583"
-         id="circle50-2"
-         cy="292.74533"
-         cx="7.677248" />
-      <ellipse
-         ry="0.034204017"
-         rx="0.034307718"
-         style="stroke-width:0.03425583"
-         id="circle52-8"
-         cy="292.74533"
-         cx="7.41994" />
-    </g>
   </g>
 </svg>