diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index 4e3d1c76f6..16b378f25d 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -4,7 +4,7 @@ PERF_TEST := 1
 HAVE_NEON := 1
 HAVE_SINC := 1
 HAVE_LOGGER := 1
-DEBUG_INPUT := 1
+DEBUG_INPUT := 0
 
 include $(CLEAR_VARS)
 
diff --git a/media/overlays/basic_overlay.cfg b/media/overlays/basic_overlay.cfg
index 906dc261c7..73b004e3f3 100644
--- a/media/overlays/basic_overlay.cfg
+++ b/media/overlays/basic_overlay.cfg
@@ -3,8 +3,6 @@ overlays = 2
 overlay0_overlay = basic_overlay.tga
 overlay1_overlay = basic_quickmenu_small.tga
 
-overlay1_rect = "0.25,0.25,0.5,0.5"
-
 overlay0_descs = 15
 overlay0_desc0  = "left,15,210,radial,10,10"
 overlay0_desc1  = "right,60,210,radial,10,10"
@@ -22,7 +20,16 @@ overlay0_desc12 = "x,200,180,radial,15,15"
 overlay0_desc13 = "y,163,210,radial,15,15"
 overlay0_desc14 = "overlay_next,111,224,radial,20,20"
 
-overlay1_descs = 3
+overlay1_descs = 11
 overlay1_desc0 = "save_state,55,51,rect,50,7"
 overlay1_desc1 = "load_state,55,29,rect,50,7"
 overlay1_desc2 = "overlay_next,116,240,radial,16,16"
+overlay1_desc3 = "state_slot_increase,55,73,rect,50,7"
+overlay1_desc4 = "state_slot_decrease,55,94,rect,50,7"
+overlay1_desc5 = "frame_advance,55,115,rect,50,7"
+overlay1_desc6 = "toggle_fast_forward,55,136,rect,50,7"
+overlay1_desc7 = "reset,55,199,rect,50,7"
+overlay1_desc8 = "rewind,160,29,rect,50,7"
+overlay1_desc8 = "audio_mute,160,51,rect,50,7"
+overlay1_desc9 = "slowmotion,160,73,rect,50,7"
+overlay1_desc10 = "enable_hotkey,160,94,rect,50,7"