diff --git a/media/overlays/gameboy-landscape.cfg b/media/overlays/gameboy-landscape.cfg
index 1de27123eb..a6f778bac5 100644
--- a/media/overlays/gameboy-landscape.cfg
+++ b/media/overlays/gameboy-landscape.cfg
@@ -16,24 +16,24 @@ overlay0_desc4  = "select,730,115,rect,30,30"
 overlay0_desc5  = "start,730,48,rect,30,30"
 overlay0_desc6 = "b,697,418,radial,30,30"
 overlay0_desc7 = "a,762,370,radial,30,30"
-overlay0_desc8 = "overlay_next,72,44,radial,30,30"
+overlay0_desc8 = "overlay_next,731,239,radial,30,30"
 overlay0_desc9 = "left|up,28,348,radial,20,20"
 overlay0_desc10 = "left|down,28,435,radial,20,20"
 overlay0_desc11 = "right|up,117,348,radial,20,20"
 overlay0_desc12 = "right|down,117,435,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,126,76,rect,125,45"
-overlay1_desc1  = "save_state,392,76,rect,125,45"
-overlay1_desc2  = "state_slot_decrease,126,188,rect,125,45"
-overlay1_desc3  = "state_slot_increase,392,188,rect,125,45"
-overlay1_desc4  = "rewind,126,300,rect,125,45"
-overlay1_desc5  = "slowmotion,653,300,rect,125,45"
-overlay1_desc6  = "reset,126,412,rect,125,45"
-overlay1_desc7  = "toggle_fast_forward,392,300,rect,125,45"
-overlay1_desc8  = "shader_next,653,188,rect,125,45"
-overlay1_desc9  = "shader_prev,653,76,rect,125,45"
-overlay1_desc10 = "overlay_next,392,417,radial,22,22"
+overlay1_desc0  = "load_state,292,53,rect,50,38"
+overlay1_desc1  = "save_state,505,53,rect,50,38"
+overlay1_desc2  = "state_slot_decrease,292,222,rect,50,38"
+overlay1_desc3  = "state_slot_increase,505,222,rect,50,38"
+overlay1_desc4  = "rewind,292,306,rect,50,38"
+overlay1_desc5  = "slowmotion,292,393,rect,50,38"
+overlay1_desc6  = "reset,505,393,rect,50,38"
+overlay1_desc7  = "toggle_fast_forward,505,306,rect,50,38"
+overlay1_desc8  = "shader_next,505,136,rect,50,38"
+overlay1_desc9  = "shader_prev,292,136,rect,50,38"
+overlay1_desc10 = "overlay_next,400,452,radial,22,22"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/gameboy-landscape.png b/media/overlays/gameboy-landscape.png
index ad9a2dc0e2..20a2c1dbcf 100644
Binary files a/media/overlays/gameboy-landscape.png and b/media/overlays/gameboy-landscape.png differ
diff --git a/media/overlays/gameboy-portrait.cfg b/media/overlays/gameboy-portrait.cfg
index 87eee69bb7..166e290419 100644
--- a/media/overlays/gameboy-portrait.cfg
+++ b/media/overlays/gameboy-portrait.cfg
@@ -23,17 +23,17 @@ overlay0_desc11 = "right|up,162,643,radial,20,20"
 overlay0_desc12 = "right|down,162,761,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,120,131,rect,110,45"
-overlay1_desc1  = "save_state,360,131,rect,110,45"
-overlay1_desc2  = "state_slot_decrease,120,245,rect,110,45"
-overlay1_desc3  = "state_slot_increase,360,245,rect,110,45"
-overlay1_desc4  = "rewind,120,357,rect,110,45"
-overlay1_desc5  = "slowmotion,120,582,rect,110,45"
-overlay1_desc6  = "reset,360,582,rect,110,45"
-overlay1_desc7  = "toggle_fast_forward,360,357,rect,110,45"
-overlay1_desc8  = "shader_next,360,467,rect,110,45"
-overlay1_desc9  = "shader_prev,120,467,rect,110,45"
-overlay1_desc10 = "overlay_next,240,682,radial,30,30"
+overlay1_desc0  = "load_state,120,52,rect,110,45"
+overlay1_desc1  = "save_state,360,52,rect,110,45"
+overlay1_desc2  = "state_slot_decrease,120,167,rect,110,45"
+overlay1_desc3  = "state_slot_increase,360,167,rect,110,45"
+overlay1_desc4  = "rewind,120,276,rect,110,45"
+overlay1_desc5  = "toggle_fast_forward,360,276,rect,110,45"
+overlay1_desc6  = "shader_prev,120,389,rect,110,45"
+overlay1_desc7  = "shader_next,360,389,rect,110,45"
+overlay1_desc8  = "slowmotion,120,504,rect,110,45"
+overlay1_desc9  = "reset,360,504,rect,110,45"
+overlay1_desc10 = "overlay_next,340,683,radial,25,25"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/genesis3-landscape.cfg b/media/overlays/genesis3-landscape.cfg
index 3002ee924b..7a02a650ce 100644
--- a/media/overlays/genesis3-landscape.cfg
+++ b/media/overlays/genesis3-landscape.cfg
@@ -13,28 +13,28 @@ overlay0_desc1 = "right,110,393,rect,25,25"
 overlay0_desc2 = "up,70,360,rect,25,25"
 overlay0_desc3 = "down,70,432,rect,25,25"
 overlay0_desc4 = "start,730,48,rect,30,30"
-overlay0_desc5 = "a,769,403,rect,20,20"
-overlay0_desc6 = "b,715,421,radial,20,20"
-overlay0_desc7 = "y,663,444,radial,20,20"
-overlay0_desc8 = "overlay_next,730,171,radial,30,30"
+overlay0_desc5 = "a,764,388,rect,26,26"
+overlay0_desc6 = "b,697,412,radial,26,26"
+overlay0_desc7 = "y,634,439,radial,26,26"
+overlay0_desc8 = "overlay_next,728,186,radial,30,30"
 overlay0_desc9 = "left|up,32,354,radial,20,20"
 overlay0_desc10 = "left|down,32,432,radial,20,20"
 overlay0_desc11 = "right|up,111,354,radial,20,20"
 overlay0_desc12 = "right|down,111,432,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,126,76,rect,125,45"
-overlay1_desc1  = "save_state,392,76,rect,125,45"
-overlay1_desc2  = "state_slot_decrease,126,188,rect,125,45"
-overlay1_desc3  = "state_slot_increase,392,188,rect,125,45"
-overlay1_desc4  = "rewind,126,300,rect,125,45"
-overlay1_desc5  = "slowmotion,653,300,rect,125,45"
-overlay1_desc6  = "reset,126,412,rect,125,45"
-overlay1_desc7  = "toggle_fast_forward,392,300,rect,125,45"
-overlay1_desc8  = "shader_next,653,188,rect,125,45"
-overlay1_desc9  = "shader_prev,653,76,rect,125,45"
-overlay1_desc10 = "overlay_next,392,417,radial,22,22"
+overlay1_desc0  = "load_state,292,53,rect,50,38"
+overlay1_desc1  = "save_state,505,53,rect,50,38"
+overlay1_desc2  = "state_slot_decrease,292,222,rect,50,38"
+overlay1_desc3  = "state_slot_increase,505,222,rect,50,38"
+overlay1_desc4  = "rewind,292,306,rect,50,38"
+overlay1_desc5  = "slowmotion,292,393,rect,50,38"
+overlay1_desc6  = "reset,505,393,rect,50,38"
+overlay1_desc7  = "toggle_fast_forward,505,306,rect,50,38"
+overlay1_desc8  = "shader_next,505,136,rect,50,38"
+overlay1_desc9  = "shader_prev,292,136,rect,50,38"
+overlay1_desc10 = "overlay_next,400,452,radial,22,22"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
-overlay2_desc0 = "overlay_next,16,16,radial,16,16"
+overlay2_desc0 = "overlay_next,16,16,radial,16,16"
\ No newline at end of file
diff --git a/media/overlays/genesis3-landscape.png b/media/overlays/genesis3-landscape.png
index b9e8ab1762..b813241bfd 100644
Binary files a/media/overlays/genesis3-landscape.png and b/media/overlays/genesis3-landscape.png differ
diff --git a/media/overlays/genesis3-portrait.cfg b/media/overlays/genesis3-portrait.cfg
index 7994cd77cd..b417f629ea 100644
--- a/media/overlays/genesis3-portrait.cfg
+++ b/media/overlays/genesis3-portrait.cfg
@@ -23,17 +23,17 @@ overlay0_desc11 = "right|up,159,638,radial,25,25"
 overlay0_desc12 = "right|down,159,744,radial,25,25"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,120,131,rect,110,45"
-overlay1_desc1  = "save_state,360,131,rect,110,45"
-overlay1_desc2  = "state_slot_decrease,120,245,rect,110,45"
-overlay1_desc3  = "state_slot_increase,360,245,rect,110,45"
-overlay1_desc4  = "rewind,120,357,rect,110,45"
-overlay1_desc5  = "slowmotion,120,582,rect,110,45"
-overlay1_desc6  = "reset,360,582,rect,110,45"
-overlay1_desc7  = "toggle_fast_forward,360,357,rect,110,45"
-overlay1_desc8  = "shader_next,360,467,rect,110,45"
-overlay1_desc9  = "shader_prev,120,467,rect,110,45"
-overlay1_desc10 = "overlay_next,240,682,radial,30,30"
+overlay1_desc0  = "load_state,120,52,rect,110,45"
+overlay1_desc1  = "save_state,360,52,rect,110,45"
+overlay1_desc2  = "state_slot_decrease,120,167,rect,110,45"
+overlay1_desc3  = "state_slot_increase,360,167,rect,110,45"
+overlay1_desc4  = "rewind,120,276,rect,110,45"
+overlay1_desc5  = "toggle_fast_forward,360,276,rect,110,45"
+overlay1_desc6  = "shader_prev,120,389,rect,110,45"
+overlay1_desc7  = "shader_next,360,389,rect,110,45"
+overlay1_desc8  = "slowmotion,120,504,rect,110,45"
+overlay1_desc9  = "reset,360,504,rect,110,45"
+overlay1_desc10 = "overlay_next,340,683,radial,30,30"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/genesis6-landscape.cfg b/media/overlays/genesis6-landscape.cfg
index 4e6a2d940f..2c9a2be784 100644
--- a/media/overlays/genesis6-landscape.cfg
+++ b/media/overlays/genesis6-landscape.cfg
@@ -13,31 +13,31 @@ overlay0_desc1 = "right,110,393,rect,25,25"
 overlay0_desc2 = "up,70,360,rect,25,25"
 overlay0_desc3 = "down,70,432,rect,25,25"
 overlay0_desc4 = "start,730,48,rect,30,30"
-overlay0_desc5 = "a,769,403,rect,20,20"
-overlay0_desc6 = "b,715,421,radial,20,20"
-overlay0_desc7 = "y,663,444,radial,20,20"
-overlay0_desc8 = "l,642,394,rect,17,17"
-overlay0_desc9 = "x,693,370,radial,17,17"
-overlay0_desc10 = "r,746,350,radial,17,17"
-overlay0_desc11 = "overlay_next,730,171,radial,30,30"
+overlay0_desc5 = "a,764,388,rect,26,26"
+overlay0_desc6 = "b,697,412,radial,26,26"
+overlay0_desc7 = "y,634,439,radial,26,26"
+overlay0_desc8 = "l,608,374,rect,24,24"
+overlay0_desc9 = "x,670,350,radial,24,24"
+overlay0_desc10 = "r,736,326,radial,24,17"
+overlay0_desc11 = "overlay_next,728,186,radial,30,30"
 overlay0_desc12 = "left|up,32,354,radial,20,20"
 overlay0_desc13 = "left|down,32,432,radial,20,20"
 overlay0_desc14 = "right|up,111,354,radial,20,20"
 overlay0_desc15 = "right|down,111,432,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,126,76,rect,125,45"
-overlay1_desc1  = "save_state,392,76,rect,125,45"
-overlay1_desc2  = "state_slot_decrease,126,188,rect,125,45"
-overlay1_desc3  = "state_slot_increase,392,188,rect,125,45"
-overlay1_desc4  = "rewind,126,300,rect,125,45"
-overlay1_desc5  = "slowmotion,653,300,rect,125,45"
-overlay1_desc6  = "reset,126,412,rect,125,45"
-overlay1_desc7  = "toggle_fast_forward,392,300,rect,125,45"
-overlay1_desc8  = "shader_next,653,188,rect,125,45"
-overlay1_desc9  = "shader_prev,653,76,rect,125,45"
-overlay1_desc10 = "overlay_next,392,417,radial,22,22"
+overlay1_desc0  = "load_state,292,53,rect,50,38"
+overlay1_desc1  = "save_state,505,53,rect,50,38"
+overlay1_desc2  = "state_slot_decrease,292,222,rect,50,38"
+overlay1_desc3  = "state_slot_increase,505,222,rect,50,38"
+overlay1_desc4  = "rewind,292,306,rect,50,38"
+overlay1_desc5  = "slowmotion,292,393,rect,50,38"
+overlay1_desc6  = "reset,505,393,rect,50,38"
+overlay1_desc7  = "toggle_fast_forward,505,306,rect,50,38"
+overlay1_desc8  = "shader_next,505,136,rect,50,38"
+overlay1_desc9  = "shader_prev,292,136,rect,50,38"
+overlay1_desc10 = "overlay_next,400,452,radial,22,22"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
-overlay2_desc0 = "overlay_next,16,16,radial,16,16"
+overlay2_desc0 = "overlay_next,16,16,radial,16,16"
\ No newline at end of file
diff --git a/media/overlays/genesis6-landscape.png b/media/overlays/genesis6-landscape.png
index bb427fcda2..771b541ea5 100644
Binary files a/media/overlays/genesis6-landscape.png and b/media/overlays/genesis6-landscape.png differ
diff --git a/media/overlays/genesis6-portrait.cfg b/media/overlays/genesis6-portrait.cfg
index 6bd864b940..fd03d4a19d 100644
--- a/media/overlays/genesis6-portrait.cfg
+++ b/media/overlays/genesis6-portrait.cfg
@@ -26,17 +26,17 @@ overlay0_desc14 = "right|up,159,638,radial,25,25"
 overlay0_desc15 = "right|down,159,744,radial,25,25"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,120,131,rect,110,45"
-overlay1_desc1  = "save_state,360,131,rect,110,45"
-overlay1_desc2  = "state_slot_decrease,120,245,rect,110,45"
-overlay1_desc3  = "state_slot_increase,360,245,rect,110,45"
-overlay1_desc4  = "rewind,120,357,rect,110,45"
-overlay1_desc5  = "slowmotion,120,582,rect,110,45"
-overlay1_desc6  = "reset,360,582,rect,110,45"
-overlay1_desc7  = "toggle_fast_forward,360,357,rect,110,45"
-overlay1_desc8  = "shader_next,360,467,rect,110,45"
-overlay1_desc9  = "shader_prev,120,467,rect,110,45"
-overlay1_desc10 = "overlay_next,240,682,radial,30,30"
+overlay1_desc0  = "load_state,120,52,rect,110,45"
+overlay1_desc1  = "save_state,360,52,rect,110,45"
+overlay1_desc2  = "state_slot_decrease,120,167,rect,110,45"
+overlay1_desc3  = "state_slot_increase,360,167,rect,110,45"
+overlay1_desc4  = "rewind,120,276,rect,110,45"
+overlay1_desc5  = "toggle_fast_forward,360,276,rect,110,45"
+overlay1_desc6  = "shader_prev,120,389,rect,110,45"
+overlay1_desc7  = "shader_next,360,389,rect,110,45"
+overlay1_desc8  = "slowmotion,120,504,rect,110,45"
+overlay1_desc9  = "reset,360,504,rect,110,45"
+overlay1_desc10 = "overlay_next,340,683,radial,30,30"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/genesis_next.png b/media/overlays/genesis_next.png
index 70fb3b4321..b782236a70 100644
Binary files a/media/overlays/genesis_next.png and b/media/overlays/genesis_next.png differ
diff --git a/media/overlays/genesis_quickmenu_small.png b/media/overlays/genesis_quickmenu_small.png
index 13bf174d28..225e99dbf4 100644
Binary files a/media/overlays/genesis_quickmenu_small.png and b/media/overlays/genesis_quickmenu_small.png differ
diff --git a/media/overlays/genesis_quickmenu_small2.png b/media/overlays/genesis_quickmenu_small2.png
index 99fc34b9f6..4082473385 100644
Binary files a/media/overlays/genesis_quickmenu_small2.png and b/media/overlays/genesis_quickmenu_small2.png differ
diff --git a/media/overlays/nes-landscape.cfg b/media/overlays/nes-landscape.cfg
index 241da64a1d..f6375768c4 100644
--- a/media/overlays/nes-landscape.cfg
+++ b/media/overlays/nes-landscape.cfg
@@ -1,8 +1,8 @@
 overlays = 3
 
 overlay0_overlay = nes-landscape.png
-overlay1_overlay = nintendo_quickmenu_small.png
-overlay2_overlay = nintendo_next.png
+overlay1_overlay = nes_quickmenu_small.png
+overlay2_overlay = nes_next.png
 
 overlay0_full_screen = true
 overlay1_full_screen = true
@@ -14,8 +14,8 @@ overlay0_desc2  = "up,77,355,rect,20,20"
 overlay0_desc3  = "down,77,443,rect,20,20"
 overlay0_desc4  = "select,54,35,rect,45,20"
 overlay0_desc5  = "start,745,35,rect,45,20"
-overlay0_desc6 = "b,754,444,radial,30,30"
-overlay0_desc7 = "a,754,355,radial,30,30"
+overlay0_desc6 = "b,685,424,radial,30,30"
+overlay0_desc7 = "a,759,424,radial,30,30"
 overlay0_desc8 = "overlay_next,743,204,radial,30,30"
 overlay0_desc9 = "left|up,29,350,radial,20,20"
 overlay0_desc10 = "left|down,29,440,radial,20,20"
@@ -23,17 +23,17 @@ overlay0_desc11 = "right|up,121,350,radial,20,20"
 overlay0_desc12 = "right|down,121,440,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,126,76,rect,125,45"
-overlay1_desc1  = "save_state,392,76,rect,125,45"
-overlay1_desc2  = "state_slot_decrease,126,188,rect,125,45"
-overlay1_desc3  = "state_slot_increase,392,188,rect,125,45"
-overlay1_desc4  = "rewind,126,300,rect,125,45"
-overlay1_desc5  = "slowmotion,653,300,rect,125,45"
-overlay1_desc6  = "reset,126,412,rect,125,45"
-overlay1_desc7  = "toggle_fast_forward,392,300,rect,125,45"
-overlay1_desc8  = "shader_next,653,188,rect,125,45"
-overlay1_desc9  = "shader_prev,653,76,rect,125,45"
-overlay1_desc10 = "overlay_next,392,417,radial,22,22"
+overlay1_desc0  = "load_state,292,53,rect,50,38"
+overlay1_desc1  = "save_state,505,53,rect,50,38"
+overlay1_desc2  = "state_slot_decrease,292,222,rect,50,38"
+overlay1_desc3  = "state_slot_increase,505,222,rect,50,38"
+overlay1_desc4  = "rewind,292,306,rect,50,38"
+overlay1_desc5  = "slowmotion,292,393,rect,50,38"
+overlay1_desc6  = "reset,505,393,rect,50,38"
+overlay1_desc7  = "toggle_fast_forward,505,306,rect,50,38"
+overlay1_desc8  = "shader_next,505,136,rect,50,38"
+overlay1_desc9  = "shader_prev,292,136,rect,50,38"
+overlay1_desc10 = "overlay_next,400,452,radial,22,22"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/nes-landscape.png b/media/overlays/nes-landscape.png
index 86de96f0d8..05a46882b8 100644
Binary files a/media/overlays/nes-landscape.png and b/media/overlays/nes-landscape.png differ
diff --git a/media/overlays/nes-portrait.cfg b/media/overlays/nes-portrait.cfg
index 1655d08b49..3acf2ba005 100644
--- a/media/overlays/nes-portrait.cfg
+++ b/media/overlays/nes-portrait.cfg
@@ -23,17 +23,17 @@ overlay0_desc11 = "right|up,156,641,radial,30,30"
 overlay0_desc12 = "right|down,156,758,radial,30,30"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,120,131,rect,110,45"
-overlay1_desc1  = "save_state,360,131,rect,110,45"
-overlay1_desc2  = "state_slot_decrease,120,245,rect,110,45"
-overlay1_desc3  = "state_slot_increase,360,245,rect,110,45"
-overlay1_desc4  = "rewind,120,357,rect,110,45"
-overlay1_desc5  = "slowmotion,120,582,rect,110,45"
-overlay1_desc6  = "reset,360,582,rect,110,45"
-overlay1_desc7  = "toggle_fast_forward,360,357,rect,110,45"
-overlay1_desc8  = "shader_next,360,467,rect,110,45"
-overlay1_desc9  = "shader_prev,120,467,rect,110,45"
-overlay1_desc10 = "overlay_next,240,682,radial,30,30"
+overlay1_desc0  = "load_state,120,52,rect,110,45"
+overlay1_desc1  = "save_state,360,52,rect,110,45"
+overlay1_desc2  = "state_slot_decrease,120,167,rect,110,45"
+overlay1_desc3  = "state_slot_increase,360,167,rect,110,45"
+overlay1_desc4  = "rewind,120,276,rect,110,45"
+overlay1_desc5  = "toggle_fast_forward,360,276,rect,110,45"
+overlay1_desc6  = "shader_prev,120,389,rect,110,45"
+overlay1_desc7  = "shader_next,360,389,rect,110,45"
+overlay1_desc8  = "slowmotion,120,504,rect,110,45"
+overlay1_desc9  = "reset,360,504,rect,110,45"
+overlay1_desc10 = "overlay_next,340,683,radial,25,25"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/nintendo_next.png b/media/overlays/nintendo_next.png
index 4f7dc65eaa..89847184a3 100644
Binary files a/media/overlays/nintendo_next.png and b/media/overlays/nintendo_next.png differ
diff --git a/media/overlays/nintendo_quickmenu_small.png b/media/overlays/nintendo_quickmenu_small.png
index 2f342e7670..1dacb0bb3f 100644
Binary files a/media/overlays/nintendo_quickmenu_small.png and b/media/overlays/nintendo_quickmenu_small.png differ
diff --git a/media/overlays/nintendo_quickmenu_small2.png b/media/overlays/nintendo_quickmenu_small2.png
index febd5a26fe..2ce38eb26f 100644
Binary files a/media/overlays/nintendo_quickmenu_small2.png and b/media/overlays/nintendo_quickmenu_small2.png differ
diff --git a/media/overlays/psx-landscape.cfg b/media/overlays/psx-landscape.cfg
index 6b7512c417..5a29543bec 100644
--- a/media/overlays/psx-landscape.cfg
+++ b/media/overlays/psx-landscape.cfg
@@ -12,8 +12,8 @@ overlay0_desc0 = "left,34,395,rect,25,25"
 overlay0_desc1 = "right,112,395,rect,25,25"
 overlay0_desc2 = "up,70,356,rect,25,25"
 overlay0_desc3 = "down,70,432,rect,25,25"
-overlay0_desc4 = "start,434,438,rect,30,17"
-overlay0_desc5 = "select,369,438,rect,30,17"
+overlay0_desc4 = "start,434,33,rect,30,17"
+overlay0_desc5 = "select,369,33,rect,30,17"
 overlay0_desc6 = "a,776,390,radial,25,25"
 overlay0_desc7 = "b,726,438,radial,25,25"
 overlay0_desc8 = "x,726,338,radial,25,25"
@@ -22,7 +22,7 @@ overlay0_desc10 = "l,71,110,rect,47,27"
 overlay0_desc11 = "l2,70,37,rect,47,27"
 overlay0_desc12 = "r,730,110,rect,47,27"
 overlay0_desc13 = "r2,730,37,rect,47,27"
-overlay0_desc14 = "overlay_next,401,27,radial,20,20"
+overlay0_desc14 = "overlay_next,401,437,radial,20,20"
 overlay0_desc15 = "left|up,34,356,radial,20,20"
 overlay0_desc16 = "left|down,34,432,radial,20,20"
 overlay0_desc17 = "right|up,112,356,radial,20,20"
diff --git a/media/overlays/psx-landscape.png b/media/overlays/psx-landscape.png
index b88f6b766a..b1f06ef8d8 100644
Binary files a/media/overlays/psx-landscape.png and b/media/overlays/psx-landscape.png differ
diff --git a/media/overlays/psx-portrait.cfg b/media/overlays/psx-portrait.cfg
index 357e2e17e6..3cd248fd2c 100644
--- a/media/overlays/psx-portrait.cfg
+++ b/media/overlays/psx-portrait.cfg
@@ -29,17 +29,17 @@ overlay0_desc17 = "right|up,157,637,radial,20,20"
 overlay0_desc18 = "right|down,157,751,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,120,131,rect,110,45"
-overlay1_desc1  = "save_state,360,131,rect,110,45"
-overlay1_desc2  = "state_slot_decrease,120,245,rect,110,45"
-overlay1_desc3  = "state_slot_increase,360,245,rect,110,45"
-overlay1_desc4  = "rewind,120,357,rect,110,45"
-overlay1_desc5  = "slowmotion,120,582,rect,110,45"
-overlay1_desc6  = "reset,360,582,rect,110,45"
-overlay1_desc7  = "toggle_fast_forward,360,357,rect,110,45"
-overlay1_desc8  = "shader_next,360,467,rect,110,45"
-overlay1_desc9  = "shader_prev,120,467,rect,110,45"
-overlay1_desc10 = "overlay_next,240,682,radial,30,30"
+overlay1_desc0  = "load_state,120,52,rect,110,45"
+overlay1_desc1  = "save_state,360,52,rect,110,45"
+overlay1_desc2  = "state_slot_decrease,120,167,rect,110,45"
+overlay1_desc3  = "state_slot_increase,360,167,rect,110,45"
+overlay1_desc4  = "rewind,120,276,rect,110,45"
+overlay1_desc5  = "toggle_fast_forward,360,276,rect,110,45"
+overlay1_desc6  = "shader_prev,120,389,rect,110,45"
+overlay1_desc7  = "shader_next,360,389,rect,110,45"
+overlay1_desc8  = "slowmotion,120,504,rect,110,45"
+overlay1_desc9  = "reset,360,504,rect,110,45"
+overlay1_desc10 = "overlay_next,340,683,radial,25,25"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/psx-portrait.png b/media/overlays/psx-portrait.png
index c5856ec21e..54f6ac43c8 100644
Binary files a/media/overlays/psx-portrait.png and b/media/overlays/psx-portrait.png differ
diff --git a/media/overlays/psx_next.png b/media/overlays/psx_next.png
index d0e5f6a1f2..7949391bdb 100644
Binary files a/media/overlays/psx_next.png and b/media/overlays/psx_next.png differ
diff --git a/media/overlays/snes-landscape.cfg b/media/overlays/snes-landscape.cfg
index 75d53fb53c..09f7d12c00 100644
--- a/media/overlays/snes-landscape.cfg
+++ b/media/overlays/snes-landscape.cfg
@@ -1,8 +1,8 @@
 overlays = 3
 
 overlay0_overlay = snes-landscape.png
-overlay1_overlay = nintendo_quickmenu_small.png
-overlay2_overlay = nintendo_next.png
+overlay1_overlay = snes_quickmenu_small.png
+overlay2_overlay = snes_next.png
 
 overlay0_full_screen = true
 overlay1_full_screen = true
@@ -27,17 +27,17 @@ overlay0_desc15 = "right|up,117,344,radial,20,20"
 overlay0_desc16 = "right|down,117,434,radial,20,20"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,126,76,rect,125,45"
-overlay1_desc1  = "save_state,392,76,rect,125,45"
-overlay1_desc2  = "state_slot_decrease,126,188,rect,125,45"
-overlay1_desc3  = "state_slot_increase,392,188,rect,125,45"
-overlay1_desc4  = "rewind,126,300,rect,125,45"
-overlay1_desc5  = "slowmotion,653,300,rect,125,45"
-overlay1_desc6  = "reset,126,412,rect,125,45"
-overlay1_desc7  = "toggle_fast_forward,392,300,rect,125,45"
-overlay1_desc8  = "shader_next,653,188,rect,125,45"
-overlay1_desc9  = "shader_prev,653,76,rect,125,45"
-overlay1_desc10 = "overlay_next,392,417,radial,22,22"
+overlay1_desc0  = "load_state,292,53,rect,50,38"
+overlay1_desc1  = "save_state,505,53,rect,50,38"
+overlay1_desc2  = "state_slot_decrease,292,222,rect,50,38"
+overlay1_desc3  = "state_slot_increase,505,222,rect,50,38"
+overlay1_desc4  = "rewind,292,306,rect,50,38"
+overlay1_desc5  = "slowmotion,292,393,rect,50,38"
+overlay1_desc6  = "reset,505,393,rect,50,38"
+overlay1_desc7  = "toggle_fast_forward,505,306,rect,50,38"
+overlay1_desc8  = "shader_next,505,136,rect,50,38"
+overlay1_desc9  = "shader_prev,292,136,rect,50,38"
+overlay1_desc10 = "overlay_next,400,452,radial,22,22"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"
diff --git a/media/overlays/snes-landscape.png b/media/overlays/snes-landscape.png
index 9b0ea41c44..aa6d729a9b 100644
Binary files a/media/overlays/snes-landscape.png and b/media/overlays/snes-landscape.png differ
diff --git a/media/overlays/snes-portrait.cfg b/media/overlays/snes-portrait.cfg
index d26f36a9d5..483b8dc787 100644
--- a/media/overlays/snes-portrait.cfg
+++ b/media/overlays/snes-portrait.cfg
@@ -27,17 +27,17 @@ overlay0_desc15 = "right|up,156,644,radial,30,30"
 overlay0_desc16 = "right|down,156,761,radial,30,30"
 
 overlay1_descs = 11
-overlay1_desc0  = "load_state,120,131,rect,110,45"
-overlay1_desc1  = "save_state,360,131,rect,110,45"
-overlay1_desc2  = "state_slot_decrease,120,245,rect,110,45"
-overlay1_desc3  = "state_slot_increase,360,245,rect,110,45"
-overlay1_desc4  = "rewind,120,357,rect,110,45"
-overlay1_desc5  = "slowmotion,120,582,rect,110,45"
-overlay1_desc6  = "reset,360,582,rect,110,45"
-overlay1_desc7  = "toggle_fast_forward,360,357,rect,110,45"
-overlay1_desc8  = "shader_next,360,467,rect,110,45"
-overlay1_desc9  = "shader_prev,120,467,rect,110,45"
-overlay1_desc10 = "overlay_next,240,682,radial,30,30"
+overlay1_desc0  = "load_state,120,52,rect,110,45"
+overlay1_desc1  = "save_state,360,52,rect,110,45"
+overlay1_desc2  = "state_slot_decrease,120,167,rect,110,45"
+overlay1_desc3  = "state_slot_increase,360,167,rect,110,45"
+overlay1_desc4  = "rewind,120,276,rect,110,45"
+overlay1_desc5  = "toggle_fast_forward,360,276,rect,110,45"
+overlay1_desc6  = "shader_prev,120,389,rect,110,45"
+overlay1_desc7  = "shader_next,360,389,rect,110,45"
+overlay1_desc8  = "slowmotion,120,504,rect,110,45"
+overlay1_desc9  = "reset,360,504,rect,110,45"
+overlay1_desc10 = "overlay_next,340,683,radial,25,25"
 
 overlay2_descs = 1
 overlay2_rect = "0.47,0.9,0.07,0.08"