diff --git a/media/overlays/psx-black/a.png b/media/overlays/dual-shock/a.png
similarity index 100%
rename from media/overlays/psx-black/a.png
rename to media/overlays/dual-shock/a.png
diff --git a/media/overlays/psx-black/b.png b/media/overlays/dual-shock/b.png
similarity index 100%
rename from media/overlays/psx-black/b.png
rename to media/overlays/dual-shock/b.png
diff --git a/media/overlays/psx-black/dpad-down.png b/media/overlays/dual-shock/dpad-down.png
similarity index 100%
rename from media/overlays/psx-black/dpad-down.png
rename to media/overlays/dual-shock/dpad-down.png
diff --git a/media/overlays/psx-black/dpad-left.png b/media/overlays/dual-shock/dpad-left.png
similarity index 100%
rename from media/overlays/psx-black/dpad-left.png
rename to media/overlays/dual-shock/dpad-left.png
diff --git a/media/overlays/psx-black/dpad-right.png b/media/overlays/dual-shock/dpad-right.png
similarity index 100%
rename from media/overlays/psx-black/dpad-right.png
rename to media/overlays/dual-shock/dpad-right.png
diff --git a/media/overlays/psx-black/dpad-up.png b/media/overlays/dual-shock/dpad-up.png
similarity index 100%
rename from media/overlays/psx-black/dpad-up.png
rename to media/overlays/dual-shock/dpad-up.png
diff --git a/media/overlays/dual-shock/dual-shock.cfg b/media/overlays/dual-shock/dual-shock.cfg
new file mode 100644
index 0000000000..97376c3eb2
--- /dev/null
+++ b/media/overlays/dual-shock/dual-shock.cfg
@@ -0,0 +1,136 @@
+overlays = 4
+
+overlay0_full_screen = true
+overlay0_normalized = true
+overlay0_name = "landscape"
+overlay0_range_mod = 1.5
+overlay0_alpha_mod = 2.0
+overlay1_full_screen = true
+overlay1_normalized = true
+overlay1_name = "portrait"
+overlay1_range_mod = 1.5
+overlay1_alpha_mod = 2.0
+overlay2_overlay = quickmenu.png
+overlay2_name = "menu"
+overlay2_full_screen = true
+overlay2_range_mod = 1.5
+overlay2_alpha_mod = 2.0
+overlay3_full_screen = true
+overlay3_normalized = true
+overlay3_name = "hide"
+overlay3_full_screen = true
+overlay3_range_mod = 1.5
+overlay3_alpha_mod = 2.0
+
+overlay0_descs = 23
+overlay0_desc0 = "left,0.04375,0.352083333333,radial,0.0525,0.0875"
+overlay0_desc0_overlay = dpad-left.png
+overlay0_desc1 = "right,0.19375,0.352083333333,radial,0.0525,0.0875"
+overlay0_desc1_overlay = dpad-right.png
+overlay0_desc2 = "up,0.11875,0.227083333333,radial,0.0525,0.0875"
+overlay0_desc2_overlay = dpad-up.png
+overlay0_desc3 = "down,0.11875,0.4770833333333,radial,0.0525,0.0875"
+overlay0_desc3_overlay = dpad-down.png
+overlay0_desc4 = "start,0.94375,0.94791666666667,rect,0.04375,0.052083333333"
+overlay0_desc4_overlay = start.png
+overlay0_desc5 = "select,0.05625,0.94791666666667,rect,0.04375,0.052083333333"
+overlay0_desc5_overlay = select.png
+overlay0_desc6 = "a,0.95625,0.352083333333,radial,0.04375,0.0729166666667"
+overlay0_desc6_overlay = a.png
+overlay0_desc7 = "b,0.88125,0.4770833333333,radial,0.04375,0.0729166666667"
+overlay0_desc7_overlay = b.png
+overlay0_desc8 = "x,0.88125,0.227083333333,radial,0.04375,0.0729166666667"
+overlay0_desc8_overlay = x.png
+overlay0_desc9 = "y,0.80625,0.352083333333,radial,0.04375,0.0729166666667"
+overlay0_desc9_overlay = y.png
+overlay0_desc10 = "l,0.0925,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc10_overlay = l1.png
+overlay0_desc11 = "l2,0.2625,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc11_overlay = l2.png
+overlay0_desc12 = "r,0.9075,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc12_overlay = r1.png
+overlay0_desc13 = "r2,0.7375,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc13_overlay = r2.png
+overlay0_desc14 = "left|up,0.0375,0.2166666667,rect,0.0375,0.0625"
+overlay0_desc15 = "right|up,0.2,0.2166666667,rect,0.0375,0.0625"
+overlay0_desc16 = "left|down,0.0375,0.4875,rect,0.0375,0.0625"
+overlay0_desc17 = "right|down,0.2,0.4875,rect,0.0375,0.0625"
+overlay0_desc18 = "overlay_next,0.60125,0.11708333333334,rect,0.025,0.04166666667"
+overlay0_desc18_overlay = next.png
+overlay0_desc18_next_target = "menu"
+overlay0_desc19 = "menu_toggle,0.5,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc19_overlay = rgui.png
+overlay0_desc20 = "overlay_next,0.40125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc20_overlay = rotate.png
+overlay0_desc20_next_target = "portrait"
+overlay0_desc21 = "analog_left,0.28845,0.75208333333,radial,0.127575,0.212625"
+overlay0_desc21_overlay = thumbstick.png
+overlay0_desc21_pct = 0.85
+overlay0_desc22 = "analog_right,0.71845,0.75208333333,radial,0.127575,0.212625"
+overlay0_desc22_overlay = thumbstick.png
+overlay0_desc22_pct = 0.85
+
+overlay1_descs = 23
+overlay1_desc0 = "left,0.072916666667,0.55025,radial,0.08208333333,0.0555"
+overlay1_desc0_overlay = dpad-left.png
+overlay1_desc1 = "right,0.322916666667,0.55025,radial,0.08208333333,0.0555"
+overlay1_desc1_overlay = dpad-right.png
+overlay1_desc2 = "up,0.1979166666667,0.45625,radial,0.08208333333,0.0555"
+overlay1_desc2_overlay = dpad-up.png
+overlay1_desc3 = "down,0.1979166666667,0.63325,radial,0.08208333333,0.0555"
+overlay1_desc3_overlay = dpad-down.png
+overlay1_desc4 = "start,0.625,0.135,rect,0.0625,0.0375"
+overlay1_desc4_overlay = start.png
+overlay1_desc5 = "select,0.375,0.135,rect,0.0625,0.0375"
+overlay1_desc5_overlay = select.png
+overlay1_desc6 = "a,0.9270833333333,0.54125,radial,0.0729166666667,0.04375"
+overlay1_desc6_overlay = a.png
+overlay1_desc7 = "b,0.7820833333333,0.63625,radial,0.0729166666667,0.04375"
+overlay1_desc7_overlay = b.png
+overlay1_desc8 = "x,0.7820833333333,0.44625,radial,0.0729166666667,0.04375"
+overlay1_desc8_overlay = x.png
+overlay1_desc9 = "y,0.637083333333,0.54125,radial,0.0729166666667,0.04375"
+overlay1_desc9_overlay = y.png
+overlay1_desc10 = "l,0.1041666667,0.10125,rect,0.1041666667,0.03125"
+overlay1_desc10_overlay = l1.png
+overlay1_desc11 = "l2,0.1041666667,0.02625,rect,0.1041666667,0.03125"
+overlay1_desc11_overlay = l2.png
+overlay1_desc12 = "r,0.8958333333333,0.10125,rect,0.1041666667,0.03125"
+overlay1_desc12_overlay = r1.png
+overlay1_desc13 = "r2,0.8958333333333,0.02625,rect,0.1041666667,0.03125"
+overlay1_desc13_overlay = r2.png
+overlay1_desc14 = "left|up,0.0625,0.45,rect,0.0625,0.0275"
+overlay1_desc15 = "right|up,0.333333333,0.45,rect,0.0625,0.0275"
+overlay1_desc16 = "left|down,0.0625,0.6325,rect,0.0625,0.0275"
+overlay1_desc17 = "right|down,0.333333333,0.6325,rect,0.0625,0.0275"
+overlay1_desc18 = "overlay_next,0.7016666667,0.03125,rect,0.041666667,0.025"
+overlay1_desc18_overlay = next.png
+overlay1_desc18_next_target = "menu"
+overlay1_desc19 = "menu_toggle,0.5,0.03125,radial,0.04166666666,0.025"
+overlay1_desc19_overlay = rgui.png
+overlay1_desc20 = "overlay_next,0.30125,0.03125,radial,0.04166666666,0.025"
+overlay1_desc20_overlay = rotate.png
+overlay1_desc20_next_target = "landscape"
+overlay1_desc21 = "analog_left,0.24845,0.84845,radial,0.212625,0.127575"
+overlay1_desc21_overlay = thumbstick.png
+overlay1_desc21_pct = 0.85
+overlay1_desc22 = "analog_right,0.75208333333,0.84845,radial,0.212625,0.127575"
+overlay1_desc22_overlay = thumbstick.png
+overlay1_desc22_pct = 0.85
+
+overlay2_descs = 11
+overlay2_desc0 = "load_state,270,90,rect,120,30"
+overlay2_desc1 = "save_state,270,170,rect,120,30"
+overlay2_desc3 = "state_slot_increase,270,250,rect,120,30"
+overlay2_desc2 = "state_slot_decrease,270,330,rect,120,30"
+overlay2_desc6 = "reset,250,410,rect,100,30"
+overlay2_desc4 = "rewind,530,90,rect,120,30"
+overlay2_desc5 = "slowmotion,530,170,rect,120,30"
+overlay2_desc7 = "toggle_fast_forward,530,250,rect,120,300"
+overlay2_desc9 = "shader_prev,530,330,rect,120,30"
+overlay2_desc8 = "shader_next,550,410,rect,100,30"
+overlay2_desc10 = "overlay_next,400,460,rect,40,20"
+
+overlay3_descs = 1
+overlay3_desc0 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
+overlay3_desc0_overlay = next.png
\ No newline at end of file
diff --git a/media/overlays/psx-black/l1.png b/media/overlays/dual-shock/l1.png
similarity index 100%
rename from media/overlays/psx-black/l1.png
rename to media/overlays/dual-shock/l1.png
diff --git a/media/overlays/psx-black/l2.png b/media/overlays/dual-shock/l2.png
similarity index 100%
rename from media/overlays/psx-black/l2.png
rename to media/overlays/dual-shock/l2.png
diff --git a/media/overlays/psx-black/next.png b/media/overlays/dual-shock/next.png
similarity index 100%
rename from media/overlays/psx-black/next.png
rename to media/overlays/dual-shock/next.png
diff --git a/media/overlays/psx-black/ps_next.png b/media/overlays/dual-shock/ps_next.png
similarity index 100%
rename from media/overlays/psx-black/ps_next.png
rename to media/overlays/dual-shock/ps_next.png
diff --git a/media/overlays/psx-black/psx-black.cfg b/media/overlays/dual-shock/psx-black.cfg
similarity index 100%
rename from media/overlays/psx-black/psx-black.cfg
rename to media/overlays/dual-shock/psx-black.cfg
diff --git a/media/overlays/psx-black/quickmenu.png b/media/overlays/dual-shock/quickmenu.png
similarity index 100%
rename from media/overlays/psx-black/quickmenu.png
rename to media/overlays/dual-shock/quickmenu.png
diff --git a/media/overlays/psx-black/r1.png b/media/overlays/dual-shock/r1.png
similarity index 100%
rename from media/overlays/psx-black/r1.png
rename to media/overlays/dual-shock/r1.png
diff --git a/media/overlays/psx-black/r2.png b/media/overlays/dual-shock/r2.png
similarity index 100%
rename from media/overlays/psx-black/r2.png
rename to media/overlays/dual-shock/r2.png
diff --git a/media/overlays/psx-black/rgui.png b/media/overlays/dual-shock/rgui.png
similarity index 100%
rename from media/overlays/psx-black/rgui.png
rename to media/overlays/dual-shock/rgui.png
diff --git a/media/overlays/psx-black/rotate.png b/media/overlays/dual-shock/rotate.png
similarity index 100%
rename from media/overlays/psx-black/rotate.png
rename to media/overlays/dual-shock/rotate.png
diff --git a/media/overlays/psx-black/select.png b/media/overlays/dual-shock/select.png
similarity index 100%
rename from media/overlays/psx-black/select.png
rename to media/overlays/dual-shock/select.png
diff --git a/media/overlays/psx-black/start.png b/media/overlays/dual-shock/start.png
similarity index 100%
rename from media/overlays/psx-black/start.png
rename to media/overlays/dual-shock/start.png
diff --git a/media/overlays/dual-shock/thumbstick.png b/media/overlays/dual-shock/thumbstick.png
new file mode 100644
index 0000000000..62384769ab
Binary files /dev/null and b/media/overlays/dual-shock/thumbstick.png differ
diff --git a/media/overlays/psx-black/x.png b/media/overlays/dual-shock/x.png
similarity index 100%
rename from media/overlays/psx-black/x.png
rename to media/overlays/dual-shock/x.png
diff --git a/media/overlays/psx-black/y.png b/media/overlays/dual-shock/y.png
similarity index 100%
rename from media/overlays/psx-black/y.png
rename to media/overlays/dual-shock/y.png