diff --git a/media/overlays/genesis/Thumbs.db b/media/overlays/genesis/Thumbs.db
deleted file mode 100644
index 2d2cec4285..0000000000
Binary files a/media/overlays/genesis/Thumbs.db and /dev/null differ
diff --git a/media/overlays/n64/n64.cfg b/media/overlays/n64/n64.cfg
index fe893198e5..4f84380776 100644
--- a/media/overlays/n64/n64.cfg
+++ b/media/overlays/n64/n64.cfg
@@ -33,17 +33,17 @@ overlay5_alpha_mod = 2.0
 overlay0_descs = 14
 overlay0_desc0 = "start,0.498,0.8,radial,0.0375,0.0625"
 overlay0_desc0_overlay = start.png
-overlay0_desc1 = "select|b,0.88625,0.778333333333,radial,0.0325,0.05416666666667"
+overlay0_desc1 = "select|b,0.83625,0.68333333333,radial,0.0325,0.05416666666667"
 overlay0_desc1_overlay = downc.png
-overlay0_desc2 = "a,0.80,0.914583333333,radial,0.0425,0.0708"
+overlay0_desc2 = "a,0.75,0.814583333333,radial,0.0425,0.0708"
 overlay0_desc2_overlay = a.png
-overlay0_desc3 = "b,0.715,0.75516666667,radial,0.0425,0.0708"
+overlay0_desc3 = "b,0.665,0.65516666667,radial,0.0425,0.0708"
 overlay0_desc3_overlay = b.png
-overlay0_desc4 = "select|x,0.88625,0.57,radial,0.03,0.05"
+overlay0_desc4 = "select|x,0.83625,0.47,radial,0.03,0.05"
 overlay0_desc4_overlay = upc.png
-overlay0_desc5 = "select|y,0.8175,0.67,radial,0.03,0.05"
+overlay0_desc5 = "select|y,0.7675,0.57,radial,0.03,0.05"
 overlay0_desc5_overlay = leftc.png
-overlay0_desc6 = "select|a,0.955,0.67,radial,0.03,0.05"
+overlay0_desc6 = "select|a,0.905,0.57,radial,0.03,0.05"
 overlay0_desc6_overlay = rightc.png
 overlay0_desc7 = "l2,0.0625,0.052083333333,rect,0.0625,0.052083333333"
 overlay0_desc7_overlay = z.png
@@ -52,9 +52,9 @@ overlay0_desc8_overlay = r.png
 overlay0_desc9 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
 overlay0_desc9_overlay = next.png
 overlay0_desc9_next_target = "menu"
-overlay0_desc10 = "analog_left,0.11845,0.80208333333,radial,0.127575,0.212625"
+overlay0_desc10 = "analog_left,0.16845,0.70208333333,radial,0.127575,0.212625"
 overlay0_desc10_overlay = analog.png
-overlay0_desc10_pct = 0.75
+overlay0_desc10_pct = 1.0
 overlay0_desc11 = "menu_toggle,0.5,0.11708333333334,radial,0.025,0.04166666666"
 overlay0_desc11_overlay = rgui.png
 overlay0_desc12 = "overlay_next,0.30125,0.11708333333334,radial,0.025,0.04166666666"
@@ -65,32 +65,32 @@ overlay0_desc13_overlay = digital-icon.png
 overlay0_desc13_next_target = "digital-landscape"
 
 overlay1_descs = 22
-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_desc0 = "left,0.09375,0.70208333333,radial,0.0525,0.0875"
+overlay1_desc1 = "right,0.24375,0.70208333333,radial,0.0525,0.0875"
+overlay1_desc2 = "up,0.16845,0.57708333333,radial,0.0525,0.0875"
+overlay1_desc3 = "down,0.16845,0.82708333333,radial,0.0525,0.0875"
 overlay1_desc4 = "start,0.498,0.8,radial,0.0375,0.0625"
 overlay1_desc4_overlay = start.png
-overlay1_desc5 = "select|b,0.88625,0.778333333333,radial,0.0325,0.05416666666667"
+overlay1_desc5 = "select|b,0.83625,0.68333333333,radial,0.0325,0.05416666666667"
 overlay1_desc5_overlay = downc.png
-overlay1_desc6 = "a,0.80,0.914583333333,radial,0.0425,0.0708"
+overlay1_desc6 = "a,0.75,0.814583333333,radial,0.0425,0.0708"
 overlay1_desc6_overlay = a.png
-overlay1_desc7 = "b,0.715,0.75516666667,radial,0.0425,0.0708"
+overlay1_desc7 = "b,0.665,0.65516666667,radial,0.0425,0.0708"
 overlay1_desc7_overlay = b.png
-overlay1_desc8 = "select|x,0.88625,0.57,radial,0.03,0.05"
+overlay1_desc8 = "select|x,0.83625,0.47,radial,0.03,0.05"
 overlay1_desc8_overlay = upc.png
-overlay1_desc9 = "select|y,0.8175,0.67,radial,0.03,0.05"
+overlay1_desc9 = "select|y,0.7675,0.57,radial,0.03,0.05"
 overlay1_desc9_overlay = leftc.png
-overlay1_desc10 = "select|a,0.955,0.67,radial,0.03,0.05"
+overlay1_desc10 = "select|a,0.905,0.57,radial,0.03,0.05"
 overlay1_desc10_overlay = rightc.png
 overlay1_desc11 = "overlay_next,0.5,0.94533333333,rect,0.0234375,0.04166666667"
 overlay1_desc11_overlay = next.png
 overlay1_desc11_next_target = "menu"
-overlay1_desc12 = "left|down,0.04375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay1_desc13 = "right|up,0.19375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay1_desc14 = "up|left,0.04375,0.67708333333,radial,0.03125,0.0520833333333"
-overlay1_desc15 = "down|right,0.19375,0.9270833333333,radial,0.03125,0.0520833333333"
-overlay1_desc16 = "nul,0.11845,0.80208333333,rect,0.127575,0.212625"
+overlay1_desc12 = "left|down,0.09375,0.8270833333333,radial,0.03125,0.0520833333333"
+overlay1_desc13 = "right|up,0.24375,0.57708333333,radial,0.03125,0.0520833333333"
+overlay1_desc14 = "up|left,0.09375,0.57708333333,radial,0.03125,0.0520833333333"
+overlay1_desc15 = "down|right,0.24375,0.8270833333333,radial,0.03125,0.0520833333333"
+overlay1_desc16 = "nul,0.16845,0.70208333333,rect,0.127575,0.212625"
 overlay1_desc16_overlay = dpad.png
 overlay1_desc17 = "menu_toggle,0.5,0.11708333333334,radial,0.025,0.04166666666"
 overlay1_desc17_overlay = rgui.png
@@ -123,9 +123,9 @@ overlay2_desc6_overlay = rightc.png
 overlay2_desc7 = "overlay_next,0.50125,0.95833333333,rect,0.04166666666,0.0234375"
 overlay2_desc7_overlay = next.png
 overlay2_desc7_next_target = "menu"
-overlay2_desc8 = "analog_left,0.21875,0.87275,radial,0.21,0.13"
+overlay2_desc8 = "analog_left,0.21875,0.82275,radial,0.21,0.13"
 overlay2_desc8_overlay = analog.png
-overlay2_desc8_pct = 0.75
+overlay2_desc8_pct = 1.0
 overlay2_desc9 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
 overlay2_desc9_overlay = rgui.png
 overlay2_desc10 = "overlay_next,0.30125,0.57708333333334,radial,0.04166666666,0.025"
@@ -140,10 +140,10 @@ overlay2_desc13 = "r,0.9375,0.552083333333,rect,0.0925,0.032083333333"
 overlay2_desc13_overlay = r.png
 
 overlay3_descs = 22
-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_desc0 = "left,0.09375,0.81875,radial,0.0875,0.0525"
+overlay3_desc1 = "right,0.34375,0.81875,radial,0.0875,0.0525"
+overlay3_desc2 = "up,0.21875,0.74375,radial,0.0875,0.0525"
+overlay3_desc3 = "down,0.21875,0.89375,radial,0.0875,0.0525"
 overlay3_desc4 = "start,0.495,0.68625,radial,0.0625,0.0375"
 overlay3_desc4_overlay = start.png
 overlay3_desc5 = "select|b,0.82,0.82,radial,0.04375,0.02625"
@@ -161,11 +161,11 @@ overlay3_desc10_overlay = rightc.png
 overlay3_desc11 = "overlay_next,0.50125,0.95833333333,radial,0.04166666666,0.0234375"
 overlay3_desc11_overlay = next.png
 overlay3_desc11_next_target = "menu"
-overlay3_desc12 = "left|down,0.09375,0.94375,radial,0.05208333333333,0.03125"
-overlay3_desc13 = "right|up,0.34375,0.79375,radial,0.05208333333333,0.03125"
-overlay3_desc14 = "up|left,0.09375,0.79375,radial,0.05208333333333,0.03125"
-overlay3_desc15 = "down|right,0.34375,0.94375,radial,0.05208333333333,0.03125"
-overlay3_desc16 = "nul,0.21875,0.87275,radial,0.21,0.13"
+overlay3_desc12 = "left|down,0.09375,0.89375,radial,0.05208333333333,0.03125"
+overlay3_desc13 = "right|up,0.34375,0.74375,radial,0.05208333333333,0.03125"
+overlay3_desc14 = "up|left,0.09375,0.74375,radial,0.05208333333333,0.03125"
+overlay3_desc15 = "down|right,0.34375,0.89375,radial,0.05208333333333,0.03125"
+overlay3_desc16 = "nul,0.21875,0.82275,radial,0.21,0.13"
 overlay3_desc16_overlay = dpad.png
 overlay3_desc17 = "menu_toggle,0.50125,0.57708333333334,radial,0.04166666666,0.025"
 overlay3_desc17_overlay = rgui.png