diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index e1f295598..b810ae04a 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -759,6 +759,30 @@ void GuiMenu::openInputDeviceOptions()
 {
     auto s = new GuiSettings(mWindow, "INPUT DEVICE SETTINGS");
 
+    // Controller type.
+    auto input_controller_type = std::make_shared<OptionListComponent<std::string>>
+            (mWindow, getHelpStyle(), "CONTROLLER TYPE", false);
+    std::string selectedPlayer = Settings::getInstance()->getString("InputControllerType");
+    input_controller_type->add("XBOX", "xbox", selectedPlayer == "xbox");
+    input_controller_type->add("XBOX360", "xbox360", selectedPlayer == "xbox360");
+    input_controller_type->add("PLAYSTATION4", "ps4", selectedPlayer == "ps4");
+    input_controller_type->add("PLAYSTATION5", "ps5", selectedPlayer == "ps5");
+    input_controller_type->add("SNES", "snes", selectedPlayer == "snes");
+    // If there are no objects returned, then there must be a manually modified entry in the
+    // configuration file. Simply set the controller type to "xbox" in this case.
+    if (input_controller_type->getSelectedObjects().size() == 0)
+        input_controller_type->selectEntry(0);
+    s->addWithLabel("CONTROLLER TYPE", input_controller_type);
+    s->addSaveFunc([input_controller_type, s] {
+        if (input_controller_type->getSelected() !=
+                Settings::getInstance()->getString("InputControllerType")) {
+            Settings::getInstance()->setString("InputControllerType",
+                    input_controller_type->getSelected());
+            s->setNeedsReloadHelpPrompts();
+            s->setNeedsSaving();
+        }
+    });
+
     // Whether to only accept input from the first controller.
     auto input_only_first_controller = std::make_shared<SwitchComponent>(mWindow);
     input_only_first_controller->setState(Settings::getInstance()->
diff --git a/es-app/src/guis/GuiSettings.cpp b/es-app/src/guis/GuiSettings.cpp
index bb8b7a8d7..0ac329774 100644
--- a/es-app/src/guis/GuiSettings.cpp
+++ b/es-app/src/guis/GuiSettings.cpp
@@ -10,6 +10,7 @@
 
 #include "guis/GuiSettings.h"
 
+#include "components/HelpComponent.h"
 #include "guis/GuiTextEditPopup.h"
 #include "views/gamelist/IGameListView.h"
 #include "views/ViewController.h"
@@ -25,6 +26,7 @@ GuiSettings::GuiSettings(
         : GuiComponent(window),
         mMenu(window, title),
         mNeedsSaving(false),
+        mNeedsReloadHelpPrompts(false),
         mNeedsCollectionsUpdate(false),
         mNeedsSorting(false),
         mNeedsSortingCollections(false),
@@ -61,6 +63,9 @@ void GuiSettings::save()
     if (mNeedsSaving)
         Settings::getInstance()->saveFile();
 
+    if (mNeedsReloadHelpPrompts)
+        mWindow->reloadHelpPrompts();
+
     if (mNeedsCollectionsUpdate) {
         CollectionSystemsManager::get()->loadEnabledListFromSettings();
         CollectionSystemsManager::get()->updateSystemsList();
diff --git a/es-app/src/guis/GuiSettings.h b/es-app/src/guis/GuiSettings.h
index 980313936..b303789c6 100644
--- a/es-app/src/guis/GuiSettings.h
+++ b/es-app/src/guis/GuiSettings.h
@@ -34,6 +34,7 @@ public:
     inline void addSaveFunc(const std::function<void()>& func) { mSaveFuncs.push_back(func); };
 
     void setNeedsSaving() { mNeedsSaving = true; };
+    void setNeedsReloadHelpPrompts() { mNeedsReloadHelpPrompts = true; };
     void setNeedsCollectionsUpdate() { mNeedsCollectionsUpdate = true; };
     void setNeedsSorting() { mNeedsSorting = true; };
     void setNeedsSortingCollections() { mNeedsSortingCollections = true; };
@@ -53,6 +54,7 @@ private:
     MenuComponent mMenu;
     std::vector<std::function<void()>> mSaveFuncs;
     bool mNeedsSaving;
+    bool mNeedsReloadHelpPrompts;
     bool mNeedsCollectionsUpdate;
     bool mNeedsSorting;
     bool mNeedsSortingCollections;
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index 2cbb10ea5..03009cbba 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -197,6 +197,7 @@ void Settings::setDefaults()
     mBoolMap["NavigationSounds"] = { true, true };
 
     // Input device settings.
+    mStringMap["InputControllerType"] = { "xbox", "xbox" };
     mBoolMap["InputOnlyFirstController"] = { false, false };
 
     // Game collection settings.
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 043a141ae..ceb73e3e1 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -650,6 +650,14 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts, const HelpSt
     mHelp->setPrompts(addPrompts);
 }
 
+void Window::reloadHelpPrompts()
+{
+    if (mHelp) {
+        delete mHelp;
+        mHelp = new HelpComponent(this);
+    }
+}
+
 void Window::setInfoPopup(InfoPopup* infoPopup)
 {
     delete mInfoPopup;
diff --git a/es-core/src/Window.h b/es-core/src/Window.h
index dd452da32..274e221a8 100644
--- a/es-core/src/Window.h
+++ b/es-core/src/Window.h
@@ -100,6 +100,7 @@ public:
 
     void renderHelpPromptsEarly(); // Used to render HelpPrompts before a fade.
     void setHelpPrompts(const std::vector<HelpPrompt>& prompts, const HelpStyle& style);
+    void reloadHelpPrompts();
 
     void setScreensaver(Screensaver* screensaver) { mScreensaver = screensaver; }
     void setInfoPopup(InfoPopup* infoPopup);
diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp
index 25308e546..5350dce40 100644
--- a/es-core/src/components/HelpComponent.cpp
+++ b/es-core/src/components/HelpComponent.cpp
@@ -22,24 +22,70 @@
 #define ICON_TEXT_SPACING 8 // Space between [icon] and [text] (px).
 #define ENTRY_SPACING 16 // Space between [text] and next [icon] (px).
 
-static const std::map<std::string, std::string> ICON_PATH_MAP {
-    { "up/down", ":/help/dpad_updown.svg" },
-    { "left/right", ":/help/dpad_leftright.svg" },
-    { "up/down/left/right", ":/help/dpad_all.svg" },
-    { "thumbstickclick", ":/help/thumbstick_click.svg" },
-    { "a", ":/help/button_a.svg" },
-    { "b", ":/help/button_b.svg" },
-    { "x", ":/help/button_x.svg" },
-    { "y", ":/help/button_y.svg" },
-    { "l", ":/help/button_l.svg" },
-    { "r", ":/help/button_r.svg" },
-    { "lr", ":/help/button_lr.svg" },
-    { "start", ":/help/button_start.svg" },
-    { "select", ":/help/button_select.svg" }
-};
+static std::map<std::string, std::string> sIconPathMap {};
 
 HelpComponent::HelpComponent(Window* window) : GuiComponent(window)
 {
+    assignIcons();
+}
+
+void HelpComponent::assignIcons()
+{
+    std::string controllerType = Settings::getInstance()->getString("InputControllerType");
+
+    sIconPathMap.clear();
+
+    // These graphics files are common between all controller types.
+    sIconPathMap["up/down"] = ":/help/dpad_updown.svg";
+    sIconPathMap["left/right"] = ":/help/dpad_leftright.svg";
+    sIconPathMap["up/down/left/right"] = ":/help/dpad_all.svg";
+    sIconPathMap["thumbstickclick"] = ":/help/thumbstick_click.svg";
+    sIconPathMap["l"] = ":/help/button_l.svg";
+    sIconPathMap["r"] = ":/help/button_r.svg";
+    sIconPathMap["lr"] = ":/help/button_lr.svg";
+
+    // These graphics files are custom per controller type.
+    if (controllerType == "snes") {
+        sIconPathMap["a"] = ":/help/button_a_SNES.svg";
+        sIconPathMap["b"] = ":/help/button_b_SNES.svg";
+        sIconPathMap["x"] = ":/help/button_x_SNES.svg";
+        sIconPathMap["y"] = ":/help/button_y_SNES.svg";
+        sIconPathMap["start"] = ":/help/button_start_SNES.svg";
+        sIconPathMap["select"] = ":/help/button_back_SNES.svg";
+    }
+    else if (controllerType == "ps4") {
+        sIconPathMap["a"] = ":/help/button_a_PS.svg";
+        sIconPathMap["b"] = ":/help/button_b_PS.svg";
+        sIconPathMap["x"] = ":/help/button_x_PS.svg";
+        sIconPathMap["y"] = ":/help/button_y_PS.svg";
+        sIconPathMap["start"] = ":/help/button_start_PS4.svg";
+        sIconPathMap["select"] = ":/help/button_back_PS4.svg";
+    }
+    else if (controllerType == "ps5") {
+        sIconPathMap["a"] = ":/help/button_a_PS.svg";
+        sIconPathMap["b"] = ":/help/button_b_PS.svg";
+        sIconPathMap["x"] = ":/help/button_x_PS.svg";
+        sIconPathMap["y"] = ":/help/button_y_PS.svg";
+        sIconPathMap["start"] = ":/help/button_start_PS5.svg";
+        sIconPathMap["select"] = ":/help/button_back_PS5.svg";
+    }
+    else if (controllerType == "xbox360") {
+        sIconPathMap["a"] = ":/help/button_a_XBOX.svg";
+        sIconPathMap["b"] = ":/help/button_b_XBOX.svg";
+        sIconPathMap["x"] = ":/help/button_x_XBOX.svg";
+        sIconPathMap["y"] = ":/help/button_y_XBOX.svg";
+        sIconPathMap["start"] = ":/help/button_start_XBOX360.svg";
+        sIconPathMap["select"] = ":/help/button_back_XBOX360.svg";
+    }
+    else {
+        // Xbox One and later.
+        sIconPathMap["a"] = ":/help/button_a_XBOX.svg";
+        sIconPathMap["b"] = ":/help/button_b_XBOX.svg";
+        sIconPathMap["x"] = ":/help/button_x_XBOX.svg";
+        sIconPathMap["y"] = ":/help/button_y_XBOX.svg";
+        sIconPathMap["start"] = ":/help/button_start_XBOX.svg";
+        sIconPathMap["select"] = ":/help/button_back_XBOX.svg";
+    }
 }
 
 void HelpComponent::clearPrompts()
@@ -119,8 +165,8 @@ std::shared_ptr<TextureResource> HelpComponent::getIconTexture(const char* name)
     if (it != mIconCache.cend())
         return it->second;
 
-    auto pathLookup = ICON_PATH_MAP.find(name);
-    if (pathLookup == ICON_PATH_MAP.cend()) {
+    auto pathLookup = sIconPathMap.find(name);
+    if (pathLookup == sIconPathMap.cend()) {
         LOG(LogError) << "Unknown help icon \"" << name << "\"";
         return nullptr;
     }
diff --git a/es-core/src/components/HelpComponent.h b/es-core/src/components/HelpComponent.h
index 36f726af7..19bd61aed 100644
--- a/es-core/src/components/HelpComponent.h
+++ b/es-core/src/components/HelpComponent.h
@@ -21,6 +21,8 @@ class HelpComponent : public GuiComponent
 public:
     HelpComponent(Window* window);
 
+    void assignIcons();
+
     void clearPrompts();
     void setPrompts(const std::vector<HelpPrompt>& prompts);
 
diff --git a/es-core/src/guis/GuiInputConfig.cpp b/es-core/src/guis/GuiInputConfig.cpp
index bde82a71d..b6ca90728 100644
--- a/es-core/src/guis/GuiInputConfig.cpp
+++ b/es-core/src/guis/GuiInputConfig.cpp
@@ -19,41 +19,13 @@
 
 struct InputConfigStructure {
     std::string name;
-    const bool skippable;
+    bool skippable;
     std::string dispName;
     std::string icon;
 };
 
 static const int inputCount = 24;
-
-static const InputConfigStructure GUI_INPUT_CONFIG_LIST[inputCount] =
-{
-    { "Up",                   false, "D-PAD UP",               ":/help/dpad_up.svg" },
-    { "Down",                 false, "D-PAD DOWN",             ":/help/dpad_down.svg" },
-    { "Left",                 false, "D-PAD LEFT",             ":/help/dpad_left.svg" },
-    { "Right",                false, "D-PAD RIGHT",            ":/help/dpad_right.svg" },
-    { "Start",                false, "START",                  ":/help/button_start.svg" },
-    { "Select",               false, "SELECT",                 ":/help/button_select.svg" },
-    { "A",                    false, "BUTTON A",               ":/help/buttons_south_XBOX.svg" },
-    { "B",                    false, "BUTTON B",               ":/help/buttons_east_XBOX.svg" },
-    { "X",                    true,  "BUTTON X",               ":/help/buttons_west_XBOX.svg" },
-    { "Y",                    true,  "BUTTON Y",               ":/help/buttons_north_XBOX.svg" },
-    { "LeftShoulder",         true,  "LEFT SHOULDER",          ":/help/button_l.svg" },
-    { "RightShoulder",        true,  "RIGHT SHOULDER",         ":/help/button_r.svg" },
-    { "LeftTrigger",          true,  "LEFT TRIGGER",           ":/help/button_lt.svg" },
-    { "RightTrigger",         true,  "RIGHT TRIGGER",          ":/help/button_rt.svg" },
-    { "LeftThumbstickUp",     true,  "LEFT THUMBSTICK UP",     ":/help/thumbstick_up.svg" },
-    { "LeftThumbstickDown",   true,  "LEFT THUMBSTICK DOWN",   ":/help/thumbstick_down.svg" },
-    { "LeftThumbstickLeft",   true,  "LEFT THUMBSTICK LEFT",   ":/help/thumbstick_left.svg" },
-    { "LeftThumbstickRight",  true,  "LEFT THUMBSTICK RIGHT",  ":/help/thumbstick_right.svg" },
-    { "LeftThumbstickClick",  true,  "LEFT THUMBSTICK CLICK",  ":/help/thumbstick_click.svg" },
-    { "RightThumbstickUp",    true,  "RIGHT THUMBSTICK UP",    ":/help/thumbstick_up.svg" },
-    { "RightThumbstickDown",  true,  "RIGHT THUMBSTICK DOWN",  ":/help/thumbstick_down.svg" },
-    { "RightThumbstickLeft",  true,  "RIGHT THUMBSTICK LEFT",  ":/help/thumbstick_left.svg" },
-    { "RightThumbstickRight", true,  "RIGHT THUMBSTICK RIGHT", ":/help/thumbstick_right.svg" },
-    { "RightThumbstickClick", true,  "RIGHT THUMBSTICK CLICK", ":/help/thumbstick_click.svg" },
-//    { "HotKeyEnable",         true,  "HOTKEY ENABLE",          ":/help/button_hotkey.svg" }
-};
+static InputConfigStructure sGuiInputConfigList[inputCount];
 
 GuiInputConfig::GuiInputConfig(
         Window* window,
@@ -66,6 +38,10 @@ GuiInputConfig::GuiInputConfig(
         mTargetConfig(target),
         mHoldingInput(false)
 {
+    // Populate the configuration list with the text and icons applicable to the
+    // configured controller type.
+    populateConfigList();
+
     LOG(LogInfo) << "Configuring device " << target->getDeviceId() << " (" <<
             target->getDeviceName() << ").";
 
@@ -112,7 +88,7 @@ GuiInputConfig::GuiInputConfig(
 
         // Icon.
         auto icon = std::make_shared<ImageComponent>(mWindow);
-        icon->setImage(GUI_INPUT_CONFIG_LIST[i].icon);
+        icon->setImage(sGuiInputConfigList[i].icon);
         icon->setColorShift(0x777777FF);
         icon->setResize(0, Font::get(FONT_SIZE_MEDIUM)->getLetterHeight() * 1.25f);
         row.addElement(icon, false);
@@ -123,7 +99,7 @@ GuiInputConfig::GuiInputConfig(
         row.addElement(spacer, false);
 
         auto text = std::make_shared<TextComponent>(mWindow,
-                GUI_INPUT_CONFIG_LIST[i].dispName, Font::get(FONT_SIZE_MEDIUM), 0x777777FF);
+                sGuiInputConfigList[i].dispName, Font::get(FONT_SIZE_MEDIUM), 0x777777FF);
         row.addElement(text, true);
 
         auto mapping = std::make_shared<TextComponent>(mWindow, "-NOT DEFINED-",
@@ -184,7 +160,7 @@ GuiInputConfig::GuiInputConfig(
 
     // Only show "HOLD TO SKIP" if this input is skippable.
     mList->setCursorChangedCallback([this](CursorState) {
-        bool skippable = GUI_INPUT_CONFIG_LIST[mList->getCursorId()].skippable;
+        bool skippable = sGuiInputConfigList[mList->getCursorId()].skippable;
         mSubtitle2->setOpacity(skippable * 255);
     });
 
@@ -248,9 +224,124 @@ GuiInputConfig::GuiInputConfig(
             (Renderer::getScreenHeight() - mSize.y()) / 2.0f);
 }
 
+void GuiInputConfig::populateConfigList()
+{
+    std::string controllerType = Settings::getInstance()->getString("InputControllerType");
+
+    sGuiInputConfigList[0] =
+        { "Up",                   false, "D-PAD UP",               ":/help/dpad_up.svg" };
+    sGuiInputConfigList[1] =
+        { "Down",                 false, "D-PAD DOWN",             ":/help/dpad_down.svg" };
+    sGuiInputConfigList[2] =
+        { "Left",                 false, "D-PAD LEFT",             ":/help/dpad_left.svg" };
+    sGuiInputConfigList[3] =
+        { "Right",                false, "D-PAD RIGHT",            ":/help/dpad_right.svg" };
+
+    if (controllerType == "snes") {
+        sGuiInputConfigList[4] =
+        { "Start",                false, "START",                  ":/help/button_start_SNES.svg" };
+        sGuiInputConfigList[5] =
+        { "Select",               false, "SELECT",                 ":/help/button_back_SNES.svg" };
+        sGuiInputConfigList[6] =
+        { "A",                    false, "B",                      ":/help/mbuttons_a_SNES.svg" };
+        sGuiInputConfigList[7] =
+        { "B",                    false, "A",                      ":/help/mbuttons_b_SNES.svg" };
+        sGuiInputConfigList[8] =
+        { "X",                    true,  "Y",                      ":/help/mbuttons_x_SNES.svg" };
+        sGuiInputConfigList[9] =
+        { "Y",                    true,  "X",                      ":/help/mbuttons_y_SNES.svg" };
+    }
+    else if (controllerType == "ps4") {
+        sGuiInputConfigList[4] =
+        { "Start",                false, "OPTIONS",                ":/help/button_start_PS4.svg" };
+        sGuiInputConfigList[5] =
+        { "Select",               false, "SHARE",                  ":/help/button_back_PS4.svg" };
+        sGuiInputConfigList[6] =
+        { "A",                    false, "CROSS",                  ":/help/mbuttons_a_PS.svg" };
+        sGuiInputConfigList[7] =
+        { "B",                    false, "CIRCLE",                 ":/help/mbuttons_b_PS.svg" };
+        sGuiInputConfigList[8] =
+        { "X",                    true,  "SQUARE",                 ":/help/mbuttons_x_PS.svg" };
+        sGuiInputConfigList[9] =
+        { "Y",                    true,  "TRIANGLE",               ":/help/mbuttons_y_PS.svg" };
+    }
+    else if (controllerType == "ps5") {
+        sGuiInputConfigList[4] =
+        { "Start",                false, "OPTIONS",                ":/help/button_start_PS5.svg" };
+        sGuiInputConfigList[5] =
+        { "Select",               false, "CREATE",                 ":/help/button_back_PS5.svg" };
+        sGuiInputConfigList[6] =
+        { "A",                    false, "CROSS",                  ":/help/mbuttons_a_PS.svg" };
+        sGuiInputConfigList[7] =
+        { "B",                    false, "CIRCLE",                 ":/help/mbuttons_b_PS.svg" };
+        sGuiInputConfigList[8] =
+        { "X",                    true,  "SQUARE",                 ":/help/mbuttons_x_PS.svg" };
+        sGuiInputConfigList[9] =
+        { "Y",                    true,  "TRIANGLE",               ":/help/mbuttons_y_PS.svg" };
+    }
+    else if (controllerType == "xbox360") {
+        sGuiInputConfigList[4] =
+        { "Start",                false, "START",                  ":/help/button_start_XBOX360.svg" };
+        sGuiInputConfigList[5] =
+        { "Select",               false, "BACK",                   ":/help/button_back_XBOX360.svg" };
+        sGuiInputConfigList[6] =
+        { "A",                    false, "A",                      ":/help/mbuttons_a_XBOX.svg" };
+        sGuiInputConfigList[7] =
+        { "B",                    false, "B",                      ":/help/mbuttons_b_XBOX.svg" };
+        sGuiInputConfigList[8] =
+        { "X",                    true,  "X",                      ":/help/mbuttons_x_XBOX.svg" };
+        sGuiInputConfigList[9] =
+        { "Y",                    true,  "Y",                      ":/help/mbuttons_y_XBOX.svg" };
+    }
+    else {
+        // Xbox One and later.
+        sGuiInputConfigList[4] =
+        { "Start",                false, "MENU",                   ":/help/button_start_XBOX.svg" };
+        sGuiInputConfigList[5] =
+        { "Select",               false, "VIEW",                   ":/help/button_back_XBOX.svg" };
+        sGuiInputConfigList[6] =
+        { "A",                    false, "A",                      ":/help/mbuttons_a_XBOX.svg" };
+        sGuiInputConfigList[7] =
+        { "B",                    false, "B",                      ":/help/mbuttons_b_XBOX.svg" };
+        sGuiInputConfigList[8] =
+        { "X",                    true,  "X",                      ":/help/mbuttons_x_XBOX.svg" };
+        sGuiInputConfigList[9] =
+        { "Y",                    true,  "Y",                      ":/help/mbuttons_y_XBOX.svg" };
+    }
+
+    sGuiInputConfigList[10] =
+        { "LeftShoulder",         true,  "LEFT SHOULDER",          ":/help/button_l.svg" };
+    sGuiInputConfigList[11] =
+        { "RightShoulder",        true,  "RIGHT SHOULDER",         ":/help/button_r.svg" };
+    sGuiInputConfigList[12] =
+        { "LeftTrigger",          true,  "LEFT TRIGGER",           ":/help/button_lt.svg" };
+    sGuiInputConfigList[13] =
+        { "RightTrigger",         true,  "RIGHT TRIGGER",          ":/help/button_rt.svg" };
+    sGuiInputConfigList[14] =
+        { "LeftThumbstickUp",     true,  "LEFT THUMBSTICK UP",     ":/help/thumbstick_up.svg" };
+    sGuiInputConfigList[15] =
+        { "LeftThumbstickDown",   true,  "LEFT THUMBSTICK DOWN",   ":/help/thumbstick_down.svg" };
+    sGuiInputConfigList[16] =
+        { "LeftThumbstickLeft",   true,  "LEFT THUMBSTICK LEFT",   ":/help/thumbstick_left.svg" };
+    sGuiInputConfigList[17] =
+        { "LeftThumbstickRight",  true,  "LEFT THUMBSTICK RIGHT",  ":/help/thumbstick_right.svg" };
+    sGuiInputConfigList[18] =
+        { "LeftThumbstickClick",  true,  "LEFT THUMBSTICK CLICK",  ":/help/thumbstick_click.svg" };
+    sGuiInputConfigList[19] =
+        { "RightThumbstickUp",    true,  "RIGHT THUMBSTICK UP",    ":/help/thumbstick_up.svg" };
+    sGuiInputConfigList[20] =
+        { "RightThumbstickDown",  true,  "RIGHT THUMBSTICK DOWN",  ":/help/thumbstick_down.svg" };
+    sGuiInputConfigList[21] =
+        { "RightThumbstickLeft",  true,  "RIGHT THUMBSTICK LEFT",  ":/help/thumbstick_left.svg" };
+    sGuiInputConfigList[22] =
+        { "RightThumbstickRight", true,  "RIGHT THUMBSTICK RIGHT", ":/help/thumbstick_right.svg" };
+    sGuiInputConfigList[23] =
+        { "RightThumbstickClick", true,  "RIGHT THUMBSTICK CLICK", ":/help/thumbstick_click.svg" };
+}
+
 void GuiInputConfig::update(int deltaTime)
 {
-    if (mConfiguringRow && mHoldingInput && GUI_INPUT_CONFIG_LIST[mHeldInputId].skippable) {
+    if (mConfiguringRow && mHoldingInput && sGuiInputConfigList[mHeldInputId].skippable) {
         int prevSec = mHeldTime / 1000;
         mHeldTime += deltaTime;
         int curSec = mHeldTime / 1000;
@@ -340,8 +431,8 @@ bool GuiInputConfig::assign(Input input, int inputId)
     // If this input is mapped to something other than "nothing" or the current row,
     // generate an error. (If it's the same as what it was before, allow it.)
     if (mTargetConfig->getMappedTo(input).size() > 0 &&
-            !mTargetConfig->isMappedTo(GUI_INPUT_CONFIG_LIST[inputId].name, input) &&
-            GUI_INPUT_CONFIG_LIST[inputId].name != "HotKeyEnable") {
+            !mTargetConfig->isMappedTo(sGuiInputConfigList[inputId].name, input) &&
+            sGuiInputConfigList[inputId].name != "HotKeyEnable") {
         error(mMappings.at(inputId), "Already mapped!");
         return false;
     }
@@ -349,15 +440,15 @@ bool GuiInputConfig::assign(Input input, int inputId)
     setAssignedTo(mMappings.at(inputId), input);
 
     input.configured = true;
-    mTargetConfig->mapInput(GUI_INPUT_CONFIG_LIST[inputId].name, input);
+    mTargetConfig->mapInput(sGuiInputConfigList[inputId].name, input);
 
     LOG(LogInfo) << "Mapping [" << input.string() << "] to [" <<
-            GUI_INPUT_CONFIG_LIST[inputId].name << "]";
+            sGuiInputConfigList[inputId].name << "]";
 
     return true;
 }
 
 void GuiInputConfig::clearAssignment(int inputId)
 {
-    mTargetConfig->unmapInput(GUI_INPUT_CONFIG_LIST[inputId].name);
+    mTargetConfig->unmapInput(sGuiInputConfigList[inputId].name);
 }
diff --git a/es-core/src/guis/GuiInputConfig.h b/es-core/src/guis/GuiInputConfig.h
index d05111af6..97c31b31e 100644
--- a/es-core/src/guis/GuiInputConfig.h
+++ b/es-core/src/guis/GuiInputConfig.h
@@ -22,6 +22,8 @@ public:
     GuiInputConfig(Window* window, InputConfig* target, bool reconfigureAll,
             const std::function<void()>& okCallback);
 
+    void populateConfigList();
+
     void update(int deltaTime) override;
     void onSizeChanged() override;
 
diff --git a/resources/help/button_cross.svg b/resources/help/button_a_PS.svg
similarity index 100%
rename from resources/help/button_cross.svg
rename to resources/help/button_a_PS.svg
diff --git a/resources/help/button_b.svg b/resources/help/button_a_SNES.svg
similarity index 100%
rename from resources/help/button_b.svg
rename to resources/help/button_a_SNES.svg
diff --git a/resources/help/button_a.svg b/resources/help/button_a_XBOX.svg
similarity index 100%
rename from resources/help/button_a.svg
rename to resources/help/button_a_XBOX.svg
diff --git a/resources/help/button_circle.svg b/resources/help/button_b_PS.svg
similarity index 100%
rename from resources/help/button_circle.svg
rename to resources/help/button_b_PS.svg
diff --git a/resources/help/button_b_SNES.svg b/resources/help/button_b_SNES.svg
new file mode 100644
index 000000000..c88ad1a3c
--- /dev/null
+++ b/resources/help/button_b_SNES.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+ <circle id="outline" cx="32" cy="32" r="28" fill="none" stroke="#fff" stroke-width="2"/>
+ <path id="button_a" d="m32 4a28 28 0 0 0-28 28 28 28 0 0 0 28 28 28 28 0 0 0 28-28 28 28 0 0 0-28-28zm-4.238281 13.664062h8.457031l7.109375 28.671876h-6.875l-1.582031-6.992188h-5.761719l-1.582031 6.992188h-6.855469l7.089844-28.671876zm4.238281 8.75c-0.208333 1.002605-0.761719 3.509115-1.660156 7.519532h3.359375l-1.699219-7.519532z" fill="#fff"/>
+</svg>
diff --git a/resources/help/button_b_XBOX.svg b/resources/help/button_b_XBOX.svg
new file mode 100644
index 000000000..115fd1919
--- /dev/null
+++ b/resources/help/button_b_XBOX.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+ <circle id="outline" cx="32" cy="32" r="28" fill="none" stroke="#fff" stroke-width="2"/>
+ <path id="button_b" d="m32 4a28 28 0 0 0-28 28 28 28 0 0 0 28 28 28 28 0 0 0 28-28 28 28 0 0 0-28-28zm-8.242188 13.78125h7.890626c3.177083 0 5.488281 0.592448 6.933593 1.777344 1.445313 1.184896 2.167969 3.072916 2.167969 5.664062 0 1.653646-0.390625 3.072917-1.171875 4.257813-0.533854 0.846354-1.302083 1.458333-2.304687 1.835937 1.393229 0.533854 2.408854 1.341146 3.046874 2.421875 0.651042 1.067709 0.976563 2.447917 0.976563 4.140625 0 2.630209-0.761719 4.694011-2.285156 6.191406-1.510417 1.484376-3.541667 2.239584-6.09375 2.265626h-9.160157v-28.554688zm6.503907 5.292969v5.859375h1.542969c0.768229 0 1.315104-0.247396 1.640624-0.742188 0.325521-0.507812 0.488282-1.263021 0.488282-2.265625 0-1.015625-0.188802-1.744791-0.566406-2.1875-0.364584-0.442708-0.950521-0.664062-1.757813-0.664062h-1.347656zm0 10.996093v6.914063h1.777343c1.5625 0 2.34375-1.204427 2.34375-3.613281 0-2.200521-0.807291-3.300782-2.421874-3.300782h-1.699219z" fill="#fff"/>
+</svg>
diff --git a/resources/help/button_back_PS4.svg b/resources/help/button_back_PS4.svg
new file mode 100644
index 000000000..512e19d0f
--- /dev/null
+++ b/resources/help/button_back_PS4.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg16"
+   sodipodi:docname="button_back_PS4.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="17.957643"
+     inkscape:cx="1.1761493"
+     inkscape:cy="35.67054"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     id="outline-7"
+     d="m 1.2607257,42 a 7.1774168,7.1774168 0 0 1 7.177416,-7.177417 H 55.604024 A 7.1774168,7.1774168 0 0 1 62.781441,42 7.1774168,7.1774168 0 0 1 55.604024,49.177417 H 8.4381417 A 7.1774168,7.1774168 0 0 1 1.2607257,42 Z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:2.05069041;stroke-linejoin:round" />
+  <g
+     aria-label="SHARE"
+     transform="matrix(0.97704247,0,0,1.2388193,-3.2055136,-3.0925769)"
+     style="font-style:normal;font-weight:normal;font-size:15.61083698px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.39027089"
+     id="text4763">
+    <path
+       d="m 18.592504,22.465529 q 0,1.577853 -1.173862,2.416325 -1.166239,0.830851 -3.430115,0.830851 -2.065692,0 -3.239554,-0.731758 -1.1738615,-0.731758 -1.5092506,-2.218142 l 2.1724066,-0.358256 q 0.221052,0.853717 0.86134,1.242464 0.640288,0.381124 1.776038,0.381124 2.355346,0 2.355346,-1.433026 0,-0.457349 -0.27441,-0.754626 Q 15.863657,21.543209 15.368196,21.345024 14.880357,21.14684 13.485443,20.864808 12.281092,20.582776 11.808498,20.415082 11.335904,20.239765 10.95478,20.01109 10.573656,19.774793 10.306869,19.447027 10.040083,19.11926 9.8876331,18.677157 9.742806,18.235053 9.742806,17.663367 q 0,-1.455894 1.090015,-2.225764 1.097636,-0.777493 3.186196,-0.777493 1.997089,0 2.995634,0.625043 1.006167,0.625044 1.295821,2.065692 l -2.180029,0.297277 q -0.167694,-0.693646 -0.686023,-1.04428 -0.510706,-0.350634 -1.471138,-0.350634 -2.042825,0 -2.042825,1.280577 0,0.419236 0.21343,0.686023 0.221052,0.266787 0.647911,0.457349 0.426858,0.182939 1.730302,0.464971 1.547364,0.327766 2.210519,0.609798 0.670778,0.274409 1.059525,0.647911 0.388746,0.365879 0.594553,0.884207 0.205807,0.510706 0.205807,1.181485 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4746"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 27.175415,25.560255 v -4.603977 h -4.680202 v 4.603977 H 20.246582 V 14.820182 h 2.248631 v 4.276211 h 4.680202 v -4.276211 h 2.248631 v 10.740073 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4748"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 39.112216,25.560255 -0.95281,-2.744092 h -4.093271 l -0.95281,2.744092 h -2.248631 l 3.917954,-10.740073 h 2.652623 l 3.902709,10.740073 z m -3.003257,-9.085995 -0.04574,0.167695 q -0.07622,0.274409 -0.182939,0.625043 -0.106715,0.350634 -1.311066,3.856974 h 3.087104 l -1.059525,-3.087104 -0.327767,-1.036657 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4750"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 50.172434,25.560255 -2.492551,-4.078026 h -2.637377 v 4.078026 H 42.793874 V 14.820182 H 48.1601 q 1.920864,0 2.965144,0.83085 1.044279,0.823228 1.044279,2.370591 0,1.128127 -0.640288,1.951355 -0.640288,0.815605 -1.730302,1.074769 l 2.904164,4.512508 z m -0.266787,-7.447162 q 0,-1.547363 -1.981844,-1.547363 h -2.881297 v 3.170951 h 2.942277 q 0.945187,0 1.433026,-0.426859 0.487838,-0.426859 0.487838,-1.196729 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4752"
+       inkscape:connector-curvature="0" />
+    <path
+       d="M 54.067522,25.560255 V 14.820182 h 8.445706 v 1.737925 h -6.197075 v 2.698358 h 5.732104 v 1.737925 h -5.732104 v 2.82794 h 6.509597 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4754"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/resources/help/button_back_PS5.svg b/resources/help/button_back_PS5.svg
new file mode 100644
index 000000000..06a7d6ba6
--- /dev/null
+++ b/resources/help/button_back_PS5.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg4"
+   sodipodi:docname="button_back_PS5.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview6"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="-106.16889"
+     inkscape:cy="57.034771"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.98202991;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 32 4 A 28 28 0 0 0 4 32 A 28 28 0 0 0 32 60 A 28 28 0 0 0 60 32 A 28 28 0 0 0 32 4 z M 30.240234 12.621094 L 33.341797 12.621094 C 33.503606 12.621094 33.632812 12.801802 33.632812 13.027344 L 33.632812 33.376953 C 33.632812 33.602495 33.503606 33.785156 33.341797 33.785156 L 30.240234 33.785156 C 30.078425 33.785156 29.947266 33.602495 29.947266 33.376953 L 29.947266 13.027344 C 29.947266 12.801802 30.078425 12.621094 30.240234 12.621094 z M 15.410156 21.177734 C 15.483256 21.198763 15.549836 21.247635 15.591797 21.320312 L 23.164062 34.435547 C 23.247984 34.580903 23.202631 34.764799 23.0625 34.845703 L 20.376953 36.396484 C 20.236822 36.477389 20.056578 36.424653 19.972656 36.279297 L 12.400391 23.164062 C 12.316469 23.018707 12.361822 22.836764 12.501953 22.755859 L 15.1875 21.205078 C 15.257565 21.164626 15.337056 21.156706 15.410156 21.177734 z M 48.589844 21.177734 C 48.662944 21.156706 48.742435 21.164626 48.8125 21.205078 L 51.498047 22.755859 C 51.638178 22.836764 51.683531 23.018706 51.599609 23.164062 L 44.027344 36.279297 C 43.943422 36.424653 43.763178 36.477389 43.623047 36.396484 L 40.9375 34.845703 C 40.797369 34.764799 40.752016 34.580903 40.835938 34.435547 L 48.408203 21.320312 C 48.450164 21.247634 48.516744 21.198763 48.589844 21.177734 z "
+     id="path4873" />
+  <circle
+     style="opacity:1;fill:#e9e9e9;fill-opacity:1;stroke:none;stroke-width:1.28596556;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path4744-0"
+     cx="32"
+     cy="32"
+     r="0" />
+</svg>
diff --git a/resources/help/button_back_SNES.svg b/resources/help/button_back_SNES.svg
new file mode 100644
index 000000000..dead678c0
--- /dev/null
+++ b/resources/help/button_back_SNES.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg16"
+   sodipodi:docname="button_back_SNES.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="16.328968"
+     inkscape:cx="26.323572"
+     inkscape:cy="34.428004"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     id="outline"
+     d="m2 42a7 7 0 0 1 7-7h46a7 7 0 0 1 7 7 7 7 0 0 1-7 7h-46a7 7 0 0 1-7-7z"
+     fill="#fff"
+     stroke="#fff"
+     stroke-linejoin="round"
+     stroke-width="2" />
+  <g
+     aria-label="SELECT"
+     transform="scale(0.88808133,1.126023)"
+     style="font-style:normal;font-weight:normal;font-size:15.61083698px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.39027089"
+     id="text4763">
+    <path
+       d="m 14.903226,22.465529 q 0,1.577853 -1.173862,2.416325 -1.16624,0.830851 -3.430116,0.830851 -2.0656916,0 -3.2395534,-0.731758 -1.1738617,-0.731758 -1.5092508,-2.218142 l 2.1724065,-0.358256 q 0.2210519,0.853717 0.8613401,1.242464 0.6402883,0.381124 1.7760376,0.381124 2.355346,0 2.355346,-1.433026 0,-0.457349 -0.274409,-0.754626 Q 12.174378,21.543209 11.678917,21.345024 11.191078,21.14684 9.7961646,20.864808 8.5918129,20.582776 8.1192192,20.415082 7.6466255,20.239765 7.2655016,20.01109 6.8843776,19.774793 6.6175909,19.447027 6.3508041,19.11926 6.1983545,18.677157 6.0535274,18.235053 6.0535274,17.663367 q 0,-1.455894 1.0900145,-2.225764 1.097637,-0.777493 3.1861961,-0.777493 1.99709,0 2.995634,0.625043 1.006168,0.625044 1.295822,2.065692 l -2.180029,0.297277 q -0.167695,-0.693646 -0.686023,-1.04428 -0.510706,-0.350634 -1.471139,-0.350634 -2.0428241,0 -2.0428241,1.280577 0,0.419236 0.2134294,0.686023 0.2210519,0.266787 0.6479107,0.457349 0.4268588,0.182939 1.730303,0.464971 1.547363,0.327766 2.210519,0.609798 0.670778,0.274409 1.059524,0.647911 0.388747,0.365879 0.594554,0.884207 0.205807,0.510706 0.205807,1.181485 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4746" />
+    <path
+       d="M 16.557303,25.560255 V 14.820182 h 8.445707 v 1.737925 h -6.197076 v 2.698358 h 5.732105 v 1.737925 h -5.732105 v 2.82794 h 6.509597 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4748" />
+    <path
+       d="M 26.969609,25.560255 V 14.820182 h 2.248631 v 9.002148 h 5.762594 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4750" />
+    <path
+       d="M 36.50533,25.560255 V 14.820182 h 8.445706 v 1.737925 h -6.197075 v 2.698358 h 5.732104 v 1.737925 h -5.732104 v 2.82794 h 6.509597 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4752" />
+    <path
+       d="m 51.933225,23.94429 q 2.035202,0 2.827939,-2.042825 l 1.958978,0.739381 q -0.632666,1.554985 -1.859885,2.317233 -1.219597,0.754626 -2.927032,0.754626 -2.591643,0 -4.009424,-1.463516 -1.410159,-1.471139 -1.410159,-4.108517 0,-2.645 1.364424,-4.062781 1.364424,-1.417781 3.956067,-1.417781 1.890374,0 3.079481,0.762248 1.189107,0.754625 1.669323,2.225764 l -1.981845,0.541196 q -0.251541,-0.807983 -0.990922,-1.280577 -0.731758,-0.480216 -1.730303,-0.480216 -1.524495,0 -2.317233,0.945188 -0.785116,0.945187 -0.785116,2.766959 0,1.852263 0.807983,2.82794 0.815605,0.975678 2.347724,0.975678 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4754" />
+    <path
+       d="m 63.039178,16.558107 v 9.002148 h -2.248632 v -9.002148 h -3.468228 v -1.737925 h 9.19271 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4756" />
+  </g>
+</svg>
diff --git a/resources/help/button_back_XBOX.svg b/resources/help/button_back_XBOX.svg
new file mode 100644
index 000000000..d82c9658f
--- /dev/null
+++ b/resources/help/button_back_XBOX.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg4"
+   sodipodi:docname="button_select.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata10">
+    <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>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview6"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="36.789578"
+     inkscape:cx="18.777877"
+     inkscape:cy="25.18767"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.90203953;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 32 4 A 28 28 0 0 0 4 32 A 28 28 0 0 0 32 60 A 28 28 0 0 0 60 32 A 28 28 0 0 0 32 4 z M 16.753906 17.449219 L 35.835938 17.449219 C 36.393147 17.449219 36.793046 17.744044 37.025391 18.070312 C 37.22676 18.353077 37.3125 18.688429 37.3125 18.980469 L 37.3125 22.609375 L 34.617188 22.609375 L 34.617188 20.146484 L 17.972656 20.146484 L 17.972656 32.542969 L 20.552734 32.542969 L 20.552734 35.236328 L 16.753906 35.236328 C 16.202539 35.236328 15.797678 34.952129 15.560547 34.619141 C 15.356368 34.332427 15.273433 33.997118 15.273438 33.705078 L 15.273438 18.980469 C 15.273435 18.688422 15.359189 18.353071 15.560547 18.070312 C 15.794869 17.741264 16.196693 17.449219 16.753906 17.449219 z M 28.166016 28.763672 L 47.248047 28.763672 C 47.804636 28.763672 48.205471 29.0562 48.439453 29.384766 C 48.640582 29.667185 48.726562 30.002224 48.726562 30.294922 L 48.726562 45.019531 C 48.726562 45.31225 48.64239 45.648622 48.439453 45.933594 C 48.203635 46.264756 47.800837 46.550781 47.248047 46.550781 L 28.166016 46.550781 C 27.613224 46.550781 27.21042 46.264728 26.974609 45.933594 C 26.771647 45.648605 26.685547 45.312229 26.685547 45.019531 L 26.685547 30.294922 C 26.685547 30.002203 26.773505 29.667168 26.974609 29.384766 C 27.208594 29.056192 27.609423 28.763672 28.166016 28.763672 z M 29.384766 31.460938 L 29.384766 43.855469 L 46.029297 43.855469 L 46.029297 31.460938 L 29.384766 31.460938 z "
+     id="path4749" />
+</svg>
diff --git a/resources/help/button_back_XBOX360.svg b/resources/help/button_back_XBOX360.svg
new file mode 100644
index 000000000..1b1e097ab
--- /dev/null
+++ b/resources/help/button_back_XBOX360.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg16"
+   sodipodi:docname="button_start.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <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>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="8.110593"
+     inkscape:cx="15.256979"
+     inkscape:cy="28.10138"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:0.97137403;stroke:none;stroke-width:2.86624074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="m 36.705078,7.9726562 c 13.495895,0 24.359375,10.7159498 24.359375,24.0273438 0,13.311394 -10.86348,24.027344 -24.359375,24.027344 H 27.294922 C 13.799027,56.027344 2.9355469,45.311394 2.9355469,32 2.9355469,18.688606 13.799027,7.9726562 27.294922,7.9726562 Z m 4.1875,7.1289058 L 27.240234,23.550781 13.587891,32 27.240234,40.449219 40.892578,48.898438 V 32 Z"
+     id="rect4801"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/resources/help/button_select.svg b/resources/help/button_select.svg
deleted file mode 100644
index eba861d6c..000000000
--- a/resources/help/button_select.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
- <path id="outline" d="m2 42a7 7 0 0 1 7-7h46a7 7 0 0 1 7 7 7 7 0 0 1-7 7h-46a7 7 0 0 1-7-7z" fill="#fff" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
- <g id ="label_select" fill="#fff">
-  <path d="m7.5908203 26.665543q0.5175781 0 0.7910156-0.341797 0.2734375-0.351563 0.2734375-0.84961 0-0.507812-0.1464843-0.859375-0.1464844-0.361328-0.4296875-0.664062-0.2832032-0.302735-0.5371094-0.498047-0.2441406-0.205078-0.6152344-0.46875-1.2792969-0.898438-1.8945312-1.894531-0.6054688-0.996094-0.6054688-2.353516 0-1.875 1.1230469-2.96875 1.1328125-1.103516 2.9199219-1.103516t3.5253904 1.044922l-1.044922 2.509766q-0.05859-0.0293-0.302734-0.15625-0.244141-0.136719-0.3125-0.166016-0.06836-0.03906-0.283203-0.136718-0.2148439-0.107422-0.3027346-0.146485l-0.2636718-0.09766q-0.4296875-0.166016-0.8300782-0.166016-0.390625 0-0.625 0.361328-0.2246093 0.351563-0.2246093 0.859375 0 0.498047 0.1269531 0.830079 0.1269531 0.332031 0.390625 0.615234 0.4492187 0.46875 1.1035156 0.898437 1.2988282 0.878907 1.9531252 1.855469 0.664062 0.966797 0.664062 2.333985 0 2.041015-1.09375 3.134765-1.0937497 1.083985-3.1152341 1.083985-2.0117187 0-3.515625-0.84961v-3.203125q2.1289063 1.396485 3.2714844 1.396485z"/>
-  <path d="m21.125977 17.505386h-3.66211v2.88086h3.398438v2.65625h-3.398438v3.417968h3.66211v2.675782h-7.080079v-14.277344h7.080079z"/>
-  <path d="m26.838867 26.460464h3.574219v2.675782h-6.992188v-14.277344h3.417969z"/>
-  <path d="m39.602539 17.505386h-3.662109v2.88086h3.398437v2.65625h-3.398437v3.417968h3.662109v2.675782h-7.080078v-14.277344h7.080078z"/>
-  <path d="m46.643555 29.321793q-1.181641 0-2.109375-0.400391-0.917969-0.410156-1.503907-1.083984-0.585937-0.673829-0.966796-1.63086-0.69336-1.738281-0.69336-4.189453 0-1.933594 0.488281-3.564453 0.488282-1.650391 1.660157-2.714844 1.210937-1.074219 3.164062-1.074219 0.859375 0 1.650391 0.253907 0.800781 0.253906 1.728515 0.849609l-0.976562 2.412109q-0.07813-0.07813-0.380859-0.253906-0.302735-0.185547-0.556641-0.292969-0.673828-0.302734-1.259766-0.302734-0.576172 0-0.947265 0.341797-0.371094 0.332031-0.576172 0.820312-0.205078 0.488282-0.322266 1.171875-0.205078 1.103516-0.205078 2.373047 0 4.609375 2.099609 4.609375 0.917969 0 2.72461-1.035156v2.880859q-1.279297 0.830079-3.017578 0.830079z"/>
-  <path d="m59.680664 17.544449h-2.65625v11.591797h-3.398437v-11.591797h-2.65625v-2.685547h8.710937z"/>
- </g>
-</svg>
diff --git a/resources/help/button_start.svg b/resources/help/button_start.svg
deleted file mode 100644
index 78fb5632e..000000000
--- a/resources/help/button_start.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
- <path id="outline" d="m2 42a7 7 0 0 1 7-7h46a7 7 0 0 1 7 7 7 7 0 0 1-7 7h-46a7 7 0 0 1-7-7z" fill="#fff" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
- <g id="label_start" fill="#fff">
-  <path d="m11.02832 26.665543q0.517578 0 0.791016-0.341797 0.273437-0.351563 0.273437-0.84961 0-0.507812-0.146484-0.859375-0.146484-0.361328-0.429687-0.664062-0.283204-0.302735-0.53711-0.498047-0.24414-0.205078-0.615234-0.46875-1.2792971-0.898438-1.8945314-1.894531-0.6054688-0.996094-0.6054688-2.353516 0-1.875 1.1230469-2.96875 1.1328123-1.103516 2.9199223-1.103516 1.787109 0 3.52539 1.044922l-1.044922 2.509766q-0.05859-0.0293-0.302734-0.15625-0.244141-0.136719-0.3125-0.166016-0.06836-0.03906-0.283203-0.136718-0.214844-0.107422-0.302735-0.146485l-0.263671-0.09766q-0.429688-0.166016-0.830079-0.166016-0.390625 0-0.625 0.361328-0.224609 0.351563-0.224609 0.859375 0 0.498047 0.126953 0.830079 0.126953 0.332031 0.390625 0.615234 0.449219 0.46875 1.103516 0.898437 1.298828 0.878907 1.953125 1.855469 0.664062 0.966797 0.664062 2.333985 0 2.041015-1.09375 3.134765-1.09375 1.083985-3.115234 1.083985-2.0117188 0-3.5156251-0.84961v-3.203125q2.1289063 1.396485 3.2714841 1.396485z"/>
-  <path d="m25.149414 17.544449h-2.65625v11.591797h-3.398437v-11.591797h-2.65625v-2.685547h8.710937z"/>
-  <path d="m36.760742 29.136246h-3.4375l-0.791015-3.496094h-2.88086l-0.791015 3.496094h-3.427735l3.544922-14.335938h4.228516zm-4.814453-6.201172-0.849609-3.759766q-0.15625 0.751953-0.830078 3.759766z"/>
-  <path d="m38.108398 14.858902h3.789063q2.353516 0 3.476562 1.064453 1.123047 1.064453 1.123047 3.261719 0 2.548828-1.748047 3.701172l2.734375 6.25h-3.603515l-2.1875-5.390625h-0.175781v5.390625h-3.408204zm3.408204 2.646484v3.603516h0.253906q0.673828 0 0.976562-0.458984 0.3125-0.458985 0.3125-1.386719 0-0.9375-0.322265-1.347656-0.3125-0.410157-0.986328-0.410157z"/>
-  <path d="m56.243164 17.544449h-2.65625v11.591797h-3.398437v-11.591797h-2.65625v-2.685547h8.710937z"/>
- </g>
-</svg>
diff --git a/resources/help/button_start_PS4.svg b/resources/help/button_start_PS4.svg
new file mode 100644
index 000000000..4378d292c
--- /dev/null
+++ b/resources/help/button_start_PS4.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg16"
+   sodipodi:docname="button_start_PS4.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="20.363927"
+     inkscape:cx="22.070387"
+     inkscape:cy="31.816007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     id="outline"
+     d="M 1.2396421,42 A 7.1774168,7.1774168 0 0 1 8.4170589,34.822583 H 55.582941 A 7.1774168,7.1774168 0 0 1 62.760358,42 7.1774168,7.1774168 0 0 1 55.582941,49.177417 H 8.4170589 A 7.1774168,7.1774168 0 0 1 1.2396421,42 Z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:2.05069041;stroke-linejoin:round" />
+  <g
+     aria-label="OPTIONS"
+     transform="matrix(0.95885655,0,0,1.2157609,-2.5502249,-2.38491)"
+     style="font-style:normal;font-weight:normal;font-size:14.95902538px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3739756"
+     id="text4763">
+    <path
+       d="m 13.364116,20.142582 q 0,1.606927 -0.635466,2.82673 -0.635467,1.219803 -1.818749,1.869878 -1.1832823,0.642771 -2.760992,0.642771 -2.4249983,0 -3.8054943,-1.424322 -1.3731917,-1.431625 -1.3731917,-3.915057 0,-2.476128 1.3731917,-3.863928 1.3731918,-1.3878 3.8201027,-1.3878 2.4469106,0 3.8201026,1.402408 1.380496,1.402409 1.380496,3.84932 z m -2.198568,0 q 0,-1.66536 -0.788854,-2.607604 -0.7888553,-0.949547 -2.2131766,-0.949547 -1.4462339,0 -2.2350887,0.942243 -0.7888549,0.934939 -0.7888549,2.614908 0,1.694577 0.8034633,2.673341 0.8107675,0.971461 2.2058719,0.971461 1.4462339,0 2.227785,-0.949548 0.788854,-0.949547 0.788854,-2.695254 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4746"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 23.458536,18.301921 q 0,0.993372 -0.452861,1.774923 -0.452861,0.781551 -1.30015,1.212499 -0.839984,0.423645 -2.001354,0.423645 h -2.556474 v 3.622888 H 14.992955 V 15.044242 h 4.623566 q 1.847965,0 2.841338,0.854593 1.000677,0.847289 1.000677,2.403086 z m -2.169351,0.03652 q 0,-1.621535 -1.913703,-1.621535 h -2.227785 v 3.338024 h 2.286219 q 0.891113,0 1.373191,-0.438252 0.482078,-0.445557 0.482078,-1.278237 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4748"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 29.615988,16.709603 v 8.626273 h -2.154743 v -8.626273 h -3.323416 v -1.665361 h 8.808879 v 1.665361 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4750"
+       inkscape:connector-curvature="0" />
+    <path
+       d="M 34.108077,25.335876 V 15.044242 h 2.154742 v 10.291634 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4752"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 48.270942,20.142582 q 0,1.606927 -0.635466,2.82673 -0.635467,1.219803 -1.818749,1.869878 -1.183282,0.642771 -2.760992,0.642771 -2.424998,0 -3.805494,-1.424322 -1.373192,-1.431625 -1.373192,-3.915057 0,-2.476128 1.373192,-3.863928 1.373192,-1.3878 3.820102,-1.3878 2.446911,0 3.820103,1.402408 1.380496,1.402409 1.380496,3.84932 z m -2.198568,0 q 0,-1.66536 -0.788854,-2.607604 -0.788855,-0.949547 -2.213177,-0.949547 -1.446233,0 -2.235088,0.942243 -0.788855,0.934939 -0.788855,2.614908 0,1.694577 0.803463,2.673341 0.810768,0.971461 2.205872,0.971461 1.446234,0 2.227785,-0.949548 0.788854,-0.949547 0.788854,-2.695254 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4754"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 56.166794,25.335876 -4.484785,-7.925069 q 0.131475,1.154065 0.131475,1.85527 v 6.069799 H 49.899781 V 15.044242 H 52.3613 l 4.550524,7.990808 q -0.131476,-1.102936 -0.131476,-2.008658 v -5.98215 h 1.913704 v 10.291634 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4756"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 69.095249,22.370367 q 0,1.511971 -1.124849,2.315435 -1.117544,0.796159 -3.286895,0.796159 -1.979441,0 -3.10429,-0.701205 -1.124848,-0.701204 -1.446234,-2.125525 l 2.081701,-0.343298 q 0.211822,0.818072 0.825376,1.190586 0.613553,0.365211 1.701881,0.365211 2.257001,0 2.257001,-1.373192 0,-0.438253 -0.262951,-0.723117 -0.255648,-0.284864 -0.730422,-0.474774 -0.467469,-0.189909 -1.80414,-0.460165 -1.154065,-0.270256 -1.606926,-0.430948 -0.452862,-0.167997 -0.818072,-0.387124 -0.365211,-0.22643 -0.620858,-0.540511 -0.255647,-0.314081 -0.401732,-0.737726 -0.13878,-0.423644 -0.13878,-0.97146 0,-1.395104 1.044503,-2.13283 1.051806,-0.745029 3.05316,-0.745029 1.913703,0 2.870555,0.598945 0.964156,0.598946 1.241716,1.979442 l -2.089004,0.284864 q -0.160693,-0.664683 -0.657379,-1.000677 -0.489383,-0.335994 -1.409713,-0.335994 -1.957529,0 -1.957529,1.227108 0,0.401731 0.204518,0.657379 0.211822,0.255647 0.620858,0.438252 0.409036,0.175301 1.658056,0.445557 1.482755,0.314081 2.118221,0.584337 0.642771,0.262952 1.015286,0.620858 0.372515,0.350602 0.569728,0.847289 0.197214,0.489382 0.197214,1.132153 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.3739756"
+       id="path4758"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/resources/help/button_start_PS5.svg b/resources/help/button_start_PS5.svg
new file mode 100644
index 000000000..d6239c885
--- /dev/null
+++ b/resources/help/button_start_PS5.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg4"
+   sodipodi:docname="button_start.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview6"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="22.940221"
+     inkscape:cx="50.938226"
+     inkscape:cy="35.790928"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:0.99427478;stroke:none;stroke-width:2.90203929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 32 4 A 27.999998 27.999998 0 0 0 4 32 A 27.999998 27.999998 0 0 0 32 60 A 27.999998 27.999998 0 0 0 60 32 A 27.999998 27.999998 0 0 0 32 4 z M 15.720703 19.443359 L 48.279297 19.443359 C 48.467538 19.443359 48.643383 19.486135 48.792969 19.578125 C 48.942554 19.670113 49.083984 19.839235 49.083984 20.058594 L 49.083984 22.714844 C 49.083984 22.934202 48.942554 23.101369 48.792969 23.193359 C 48.643383 23.285345 48.467538 23.328125 48.279297 23.328125 L 15.720703 23.328125 C 15.532462 23.328125 15.356617 23.285349 15.207031 23.193359 C 15.057446 23.101371 14.916016 22.934202 14.916016 22.714844 L 14.916016 20.058594 C 14.916016 19.839235 15.057446 19.670115 15.207031 19.578125 C 15.356617 19.486139 15.532462 19.443359 15.720703 19.443359 z M 15.720703 28.097656 L 48.279297 28.097656 C 48.467538 28.097656 48.643383 28.140432 48.792969 28.232422 C 48.942554 28.32441 49.083984 28.491578 49.083984 28.710938 L 49.083984 31.367188 C 49.083984 31.586545 48.942554 31.753713 48.792969 31.845703 C 48.643383 31.937689 48.467538 31.980469 48.279297 31.980469 L 15.720703 31.980469 C 15.532462 31.980469 15.356617 31.937693 15.207031 31.845703 C 15.057446 31.753715 14.916016 31.586545 14.916016 31.367188 L 14.916016 28.710938 C 14.916016 28.491577 15.057446 28.324412 15.207031 28.232422 C 15.356617 28.140436 15.532462 28.097656 15.720703 28.097656 z M 15.720703 36.75 L 48.279297 36.75 C 48.467538 36.75 48.643383 36.792777 48.792969 36.884766 C 48.942554 36.976754 49.083984 37.143923 49.083984 37.363281 L 49.083984 40.019531 C 49.083984 40.23889 48.942554 40.406057 48.792969 40.498047 C 48.643383 40.590032 48.467538 40.632812 48.279297 40.632812 L 15.720703 40.632812 C 15.532462 40.632812 15.356617 40.590037 15.207031 40.498047 C 15.057446 40.406058 14.916016 40.23889 14.916016 40.019531 L 14.916016 37.363281 C 14.916016 37.143923 15.057446 36.976756 15.207031 36.884766 C 15.356617 36.79278 15.532462 36.75 15.720703 36.75 z "
+     id="path4749" />
+</svg>
diff --git a/resources/help/button_start_SNES.svg b/resources/help/button_start_SNES.svg
new file mode 100644
index 000000000..0ff66cc20
--- /dev/null
+++ b/resources/help/button_start_SNES.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg16"
+   sodipodi:docname="button_start_SNES.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="16.328968"
+     inkscape:cx="19.36457"
+     inkscape:cy="38.737222"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     id="outline"
+     d="m2 42a7 7 0 0 1 7-7h46a7 7 0 0 1 7 7 7 7 0 0 1-7 7h-46a7 7 0 0 1-7-7z"
+     fill="#fff"
+     stroke="#fff"
+     stroke-linejoin="round"
+     stroke-width="2" />
+  <g
+     aria-label="START"
+     transform="scale(0.88808133,1.126023)"
+     style="font-style:normal;font-weight:normal;font-size:15.61083698px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.39027089"
+     id="text4763">
+    <path
+       d="m 20.258015,22.465529 q 0,1.577853 -1.173861,2.416325 -1.16624,0.830851 -3.430116,0.830851 -2.065692,0 -3.239554,-0.731758 -1.173861,-0.731758 -1.50925,-2.218142 l 2.172406,-0.358256 q 0.221052,0.853717 0.86134,1.242464 0.640288,0.381124 1.776038,0.381124 2.355346,0 2.355346,-1.433026 0,-0.457349 -0.274409,-0.754626 -0.266787,-0.297276 -0.762248,-0.495461 -0.487839,-0.198184 -1.882753,-0.480216 -1.204351,-0.282032 -1.676945,-0.449726 -0.472594,-0.175317 -0.853718,-0.403992 -0.381124,-0.236297 -0.64791,-0.564063 -0.266787,-0.327767 -0.419237,-0.76987 -0.144827,-0.442104 -0.144827,-1.01379 0,-1.455894 1.090015,-2.225764 1.097637,-0.777493 3.186196,-0.777493 1.997089,0 2.995634,0.625043 1.006167,0.625044 1.295822,2.065692 l -2.180029,0.297277 q -0.167695,-0.693646 -0.686024,-1.04428 -0.510706,-0.350634 -1.471138,-0.350634 -2.042824,0 -2.042824,1.280577 0,0.419236 0.213429,0.686023 0.221052,0.266787 0.647911,0.457349 0.426859,0.182939 1.730302,0.464971 1.547364,0.327766 2.210519,0.609798 0.670779,0.274409 1.059525,0.647911 0.388746,0.365879 0.594553,0.884207 0.205807,0.510706 0.205807,1.181485 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4746" />
+    <path
+       d="m 26.759989,16.558107 v 9.002148 H 24.511358 V 16.558107 H 21.04313 v -1.737925 h 9.19271 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4748" />
+    <path
+       d="m 37.881186,25.560255 -0.95281,-2.744092 h -4.093271 l -0.95281,2.744092 h -2.248632 l 3.917955,-10.740073 h 2.652622 l 3.902709,10.740073 z m -3.003257,-9.085995 -0.04574,0.167695 q -0.07623,0.274409 -0.182939,0.625043 -0.106715,0.350634 -1.311067,3.856974 h 3.087104 l -1.059524,-3.087104 -0.327767,-1.036657 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4750" />
+    <path
+       d="m 48.941404,25.560255 -2.492551,-4.078026 h -2.637378 v 4.078026 H 41.562844 V 14.820182 h 5.366225 q 1.920865,0 2.965144,0.83085 1.04428,0.823228 1.04428,2.370591 0,1.128127 -0.640288,1.951355 -0.640288,0.815605 -1.730303,1.074769 l 2.904165,4.512508 z m -0.266787,-7.447162 q 0,-1.547363 -1.981845,-1.547363 h -2.881297 v 3.170951 h 2.942277 q 0.945187,0 1.433026,-0.426859 0.487839,-0.426859 0.487839,-1.196729 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4752" />
+    <path
+       d="m 57.684388,16.558107 v 9.002148 h -2.248632 v -9.002148 h -3.468227 v -1.737925 h 9.192709 v 1.737925 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.39027089"
+       id="path4754" />
+  </g>
+</svg>
diff --git a/resources/help/button_start_XBOX.svg b/resources/help/button_start_XBOX.svg
new file mode 100644
index 000000000..d6239c885
--- /dev/null
+++ b/resources/help/button_start_XBOX.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg4"
+   sodipodi:docname="button_start.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview6"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="22.940221"
+     inkscape:cx="50.938226"
+     inkscape:cy="35.790928"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:0.99427478;stroke:none;stroke-width:2.90203929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 32 4 A 27.999998 27.999998 0 0 0 4 32 A 27.999998 27.999998 0 0 0 32 60 A 27.999998 27.999998 0 0 0 60 32 A 27.999998 27.999998 0 0 0 32 4 z M 15.720703 19.443359 L 48.279297 19.443359 C 48.467538 19.443359 48.643383 19.486135 48.792969 19.578125 C 48.942554 19.670113 49.083984 19.839235 49.083984 20.058594 L 49.083984 22.714844 C 49.083984 22.934202 48.942554 23.101369 48.792969 23.193359 C 48.643383 23.285345 48.467538 23.328125 48.279297 23.328125 L 15.720703 23.328125 C 15.532462 23.328125 15.356617 23.285349 15.207031 23.193359 C 15.057446 23.101371 14.916016 22.934202 14.916016 22.714844 L 14.916016 20.058594 C 14.916016 19.839235 15.057446 19.670115 15.207031 19.578125 C 15.356617 19.486139 15.532462 19.443359 15.720703 19.443359 z M 15.720703 28.097656 L 48.279297 28.097656 C 48.467538 28.097656 48.643383 28.140432 48.792969 28.232422 C 48.942554 28.32441 49.083984 28.491578 49.083984 28.710938 L 49.083984 31.367188 C 49.083984 31.586545 48.942554 31.753713 48.792969 31.845703 C 48.643383 31.937689 48.467538 31.980469 48.279297 31.980469 L 15.720703 31.980469 C 15.532462 31.980469 15.356617 31.937693 15.207031 31.845703 C 15.057446 31.753715 14.916016 31.586545 14.916016 31.367188 L 14.916016 28.710938 C 14.916016 28.491577 15.057446 28.324412 15.207031 28.232422 C 15.356617 28.140436 15.532462 28.097656 15.720703 28.097656 z M 15.720703 36.75 L 48.279297 36.75 C 48.467538 36.75 48.643383 36.792777 48.792969 36.884766 C 48.942554 36.976754 49.083984 37.143923 49.083984 37.363281 L 49.083984 40.019531 C 49.083984 40.23889 48.942554 40.406057 48.792969 40.498047 C 48.643383 40.590032 48.467538 40.632812 48.279297 40.632812 L 15.720703 40.632812 C 15.532462 40.632812 15.356617 40.590037 15.207031 40.498047 C 15.057446 40.406058 14.916016 40.23889 14.916016 40.019531 L 14.916016 37.363281 C 14.916016 37.143923 15.057446 36.976756 15.207031 36.884766 C 15.356617 36.79278 15.532462 36.75 15.720703 36.75 z "
+     id="path4749" />
+</svg>
diff --git a/resources/help/button_start_XBOX360.svg b/resources/help/button_start_XBOX360.svg
new file mode 100644
index 000000000..656deb9d2
--- /dev/null
+++ b/resources/help/button_start_XBOX360.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   id="svg16"
+   sodipodi:docname="button_start.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <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>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="8.110593"
+     inkscape:cx="15.256979"
+     inkscape:cy="28.10138"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     style="opacity:1;fill:#ffffff;fill-opacity:0.97137403;stroke:none;stroke-width:2.86624074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 27.294922 7.9726562 C 13.799027 7.9726562 2.9355469 18.688606 2.9355469 32 C 2.9355469 45.311394 13.799027 56.027344 27.294922 56.027344 L 36.705078 56.027344 C 50.200973 56.027344 61.064453 45.311394 61.064453 32 C 61.064453 18.688606 50.200973 7.9726562 36.705078 7.9726562 L 27.294922 7.9726562 z M 23.107422 15.101562 L 36.759766 23.550781 L 50.412109 32 L 36.759766 40.449219 L 23.107422 48.898438 L 23.107422 32 L 23.107422 15.101562 z "
+     id="rect4801" />
+</svg>
diff --git a/resources/help/button_square.svg b/resources/help/button_x_PS.svg
similarity index 100%
rename from resources/help/button_square.svg
rename to resources/help/button_x_PS.svg
diff --git a/resources/help/button_y.svg b/resources/help/button_x_SNES.svg
similarity index 100%
rename from resources/help/button_y.svg
rename to resources/help/button_x_SNES.svg
diff --git a/resources/help/button_x.svg b/resources/help/button_x_XBOX.svg
similarity index 100%
rename from resources/help/button_x.svg
rename to resources/help/button_x_XBOX.svg
diff --git a/resources/help/button_triangle.svg b/resources/help/button_y_PS.svg
similarity index 100%
rename from resources/help/button_triangle.svg
rename to resources/help/button_y_PS.svg
diff --git a/resources/help/button_y_SNES.svg b/resources/help/button_y_SNES.svg
new file mode 100644
index 000000000..c0898eb23
--- /dev/null
+++ b/resources/help/button_y_SNES.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+ <circle id="outline" cx="32" cy="32" r="28" fill="none" stroke="#fff" stroke-width="2"/>
+ <path id="button_x" d="m32 4a28 28 0 0 0-28 28 28 28 0 0 0 28 28 28 28 0 0 0 28-28 28 28 0 0 0-28-28zm-9.736328 13.722656h6.875l2.929687 7.265625 2.539063-7.265625h7.109375l-6.035156 13.945313 6.523437 14.609375h-7.050781l-3.28125-8.144532-3.007813 8.144532h-7.070312l6.523437-14.824219-6.054687-13.730469z" fill="#fff"/>
+</svg>
diff --git a/resources/help/button_y_XBOX.svg b/resources/help/button_y_XBOX.svg
new file mode 100644
index 000000000..11ef2d2b8
--- /dev/null
+++ b/resources/help/button_y_XBOX.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
+ <circle id="outline" cx="32" cy="32" r="28" fill="none" stroke="#fff" stroke-width="2"/>
+ <path id="button_y" d="m32 4a28 28 0 0 0-28 28 28 28 0 0 0 28 28 28 28 0 0 0 28-28 28 28 0 0 0-28-28zm-10.107422 13.722656h7.148438l2.988281 8.847656c0.963542-2.82552 1.953125-5.774739 2.96875-8.847656h7.109375l-6.738281 17.03125v11.523438h-6.757813v-11.328125l-6.71875-17.226563z" fill="#fff"/>
+</svg>
diff --git a/resources/help/buttons_south_PS.svg b/resources/help/mbuttons_a_PS.svg
similarity index 100%
rename from resources/help/buttons_south_PS.svg
rename to resources/help/mbuttons_a_PS.svg
diff --git a/resources/help/buttons_south_SNES.svg b/resources/help/mbuttons_a_SNES.svg
similarity index 100%
rename from resources/help/buttons_south_SNES.svg
rename to resources/help/mbuttons_a_SNES.svg
diff --git a/resources/help/buttons_south_XBOX.svg b/resources/help/mbuttons_a_XBOX.svg
similarity index 100%
rename from resources/help/buttons_south_XBOX.svg
rename to resources/help/mbuttons_a_XBOX.svg
diff --git a/resources/help/buttons_east_PS.svg b/resources/help/mbuttons_b_PS.svg
similarity index 100%
rename from resources/help/buttons_east_PS.svg
rename to resources/help/mbuttons_b_PS.svg
diff --git a/resources/help/buttons_east_SNES.svg b/resources/help/mbuttons_b_SNES.svg
similarity index 100%
rename from resources/help/buttons_east_SNES.svg
rename to resources/help/mbuttons_b_SNES.svg
diff --git a/resources/help/buttons_east_XBOX.svg b/resources/help/mbuttons_b_XBOX.svg
similarity index 100%
rename from resources/help/buttons_east_XBOX.svg
rename to resources/help/mbuttons_b_XBOX.svg
diff --git a/resources/help/buttons_west_PS.svg b/resources/help/mbuttons_x_PS.svg
similarity index 100%
rename from resources/help/buttons_west_PS.svg
rename to resources/help/mbuttons_x_PS.svg
diff --git a/resources/help/buttons_west_SNES.svg b/resources/help/mbuttons_x_SNES.svg
similarity index 100%
rename from resources/help/buttons_west_SNES.svg
rename to resources/help/mbuttons_x_SNES.svg
diff --git a/resources/help/buttons_west_XBOX.svg b/resources/help/mbuttons_x_XBOX.svg
similarity index 100%
rename from resources/help/buttons_west_XBOX.svg
rename to resources/help/mbuttons_x_XBOX.svg
diff --git a/resources/help/buttons_north_PS.svg b/resources/help/mbuttons_y_PS.svg
similarity index 100%
rename from resources/help/buttons_north_PS.svg
rename to resources/help/mbuttons_y_PS.svg
diff --git a/resources/help/buttons_north_SNES.svg b/resources/help/mbuttons_y_SNES.svg
similarity index 100%
rename from resources/help/buttons_north_SNES.svg
rename to resources/help/mbuttons_y_SNES.svg
diff --git a/resources/help/buttons_north_XBOX.svg b/resources/help/mbuttons_y_XBOX.svg
similarity index 100%
rename from resources/help/buttons_north_XBOX.svg
rename to resources/help/mbuttons_y_XBOX.svg