diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index bdcef8912a..e79c031cc3 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -175,11 +175,6 @@ static int deferred_push_category(menu_displaylist_info_t *info)
    return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS);
 }
 
-static int deferred_push_video_options(menu_displaylist_info_t *info)
-{
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_VIDEO);
-}
-
 static int deferred_push_shader_options(menu_displaylist_info_t *info)
 {
    return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_SHADERS);
@@ -529,9 +524,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(menu_file_list_cbs_t *
          case MENU_LABEL_SHADER_OPTIONS:
             cbs->action_deferred_push = deferred_push_shader_options;
             break;
-         case MENU_LABEL_VIDEO_OPTIONS:
-            cbs->action_deferred_push = deferred_push_video_options;
-            break;
          case MENU_LABEL_OPTIONS:
             cbs->action_deferred_push = deferred_push_options;
             break;
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index afc0c9f6b6..baf91d7d82 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -898,7 +898,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
       case MENU_LABEL_LOAD_CONTENT:
       case MENU_LABEL_CORE_OPTIONS:
       case MENU_LABEL_CORE_CHEAT_OPTIONS:
-      case MENU_LABEL_VIDEO_OPTIONS:
       case MENU_LABEL_SHADER_OPTIONS:
       case MENU_LABEL_VIDEO_SHADER_PARAMETERS:
       case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS:
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 72c1992e18..273adfc8f2 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1574,7 +1574,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          cbs->action_ok = action_ok_shader_parameters;
          break;
       case MENU_LABEL_SHADER_OPTIONS:
-      case MENU_LABEL_VIDEO_OPTIONS:
       case MENU_VALUE_INPUT_SETTINGS:
       case MENU_LABEL_CORE_OPTIONS:
       case MENU_LABEL_CORE_CHEAT_OPTIONS:
@@ -1640,6 +1639,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
       case MENU_LABEL_CUSTOM_RATIO:
          cbs->action_ok = action_ok_custom_viewport;
          break;
+      case MENU_LABEL_SCREEN_RESOLUTION:
+         cbs->action_ok = action_ok_video_resolution;
+         break;
       default:
          return -1;
    }
@@ -1666,9 +1668,6 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
    {
       switch (type)
       {
-         case MENU_SETTINGS_VIDEO_RESOLUTION:
-            cbs->action_ok = action_ok_video_resolution;
-            break;
          case MENU_FILE_PLAYLIST_ENTRY:
             cbs->action_ok = action_ok_playlist_entry;
             break;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 2688422583..b851fa6070 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -658,7 +658,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       case MENU_LABEL_DISK_OPTIONS:
       case MENU_LABEL_CORE_OPTIONS:
       case MENU_LABEL_SHADER_OPTIONS:
-      case MENU_LABEL_VIDEO_OPTIONS:
       case MENU_LABEL_CORE_CHEAT_OPTIONS:
       case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
       case MENU_LABEL_DATABASE_MANAGER_LIST:
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 2a517b6b7a..b8eb4f6732 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1573,17 +1573,15 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
 {
    global_t *global            = global_get_ptr();
 
-
-
-   menu_list_push(info->list,
-         menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_OPTIONS),
-         menu_hash_to_str(MENU_LABEL_VIDEO_OPTIONS),
-         MENU_SETTING_ACTION, 0, 0);
 #ifdef HAVE_SHADER_MANAGER
    menu_list_push(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS),
          menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS),
          MENU_SETTING_ACTION, 0, 0);
+#else
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
+         "", 0, 0, 0);
 #endif
 
    return 0;
@@ -2010,16 +2008,6 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
          }
 #endif
          break;
-      case DISPLAYLIST_OPTIONS_VIDEO:
-         menu_list_clear(info->list);
-#if defined(GEKKO) || defined(__CELLOS_LV2__)
-         menu_list_push(info->list,
-               menu_hash_to_str(MENU_LABEL_VALUE_SCREEN_RESOLUTION),
-               menu_hash_to_str(MENU_LABEL_SCREEN_RESOLUTION),
-               MENU_SETTINGS_VIDEO_RESOLUTION, 0, 0);
-#endif
-         need_push    = true;
-         break;
       case DISPLAYLIST_PERFCOUNTERS_CORE:
       case DISPLAYLIST_PERFCOUNTERS_FRONTEND:
          menu_list_clear(info->list);
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index 35163fe212..df45630267 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -79,7 +79,6 @@ enum
    DISPLAYLIST_OPTIONS_REMAPPINGS,
    DISPLAYLIST_OPTIONS_MANAGEMENT,
    DISPLAYLIST_OPTIONS_DISK,
-   DISPLAYLIST_OPTIONS_VIDEO,
    DISPLAYLIST_OPTIONS_SHADERS,
 };
 
diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index 540e146222..db080d2e3e 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -271,8 +271,6 @@ static const char *menu_hash_to_str_german(uint32_t hash)
          return "Zeige Boxart";
       case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
          return "Core-Input-Remapping-Optionen";
-      case MENU_LABEL_VALUE_VIDEO_OPTIONS:
-         return "Video-Optionen";
       case MENU_LABEL_VALUE_SHADER_OPTIONS:
          return "Shader-Optionen";
       case MENU_LABEL_VALUE_NO_SHADER_PARAMETERS:
@@ -1240,10 +1238,6 @@ static const char *menu_hash_to_str_portuguese(uint32_t hash)
          return "core_input_remapping_options";
       case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
          return "Opções de Remapeamento de Controlador de Core";
-      case MENU_LABEL_VIDEO_OPTIONS:
-         return "video_options";
-      case MENU_LABEL_VALUE_VIDEO_OPTIONS:
-         return "Opções de Vídeo";
       case MENU_LABEL_VALUE_SHADER_OPTIONS:
          return "Opções de Shaders";
       case MENU_LABEL_SHADER_OPTIONS:
@@ -1798,8 +1792,6 @@ static const char *menu_hash_to_str_french(uint32_t hash)
          return "Afficher les vignettes";
       case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
          return "Options de remap d'entrées du core";
-      case MENU_LABEL_VALUE_VIDEO_OPTIONS:
-         return "Options vidéo";
       case MENU_LABEL_VALUE_SHADER_OPTIONS:
          return "Options de shaders";
       case MENU_LABEL_VALUE_NO_SHADER_PARAMETERS:
@@ -2888,10 +2880,6 @@ static const char *menu_hash_to_str_english(uint32_t hash)
          return "core_input_remapping_options";
       case MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
          return "Core Input Remapping Options";
-      case MENU_LABEL_VIDEO_OPTIONS:
-         return "video_options";
-      case MENU_LABEL_VALUE_VIDEO_OPTIONS:
-         return "Video Options";
       case MENU_LABEL_VALUE_SHADER_OPTIONS:
          return "Shader Options";
       case MENU_LABEL_SHADER_OPTIONS:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 664f104594..7ddf4e4b8a 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -588,8 +588,6 @@ extern "C" {
 #define MENU_LABEL_VALUE_DISK_IMAGE_APPEND                                     0x1cb28c6bU
 #define MENU_LABEL_DISK_INDEX                                                  0x6c14bf54U
 #define MENU_LABEL_SHADER_OPTIONS                                              0x1f7d2fc7U
-#define MENU_LABEL_VIDEO_OPTIONS                                               0x6390c4e7U
-#define MENU_LABEL_VALUE_VIDEO_OPTIONS                                         0xb4349948U
 #define MENU_LABEL_VALUE_CORE_CHEAT_OPTIONS                                    0x8ba478bfU
 #define MENU_LABEL_CORE_CHEAT_OPTIONS                                          0x9293171dU
 #define MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS                          0x7c65016dU
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 7ebf178cac..04312c32a8 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -4257,6 +4257,15 @@ static bool setting_append_list_video_options(
    END_SUB_GROUP(list, list_info, parent_group);
    START_SUB_GROUP(list, list_info, "Monitor", group_info.name, subgroup_info, parent_group);
 
+#if defined(GEKKO) || defined(__CELLOS_LV2__)
+   CONFIG_ACTION(
+         menu_hash_to_str(MENU_LABEL_SCREEN_RESOLUTION),
+         menu_hash_to_str(MENU_LABEL_VALUE_SCREEN_RESOLUTION),
+         group_info.name,
+         subgroup_info.name,
+         parent_group);
+#endif
+
    CONFIG_UINT(
          settings->video.monitor_index,
          menu_hash_to_str(MENU_LABEL_VIDEO_MONITOR_INDEX),