diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0e1115b3..8ecbbf0d6 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -897,6 +897,9 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
            src/qt_gui/cheats_patches.h
            src/qt_gui/compatibility_info.cpp
            src/qt_gui/compatibility_info.h
+	   src/qt_gui/control_settings.cpp	   
+           src/qt_gui/control_settings.h
+           src/qt_gui/control_settings.ui
            src/qt_gui/main_window_ui.h
            src/qt_gui/main_window.cpp
            src/qt_gui/main_window.h
diff --git a/REUSE.toml b/REUSE.toml
index a62974bcd..63242edb2 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -38,6 +38,7 @@ path = [
     "src/images/list_mode_icon.png",
     "src/images/pause_icon.png",
     "src/images/play_icon.png",
+    "src/images/ps4_controller.png",
     "src/images/refresh_icon.png",
     "src/images/settings_icon.png",
     "src/images/stop_icon.png",
diff --git a/src/images/ps4_controller.png b/src/images/ps4_controller.png
new file mode 100644
index 000000000..0e2c1d4f1
Binary files /dev/null and b/src/images/ps4_controller.png differ
diff --git a/src/qt_gui/control_settings.cpp b/src/qt_gui/control_settings.cpp
new file mode 100644
index 000000000..0374d2049
--- /dev/null
+++ b/src/qt_gui/control_settings.cpp
@@ -0,0 +1,498 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <fstream>
+#include <QMessageBox>
+#include "common/path_util.h"
+#include "control_settings.h"
+#include "kbm_config_dialog.h"
+#include "ui_control_settings.h"
+
+ControlSettings::ControlSettings(std::shared_ptr<GameInfoClass> game_info_get, QWidget* parent)
+    : QDialog(parent), m_game_info(game_info_get), ui(new Ui::ControlSettings) {
+
+    ui->setupUi(this);
+    ui->PerGameCheckBox->setChecked(!Config::GetUseUnifiedInputConfig());
+
+    AddBoxItems();
+    SetUIValuestoMappings();
+
+    connect(ui->buttonBox, &QDialogButtonBox::clicked, this, [this](QAbstractButton* button) {
+        if (button == ui->buttonBox->button(QDialogButtonBox::Save)) {
+            SaveControllerConfig(true);
+        } else if (button == ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)) {
+            SetDefault();
+        } else if (button == ui->buttonBox->button(QDialogButtonBox::Apply)) {
+            SaveControllerConfig(false);
+        }
+    });
+
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
+    connect(ui->KBMButton, &QPushButton::clicked, this, [this] {
+        auto KBMWindow = new EditorDialog(this);
+        KBMWindow->exec();
+    });
+    connect(ui->ProfileComboBox, &QComboBox::currentTextChanged, this, [this] {
+        GetGameTitle();
+        SetUIValuestoMappings();
+    });
+
+    connect(ui->LeftDeadzoneSlider, &QSlider::valueChanged, this,
+            [this](int value) { ui->LeftDeadzoneValue->setText(QString::number(value)); });
+    connect(ui->RightDeadzoneSlider, &QSlider::valueChanged, this,
+            [this](int value) { ui->RightDeadzoneValue->setText(QString::number(value)); });
+
+    connect(ui->LStickUpBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->LStickDownBox->setCurrentIndex(value); });
+    connect(ui->LStickDownBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->LStickUpBox->setCurrentIndex(value); });
+    connect(ui->LStickRightBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->LStickLeftBox->setCurrentIndex(value); });
+    connect(ui->LStickLeftBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->LStickRightBox->setCurrentIndex(value); });
+
+    connect(ui->RStickUpBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->RStickDownBox->setCurrentIndex(value); });
+    connect(ui->RStickDownBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->RStickUpBox->setCurrentIndex(value); });
+    connect(ui->RStickRightBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->RStickLeftBox->setCurrentIndex(value); });
+    connect(ui->RStickLeftBox, &QComboBox::currentIndexChanged, this,
+            [this](int value) { ui->RStickRightBox->setCurrentIndex(value); });
+}
+
+void ControlSettings::SaveControllerConfig(bool CloseOnSave) {
+    QList<QComboBox*> list;
+    list << ui->RStickUpBox << ui->RStickRightBox << ui->LStickUpBox << ui->LStickRightBox;
+    int count_axis_left_x = 0, count_axis_left_y = 0, count_axis_right_x = 0,
+        count_axis_right_y = 0;
+    for (const auto& i : list) {
+        if (i->currentText() == "axis_left_x") {
+            count_axis_left_x = count_axis_left_x + 1;
+        } else if (i->currentText() == "axis_left_y") {
+            count_axis_left_y = count_axis_left_y + 1;
+        } else if (i->currentText() == "axis_right_x") {
+            count_axis_right_x = count_axis_right_x + 1;
+        } else if (i->currentText() == "axis_right_y") {
+            count_axis_right_y = count_axis_right_y + 1;
+        }
+    }
+
+    if (count_axis_left_x > 1 | count_axis_left_y > 1 | count_axis_right_x > 1 |
+        count_axis_right_y > 1) {
+        QMessageBox::StandardButton nosave;
+        nosave = QMessageBox::information(this, "Unable to Save",
+                                          "Cannot bind axis values more than once");
+        return;
+    }
+
+    std::string config_id;
+    config_id = (ui->ProfileComboBox->currentText() == "Common Config")
+                    ? "default"
+                    : ui->ProfileComboBox->currentText().toStdString();
+    const auto config_file = Config::GetFoolproofKbmConfigFile(config_id);
+
+    int lineCount = 0;
+    std::string line;
+    std::vector<std::string> lines;
+    std::string output_string = "", input_string = "";
+    std::fstream file(config_file);
+
+    while (std::getline(file, line)) {
+        lineCount++;
+
+        std::size_t comment_pos = line.find('#');
+        if (comment_pos != std::string::npos) {
+            if (!line.contains("Range of deadzones"))
+                lines.push_back(line);
+            continue;
+        }
+
+        std::size_t equal_pos = line.find('=');
+        if (equal_pos == std::string::npos) {
+            lines.push_back(line);
+            continue;
+        }
+
+        output_string = line.substr(0, equal_pos - 1);
+        input_string = line.substr(equal_pos + 2);
+
+        if (std::find(ControllerInputs.begin(), ControllerInputs.end(), input_string) !=
+                ControllerInputs.end() ||
+            output_string == "analog_deadzone") {
+            line.erase();
+            continue;
+        }
+        lines.push_back(line);
+    }
+
+    file.close();
+
+    input_string = "cross";
+    output_string = ui->ABox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "circle";
+    output_string = ui->BBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "square";
+    output_string = ui->XBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "triangle";
+    output_string = ui->YBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    lines.push_back("");
+
+    input_string = "l1";
+    output_string = ui->LBBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "r1";
+    output_string = ui->RBBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "l2";
+    output_string = ui->LTBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "r2";
+    output_string = ui->RTBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "l3";
+    output_string = ui->LClickBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "r3";
+    output_string = ui->RClickBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    lines.push_back("");
+
+    input_string = "back";
+    output_string = ui->BackBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "options";
+    output_string = ui->StartBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    lines.push_back("");
+
+    input_string = "pad_up";
+    output_string = ui->DpadUpBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "pad_down";
+    output_string = ui->DpadDownBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "pad_left";
+    output_string = ui->DpadLeftBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "pad_right";
+    output_string = ui->DpadRightBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    lines.push_back("");
+
+    input_string = "axis_left_x";
+    output_string = ui->LStickRightBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "axis_left_y";
+    output_string = ui->LStickUpBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "axis_right_x";
+    output_string = ui->RStickRightBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    input_string = "axis_right_y";
+    output_string = ui->RStickUpBox->currentText().toStdString();
+    lines.push_back(output_string + " = " + input_string);
+
+    lines.push_back("");
+    lines.push_back("# Range of deadzones: 1 (almost none) to 127 (max)");
+
+    std::string deadzonevalue = std::to_string(ui->LeftDeadzoneSlider->value());
+    lines.push_back("analog_deadzone = leftjoystick, " + deadzonevalue);
+
+    deadzonevalue = std::to_string(ui->RightDeadzoneSlider->value());
+    lines.push_back("analog_deadzone = rightjoystick, " + deadzonevalue);
+
+    std::vector<std::string> save;
+    bool CurrentLineEmpty = false, LastLineEmpty = false;
+    for (auto const& line : lines) {
+        LastLineEmpty = CurrentLineEmpty ? true : false;
+        CurrentLineEmpty = line.empty() ? true : false;
+        if (!CurrentLineEmpty || !LastLineEmpty)
+            save.push_back(line);
+    }
+
+    std::ofstream output_file(config_file);
+    for (auto const& line : save) {
+        output_file << line << '\n';
+    }
+    output_file.close();
+
+    Config::SetUseUnifiedInputConfig(!ui->PerGameCheckBox->isChecked());
+    Config::save(Common::FS::GetUserPath(Common::FS::PathType::UserDir) / "config.toml");
+
+    if (CloseOnSave)
+        QWidget::close();
+}
+
+void ControlSettings::SetDefault() {
+    ui->ABox->setCurrentIndex(0);
+    ui->BBox->setCurrentIndex(1);
+    ui->XBox->setCurrentIndex(2);
+    ui->YBox->setCurrentIndex(3);
+    ui->DpadUpBox->setCurrentIndex(11);
+    ui->DpadDownBox->setCurrentIndex(12);
+    ui->DpadLeftBox->setCurrentIndex(13);
+    ui->DpadRightBox->setCurrentIndex(14);
+    ui->LClickBox->setCurrentIndex(8);
+    ui->RClickBox->setCurrentIndex(9);
+    ui->LBBox->setCurrentIndex(4);
+    ui->RBBox->setCurrentIndex(5);
+    ui->LTBox->setCurrentIndex(6);
+    ui->RTBox->setCurrentIndex(7);
+    ui->StartBox->setCurrentIndex(10);
+    ui->BackBox->setCurrentIndex(15);
+
+    ui->LStickUpBox->setCurrentIndex(1);
+    ui->LStickDownBox->setCurrentIndex(1);
+    ui->LStickLeftBox->setCurrentIndex(0);
+    ui->LStickRightBox->setCurrentIndex(0);
+    ui->RStickUpBox->setCurrentIndex(3);
+    ui->RStickDownBox->setCurrentIndex(3);
+    ui->RStickLeftBox->setCurrentIndex(2);
+    ui->RStickRightBox->setCurrentIndex(2);
+
+    ui->LeftDeadzoneSlider->setValue(2);
+    ui->RightDeadzoneSlider->setValue(2);
+}
+
+void ControlSettings::AddBoxItems() {
+    ui->DpadUpBox->addItems(ButtonOutputs);
+    ui->DpadDownBox->addItems(ButtonOutputs);
+    ui->DpadLeftBox->addItems(ButtonOutputs);
+    ui->DpadRightBox->addItems(ButtonOutputs);
+    ui->LBBox->addItems(ButtonOutputs);
+    ui->RBBox->addItems(ButtonOutputs);
+    ui->LTBox->addItems(ButtonOutputs);
+    ui->RTBox->addItems(ButtonOutputs);
+    ui->RClickBox->addItems(ButtonOutputs);
+    ui->LClickBox->addItems(ButtonOutputs);
+    ui->StartBox->addItems(ButtonOutputs);
+    ui->ABox->addItems(ButtonOutputs);
+    ui->BBox->addItems(ButtonOutputs);
+    ui->XBox->addItems(ButtonOutputs);
+    ui->YBox->addItems(ButtonOutputs);
+    ui->BackBox->addItems(ButtonOutputs);
+
+    ui->LStickUpBox->addItems(StickOutputs);
+    ui->LStickDownBox->addItems(StickOutputs);
+    ui->LStickLeftBox->addItems(StickOutputs);
+    ui->LStickRightBox->addItems(StickOutputs);
+    ui->RStickUpBox->addItems(StickOutputs);
+    ui->RStickDownBox->addItems(StickOutputs);
+    ui->RStickLeftBox->addItems(StickOutputs);
+    ui->RStickRightBox->addItems(StickOutputs);
+
+    ui->ProfileComboBox->addItem("Common Config");
+    for (int i = 0; i < m_game_info->m_games.size(); i++) {
+        ui->ProfileComboBox->addItem(QString::fromStdString(m_game_info->m_games[i].serial));
+    }
+    ui->ProfileComboBox->setCurrentText("Common Config");
+    ui->TitleLabel->setText("Common Config");
+}
+
+void ControlSettings::SetUIValuestoMappings() {
+    std::string config_id;
+    config_id = (ui->ProfileComboBox->currentText() == "Common Config")
+                    ? "default"
+                    : ui->ProfileComboBox->currentText().toStdString();
+
+    const auto config_file = Config::GetFoolproofKbmConfigFile(config_id);
+    std::ifstream file(config_file);
+
+    bool CrossExists = false, CircleExists = false, SquareExists = false, TriangleExists = false,
+         L1Exists = false, L2Exists = false, L3Exists = false, R1Exists = false, R2Exists = false,
+         R3Exists = false, DPadUpExists = false, DPadDownExists = false, DPadLeftExists = false,
+         DPadRightExists = false, StartExists = false, BackExists = false, LStickXExists = false,
+         LStickYExists = false, RStickXExists = false, RStickYExists = false;
+    int lineCount = 0;
+    std::string line = "";
+    while (std::getline(file, line)) {
+        lineCount++;
+
+        line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
+        if (line.empty())
+            continue;
+
+        std::size_t comment_pos = line.find('#');
+        if (comment_pos != std::string::npos)
+            line = line.substr(0, comment_pos);
+
+        std::size_t equal_pos = line.find('=');
+        if (equal_pos == std::string::npos)
+            continue;
+
+        std::string output_string = line.substr(0, equal_pos);
+        std::string input_string = line.substr(equal_pos + 1);
+
+        if (std::find(ControllerInputs.begin(), ControllerInputs.end(), input_string) !=
+                ControllerInputs.end() ||
+            output_string == "analog_deadzone") {
+            if (input_string == "cross") {
+                ui->ABox->setCurrentText(QString::fromStdString(output_string));
+                CrossExists = true;
+            } else if (input_string == "circle") {
+                ui->BBox->setCurrentText(QString::fromStdString(output_string));
+                CircleExists = true;
+            } else if (input_string == "square") {
+                ui->XBox->setCurrentText(QString::fromStdString(output_string));
+                SquareExists = true;
+            } else if (input_string == "triangle") {
+                ui->YBox->setCurrentText(QString::fromStdString(output_string));
+                TriangleExists = true;
+            } else if (input_string == "l1") {
+                ui->LBBox->setCurrentText(QString::fromStdString(output_string));
+                L1Exists = true;
+            } else if (input_string == "l2") {
+                ui->LTBox->setCurrentText(QString::fromStdString(output_string));
+                L2Exists = true;
+            } else if (input_string == "r1") {
+                ui->RBBox->setCurrentText(QString::fromStdString(output_string));
+                R1Exists = true;
+            } else if (input_string == "r2") {
+                ui->RTBox->setCurrentText(QString::fromStdString(output_string));
+                R2Exists = true;
+            } else if (input_string == "l3") {
+                ui->LClickBox->setCurrentText(QString::fromStdString(output_string));
+                L3Exists = true;
+            } else if (input_string == "r3") {
+                ui->RClickBox->setCurrentText(QString::fromStdString(output_string));
+                R3Exists = true;
+            } else if (input_string == "pad_up") {
+                ui->DpadUpBox->setCurrentText(QString::fromStdString(output_string));
+                DPadUpExists = true;
+            } else if (input_string == "pad_down") {
+                ui->DpadDownBox->setCurrentText(QString::fromStdString(output_string));
+                DPadDownExists = true;
+            } else if (input_string == "pad_left") {
+                ui->DpadLeftBox->setCurrentText(QString::fromStdString(output_string));
+                DPadLeftExists = true;
+            } else if (input_string == "pad_right") {
+                ui->DpadRightBox->setCurrentText(QString::fromStdString(output_string));
+                DPadRightExists = true;
+            } else if (input_string == "options") {
+                ui->StartBox->setCurrentText(QString::fromStdString(output_string));
+                StartExists = true;
+            } else if (input_string == "back") {
+                ui->BackBox->setCurrentText(QString::fromStdString(output_string));
+                BackExists = true;
+            } else if (input_string == "axis_left_x") {
+                ui->LStickRightBox->setCurrentText(QString::fromStdString(output_string));
+                ui->LStickLeftBox->setCurrentText(QString::fromStdString(output_string));
+                LStickXExists = true;
+            } else if (input_string == "axis_left_y") {
+                ui->LStickUpBox->setCurrentText(QString::fromStdString(output_string));
+                ui->LStickDownBox->setCurrentText(QString::fromStdString(output_string));
+                LStickYExists = true;
+            } else if (input_string == "axis_right_x") {
+                ui->RStickRightBox->setCurrentText(QString::fromStdString(output_string));
+                ui->RStickLeftBox->setCurrentText(QString::fromStdString(output_string));
+                RStickXExists = true;
+            } else if (input_string == "axis_right_y") {
+                ui->RStickUpBox->setCurrentText(QString::fromStdString(output_string));
+                ui->RStickDownBox->setCurrentText(QString::fromStdString(output_string));
+                RStickYExists = true;
+            } else if (input_string.contains("leftjoystick")) {
+                std::size_t comma_pos = line.find(',');
+                int deadzonevalue = std::stoi(line.substr(comma_pos + 1));
+                ui->LeftDeadzoneSlider->setValue(deadzonevalue);
+                ui->LeftDeadzoneValue->setText(QString::number(deadzonevalue));
+            } else if (input_string.contains("rightjoystick")) {
+                std::size_t comma_pos = line.find(',');
+                int deadzonevalue = std::stoi(line.substr(comma_pos + 1));
+                ui->RightDeadzoneSlider->setValue(deadzonevalue);
+                ui->RightDeadzoneValue->setText(QString::number(deadzonevalue));
+            }
+        }
+    }
+
+    // If an entry does not exist in the config file, we assume the user wants it unmapped
+    if (!CrossExists)
+        ui->ABox->setCurrentText("unmapped");
+    if (!CircleExists)
+        ui->BBox->setCurrentText("unmapped");
+    if (!SquareExists)
+        ui->XBox->setCurrentText("unmapped");
+    if (!TriangleExists)
+        ui->YBox->setCurrentText("unmapped");
+    if (!L1Exists)
+        ui->LBBox->setCurrentText("unmapped");
+    if (!L2Exists)
+        ui->LTBox->setCurrentText("unmapped");
+    if (!L3Exists)
+        ui->LClickBox->setCurrentText("unmapped");
+    if (!R1Exists)
+        ui->RBBox->setCurrentText("unmapped");
+    if (!R2Exists)
+        ui->RTBox->setCurrentText("unmapped");
+    if (!R3Exists)
+        ui->RClickBox->setCurrentText("unmapped");
+    if (!DPadUpExists)
+        ui->DpadUpBox->setCurrentText("unmapped");
+    if (!DPadDownExists)
+        ui->DpadDownBox->setCurrentText("unmapped");
+    if (!DPadLeftExists)
+        ui->DpadLeftBox->setCurrentText("unmapped");
+    if (!DPadRightExists)
+        ui->DpadRightBox->setCurrentText("unmapped");
+    if (!BackExists)
+        ui->BackBox->setCurrentText("unmapped");
+    if (!StartExists)
+        ui->StartBox->setCurrentText("unmapped");
+
+    if (!LStickXExists) {
+        ui->LStickRightBox->setCurrentText("unmapped");
+        ui->LStickLeftBox->setCurrentText("unmapped");
+    }
+    if (!LStickYExists) {
+        ui->LStickUpBox->setCurrentText("unmapped");
+        ui->LStickDownBox->setCurrentText("unmapped");
+    }
+    if (!RStickXExists) {
+        ui->RStickRightBox->setCurrentText("unmapped");
+        ui->RStickLeftBox->setCurrentText("unmapped");
+    }
+    if (!RStickYExists) {
+        ui->RStickUpBox->setCurrentText("unmapped");
+        ui->RStickDownBox->setCurrentText("unmapped");
+    }
+
+    file.close();
+}
+
+void ControlSettings::GetGameTitle() {
+    if (ui->ProfileComboBox->currentText() == "Common Config") {
+        ui->TitleLabel->setText("Common Config");
+    } else {
+        for (int i = 0; i < m_game_info->m_games.size(); i++) {
+            if (m_game_info->m_games[i].serial ==
+                ui->ProfileComboBox->currentText().toStdString()) {
+                ui->TitleLabel->setText(QString::fromStdString(m_game_info->m_games[i].name));
+            }
+        }
+    }
+}
+
+ControlSettings::~ControlSettings() {}
diff --git a/src/qt_gui/control_settings.h b/src/qt_gui/control_settings.h
new file mode 100644
index 000000000..04227f3a8
--- /dev/null
+++ b/src/qt_gui/control_settings.h
@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <QDialog>
+#include "game_info.h"
+
+namespace Ui {
+class ControlSettings;
+}
+
+class ControlSettings : public QDialog {
+    Q_OBJECT
+public:
+    explicit ControlSettings(std::shared_ptr<GameInfoClass> game_info_get,
+                             QWidget* parent = nullptr);
+    ~ControlSettings();
+
+private Q_SLOTS:
+    void SaveControllerConfig(bool CloseOnSave);
+    void SetDefault();
+
+private:
+    std::unique_ptr<Ui::ControlSettings> ui;
+    std::shared_ptr<GameInfoClass> m_game_info;
+
+    void AddBoxItems();
+    void SetUIValuestoMappings();
+    void GetGameTitle();
+
+    const std::vector<std::string> ControllerInputs = {
+        "cross",        "circle",    "square",      "triangle",    "l1",
+        "r1",           "l2",        "r2",          "l3",
+
+        "r3",           "options",   "pad_up",
+
+        "pad_down",
+
+        "pad_left",     "pad_right", "axis_left_x", "axis_left_y", "axis_right_x",
+        "axis_right_y", "back"};
+
+    const QStringList ButtonOutputs = {"cross",    "circle",    "square",   "triangle", "l1",
+                                       "r1",       "l2",        "r2",       "l3",
+
+                                       "r3",       "options",   "pad_up",
+
+                                       "pad_down",
+
+                                       "pad_left", "pad_right", "touchpad", "unmapped"};
+
+    const QStringList StickOutputs = {"axis_left_x", "axis_left_y", "axis_right_x", "axis_right_y",
+                                      "unmapped"};
+};
diff --git a/src/qt_gui/control_settings.ui b/src/qt_gui/control_settings.ui
new file mode 100644
index 000000000..b6acb5ca9
--- /dev/null
+++ b/src/qt_gui/control_settings.ui
@@ -0,0 +1,1379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+     SPDX-License-Identifier: GPL-2.0-or-later -->
+<ui version="4.0">
+ <class>ControlSettings</class>
+ <widget class="QDialog" name="ControlSettings">
+  <property name="windowModality">
+   <enum>Qt::WindowModality::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1012</width>
+    <height>721</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Configure Controls</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>:/rpcs3.ico</normaloff>:/rpcs3.ico</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::Shape::NoFrame</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QTabWidget" name="tabWidget">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>994</width>
+        <height>673</height>
+       </rect>
+      </property>
+      <widget class="QWidget" name="tab">
+       <attribute name="title">
+        <string>Control Settings</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="mainLayout">
+        <property name="leftMargin">
+         <number>5</number>
+        </property>
+        <property name="topMargin">
+         <number>5</number>
+        </property>
+        <property name="rightMargin">
+         <number>5</number>
+        </property>
+        <property name="bottomMargin">
+         <number>5</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" name="bottomLayout">
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_left">
+            <property name="spacing">
+             <number>5</number>
+            </property>
+            <item>
+             <widget class="QGroupBox" name="gb_dpad">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="title">
+               <string>D-Pad</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_dpad_layout">
+               <property name="spacing">
+                <number>6</number>
+               </property>
+               <property name="leftMargin">
+                <number>5</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>5</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
+               <item>
+                <widget class="QWidget" name="dpad_up" native="true">
+                 <layout class="QHBoxLayout" name="dpad_up_layout">
+                  <property name="spacing">
+                   <number>0</number>
+                  </property>
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_dpad_up">
+                    <property name="minimumSize">
+                     <size>
+                      <width>124</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>0</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Up</string>
+                    </property>
+                    <layout class="QHBoxLayout" name="horizontalLayout_4">
+                     <item>
+                      <widget class="QComboBox" name="DpadUpBox">
+                       <property name="editable">
+                        <bool>false</bool>
+                       </property>
+                       <property name="sizeAdjustPolicy">
+                        <enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="layout_dpad_left_right">
+                 <item>
+                  <widget class="QGroupBox" name="gb_dpad_left">
+                   <property name="title">
+                    <string>Left</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_dpad_left_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="DpadLeftBox"/>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QGroupBox" name="gb_dpad_right">
+                   <property name="title">
+                    <string>Right</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_dpad_right_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="DpadRightBox">
+                      <property name="editable">
+                       <bool>false</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QWidget" name="dpad_down" native="true">
+                 <layout class="QHBoxLayout" name="dpad_down_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_dpad_down">
+                    <property name="maximumSize">
+                     <size>
+                      <width>124</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Down</string>
+                    </property>
+                    <layout class="QHBoxLayout" name="horizontalLayout_3">
+                     <item>
+                      <widget class="QComboBox" name="DpadDownBox">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                       <property name="sizePolicy">
+                        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                         <horstretch>0</horstretch>
+                         <verstretch>0</verstretch>
+                        </sizepolicy>
+                       </property>
+                       <property name="minimumSize">
+                        <size>
+                         <width>0</width>
+                         <height>0</height>
+                        </size>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Orientation::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Policy::Maximum</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="LeftStickDeadZoneGB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="title">
+               <string>Left Stick Deadzone (def:2 max:127)</string>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_15">
+               <item>
+                <widget class="QLabel" name="LeftDeadzoneValue">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Left Deadzone</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QSlider" name="LeftDeadzoneSlider">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>127</number>
+                 </property>
+                 <property name="orientation">
+                  <enum>Qt::Orientation::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="gb_left_stick">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="title">
+               <string>Left Stick</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_left_stick_layout">
+               <property name="leftMargin">
+                <number>5</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>5</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
+               <item>
+                <widget class="QWidget" name="left_stick_up" native="true">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>2121</height>
+                  </size>
+                 </property>
+                 <layout class="QHBoxLayout" name="left_stick_up_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_left_stick_up">
+                    <property name="minimumSize">
+                     <size>
+                      <width>0</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>124</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Up</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_10">
+                     <item>
+                      <widget class="QComboBox" name="LStickUpBox">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="layout_left_stick_left_right">
+                 <item>
+                  <widget class="QGroupBox" name="gb_left_stick_left">
+                   <property name="title">
+                    <string>Left</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_left_stick_left_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="LStickLeftBox">
+                      <property name="enabled">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QGroupBox" name="gb_left_stick_right">
+                   <property name="maximumSize">
+                    <size>
+                     <width>179</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="title">
+                    <string>Right</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_left_stick_right_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="LStickRightBox">
+                      <property name="enabled">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QWidget" name="left_stick_down" native="true">
+                 <layout class="QHBoxLayout" name="left_stick_down_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_left_stick_down">
+                    <property name="minimumSize">
+                     <size>
+                      <width>124</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>124</width>
+                      <height>21212</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Down</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_8">
+                     <item>
+                      <widget class="QComboBox" name="LStickDownBox">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                       <property name="editable">
+                        <bool>false</bool>
+                       </property>
+                       <property name="frame">
+                        <bool>false</bool>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_middle" stretch="0,0,0,0">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QGroupBox" name="ProfileGroupBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="font">
+               <font>
+                <pointsize>12</pointsize>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="title">
+               <string>Config Selection</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignmentFlag::AlignCenter</set>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_16">
+               <item>
+                <layout class="QHBoxLayout" name="horizontalLayout_6">
+                 <item>
+                  <widget class="QComboBox" name="ProfileComboBox">
+                   <property name="font">
+                    <font>
+                     <pointsize>9</pointsize>
+                     <bold>false</bold>
+                    </font>
+                   </property>
+                   <property name="currentText">
+                    <string/>
+                   </property>
+                   <property name="currentIndex">
+                    <number>-1</number>
+                   </property>
+                   <property name="placeholderText">
+                    <string>Common Config</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="TitleLabel">
+                   <property name="font">
+                    <font>
+                     <pointsize>10</pointsize>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Common Config</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignmentFlag::AlignCenter</set>
+                   </property>
+                   <property name="wordWrap">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="PerGameCheckBox">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <pointsize>9</pointsize>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Use per-game configs</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="layout_middle_top">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout" name="layout_l1_l2">
+                <item>
+                 <widget class="QGroupBox" name="gb_l1">
+                  <property name="title">
+                   <string>L1 / LB</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="gb_l1_layout">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QComboBox" name="LBBox"/>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="gb_l2">
+                  <property name="title">
+                   <string>L2 / LT</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="gb_l2_layout">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QComboBox" name="LTBox"/>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="layout_system_buttons">
+                <item>
+                 <layout class="QVBoxLayout" name="verticalLayout_4">
+                  <property name="spacing">
+                   <number>10</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="groupBox">
+                    <property name="font">
+                     <font>
+                      <bold>true</bold>
+                     </font>
+                    </property>
+                    <property name="title">
+                     <string>KBM Controls</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_11">
+                     <item>
+                      <widget class="QPushButton" name="KBMButton">
+                       <property name="font">
+                        <font>
+                         <bold>true</bold>
+                        </font>
+                       </property>
+                       <property name="text">
+                        <string>KBM Editor</string>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QGroupBox" name="groupBox_2">
+                    <property name="title">
+                     <string>Back</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_9">
+                     <item>
+                      <widget class="QComboBox" name="BackBox"/>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="layout_r1_r2">
+                <item>
+                 <widget class="QGroupBox" name="gb_r1">
+                  <property name="title">
+                   <string>R1 / RB</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="gb_r1_layout">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QComboBox" name="RBBox"/>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="gb_r2">
+                  <property name="title">
+                   <string>R2 / RT</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="gb_r2_layout">
+                   <property name="leftMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>5</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>5</number>
+                   </property>
+                   <item>
+                    <widget class="QComboBox" name="RTBox"/>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <widget class="QWidget" name="widget_controller" native="true">
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>200</height>
+               </size>
+              </property>
+              <layout class="QHBoxLayout" name="widget_controller_layout">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QLabel" name="l_controller">
+                 <property name="maximumSize">
+                  <size>
+                   <width>415</width>
+                   <height>256</height>
+                  </size>
+                 </property>
+                 <property name="pixmap">
+                  <pixmap resource="../shadps4.qrc">:/images/ps4_controller.png</pixmap>
+                 </property>
+                 <property name="scaledContents">
+                  <bool>true</bool>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignmentFlag::AlignBottom|Qt::AlignmentFlag::AlignHCenter</set>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="layout_middle_bottom">
+              <property name="spacing">
+               <number>10</number>
+              </property>
+              <property name="sizeConstraint">
+               <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
+              </property>
+              <item>
+               <widget class="QGroupBox" name="gb_l3">
+                <property name="title">
+                 <string>L3</string>
+                </property>
+                <layout class="QVBoxLayout" name="gb_l3_layout">
+                 <property name="leftMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>5</number>
+                 </property>
+                 <item>
+                  <widget class="QComboBox" name="LClickBox"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QGroupBox" name="gb_start">
+                <property name="title">
+                 <string>Options / Start</string>
+                </property>
+                <layout class="QVBoxLayout" name="gb_start_layout">
+                 <property name="leftMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>5</number>
+                 </property>
+                 <item>
+                  <widget class="QComboBox" name="StartBox"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QGroupBox" name="gb_r3">
+                <property name="title">
+                 <string>R3</string>
+                </property>
+                <layout class="QVBoxLayout" name="gb_r3_layout">
+                 <property name="leftMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>5</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>5</number>
+                 </property>
+                 <item>
+                  <widget class="QComboBox" name="RClickBox"/>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_right">
+            <property name="spacing">
+             <number>5</number>
+            </property>
+            <item>
+             <widget class="QGroupBox" name="gb_face_buttons">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="title">
+               <string>Face Buttons</string>
+              </property>
+              <layout class="QVBoxLayout" name="gb_face_buttons_layout">
+               <property name="leftMargin">
+                <number>5</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>5</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
+               <item>
+                <widget class="QWidget" name="widget_triangle" native="true">
+                 <layout class="QHBoxLayout" name="widget_triangle_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_triangle">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="minimumSize">
+                     <size>
+                      <width>124</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>0</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Triangle / Y</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_3">
+                     <item>
+                      <widget class="QComboBox" name="YBox">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                       <property name="sizePolicy">
+                        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                         <horstretch>0</horstretch>
+                         <verstretch>0</verstretch>
+                        </sizepolicy>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="layout_square_circle">
+                 <item>
+                  <widget class="QGroupBox" name="gb_square">
+                   <property name="title">
+                    <string>Square / X</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_square_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="XBox"/>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QGroupBox" name="gb_circle">
+                   <property name="title">
+                    <string>Circle / B</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_circle_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="BBox"/>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QWidget" name="widget_cross" native="true">
+                 <layout class="QHBoxLayout" name="widget_cross_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_cross">
+                    <property name="minimumSize">
+                     <size>
+                      <width>124</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>124</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Cross / A</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_5">
+                     <item>
+                      <widget class="QComboBox" name="ABox"/>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Orientation::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Policy::Maximum</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="RightStickDeadZoneGB">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="title">
+               <string>Right Stick Deadzone (def:2, max:127)</string>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_13">
+               <item>
+                <widget class="QLabel" name="RightDeadzoneValue">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Right Deadzone</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QSlider" name="RightDeadzoneSlider">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>127</number>
+                 </property>
+                 <property name="orientation">
+                  <enum>Qt::Orientation::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="gb_right_stick">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="title">
+               <string>Right Stick</string>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_2">
+               <property name="leftMargin">
+                <number>5</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>5</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
+               <item>
+                <widget class="QWidget" name="widget_right_stick_up" native="true">
+                 <layout class="QHBoxLayout" name="widget_right_stick_up_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_right_stick_up">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="minimumSize">
+                     <size>
+                      <width>0</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>124</width>
+                      <height>1231321</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Up</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_7">
+                     <item>
+                      <widget class="QComboBox" name="RStickUpBox">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="layout_right_stick_left_right">
+                 <item>
+                  <widget class="QGroupBox" name="gb_right_stick_left">
+                   <property name="title">
+                    <string>Left</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_right_stick_left_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="RStickLeftBox">
+                      <property name="enabled">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QGroupBox" name="gb_right_stick_right">
+                   <property name="title">
+                    <string>Right</string>
+                   </property>
+                   <layout class="QVBoxLayout" name="gb_right_stick_right_layout">
+                    <property name="leftMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>5</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>5</number>
+                    </property>
+                    <item>
+                     <widget class="QComboBox" name="RStickRightBox"/>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item>
+                <widget class="QWidget" name="widget_right_stick_down" native="true">
+                 <layout class="QHBoxLayout" name="widget_right_stick_down_layout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="gb_right_stick_down">
+                    <property name="minimumSize">
+                     <size>
+                      <width>124</width>
+                      <height>0</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>124</width>
+                      <height>2121</height>
+                     </size>
+                    </property>
+                    <property name="title">
+                     <string>Down</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="verticalLayout_6">
+                     <item>
+                      <widget class="QComboBox" name="RStickDownBox">
+                       <property name="enabled">
+                        <bool>true</bool>
+                       </property>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
+     </property>
+     <property name="centerButtons">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../shadps4.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index 4a6cb9103..0ab9d3a42 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -16,6 +16,7 @@
 #include "common/scm_rev.h"
 #include "common/string_util.h"
 #include "common/version.h"
+#include "control_settings.h"
 #include "core/file_format/pkg.h"
 #include "core/loader.h"
 #include "game_install_dialog.h"
@@ -301,8 +302,8 @@ void MainWindow::CreateConnects() {
 
     // this is the editor for kbm keybinds
     connect(ui->controllerButton, &QPushButton::clicked, this, [this]() {
-        EditorDialog* editorWindow = new EditorDialog(this);
-        editorWindow->exec(); // Show the editor window modally
+        auto configWindow = new ControlSettings(m_game_info, this);
+        configWindow->exec();
     });
 
 #ifdef ENABLE_UPDATER
diff --git a/src/shadps4.qrc b/src/shadps4.qrc
index 30f234ed8..40aeb9fb9 100644
--- a/src/shadps4.qrc
+++ b/src/shadps4.qrc
@@ -30,5 +30,6 @@
 		<file>images/ko-fi.png</file>
 		<file>images/youtube.png</file>
 		<file>images/website.png</file>
+		<file>images/ps4_controller.png</file>
 	</qresource>
 </RCC>