diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index db95173633..4e184ac115 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -798,6 +798,14 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
    {
       MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS,
       deferred_push_core_input_remapping_options
+   },
+   {
+      MENU_ENUM_LABEL_MANAGEMENT,
+      deferred_push_management_options
+   },
+   {
+      MENU_ENUM_LABEL_CONTENT_HISTORY_PATH,
+      deferred_push_content_history_path
    }
 };
 
@@ -1262,9 +1270,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_LABEL_REMAP_FILE_LOAD:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_remap_file_load);
             break;
-         case MENU_LABEL_MANAGEMENT:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_management_options);
-            break;
          case MENU_LABEL_DEFERRED_CORE_LIST:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_list_deferred);
             break;
@@ -1342,9 +1347,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_LABEL_CONTENT_COLLECTION_LIST:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list);
             break;
-         case MENU_LABEL_CONTENT_HISTORY_PATH:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_history_path);
-            break;
          default:
             return -1;
       }
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index f53a7ef076..18ed001faf 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -154,6 +154,7 @@ default_fill_title_macro(action_get_title_configurations,       MENU_ENUM_LABEL_
 default_fill_title_macro(action_get_title_content_database_directory,   MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY)
 default_fill_title_macro(action_get_title_savestate_directory,          MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY)
 default_fill_title_macro(action_get_title_dynamic_wallpapers_directory, MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY)
+default_fill_title_macro(action_get_title_thumbnails_directory, MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY)
 default_fill_title_macro(action_get_title_core_assets_directory, MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR)
 default_fill_title_macro(action_get_title_config_directory,      MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY)
 default_fill_title_macro(action_get_title_input_remapping_directory,    MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY)
@@ -568,6 +569,110 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
    {
       MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS,
       action_get_input_remapping_options_list
+   },
+   {
+      MENU_ENUM_LABEL_MANAGEMENT,
+      action_get_title_action_generic
+   },
+   {
+      MENU_ENUM_LABEL_LIBRETRO_DIR_PATH,
+      action_get_title_core_directory
+   },
+   {
+      MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR,
+      action_get_title_autoconfig_directory
+   },
+   {
+      MENU_ENUM_LABEL_CURSOR_DIRECTORY,
+      action_get_title_cursor_directory
+   },
+   {
+      MENU_ENUM_LABEL_OSK_OVERLAY_DIRECTORY,
+      action_get_title_onscreen_overlay_keyboard_directory
+   },
+   {
+      MENU_ENUM_LABEL_ASSETS_DIRECTORY,
+      action_get_title_assets_directory
+   },
+   {
+      MENU_ENUM_LABEL_CACHE_DIRECTORY,
+      action_get_title_extraction_directory
+   },
+   {
+      MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY,
+      action_get_title_config_directory
+   },
+   {
+      MENU_ENUM_LABEL_VIDEO_SHADER_DIR,
+      action_get_title_video_shader_directory
+   },
+   {
+      MENU_ENUM_LABEL_AUDIO_FILTER_DIR,
+      action_get_title_audio_filter_directory
+   },
+   {
+      MENU_ENUM_LABEL_SAVEFILE_DIRECTORY,
+      action_get_title_savefile_directory
+   },
+   {
+      MENU_ENUM_LABEL_SAVESTATE_DIRECTORY,
+      action_get_title_savestate_directory
+   },
+   {
+      MENU_ENUM_LABEL_CORE_ASSETS_DIRECTORY,
+      action_get_title_core_assets_directory
+   },
+   {
+      MENU_ENUM_LABEL_PLAYLIST_DIRECTORY,
+      action_get_title_playlist_directory
+   },
+   {
+      MENU_ENUM_LABEL_CONTENT_DIRECTORY,
+      action_get_title_content_directory
+   },
+   {
+      MENU_ENUM_LABEL_SCREENSHOT_DIRECTORY,
+      action_get_title_screenshot_directory
+   },
+   {
+      MENU_ENUM_LABEL_SYSTEM_DIRECTORY,
+      action_get_title_system_directory
+   },
+   {
+      MENU_ENUM_LABEL_OVERLAY_DIRECTORY,
+      action_get_title_overlay_directory
+   },
+   {
+      MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY,
+      action_get_title_browser_directory
+   },
+   {
+      MENU_ENUM_LABEL_VIDEO_FILTER_DIR,
+      action_get_title_video_filter_directory
+   },
+   {
+      MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY,
+      action_get_title_recording_config_directory
+   },
+   {
+      MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY,
+      action_get_title_recording_output_directory
+   },
+   {
+      MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY,
+      action_get_title_input_remapping_directory
+   },
+   {
+      MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY,
+      action_get_title_content_database_directory
+   },
+   {
+      MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY,
+      action_get_title_dynamic_wallpapers_directory
+   },
+   {
+      MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY,
+      action_get_title_thumbnails_directory
    }
 };
 
@@ -956,75 +1061,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_DEFERRED_CORE_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_core_list);
             break;
-         case MENU_LABEL_JOYPAD_AUTOCONFIG_DIR:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_autoconfig_directory);
-            break;
-         case MENU_LABEL_CACHE_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_extraction_directory);
-            break;
-         case MENU_LABEL_SYSTEM_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_system_directory);
-            break;
-         case MENU_LABEL_ASSETS_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_assets_directory);
-            break;
-         case MENU_LABEL_SAVEFILE_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_savefile_directory);
-            break;
-         case MENU_LABEL_OVERLAY_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_overlay_directory);
-            break;
-         case MENU_LABEL_RGUI_BROWSER_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_browser_directory);
-            break;
-         case MENU_LABEL_PLAYLIST_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_playlist_directory);
-            break;
-         case MENU_LABEL_CONTENT_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_content_directory);
-            break;
-         case MENU_LABEL_SCREENSHOT_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_screenshot_directory);
-            break;
-         case MENU_LABEL_VIDEO_SHADER_DIR:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_video_shader_directory);
-            break;
-         case MENU_LABEL_VIDEO_FILTER_DIR:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_video_filter_directory);
-            break;
-         case MENU_LABEL_AUDIO_FILTER_DIR:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter_directory);
-            break;
-         case MENU_LABEL_CURSOR_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_cursor_directory);
-            break;
-         case MENU_LABEL_RECORDING_CONFIG_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_recording_config_directory);
-            break;
-         case MENU_LABEL_RECORDING_OUTPUT_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_recording_output_directory);
-            break;
-         case MENU_LABEL_OSK_OVERLAY_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_onscreen_overlay_keyboard_directory);
-            break;
-         case MENU_LABEL_INPUT_REMAPPING_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_input_remapping_directory);
-            break;
-         case MENU_LABEL_CONTENT_DATABASE_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_content_database_directory);
-            break;
-         case MENU_LABEL_SAVESTATE_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_savestate_directory);
-            break;
-         case MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_dynamic_wallpapers_directory);
-            break;
-         case MENU_LABEL_CORE_ASSETS_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_core_assets_directory);
-            break;
-         case MENU_LABEL_RGUI_CONFIG_DIRECTORY:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_config_directory);
-            break;
          case MENU_LABEL_DATABASE_MANAGER_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_database_manager_list);
             break;
@@ -1070,9 +1106,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_ACHIEVEMENT_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_cheevos_list);
             break;
-         case MENU_LABEL_MANAGEMENT:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_action_generic);
-            break;
          case MENU_LABEL_REMAP_FILE_LOAD:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_remap_file_load);
             break;
@@ -1085,9 +1118,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_DEFERRED_ACCOUNTS_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_list);
             break;
-         case MENU_LABEL_LIBRETRO_DIR_PATH:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_core_directory);
-            break;
          default:
             return -1;
       }
diff --git a/msg_hash.h b/msg_hash.h
index a025562786..a51edb9820 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1781,34 +1781,6 @@ enum msg_hash_enums
 #define MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST                                0x679a1b0bU
 #define MENU_LABEL_DEFERRED_BROWSE_URL_START                                   0xcef58296U
 
-/* Directory settings */
-
-#define MENU_LABEL_CURSOR_DIRECTORY                                            0xdee8d377U
-#define MENU_LABEL_OSK_OVERLAY_DIRECTORY                                       0xcce86287U
-#define MENU_LABEL_JOYPAD_AUTOCONFIG_DIR                                       0x2f4822d8U
-#define MENU_LABEL_RECORDING_OUTPUT_DIRECTORY                                  0x30bece06U
-#define MENU_LABEL_RECORDING_CONFIG_DIRECTORY                                  0x3c3f274bU
-#define MENU_LABEL_LIBRETRO_DIR_PATH                                           0x1af1eb72U
-#define MENU_LABEL_AUDIO_FILTER_DIR                                            0x4bd96ebaU
-#define MENU_LABEL_VIDEO_SHADER_DIR                                            0x30f53b10U
-#define MENU_LABEL_VIDEO_FILTER_DIR                                            0x67603f1fU
-#define MENU_LABEL_SCREENSHOT_DIRECTORY                                        0x552612d7U
-#define MENU_LABEL_SYSTEM_DIRECTORY                                            0x35a6fb9eU
-#define MENU_LABEL_INPUT_REMAPPING_DIRECTORY                                   0x5233c20bU
-#define MENU_LABEL_OVERLAY_DIRECTORY                                           0xc4ed3d1bU
-#define MENU_LABEL_SAVEFILE_DIRECTORY                                          0x92773488U
-#define MENU_LABEL_SAVESTATE_DIRECTORY                                         0x90551289U
-#define MENU_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY                                0x62f975b8U
-#define MENU_LABEL_THUMBNAILS_DIRECTORY                                        0xdea77410U
-#define MENU_LABEL_RGUI_BROWSER_DIRECTORY                                      0xa86cba73U
-#define MENU_LABEL_CONTENT_DATABASE_DIRECTORY                                  0x6b443f80U
-#define MENU_LABEL_PLAYLIST_DIRECTORY                                          0x6361820bU
-#define MENU_LABEL_CORE_ASSETS_DIRECTORY                                       0x8ba5ee54U
-#define MENU_LABEL_CONTENT_DIRECTORY                                           0x7738dc14U
-#define MENU_LABEL_RGUI_CONFIG_DIRECTORY                                       0x0cb3e005U
-#define MENU_LABEL_ASSETS_DIRECTORY                                            0xde1ae8ecU
-#define MENU_LABEL_CACHE_DIRECTORY                                             0x851dfb8dU
-
 /* RDB settings */
 
 #define MENU_LABEL_RDB_ENTRY_START_CONTENT                                     0x95025a55U
@@ -1829,14 +1801,12 @@ enum msg_hash_enums
 #define MENU_LABEL_RDB_ENTRY_RELEASE_YEAR                                      0x14c9c6bfU
 #define MENU_LABEL_RDB_ENTRY_MAX_USERS                                         0xfae91cc4U
 
-#define MENU_LABEL_MANAGEMENT                                                  0x2516c88aU
 #define MENU_LABEL_FRONTEND_COUNTERS                                           0xe5696877U
 #define MENU_LABEL_CORE_COUNTERS                                               0x64cc83e0U
 #define MENU_LABEL_ACHIEVEMENT_LIST                                            0x7b90fc49U
 #define MENU_LABEL_DATABASE_MANAGER_LIST                                       0x7f853d8fU
 #define MENU_LABEL_CURSOR_MANAGER_LIST                                         0xa969e378U
 #define MENU_LABEL_REMAP_FILE_LOAD                                             0x9c2799b8U
-#define MENU_LABEL_CONTENT_HISTORY_PATH                                        0x6f22fb9dU
 #define MENU_LABEL_REMAP_FILE_SAVE_CORE                                        0x7c9d4c8fU
 #define MENU_LABEL_REMAP_FILE_SAVE_GAME                                        0x7c9f41e0U
 #define MENU_LABEL_CONTENT_COLLECTION_LIST                                     0x32d1df83U