diff --git a/resources/graphics/controllers/gamepad_nintendo_64.svg b/resources/graphics/controllers/gamepad_nintendo_64.svg
index b6b01c15a..48c9bf4e8 100644
--- a/resources/graphics/controllers/gamepad_nintendo_64.svg
+++ b/resources/graphics/controllers/gamepad_nintendo_64.svg
@@ -15,9 +15,34 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="gamepad_nintendo_64.svg">
   <defs
-     id="defs4919" />
+     id="defs4919">
+    <clipPath
+       id="clipPath16"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path18"
+         d="M 0,366.069 H 352.845 V 0 H 0 Z" />
+    </clipPath>
+    <clipPath
+       id="clipPath16-4"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path18-6"
+         d="M 0,366.069 H 352.845 V 0 H 0 Z" />
+    </clipPath>
+    <clipPath
+       id="clipPath16-4-4"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path18-6-6"
+         d="M 0,366.069 H 352.845 V 0 H 0 Z" />
+    </clipPath>
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,9 +50,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="22.627417"
+     inkscape:cx="14.408843"
+     inkscape:cy="35.16371"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -36,7 +61,8 @@
      inkscape:window-height="2065"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false" />
   <metadata
      id="metadata4922">
     <rdf:RDF>
@@ -55,14 +81,213 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g6500">
       <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"
+         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" />
     </g>
   </g>
diff --git a/resources/graphics/controllers/gamepad_nintendo_nes.svg b/resources/graphics/controllers/gamepad_nintendo_nes.svg
index b6b01c15a..e546a52eb 100644
--- a/resources/graphics/controllers/gamepad_nintendo_nes.svg
+++ b/resources/graphics/controllers/gamepad_nintendo_nes.svg
@@ -15,7 +15,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="gamepad_nintendo_nes.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="33.785627"
+     inkscape:cx="7.8454542"
+     inkscape:cy="25.685359"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -36,7 +36,8 @@
      inkscape:window-height="2065"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
   <metadata
      id="metadata4922">
     <rdf:RDF>
@@ -55,14 +56,278 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5404"
+       transform="matrix(0.98413614,0,0,0.98413614,0.08814355,4.6234203)">
+      <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)"
+         id="g20">
+        <path
+           id="path22"
+           style="fill:#c2c2c2;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.20466661;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 0,0 c -1.039,0 -1.881,0.958 -1.881,2.139 v 415.804 c 0,1.182 0.842,2.14 1.881,2.14 h 178.662 c 1.038,0 1.88,-0.958 1.88,-2.14 V 2.139 C 180.542,0.958 179.7,0 178.662,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.464353,293.10033)"
+         id="g24">
+        <path
+           id="path26"
+           style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 v -152.916 c 0,-1.111 0.65,-2.012 1.451,-2.012 H 139.34 c 0.802,0 1.451,0.901 1.451,2.012 v 391.023 c 0,1.112 -0.649,2.012 -1.451,2.012 H 1.451 C 0.65,240.119 0,239.219 0,238.107 V 117.433 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.4908229,292.51958)"
+         id="g28">
+        <path
+           id="path30"
+           style="fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -3.512,0 -6.358,2.314 -6.358,5.169 v 108.025 c 0,2.856 2.846,5.17 6.358,5.17 h 27.98 c 3.511,0 6.359,-2.314 6.359,-5.17 V 5.169 C 34.339,2.314 31.491,0 27.98,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#d2d2d2;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.3691078,292.49015)"
+         id="g32">
+        <path
+           id="path34"
+           style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -1.287,0 -2.33,1.043 -2.33,2.33 v 102.054 c 0,1.286 1.043,2.329 2.33,2.329 h 25.164 c 1.287,0 2.33,-1.043 2.33,-2.329 V 2.33 C 27.494,1.043 26.451,0 25.164,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#7a7a7a;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.4810844,290.23659)"
+         id="g36">
+        <path
+           id="path38"
+           style="fill:#7a7a7a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 2.059,0 3.728,1.67 3.728,3.729 v 109.975 c 0,2.06 -1.669,3.728 -3.728,3.728 h -11.301 c -2.058,0 -3.727,-1.668 -3.727,-3.728 V 3.729 C -15.028,1.67 -13.359,0 -11.301,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#7a7a7a;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.4810844,290.77188)"
+         id="g40">
+        <path
+           id="path42"
+           style="fill:#7a7a7a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 2.059,0 3.729,1.67 3.729,3.729 v 109.975 c 0,2.06 -1.67,3.728 -3.729,3.728 h -11.301 c -2.058,0 -3.727,-1.668 -3.727,-3.728 V 3.729 C -15.028,1.67 -13.359,0 -11.301,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#7a7a7a;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.4810844,291.32568)"
+         id="g44">
+        <path
+           id="path46"
+           style="fill:#7a7a7a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 2.06,0 3.729,1.67 3.729,3.729 v 109.975 c 0,2.06 -1.669,3.728 -3.729,3.728 h -11.3 c -2.059,0 -3.728,-1.668 -3.728,-3.728 V 3.729 C -15.028,1.67 -13.359,0 -11.3,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#7a7a7a;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,6.4031809,292.84107)"
+         id="g48">
+        <path
+           id="path50"
+           style="fill:#7a7a7a;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 v 109.975 c 0,2.06 -1.669,3.728 -3.727,3.728 h -8.681 V -3.729 h 8.681 C -1.669,-3.729 0,-2.059 0,0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#d2d2d2;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,3.0886639,292.15446)"
+         id="g52">
+        <path
+           id="path54"
+           style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 v -20.241 c 0,-2.059 1.669,-3.728 3.729,-3.728 h 27.726 c 2.06,0 3.729,1.669 3.729,3.728 V 0 h 20.242 c 2.058,0 3.727,1.67 3.727,3.728 v 27.727 c 0,2.06 -1.669,3.729 -3.727,3.729 H 35.184 v 20.242 c 0,2.058 -1.669,3.728 -3.729,3.728 H 3.729 C 1.669,59.154 0,57.484 0,55.426 V 35.184 h -20.241 c -2.059,0 -3.729,-1.669 -3.729,-3.729 V 3.728 C -23.97,1.67 -22.3,0 -20.241,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#c2c2c2;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,7.8323054,292.63419)"
+         id="g56">
+        <path
+           id="path58"
+           style="fill:#c2c2c2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -1.287,0 -2.33,1.043 -2.33,2.33 v 38.912 c 0,1.286 1.043,2.329 2.33,2.329 h 39.377 c 1.287,0 2.33,-1.043 2.33,-2.329 V 2.33 C 41.707,1.043 40.664,0 39.377,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,7.7397953,292.22282)"
+         id="g60">
+        <path
+           id="path62"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -9.587,0 -17.358,7.771 -17.358,17.357 0,9.588 7.771,17.36 17.358,17.36 9.587,0 17.358,-7.772 17.358,-17.36 C 17.358,7.771 9.587,0 0,0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#c2c2c2;fill-opacity:1"
+         transform="matrix(0,-0.02089351,-0.02089351,0,8.9744701,292.63419)"
+         id="g64">
+        <path
+           id="path66"
+           style="fill:#c2c2c2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -1.287,0 -2.33,1.043 -2.33,2.33 v 38.911 c 0,1.286 1.043,2.329 2.33,2.329 h 39.377 c 1.287,0 2.33,-1.043 2.33,-2.329 V 2.33 C 41.707,1.043 40.664,0 39.377,0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,8.8819599,292.22282)"
+         id="g68">
+        <path
+           id="path70"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -9.587,0 -17.358,7.771 -17.358,17.357 0,9.588 7.771,17.36 17.358,17.36 9.587,0 17.358,-7.772 17.358,-17.36 C 17.358,7.771 9.587,0 0,0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,4.4506386,292.34857)"
+         id="g72">
+        <path
+           id="path74"
+           style="fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0,3.323 2.694,6.019 6.019,6.019 3.325,0 6.019,-2.696 6.019,-6.019 v -21.94 c 0,-3.325 -2.694,-6.02 -6.019,-6.02 -3.325,0 -6.019,2.695 -6.019,6.02 z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,5.5995372,292.34857)"
+         id="g76">
+        <path
+           id="path78"
+           style="fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0,3.325 2.694,6.02 6.019,6.02 3.325,0 6.019,-2.695 6.019,-6.02 v -21.94 c 0,-3.325 -2.694,-6.02 -6.019,-6.02 -3.325,0 -6.019,2.695 -6.019,6.02 z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,3.0229224,292.08875)"
+         id="g80">
+        <path
+           id="path82"
+           style="fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 V -24.058 H 28.893 V 0 H 52.95 V 28.893 H 28.893 V 52.949 H 0 V 28.893 H -24.057 V 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,2.7211094,291.4072)"
+         id="g84">
+        <path
+           id="path86"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 V -6 H 6.933 V -8.563 L 15.379,0 6.933,8.563 V 6 H 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,2.7211094,292.16662)"
+         id="g88">
+        <path
+           id="path90"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 V 6 H -6.932 V 8.563 L -15.378,0 -6.932,-8.563 V -6 H 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,3.1008238,291.7915)"
+         id="g92">
+        <path
+           id="path94"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 H -6 V -6.932 H -8.564 L 0,-15.377 8.563,-6.932 H 5.999 V 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,2.3413927,291.7915)"
+         id="g96">
+        <path
+           id="path98"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 H 5.999 V 6.932 H 8.563 L 0,15.379 -8.564,6.932 H -6 V 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,2.8862161,291.7915)"
+         id="g100">
+        <path
+           id="path102"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -4.364,0 -7.902,3.539 -7.902,7.902 0,4.366 3.538,7.903 7.902,7.903 4.363,0 7.902,-3.537 7.902,-7.903 C 7.902,3.539 4.363,0 0,0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,7.175263,290.8466)"
+         id="g104">
+        <path
+           id="path106"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0.08,0.115 0.173,0.176 0.267,0.234 2.855,1.764 5.71,3.53 8.568,5.287 0.172,0.107 0.243,0.213 0.24,0.42 C 9.064,7.103 9.07,8.264 9.07,9.424 9.07,9.516 9.061,9.607 9.057,9.713 H -4.03 V 5.705 H 5.015 C 5.021,5.682 5.029,5.659 5.035,5.637 4.946,5.578 4.856,5.518 4.767,5.461 1.915,3.691 -0.936,1.919 -3.791,0.155 -3.982,0.037 -4.053,-0.09 -4.051,-0.316 -4.039,-1.448 -4.045,-2.58 -4.045,-3.713 V -4.008 H 9.049 V 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,8.5241189,290.87865)"
+         id="g108">
+        <path
+           id="path110"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c -0.848,0.033 -1.414,0.732 -1.385,1.563 0.03,0.85 0.614,1.467 1.462,1.501 0.611,0.025 1.227,0.004 1.839,0.004 V 3.073 C 2.481,3.073 3.048,3.086 3.613,3.07 4.539,3.044 5.123,2.465 5.154,1.569 5.184,0.696 4.636,0.03 3.731,-0.006 2.489,-0.055 1.242,-0.049 0,0 m 5.763,-0.004 c 0.4,0.733 0.716,1.44 0.775,2.236 C 6.595,3.02 6.481,3.772 6.142,4.488 5.799,5.211 5.303,5.807 4.667,6.286 3.091,7.476 0.943,7.616 -0.624,6.494 -3.002,4.792 -3.281,2.557 -2.06,0.008 c -0.148,-0.01 -0.293,-0.021 -0.432,-0.03 v -3.849 h 13.081 v 3.867 z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,7.6522619,290.76894)"
+         id="g112">
+        <path
+           id="path114"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 C 1.673,1.627 1.79,4.392 0.265,6.199 0.203,6.273 0.145,6.352 0.038,6.486 h 0.88 v 3.858 H -7.753 V 6.501 c 0.128,-0.007 0.248,-0.019 0.368,-0.018 1.708,0.002 3.415,0.013 5.122,0.003 0.276,-0.002 0.575,-0.045 0.82,-0.158 0.777,-0.36 1.186,-1.329 0.972,-2.205 -0.203,-0.832 -0.886,-1.35 -1.787,-1.35 H -7.409 -7.74 v -3.868 c 0.048,-0.009 0.075,-0.018 0.102,-0.018 1.614,0 3.227,-0.019 4.839,0.008 1.06,0.017 2.02,0.348 2.799,1.105"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,8.3449716,290.81916)"
+         id="g116">
+        <path
+           id="path118"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 C 1.046,0.037 1.942,0.512 2.638,1.314 4.101,3.004 4.11,5.552 2.665,7.268 2.601,7.343 2.538,7.418 2.419,7.561 H 3.33 v 3.868 h -8.667 v -3.87 h 0.388 c 1.726,0.002 3.453,0.002 5.179,0.005 0.363,0 0.688,-0.097 0.978,-0.312 C 1.875,6.754 2.155,5.846 1.888,5.049 1.626,4.268 1.006,3.848 0.108,3.846 c -1.697,0 -3.395,0 -5.093,-10e-4 C -5.104,3.844 -5.222,3.83 -5.337,3.822 v -3.837 c 0.058,-0.01 0.094,-0.023 0.131,-0.023 C -3.471,-0.031 -1.733,-0.061 0,0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,8.7863471,290.83871)"
+         id="g120">
+        <path
+           id="path122"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 v 0.029 c -0.745,0 -1.491,-0.033 -2.234,0.008 -0.991,0.057 -1.624,0.767 -1.587,1.701 0.029,0.736 0.595,1.336 1.404,1.474 0.222,0.038 0.449,0.056 0.675,0.056 1.161,0.005 2.32,0.005 3.48,-0.002 C 1.982,3.265 2.23,3.247 2.469,3.197 3.325,3.016 3.874,2.35 3.832,1.569 3.787,0.741 3.153,0.121 2.262,0.031 2.131,0.018 1.999,0.002 1.867,0.002 1.244,-0.002 0.622,0 0,0 M 3.417,-2.502 C 5.386,-0.238 5.358,3.506 3.357,5.771 1.523,7.85 -1.442,7.885 -3.313,5.84 -4.408,4.643 -4.882,3.205 -4.896,1.699 c 0.007,-1.582 0.424,-2.926 1.363,-4.086 1.87,-2.308 5.001,-2.357 6.95,-0.115"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,7.9732969,290.81294)"
+         id="g124">
+        <path
+           id="path126"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 C 0,0.669 0.012,1.338 -0.006,2.008 -0.012,2.264 0.073,2.342 0.319,2.314 0.627,2.277 0.943,2.295 1.246,2.236 2.02,2.086 2.555,1.415 2.55,0.645 2.545,-0.133 1.982,-0.811 1.196,-0.937 0.819,-0.998 0.433,-0.998 0,-1.029 Z M 1.818,-3.759 C 2.904,-2.672 3.463,-1.34 3.571,0.183 3.697,1.963 3.24,3.566 2.048,4.92 1.251,5.823 0.254,6.383 -0.967,6.467 -2.552,6.576 -3.83,5.939 -4.793,4.723 -6.229,2.906 -6.516,0.842 -5.858,-1.342 c 0.459,-1.523 1.379,-2.711 2.86,-3.398 0.113,-0.053 0.234,-0.086 0.355,-0.129 v 3.844 c -0.358,0.027 -0.697,0.033 -1.032,0.081 -0.823,0.117 -1.405,0.739 -1.433,1.506 -0.032,0.838 0.453,1.54 1.299,1.665 0.803,0.117 1.628,0.086 2.488,0.123 v -7.455 c 0.142,0 0.244,-0.01 0.344,0 1.094,0.111 2.025,0.574 2.795,1.346"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0,-0.02089351,-0.02089351,0,7.8475264,290.72222)"
+         id="g128">
+        <path
+           id="path130"
+           style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 v 2.109 h 1.748 v 3.942 h -1.751 c 0,0.128 0.001,0.229 0,0.33 C -0.004,6.9 0.001,7.419 -0.014,7.937 -0.016,8.021 -0.101,8.17 -0.156,8.173 -0.52,8.193 -0.887,8.184 -1.283,8.184 V 6.035 H -9.981 V 2.102 h 8.706 V 0 Z"
+           inkscape:connector-curvature="0" />
+      </g>
       <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"
+         id="path132"
+         style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02089351"
+         d="m 7.3891019,290.93085 v -0.18126 h -0.081297 v 0.18126 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path134"
+         style="fill:#cd3332;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02089351"
+         d="m 7.3074291,290.65749 v 0.0545 h 0.081652 v -0.0545 z"
          inkscape:connector-curvature="0" />
     </g>
   </g>
diff --git a/resources/graphics/controllers/gamepad_nintendo_snes.svg b/resources/graphics/controllers/gamepad_nintendo_snes.svg
index b6b01c15a..f4e823894 100644
--- a/resources/graphics/controllers/gamepad_nintendo_snes.svg
+++ b/resources/graphics/controllers/gamepad_nintendo_snes.svg
@@ -2,6 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:bx="https://www.boxy-svg.com/bx"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -15,7 +16,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="gamepad_nintendo_snes.svg">
   <defs
      id="defs4919" />
   <sodipodi:namedview
@@ -25,9 +26,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="8.4464068"
+     inkscape:cx="-54.59087"
+     inkscape:cy="43.269643"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -55,15 +56,205 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5490"
+       transform="translate(-1e-7,3.169167e-6)">
       <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"
+         bx:origin="0 0"
+         style="fill:#666666;fill-opacity:1;stroke-width:0.02360734"
+         d="m 7.1960037,289.44528 c -0.023395,0 -0.050378,0.002 -0.073442,0.0123 -0.023088,0.0103 -0.042375,0.0322 -0.042375,0.0632 h 0.015132 c -2.597e-4,0.006 4.958e-4,0.0149 0.00783,0.0152 l 1.0501723,-0.003 c 0.3750498,0.0113 0.7009018,0.12038 0.9866451,0.29436 0.012134,0.006 0.017375,-0.007 0.017163,-0.0115 -8.498e-4,-0.0203 -0.00203,-0.0362 -0.00356,-0.0488 h 0.00153 c 0,-0.02 0.00172,-0.0354 0,-0.0503 -0.00172,-0.0147 -0.010104,-0.0297 -0.025424,-0.0382 -1.416e-4,-9e-5 9.44e-5,-4.5e-4 0,-4.9e-4 -1.416e-4,-5e-5 -3.541e-4,9e-5 -4.721e-4,0 -0.2819891,-0.1585 -0.6068969,-0.23265 -0.9523195,-0.23265 z"
+         id="path7-9"
          inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0 1"
+         style="fill:#666666;fill-opacity:1;stroke-width:0.02360734"
+         d="m 3.9188805,289.44528 c 0.023395,0 0.050378,0.002 0.073442,0.0123 0.023088,0.0103 0.042375,0.0322 0.042375,0.0632 h -0.015132 c 2.596e-4,0.006 -4.957e-4,0.0149 -0.00783,0.0152 l -1.0501722,-0.003 c -0.3750498,0.0113 -0.7009019,0.12038 -0.9866451,0.29436 -0.012134,0.006 -0.017375,-0.007 -0.017163,-0.0115 8.5e-4,-0.0203 0.00203,-0.0362 0.00356,-0.0488 h -0.00153 c 0,-0.02 -0.00172,-0.0354 0,-0.0503 0.00172,-0.0147 0.010104,-0.0297 0.025425,-0.0382 1.417e-4,-9e-5 -9.44e-5,-4.5e-4 0,-4.9e-4 1.417e-4,-5e-5 3.542e-4,9e-5 4.722e-4,0 0.2819896,-0.1585 0.6068973,-0.23265 0.9523199,-0.23265 z"
+         id="path-7-2"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-width:0.09618732;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 2.9246105,289.56906 h 2.1116762 0.3800308 v 0.0197 0.0151 h 0.015038 0.2539677 0.015038 v -0.0151 -0.0197 h 0.3758051 2.1116525 c 1.0565227,0 1.9127142,0.85577 1.9127142,1.91224 0,1.05653 -0.8562387,1.91272 -1.9127142,1.91272 -0.4169055,0 -0.8022717,-0.13343 -1.1165561,-0.35978 h -4.485e-4 l -0.039495,-0.0305 c -0.069406,-0.0554 -0.1573902,-0.0884 -0.253047,-0.0884 H 6.0615296 5.0508288 4.3340629 c -0.095633,0 -0.1836179,0.0329 -0.2529998,0.0884 l -0.039519,0.0305 h -4.488e-4 c -0.3140956,0.22649 -0.6993909,0.35984 -1.1164381,0.35984 -1.0564755,0 -1.91269,-0.85619 -1.91269,-1.9127 0,-1.05648 0.8562381,-1.91227 1.91269,-1.91227 z"
+         id="path-11-5"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 4.0211713,291.45945 c 0,0.5997 -0.4853432,1.08579 -1.0840489,1.08579 -0.5987057,0 -1.0840489,-0.48609 -1.0840489,-1.08579 0,-0.59968 0.4853432,-1.08585 1.0840489,-1.08585 0.5987057,0 1.0840489,0.48617 1.0840489,1.08585"
+         style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.02360734"
+         id="path42-8"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 9.9144126,291.46153 c 0,0.95212 -0.7718895,1.72398 -1.7240207,1.72398 -0.9521547,0 -1.7240201,-0.77186 -1.7240201,-1.72398 0,-0.95216 0.7718654,-1.72403 1.7240201,-1.72403 0.9521312,0 1.7240207,0.77187 1.7240207,1.72403"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path50-2"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="M 3.6921794,291.18732 H 3.209197 v -0.48295 c 0,-0.0206 -0.016879,-0.0375 -0.037536,-0.0375 H 2.7025599 c -0.020656,0 -0.037536,0.0169 -0.037536,0.0375 v 0.48295 H 2.182042 c -0.020609,0 -0.037489,0.0169 -0.037489,0.0375 v 0.46913 c 0,0.0206 0.016879,0.0375 0.037489,0.0375 h 0.4829824 v 0.48298 c 0,0.0206 0.016879,0.0375 0.037536,0.0375 h 0.4691013 c 0.020657,0 0.037536,-0.0168 0.037536,-0.0375 v -0.48298 h 0.4829824 c 0.020633,0 0.037512,-0.0169 0.037512,-0.0375 v -0.46913 c 0,-0.0206 -0.016879,-0.0375 -0.037512,-0.0375"
+         style="fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path70-8"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 2.2576088,291.4102 c -0.047734,0.027 -0.047734,0.0714 0,0.0984 l 0.18494,0.10486 c 0.047734,0.0271 0.08678,0.0145 0.08678,-0.0281 v -0.25198 c 0,-0.0425 -0.039047,-0.0552 -0.08678,-0.0282 l -0.18494,0.10488 c -0.047734,0.027 -0.047734,0.0713 0,0.0985 l 0.18494,0.10485 c 0.047734,0.0271 0.08678,0.0144 0.08678,-0.0281 v -0.25198 c 0,-0.0425 -0.039047,-0.0552 -0.08678,-0.0282 z"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path90-9"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 3.6142988,291.4102 c 0.047758,0.027 0.047758,0.0714 0,0.0984 l -0.1849398,0.1049 c -0.047734,0.0271 -0.08678,0.0145 -0.08678,-0.0281 v -0.25198 c 0,-0.0425 0.039047,-0.0552 0.08678,-0.0282 l 0.1849398,0.10488 c 0.047758,0.027 0.047758,0.0713 0,0.0985 l -0.1849398,0.10485 c -0.047734,0.0271 -0.08678,0.0144 -0.08678,-0.0281 v -0.25198 c 0,-0.0425 0.039047,-0.0552 0.08678,-0.0282 z"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path94-3"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 2.9863201,290.78283 c -0.027078,-0.0477 -0.071389,-0.0477 -0.098443,0 l -0.1048638,0.18494 c -0.027078,0.0477 -0.014424,0.0868 0.028093,0.0868 h 0.2519846 c 0.042541,0 0.055148,-0.039 0.028116,-0.0868 l -0.1048874,-0.18494 c -0.027078,-0.0477 -0.071388,-0.0477 -0.098442,0 l -0.1048638,0.18494 c -0.027078,0.0477 -0.014425,0.0868 0.028093,0.0868 h 0.2519846 c 0.04254,0 0.055147,-0.039 0.028116,-0.0868 z"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path98-6"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 2.9851633,292.13952 c -0.027054,0.0477 -0.071365,0.0477 -0.098443,0 l -0.1048638,-0.18491 c -0.027054,-0.0477 -0.014424,-0.0868 0.028093,-0.0868 h 0.2520084 c 0.042516,0 0.055147,0.039 0.028093,0.0868 l -0.1048874,0.18491 c -0.027054,0.0477 -0.071365,0.0477 -0.098443,0 L 2.781857,291.95461 c -0.027054,-0.0477 -0.014423,-0.0868 0.028093,-0.0868 h 0.2520083 c 0.042516,0 0.055147,0.039 0.028093,0.0868 z"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path102-8"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 4.9932881,291.69085 -0.3882349,0.30435 c -0.1342009,0.10571 -0.3018025,-0.0856 -0.1567248,-0.19994 l 0.3882108,-0.30437 c 0.1387396,-0.10675 0.2974457,0.0917 0.1567489,0.19996"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path-4-0"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 5.9691682,291.69085 -0.3882347,0.30435 c -0.134201,0.10571 -0.3018026,-0.0856 -0.1567249,-0.19994 l 0.3882108,-0.30437 c 0.1387398,-0.10675 0.2974458,0.0917 0.1567488,0.19996"
+         style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path-2-2"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#f4f4f4;stroke-width:0.02360734"
+         d="m 7.3241444,291.12235 c -0.1966728,0 -0.3564945,0.15985 -0.3564945,0.35652 0,0.19667 0.1598217,0.35651 0.3564945,0.35651 0.1966962,0 0.3565179,-0.15984 0.3565179,-0.35651 0,-0.19667 -0.1598217,-0.35652 -0.3565179,-0.35652 z m 0,0.0301 c 0.1804073,0 0.326395,0.14601 0.326395,0.32639 0,0.18039 -0.1459877,0.32638 -0.326395,0.32638 -0.1803602,0 -0.3263479,-0.14599 -0.3263479,-0.32638 0,-0.18038 0.1459877,-0.32639 0.3263479,-0.32639 z"
+         id="circle35-1"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#f4f4f4;stroke-width:0.02360734"
+         d="m 8.1898018,290.44796 c -0.1966728,0 -0.3560459,0.15982 -0.3560459,0.35652 0,0.19666 0.1593731,0.3565 0.3560459,0.3565 0.1966727,0 0.3565179,-0.15984 0.3565179,-0.3565 0,-0.1967 -0.1598452,-0.35652 -0.3565179,-0.35652 z m 0,0.0302 c 0.1803836,0 0.3263714,0.14599 0.3263714,0.32635 0,0.18039 -0.1459878,0.32638 -0.3263714,0.32638 -0.1803601,0 -0.3258993,-0.14599 -0.3258993,-0.32638 0,-0.18036 0.1455156,-0.32635 0.3258993,-0.32635 z"
+         id="circle37-0"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#f4f4f4;stroke-width:0.02360734"
+         d="m 8.2184138,291.78076 c -0.1966491,0 -0.3564943,0.15985 -0.3564943,0.35654 0,0.19668 0.1598452,0.35605 0.3564943,0.35605 0.19672,0 0.3560459,-0.15937 0.3560459,-0.35605 0,-0.19667 -0.1593259,-0.35654 -0.3560459,-0.35654 z m 0,0.0302 c 0.180431,0 0.3258994,0.14599 0.3258994,0.32637 0,0.18038 -0.1454684,0.32588 -0.3258994,0.32588 -0.18036,0 -0.3263478,-0.1455 -0.3263478,-0.32588 0,-0.18038 0.1459878,-0.32637 0.3263478,-0.32637 z"
+         id="circle41-8"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#f4f4f4;stroke-width:0.02360734"
+         d="m 9.0840949,291.1064 c -0.1966728,0 -0.3565416,0.15984 -0.3565416,0.35649 0,0.19668 0.1598688,0.3565 0.3565416,0.3565 0.1966962,0 0.3565183,-0.15982 0.3565183,-0.3565 0,-0.19665 -0.1598692,-0.35649 -0.3565183,-0.35649 z m 0,0.0301 c 0.18036,0 0.3263477,0.14599 0.3263477,0.32635 0,0.18041 -0.1459877,0.32638 -0.3263477,0.32638 -0.1803601,0 -0.3263479,-0.14599 -0.3263479,-0.32638 0,-0.18036 0.1459878,-0.32635 0.3263479,-0.32635 z"
+         id="circle43-5"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path57-0"
+         bx:origin="0 0"
+         style="fill:#d8d8d8;stroke-width:0.02360734"
+         d="m 9.4124494,291.20399 c 0.1425647,0.18303 0.1100572,0.4466 -0.072994,0.58919 l -0.8656102,0.67439 c -0.1830512,0.14256 -0.4466272,0.10956 -0.5891683,-0.0734 -0.1425411,-0.18305 -0.1100338,-0.4466 0.073017,-0.58916 l 0.8660823,-0.67395 c 0.068603,-0.0534 0.1482306,-0.0826 0.2289204,-0.0881 0.1343729,-0.009 0.2706817,0.0466 0.3597527,0.16108 z"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#ba2318;fill-opacity:1;stroke-width:0.02360734"
+         d="m 9.0840713,291.1066 c 0.1969323,0 0.3563058,0.15938 0.3563058,0.35634 0,0.19688 -0.1593735,0.35623 -0.3563058,0.35623 -0.1969088,0 -0.3562819,-0.15935 -0.3562819,-0.35623 0,-0.19696 0.1593731,-0.35634 0.3562819,-0.35634 z"
+         id="path-5-6"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path60-4"
+         bx:origin="0 0"
+         style="fill:#d8d8d8;stroke-width:0.02360734"
+         d="m 8.5212016,290.54756 c 0.1425647,0.18303 0.1100573,0.44661 -0.073018,0.58917 l -0.8655866,0.67439 c -0.1830512,0.14257 -0.4466271,0.10959 -0.5891918,-0.0734 -0.1425411,-0.18305 -0.1100102,-0.4466 0.073041,-0.58915 L 7.932529,290.4746 c 0.068603,-0.0534 0.148207,-0.0826 0.2288968,-0.0881 0.1343965,-0.009 0.2707053,0.0467 0.3597758,0.1611 z"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#0a2a8d;fill-opacity:1;stroke-width:0.02360734"
+         d="m 8.1900614,290.44818 c 0.1969088,0 0.356282,0.15937 0.356282,0.35633 0,0.19691 -0.1593732,0.35625 -0.356282,0.35625 -0.1969087,0 -0.3563055,-0.15934 -0.3563055,-0.35625 0,-0.19696 0.1593968,-0.35633 0.3563055,-0.35633 z"
+         id="path-6-6"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#fed01b;fill-opacity:1;stroke-width:0.02360734"
+         d="m 8.2181778,291.78079 c 0.1969324,0 0.3563055,0.15937 0.3563055,0.35631 0,0.19689 -0.1593731,0.35622 -0.3563055,0.35622 -0.1969089,0 -0.3562819,-0.15933 -0.3562819,-0.35622 0,-0.19694 0.159373,-0.35631 0.3562819,-0.35631 z"
+         id="path-1-2"
+         inkscape:connector-curvature="0" />
+      <path
+         bx:origin="0.5 0.5"
+         style="fill:#007544;fill-opacity:1;stroke-width:0.02360734"
+         d="m 7.3241444,291.12259 c 0.1969324,0 0.3563054,0.15936 0.3563054,0.3563 0,0.19692 -0.159373,0.35626 -0.3563054,0.35626 -0.1969088,0 -0.356282,-0.15934 -0.356282,-0.35626 0,-0.19694 0.1593732,-0.3563 0.356282,-0.3563 z"
+         id="path-10-5"
+         inkscape:connector-curvature="0" />
+      <path
+         clip-path="url(#clipPath16)"
+         bx:origin="0.5 0.5"
+         d="m 3.1345978,291.45942 c 0,0.10909 -0.088409,0.19747 -0.197499,0.19747 -0.1090423,0 -0.1974517,-0.0884 -0.1974517,-0.19747 0,-0.10905 0.088409,-0.19748 0.1974517,-0.19748 0.1090895,0 0.197499,0.0884 0.197499,0.19748"
+         style="fill:#666666;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         id="path-18-8"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path-3-2"
+         d="m 4.4033542,289.80731 -0.07603,4.4e-4 c -0.021034,0 -0.041728,0.0175 -0.04553,0.0394 v 4.5e-4 4.6e-4 l -4.527e-4,4.5e-4 v 8.8e-4 4.6e-4 l -4.527e-4,8.8e-4 v 4.5e-4 l -4.526e-4,8.8e-4 v 8.9e-4 l -4.527e-4,8.8e-4 v 8.8e-4 8.8e-4 l -4.526e-4,8.8e-4 -4.526e-4,0.002 -8.827e-4,0.003 -4.526e-4,0.003 -8.827e-4,0.003 v 0.004 l -8.826e-4,0.003 -8.827e-4,0.004 -8.826e-4,0.004 -8.827e-4,0.006 -8.827e-4,0.004 -8.827e-4,0.004 -4.526e-4,0.003 -4.526e-4,0.004 -8.827e-4,0.004 -4.526e-4,0.004 -4.527e-4,0.002 -4.526e-4,0.003 -4.527e-4,0.003 v 8.8e-4 l -4.526e-4,8.8e-4 v 8.8e-4 8.8e-4 l -4.526e-4,9e-4 v 4.4e-4 8.8e-4 l -4.527e-4,8.9e-4 v 4.5e-4 4.5e-4 c -3.847e-4,0.009 9.997e-4,0.0223 0.00398,0.0247 0.00373,0.0209 0.072731,0.11781 0.070725,0.13261 -0.0019,0.0148 -0.010166,0.0584 -0.010166,0.0584 -0.00248,0.0147 -0.012446,0.0265 -0.026964,0.0265 -0.014448,0 -0.024115,-0.0118 -0.021659,-0.0265 l 0.012819,-0.0721 h -0.051276 l -0.01768,0.10034 c -0.00352,0.0204 0.010175,0.0363 0.0305,0.0363 h 0.073378 c 0.020374,0 0.040032,-0.0158 0.043762,-0.0363 0,0 0.018683,-0.0938 0.018565,-0.10034 -7.06e-5,-0.007 -0.00176,-0.008 -0.00176,-0.008 0,-0.007 -0.061376,-0.11016 -0.067632,-0.11404 -0.0027,-0.002 -0.00472,-0.0115 -0.00486,-0.0177 -9.46e-5,-0.006 0.00796,-0.0473 0.00796,-0.0473 0.00254,-0.0146 0.016424,-0.0261 0.030942,-0.0261 0.014519,0 0.020208,0.0115 0.017683,0.0261 l -0.011052,0.065 h 0.05216 l 0.018124,-0.0977 c 0.00406,-0.0218 -0.00981,-0.0394 -0.030942,-0.0394 z m 0.6612857,0 -0.110951,4.5e-4 -0.07382,0.39518 h 0.049066 l 0.033595,-0.17902 h 0.034921 c 0.0046,0.005 0.00504,0.0124 0.00574,0.0164 8.826e-4,0.006 0.00204,0.0133 0.00134,0.019 -6.338e-4,0.006 -0.026964,0.14366 -0.026964,0.14366 h 0.049067 c 0,0 0.027848,-0.15009 0.027848,-0.1525 7.08e-5,-0.003 5.93e-5,-0.0103 -0.00265,-0.0146 -0.00184,-0.003 -0.00478,-0.009 -0.0084,-0.0111 -0.00683,-0.005 -0.014586,-0.008 -0.014586,-0.008 h -0.00354 c 0.014023,-0.006 0.040534,-0.0148 0.04332,-0.0301 l 0.026964,-0.14012 c 0.00411,-0.0218 -0.00979,-0.0394 -0.030943,-0.0394 z m -0.5958645,4.5e-4 -0.061443,0.35849 c -0.00358,0.0204 0.00976,0.0367 0.030059,0.0367 h 0.073378 c 0.020351,0 0.040426,-0.0163 0.044203,-0.0367 l 0.065863,-0.35849 h -0.046414 l -0.062769,0.34833 c -8.601e-4,0.005 -0.00563,0.009 -0.010608,0.009 h -0.036689 c -0.00513,0 -0.00829,-0.005 -0.00752,-0.009 l 0.061001,-0.34833 z m 0.1768144,0 -0.074262,0.39518 h 0.049508 l 0.033595,-0.17902 h 0.062769 c 0.020348,0 0.039566,-0.0164 0.04332,-0.0367 l 0.026964,-0.14012 c 0.00397,-0.0218 -0.00981,-0.0394 -0.030943,-0.0394 h -0.061885 z m 0.1759304,0 -0.076914,0.39518 h 0.1105089 l 0.00796,-0.0491 h -0.054813 l 0.022544,-0.13349 h 0.054371 l 0.00752,-0.0411 h -0.054371 l 0.024312,-0.12244 h 0.054371 l 0.00796,-0.0491 z m 0.3956223,0 -0.074262,0.39518 h 0.056581 l 0.045972,-0.22898 0.017683,0.22898 h 0.049508 l 0.074262,-0.39518 h -0.056581 l -0.038457,0.20643 -0.025196,-0.20643 z m 0.1953798,0 -0.074262,0.39518 h 0.049066 l 0.074704,-0.39518 z m 0.075146,0 -0.074262,0.39518 h 0.057022 l 0.04553,-0.22898 0.018124,0.22898 h 0.049066 l 0.074262,-0.39518 h -0.056581 l -0.038015,0.20643 -0.025638,-0.20643 z m 0.1905175,0 -0.00884,0.0486 h 0.0305 l -0.060559,0.34655 h 0.056138 l 0.061885,-0.34655 h 0.029617 l 0.00752,-0.0486 z m 0.135705,0 -0.076914,0.39518 h 0.110509 l 0.00796,-0.0491 h -0.054812 l 0.022544,-0.13349 h 0.054812 l 0.00752,-0.0411 h -0.054371 l 0.02387,-0.12246 h 0.054371 l 0.00796,-0.0491 z m 0.1246543,0 -0.07382,0.39518 h 0.056581 l 0.045972,-0.22898 0.018124,0.22898 h 0.049066 l 0.074262,-0.39518 H 6.051707 l -0.038015,0.20643 -0.025196,-0.20643 z m 0.1958219,0 -0.074262,0.39518 h 0.1127192 c 0.020397,0 0.039937,-0.0163 0.043762,-0.0367 l 0.059675,-0.31914 c 0.00402,-0.0218 -0.00986,-0.0394 -0.030943,-0.0394 z m 0.2112932,0 c -0.021104,0 -0.04131,0.0175 -0.045087,0.0394 l -0.054812,0.31914 c -0.00359,0.0204 0.00976,0.0367 0.030059,0.0367 h 0.080893 c 0.020351,0 0.040473,-0.0163 0.044203,-0.0367 l 0.059233,-0.31914 c 0.00411,-0.0218 -0.00947,-0.0394 -0.0305,-0.0394 z m -0.1692998,0.0455 h 0.022544 c 0.014614,0 0.02458,0.0115 0.022102,0.0261 l -0.048182,0.25903 c -0.00254,0.0147 -0.016888,0.0265 -0.031385,0.0265 H 6.119338 Z m 0.1980322,0 h 0.00176 c 0.014494,0 0.024186,0.0115 0.021659,0.0261 l -0.046414,0.25903 c -0.00248,0.0146 -0.016006,0.0265 -0.0305,0.0265 -0.014541,0 -0.020161,-0.0118 -0.017683,-0.0265 l 0.04553,-0.25903 4.527e-4,-8.8e-4 4.527e-4,-8.8e-4 4.527e-4,-9.1e-4 4.526e-4,-8.8e-4 v -0.002 l 4.526e-4,-8.9e-4 4.527e-4,-8.8e-4 8.826e-4,-8.9e-4 4.527e-4,-8.8e-4 4.526e-4,-8.8e-4 4.527e-4,-8.8e-4 8.826e-4,-8.8e-4 8.827e-4,-8.8e-4 8.826e-4,-4.6e-4 4.527e-4,-8.8e-4 0.00134,-8.8e-4 8.827e-4,-8.9e-4 4.526e-4,-8.8e-4 0.00134,-4.5e-4 0.00134,-8.9e-4 4.526e-4,-8.8e-4 0.00134,-8.8e-4 0.00134,-4.6e-4 8.827e-4,-4.4e-4 8.827e-4,-4.6e-4 0.00134,-4.5e-4 0.00134,-4.6e-4 h 0.00134 l 8.827e-4,-4.5e-4 h 0.00176 z m -1.6815051,9e-4 v 9e-4 h 0.02387 c 0.00531,0 0.016463,0.0118 0.015471,0.0173 l -0.020333,0.0977 c -9.998e-4,0.005 -0.00786,0.0168 -0.012818,0.0168 H 4.6703453 4.6698927 4.66944 l -4.526e-4,-4.5e-4 H 4.6685347 4.668082 4.6676294 v -4.5e-4 h -4.527e-4 -3.689e-4 l -4.526e-4,-4.5e-4 h -4.526e-4 -4.527e-4 l -4.526e-4,-4.6e-4 h -4.527e-4 v -4.5e-4 -4.6e-4 l -4.526e-4,-4.4e-4 v -4.6e-4 l -4.526e-4,-4.5e-4 -4.527e-4,-4.6e-4 v -4.5e-4 l -4.526e-4,-4.5e-4 v -4.5e-4 -4.5e-4 l -4.527e-4,-4.6e-4 v -4.5e-4 c 0,-6.6e-4 -9.46e-5,-0.002 0,-0.003 l 0.022986,-0.11934 c 0.00213,-0.002 0.00487,-0.004 0.00752,-0.004 z m 0.305447,9e-4 h 4.527e-4 4.526e-4 4.526e-4 4.527e-4 4.526e-4 4.527e-4 0.022544 c 0.00522,0 0.016114,0.0118 0.01503,0.0173 l -0.020333,0.0972 c -9.27e-4,0.005 -0.013489,0.0173 -0.018565,0.0173 h -0.020776 c -0.00437,0 -0.00767,-0.003 -0.00796,-0.007 0,-6.6e-4 -7.09e-5,-9.1e-4 0,-0.002 l 0.022986,-0.1198 v -4.4e-4 h 4.527e-4 l 8.826e-4,-4.6e-4 h 4.527e-4 l 4.526e-4,-4.5e-4 4.526e-4,-4.5e-4 4.527e-4,-4.6e-4 h 4.526e-4 z"
+         clip-path="url(#clipPath16)"
+         style="fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02360734"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.03790672,0,0,-0.03790672,3.7592595,290.15558)"
+         id="g104-8">
+        <path
+           inkscape:connector-curvature="0"
+           id="path106-4"
+           style="fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0,-0.841 -1.525,-1.523 -3.407,-1.523 -1.882,0 -3.408,0.682 -3.408,1.523 0,0.841 1.526,1.523 3.408,1.523 C -1.525,1.523 0,0.841 0,0" />
+      </g>
+      <g
+         transform="matrix(0.03790672,0,0,-0.03790672,3.9904754,290.25122)"
+         id="g108-7">
+        <path
+           inkscape:connector-curvature="0"
+           id="path110-2"
+           style="fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0,-0.841 -1.525,-1.523 -3.407,-1.523 -1.882,0 -3.408,0.682 -3.408,1.523 0,0.841 1.526,1.523 3.408,1.523 C -1.525,1.523 0,0.841 0,0" />
+      </g>
+      <g
+         transform="matrix(0.03790672,0,0,-0.03790672,4.0060213,290.18972)"
+         id="g112-4">
+        <path
+           inkscape:connector-curvature="0"
+           id="path114-0"
+           style="fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 C -0.41,1.706 -1.897,3.592 -3.817,2.772 -2.254,6.378 0.697,5.805 1.721,4.575 2.519,3.618 2.5,0.343 0,0" />
+      </g>
+      <g
+         transform="matrix(0.03790672,0,0,-0.03790672,3.7783874,290.08515)"
+         id="g116-6">
+        <path
+           inkscape:connector-curvature="0"
+           id="path118-2"
+           style="fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 0,0 C -0.41,1.706 -1.897,3.591 -3.817,2.772 -2.254,6.378 0.697,5.805 1.721,4.575 2.519,3.618 2.5,0.343 0,0" />
+      </g>
+      <rect
+         y="290.25565"
+         x="4.2044096"
+         height="0.10818105"
+         width="2.1955299"
+         id="rect5303"
+         style="opacity:1;vector-effect:none;fill:#5a5a5a;fill-opacity:1;stroke:none;stroke-width:0.09032007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/gamepad_playstation.svg b/resources/graphics/controllers/gamepad_playstation.svg
index b6b01c15a..5b5c4016e 100644
--- a/resources/graphics/controllers/gamepad_playstation.svg
+++ b/resources/graphics/controllers/gamepad_playstation.svg
@@ -15,9 +15,18 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="gamepad_playstation.svg">
   <defs
-     id="defs4919" />
+     id="defs4919">
+    <clipPath
+       id="clipPath16"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path18"
+         d="M 0,428.623 H 265.712 V 0 H 0 Z" />
+    </clipPath>
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,9 +34,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="23.890046"
+     inkscape:cx="27.458701"
+     inkscape:cy="15.063512"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -55,15 +64,98 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g14725"
+       transform="translate(4.3347377e-7,2.6668856e-5)">
       <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" />
+         inkscape:connector-curvature="0"
+         id="path30-4"
+         d="m 2.918825,288.73845 c -0.3626261,0 -0.616968,0.0767 -0.6457872,0.22565 -0.01881,0.097 -0.050224,0.30821 -0.078304,0.49129 -0.41776,0.24637 -0.6988306,0.69994 -0.6988306,1.22 0,0.0214 0.00244,0.0421 0.00334,0.0631 -0.162574,0.97662 -0.2776564,1.9435 -0.3645706,2.39876 -0.15520473,0.81336 1.2039422,1.49728 1.7192908,0.55737 0.2440554,-0.44511 0.4645608,-0.87975 0.6276849,-1.20611 0.1572849,0.27068 0.4470001,0.45466 0.7826057,0.45466 0.3725061,0 0.6916645,-0.22473 0.8318607,-0.54559 h 0.9038486 c 0.1406855,0.31961 0.458946,0.5435 0.8305979,0.5435 0.3414904,0 0.6363897,-0.19031 0.7914465,-0.46899 0.164161,0.32858 0.3886006,0.7719 0.6356832,1.22253 0.5153483,0.93993 1.8802691,0.25485 1.7192919,-0.55737 -0.088057,-0.44424 -0.2047877,-1.44363 -0.3708866,-2.43665 9.23e-5,-0.006 8.063e-4,-0.0131 8.063e-4,-0.0198 0,-0.53576 -0.2975275,-1.00202 -0.7362977,-1.24274 -0.026471,-0.17238 -0.057632,-0.38042 -0.075777,-0.47403 -0.028798,-0.14887 -0.2831807,-0.22565 -0.6457867,-0.22565 -0.3626265,0 -0.6169468,0.0768 -0.6457865,0.22565 -0.020408,0.10559 -0.053047,0.32285 -0.085459,0.53464 -0.043019,0.0282 -0.087115,0.055 -0.1267154,0.0876 H 5.8530379 c -0.010012,0.0164 -0.028546,0.0278 -0.049255,0.0278 H 5.2775551 c -0.020687,0 -0.03798,-0.0113 -0.047992,-0.0278 h -1.411553 c -0.054123,-0.045 -0.1129686,-0.0841 -0.1734445,-0.12082 -0.029054,-0.1895 -0.060403,-0.40239 -0.079566,-0.5014 -0.028798,-0.14887 -0.2836438,-0.22565 -0.6462072,-0.22565 z"
+         style="fill:#c2c2c2;fill-opacity:1;fill-rule:nonzero;stroke:#010101;stroke-width:0.12790291;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 4.9385609,292.0328 c 0,0.37663 -0.3054025,0.68198 -0.6820351,0.68198 -0.3766326,0 -0.6819521,-0.30535 -0.6819521,-0.68198 0,-0.37666 0.3053195,-0.68199 0.6819521,-0.68199 0.3766326,0 0.6820351,0.30533 0.6820351,0.68199"
+         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path78-7" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 4.8520894,292.0328 c 0,0.32888 -0.266653,0.59553 -0.5955575,0.59553 -0.3288837,0 -0.595475,-0.26665 -0.595475,-0.59553 0,-0.32891 0.2665913,-0.59553 0.595475,-0.59553 0.3289045,0 0.5955575,0.26662 0.5955575,0.59553"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path82-2" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.9044385,289.64912 c -0.056376,0 -0.1021387,0.0457 -0.1021387,0.10218 v 0.53847 H 7.2626631 c -0.056417,0 -0.1010629,0.0457 -0.1010629,0.10221 v 0.57294 c 0,0.0564 0.044645,0.10218 0.1010629,0.10218 h 0.5396367 v 0.53846 c 0,0.0565 0.045763,0.10221 0.1021387,0.10221 h 0.5729657 c 0.056417,0 0.1010216,-0.0457 0.1010216,-0.10221 v -0.53846 h 0.5396366 c 0.056417,0 0.1010212,-0.0457 0.1010212,-0.10218 v -0.57294 c 0,-0.0564 -0.044605,-0.10221 -0.1010212,-0.10221 H 8.5784258 v -0.53847 c 0,-0.0564 -0.044605,-0.10218 -0.1010216,-0.10218 z"
+         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path86-4" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 4.5344498,290.69783 h 0.4095271 c 0.00492,0 0.00896,0.004 0.00896,0.009 v 0.22701 c 0,0.005 -0.00403,0.009 -0.00896,0.009 H 4.5344498 c -0.00496,0 -0.00894,-0.004 -0.00894,-0.009 v -0.22701 c 0,-0.005 0.00397,-0.009 0.00894,-0.009"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path90-2" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 5.3469959,291.51393 h 0.4094858 c 0.00497,0 0.00902,0.004 0.00902,0.009 v 0.22703 c 0,0.005 -0.00406,0.009 -0.00902,0.009 H 5.3469959 c -0.00496,0 -0.00898,-0.004 -0.00898,-0.009 v -0.22703 c 0,-0.005 0.00402,-0.009 0.00898,-0.009"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path94-2" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 6.499405,290.82029 c 0,0.0533 -0.3121883,0.12245 -0.3121883,0.12245 -0.03455,0.009 -0.057617,-0.006 -0.057617,-0.0576 v -0.1297 c 0,-0.0514 0.025219,-0.0661 0.057617,-0.0576 0,0 0.3121883,0.0722 0.3121883,0.12246"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path102-0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 8.4929289,290.03008 c 0,0.16709 -0.1354885,0.30257 -0.3025681,0.30257 -0.1670797,0 -0.3025681,-0.13548 -0.3025681,-0.30257 0,-0.16711 0.1354884,-0.30257 0.3025681,-0.30257 0.1670796,0 0.3025681,0.13546 0.3025681,0.30257"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path106-9" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 8.4929289,291.33161 c 0,0.16711 -0.1354885,0.30257 -0.3025681,0.30257 -0.1670797,0 -0.3025681,-0.13546 -0.3025681,-0.30257 0,-0.16711 0.1354884,-0.30256 0.3025681,-0.30256 0.1670796,0 0.3025681,0.13545 0.3025681,0.30256"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path110-5" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 8.5385468,290.68084 c 0,-0.16708 0.1354886,-0.30259 0.3025681,-0.30259 0.1671211,0 0.3025681,0.13551 0.3025681,0.30259 0,0.1671 -0.135447,0.30257 -0.3025681,0.30257 -0.1670795,0 -0.3025681,-0.13547 -0.3025681,-0.30257"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path114-0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.2370362,290.68084 c 0,-0.16708 0.1354471,-0.30259 0.3025681,-0.30259 0.167121,0 0.3025681,0.13551 0.3025681,0.30259 0,0.1671 -0.1354471,0.30257 -0.3025681,0.30257 -0.167121,0 -0.3025681,-0.13547 -0.3025681,-0.30257"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path118-7" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 2.6289716,289.63142 c -0.056455,0 -0.1021799,0.0457 -0.1021799,0.10219 v 0.53847 H 1.9871552 c -0.056455,0 -0.1010216,0.0457 -0.1010216,0.10218 v 0.57293 c 0,0.0565 0.044561,0.10218 0.1010216,0.10218 h 0.5396365 v 0.53846 c 0,0.0565 0.045718,0.10219 0.1021799,0.10219 h 0.5728832 c 0.056455,0 0.1010216,-0.0457 0.1010216,-0.10219 v -0.53846 h 0.5396365 c 0.056459,0 0.1010629,-0.0457 0.1010629,-0.10218 v -0.57293 c 0,-0.0565 -0.044605,-0.10218 -0.1010629,-0.10218 H 3.3028764 v -0.53847 c 0,-0.0565 -0.044562,-0.10219 -0.1010216,-0.10219 z"
+         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path122-8" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.5127736,292.0328 c 0,0.37663 -0.3053611,0.68198 -0.6819936,0.68198 -0.3766327,0 -0.6819938,-0.30535 -0.6819938,-0.68198 0,-0.37666 0.3053611,-0.68199 0.6819938,-0.68199 0.3766325,0 0.6819936,0.30533 0.6819936,0.68199"
+         style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path126-0" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.4263022,292.0328 c 0,0.32888 -0.2666116,0.59553 -0.5955161,0.59553 -0.3289251,0 -0.595516,-0.26665 -0.595516,-0.59553 0,-0.32891 0.2665909,-0.59553 0.595516,-0.59553 0.3289045,0 0.5955161,0.26662 0.5955161,0.59553"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path130-6" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 3.2572624,290.45455 c -0.012333,8.1e-4 -0.023649,0.007 -0.03103,0.0172 l -0.1285787,0.16305 c -0.011959,0.0155 -0.011959,0.0372 0,0.0528 l 0.128579,0.16424 c 0.00817,0.0108 0.020895,0.0172 0.034468,0.0172 l 0.2985335,8.1e-4 c 0.011584,1.1e-4 0.022696,-0.005 0.030949,-0.0127 0.00815,-0.008 0.012725,-0.0194 0.012644,-0.0309 v -0.32265 c 2.069e-4,-0.0237 -0.018745,-0.0432 -0.042476,-0.0436 L 3.261838,290.454 c -0.00155,-6e-5 -0.00301,-6e-5 -0.00456,0"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path150-6" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 2.5724422,290.4513 c 0.012285,8.1e-4 0.02356,0.007 0.030949,0.0172 l 0.1286193,0.16303 c 0.012,0.0155 0.012,0.0372 0,0.0528 l -0.1286193,0.16414 c -0.00815,0.0108 -0.020855,0.0172 -0.034428,0.0172 l -0.2984927,8.1e-4 c -0.011626,9e-5 -0.022737,-0.005 -0.030989,-0.0126 -0.00815,-0.008 -0.012725,-0.0194 -0.012644,-0.0309 v -0.32261 c -2.069e-4,-0.0238 0.018745,-0.0432 0.042476,-0.0436 l 0.298513,-0.006 c 0.00155,-7e-5 0.00309,-7e-5 0.00464,0"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path154-9" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 3.1210105,291.00313 c -0.00105,-0.0123 -0.00733,-0.0236 -0.017254,-0.0309 l -0.1630449,-0.1286 c -0.015561,-0.012 -0.037262,-0.012 -0.052821,0 l -0.1641626,0.1286 c -0.010802,0.008 -0.017172,0.0209 -0.017214,0.0345 l -0.00114,0.29852 c -4.07e-5,0.0116 0.00456,0.0227 0.012684,0.0309 0.00821,0.008 0.019364,0.0128 0.030973,0.0127 h 0.3226357 c 0.02369,1.9e-4 0.043152,-0.0188 0.043608,-0.0425 l 0.00579,-0.2985 c 4.16e-5,-0.002 4.16e-5,-0.003 0,-0.005"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path158-5" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 3.1242414,290.3183 c -0.00105,0.0123 -0.00733,0.0236 -0.017214,0.031 l -0.1630042,0.12856 c -0.0156,0.012 -0.037303,0.012 -0.052863,0 l -0.1641623,-0.12852 c -0.010843,-0.008 -0.017173,-0.021 -0.017214,-0.0345 l -0.00114,-0.29853 c -8.22e-5,-0.0116 0.00448,-0.0227 0.012684,-0.0309 0.00821,-0.008 0.019364,-0.0128 0.030973,-0.0127 h 0.3225942 c 0.023772,-1.6e-4 0.043201,0.0188 0.043649,0.0425 l 0.00571,0.29847 c 8.3e-5,0.002 8.3e-5,0.003 0,0.005"
+         style="fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.02068842"
+         id="path162-7" />
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/joycon_left_or_right_nintendo.svg b/resources/graphics/controllers/joycon_left_or_right_nintendo.svg
index b6b01c15a..e4e991891 100644
--- a/resources/graphics/controllers/joycon_left_or_right_nintendo.svg
+++ b/resources/graphics/controllers/joycon_left_or_right_nintendo.svg
@@ -15,7 +15,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="joycon_left_or_right_nintendo.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="24.884308"
+     inkscape:cx="13.368346"
+     inkscape:cy="25.181666"
      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>
@@ -55,15 +55,258 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5555-7"
+       transform="translate(-0.02566855,1.3229153)">
+      <g
+         transform="translate(-3.7897826)"
+         id="g5517-6">
+        <path
+           style="fill:#5cc8e4;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 11.490269,288.142 c -0.05711,3.7e-4 -0.0966,9.4e-4 -0.104504,0.003 -0.03504,0.006 -0.04397,0.0161 -0.03916,0.0432 l 0.0034,0.0207 -0.259024,0.003 c -0.283756,0.003 -0.330474,0.008 -0.443152,0.0433 -0.122296,0.0387 -0.231534,0.10257 -0.324974,0.19031 -0.121609,0.11354 -0.193036,0.23546 -0.234946,0.39997 -0.0089,0.0375 -0.01169,0.0974 -0.01513,0.34517 l -0.0041,0.30001 -0.05841,0.002 c -0.04122,0.002 -0.06183,0.005 -0.07007,0.0122 -0.01168,0.01 -0.01236,0.0394 -0.01236,0.44774 v 0.4374 l 0.01513,0.0135 c 0.01237,0.011 0.02404,0.013 0.07213,0.013 h 0.057 v 0.86126 0.86124 h -0.05429 c -0.04397,0 -0.05702,0.003 -0.07213,0.0135 l -0.01785,0.0129 v 0.43806 0.43806 l 0.01785,0.0129 c 0.01511,0.011 0.02816,0.0135 0.07213,0.0135 h 0.05363 l 0.0021,0.50192 0.0021,0.50131 0.02267,0.0774 c 0.07489,0.26257 0.287176,0.4761 0.548259,0.55158 0.03641,0.011 0.0687,0.0193 0.07213,0.0193 0.0034,0 0.0062,-0.0283 0.0062,-0.0632 0,-0.0529 0.0028,-0.0677 0.01583,-0.0917 0.02061,-0.0393 0.07625,-0.071 0.123656,-0.071 0.02748,0 0.03641,-0.003 0.05358,-0.0187 l 0.01991,-0.0187 v 0.14447 0.14518 l 0.493317,-0.003 c 0.467201,-0.003 0.496745,-0.003 0.569574,-0.0162 0.40674,-0.0723 0.737236,-0.27548 0.957782,-0.58773 0.11199,-0.15806 0.182748,-0.32644 0.221222,-0.52515 l 0.01513,-0.0787 v -2.04833 c 0,-1.64189 -0.0021,-2.05993 -0.0089,-2.10638 -0.01237,-0.082 -0.04051,-0.18966 -0.06731,-0.25998 -0.01305,-0.0329 -0.02337,-0.0625 -0.02337,-0.0658 0,-0.003 0.0076,-0.008 0.01649,-0.0103 0.0089,-0.002 0.02337,-0.0103 0.03162,-0.0187 l 0.01443,-0.0142 -0.01719,-0.0471 c -0.06665,-0.1787 -0.275496,-0.41094 -0.511158,-0.56772 -0.179322,-0.11934 -0.368952,-0.1987 -0.561328,-0.23548 -0.07764,-0.0148 -0.100333,-0.0162 -0.367601,-0.0187 -0.07832,-9.4e-4 -0.153053,-9.4e-4 -0.210165,-9.4e-4 z"
+           id="path6-2-9-6-7-2-4"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#3a3a3a;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 10.941609,288.21703 c -0.0071,1.90972 0.0062,4.82211 -0.0036,6.23889 l -0.02015,0.0191 c -0.01717,0.0157 -0.02575,0.0186 -0.05323,0.0186 -0.04741,0 -0.103414,0.0315 -0.124023,0.0708 -0.01303,0.024 -0.0155,0.0391 -0.0155,0.092 0,0.0349 -0.0028,0.063 -0.0062,0.063 -0.0034,0 -0.03594,-0.008 -0.07235,-0.0191 -0.261084,-0.0755 -0.473397,-0.28933 -0.548287,-0.5519 l -0.02274,-0.0775 -0.0021,-0.50126 -0.0021,-0.50178 h -0.05374 c -0.043971,0 -0.056721,-0.002 -0.071831,-0.0134 l -0.018087,-0.0129 v -0.43822 -0.4377 l 0.018087,-0.0129 c 0.01511,-0.0105 0.02786,-0.0139 0.071831,-0.0139 h 0.05426 v -0.86093 -0.86144 h -0.05684 c -0.048091,0 -0.059461,-0.002 -0.07183,-0.0129 l -0.015502,-0.0134 v -0.43718 c 0,-0.40834 7.144e-4,-0.43803 0.012401,-0.44804 0.00824,-0.007 0.02906,-0.0104 0.070281,-0.0124 l 0.05839,-0.002 0.0041,-0.30024 c 0.0034,-0.24777 0.0061,-0.3077 0.01499,-0.3452 0.04191,-0.16451 0.113518,-0.28643 0.235127,-0.39997 0.09343,-0.0877 0.202741,-0.15146 0.325037,-0.19016 0.08324,-0.0261 0.160138,-0.0338 0.293522,-0.0382 z"
+           id="path6-2-9-6-7-0-4-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscsscccccscccccscccsccscccccccc" />
+      </g>
+      <circle
+         r="0.52860862"
+         cy="291.67377"
+         cx="8.1410007"
+         id="path4913-2-0"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10583334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.40539873"
+         cy="291.67377"
+         cx="8.1410007"
+         id="path4913-7-8-3"
+         style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.08116535;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="289.31393"
+         cx="8.1341553"
+         id="path4932-9-0"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="290.31146"
+         cx="8.1341553"
+         id="path4932-9-3-9"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="289.80917"
+         cx="8.6618767"
+         id="path4932-9-3-6-2"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="289.80917"
+         cx="7.6138792"
+         id="path4932-9-3-6-8-5"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.27285156"
+         cy="292.93457"
+         cx="7.7668409"
+         id="path5072-4"
+         style="opacity:1;vector-effect:none;fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.10746154;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.20463867"
+         cy="292.93457"
+         cx="7.7668409"
+         id="path5072-0-0"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.08059616;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <g
+         id="g5361-5">
+        <rect
+           style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-9"
+           width="0.11885579"
+           height="0.36896971"
+           x="7.4061403"
+           y="288.6051" />
+        <rect
+           style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-2-4"
+           width="0.1188558"
+           height="0.36896974"
+           x="-288.84903"
+           y="7.2810831"
+           transform="rotate(-90)" />
+      </g>
+      <g
+         style="fill:#8e8e8e;fill-opacity:1"
+         transform="translate(-0.69453125)"
+         id="g5361-2-6">
+        <rect
+           style="opacity:1;vector-effect:none;fill:#8e8e8e;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-5-9"
+           width="0.11885579"
+           height="0.36896971"
+           x="7.4061403"
+           y="288.6051" />
+        <rect
+           style="opacity:1;vector-effect:none;fill:#8e8e8e;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-2-8-2"
+           width="0.1188558"
+           height="0.36896974"
+           x="-288.84903"
+           y="7.2810831"
+           transform="rotate(-90)" />
+      </g>
+    </g>
+    <g
+       id="g5536-2"
+       transform="translate(-0.02566855,-1.3229181)">
+      <g
+         id="g5474-4">
+        <path
+           style="fill:#ef675b;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 3.4633507,288.142 c 0.05711,3.7e-4 0.0966,9.4e-4 0.104504,0.003 0.03504,0.006 0.04397,0.0161 0.03916,0.0432 l -0.0034,0.0207 0.259024,0.003 c 0.283756,0.003 0.330474,0.008 0.443152,0.0433 0.122296,0.0387 0.231534,0.10257 0.324974,0.19031 0.121609,0.11354 0.193036,0.23546 0.234946,0.39997 0.0089,0.0375 0.01169,0.0974 0.01513,0.34517 l 0.0041,0.30001 0.05841,0.002 c 0.04122,0.002 0.06183,0.005 0.07007,0.0122 0.01168,0.01 0.01236,0.0394 0.01236,0.44774 v 0.4374 l -0.01513,0.0135 c -0.01237,0.011 -0.02404,0.013 -0.07213,0.013 h -0.057 v 0.86126 0.86124 h 0.05429 c 0.04397,0 0.05702,0.003 0.07213,0.0135 l 0.01785,0.0129 v 0.43806 0.43806 l -0.01785,0.0129 c -0.01511,0.011 -0.02816,0.0135 -0.07213,0.0135 h -0.05363 l -0.0021,0.50192 -0.0021,0.50131 -0.02267,0.0774 c -0.07489,0.26257 -0.287176,0.4761 -0.548259,0.55158 -0.03641,0.011 -0.0687,0.0193 -0.07213,0.0193 -0.0034,0 -0.0062,-0.0283 -0.0062,-0.0632 0,-0.0529 -0.0028,-0.0677 -0.01583,-0.0917 -0.02061,-0.0393 -0.07625,-0.071 -0.123656,-0.071 -0.02748,0 -0.03641,-0.003 -0.05358,-0.0187 l -0.01991,-0.0187 v 0.14447 0.14518 l -0.493317,-0.003 c -0.467201,-0.003 -0.496745,-0.003 -0.569574,-0.0162 -0.40674,-0.0723 -0.737236,-0.27548 -0.957782,-0.58773 -0.11199,-0.15806 -0.182748,-0.32644 -0.221222,-0.52515 l -0.01513,-0.0787 v -2.04833 c 0,-1.64189 0.0021,-2.05993 0.0089,-2.10638 0.01237,-0.082 0.04051,-0.18966 0.06731,-0.25998 0.01305,-0.0329 0.02337,-0.0625 0.02337,-0.0658 0,-0.003 -0.0076,-0.008 -0.01649,-0.0103 -0.0089,-0.002 -0.02337,-0.0103 -0.03162,-0.0187 l -0.01443,-0.0142 0.01719,-0.0471 c 0.06665,-0.1787 0.275496,-0.41094 0.511158,-0.56772 0.179322,-0.11934 0.368952,-0.1987 0.561328,-0.23548 0.07764,-0.0148 0.100333,-0.0162 0.367601,-0.0187 0.07832,-9.4e-4 0.153053,-9.4e-4 0.210165,-9.4e-4 z"
+           id="path6-2-9-6-7-7"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#3a3a3a;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 4.0120111,288.21703 c 0.0071,1.90972 -0.0062,4.82211 0.00362,6.23889 l 0.020153,0.0191 c 0.017169,0.0157 0.025747,0.0186 0.053227,0.0186 0.047406,0 0.1034135,0.0315 0.1240234,0.0708 0.013031,0.024 0.015502,0.0391 0.015502,0.092 0,0.0349 0.0028,0.063 0.0062,0.063 0.00343,0 0.035937,-0.008 0.072347,-0.0191 0.2610831,-0.0755 0.473397,-0.28933 0.548287,-0.5519 l 0.022738,-0.0775 0.00206,-0.50126 0.00206,-0.50178 h 0.053743 c 0.04397,0 0.05672,-0.002 0.07183,-0.0134 l 0.018087,-0.0129 v -0.43822 -0.4377 l -0.018087,-0.0129 c -0.01511,-0.0105 -0.02786,-0.0139 -0.07183,-0.0139 h -0.05426 v -0.86093 -0.86144 h 0.056844 c 0.04809,0 0.059461,-0.002 0.07183,-0.0129 l 0.015502,-0.0134 v -0.43718 c 0,-0.40834 -7.144e-4,-0.43803 -0.012401,-0.44804 -0.00824,-0.007 -0.02906,-0.0104 -0.07028,-0.0124 l -0.058394,-0.002 -0.00414,-0.30024 c -0.00344,-0.24777 -0.00609,-0.3077 -0.014986,-0.3452 -0.04191,-0.16451 -0.1135187,-0.28643 -0.2351278,-0.39997 -0.093432,-0.0877 -0.202741,-0.15146 -0.3250367,-0.19016 -0.083235,-0.0261 -0.1601383,-0.0338 -0.2935221,-0.0382 z"
+           id="path6-2-9-6-7-0-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscsscccccscccccscccsccscccccccc" />
+      </g>
+      <circle
+         r="0.52860862"
+         cy="289.81152"
+         cx="2.9751794"
+         id="path4913-5"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10583334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.40539873"
+         cy="289.81152"
+         cx="2.9751794"
+         id="path4913-7-4"
+         style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.08116535;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="291.17242"
+         cx="2.9824786"
+         id="path4932-8"
+         style="opacity:1;vector-effect:none;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="292.16913"
+         cx="2.9824786"
+         id="path4932-5-1"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="291.668"
+         cx="3.5057743"
+         id="path4932-5-4-2"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="291.668"
+         cx="2.453645"
+         id="path4932-5-4-8-8"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <rect
+         y="292.72568"
+         x="3.1402979"
+         height="0.40977666"
+         width="0.40977666"
+         id="rect4981-9"
+         style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.11866162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <rect
+         y="288.72342"
+         x="3.4670115"
+         height="0.11767235"
+         width="0.36270773"
+         id="rect4985-3"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10989299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.15931769"
+         cy="292.93057"
+         cx="3.3451862"
+         id="path5346-6"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10265833;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <rect
+         y="288.72342"
+         x="4.1077991"
+         height="0.11767235"
+         width="0.36270773"
+         id="rect4985-6-8"
+         style="opacity:1;vector-effect:none;fill:#8e8e8e;fill-opacity:1;stroke:none;stroke-width:0.10989299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
       <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" />
+         inkscape:transform-center-y="-0.036071626"
+         d="m 2.9824786,291.04147 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.072143152"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="291.18576"
+         sodipodi:cx="2.9824786"
+         sodipodi:sides="3"
+         id="path5401-0"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
+      <path
+         transform="scale(1,-1)"
+         inkscape:transform-center-y="0.03607122"
+         d="m 2.9824786,-292.29272 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.07214316"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="-292.14844"
+         sodipodi:cx="2.9824786"
+         sodipodi:sides="3"
+         id="path5401-2-2"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="-0.036068174"
+         transform="rotate(90,2.6492247,291.98912)"
+         inkscape:transform-center-y="-3.4871622e-06"
+         d="m 2.3320532,291.00348 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.07214316"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="291.14777"
+         sodipodi:cx="2.3320532"
+         sodipodi:sides="3"
+         id="path5401-8-1"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="0.036067872"
+         transform="matrix(0,1,1,0,294.58281,289.3399)"
+         d="m 2.3320532,-292.25473 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.07214316"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="-292.11044"
+         sodipodi:cx="2.3320532"
+         sodipodi:sides="3"
+         id="path5401-2-4-0"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/joycon_pair_nintendo.svg b/resources/graphics/controllers/joycon_pair_nintendo.svg
index b6b01c15a..37aec1f15 100644
--- a/resources/graphics/controllers/joycon_pair_nintendo.svg
+++ b/resources/graphics/controllers/joycon_pair_nintendo.svg
@@ -15,7 +15,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="joycon_pair_nintendo.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="22.627417"
+     inkscape:cx="6.9090935"
+     inkscape:cy="21.394356"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -55,15 +55,258 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5555"
+       transform="translate(-0.02566855,-1.3888992e-6)">
+      <g
+         transform="translate(-3.7897826)"
+         id="g5517">
+        <path
+           style="fill:#5cc8e4;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 11.490269,288.142 c -0.05711,3.7e-4 -0.0966,9.4e-4 -0.104504,0.003 -0.03504,0.006 -0.04397,0.0161 -0.03916,0.0432 l 0.0034,0.0207 -0.259024,0.003 c -0.283756,0.003 -0.330474,0.008 -0.443152,0.0433 -0.122296,0.0387 -0.231534,0.10257 -0.324974,0.19031 -0.121609,0.11354 -0.193036,0.23546 -0.234946,0.39997 -0.0089,0.0375 -0.01169,0.0974 -0.01513,0.34517 l -0.0041,0.30001 -0.05841,0.002 c -0.04122,0.002 -0.06183,0.005 -0.07007,0.0122 -0.01168,0.01 -0.01236,0.0394 -0.01236,0.44774 v 0.4374 l 0.01513,0.0135 c 0.01237,0.011 0.02404,0.013 0.07213,0.013 h 0.057 v 0.86126 0.86124 h -0.05429 c -0.04397,0 -0.05702,0.003 -0.07213,0.0135 l -0.01785,0.0129 v 0.43806 0.43806 l 0.01785,0.0129 c 0.01511,0.011 0.02816,0.0135 0.07213,0.0135 h 0.05363 l 0.0021,0.50192 0.0021,0.50131 0.02267,0.0774 c 0.07489,0.26257 0.287176,0.4761 0.548259,0.55158 0.03641,0.011 0.0687,0.0193 0.07213,0.0193 0.0034,0 0.0062,-0.0283 0.0062,-0.0632 0,-0.0529 0.0028,-0.0677 0.01583,-0.0917 0.02061,-0.0393 0.07625,-0.071 0.123656,-0.071 0.02748,0 0.03641,-0.003 0.05358,-0.0187 l 0.01991,-0.0187 v 0.14447 0.14518 l 0.493317,-0.003 c 0.467201,-0.003 0.496745,-0.003 0.569574,-0.0162 0.40674,-0.0723 0.737236,-0.27548 0.957782,-0.58773 0.11199,-0.15806 0.182748,-0.32644 0.221222,-0.52515 l 0.01513,-0.0787 v -2.04833 c 0,-1.64189 -0.0021,-2.05993 -0.0089,-2.10638 -0.01237,-0.082 -0.04051,-0.18966 -0.06731,-0.25998 -0.01305,-0.0329 -0.02337,-0.0625 -0.02337,-0.0658 0,-0.003 0.0076,-0.008 0.01649,-0.0103 0.0089,-0.002 0.02337,-0.0103 0.03162,-0.0187 l 0.01443,-0.0142 -0.01719,-0.0471 c -0.06665,-0.1787 -0.275496,-0.41094 -0.511158,-0.56772 -0.179322,-0.11934 -0.368952,-0.1987 -0.561328,-0.23548 -0.07764,-0.0148 -0.100333,-0.0162 -0.367601,-0.0187 -0.07832,-9.4e-4 -0.153053,-9.4e-4 -0.210165,-9.4e-4 z"
+           id="path6-2-9-6-7-2"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#3a3a3a;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 10.941609,288.21703 c -0.0071,1.90972 0.0062,4.82211 -0.0036,6.23889 l -0.02015,0.0191 c -0.01717,0.0157 -0.02575,0.0186 -0.05323,0.0186 -0.04741,0 -0.103414,0.0315 -0.124023,0.0708 -0.01303,0.024 -0.0155,0.0391 -0.0155,0.092 0,0.0349 -0.0028,0.063 -0.0062,0.063 -0.0034,0 -0.03594,-0.008 -0.07235,-0.0191 -0.261084,-0.0755 -0.473397,-0.28933 -0.548287,-0.5519 l -0.02274,-0.0775 -0.0021,-0.50126 -0.0021,-0.50178 h -0.05374 c -0.043971,0 -0.056721,-0.002 -0.071831,-0.0134 l -0.018087,-0.0129 v -0.43822 -0.4377 l 0.018087,-0.0129 c 0.01511,-0.0105 0.02786,-0.0139 0.071831,-0.0139 h 0.05426 v -0.86093 -0.86144 h -0.05684 c -0.048091,0 -0.059461,-0.002 -0.07183,-0.0129 l -0.015502,-0.0134 v -0.43718 c 0,-0.40834 7.144e-4,-0.43803 0.012401,-0.44804 0.00824,-0.007 0.02906,-0.0104 0.070281,-0.0124 l 0.05839,-0.002 0.0041,-0.30024 c 0.0034,-0.24777 0.0061,-0.3077 0.01499,-0.3452 0.04191,-0.16451 0.113518,-0.28643 0.235127,-0.39997 0.09343,-0.0877 0.202741,-0.15146 0.325037,-0.19016 0.08324,-0.0261 0.160138,-0.0338 0.293522,-0.0382 z"
+           id="path6-2-9-6-7-0-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscsscccccscccccscccsccscccccccc" />
+      </g>
+      <circle
+         r="0.52860862"
+         cy="291.67377"
+         cx="8.1410007"
+         id="path4913-2"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10583334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.40539873"
+         cy="291.67377"
+         cx="8.1410007"
+         id="path4913-7-8"
+         style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.08116535;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="289.31393"
+         cx="8.1341553"
+         id="path4932-9"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="290.31146"
+         cx="8.1341553"
+         id="path4932-9-3"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="289.80917"
+         cx="8.6618767"
+         id="path4932-9-3-6"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="289.80917"
+         cx="7.6138792"
+         id="path4932-9-3-6-8"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.27285156"
+         cy="292.93457"
+         cx="7.7668409"
+         id="path5072"
+         style="opacity:1;vector-effect:none;fill:#7a7a7a;fill-opacity:1;stroke:none;stroke-width:0.10746154;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.20463867"
+         cy="292.93457"
+         cx="7.7668409"
+         id="path5072-0"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.08059616;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <g
+         id="g5361">
+        <rect
+           style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091"
+           width="0.11885579"
+           height="0.36896971"
+           x="7.4061403"
+           y="288.6051" />
+        <rect
+           style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-2"
+           width="0.1188558"
+           height="0.36896974"
+           x="-288.84903"
+           y="7.2810831"
+           transform="rotate(-90)" />
+      </g>
+      <g
+         style="fill:#8e8e8e;fill-opacity:1"
+         transform="translate(-0.69453125)"
+         id="g5361-2">
+        <rect
+           style="opacity:1;vector-effect:none;fill:#8e8e8e;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-5"
+           width="0.11885579"
+           height="0.36896971"
+           x="7.4061403"
+           y="288.6051" />
+        <rect
+           style="opacity:1;vector-effect:none;fill:#8e8e8e;fill-opacity:1;stroke:none;stroke-width:0.10772337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="rect5091-2-8"
+           width="0.1188558"
+           height="0.36896974"
+           x="-288.84903"
+           y="7.2810831"
+           transform="rotate(-90)" />
+      </g>
+    </g>
+    <g
+       id="g5536"
+       transform="translate(-0.02566855,-1.3888992e-6)">
+      <g
+         id="g5474">
+        <path
+           style="fill:#ef675b;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 3.4633507,288.142 c 0.05711,3.7e-4 0.0966,9.4e-4 0.104504,0.003 0.03504,0.006 0.04397,0.0161 0.03916,0.0432 l -0.0034,0.0207 0.259024,0.003 c 0.283756,0.003 0.330474,0.008 0.443152,0.0433 0.122296,0.0387 0.231534,0.10257 0.324974,0.19031 0.121609,0.11354 0.193036,0.23546 0.234946,0.39997 0.0089,0.0375 0.01169,0.0974 0.01513,0.34517 l 0.0041,0.30001 0.05841,0.002 c 0.04122,0.002 0.06183,0.005 0.07007,0.0122 0.01168,0.01 0.01236,0.0394 0.01236,0.44774 v 0.4374 l -0.01513,0.0135 c -0.01237,0.011 -0.02404,0.013 -0.07213,0.013 h -0.057 v 0.86126 0.86124 h 0.05429 c 0.04397,0 0.05702,0.003 0.07213,0.0135 l 0.01785,0.0129 v 0.43806 0.43806 l -0.01785,0.0129 c -0.01511,0.011 -0.02816,0.0135 -0.07213,0.0135 h -0.05363 l -0.0021,0.50192 -0.0021,0.50131 -0.02267,0.0774 c -0.07489,0.26257 -0.287176,0.4761 -0.548259,0.55158 -0.03641,0.011 -0.0687,0.0193 -0.07213,0.0193 -0.0034,0 -0.0062,-0.0283 -0.0062,-0.0632 0,-0.0529 -0.0028,-0.0677 -0.01583,-0.0917 -0.02061,-0.0393 -0.07625,-0.071 -0.123656,-0.071 -0.02748,0 -0.03641,-0.003 -0.05358,-0.0187 l -0.01991,-0.0187 v 0.14447 0.14518 l -0.493317,-0.003 c -0.467201,-0.003 -0.496745,-0.003 -0.569574,-0.0162 -0.40674,-0.0723 -0.737236,-0.27548 -0.957782,-0.58773 -0.11199,-0.15806 -0.182748,-0.32644 -0.221222,-0.52515 l -0.01513,-0.0787 v -2.04833 c 0,-1.64189 0.0021,-2.05993 0.0089,-2.10638 0.01237,-0.082 0.04051,-0.18966 0.06731,-0.25998 0.01305,-0.0329 0.02337,-0.0625 0.02337,-0.0658 0,-0.003 -0.0076,-0.008 -0.01649,-0.0103 -0.0089,-0.002 -0.02337,-0.0103 -0.03162,-0.0187 l -0.01443,-0.0142 0.01719,-0.0471 c 0.06665,-0.1787 0.275496,-0.41094 0.511158,-0.56772 0.179322,-0.11934 0.368952,-0.1987 0.561328,-0.23548 0.07764,-0.0148 0.100333,-0.0162 0.367601,-0.0187 0.07832,-9.4e-4 0.153053,-9.4e-4 0.210165,-9.4e-4 z"
+           id="path6-2-9-6-7"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#3a3a3a;fill-opacity:1;stroke:#3a3a3a;stroke-width:0.10255391;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 4.0120111,288.21703 c 0.0071,1.90972 -0.0062,4.82211 0.00362,6.23889 l 0.020153,0.0191 c 0.017169,0.0157 0.025747,0.0186 0.053227,0.0186 0.047406,0 0.1034135,0.0315 0.1240234,0.0708 0.013031,0.024 0.015502,0.0391 0.015502,0.092 0,0.0349 0.0028,0.063 0.0062,0.063 0.00343,0 0.035937,-0.008 0.072347,-0.0191 0.2610831,-0.0755 0.473397,-0.28933 0.548287,-0.5519 l 0.022738,-0.0775 0.00206,-0.50126 0.00206,-0.50178 h 0.053743 c 0.04397,0 0.05672,-0.002 0.07183,-0.0134 l 0.018087,-0.0129 v -0.43822 -0.4377 l -0.018087,-0.0129 c -0.01511,-0.0105 -0.02786,-0.0139 -0.07183,-0.0139 h -0.05426 v -0.86093 -0.86144 h 0.056844 c 0.04809,0 0.059461,-0.002 0.07183,-0.0129 l 0.015502,-0.0134 v -0.43718 c 0,-0.40834 -7.144e-4,-0.43803 -0.012401,-0.44804 -0.00824,-0.007 -0.02906,-0.0104 -0.07028,-0.0124 l -0.058394,-0.002 -0.00414,-0.30024 c -0.00344,-0.24777 -0.00609,-0.3077 -0.014986,-0.3452 -0.04191,-0.16451 -0.1135187,-0.28643 -0.2351278,-0.39997 -0.093432,-0.0877 -0.202741,-0.15146 -0.3250367,-0.19016 -0.083235,-0.0261 -0.1601383,-0.0338 -0.2935221,-0.0382 z"
+           id="path6-2-9-6-7-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccscsscccccscccccscccsccscccccccc" />
+      </g>
+      <circle
+         r="0.52860862"
+         cy="289.81152"
+         cx="2.9751794"
+         id="path4913"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10583334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.40539873"
+         cy="289.81152"
+         cx="2.9751794"
+         id="path4913-7"
+         style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.08116535;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="291.17242"
+         cx="2.9824786"
+         id="path4932"
+         style="opacity:1;vector-effect:none;fill:#404040;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="292.16913"
+         cx="2.9824786"
+         id="path4932-5"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="291.668"
+         cx="3.5057743"
+         id="path4932-5-4"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.24365099"
+         cy="291.668"
+         cx="2.453645"
+         id="path4932-5-4-8"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10829458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <rect
+         y="292.72568"
+         x="3.1402979"
+         height="0.40977666"
+         width="0.40977666"
+         id="rect4981"
+         style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.11866162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <rect
+         y="288.72342"
+         x="3.4670115"
+         height="0.11767235"
+         width="0.36270773"
+         id="rect4985"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10989299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <circle
+         r="0.15931769"
+         cy="292.93057"
+         cx="3.3451862"
+         id="path5346"
+         style="opacity:1;vector-effect:none;fill:#3a3a3a;fill-opacity:1;stroke:none;stroke-width:0.10265833;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <rect
+         y="288.72342"
+         x="4.1077991"
+         height="0.11767235"
+         width="0.36270773"
+         id="rect4985-6"
+         style="opacity:1;vector-effect:none;fill:#8e8e8e;fill-opacity:1;stroke:none;stroke-width:0.10989299;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
       <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" />
+         inkscape:transform-center-y="-0.036071626"
+         d="m 2.9824786,291.04147 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.072143152"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="291.18576"
+         sodipodi:cx="2.9824786"
+         sodipodi:sides="3"
+         id="path5401"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
+      <path
+         transform="scale(1,-1)"
+         inkscape:transform-center-y="0.03607122"
+         d="m 2.9824786,-292.29272 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.07214316"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="-292.14844"
+         sodipodi:cx="2.9824786"
+         sodipodi:sides="3"
+         id="path5401-2"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="-0.036068174"
+         transform="rotate(90,2.6492247,291.98912)"
+         inkscape:transform-center-y="-3.4871622e-06"
+         d="m 2.3320532,291.00348 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.07214316"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="291.14777"
+         sodipodi:cx="2.3320532"
+         sodipodi:sides="3"
+         id="path5401-8"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
+      <path
+         inkscape:transform-center-x="0.036067872"
+         transform="matrix(0,1,1,0,294.58281,289.3399)"
+         d="m 2.3320532,-292.25473 0.1249556,0.21643 -0.2499112,0 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="-0.52359878"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.07214316"
+         sodipodi:r1="0.1442863"
+         sodipodi:cy="-292.11044"
+         sodipodi:cx="2.3320532"
+         sodipodi:sides="3"
+         id="path5401-2-4"
+         style="opacity:1;vector-effect:none;fill:#282828;fill-opacity:1;stroke:none;stroke-width:0.08117354;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+         sodipodi:type="star" />
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/mouse_amiga.svg b/resources/graphics/controllers/mouse_amiga.svg
index b6b01c15a..696cbd88d 100644
--- a/resources/graphics/controllers/mouse_amiga.svg
+++ b/resources/graphics/controllers/mouse_amiga.svg
@@ -15,7 +15,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="mouse_amiga.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="16.892814"
+     inkscape:cx="-25.122961"
+     inkscape:cy="12.292821"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -36,7 +36,9 @@
      inkscape:window-height="2065"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-global="false" />
   <metadata
      id="metadata4922">
     <rdf:RDF>
@@ -55,15 +57,54 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5117">
       <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" />
+         inkscape:connector-curvature="0"
+         id="rect4891"
+         d="m 5.4289836,285.88748 h 0.2545328 v 2.06353 H 5.4289836 Z"
+         style="opacity:1;vector-effect:none;fill:#60605d;fill-opacity:1;stroke:none;stroke-width:0.04231874;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <polygon
+         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 " />
+      <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"
+         id="XMLID_695_"
+         d="m 3.5924685,287.9657 h 3.9275632 c 0.2158001,0 0.3884402,0.17264 0.3884402,0.38844 v 6.86246 c 0,0.21579 -0.1726401,0.38842 -0.3884402,0.38842 H 3.5924685 c -0.2158001,0 -0.3884403,-0.17263 -0.3884403,-0.38842 v -6.86246 c 0,-0.2158 0.1726402,-0.38844 0.3884403,-0.38844 z" />
+      <path
+         style="fill:#d6d6d6;fill-opacity:1;stroke-width:0.05395004"
+         inkscape:connector-curvature="0"
+         id="XMLID_693_"
+         d="M 4.1967089,289.36841 H 6.915791 c 0.070136,0 0.1294803,0.0594 0.1294803,0.12948 v 3.79809 c 0,0.0702 -0.059345,0.12946 -0.1294803,0.12946 H 4.1967089 c -0.070136,0 -0.1294802,-0.0594 -0.1294802,-0.12946 v -3.79809 c 0,-0.0755 0.059345,-0.12948 0.1294802,-0.12948 z" />
+      <g
+         transform="translate(-0.0215808)"
+         id="g4938">
+        <path
+           style="fill:#60605d;stroke-width:0.05395004"
+           inkscape:connector-curvature="0"
+           id="XMLID_691_"
+           d="m 4.2182898,288.6185 h 0.8632006 c 0.070135,0 0.1294802,0.0594 0.1294802,0.12947 v 1.72641 c 0,0.0701 -0.059345,0.12947 -0.1294802,0.12947 H 4.2182898 c -0.070135,0 -0.1294801,-0.0594 -0.1294801,-0.12947 v -1.72641 c 0,-0.0701 0.059345,-0.12947 0.1294801,-0.12947 z" />
+        <path
+           style="fill:#60605d;stroke-width:0.05395004"
+           inkscape:connector-curvature="0"
+           id="XMLID_686_"
+           d="m 6.0741712,288.6185 h 0.8632007 c 0.070135,0 0.12948,0.0594 0.12948,0.12947 v 1.72641 c 0,0.0701 -0.059345,0.12947 -0.12948,0.12947 H 6.0741712 c -0.070135,0 -0.1294801,-0.0594 -0.1294801,-0.12947 v -1.72641 c 0,-0.0701 0.059345,-0.12947 0.1294801,-0.12947 z" />
+        <g
+           id="g4931">
+          <path
+             d="m 4.2182898,288.5052 h 0.8632006 c 0.070135,0 0.1294802,0.0594 0.1294802,0.12948 v 1.7264 c 0,0.0701 -0.059345,0.12947 -0.1294802,0.12947 H 4.2182898 c -0.070135,0 -0.1294801,-0.0594 -0.1294801,-0.12947 v -1.7264 c 0,-0.0755 0.059345,-0.12948 0.1294801,-0.12948 z"
+             id="XMLID_689_"
+             inkscape:connector-curvature="0"
+             style="fill:#7d7c77;fill-opacity:1;stroke-width:0.05395004" />
+          <path
+             d="m 6.0741712,288.5052 h 0.8632007 c 0.070135,0 0.12948,0.0594 0.12948,0.12948 v 1.7264 c 0,0.0701 -0.059345,0.12947 -0.12948,0.12947 H 6.0741712 c -0.070135,0 -0.1294801,-0.0594 -0.1294801,-0.12947 v -1.7264 c 0,-0.0755 0.059345,-0.12948 0.1294801,-0.12948 z"
+             id="XMLID_684_"
+             inkscape:connector-curvature="0"
+             style="fill:#7d7c77;fill-opacity:1;stroke-width:0.05395004" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/wii_remote_nintendo.svg b/resources/graphics/controllers/wii_remote_nintendo.svg
index b6b01c15a..c8a5055c7 100644
--- a/resources/graphics/controllers/wii_remote_nintendo.svg
+++ b/resources/graphics/controllers/wii_remote_nintendo.svg
@@ -15,7 +15,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="wii_remote_nintendo.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="22.627417"
+     inkscape:cx="-16.659924"
+     inkscape:cy="14.555913"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -55,15 +55,280 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5266">
       <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" />
+         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" />
+      <g
+         transform="matrix(0.03430772,0,0,0.03430772,13.275487,277.84072)"
+         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>
+      <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" />
+      <path
+         style="fill:#bdbebf;stroke-width:0.03430772"
+         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" />
+      <circle
+         style="fill:#e7e8e9;stroke-width:0.03430772"
+         id="circle68"
+         r="0.22986172"
+         cy="287.16898"
+         cx="4.8426495" />
+      <path
+         style="fill:#bf1e2e;stroke-width:0.03430772"
+         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" />
+      <rect
+         style="fill:#e7e8e9;stroke-width:0.03430772"
+         id="rect72"
+         height="0.20241556"
+         width="0.075476989"
+         y="287.02832"
+         x="4.8049111" />
+      <rect
+         style="fill:#bf1e2e;stroke-width:0.03430772"
+         id="rect74"
+         height="0.16810784"
+         width="0.034307718"
+         y="287.04205"
+         x="4.8254952" />
+      <path
+         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         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" />
+      <path
+         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         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" />
+      <path
+         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         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" />
+      <path
+         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         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" />
+      <path
+         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         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" />
+      <path
+         style="fill:#b0b2b4;stroke-width:0.03430772;fill-opacity:1"
+         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" />
+      <rect
+         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         id="rect126"
+         height="0.33278489"
+         width="0.068615437"
+         y="295.66016"
+         x="5.9233427" />
+      <rect
+         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         id="rect128"
+         height="0.072046205"
+         width="0.068615437"
+         y="295.52979"
+         x="5.9233427" />
+      <rect
+         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         id="rect130"
+         height="0.33278489"
+         width="0.068615437"
+         y="295.66016"
+         x="5.7552347" />
+      <rect
+         style="fill:#7a7b7e;stroke-width:0.03430772;fill-opacity:1"
+         id="rect132"
+         height="0.072046205"
+         width="0.068615437"
+         y="295.52979"
+         x="5.7552347" />
+      <polygon
+         transform="matrix(0.03430772,0,0,0.03430772,13.206872,277.84072)"
+         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" />
     </g>
   </g>
 </svg>
diff --git a/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg b/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
index b6b01c15a..d9699c383 100644
--- a/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
+++ b/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
@@ -15,7 +15,7 @@
    version="1.1"
    id="svg4925"
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="unknown.svg">
+   sodipodi:docname="wii_remote_nunchuck_nintendo.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="32"
+     inkscape:cx="3.7670704"
+     inkscape:cy="20.243876"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -36,7 +36,8 @@
      inkscape:window-height="2065"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true" />
   <metadata
      id="metadata4922">
     <rdf:RDF>
@@ -55,15 +56,313 @@
      id="layer1"
      transform="translate(0,-285.88748)">
     <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="g5629"
+       transform="matrix(0.97763205,0,0,0.97763205,0.12423766,6.4933408)">
       <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="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"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.10556875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <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 "
+         style="fill:#b0b2b4;fill-opacity:1" />
+      <circle
+         style="fill:#efefef;fill-opacity:1;stroke-width:0.03424572"
+         cx="3.4272597"
+         cy="290.66302"
+         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>