diff --git a/src/duckstation-qt/controllerbindingwidget.ui b/src/duckstation-qt/controllerbindingwidget.ui
index 918472412..d654f3d5c 100644
--- a/src/duckstation-qt/controllerbindingwidget.ui
+++ b/src/duckstation-qt/controllerbindingwidget.ui
@@ -134,7 +134,7 @@
Clear Mapping
-
+
..
diff --git a/src/duckstation-qt/controllerbindingwidget_analog_controller.ui b/src/duckstation-qt/controllerbindingwidget_analog_controller.ui
index fe05efcf2..aaef9b079 100644
--- a/src/duckstation-qt/controllerbindingwidget_analog_controller.ui
+++ b/src/duckstation-qt/controllerbindingwidget_analog_controller.ui
@@ -6,8 +6,8 @@
0
0
- 1100
- 500
+ 1202
+ 646
@@ -40,19 +40,6 @@
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -448,12 +435,12 @@
-
-
-
-
+
-
+
- Select
+ R2
-
+
6
@@ -467,7 +454,7 @@
6
-
-
+
100
@@ -482,12 +469,12 @@
- -
-
+
-
+
- L1
+ Select
-
+
6
@@ -501,7 +488,7 @@
6
-
-
+
100
@@ -516,12 +503,12 @@
- -
-
+
-
+
- R1
+ L2
-
+
6
@@ -535,7 +522,7 @@
6
-
-
+
100
@@ -550,12 +537,12 @@
- -
-
+
-
+
- R2
+ Start
-
+
6
@@ -569,7 +556,7 @@
6
-
-
+
100
@@ -584,12 +571,12 @@
- -
-
+
-
+
- L2
+ R1
-
+
6
@@ -603,7 +590,7 @@
6
-
-
+
100
@@ -618,12 +605,12 @@
- -
-
+
-
+
- Start
+ L1
-
+
6
@@ -637,7 +624,7 @@
6
-
-
+
100
@@ -652,36 +639,10 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -1265,7 +1226,7 @@
-
+
diff --git a/src/duckstation-qt/controllerbindingwidget_analog_joystick.ui b/src/duckstation-qt/controllerbindingwidget_analog_joystick.ui
index 8f9d62f39..539e88bd1 100644
--- a/src/duckstation-qt/controllerbindingwidget_analog_joystick.ui
+++ b/src/duckstation-qt/controllerbindingwidget_analog_joystick.ui
@@ -6,8 +6,8 @@
0
0
- 1100
- 500
+ 1157
+ 565
@@ -40,19 +40,6 @@
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -408,12 +395,12 @@
-
-
-
-
+
-
+
- L2
+ R1
-
+
6
@@ -427,7 +414,7 @@
6
-
-
+
100
@@ -442,7 +429,7 @@
- -
+
-
L1
@@ -476,12 +463,12 @@
- -
-
+
-
+
- R2
+ L2
-
+
6
@@ -495,7 +482,7 @@
6
-
-
+
100
@@ -510,12 +497,12 @@
- -
-
+
-
+
- Start
+ R2
-
+
6
@@ -529,7 +516,7 @@
6
-
-
+
100
@@ -544,12 +531,12 @@
- -
-
+
-
+
- R1
+ Start
-
+
6
@@ -563,7 +550,7 @@
6
-
-
+
100
@@ -578,7 +565,7 @@
- -
+
-
Select
@@ -612,36 +599,10 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -1028,7 +989,7 @@
- :/controllers/analog_controller.svg
+ :/controllers/analog_joystick.svg
true
@@ -1180,7 +1141,7 @@
-
+
diff --git a/src/duckstation-qt/controllerbindingwidget_mouse.ui b/src/duckstation-qt/controllerbindingwidget_mouse.ui
index c652a666c..b24384e0d 100644
--- a/src/duckstation-qt/controllerbindingwidget_mouse.ui
+++ b/src/duckstation-qt/controllerbindingwidget_mouse.ui
@@ -7,11 +7,11 @@
0
0
1100
- 500
+ 534
-
+
0
0
@@ -22,48 +22,40 @@
500
+
+
+ 16777215
+ 16777210
+
+
Form
-
-
-
- Qt::Vertical
-
-
-
- 20
- 187
-
-
-
-
- -
-
-
- Qt::Horizontal
+
+
+
+ 0
+ 0
+
-
+
- 405
- 20
+ 0
+ 0
-
-
- -
-
Buttons
-
-
-
+
-
+
- Left
+ Right
-
+
6
@@ -77,7 +69,7 @@
6
-
-
+
100
@@ -98,12 +90,12 @@
- -
-
+
-
+
- Right
+ Left
-
+
6
@@ -117,7 +109,7 @@
6
-
-
+
100
@@ -141,20 +133,52 @@
- -
+
-
Qt::Horizontal
- 405
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ :/controllers/mouse.svg
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
20
- -
+
-
Qt::Vertical
@@ -162,7 +186,7 @@
20
- 187
+ 40
diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp
index 5550da84c..5dd94f501 100644
--- a/src/duckstation-qt/controllerbindingwidgets.cpp
+++ b/src/duckstation-qt/controllerbindingwidgets.cpp
@@ -850,7 +850,7 @@ ControllerBindingWidget_AnalogJoystick::~ControllerBindingWidget_AnalogJoystick(
QIcon ControllerBindingWidget_AnalogJoystick::getIcon() const
{
- return QIcon::fromTheme(QStringLiteral("controller-line"));
+ return QIcon::fromTheme(QStringLiteral("joystick-line"));
}
ControllerBindingWidget_Base* ControllerBindingWidget_AnalogJoystick::createInstance(ControllerBindingWidget* parent)
diff --git a/src/duckstation-qt/controllersettingsdialog.ui b/src/duckstation-qt/controllersettingsdialog.ui
index 16a2d4419..e6f831fc5 100644
--- a/src/duckstation-qt/controllersettingsdialog.ui
+++ b/src/duckstation-qt/controllersettingsdialog.ui
@@ -81,7 +81,7 @@
New Profile
-
+
..
@@ -102,7 +102,7 @@
Delete Profile
-
+
..
diff --git a/src/duckstation-qt/gamelistsettingswidget.ui b/src/duckstation-qt/gamelistsettingswidget.ui
index 7d8e6f2c2..d0fa279c7 100644
--- a/src/duckstation-qt/gamelistsettingswidget.ui
+++ b/src/duckstation-qt/gamelistsettingswidget.ui
@@ -60,7 +60,7 @@
Add
-
+
@@ -76,7 +76,7 @@
Remove
-
+
@@ -119,7 +119,7 @@
Add
-
+
@@ -135,7 +135,7 @@
Remove
-
+
diff --git a/src/duckstation-qt/resources/controllers/analog_joystick.svg b/src/duckstation-qt/resources/controllers/analog_joystick.svg
new file mode 100644
index 000000000..3fed2f31a
--- /dev/null
+++ b/src/duckstation-qt/resources/controllers/analog_joystick.svg
@@ -0,0 +1,403 @@
+
+
+
diff --git a/src/duckstation-qt/resources/controllers/mouse.svg b/src/duckstation-qt/resources/controllers/mouse.svg
new file mode 100644
index 000000000..46f9d2cb4
--- /dev/null
+++ b/src/duckstation-qt/resources/controllers/mouse.svg
@@ -0,0 +1,41 @@
+
+
+
diff --git a/src/duckstation-qt/resources/controllers/negcon.svg b/src/duckstation-qt/resources/controllers/negcon.svg
index d95e816f5..d56b7d1e3 100644
--- a/src/duckstation-qt/resources/controllers/negcon.svg
+++ b/src/duckstation-qt/resources/controllers/negcon.svg
@@ -1,149 +1,112 @@
-
-
+
+
+
diff --git a/src/duckstation-qt/resources/icons/black/svg/joystick-line.svg b/src/duckstation-qt/resources/icons/black/svg/joystick-line.svg
new file mode 100644
index 000000000..278250a15
--- /dev/null
+++ b/src/duckstation-qt/resources/icons/black/svg/joystick-line.svg
@@ -0,0 +1,32 @@
+
+
+
diff --git a/src/duckstation-qt/resources/icons/white/svg/joystick-line.svg b/src/duckstation-qt/resources/icons/white/svg/joystick-line.svg
new file mode 100644
index 000000000..5174783a5
--- /dev/null
+++ b/src/duckstation-qt/resources/icons/white/svg/joystick-line.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/duckstation-qt/resources/resources.qrc b/src/duckstation-qt/resources/resources.qrc
index e0251a6da..56b17bb6e 100644
--- a/src/duckstation-qt/resources/resources.qrc
+++ b/src/duckstation-qt/resources/resources.qrc
@@ -213,6 +213,8 @@
controllers/negcon.svg
controllers/analog_controller.svg
controllers/digital_controller.svg
+ controllers/analog_joystick.svg
+ controllers/mouse.svg
icons/list-add@2x.png
icons/flag-eu.svg
icons/flag-jp.svg
@@ -350,6 +352,7 @@
icons/black/svg/arrow-down-line.svg
icons/black/svg/screenshot-2-line.svg
icons/black/svg/minus-line.svg
+ icons/black/svg/joystick-line.svg
icons/audio-card@2x.png
icons/applications-system-24@2x.png
icons/video-display@2x.png
@@ -504,6 +507,7 @@
icons/white/svg/arrow-down-line.svg
icons/white/svg/screenshot-2-line.svg
icons/white/svg/minus-line.svg
+ icons/white/svg/joystick-line.svg
icons/flag-jp@2x.png
icons/view-fullscreen.png
icons/edit-clear-16.png