From c4a7380d402beea0cc1c7d3442b2c32f27e540f9 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Wed, 27 Oct 2021 19:10:48 +0200
Subject: [PATCH] Added a few more controller types and icons.

Also fixed an incorrect name for one controller and made some other name changes.
---
 es-core/src/components/BadgeComponent.cpp     |  55 +-
 .../controllers/flight_stick_generic.svg      |  69 +++
 .../controllers/joystick_arcade_1_button.svg  | 271 +++++++++
 .../controllers/joystick_arcade_5_buttons.svg | 515 ++++++++++++++++++
 .../joystick_arcade_no_buttons.svg            | 215 ++++++++
 ...ric.svg => keyboard_and_mouse_generic.svg} |   0
 .../graphics/controllers/lightgun_generic.svg |  10 +-
 .../graphics/controllers/spinner_generic.svg  |  69 +++
 ...vg => wii_remote_and_nunchuk_nintendo.svg} |   0
 9 files changed, 1174 insertions(+), 30 deletions(-)
 create mode 100644 resources/graphics/controllers/flight_stick_generic.svg
 create mode 100644 resources/graphics/controllers/joystick_arcade_1_button.svg
 create mode 100644 resources/graphics/controllers/joystick_arcade_5_buttons.svg
 create mode 100644 resources/graphics/controllers/joystick_arcade_no_buttons.svg
 rename resources/graphics/controllers/{keyboard_mouse_generic.svg => keyboard_and_mouse_generic.svg} (100%)
 create mode 100644 resources/graphics/controllers/spinner_generic.svg
 rename resources/graphics/controllers/{wii_remote_nunchuck_nintendo.svg => wii_remote_and_nunchuk_nintendo.svg} (100%)

diff --git a/es-core/src/components/BadgeComponent.cpp b/es-core/src/components/BadgeComponent.cpp
index abe74f0d7..ac93c37cb 100644
--- a/es-core/src/components/BadgeComponent.cpp
+++ b/es-core/src/components/BadgeComponent.cpp
@@ -26,31 +26,36 @@ std::vector<GameControllers> BadgeComponent::sGameControllers;
 
 // The "unknown" controller entry has to be placed last.
 GameControllers sControllerDefinitions [] = {
-    // shortName                      displayName                           fileName
-    {"gamepad_generic",               "Gamepad (Generic)",                  ":/graphics/controllers/gamepad_generic.svg"},
-    {"gamepad_xbox",                  "Gamepad (Xbox)",                     ":/graphics/controllers/gamepad_xbox.svg"},
-    {"gamepad_playstation",           "Gamepad (PlayStation)",              ":/graphics/controllers/gamepad_playstation.svg"},
-    {"gamepad_nintendo_nes",          "Gamepad (Nintendo NES)",             ":/graphics/controllers/gamepad_nintendo_nes.svg"},
-    {"gamepad_nintendo_snes",         "Gamepad (Nintendo SNES)",            ":/graphics/controllers/gamepad_nintendo_snes.svg"},
-    {"gamepad_nintendo_64",           "Gamepad (Nintendo 64)",              ":/graphics/controllers/gamepad_nintendo_64.svg"},
-    {"joystick_generic",              "Joystick (Generic)",                 ":/graphics/controllers/joystick_generic.svg"},
-    {"joystick_arcade_2_buttons",     "Joystick (Arcade 2 Buttons)",        ":/graphics/controllers/joystick_arcade_2_buttons.svg"},
-    {"joystick_arcade_3_buttons",     "Joystick (Arcade 3 Buttons)",        ":/graphics/controllers/joystick_arcade_3_buttons.svg"},
-    {"joystick_arcade_4_buttons",     "Joystick (Arcade 4 Buttons)",        ":/graphics/controllers/joystick_arcade_4_buttons.svg"},
-    {"joystick_arcade_6_buttons",     "Joystick (Arcade 6 Buttons)",        ":/graphics/controllers/joystick_arcade_6_buttons.svg"},
-    {"trackball_generic",             "Trackball (Generic)",                ":/graphics/controllers/trackball_generic.svg"},
-    {"lightgun_generic",              "Lightgun (Generic)",                 ":/graphics/controllers/lightgun_generic.svg"},
-    {"lightgun_nintendo",             "Lightgun (Nintendo)",                ":/graphics/controllers/lightgun_nintendo.svg"},
-    {"keyboard_generic",              "Keyboard (Generic)",                 ":/graphics/controllers/keyboard_generic.svg"},
-    {"mouse_generic",                 "Mouse (Generic)",                    ":/graphics/controllers/mouse_generic.svg"},
-    {"mouse_amiga",                   "Mouse (Amiga)",                      ":/graphics/controllers/mouse_amiga.svg"},
-    {"keyboard_mouse_generic",        "Keyboard and Mouse (Generic)",       ":/graphics/controllers/keyboard_mouse_generic.svg"},
-    {"steering_wheel_generic",        "Steering Wheel (Generic)",           ":/graphics/controllers/steering_wheel_generic.svg"},
-    {"wii_remote_nintendo",           "Wii Remote (Nintendo)",              ":/graphics/controllers/wii_remote_nintendo.svg"},
-    {"wii_remote_nunchuck_nintendo",  "Wii Remote and Nunchuck (Nintendo)", ":/graphics/controllers/wii_remote_nunchuck_nintendo.svg"},
-    {"joycon_left_or_right_nintendo", "Joy-Con Left or Right (Nintendo)",   ":/graphics/controllers/joycon_left_or_right_nintendo.svg"},
-    {"joycon_pair_nintendo",          "Joy-Con Pair (Nintendo)",            ":/graphics/controllers/joycon_pair_nintendo.svg"},
-    {"unknown",                       "Unknown Controller",                 ":/graphics/controllers/unknown.svg"}
+    // shortName                        displayName                          fileName
+    {"gamepad_generic",                 "Gamepad (Generic)",                 ":/graphics/controllers/gamepad_generic.svg"},
+    {"gamepad_xbox",                    "Gamepad (Xbox)",                    ":/graphics/controllers/gamepad_xbox.svg"},
+    {"gamepad_playstation",             "Gamepad (PlayStation)",             ":/graphics/controllers/gamepad_playstation.svg"},
+    {"gamepad_nintendo_nes",            "Gamepad (Nintendo NES)",            ":/graphics/controllers/gamepad_nintendo_nes.svg"},
+    {"gamepad_nintendo_snes",           "Gamepad (Nintendo SNES)",           ":/graphics/controllers/gamepad_nintendo_snes.svg"},
+    {"gamepad_nintendo_64",             "Gamepad (Nintendo 64)",             ":/graphics/controllers/gamepad_nintendo_64.svg"},
+    {"joystick_generic",                "Joystick (Generic)",                ":/graphics/controllers/joystick_generic.svg"},
+    {"joystick_arcade_no_buttons",      "Joystick (Arcade no Buttons)",      ":/graphics/controllers/joystick_arcade_no_buttons.svg"},
+    {"joystick_arcade_1_button",        "Joystick (Arcade 1 Button)",        ":/graphics/controllers/joystick_arcade_1_button.svg"},
+    {"joystick_arcade_2_buttons",       "Joystick (Arcade 2 Buttons)",       ":/graphics/controllers/joystick_arcade_2_buttons.svg"},
+    {"joystick_arcade_3_buttons",       "Joystick (Arcade 3 Buttons)",       ":/graphics/controllers/joystick_arcade_3_buttons.svg"},
+    {"joystick_arcade_4_buttons",       "Joystick (Arcade 4 Buttons)",       ":/graphics/controllers/joystick_arcade_4_buttons.svg"},
+    {"joystick_arcade_5_buttons",       "Joystick (Arcade 5 Buttons)",       ":/graphics/controllers/joystick_arcade_5_buttons.svg"},
+    {"joystick_arcade_6_buttons",       "Joystick (Arcade 6 Buttons)",       ":/graphics/controllers/joystick_arcade_6_buttons.svg"},
+    {"flight_stick_generic",            "Flight Stick (Generic)",            ":/graphics/controllers/flight_stick_generic.svg"},
+    {"spinner_generic",                 "Spinner (Generic)",                 ":/graphics/controllers/spinner_generic.svg"},
+    {"trackball_generic",               "Trackball (Generic)",               ":/graphics/controllers/trackball_generic.svg"},
+    {"lightgun_generic",                "Lightgun (Generic)",                ":/graphics/controllers/lightgun_generic.svg"},
+    {"lightgun_nintendo",               "Lightgun (Nintendo)",               ":/graphics/controllers/lightgun_nintendo.svg"},
+    {"keyboard_generic",                "Keyboard (Generic)",                ":/graphics/controllers/keyboard_generic.svg"},
+    {"mouse_generic",                   "Mouse (Generic)",                   ":/graphics/controllers/mouse_generic.svg"},
+    {"mouse_amiga",                     "Mouse (Amiga)",                     ":/graphics/controllers/mouse_amiga.svg"},
+    {"keyboard_and_mouse_generic",      "Keyboard and Mouse (Generic)",      ":/graphics/controllers/keyboard_and_mouse_generic.svg"},
+    {"steering_wheel_generic",          "Steering Wheel (Generic)",          ":/graphics/controllers/steering_wheel_generic.svg"},
+    {"wii_remote_nintendo",             "Wii Remote (Nintendo)",             ":/graphics/controllers/wii_remote_nintendo.svg"},
+    {"wii_remote_and_nunchuk_nintendo", "Wii Remote and Nunchuk (Nintendo)", ":/graphics/controllers/wii_remote_and_nunchuk_nintendo.svg"},
+    {"joycon_left_or_right_nintendo",   "Joy-Con Left or Right (Nintendo)",  ":/graphics/controllers/joycon_left_or_right_nintendo.svg"},
+    {"joycon_pair_nintendo",            "Joy-Con Pair (Nintendo)",           ":/graphics/controllers/joycon_pair_nintendo.svg"},
+    {"unknown",                         "Unknown Controller",                ":/graphics/controllers/unknown.svg"}
 };
 
 // clang-format on
diff --git a/resources/graphics/controllers/flight_stick_generic.svg b/resources/graphics/controllers/flight_stick_generic.svg
new file mode 100644
index 000000000..2c32c71df
--- /dev/null
+++ b/resources/graphics/controllers/flight_stick_generic.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
+   version="1.1"
+   id="svg4925"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="unknown.svg">
+  <defs
+     id="defs4919" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.8620863"
+     inkscape:cx="-207.82219"
+     inkscape:cy="164.29106"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4922">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <g
+       aria-label="?"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="text4825"
+       transform="matrix(4.7799158,0,0,4.7799158,14.931273,-1129.9431)">
+      <path
+         d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
+         style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4827"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/graphics/controllers/joystick_arcade_1_button.svg b/resources/graphics/controllers/joystick_arcade_1_button.svg
new file mode 100644
index 000000000..8b6d63b38
--- /dev/null
+++ b/resources/graphics/controllers/joystick_arcade_1_button.svg
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
+   version="1.1"
+   id="svg4925"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="joystick_arcade_1_button.svg">
+  <defs
+     id="defs4919" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.6349024"
+     inkscape:cx="86.784948"
+     inkscape:cy="139.70124"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4922">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="56.947788"
+       height="33.415451"
+       x="5.3927727"
+       y="246.4256"
+       ry="3.286572"
+       rx="3.1865375" />
+    <g
+       id="g4928"
+       transform="matrix(0.99990441,0,0,1.0164462,0.00195324,-4.327527)">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
+      <path
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+    <g
+       transform="matrix(0.44781227,0,0,0.44052453,41.797439,158.01448)"
+       id="g4943-94-7">
+      <ellipse
+         ry="10.068469"
+         rx="10.235035"
+         transform="rotate(90)"
+         cy="-10.165825"
+         cx="238.62199"
+         id="path4799-0-2-6-5"
+         style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+      <g
+         style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+         id="g8-8-1-9-1-8-6-2-9-9">
+        <circle
+           cx="28.9"
+           cy="27.299999"
+           r="14.5"
+           id="circle6-1-0-9-9-5-1-4-2-2"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <g
+         style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+         id="g8-8-1-9-1-5-7-2-2">
+        <circle
+           cx="28.9"
+           cy="27.299999"
+           r="14.5"
+           id="circle6-1-0-9-9-54-7-4-8"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <g
+         style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+         transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+         id="g8-69-8-5-8-7-2-7-5-7-9">
+        <circle
+           cx="28.9"
+           cy="27.299999"
+           r="14.5"
+           id="circle6-2-9-0-1-8-5-6-4-7-7"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      </g>
+      <g
+         style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+         transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+         id="g8-69-8-5-8-7-5-8-5-3">
+        <circle
+           cx="28.9"
+           cy="27.299999"
+           r="14.5"
+           id="circle6-2-9-0-1-8-69-1-48-6"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/resources/graphics/controllers/joystick_arcade_5_buttons.svg b/resources/graphics/controllers/joystick_arcade_5_buttons.svg
new file mode 100644
index 000000000..fa851a34f
--- /dev/null
+++ b/resources/graphics/controllers/joystick_arcade_5_buttons.svg
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
+   version="1.1"
+   id="svg4925"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="joystick_arcade_5_buttons.svg">
+  <defs
+     id="defs4919" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.8377249"
+     inkscape:cx="114.28865"
+     inkscape:cy="99.052722"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4922">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="56.947788"
+       height="33.415451"
+       x="5.3927727"
+       y="246.4256"
+       ry="3.286572"
+       rx="3.1865375" />
+    <rect
+       style="opacity:0.47400004;vector-effect:none;fill:#7b7b7b;fill-opacity:1;stroke:#2a2a2a;stroke-width:0.11244792;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5720"
+       width="0.34024119"
+       height="0.1701206"
+       x="121.80635"
+       y="290.62045"
+       rx="3.3712945"
+       ry="0.1701206" />
+    <g
+       transform="matrix(0.88758869,0,0,0.90164635,0.54790817,25.880136)"
+       id="g4928">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
+      <path
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+    <g
+       id="g5074"
+       transform="translate(0,1.5547436)">
+      <g
+         id="g5577">
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,50.252964,172.25636)"
+           id="g4943-94-6-7">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,50.252963,162.50161)"
+           id="g4943-94-6-7-2">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4-2"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8-7"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5-7">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9-5"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7-4">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5-8"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8-2"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+      <g
+         transform="translate(0,-3.1094589)"
+         id="g5533">
+        <g
+           transform="matrix(0.40129561,0,0,0.39476489,31.340006,165.61108)"
+           id="g4943-94-6">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+        <g
+           transform="matrix(0.40129561,0,0,0.3947649,31.340004,175.36581)"
+           id="g4943-94-6-7-34">
+          <ellipse
+             ry="10.068469"
+             rx="10.235035"
+             transform="rotate(90)"
+             cy="-10.165825"
+             cx="238.62199"
+             id="path4799-0-2-6-5-4-03"
+             style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+          <g
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+             id="g8-8-1-9-1-8-6-2-9-6-1-9">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-5-1-4-2-3-8-1"
+               style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+             id="g8-8-1-9-1-5-7-2-94-5-96">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-1-0-9-9-54-7-4-8-9-9"
+               style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+             id="g8-69-8-5-8-7-2-7-5-7-1-7-3">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-5-6-4-7-2-5-3"
+               style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+          <g
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+             id="g8-69-8-5-8-7-5-8-5-9-3-8">
+            <circle
+               cx="28.9"
+               cy="27.299999"
+               r="14.5"
+               id="circle6-2-9-0-1-8-69-1-48-39-8-0"
+               style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
+      <g
+         id="g4943-94-6-7-28-1"
+         transform="matrix(0.40129561,0,0,0.3947649,40.796484,167.37898)">
+        <ellipse
+           style="opacity:1;vector-effect:none;fill:#f6dc00;fill-opacity:1;stroke:#5b550f;stroke-width:0.19470723;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+           id="path4799-0-2-6-5-4-4-7"
+           cx="238.62199"
+           cy="-10.165825"
+           transform="rotate(90)"
+           rx="10.235035"
+           ry="10.068469" />
+        <g
+           id="g8-8-1-9-1-8-6-2-9-6-1-7-2"
+           transform="matrix(-0.58094187,0,0,-0.5905526,26.955068,254.74411)"
+           style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#6d662a;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-5-1-4-2-3-8-2-7"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-8-1-9-1-5-7-2-94-5-4-2"
+           transform="matrix(-0.5286,0,0,-0.53734481,25.442385,253.29154)"
+           style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <circle
+             style="fill:#ffe92b;fill-opacity:1;stroke:none;stroke-width:1.2247448;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="circle6-1-0-9-9-54-7-4-8-9-0-2"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-2-7-5-7-1-7-6-6"
+           transform="matrix(-0.48421826,0,0,-0.49222886,24.159795,252.05984)"
+           style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f4db00;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-5-6-4-7-2-5-2-1"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+        <g
+           id="g8-69-8-5-8-7-5-8-5-9-3-9-0"
+           transform="matrix(-0.44852635,0,0,-0.45594649,23.128288,251.04388)"
+           style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1">
+          <circle
+             style="fill:#f1d700;fill-opacity:1;stroke:none;stroke-opacity:1"
+             id="circle6-2-9-0-1-8-69-1-48-39-8-9-6"
+             r="14.5"
+             cy="27.299999"
+             cx="28.9" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/resources/graphics/controllers/joystick_arcade_no_buttons.svg b/resources/graphics/controllers/joystick_arcade_no_buttons.svg
new file mode 100644
index 000000000..91ff9b318
--- /dev/null
+++ b/resources/graphics/controllers/joystick_arcade_no_buttons.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
+   version="1.1"
+   id="svg4925"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="joystick_arcade_no_buttons.svg">
+  <defs
+     id="defs4919" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.9254477"
+     inkscape:cx="296.85138"
+     inkscape:cy="194.43876"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4922">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <rect
+       style="opacity:1;vector-effect:none;fill:#373737;fill-opacity:1;stroke:#000000;stroke-width:0.2909528;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="rect5985-6-0"
+       width="47.970272"
+       height="47.970272"
+       x="9.8815308"
+       y="239.14818"
+       ry="4.2912331"
+       rx="4.2912331" />
+    <g
+       id="g4928"
+       transform="matrix(1.6286027,0,0,1.6555452,0.48106305,-172.49575)">
+      <ellipse
+         ry="10.483982"
+         rx="10.657423"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-3-0-2"
+         style="opacity:1;fill:#7b7b7b;fill-opacity:1;stroke:#080701;stroke-width:0.24870832;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="6.1186433"
+         rx="6.2198658"
+         cx="20.499538"
+         cy="263.1333"
+         id="circle34-2-3-39-9"
+         style="opacity:1;fill:#424242;fill-opacity:1;stroke-width:0.14515407" />
+      <g
+         transform="matrix(0.83301628,0,0,0.81945968,4.5251315,59.03631)"
+         id="g5882-1-9">
+        <g
+           id="g5815-9-6">
+          <g
+             id="g5786-6-0">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-9-2"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-3-7"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-3-6">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-8-1"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-0-3"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+        <g
+           id="g5815-6-5-2"
+           transform="rotate(45,19.238276,249.03729)">
+          <g
+             id="g5786-4-6-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-0-6-59"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-0-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+          <g
+             transform="rotate(90,19.176585,249.06284)"
+             id="g5786-9-4-0-1">
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.1078754"
+               inkscape:connector-curvature="0"
+               d="m 19.176687,237.11862 -1.677879,1.91267 h 0.81948 v 1.74035 h 1.7166 v -1.74022 h 0.81948 z"
+               id="path4-0-1-6-0-4"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="2.11451"
+               inkscape:transform-center-y="-0.31364665" />
+            <path
+               style="fill:#b7b7b9;fill-opacity:1;stroke-width:0.10787541"
+               inkscape:connector-curvature="0"
+               d="m 19.176489,261.00707 1.677879,-1.91267 h -0.81948 v -1.74035 h -1.7166 v 1.74022 h -0.819481 z"
+               id="path4-0-4-9-2-4-9"
+               sodipodi:nodetypes="cccccccc"
+               inkscape:transform-center-x="-2.11451"
+               inkscape:transform-center-y="0.31364335" />
+          </g>
+        </g>
+      </g>
+      <circle
+         id="ellipse8-1"
+         transform="rotate(-166.691)"
+         cy="-251.3472"
+         cx="-80.522942"
+         r="3.860163"
+         style="fill:#9e9e9b;stroke-width:0.13708451" />
+      <circle
+         transform="rotate(-90)"
+         id="circle10-0"
+         r="3.0756288"
+         cy="20.498316"
+         cx="-263.13339"
+         style="fill:#565656;stroke-width:0.13708451" />
+      <path
+         id="path12-7"
+         d="m 20.507225,259.29748 c -2.123437,0 -3.844811,1.72138 -3.844811,3.84482 0,2.12343 1.721374,3.84481 3.844811,3.84481 2.123441,0 3.84481,-1.72138 3.84481,-3.84481 0,-2.12344 -1.721369,-3.84482 -3.84481,-3.84482 z m -0.04741,7.48263 c -2.035291,0 -3.685245,-1.64995 -3.685245,-3.68525 0,-2.03529 1.649954,-3.68524 3.685245,-3.68524 2.035292,0 3.685242,1.64995 3.685242,3.68524 0,2.0353 -1.64995,3.68525 -3.685242,3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#c9c9c7;stroke-width:0.13708451" />
+      <path
+         id="path14-5"
+         d="m 20.507093,266.98697 c 2.123437,0 3.844806,-1.72124 3.844806,-3.84481 0,-2.12344 -1.721369,-3.84481 -3.844806,-3.84481 -2.123442,0 -3.844811,1.72137 -3.844811,3.84481 1.28e-4,2.12357 1.721506,3.84481 3.844811,3.84481 z m 0.04741,-7.48249 c 2.035292,0 3.685241,1.64995 3.685241,3.68525 0,2.03529 -1.649949,3.68524 -3.685241,3.68524 -2.035155,0 -3.685241,-1.64995 -3.685241,-3.68524 1.28e-4,-2.0353 1.650086,-3.68525 3.685241,-3.68525 z"
+         inkscape:connector-curvature="0"
+         style="fill:#9a9a9b;stroke-width:0.13708451" />
+      <ellipse
+         ry="5.0897107"
+         rx="5.1739116"
+         cx="20.06336"
+         cy="260.785"
+         id="circle34-2-3-1-4-8"
+         style="opacity:1;fill:#f4d400;fill-opacity:1;stroke:#080701;stroke-width:0.25320625;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         inkscape:transform-center-y="-2.1261916"
+         inkscape:transform-center-x="10.630944"
+         transform="matrix(0.6842207,0.729275,-0.6842207,0.729275,0,0)"
+         ry="0.88702333"
+         rx="0.65102625"
+         cy="164.61426"
+         cx="190.09605"
+         id="path4910-2-7"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.01910845;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84313725;paint-order:normal" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/graphics/controllers/keyboard_mouse_generic.svg b/resources/graphics/controllers/keyboard_and_mouse_generic.svg
similarity index 100%
rename from resources/graphics/controllers/keyboard_mouse_generic.svg
rename to resources/graphics/controllers/keyboard_and_mouse_generic.svg
diff --git a/resources/graphics/controllers/lightgun_generic.svg b/resources/graphics/controllers/lightgun_generic.svg
index b6b01c15a..bc679bf23 100644
--- a/resources/graphics/controllers/lightgun_generic.svg
+++ b/resources/graphics/controllers/lightgun_generic.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="lightgun_generic.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="23.890046"
+     inkscape:cx="-11.572306"
+     inkscape:cy="10.092918"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -58,7 +58,7 @@
        aria-label="?"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="text4825"
-       transform="matrix(0.91316098,0,0,0.91316098,1.9388092,25.308702)">
+       transform="matrix(0.91316098,0,0,0.91316098,5.0065967,25.308702)">
       <path
          d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
          style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
diff --git a/resources/graphics/controllers/spinner_generic.svg b/resources/graphics/controllers/spinner_generic.svg
new file mode 100644
index 000000000..2c32c71df
--- /dev/null
+++ b/resources/graphics/controllers/spinner_generic.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 67.733333 67.733333"
+   version="1.1"
+   id="svg4925"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="unknown.svg">
+  <defs
+     id="defs4919" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.8620863"
+     inkscape:cx="-207.82219"
+     inkscape:cy="164.29106"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4922">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <g
+       aria-label="?"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.72348785px;line-height:1.25;font-family:Digitalt;-inkscape-font-specification:Digitalt;letter-spacing:0px;word-spacing:0px;fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="text4825"
+       transform="matrix(4.7799158,0,0,4.7799158,14.931273,-1129.9431)">
+      <path
+         d="m 1.9437243,295.40006 q 0,-0.59882 0.013713,-1.25707 0.66739,-0.032 1.3530646,-0.032 0.6033936,0 1.5724804,0.032 0.073139,0 0.1279926,0.0548 0.054854,0.0549 0.054854,0.128 0.013713,0.74053 0.013713,1.40334 0,0.58968 -0.013713,1.24793 -0.4114048,0.0229 -0.9919426,0.0229 -0.8410942,0 -1.9336024,-0.0594 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.12799 -0.013713,-0.71768 -0.013713,-1.35764 z m -1.50391294,-9.11947 q 1.63190554,-0.39312 3.35523444,-0.39312 0.6811034,0 1.2205008,0.0777 0.5439685,0.0777 1.0147984,0.2697 0.475401,0.18741 0.7908113,0.48911 0.3154104,0.29713 0.4936858,0.76339 0.1828465,0.46625 0.1828465,1.07879 0,0.68567 -0.3016968,1.27078 -0.2971257,0.58511 -0.8182384,1.12908 -0.2422717,0.25142 -0.3656931,0.38855 -0.1234214,0.13713 -0.3199815,0.39769 -0.1919889,0.25599 -0.2925545,0.46169 -0.095994,0.2057 -0.1782754,0.50283 -0.07771,0.29255 -0.082281,0.60339 -0.5531109,0.0366 -1.3804916,0.0366 -0.8502365,0 -1.6913306,-0.0366 -0.07771,-0.005 -0.1325638,-0.0548 -0.050283,-0.0549 -0.050283,-0.128 0,-0.53025 0.1325638,-0.99651 0.1325637,-0.46626 0.3428373,-0.79538 0.2102735,-0.32913 0.4662587,-0.61254 0.2559852,-0.28798 0.5119704,-0.5074 0.2559851,-0.22398 0.4662587,-0.41597 0.2102735,-0.19199 0.3428373,-0.38855 0.1325637,-0.19656 0.1325637,-0.38398 0,-0.5394 -0.754242,-0.5394 -0.612536,0 -1.5084841,0.31541 -0.891377,0.31084 -1.16564687,0.5074 z"
+         style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-width:0.2605817;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4827"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg b/resources/graphics/controllers/wii_remote_and_nunchuk_nintendo.svg
similarity index 100%
rename from resources/graphics/controllers/wii_remote_nunchuck_nintendo.svg
rename to resources/graphics/controllers/wii_remote_and_nunchuk_nintendo.svg