diff --git a/media/overlays/gameboy/gameboy.cfg b/media/overlays/gameboy/gameboy.cfg
index 6cae7dcfb3..487f127ea8 100644
--- a/media/overlays/gameboy/gameboy.cfg
+++ b/media/overlays/gameboy/gameboy.cfg
@@ -65,10 +65,10 @@ 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.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_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_desc13_overlay = dpad.png
 overlay1_desc14 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
diff --git a/media/overlays/gba/gba.cfg b/media/overlays/gba/gba.cfg
index cceaae7acd..8f70d7a322 100644
--- a/media/overlays/gba/gba.cfg
+++ b/media/overlays/gba/gba.cfg
@@ -73,10 +73,10 @@ 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_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_desc15_overlay = dpad.png
 overlay1_desc16 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
diff --git a/media/overlays/genesis/genesis.cfg b/media/overlays/genesis/genesis.cfg
index c0d4bf6910..5899b74b3c 100644
--- a/media/overlays/genesis/genesis.cfg
+++ b/media/overlays/genesis/genesis.cfg
@@ -116,10 +116,10 @@ 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.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_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_desc16_overlay = dpad.png
 overlay2_desc17 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
@@ -147,10 +147,10 @@ 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.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_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_desc13_overlay = dpad.png
 overlay3_desc14 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
diff --git a/media/overlays/nes/nes.cfg b/media/overlays/nes/nes.cfg
index 0cdb6ab4f0..4fe588ea8b 100644
--- a/media/overlays/nes/nes.cfg
+++ b/media/overlays/nes/nes.cfg
@@ -65,10 +65,10 @@ 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.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_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_desc13_overlay = dpad.png
 overlay1_desc14 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
diff --git a/media/overlays/normalized/box-psx-diagonals/a.png b/media/overlays/normalized/box-psx-diagonals/a.png
deleted file mode 100644
index 669b896853..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/a.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/b.png b/media/overlays/normalized/box-psx-diagonals/b.png
deleted file mode 100644
index 85cd7571aa..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/b.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/box-psx-diagonals.cfg b/media/overlays/normalized/box-psx-diagonals/box-psx-diagonals.cfg
deleted file mode 100644
index aee2be810f..0000000000
--- a/media/overlays/normalized/box-psx-diagonals/box-psx-diagonals.cfg
+++ /dev/null
@@ -1,121 +0,0 @@
-overlays = 4
-
-overlay0_normalized = true
-overlay0_name = "landscape"
-overlay0_range_mod = 1.5
-overlay0_alpha_mod = 2.0
-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.07708333333334,rect,0.025,0.04166666667"
-overlay0_desc18_overlay = next.png
-overlay0_desc18_next_target = "menu"
-overlay0_desc19 = "menu_toggle,0.50125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc19_overlay = rgui.png
-overlay0_desc20 = "overlay_next,0.30125,0.07708333333334,radial,0.025,0.04166666666"
-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_overlay = dpad-left.png
-overlay1_desc1 = "right,0.322916666667,0.83125,radial,0.08208333333,0.0675"
-overlay1_desc1_overlay = dpad-right.png
-overlay1_desc2 = "up,0.1979166666667,0.75625,radial,0.08208333333,0.0675"
-overlay1_desc2_overlay = dpad-up.png
-overlay1_desc3 = "down,0.1979166666667,0.90625,radial,0.08208333333,0.0675"
-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.0375"
-overlay1_desc15 = "right|up,0.333333333,0.75,rect,0.0625,0.0375"
-overlay1_desc16 = "left|down,0.0625,0.9125,rect,0.0625,0.0375"
-overlay1_desc17 = "right|down,0.333333333,0.9125,rect,0.0625,0.0375"
-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/normalized/box-psx-diagonals/dpad-down.png b/media/overlays/normalized/box-psx-diagonals/dpad-down.png
deleted file mode 100644
index d5a15420d1..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/dpad-down.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/dpad-left.png b/media/overlays/normalized/box-psx-diagonals/dpad-left.png
deleted file mode 100644
index 04a4717ad2..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/dpad-left.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/dpad-right.png b/media/overlays/normalized/box-psx-diagonals/dpad-right.png
deleted file mode 100644
index ee6e38e183..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/dpad-right.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/dpad-up.png b/media/overlays/normalized/box-psx-diagonals/dpad-up.png
deleted file mode 100644
index c13a15e7eb..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/dpad-up.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/dpad.png b/media/overlays/normalized/box-psx-diagonals/dpad.png
deleted file mode 100644
index fdb8f60cd1..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/dpad.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/l1.png b/media/overlays/normalized/box-psx-diagonals/l1.png
deleted file mode 100644
index 3d2d142faf..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/l1.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/l2.png b/media/overlays/normalized/box-psx-diagonals/l2.png
deleted file mode 100644
index 09756b9de0..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/l2.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/next.png b/media/overlays/normalized/box-psx-diagonals/next.png
deleted file mode 100644
index 86d2143164..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/next.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/ps_next.png b/media/overlays/normalized/box-psx-diagonals/ps_next.png
deleted file mode 100644
index 3da53f49ac..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/ps_next.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/quickmenu.png b/media/overlays/normalized/box-psx-diagonals/quickmenu.png
deleted file mode 100644
index 9b4918134b..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/quickmenu.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/r1.png b/media/overlays/normalized/box-psx-diagonals/r1.png
deleted file mode 100644
index ed18e93b0f..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/r1.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/r2.png b/media/overlays/normalized/box-psx-diagonals/r2.png
deleted file mode 100644
index 941c187f7a..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/r2.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/rgui.png b/media/overlays/normalized/box-psx-diagonals/rgui.png
deleted file mode 100644
index 6e79619397..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/rgui.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/rotate.png b/media/overlays/normalized/box-psx-diagonals/rotate.png
deleted file mode 100644
index 8d09bee709..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/rotate.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/select.png b/media/overlays/normalized/box-psx-diagonals/select.png
deleted file mode 100644
index b888bbb1a8..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/select.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/start.png b/media/overlays/normalized/box-psx-diagonals/start.png
deleted file mode 100644
index 44e577766d..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/start.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/x.png b/media/overlays/normalized/box-psx-diagonals/x.png
deleted file mode 100644
index 37a3142053..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/x.png and /dev/null differ
diff --git a/media/overlays/normalized/box-psx-diagonals/y.png b/media/overlays/normalized/box-psx-diagonals/y.png
deleted file mode 100644
index 46aa5229da..0000000000
Binary files a/media/overlays/normalized/box-psx-diagonals/y.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/a.png b/media/overlays/normalized/gameboy/a.png
deleted file mode 100644
index ae6b8f7339..0000000000
Binary files a/media/overlays/normalized/gameboy/a.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/b.png b/media/overlays/normalized/gameboy/b.png
deleted file mode 100644
index b8c84fa234..0000000000
Binary files a/media/overlays/normalized/gameboy/b.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/dpad.png b/media/overlays/normalized/gameboy/dpad.png
deleted file mode 100644
index 3a0e55a7ae..0000000000
Binary files a/media/overlays/normalized/gameboy/dpad.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/gameboy.cfg b/media/overlays/normalized/gameboy/gameboy.cfg
deleted file mode 100644
index 21f17d8ac1..0000000000
--- a/media/overlays/normalized/gameboy/gameboy.cfg
+++ /dev/null
@@ -1,94 +0,0 @@
-overlays = 4
-
-overlay0_normalized = true
-overlay0_name = "landscape"
-overlay0_range_mod = 1.5
-overlay0_alpha_mod = 2.0
-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 = 16
-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 = "overlay_next,0.70125,0.07708333333334,rect,0.025,0.04166666667"
-overlay0_desc8_overlay = next.png
-overlay0_desc8_next_target = "menu"
-overlay0_desc9 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc10 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc11 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc12 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc13 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
-overlay0_desc13_overlay = dpad.png
-overlay0_desc14 = "menu_toggle,0.50125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc14_overlay = rgui.png
-overlay0_desc15 = "overlay_next,0.30125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc15_overlay = rotate.png
-overlay0_desc15_next_target = "portrait"
-
-overlay1_descs = 16
-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_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 = "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.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.86875,rect,0.2625,0.1575"
-overlay1_desc13_overlay = dpad.png
-overlay1_desc14 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
-overlay1_desc14_overlay = rgui.png
-overlay1_desc15 = "overlay_next,0.30125,0.53125,radial,0.04166666666,0.025"
-overlay1_desc15_overlay = rotate.png
-overlay1_desc15_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/normalized/gameboy/next-menu.png b/media/overlays/normalized/gameboy/next-menu.png
deleted file mode 100644
index ea1cd5341f..0000000000
Binary files a/media/overlays/normalized/gameboy/next-menu.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/next.png b/media/overlays/normalized/gameboy/next.png
deleted file mode 100644
index 87edcb69d5..0000000000
Binary files a/media/overlays/normalized/gameboy/next.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/quickmenu.png b/media/overlays/normalized/gameboy/quickmenu.png
deleted file mode 100644
index 9b4918134b..0000000000
Binary files a/media/overlays/normalized/gameboy/quickmenu.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/rgui.png b/media/overlays/normalized/gameboy/rgui.png
deleted file mode 100644
index 2f0295463c..0000000000
Binary files a/media/overlays/normalized/gameboy/rgui.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/rotate.png b/media/overlays/normalized/gameboy/rotate.png
deleted file mode 100644
index 39cb11fbea..0000000000
Binary files a/media/overlays/normalized/gameboy/rotate.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/select.png b/media/overlays/normalized/gameboy/select.png
deleted file mode 100644
index a038c10a2b..0000000000
Binary files a/media/overlays/normalized/gameboy/select.png and /dev/null differ
diff --git a/media/overlays/normalized/gameboy/start.png b/media/overlays/normalized/gameboy/start.png
deleted file mode 100644
index f9078b1399..0000000000
Binary files a/media/overlays/normalized/gameboy/start.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/a.png b/media/overlays/normalized/gba/a.png
deleted file mode 100644
index 76b973e8df..0000000000
Binary files a/media/overlays/normalized/gba/a.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/b.png b/media/overlays/normalized/gba/b.png
deleted file mode 100644
index 840c608c7f..0000000000
Binary files a/media/overlays/normalized/gba/b.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/dpad.png b/media/overlays/normalized/gba/dpad.png
deleted file mode 100644
index 4a20871304..0000000000
Binary files a/media/overlays/normalized/gba/dpad.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/gba.cfg b/media/overlays/normalized/gba/gba.cfg
deleted file mode 100644
index 8a0f074bf9..0000000000
--- a/media/overlays/normalized/gba/gba.cfg
+++ /dev/null
@@ -1,102 +0,0 @@
-overlays = 4
-
-overlay0_normalized = true
-overlay0_name = "landscape"
-overlay0_range_mod = 1.5
-overlay0_alpha_mod = 2.0
-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.07708333333334,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.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc16_overlay = rgui.png
-overlay0_desc17 = "overlay_next,0.30125,0.07708333333334,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.86875,rect,0.2625,0.1575"
-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/normalized/gba/l.png b/media/overlays/normalized/gba/l.png
deleted file mode 100644
index aefcac586a..0000000000
Binary files a/media/overlays/normalized/gba/l.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/next-menu.png b/media/overlays/normalized/gba/next-menu.png
deleted file mode 100644
index d401f54468..0000000000
Binary files a/media/overlays/normalized/gba/next-menu.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/next.png b/media/overlays/normalized/gba/next.png
deleted file mode 100644
index 86d2143164..0000000000
Binary files a/media/overlays/normalized/gba/next.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/quickmenu.png b/media/overlays/normalized/gba/quickmenu.png
deleted file mode 100644
index 9b4918134b..0000000000
Binary files a/media/overlays/normalized/gba/quickmenu.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/r.png b/media/overlays/normalized/gba/r.png
deleted file mode 100644
index f90c74e21d..0000000000
Binary files a/media/overlays/normalized/gba/r.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/rgui.png b/media/overlays/normalized/gba/rgui.png
deleted file mode 100644
index 2fbd181f2b..0000000000
Binary files a/media/overlays/normalized/gba/rgui.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/rotate.png b/media/overlays/normalized/gba/rotate.png
deleted file mode 100644
index 8d09bee709..0000000000
Binary files a/media/overlays/normalized/gba/rotate.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/select.png b/media/overlays/normalized/gba/select.png
deleted file mode 100644
index 51a6bfdebc..0000000000
Binary files a/media/overlays/normalized/gba/select.png and /dev/null differ
diff --git a/media/overlays/normalized/gba/start.png b/media/overlays/normalized/gba/start.png
deleted file mode 100644
index 2909ba8a6e..0000000000
Binary files a/media/overlays/normalized/gba/start.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/3button.png b/media/overlays/normalized/genesis/3button.png
deleted file mode 100644
index 82346a2827..0000000000
Binary files a/media/overlays/normalized/genesis/3button.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/6button.png b/media/overlays/normalized/genesis/6button.png
deleted file mode 100644
index f5efc43ef1..0000000000
Binary files a/media/overlays/normalized/genesis/6button.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/a.png b/media/overlays/normalized/genesis/a.png
deleted file mode 100644
index 8ecfa7bc51..0000000000
Binary files a/media/overlays/normalized/genesis/a.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/b.png b/media/overlays/normalized/genesis/b.png
deleted file mode 100644
index 7d7a59712b..0000000000
Binary files a/media/overlays/normalized/genesis/b.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/c.png b/media/overlays/normalized/genesis/c.png
deleted file mode 100644
index 1055995678..0000000000
Binary files a/media/overlays/normalized/genesis/c.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/dpad.png b/media/overlays/normalized/genesis/dpad.png
deleted file mode 100644
index 216b2e07b9..0000000000
Binary files a/media/overlays/normalized/genesis/dpad.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/genesis.cfg b/media/overlays/normalized/genesis/genesis.cfg
deleted file mode 100644
index 1390984289..0000000000
--- a/media/overlays/normalized/genesis/genesis.cfg
+++ /dev/null
@@ -1,177 +0,0 @@
-overlays = 6
-
-overlay0_normalized = true
-overlay0_name = "6-button-landscape"
-overlay0_range_mod = 1.5
-overlay0_alpha_mod = 2.0
-overlay1_normalized = true
-overlay1_name = "3-button-landscape"
-overlay1_range_mod = 1.5
-overlay1_alpha_mod = 2.0
-overlay2_normalized = true
-overlay2_name = "6-button-portrait"
-overlay2_range_mod = 1.5
-overlay2_alpha_mod = 2.0
-overlay3_normalized = true
-overlay3_name = "3-button-portrait"
-overlay3_range_mod = 1.5
-overlay3_alpha_mod = 2.0
-overlay4_overlay = quickmenu.png
-overlay4_name = "menu"
-overlay5_overlay = next.png
-overlay5_name = "hide"
-overlay5_full_screen = true
-
-overlay0_descs = 20
-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.9125,0.1,rect,0.0375,0.0625"
-overlay0_desc4_overlay = start.png
-overlay0_desc5 = "a,0.955,0.8083333333333,rect,0.0325,0.05416666666667"
-overlay0_desc5_overlay = c.png
-overlay0_desc6 = "b,0.87625,0.858333333333,radial,0.0325,0.05416666666667"
-overlay0_desc6_overlay = b.png
-overlay0_desc7 = "y,0.7925,0.914583333333,radial,0.0325,0.05416666666667"
-overlay0_desc7_overlay = a.png
-overlay0_desc8 = "l,0.76,0.77916666667,rect,0.03,0.05"
-overlay0_desc8_overlay = x.png
-overlay0_desc9 = "x,0.8375,0.72916666667,radial,0.03,0.05"
-overlay0_desc9_overlay = y.png
-overlay0_desc10 = "r,0.92,0.679166666667,radial,0.03,0.05"
-overlay0_desc10_overlay = z.png
-overlay0_desc11 = "overlay_next,0.50125,0.95833333333,rect,0.03,0.04166666667"
-overlay0_desc11_overlay = next.png
-overlay0_desc11_next_target = "menu"
-overlay0_desc12 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc13 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc14 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc15 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc16 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
-overlay0_desc16_overlay = dpad.png
-overlay0_desc17 = "menu_toggle,0.50125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc17_overlay = rgui.png
-overlay0_desc18 = "overlay_next,0.30125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc18_overlay = rotate.png
-overlay0_desc18_next_target = "6-button-portrait"
-overlay0_desc19 = "overlay_next,0.70125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc19_overlay = 3button.png
-overlay0_desc19_next_target = "3-button-landscape"
-
-overlay1_descs = 17
-overlay1_desc0 = "left,0.04375,0.80208333333,radial,0.0525,0.0875"
-overlay1_desc1 = "right,0.19375,0.80208333333,radial,0.0525,0.0875"
-overlay1_desc2 = "up,0.11845,0.67708333333,radial,0.0525,0.0875"
-overlay1_desc3 = "down,0.11845,0.92708333333,radial,0.0525,0.0875"
-overlay1_desc4 = "start,0.9125,0.1,rect,0.0375,0.0625"
-overlay1_desc4_overlay = start.png
-overlay1_desc5 = "a,0.955,0.8083333333333,rect,0.0325,0.05416666666667"
-overlay1_desc5_overlay = c.png
-overlay1_desc6 = "b,0.87625,0.858333333333,radial,0.0325,0.05416666666667"
-overlay1_desc6_overlay = b.png
-overlay1_desc7 = "y,0.7925,0.914583333333,radial,0.0325,0.05416666666667"
-overlay1_desc7_overlay = a.png
-overlay1_desc8 = "overlay_next,0.50125,0.95833333333,rect,0.03,0.04166666667"
-overlay1_desc8_overlay = next.png
-overlay1_desc8_next_target = "menu"
-overlay1_desc9 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay1_desc10 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay1_desc11 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay1_desc12 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay1_desc13 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
-overlay1_desc13_overlay = dpad.png
-overlay1_desc14 = "menu_toggle,0.50125,0.07708333333334,radial,0.025,0.04166666666"
-overlay1_desc14_overlay = rgui.png
-overlay1_desc15 = "overlay_next,0.30125,0.07708333333334,radial,0.025,0.04166666666"
-overlay1_desc15_overlay = rotate.png
-overlay1_desc15_next_target = "3-button-portrait"
-overlay1_desc16 = "overlay_next,0.70125,0.07708333333334,radial,0.025,0.04166666666"
-overlay1_desc16_overlay = 6button.png
-overlay1_desc16_next_target = "6-button-landscape"
-
-overlay2_descs = 20
-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_overlay = start.png
-overlay2_desc5 = "a,0.93541666666667,0.9,radial,0.05208333333,0.03125"
-overlay2_desc5_overlay = c.png
-overlay2_desc6 = "b,0.77916666667,0.92,radial,0.05208333333,0.03125"
-overlay2_desc6_overlay = b.png
-overlay2_desc7 = "y,0.6270833333333,0.94375,rect,0.05208333333,0.03125"
-overlay2_desc7_overlay = a.png
-overlay2_desc8 = "l,0.5895833333333,0.855,rect,0.04375,0.02625"
-overlay2_desc8_overlay = x.png
-overlay2_desc9 = "x,0.733333333,0.8325,radial,0.04375,0.02625"
-overlay2_desc9_overlay = y.png
-overlay2_desc10 = "r,0.8875,0.81,radial,0.04375,0.02625"
-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.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.86875,rect,0.2225,0.1175"
-overlay2_desc16_overlay = dpad.png
-overlay2_desc17 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
-overlay2_desc17_overlay = rgui.png
-overlay2_desc18 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
-overlay2_desc18_overlay = rotate.png
-overlay2_desc18_next_target = "6-button-landscape"
-overlay2_desc19 = "overlay_next,0.70125,0.57708333333334,radial,0.04166666666,0.025"
-overlay2_desc19_overlay = 3button.png
-overlay2_desc19_next_target = "3-button-portrait"
-
-overlay3_descs = 17
-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_overlay = start.png
-overlay3_desc5 = "a,0.93541666666667,0.9,radial,0.05208333333,0.03125"
-overlay3_desc5_overlay = c.png
-overlay3_desc6 = "b,0.77916666667,0.92,radial,0.05208333333,0.03125"
-overlay3_desc6_overlay = b.png
-overlay3_desc7 = "y,0.6270833333333,0.94375,rect,0.05208333333,0.03125"
-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.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.86875,rect,0.2225,0.1175"
-overlay3_desc13_overlay = dpad.png
-overlay3_desc14 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
-overlay3_desc14_overlay = rgui.png
-overlay3_desc15 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
-overlay3_desc15_overlay = rotate.png
-overlay3_desc15_next_target = "3-button-landscape"
-overlay3_desc16 = "overlay_next,0.70125,0.57708333333334,radial,0.04166666666,0.025"
-overlay3_desc16_overlay = 6button.png
-overlay3_desc16_next_target = "6-button-portrait"
-
-overlay4_descs = 11
-overlay4_desc0  = "load_state,292,53,rect,50,38"
-overlay4_desc1  = "save_state,505,53,rect,50,38"
-overlay4_desc2  = "state_slot_decrease,292,222,rect,50,38"
-overlay4_desc3  = "state_slot_increase,505,222,rect,50,38"
-overlay4_desc4  = "rewind,292,306,rect,50,38"
-overlay4_desc5  = "slowmotion,292,393,rect,50,38"
-overlay4_desc6  = "reset,505,393,rect,50,38"
-overlay4_desc7  = "toggle_fast_forward,505,306,rect,50,38"
-overlay4_desc8  = "shader_next,505,136,rect,50,38"
-overlay4_desc9  = "shader_prev,292,136,rect,50,38"
-overlay4_desc10 = "overlay_next,400,452,radial,22,22"
-overlay4_desc10_next_target = "hide"
-
-overlay5_descs = 1
-overlay5_rect = "0.47,0.9,0.1,0.1"
-overlay5_desc0 = "overlay_next,16,16,radial,35,35"
\ No newline at end of file
diff --git a/media/overlays/normalized/genesis/next.png b/media/overlays/normalized/genesis/next.png
deleted file mode 100644
index 87edcb69d5..0000000000
Binary files a/media/overlays/normalized/genesis/next.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/quickmenu.png b/media/overlays/normalized/genesis/quickmenu.png
deleted file mode 100644
index 225e99dbf4..0000000000
Binary files a/media/overlays/normalized/genesis/quickmenu.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/rgui.png b/media/overlays/normalized/genesis/rgui.png
deleted file mode 100644
index 2f0295463c..0000000000
Binary files a/media/overlays/normalized/genesis/rgui.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/rotate.png b/media/overlays/normalized/genesis/rotate.png
deleted file mode 100644
index 39cb11fbea..0000000000
Binary files a/media/overlays/normalized/genesis/rotate.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/start.png b/media/overlays/normalized/genesis/start.png
deleted file mode 100644
index 01e221801c..0000000000
Binary files a/media/overlays/normalized/genesis/start.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/x.png b/media/overlays/normalized/genesis/x.png
deleted file mode 100644
index 1c39cd1176..0000000000
Binary files a/media/overlays/normalized/genesis/x.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/y.png b/media/overlays/normalized/genesis/y.png
deleted file mode 100644
index 6282aa1cbe..0000000000
Binary files a/media/overlays/normalized/genesis/y.png and /dev/null differ
diff --git a/media/overlays/normalized/genesis/z.png b/media/overlays/normalized/genesis/z.png
deleted file mode 100644
index 9975d38864..0000000000
Binary files a/media/overlays/normalized/genesis/z.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/a.png b/media/overlays/normalized/snes/a.png
deleted file mode 100644
index 910010cab3..0000000000
Binary files a/media/overlays/normalized/snes/a.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/b.png b/media/overlays/normalized/snes/b.png
deleted file mode 100644
index 8c5030c13e..0000000000
Binary files a/media/overlays/normalized/snes/b.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/dpad.png b/media/overlays/normalized/snes/dpad.png
deleted file mode 100644
index de42d9a707..0000000000
Binary files a/media/overlays/normalized/snes/dpad.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/l1.png b/media/overlays/normalized/snes/l1.png
deleted file mode 100644
index a82249ec63..0000000000
Binary files a/media/overlays/normalized/snes/l1.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/next.png b/media/overlays/normalized/snes/next.png
deleted file mode 100644
index 87edcb69d5..0000000000
Binary files a/media/overlays/normalized/snes/next.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/quickmenu.png b/media/overlays/normalized/snes/quickmenu.png
deleted file mode 100644
index 225e99dbf4..0000000000
Binary files a/media/overlays/normalized/snes/quickmenu.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/r1.png b/media/overlays/normalized/snes/r1.png
deleted file mode 100644
index f5a072af6c..0000000000
Binary files a/media/overlays/normalized/snes/r1.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/rgui.png b/media/overlays/normalized/snes/rgui.png
deleted file mode 100644
index 2f0295463c..0000000000
Binary files a/media/overlays/normalized/snes/rgui.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/rotate.png b/media/overlays/normalized/snes/rotate.png
deleted file mode 100644
index 39cb11fbea..0000000000
Binary files a/media/overlays/normalized/snes/rotate.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/select.png b/media/overlays/normalized/snes/select.png
deleted file mode 100644
index 006f4446e7..0000000000
Binary files a/media/overlays/normalized/snes/select.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/snes.cfg b/media/overlays/normalized/snes/snes.cfg
deleted file mode 100644
index 97ff283638..0000000000
--- a/media/overlays/normalized/snes/snes.cfg
+++ /dev/null
@@ -1,108 +0,0 @@
-overlays = 4
-
-overlay0_normalized = true
-overlay0_name = "landscape"
-overlay0_range_mod = 1.5
-overlay0_alpha_mod = 2.0
-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.png
-overlay3_name = "hide"
-overlay3_full_screen = true
-
-overlay0_descs = 20
-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.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.052083333333,rect,0.0625,0.052083333333"
-overlay0_desc10_overlay = l1.png
-overlay0_desc11 = "r,0.9375,0.052083333333,rect,0.0625,0.052083333333"
-overlay0_desc11_overlay = r1.png
-overlay0_desc12 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc13 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc14 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay0_desc15 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay0_desc16 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
-overlay0_desc16_overlay = dpad.png
-overlay0_desc17 = "overlay_next,0.70125,0.07708333333334,rect,0.025,0.04166666667"
-overlay0_desc17_overlay = next.png
-overlay0_desc17_next_target = "menu"
-overlay0_desc18 = "menu_toggle,0.50125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc18_overlay = rgui.png
-overlay0_desc19 = "overlay_next,0.30125,0.07708333333334,radial,0.025,0.04166666666"
-overlay0_desc19_overlay = rotate.png
-overlay0_desc19_next_target = "portrait"
-
-overlay1_descs = 20
-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.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.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.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.86875,rect,0.2225,0.1325"
-overlay1_desc16_overlay = dpad.png
-overlay1_desc17 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"
-overlay1_desc17_overlay = next.png
-overlay1_desc17_next_target = "menu"
-overlay1_desc18 = "menu_toggle,0.5,0.53125,radial,0.04166666666,0.025"
-overlay1_desc18_overlay = rgui.png
-overlay1_desc19 = "overlay_next,0.30125,0.53125,radial,0.04166666666,0.025"
-overlay1_desc19_overlay = rotate.png
-overlay1_desc19_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/normalized/snes/start.png b/media/overlays/normalized/snes/start.png
deleted file mode 100644
index 60e864d3fb..0000000000
Binary files a/media/overlays/normalized/snes/start.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/x.png b/media/overlays/normalized/snes/x.png
deleted file mode 100644
index 15d822207e..0000000000
Binary files a/media/overlays/normalized/snes/x.png and /dev/null differ
diff --git a/media/overlays/normalized/snes/y.png b/media/overlays/normalized/snes/y.png
deleted file mode 100644
index 8390ccb33d..0000000000
Binary files a/media/overlays/normalized/snes/y.png and /dev/null differ
diff --git a/media/overlays/psx/box-psx-diagonals.cfg b/media/overlays/psx/box-psx-diagonals.cfg
index b453cc6fff..d17dd8b285 100644
--- a/media/overlays/psx/box-psx-diagonals.cfg
+++ b/media/overlays/psx/box-psx-diagonals.cfg
@@ -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.0625,0.0375"
-overlay1_desc15 = "right|up,0.333333333,0.75,rect,0.0625,0.0375"
-overlay1_desc16 = "left|down,0.0625,0.9125,rect,0.0625,0.0375"
-overlay1_desc17 = "right|down,0.333333333,0.9125,rect,0.0625,0.0375"
+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_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/snes/snes.cfg b/media/overlays/snes/snes.cfg
index d1971dafc6..50f6979a46 100644
--- a/media/overlays/snes/snes.cfg
+++ b/media/overlays/snes/snes.cfg
@@ -76,10 +76,10 @@ 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.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_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_desc16_overlay = dpad.png
 overlay1_desc17 = "overlay_next,0.7016666667,0.53125,rect,0.041666667,0.025"