diff --git a/media/overlays/gameboy/gameboy.cfg b/media/overlays/gameboy/gameboy.cfg
index 487f127ea8..1ff585e2a1 100644
--- a/media/overlays/gameboy/gameboy.cfg
+++ b/media/overlays/gameboy/gameboy.cfg
@@ -26,9 +26,9 @@ overlay0_desc0 = "left,0.04375,0.80208333333,radial,0.0525,0.0875"
 overlay0_desc1 = "right,0.19375,0.80208333333,radial,0.0525,0.0875"
 overlay0_desc2 = "up,0.11845,0.67708333333,radial,0.0525,0.0875"
 overlay0_desc3 = "down,0.11845,0.92708333333,radial,0.0525,0.0875"
-overlay0_desc4 = "start,0.65,0.9375,rect,0.0625,0.0458333333"
+overlay0_desc4 = "start,0.60,0.9375,rect,0.0355,0.0458333333"
 overlay0_desc4_overlay = start.png
-overlay0_desc5 = "select,0.35,0.9375,rect,0.0625,0.0458333333"
+overlay0_desc5 = "select,0.40,0.9375,rect,0.0355,0.0458333333"
 overlay0_desc5_overlay = select.png
 overlay0_desc6 = "b,0.84375,0.90625,radial,0.05,0.0833333333"
 overlay0_desc6_overlay = b.png
@@ -54,10 +54,9 @@ overlay1_desc0 = "left,0.09375,0.86875,radial,0.0875,0.0525"
 overlay1_desc1 = "right,0.34375,0.86875,radial,0.0875,0.0525"
 overlay1_desc2 = "up,0.21875,0.79375,radial,0.0875,0.0525"
 overlay1_desc3 = "down,0.21875,0.94375,radial,0.0875,0.0525"
-overlay1_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
-overlay1_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
+overlay1_desc4 = "start,0.6,0.70625,rect,0.06416666667,0.025"
 overlay1_desc4_overlay = start.png
-overlay1_desc5 = "select,0.5,0.61875,rect,0.10416666667,0.025"
+overlay1_desc5 = "select,0.6,0.61875,rect,0.06416666667,0.025"
 overlay1_desc5_overlay = select.png
 overlay1_desc6 = "b,0.71875,0.90625,radial,0.0833333333333,0.05"
 overlay1_desc6_overlay = b.png
@@ -65,11 +64,11 @@ overlay1_desc7 = "a,0.88541666666,0.84375,radial,0.0833333333333,0.05"
 overlay1_desc7_overlay = a.png
 overlay1_desc8 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
 overlay1_desc8_overlay = next.png
-overlay1_desc9 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc10 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc11 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc12 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc13 = "nul,0.21875,0.86875,rect,0.2625,0.1575"
+overlay1_desc9 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc10 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc11 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc12 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc13 = "nul,0.21875,0.87275,rect,0.21,0.13"
 overlay1_desc13_overlay = dpad.png
 overlay1_desc14 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
 overlay1_desc14_overlay = rgui.png
diff --git a/media/overlays/gba-grey/a.png b/media/overlays/gba-grey/a.png
new file mode 100644
index 0000000000..997876b35e
Binary files /dev/null and b/media/overlays/gba-grey/a.png differ
diff --git a/media/overlays/gba-grey/b.png b/media/overlays/gba-grey/b.png
new file mode 100644
index 0000000000..87177f4bfa
Binary files /dev/null and b/media/overlays/gba-grey/b.png differ
diff --git a/media/overlays/gba-grey/dpad.png b/media/overlays/gba-grey/dpad.png
new file mode 100644
index 0000000000..a42bdcbfed
Binary files /dev/null and b/media/overlays/gba-grey/dpad.png differ
diff --git a/media/overlays/gba-grey/gba-grey.cfg b/media/overlays/gba-grey/gba-grey.cfg
new file mode 100644
index 0000000000..df39e7d23c
--- /dev/null
+++ b/media/overlays/gba-grey/gba-grey.cfg
@@ -0,0 +1,104 @@
+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_overlay = next-menu.png
+overlay3_name = "hide"
+overlay3_full_screen = true
+overlay3_range_mod = 1.5
+overlay3_alpha_mod = 2.0
+
+overlay0_descs = 18
+overlay0_desc0 = "left,0.04375,0.80208333333,radial,0.0525,0.0875"
+overlay0_desc1 = "right,0.19375,0.80208333333,radial,0.0525,0.0875"
+overlay0_desc2 = "up,0.11845,0.67708333333,radial,0.0525,0.0875"
+overlay0_desc3 = "down,0.11845,0.92708333333,radial,0.0525,0.0875"
+overlay0_desc4 = "start,0.65,0.9375,rect,0.0625,0.0458333333"
+overlay0_desc4_overlay = start.png
+overlay0_desc5 = "select,0.35,0.9375,rect,0.0625,0.0458333333"
+overlay0_desc5_overlay = select.png
+overlay0_desc6 = "b,0.84375,0.90625,radial,0.05,0.0833333333"
+overlay0_desc6_overlay = b.png
+overlay0_desc7 = "a,0.94375,0.8020833333333,radial,0.05,0.0833333333"
+overlay0_desc7_overlay = a.png
+overlay0_desc8 = "l,0.0625,0.0729166666667,rect,0.0625,0.0520833333333"
+overlay0_desc8_overlay = l.png
+overlay0_desc9 = "r,0.9375,0.0729166666667,rect,0.0625,0.0520833333333"
+overlay0_desc9_overlay = r.png
+overlay0_desc10 = "overlay_next,0.70125,0.11708333333334,rect,0.025,0.04166666667"
+overlay0_desc10_overlay = next.png
+overlay0_desc10_next_target = "menu"
+overlay0_desc11 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
+overlay0_desc12 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
+overlay0_desc13 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
+overlay0_desc14 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
+overlay0_desc15 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
+overlay0_desc15_overlay = dpad.png
+overlay0_desc16 = "menu_toggle,0.50125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc16_overlay = rgui.png
+overlay0_desc17 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc17_overlay = rotate.png
+overlay0_desc17_next_target = "portrait"
+
+overlay1_descs = 18
+overlay1_desc0 = "left,0.09375,0.86875,radial,0.0875,0.0525"
+overlay1_desc1 = "right,0.34375,0.86875,radial,0.0875,0.0525"
+overlay1_desc2 = "up,0.21875,0.79375,radial,0.0875,0.0525"
+overlay1_desc3 = "down,0.21875,0.94375,radial,0.0875,0.0525"
+overlay1_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
+overlay1_desc4_overlay = start.png
+overlay1_desc5 = "select,0.5,0.61875,rect,0.10416666667,0.025"
+overlay1_desc5_overlay = select.png
+overlay1_desc6 = "b,0.71875,0.90625,radial,0.0833333333333,0.05"
+overlay1_desc6_overlay = b.png
+overlay1_desc7 = "a,0.88541666666,0.84375,radial,0.0833333333333,0.05"
+overlay1_desc7_overlay = a.png
+overlay1_desc8 = "l,0.1041666667,0.61875,rect,0.10416666667,0.03125"
+overlay1_desc8_overlay = l.png
+overlay1_desc9 = "r,0.8958333333,0.61875,rect,0.10416666667,0.03125"
+overlay1_desc9_overlay = r.png
+overlay1_desc10 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
+overlay1_desc10_overlay = next.png
+overlay1_desc10_next_target = "menu"
+overlay1_desc11 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc12 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc13 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc14 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc15 = "nul,0.21875,0.87275,rect,0.21,0.13"
+overlay1_desc15_overlay = dpad.png
+overlay1_desc16 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
+overlay1_desc16_overlay = rgui.png
+overlay1_desc17 = "overlay_next,0.30125,0.53125,radial,0.04166666666,0.025"
+overlay1_desc17_overlay = rotate.png
+overlay1_desc17_next_target = "landscape"
+
+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"
+overlay2_desc10_next_target = "hide"
+
+overlay3_descs = 1
+overlay3_rect = "0.4375,0.916,0.125,0.084"
+overlay3_desc0 = "overlay_next,50,20,rect,50,20"
\ No newline at end of file
diff --git a/media/overlays/gba-grey/l.png b/media/overlays/gba-grey/l.png
new file mode 100644
index 0000000000..ece68d1507
Binary files /dev/null and b/media/overlays/gba-grey/l.png differ
diff --git a/media/overlays/gba-grey/next-menu.png b/media/overlays/gba-grey/next-menu.png
new file mode 100644
index 0000000000..807dd3c480
Binary files /dev/null and b/media/overlays/gba-grey/next-menu.png differ
diff --git a/media/overlays/gba-grey/next.png b/media/overlays/gba-grey/next.png
new file mode 100644
index 0000000000..bec6e68d29
Binary files /dev/null and b/media/overlays/gba-grey/next.png differ
diff --git a/media/overlays/gba-grey/quickmenu.png b/media/overlays/gba-grey/quickmenu.png
new file mode 100644
index 0000000000..225e99dbf4
Binary files /dev/null and b/media/overlays/gba-grey/quickmenu.png differ
diff --git a/media/overlays/gba-grey/r.png b/media/overlays/gba-grey/r.png
new file mode 100644
index 0000000000..c2313bb0d6
Binary files /dev/null and b/media/overlays/gba-grey/r.png differ
diff --git a/media/overlays/gba-grey/rgui.png b/media/overlays/gba-grey/rgui.png
new file mode 100644
index 0000000000..a635d7f4e3
Binary files /dev/null and b/media/overlays/gba-grey/rgui.png differ
diff --git a/media/overlays/gba-grey/rotate.png b/media/overlays/gba-grey/rotate.png
new file mode 100644
index 0000000000..39cb11fbea
Binary files /dev/null and b/media/overlays/gba-grey/rotate.png differ
diff --git a/media/overlays/gba-grey/select.png b/media/overlays/gba-grey/select.png
new file mode 100644
index 0000000000..9ac8925576
Binary files /dev/null and b/media/overlays/gba-grey/select.png differ
diff --git a/media/overlays/gba-grey/start.png b/media/overlays/gba-grey/start.png
new file mode 100644
index 0000000000..74ad0b3f3f
Binary files /dev/null and b/media/overlays/gba-grey/start.png differ
diff --git a/media/overlays/gba/gba.cfg b/media/overlays/gba/gba.cfg
index 8f70d7a322..df39e7d23c 100644
--- a/media/overlays/gba/gba.cfg
+++ b/media/overlays/gba/gba.cfg
@@ -73,11 +73,11 @@ overlay1_desc9_overlay = r.png
 overlay1_desc10 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
 overlay1_desc10_overlay = next.png
 overlay1_desc10_next_target = "menu"
-overlay1_desc11 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc12 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc13 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc14 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc15 = "nul,0.21875,0.86875,rect,0.2625,0.1575"
+overlay1_desc11 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc12 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc13 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc14 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc15 = "nul,0.21875,0.87275,rect,0.21,0.13"
 overlay1_desc15_overlay = dpad.png
 overlay1_desc16 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
 overlay1_desc16_overlay = rgui.png
diff --git a/media/overlays/genesis/3button.png b/media/overlays/genesis/3button.png
index 82346a2827..6656d96870 100644
Binary files a/media/overlays/genesis/3button.png and b/media/overlays/genesis/3button.png differ
diff --git a/media/overlays/genesis/6button.png b/media/overlays/genesis/6button.png
index f5efc43ef1..60d6f45836 100644
Binary files a/media/overlays/genesis/6button.png and b/media/overlays/genesis/6button.png differ
diff --git a/media/overlays/genesis/a.png b/media/overlays/genesis/a.png
index 8ecfa7bc51..b340d94171 100644
Binary files a/media/overlays/genesis/a.png and b/media/overlays/genesis/a.png differ
diff --git a/media/overlays/genesis/b.png b/media/overlays/genesis/b.png
index 7d7a59712b..1ac328e136 100644
Binary files a/media/overlays/genesis/b.png and b/media/overlays/genesis/b.png differ
diff --git a/media/overlays/genesis/c.png b/media/overlays/genesis/c.png
index 1055995678..8a00b6a70b 100644
Binary files a/media/overlays/genesis/c.png and b/media/overlays/genesis/c.png differ
diff --git a/media/overlays/genesis/dpad.png b/media/overlays/genesis/dpad.png
index 216b2e07b9..6620ab5d38 100644
Binary files a/media/overlays/genesis/dpad.png and b/media/overlays/genesis/dpad.png differ
diff --git a/media/overlays/genesis/genesis.cfg b/media/overlays/genesis/genesis.cfg
index 5899b74b3c..b897dfee09 100644
--- a/media/overlays/genesis/genesis.cfg
+++ b/media/overlays/genesis/genesis.cfg
@@ -99,7 +99,7 @@ overlay2_desc0 = "left,0.09375,0.86875,radial,0.0875,0.0525"
 overlay2_desc1 = "right,0.34375,0.86875,radial,0.0875,0.0525"
 overlay2_desc2 = "up,0.21875,0.79375,radial,0.0875,0.0525"
 overlay2_desc3 = "down,0.21875,0.94375,radial,0.0875,0.0525"
-overlay2_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
+overlay2_desc4 = "start,0.5,0.70625,rect,0.05416666667,0.025"
 overlay2_desc4_overlay = start.png
 overlay2_desc5 = "a,0.93541666666667,0.9,radial,0.05208333333,0.03125"
 overlay2_desc5_overlay = c.png
@@ -116,11 +116,11 @@ overlay2_desc10_overlay = z.png
 overlay2_desc11 = "overlay_next,0.50125,0.95833333333,rect,0.04166666666,0.025"
 overlay2_desc11_overlay = next.png
 overlay2_desc11_next_target = "menu"
-overlay2_desc12 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.05125"
-overlay2_desc13 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.05125"
-overlay2_desc14 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.05125"
-overlay2_desc15 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.05125"
-overlay2_desc16 = "nul,0.21875,0.86875,rect,0.2225,0.1175"
+overlay2_desc12 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay2_desc13 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay2_desc14 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay2_desc15 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay2_desc16 = "nul,0.21875,0.87275,rect,0.21,0.13"
 overlay2_desc16_overlay = dpad.png
 overlay2_desc17 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
 overlay2_desc17_overlay = rgui.png
@@ -136,7 +136,7 @@ overlay3_desc0 = "left,0.09375,0.86875,radial,0.0875,0.0525"
 overlay3_desc1 = "right,0.34375,0.86875,radial,0.0875,0.0525"
 overlay3_desc2 = "up,0.21875,0.79375,radial,0.0875,0.0525"
 overlay3_desc3 = "down,0.21875,0.94375,radial,0.0875,0.0525"
-overlay3_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
+overlay3_desc4 = "start,0.5,0.70625,rect,0.05416666667,0.025"
 overlay3_desc4_overlay = start.png
 overlay3_desc5 = "a,0.93541666666667,0.9,radial,0.05208333333,0.03125"
 overlay3_desc5_overlay = c.png
@@ -147,11 +147,11 @@ overlay3_desc7_overlay = a.png
 overlay3_desc8 = "overlay_next,0.50125,0.95833333333,rect,0.04166666666,0.025"
 overlay3_desc8_overlay = next.png
 overlay3_desc8_next_target = "menu"
-overlay3_desc9 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.05125"
-overlay3_desc10 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.05125"
-overlay3_desc11 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.05125"
-overlay3_desc12 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.05125"
-overlay3_desc13 = "nul,0.21875,0.86875,rect,0.2225,0.1175"
+overlay3_desc9 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay3_desc10 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay3_desc11 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay3_desc12 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay3_desc13 = "nul,0.21875,0.87275,rect,0.21,0.13"
 overlay3_desc13_overlay = dpad.png
 overlay3_desc14 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
 overlay3_desc14_overlay = rgui.png
diff --git a/media/overlays/genesis/next.png b/media/overlays/genesis/next.png
index 87edcb69d5..a4a6e656a5 100644
Binary files a/media/overlays/genesis/next.png and b/media/overlays/genesis/next.png differ
diff --git a/media/overlays/genesis/rotate.png b/media/overlays/genesis/rotate.png
index 39cb11fbea..d03619b570 100644
Binary files a/media/overlays/genesis/rotate.png and b/media/overlays/genesis/rotate.png differ
diff --git a/media/overlays/genesis/start.png b/media/overlays/genesis/start.png
index 01e221801c..6fdc3655fe 100644
Binary files a/media/overlays/genesis/start.png and b/media/overlays/genesis/start.png differ
diff --git a/media/overlays/genesis/x.png b/media/overlays/genesis/x.png
index 1c39cd1176..31b3550690 100644
Binary files a/media/overlays/genesis/x.png and b/media/overlays/genesis/x.png differ
diff --git a/media/overlays/genesis/y.png b/media/overlays/genesis/y.png
index 6282aa1cbe..26ce083d3e 100644
Binary files a/media/overlays/genesis/y.png and b/media/overlays/genesis/y.png differ
diff --git a/media/overlays/genesis/z.png b/media/overlays/genesis/z.png
index 9975d38864..5d6b851f36 100644
Binary files a/media/overlays/genesis/z.png and b/media/overlays/genesis/z.png differ
diff --git a/media/overlays/nes/a.png b/media/overlays/nes/a.png
index 1dc0076852..6026d4dced 100644
Binary files a/media/overlays/nes/a.png and b/media/overlays/nes/a.png differ
diff --git a/media/overlays/nes/b.png b/media/overlays/nes/b.png
index 3ef8525a76..ce6741add1 100644
Binary files a/media/overlays/nes/b.png and b/media/overlays/nes/b.png differ
diff --git a/media/overlays/nes/dpad.png b/media/overlays/nes/dpad.png
index f3b772ca8f..a3a5a6c646 100644
Binary files a/media/overlays/nes/dpad.png and b/media/overlays/nes/dpad.png differ
diff --git a/media/overlays/nes/nes.cfg b/media/overlays/nes/nes.cfg
index 4fe588ea8b..17c36a4a3e 100644
--- a/media/overlays/nes/nes.cfg
+++ b/media/overlays/nes/nes.cfg
@@ -54,10 +54,9 @@ overlay1_desc0 = "left,0.09375,0.86875,radial,0.0875,0.0525"
 overlay1_desc1 = "right,0.34375,0.86875,radial,0.0875,0.0525"
 overlay1_desc2 = "up,0.21875,0.79375,radial,0.0875,0.0525"
 overlay1_desc3 = "down,0.21875,0.94375,radial,0.0875,0.0525"
-overlay1_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
-overlay1_desc4 = "start,0.5,0.70625,rect,0.10416666667,0.025"
+overlay1_desc4 = "start,0.5,0.70625,rect,0.05416666667,0.025"
 overlay1_desc4_overlay = start.png
-overlay1_desc5 = "select,0.5,0.61875,rect,0.10416666667,0.025"
+overlay1_desc5 = "select,0.5,0.61875,rect,0.05416666667,0.025"
 overlay1_desc5_overlay = select.png
 overlay1_desc6 = "b,0.69875,0.90625,radial,0.0833333333333,0.05"
 overlay1_desc6_overlay = b.png
@@ -65,11 +64,11 @@ overlay1_desc7 = "a,0.86541666666,0.90625,radial,0.0833333333333,0.05"
 overlay1_desc7_overlay = a.png
 overlay1_desc8 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
 overlay1_desc8_overlay = next.png
-overlay1_desc9 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc10 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc11 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc12 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc13 = "nul,0.21875,0.86875,rect,0.2625,0.1575"
+overlay1_desc9 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.08125"
+overlay1_desc10 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.08125"
+overlay1_desc11 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.08125"
+overlay1_desc12 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.08125"
+overlay1_desc13 = "nul,0.21875,0.87275,rect,0.21,0.13"
 overlay1_desc13_overlay = dpad.png
 overlay1_desc14 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
 overlay1_desc14_overlay = rgui.png
diff --git a/media/overlays/nes/next-menu.png b/media/overlays/nes/next-menu.png
index ea1cd5341f..cbb40d6ea3 100644
Binary files a/media/overlays/nes/next-menu.png and b/media/overlays/nes/next-menu.png differ
diff --git a/media/overlays/nes/next.png b/media/overlays/nes/next.png
index 87edcb69d5..885122dd07 100644
Binary files a/media/overlays/nes/next.png and b/media/overlays/nes/next.png differ
diff --git a/media/overlays/nes/rotate.png b/media/overlays/nes/rotate.png
index 39cb11fbea..c541adf70f 100644
Binary files a/media/overlays/nes/rotate.png and b/media/overlays/nes/rotate.png differ
diff --git a/media/overlays/nes/select.png b/media/overlays/nes/select.png
index d5a8596a06..0ececbf9c5 100644
Binary files a/media/overlays/nes/select.png and b/media/overlays/nes/select.png differ
diff --git a/media/overlays/nes/start.png b/media/overlays/nes/start.png
index 86797d6702..f738456f95 100644
Binary files a/media/overlays/nes/start.png and b/media/overlays/nes/start.png differ
diff --git a/media/overlays/psx-black/a.png b/media/overlays/psx-black/a.png
new file mode 100644
index 0000000000..631559deec
Binary files /dev/null and b/media/overlays/psx-black/a.png differ
diff --git a/media/overlays/psx-black/b.png b/media/overlays/psx-black/b.png
new file mode 100644
index 0000000000..59f88d73f3
Binary files /dev/null and b/media/overlays/psx-black/b.png differ
diff --git a/media/overlays/psx-black/dpad-down.png b/media/overlays/psx-black/dpad-down.png
new file mode 100644
index 0000000000..467f9a42d8
Binary files /dev/null and b/media/overlays/psx-black/dpad-down.png differ
diff --git a/media/overlays/psx-black/dpad-left.png b/media/overlays/psx-black/dpad-left.png
new file mode 100644
index 0000000000..8a6af2d1fa
Binary files /dev/null and b/media/overlays/psx-black/dpad-left.png differ
diff --git a/media/overlays/psx-black/dpad-right.png b/media/overlays/psx-black/dpad-right.png
new file mode 100644
index 0000000000..6a43d18e67
Binary files /dev/null and b/media/overlays/psx-black/dpad-right.png differ
diff --git a/media/overlays/psx-black/dpad-up.png b/media/overlays/psx-black/dpad-up.png
new file mode 100644
index 0000000000..ff7d13e16a
Binary files /dev/null and b/media/overlays/psx-black/dpad-up.png differ
diff --git a/media/overlays/psx-black/l1.png b/media/overlays/psx-black/l1.png
new file mode 100644
index 0000000000..6ec652e2bc
Binary files /dev/null and b/media/overlays/psx-black/l1.png differ
diff --git a/media/overlays/psx-black/l2.png b/media/overlays/psx-black/l2.png
new file mode 100644
index 0000000000..bf3833a645
Binary files /dev/null and b/media/overlays/psx-black/l2.png differ
diff --git a/media/overlays/psx-black/next.png b/media/overlays/psx-black/next.png
new file mode 100644
index 0000000000..5101fa5f6e
Binary files /dev/null and b/media/overlays/psx-black/next.png differ
diff --git a/media/overlays/psx-black/ps_next.png b/media/overlays/psx-black/ps_next.png
new file mode 100644
index 0000000000..65b3886641
Binary files /dev/null and b/media/overlays/psx-black/ps_next.png differ
diff --git a/media/overlays/psx-black/psx-black.cfg b/media/overlays/psx-black/psx-black.cfg
new file mode 100644
index 0000000000..4c8b7a17ab
--- /dev/null
+++ b/media/overlays/psx-black/psx-black.cfg
@@ -0,0 +1,123 @@
+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_overlay = ps_next.png
+overlay3_name = "hide"
+overlay3_full_screen = true
+overlay3_range_mod = 1.5
+overlay3_alpha_mod = 2.0
+
+overlay0_descs = 21
+overlay0_desc0 = "left,0.04375,0.802083333333,radial,0.0525,0.0875"
+overlay0_desc0_overlay = dpad-left.png
+overlay0_desc1 = "right,0.19375,0.802083333333,radial,0.0525,0.0875"
+overlay0_desc1_overlay = dpad-right.png
+overlay0_desc2 = "up,0.11875,0.677083333333,radial,0.0525,0.0875"
+overlay0_desc2_overlay = dpad-up.png
+overlay0_desc3 = "down,0.11875,0.9270833333333,radial,0.0525,0.0875"
+overlay0_desc3_overlay = dpad-down.png
+overlay0_desc4 = "start,0.64375,0.94791666666667,rect,0.04375,0.052083333333"
+overlay0_desc4_overlay = start.png
+overlay0_desc5 = "select,0.35625,0.94791666666667,rect,0.04375,0.052083333333"
+overlay0_desc5_overlay = select.png
+overlay0_desc6 = "a,0.95625,0.802083333333,radial,0.04375,0.0729166666667"
+overlay0_desc6_overlay = a.png
+overlay0_desc7 = "b,0.88125,0.927083333333,radial,0.04375,0.0729166666667"
+overlay0_desc7_overlay = b.png
+overlay0_desc8 = "x,0.88125,0.677083333333,radial,0.04375,0.0729166666667"
+overlay0_desc8_overlay = x.png
+overlay0_desc9 = "y,0.80625,0.802083333333,radial,0.04375,0.0729166666667"
+overlay0_desc9_overlay = y.png
+overlay0_desc10 = "l,0.0625,0.1770833333333,rect,0.0625,0.052083333333"
+overlay0_desc10_overlay = l1.png
+overlay0_desc11 = "l2,0.0625,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc11_overlay = l2.png
+overlay0_desc12 = "r,0.9375,0.1770833333333,rect,0.0625,0.052083333333"
+overlay0_desc12_overlay = r1.png
+overlay0_desc13 = "r2,0.9375,0.052083333333,rect,0.0625,0.052083333333"
+overlay0_desc13_overlay = r2.png
+overlay0_desc14 = "left|up,0.0375,0.6666666667,rect,0.0375,0.0625"
+overlay0_desc15 = "right|up,0.2,0.6666666667,rect,0.0375,0.0625"
+overlay0_desc16 = "left|down,0.0375,0.9375,rect,0.0375,0.0625"
+overlay0_desc17 = "right|down,0.2,0.9375,rect,0.0375,0.0625"
+overlay0_desc18 = "overlay_next,0.70125,0.11708333333334,rect,0.025,0.04166666667"
+overlay0_desc18_overlay = next.png
+overlay0_desc18_next_target = "menu"
+overlay0_desc19 = "menu_toggle,0.50125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc19_overlay = rgui.png
+overlay0_desc20 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
+overlay0_desc20_overlay = rotate.png
+overlay0_desc20_next_target = "portrait"
+
+overlay1_descs = 21
+overlay1_desc0 = "left,0.072916666667,0.85025,radial,0.08208333333,0.0555"
+overlay1_desc0_overlay = dpad-left.png
+overlay1_desc1 = "right,0.322916666667,0.85025,radial,0.08208333333,0.0555"
+overlay1_desc1_overlay = dpad-right.png
+overlay1_desc2 = "up,0.1979166666667,0.75625,radial,0.08208333333,0.0555"
+overlay1_desc2_overlay = dpad-up.png
+overlay1_desc3 = "down,0.1979166666667,0.93325,radial,0.08208333333,0.0555"
+overlay1_desc3_overlay = dpad-down.png
+overlay1_desc4 = "start,0.625,0.635,rect,0.0625,0.0375"
+overlay1_desc4_overlay = start.png
+overlay1_desc5 = "select,0.375,0.635,rect,0.0625,0.0375"
+overlay1_desc5_overlay = select.png
+overlay1_desc6 = "a,0.9270833333333,0.83125,radial,0.0729166666667,0.04375"
+overlay1_desc6_overlay = a.png
+overlay1_desc7 = "b,0.8020833333333,0.90625,radial,0.0729166666667,0.04375"
+overlay1_desc7_overlay = b.png
+overlay1_desc8 = "x,0.8020833333333,0.75625,radial,0.0729166666667,0.04375"
+overlay1_desc8_overlay = x.png
+overlay1_desc9 = "y,0.677083333333,0.83125,radial,0.0729166666667,0.04375"
+overlay1_desc9_overlay = y.png
+overlay1_desc10 = "l,0.1041666667,0.60125,rect,0.1041666667,0.03125"
+overlay1_desc10_overlay = l1.png
+overlay1_desc11 = "l2,0.1041666667,0.52625,rect,0.1041666667,0.03125"
+overlay1_desc11_overlay = l2.png
+overlay1_desc12 = "r,0.8958333333333,0.60125,rect,0.1041666667,0.03125"
+overlay1_desc12_overlay = r1.png
+overlay1_desc13 = "r2,0.8958333333333,0.52625,rect,0.1041666667,0.03125"
+overlay1_desc13_overlay = r2.png
+overlay1_desc14 = "left|up,0.0625,0.75,rect,0.0625,0.0275"
+overlay1_desc15 = "right|up,0.333333333,0.75,rect,0.0625,0.0275"
+overlay1_desc16 = "left|down,0.0625,0.9325,rect,0.0625,0.0275"
+overlay1_desc17 = "right|down,0.333333333,0.9325,rect,0.0625,0.0275"
+overlay1_desc18 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
+overlay1_desc18_overlay = next.png
+overlay1_desc18_next_target = "menu"
+overlay1_desc19 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
+overlay1_desc19_overlay = rgui.png
+overlay1_desc20 = "overlay_next,0.30125,0.53125,radial,0.04166666666,0.025"
+overlay1_desc20_overlay = rotate.png
+overlay1_desc20_next_target = "landscape"
+
+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_rect = "0.4375,0.916,0.125,0.084"
+overlay3_desc0 = "overlay_next,50,20,rect,50,20"
\ No newline at end of file
diff --git a/media/overlays/psx-black/quickmenu.png b/media/overlays/psx-black/quickmenu.png
new file mode 100644
index 0000000000..9b4918134b
Binary files /dev/null and b/media/overlays/psx-black/quickmenu.png differ
diff --git a/media/overlays/psx-black/r1.png b/media/overlays/psx-black/r1.png
new file mode 100644
index 0000000000..8badf47005
Binary files /dev/null and b/media/overlays/psx-black/r1.png differ
diff --git a/media/overlays/psx-black/r2.png b/media/overlays/psx-black/r2.png
new file mode 100644
index 0000000000..41b10b9220
Binary files /dev/null and b/media/overlays/psx-black/r2.png differ
diff --git a/media/overlays/psx-black/rgui.png b/media/overlays/psx-black/rgui.png
new file mode 100644
index 0000000000..2f0295463c
Binary files /dev/null and b/media/overlays/psx-black/rgui.png differ
diff --git a/media/overlays/psx-black/rotate.png b/media/overlays/psx-black/rotate.png
new file mode 100644
index 0000000000..1d98a6f890
Binary files /dev/null and b/media/overlays/psx-black/rotate.png differ
diff --git a/media/overlays/psx-black/select.png b/media/overlays/psx-black/select.png
new file mode 100644
index 0000000000..c9db348bc6
Binary files /dev/null and b/media/overlays/psx-black/select.png differ
diff --git a/media/overlays/psx-black/start.png b/media/overlays/psx-black/start.png
new file mode 100644
index 0000000000..be96f19240
Binary files /dev/null and b/media/overlays/psx-black/start.png differ
diff --git a/media/overlays/psx-black/x.png b/media/overlays/psx-black/x.png
new file mode 100644
index 0000000000..34ce37d795
Binary files /dev/null and b/media/overlays/psx-black/x.png differ
diff --git a/media/overlays/psx-black/y.png b/media/overlays/psx-black/y.png
new file mode 100644
index 0000000000..6efb38204e
Binary files /dev/null and b/media/overlays/psx-black/y.png differ
diff --git a/media/overlays/psx/box-psx-diagonals.cfg b/media/overlays/psx/box-psx-diagonals.cfg
index d17dd8b285..4c8b7a17ab 100644
--- a/media/overlays/psx/box-psx-diagonals.cfg
+++ b/media/overlays/psx/box-psx-diagonals.cfg
@@ -64,13 +64,13 @@ overlay0_desc20_overlay = rotate.png
 overlay0_desc20_next_target = "portrait"
 
 overlay1_descs = 21
-overlay1_desc0 = "left,0.072916666667,0.83125,radial,0.08208333333,0.0675"
+overlay1_desc0 = "left,0.072916666667,0.85025,radial,0.08208333333,0.0555"
 overlay1_desc0_overlay = dpad-left.png
-overlay1_desc1 = "right,0.322916666667,0.83125,radial,0.08208333333,0.0675"
+overlay1_desc1 = "right,0.322916666667,0.85025,radial,0.08208333333,0.0555"
 overlay1_desc1_overlay = dpad-right.png
-overlay1_desc2 = "up,0.1979166666667,0.75625,radial,0.08208333333,0.0675"
+overlay1_desc2 = "up,0.1979166666667,0.75625,radial,0.08208333333,0.0555"
 overlay1_desc2_overlay = dpad-up.png
-overlay1_desc3 = "down,0.1979166666667,0.90625,radial,0.08208333333,0.0675"
+overlay1_desc3 = "down,0.1979166666667,0.93325,radial,0.08208333333,0.0555"
 overlay1_desc3_overlay = dpad-down.png
 overlay1_desc4 = "start,0.625,0.635,rect,0.0625,0.0375"
 overlay1_desc4_overlay = start.png
@@ -92,10 +92,10 @@ overlay1_desc12 = "r,0.8958333333333,0.60125,rect,0.1041666667,0.03125"
 overlay1_desc12_overlay = r1.png
 overlay1_desc13 = "r2,0.8958333333333,0.52625,rect,0.1041666667,0.03125"
 overlay1_desc13_overlay = r2.png
-overlay1_desc14 = "left|up,0.0625,0.75,rect,0.0825,0.0575"
-overlay1_desc15 = "right|up,0.333333333,0.75,rect,0.0825,0.0575"
-overlay1_desc16 = "left|down,0.0625,0.9125,rect,0.0825,0.0575"
-overlay1_desc17 = "right|down,0.333333333,0.9125,rect,0.0825,0.0575"
+overlay1_desc14 = "left|up,0.0625,0.75,rect,0.0625,0.0275"
+overlay1_desc15 = "right|up,0.333333333,0.75,rect,0.0625,0.0275"
+overlay1_desc16 = "left|down,0.0625,0.9325,rect,0.0625,0.0275"
+overlay1_desc17 = "right|down,0.333333333,0.9325,rect,0.0625,0.0275"
 overlay1_desc18 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
 overlay1_desc18_overlay = next.png
 overlay1_desc18_next_target = "menu"
diff --git a/media/overlays/psx/rotate.png b/media/overlays/psx/rotate.png
index 8d09bee709..6660ad01ff 100644
Binary files a/media/overlays/psx/rotate.png and b/media/overlays/psx/rotate.png differ
diff --git a/media/overlays/snes/a.png b/media/overlays/snes/a.png
index 910010cab3..9008cbdda3 100644
Binary files a/media/overlays/snes/a.png and b/media/overlays/snes/a.png differ
diff --git a/media/overlays/snes/b.png b/media/overlays/snes/b.png
index 8c5030c13e..10ae4d9451 100644
Binary files a/media/overlays/snes/b.png and b/media/overlays/snes/b.png differ
diff --git a/media/overlays/snes/dpad.png b/media/overlays/snes/dpad.png
index de42d9a707..21400e2f73 100644
Binary files a/media/overlays/snes/dpad.png and b/media/overlays/snes/dpad.png differ
diff --git a/media/overlays/snes/l1.png b/media/overlays/snes/l1.png
index a82249ec63..2a1621289a 100644
Binary files a/media/overlays/snes/l1.png and b/media/overlays/snes/l1.png differ
diff --git a/media/overlays/snes/next.png b/media/overlays/snes/next.png
index 87edcb69d5..c039a46b51 100644
Binary files a/media/overlays/snes/next.png and b/media/overlays/snes/next.png differ
diff --git a/media/overlays/snes/r1.png b/media/overlays/snes/r1.png
index f5a072af6c..aa2d2f4d9d 100644
Binary files a/media/overlays/snes/r1.png and b/media/overlays/snes/r1.png differ
diff --git a/media/overlays/snes/rotate.png b/media/overlays/snes/rotate.png
index 39cb11fbea..97940e80da 100644
Binary files a/media/overlays/snes/rotate.png and b/media/overlays/snes/rotate.png differ
diff --git a/media/overlays/snes/select.png b/media/overlays/snes/select.png
index 006f4446e7..f569e1c19b 100644
Binary files a/media/overlays/snes/select.png and b/media/overlays/snes/select.png differ
diff --git a/media/overlays/snes/snes.cfg b/media/overlays/snes/snes.cfg
index 50f6979a46..bb123e055c 100644
--- a/media/overlays/snes/snes.cfg
+++ b/media/overlays/snes/snes.cfg
@@ -76,11 +76,11 @@ overlay1_desc10 = "l,0.1041666667,0.52625,rect,0.1041666667,0.03125"
 overlay1_desc10_overlay = l1.png
 overlay1_desc11 = "r,0.8958333333333,0.52625,rect,0.1041666667,0.03125"
 overlay1_desc11_overlay = r1.png
-overlay1_desc12 = "left|down,0.09375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc13 = "right|up,0.34375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc14 = "up|left,0.09375,0.79375,radial,0.08208333333333,0.05125"
-overlay1_desc15 = "down|right,0.34375,0.94375,radial,0.08208333333333,0.05125"
-overlay1_desc16 = "nul,0.21875,0.86875,rect,0.2225,0.1325"
+overlay1_desc12 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc13 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc14 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
+overlay1_desc15 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
+overlay1_desc16 = "nul,0.21875,0.87275,rect,0.21,0.13"
 overlay1_desc16_overlay = dpad.png
 overlay1_desc17 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
 overlay1_desc17_overlay = next.png
diff --git a/media/overlays/snes/start.png b/media/overlays/snes/start.png
index 60e864d3fb..7e232eb7e1 100644
Binary files a/media/overlays/snes/start.png and b/media/overlays/snes/start.png differ
diff --git a/media/overlays/snes/x.png b/media/overlays/snes/x.png
index 15d822207e..565b60d1f4 100644
Binary files a/media/overlays/snes/x.png and b/media/overlays/snes/x.png differ
diff --git a/media/overlays/snes/y.png b/media/overlays/snes/y.png
index 8390ccb33d..f8bdaebf90 100644
Binary files a/media/overlays/snes/y.png and b/media/overlays/snes/y.png differ