diff --git a/configuration.c b/configuration.c
index ec05a6d9ca..74cbc3f4df 100644
--- a/configuration.c
+++ b/configuration.c
@@ -520,19 +520,6 @@ const char *config_get_default_menu(void)
    return "null";
 }
 
-static unsigned config_menu_btn_ok_default(void)
-{
-   if (g_defaults.menu.controls.set)
-      return g_defaults.menu.controls.menu_btn_ok;
-   return default_menu_btn_ok;
-}
-
-static unsigned config_menu_btn_cancel_default(void)
-{
-   if (g_defaults.menu.controls.set)
-      return g_defaults.menu.controls.menu_btn_cancel;
-   return default_menu_btn_cancel;
-}
 #endif
 
 bool config_overlay_enable_default(void)
@@ -895,12 +882,7 @@ static int populate_settings_int(settings_t *settings, struct config_int_setting
    SETTING_INT("keyboard_gamepad_mapping_type",&settings->input.keyboard_gamepad_mapping_type, true, 1, false);
    SETTING_INT("input_poll_type_behavior",     &settings->input.poll_type_behavior, true, 2, false);
 #ifdef HAVE_MENU
-   SETTING_INT("menu_ok_btn",                  &settings->menu_ok_btn,     true, config_menu_btn_ok_default(), false);
-   SETTING_INT("menu_cancel_btn",              &settings->menu_cancel_btn, true, config_menu_btn_cancel_default(), false);
-   SETTING_INT("menu_search_btn",              &settings->menu_search_btn, true, default_menu_btn_search, false);
-   SETTING_INT("menu_info_btn",                &settings->menu_info_btn,   true, default_menu_btn_info, false);
-   SETTING_INT("menu_default_btn",             &settings->menu_default_btn, true, default_menu_btn_default, false);
-   SETTING_INT("menu_scroll_down_btn",         &settings->menu_scroll_down_btn, true, default_menu_btn_scroll_down, false);
+
 #endif
    SETTING_INT("video_monitor_index",          &settings->video.monitor_index, true, monitor_index, false);
    SETTING_INT("video_fullscreen_x",           &settings->video.fullscreen_x,  true, fullscreen_x, false);
@@ -911,7 +893,6 @@ static int populate_settings_int(settings_t *settings, struct config_int_setting
 #ifdef HAVE_NETWORKGAMEPAD
    SETTING_INT("network_remote_base_port",     &settings->network_remote_base_port, true, network_remote_base_port, false);
 #endif
-   SETTING_INT("menu_scroll_up_btn",           &settings->menu_scroll_up_btn, true, default_menu_btn_scroll_up, false);
 #ifdef HAVE_GEKKO
    SETTING_INT("video_viwidth",                &settings->video.viwidth, true, video_viwidth, false);
 #endif
diff --git a/configuration.h b/configuration.h
index d58cb0547f..5eb700da4f 100644
--- a/configuration.h
+++ b/configuration.h
@@ -454,14 +454,6 @@ typedef struct settings
    bool sort_savefiles_enable;
    bool sort_savestates_enable;
 
-   unsigned menu_ok_btn;
-   unsigned menu_cancel_btn;
-   unsigned menu_search_btn;
-   unsigned menu_default_btn;
-   unsigned menu_info_btn;
-   unsigned menu_scroll_down_btn;
-   unsigned menu_scroll_up_btn;
-
    char username[32];
 #ifdef HAVE_LANGEXTRA
    unsigned int user_language;
diff --git a/input/input_driver.c b/input/input_driver.c
index d236bc33d6..f3a88cbbe0 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -820,23 +820,23 @@ uint64_t input_menu_keys_pressed(void)
 
    if (current_input->input_state(current_input_data, binds, 0,
       RETRO_DEVICE_KEYBOARD, 0, RETROK_RETURN))
-      BIT64_SET(ret, settings->menu_ok_btn);
+      BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_A);
 
    if (current_input->input_state(current_input_data, binds, 0,
       RETRO_DEVICE_KEYBOARD, 0, RETROK_BACKSPACE))
-      BIT64_SET(ret, settings->menu_cancel_btn);
+      BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_B);
 
    if (current_input->input_state(current_input_data, binds, 0,
       RETRO_DEVICE_KEYBOARD, 0, RETROK_SPACE))
-      BIT64_SET(ret, settings->menu_default_btn);
+      BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_START);
 
    if (current_input->input_state(current_input_data, binds, 0,
       RETRO_DEVICE_KEYBOARD, 0, RETROK_SLASH))
-      BIT64_SET(ret, settings->menu_search_btn);
+      BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_X);
 
    if (current_input->input_state(current_input_data, binds, 0,
       RETRO_DEVICE_KEYBOARD, 0, RETROK_RSHIFT))
-      BIT64_SET(ret, settings->menu_info_btn);
+      BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_SELECT);
 
    if (current_input->input_state(current_input_data, binds, 0,
       RETRO_DEVICE_KEYBOARD, 0, RETROK_RIGHT))
diff --git a/menu/menu_event.c b/menu/menu_event.c
index 3150189b12..27574af55d 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -356,21 +356,21 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
       ret = MENU_ACTION_LEFT;
    else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT))
       ret = MENU_ACTION_RIGHT;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_scroll_up_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L))
       ret = MENU_ACTION_SCROLL_UP;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_scroll_down_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R))
       ret = MENU_ACTION_SCROLL_DOWN;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_cancel_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_B))
       ret = MENU_ACTION_CANCEL;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_ok_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_A))
       ret = MENU_ACTION_OK;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_search_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_X))
       ret = MENU_ACTION_SEARCH;
    else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_Y))
       ret = MENU_ACTION_SCAN;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_default_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_START))
       ret = MENU_ACTION_START;
-   else if (trigger_input & (UINT64_C(1) << settings->menu_info_btn))
+   else if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_SELECT))
       ret = MENU_ACTION_INFO;
    else if (trigger_input & (UINT64_C(1) << RARCH_MENU_TOGGLE))
       ret = MENU_ACTION_TOGGLE;