diff --git a/configuration.c b/configuration.c
index ac4779b2d7..eb06600553 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1507,8 +1507,6 @@ static struct config_path_setting *populate_settings_path(
          settings->paths.path_stream_url, false, NULL, true);
    SETTING_PATH("video_font_path",
          settings->paths.path_font, false, NULL, true);
-   SETTING_PATH("cursor_directory",
-         settings->paths.directory_cursor, false, NULL, true);
    SETTING_PATH("screenshot_directory",
          settings->paths.directory_screenshot, true, NULL, true);
    SETTING_PATH("system_directory",
@@ -2727,7 +2725,6 @@ void config_set_defaults(void *data)
 
    *settings->paths.path_libretro_info = '\0';
    *settings->paths.directory_libretro = '\0';
-   *settings->paths.directory_cursor = '\0';
    *settings->paths.directory_resampler = '\0';
    *settings->paths.directory_screenshot = '\0';
    *settings->paths.directory_system = '\0';
@@ -2864,10 +2861,6 @@ void config_set_defaults(void *data)
       configuration_set_string(settings,
             settings->paths.path_content_database,
             g_defaults.dirs[DEFAULT_DIR_DATABASE]);
-   if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_CURSOR]))
-      configuration_set_string(settings,
-            settings->paths.directory_cursor,
-            g_defaults.dirs[DEFAULT_DIR_CURSOR]);
    if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_CHEATS]))
       configuration_set_string(settings,
             settings->paths.path_cheat_database,
diff --git a/configuration.h b/configuration.h
index 839fdde48c..44d53ecaa5 100644
--- a/configuration.h
+++ b/configuration.h
@@ -495,7 +495,6 @@ typedef struct settings
       char directory_video_filter[PATH_MAX_LENGTH];
       char directory_video_shader[PATH_MAX_LENGTH];
       char directory_libretro[PATH_MAX_LENGTH];
-      char directory_cursor[PATH_MAX_LENGTH];
       char directory_input_remapping[PATH_MAX_LENGTH];
       char directory_overlay[PATH_MAX_LENGTH];
 #ifdef HAVE_VIDEO_LAYOUT
diff --git a/defaults.h b/defaults.h
index 91ad1f87c1..ff11ff72c8 100644
--- a/defaults.h
+++ b/defaults.h
@@ -62,7 +62,6 @@ enum default_dirs
    DEFAULT_DIR_WALLPAPERS,
    DEFAULT_DIR_THUMBNAILS,
    DEFAULT_DIR_DATABASE,
-   DEFAULT_DIR_CURSOR,
    DEFAULT_DIR_CHEATS,
    DEFAULT_DIR_RECORD_CONFIG,
    DEFAULT_DIR_RECORD_OUTPUT,
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index e26fbc03fc..1ab7c52565 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -129,8 +129,6 @@ static void frontend_ctr_get_env(int* argc, char* argv[],
                       "overlays/ctr", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], g_defaults.dirs[DEFAULT_DIR_PORT],
-                      "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
    fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index c771ec0f55..1c6fb9f7c4 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -414,7 +414,6 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], home_dir_buf, "config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], "remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], home_dir_buf, "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], home_dir_buf, "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], home_dir_buf, "cht", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS], home_dir_buf, "thumbnails", sizeof(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], home_dir_buf, "saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));
@@ -450,7 +449,6 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], application_data, "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], application_data, "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], application_data, "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], application_data, "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], application_data, "cht", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER], application_data, "audio_filters", sizeof(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], application_data, "video_filters", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
diff --git a/frontend/drivers/platform_dos.c b/frontend/drivers/platform_dos.c
index 5dd2097129..836449b296 100644
--- a/frontend/drivers/platform_dos.c
+++ b/frontend/drivers/platform_dos.c
@@ -86,8 +86,6 @@ static void frontend_dos_get_env_settings(int *argc, char *argv[],
 			   "recrdcfg", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG]));
 	fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], base_path,
 			   "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT]));
-	fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], base_path,
-			   "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
 	fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path,
 			   "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
 	fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path,
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 6fdc3f303b..617c4a2feb 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -100,8 +100,6 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
          "bundle/assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
          "bundle/autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], base_path,
-         "bundle/database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path,
          "bundle/database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
diff --git a/frontend/drivers/platform_orbis.c b/frontend/drivers/platform_orbis.c
index 54dbaddc52..a71be66eb6 100644
--- a/frontend/drivers/platform_orbis.c
+++ b/frontend/drivers/platform_orbis.c
@@ -121,8 +121,6 @@ static void frontend_orbis_get_env(int *argc, char *argv[],
          "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], user_path,
          "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], user_path,
-         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path,
          "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index 92c326c5e3..244b4c1694 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -87,8 +87,6 @@ static void create_path_names(void)
          "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], user_path,
          "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], user_path,
-         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path,
          "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 8b8212a5dd..4a2d5ae29e 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -164,9 +164,6 @@ static void fill_derived_paths(void)
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
 		       g_defaults.dirs[DEFAULT_DIR_CORE],
 		       "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
-    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR],
-		       g_defaults.dirs[DEFAULT_DIR_CORE],
-		       "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
     fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE],
 		       g_defaults.dirs[DEFAULT_DIR_CORE],
 		       "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index a9b98ba21a..85bdaa7ffb 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -111,8 +111,6 @@ static void frontend_psp_get_env_settings(int *argc, char *argv[],
       sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], user_path,
       "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], user_path,
-      "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path, "cheats",
       sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,
diff --git a/frontend/drivers/platform_qnx.c b/frontend/drivers/platform_qnx.c
index 5c6a4bcb02..f037b52636 100644
--- a/frontend/drivers/platform_qnx.c
+++ b/frontend/drivers/platform_qnx.c
@@ -95,8 +95,6 @@ static void frontend_qnx_get_env_settings(int *argc, char *argv[],
          "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], data_path,
          "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], data_path,
-         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], data_path,
          "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], data_path,
diff --git a/frontend/drivers/platform_switch.c b/frontend/drivers/platform_switch.c
index c41c5122da..a961d3effa 100644
--- a/frontend/drivers/platform_switch.c
+++ b/frontend/drivers/platform_switch.c
@@ -232,9 +232,6 @@ static void frontend_switch_get_env(
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT]));
 
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], g_defaults.dirs[DEFAULT_DIR_PORT],
-                      "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
-
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], g_defaults.dirs[DEFAULT_DIR_PORT],
                       "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
 
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index 29e9a0d633..fe5f7341c9 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -1619,9 +1619,6 @@ static void frontend_unix_get_env(int *argc,
             fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE],
                   app_dir, "database/rdb",
                   sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-            fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR],
-                  app_dir, "database/cursors",
-                  sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
             fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_WALLPAPERS],
                   app_dir, "assets/wallpapers",
                   sizeof(g_defaults.dirs[DEFAULT_DIR_WALLPAPERS]));
@@ -1886,8 +1883,6 @@ static void frontend_unix_get_env(int *argc,
          "records_config", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], base_path,
          "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], base_path,
-         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path,
          "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path,
diff --git a/frontend/drivers/platform_uwp.c b/frontend/drivers/platform_uwp.c
index a923e37ef5..7c5dcc44db 100644
--- a/frontend/drivers/platform_uwp.c
+++ b/frontend/drivers/platform_uwp.c
@@ -299,8 +299,6 @@ static void frontend_uwp_env_get(int *argc, char *argv[],
       "~\\cheats\\", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE],
       "~\\database\\rdb\\", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CURSOR],
-      "~\\database\\cursors\\", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_PLAYLIST],
       "~\\playlists\\", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG],
diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c
index 6e5114a4a6..c6f3515d3e 100644
--- a/frontend/drivers/platform_wiiu.c
+++ b/frontend/drivers/platform_wiiu.c
@@ -130,8 +130,6 @@ static void frontend_wiiu_get_env_settings(int *argc, char *argv[],
          "filters", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], g_defaults.dirs[DEFAULT_DIR_PORT],
          "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], g_defaults.dirs[DEFAULT_DIR_PORT],
-         "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], g_defaults.dirs[DEFAULT_DIR_CORE],
          "logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS], g_defaults.dirs[DEFAULT_DIR_PORT],
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 97870958d2..604a2ad861 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -587,8 +587,6 @@ static void frontend_win32_env_get(int *argc, char *argv[],
       ":\\cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
    fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE],
       ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
-   fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CURSOR],
-      ":\\database\\cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
    fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_PLAYLIST],
       ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
    fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG],
diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h
index bba6dfe7a3..7ed30e448f 100644
--- a/intl/msg_hash_ar.h
+++ b/intl/msg_hash_ar.h
@@ -4155,10 +4155,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
    "معلومات أساسية"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "المؤشر"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR,
    "شرائح الفيديو"
diff --git a/intl/msg_hash_ca.h b/intl/msg_hash_ca.h
index 1069dc6b65..6fc73b1b18 100644
--- a/intl/msg_hash_ca.h
+++ b/intl/msg_hash_ca.h
@@ -4539,10 +4539,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Les bases de dades es desen en aquest directori."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Cursors"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Arxius de trucs"
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index 0c8e984165..eb0f716678 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -5967,14 +5967,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "保存游戏内容数据库文件的文件夹。"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "指针"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "保存指针文件的文件夹。"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "金手指文件"
diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h
index 2380780c87..b9730fd2af 100644
--- a/intl/msg_hash_cht.h
+++ b/intl/msg_hash_cht.h
@@ -3675,14 +3675,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "設定遊戲資料庫儲存位置。"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "指標"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "設定指標搜尋記錄儲存位置。"
-   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CHEAT_DATABASE_PATH,
    "設定作弊碼文件儲存位置。"
diff --git a/intl/msg_hash_cs.h b/intl/msg_hash_cs.h
index 4bb55af977..c9996d555e 100644
--- a/intl/msg_hash_cs.h
+++ b/intl/msg_hash_cs.h
@@ -6247,14 +6247,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "V tomto adresáři jsou uloženy databáze."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Kurzor"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "V tomto adresáři jsou uloženy kurzorové dotazy."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Soubory Cheatů"
diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h
index 2924c028fb..6214556173 100644
--- a/intl/msg_hash_de.h
+++ b/intl/msg_hash_de.h
@@ -6183,14 +6183,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Datenbanken werden in diesem Verzeichnis gespeichert."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Suchanfragen"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Suchanfragen werden in diesem Verzeichnis gespeichert."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Cheat-Dateien"
diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h
index 5fdd815a55..f1b1e135ac 100644
--- a/intl/msg_hash_el.h
+++ b/intl/msg_hash_el.h
@@ -2987,10 +2987,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
    "Πληροφορίες Πυρήνα"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Δρομείς"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY,
    "Στιγμιότυπα Οθόνης"
diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
index a17d76b550..eded0d2bc5 100644
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@@ -6327,14 +6327,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "En este directorio se guardarán las bases de datos."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Cursores"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "En este directorio se guardarán las peticiones de cursores."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Archivos de trucos"
diff --git a/intl/msg_hash_fi.h b/intl/msg_hash_fi.h
index 253873da9a..c127abfd4c 100644
--- a/intl/msg_hash_fi.h
+++ b/intl/msg_hash_fi.h
@@ -6123,14 +6123,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Tietokannat on tallennettu tähän kansioon."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Kohdistin"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Kohdistimen kyselyt on tallennettu tähän kansioon."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Huijaustiedostot"
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index 83615c5cb7..716f572c02 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -6299,14 +6299,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Les bases de données sont conservées dans ce dossier."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Pointeurs "
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Les requêtes de curseur sont conservées dans ce dossier."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Fichier de cheats "
diff --git a/intl/msg_hash_hu.h b/intl/msg_hash_hu.h
index 9190a07215..6e3496001b 100644
--- a/intl/msg_hash_hu.h
+++ b/intl/msg_hash_hu.h
@@ -1939,10 +1939,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY,
    "Adatbázisok"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Kurzor"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR,
    "Videószűrők"
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index e10d5d42b9..e04dc35937 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -6267,14 +6267,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "I database sono memorizzati in questa directory."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Cursore"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Le query del cursore sono memorizzate in questa directory."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "File Di Trucchi"
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index d325dda5cd..2cbd168dbc 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -5527,14 +5527,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "データベースはこのディレクトリに保存されます."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "カーソル"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "カーソルクエリはこのディレクトリに保存されます."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "チートファイル"
diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h
index e07b2298ff..61a730ef58 100644
--- a/intl/msg_hash_ko.h
+++ b/intl/msg_hash_ko.h
@@ -6363,14 +6363,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "데이터베이스가 저장되는 디렉토리입니다."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "커서"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "커서 정보가 저장되는 디렉토리입니다."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "치트 파일"
diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h
index 53de2cacde..35c8d368ac 100644
--- a/intl/msg_hash_pl.h
+++ b/intl/msg_hash_pl.h
@@ -6119,14 +6119,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Bazy danych są przechowywane w tym katalogu."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Kursor"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Zapytania kursora są przechowywane w tym katalogu."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Pliki Cheat"
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
index b7a62decfa..51d2feb2f2 100644
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@@ -6283,10 +6283,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Os bancos de dados são armazenados neste diretório."
    )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "As consultas salvas são armazenadas neste diretório."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Arquivos de trapaça"
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index a5353323ed..e92ed41d20 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -6359,14 +6359,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Каталог хранения баз данных."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Указатели"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Каталог хранения поисковых запросов."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Файлы чит-кодов"
diff --git a/intl/msg_hash_sk.h b/intl/msg_hash_sk.h
index d2a5d3208d..5051efd956 100644
--- a/intl/msg_hash_sk.h
+++ b/intl/msg_hash_sk.h
@@ -2395,10 +2395,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
    "Informácie o jadre"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Kurzor"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
    "Profily herného ovládača"
diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h
index a29eb55037..4a2f2d294e 100644
--- a/intl/msg_hash_tr.h
+++ b/intl/msg_hash_tr.h
@@ -6327,14 +6327,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Veritabanları bu dizinde saklanır."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "İmleç"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "İmleç sorguları bu dizinde saklanır."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Hile Dosyaları"
diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h
index 96317abb7e..13af6efca9 100644
--- a/intl/msg_hash_uk.h
+++ b/intl/msg_hash_uk.h
@@ -3935,10 +3935,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
    "Інформація про ядро"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Вказівник"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR,
    "Відеошейдери"
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index cd7b2654f0..00b650dc57 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -6415,14 +6415,6 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
    "Databases are stored in this directory."
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Cursor"
-   )
-MSG_HASH(
-   MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
-   "Cursor queries are stored in this directory."
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
    "Cheat Files"
diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h
index 0d1bc4b146..6af049de33 100644
--- a/intl/msg_hash_vn.h
+++ b/intl/msg_hash_vn.h
@@ -1847,10 +1847,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
    "Core Info Danh mục"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-   "Mục Cursor"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY,
    "Playlists Danh mục"
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 6c3f032302..adfd1dff7c 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -107,7 +107,6 @@ GENERIC_DEFERRED_PUSH(deferred_push_content_settings,               DISPLAYLIST_
 GENERIC_DEFERRED_PUSH(deferred_push_add_content_list,               DISPLAYLIST_ADD_CONTENT_LIST)
 GENERIC_DEFERRED_PUSH(deferred_push_history_list,                   DISPLAYLIST_HISTORY)
 GENERIC_DEFERRED_PUSH(deferred_push_database_manager_list,          DISPLAYLIST_DATABASES)
-GENERIC_DEFERRED_PUSH(deferred_push_cursor_manager_list,            DISPLAYLIST_DATABASE_CURSORS)
 GENERIC_DEFERRED_PUSH(deferred_push_content_collection_list,        DISPLAYLIST_DATABASE_PLAYLISTS)
 GENERIC_DEFERRED_PUSH(deferred_push_configurations_list,            DISPLAYLIST_CONFIGURATIONS_LIST)
 GENERIC_DEFERRED_PUSH(deferred_push_load_content_special,           DISPLAYLIST_LOAD_CONTENT_LIST)
@@ -839,7 +838,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
       {MENU_ENUM_LABEL_CONFIGURATIONS, deferred_push_configurations},
       {MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST, deferred_push_accounts_cheevos_list},
       {MENU_ENUM_LABEL_DATABASE_MANAGER_LIST, deferred_push_database_manager_list},
-      {MENU_ENUM_LABEL_CURSOR_MANAGER_LIST, deferred_push_cursor_manager_list},
 #ifdef HAVE_LIBRETRODB
       {MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST, deferred_push_cursor_manager_list_deferred},
       {MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER, deferred_push_cursor_manager_list_deferred_query_rdb_entry_publisher},
@@ -1030,9 +1028,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_ENUM_LABEL_DATABASE_MANAGER_LIST:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_database_manager_list);
             break;
-         case MENU_ENUM_LABEL_CURSOR_MANAGER_LIST:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list);
-            break;
          case MENU_ENUM_LABEL_CHEAT_FILE_LOAD:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cheat_file_load);
             break;
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 38f70c6de2..45b88b0c2e 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -1377,18 +1377,6 @@ static void menu_action_setting_disp_set_label_menu_file_rdb(
          path, "(RDB)", STRLEN_CONST("(RDB)"), s2, len2);
 }
 
-static void menu_action_setting_disp_set_label_menu_file_cursor(
-      file_list_t* list,
-      unsigned *w, unsigned type, unsigned i,
-      const char *label,
-      char *s, size_t len,
-      const char *path,
-      char *s2, size_t len2)
-{
-   MENU_ACTION_SETTING_GENERIC_DISP_SET_LABEL_2(w, s, len,
-         path, "(CURSOR)", STRLEN_CONST("(CURSOR)"), s2, len2);
-}
-
 static void menu_action_setting_disp_set_label_menu_file_cheat(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,
@@ -2205,10 +2193,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
          BIND_ACTION_GET_VALUE(cbs,
                menu_action_setting_disp_set_label_menu_file_rdb);
          break;
-      case FILE_TYPE_CURSOR:
-         BIND_ACTION_GET_VALUE(cbs,
-               menu_action_setting_disp_set_label_menu_file_cursor);
-         break;
       case FILE_TYPE_CHEAT:
          BIND_ACTION_GET_VALUE(cbs,
                menu_action_setting_disp_set_label_menu_file_cheat);
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 64c5f482a9..a7303651ff 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -1213,7 +1213,6 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
          case FILE_TYPE_RDB:
          case FILE_TYPE_RDB_ENTRY:
          case FILE_TYPE_RPL_ENTRY:
-         case FILE_TYPE_CURSOR:
          case FILE_TYPE_SHADER:
          case FILE_TYPE_SHADER_PRESET:
          case FILE_TYPE_IMAGE:
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 9c3705ef82..dfb5176c03 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1381,18 +1381,6 @@ int generic_action_ok_displaylist_push(const char *path,
             dl_type            = DISPLAYLIST_GENERIC;
          }
          break;
-      case ACTION_OK_DL_CURSOR_MANAGER_LIST:
-         filebrowser_clear_type();
-         fill_pathname_join_special(tmp, settings->paths.directory_cursor,
-               path, sizeof(tmp));
-
-         info.directory_ptr = idx;
-         info_path          = tmp;
-         info_label         = msg_hash_to_str(
-               MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST);
-         info.enum_idx      = MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST;
-         dl_type            = DISPLAYLIST_GENERIC;
-         break;
          /* Pending clear */
       case ACTION_OK_DL_CORE_UPDATER_LIST:
          info.type          = type;
@@ -5806,7 +5794,6 @@ DEFAULT_ACTION_OK_FUNC(action_ok_wifi_list, ACTION_OK_DL_WIFI_SETTINGS_LIST)
 DEFAULT_ACTION_OK_FUNC(action_ok_wifi_networks_list, ACTION_OK_DL_WIFI_NETWORKS_LIST)
 #endif
 #endif
-DEFAULT_ACTION_OK_FUNC(action_ok_cursor_manager_list, ACTION_OK_DL_CURSOR_MANAGER_LIST)
 DEFAULT_ACTION_OK_FUNC(action_ok_compressed_archive_push, ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH)
 DEFAULT_ACTION_OK_FUNC(action_ok_compressed_archive_push_detect_core, ACTION_OK_DL_COMPRESSED_ARCHIVE_PUSH_DETECT_CORE)
 DEFAULT_ACTION_OK_FUNC(action_ok_logging_list, ACTION_OK_DL_LOGGING_SETTINGS_LIST)
@@ -8321,7 +8308,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          {MENU_ENUM_LABEL_DETECT_CORE_LIST_OK,                 action_ok_file_load_detect_core},
          {MENU_ENUM_LABEL_DETECT_CORE_LIST_OK_CURRENT_CORE,    action_ok_file_load_current_core},
          {MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY,                action_ok_push_generic_list},
-         {MENU_ENUM_LABEL_CURSOR_MANAGER_LIST,                 action_ok_push_generic_list},
          {MENU_ENUM_LABEL_DATABASE_MANAGER_LIST,               action_ok_push_generic_list},
 #ifdef HAVE_CHEATS
          {MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES,                 action_ok_cheat_apply_changes},
@@ -8890,17 +8876,6 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
             BIND_ACTION_OK(cbs, action_ok_push_netplay_ban);
 #endif
             break;
-         case FILE_TYPE_CURSOR:
-            if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_DATABASE_MANAGER_LIST)))
-            {
-               BIND_ACTION_OK(cbs, action_ok_deferred_list_stub);
-            }
-            else if (string_is_equal(menu_label,
-                     msg_hash_to_str(MENU_ENUM_LABEL_CURSOR_MANAGER_LIST)))
-            {
-               BIND_ACTION_OK(cbs, action_ok_cursor_manager_list);
-            }
-            break;
          case FILE_TYPE_VIDEOFILTER:
             BIND_ACTION_OK(cbs, action_ok_set_path_videofilter);
             break;
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 83112ffdf7..1b6b34beb7 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -1029,7 +1029,6 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
          case FILE_TYPE_RDB:
          case FILE_TYPE_RDB_ENTRY:
          case FILE_TYPE_RPL_ENTRY:
-         case FILE_TYPE_CURSOR:
          case FILE_TYPE_SHADER:
          case FILE_TYPE_SHADER_PRESET:
          case FILE_TYPE_IMAGE:
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 276528d73d..a4fdb6bb6d 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -1014,7 +1014,6 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_content_video_history_directory,
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_runtime_log_directory,                 MENU_ENUM_SUBLABEL_RUNTIME_LOG_DIRECTORY)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cache_directory,                       MENU_ENUM_SUBLABEL_CACHE_DIRECTORY)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_database_directory,                    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY)
-DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cursor_directory,                      MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_assets_directory,                      MENU_ENUM_SUBLABEL_ASSETS_DIRECTORY)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_savefile_directory,                    MENU_ENUM_SUBLABEL_SAVEFILE_DIRECTORY)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_savestate_directory,                   MENU_ENUM_SUBLABEL_SAVESTATE_DIRECTORY)
@@ -2501,9 +2500,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_database_directory);
             break;
-         case MENU_ENUM_LABEL_CURSOR_DIRECTORY:
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cursor_directory);
-            break;
          case MENU_ENUM_LABEL_CACHE_DIRECTORY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cache_directory);
             break;
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 082aba0390..dcce297d79 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -3872,7 +3872,6 @@ enum materialui_entry_value_type materialui_get_entry_value_type(
             case FILE_TYPE_CORE:
             case FILE_TYPE_DIRECT_LOAD:
             case FILE_TYPE_RDB:
-            case FILE_TYPE_CURSOR:
             case FILE_TYPE_PLAIN:
             case FILE_TYPE_DIRECTORY:
             case FILE_TYPE_MUSIC:
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index b6c24d1dfd..bba2206f77 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -2091,8 +2091,6 @@ static uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
          return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RDB];
       case FILE_TYPE_RDB_ENTRY:
          return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FILE];
-      case FILE_TYPE_CURSOR:
-         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CURSOR];
       case FILE_TYPE_PLAYLIST_ENTRY:
       case MENU_SETTING_ACTION_RUN:
          return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RUN];
@@ -7326,7 +7324,6 @@ static bool ozone_is_current_entry_settings(size_t current_selection)
             case FILE_TYPE_CORE:
             case FILE_TYPE_DIRECT_LOAD:
             case FILE_TYPE_RDB:
-            case FILE_TYPE_CURSOR:
             case FILE_TYPE_PLAIN:
             case FILE_TYPE_DIRECTORY:
             case FILE_TYPE_MUSIC:
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 5c611f4880..a912bb2152 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3188,8 +3188,6 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_RDB];
       case FILE_TYPE_RDB_ENTRY:
          return xmb->textures.list[XMB_TEXTURE_FILE];
-      case FILE_TYPE_CURSOR:
-         return xmb->textures.list[XMB_TEXTURE_CURSOR];
       case FILE_TYPE_PLAYLIST_ENTRY:
       case MENU_SETTING_ACTION_RUN:
          return xmb->textures.list[XMB_TEXTURE_RUN];
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 15eaa620d5..1eeff965d7 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -154,7 +154,6 @@ enum
    ACTION_OK_DL_PARENT_DIRECTORY_PUSH,
    ACTION_OK_DL_DIRECTORY_PUSH,
    ACTION_OK_DL_DATABASE_MANAGER_LIST,
-   ACTION_OK_DL_CURSOR_MANAGER_LIST,
    ACTION_OK_DL_CORE_UPDATER_LIST,
    ACTION_OK_DL_CORE_MANAGER_LIST,
 #ifdef HAVE_MIST
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 8f2311228e..66f976941b 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -4013,12 +4013,6 @@ static unsigned menu_displaylist_parse_information_list(file_list_t *info_list)
          MENU_ENUM_LABEL_DATABASE_MANAGER_LIST,
          MENU_SETTING_ACTION, 0, 0, NULL))
       count++;
-   if (menu_entries_append(info_list,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER),
-         msg_hash_to_str(MENU_ENUM_LABEL_CURSOR_MANAGER_LIST),
-         MENU_ENUM_LABEL_CURSOR_MANAGER_LIST,
-         MENU_SETTING_ACTION, 0, 0, NULL))
-      count++;
 #endif
 
    if (retroarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL))
@@ -10005,7 +9999,6 @@ unsigned menu_displaylist_build_list(
                {MENU_ENUM_LABEL_LIBRETRO_DIR_PATH,               PARSE_ONLY_DIR},
                {MENU_ENUM_LABEL_LIBRETRO_INFO_PATH,              PARSE_ONLY_DIR},
                {MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY,      PARSE_ONLY_DIR},
-               {MENU_ENUM_LABEL_CURSOR_DIRECTORY,                PARSE_ONLY_DIR},
 #ifdef HAVE_CHEATS
                {MENU_ENUM_LABEL_CHEAT_DATABASE_PATH,             PARSE_ONLY_DIR},
 #endif
@@ -13794,21 +13787,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             info->path         = strdup(settings->paths.path_content_database);
          }
          break;
-      case DISPLAYLIST_DATABASE_CURSORS:
-         {
-            menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-            filebrowser_clear_type();
-            if (!string_is_empty(info->exts))
-               free(info->exts);
-            if (info->path)
-               free(info->path);
-            info->type_default = FILE_TYPE_CURSOR;
-            info->exts         = strldup("dbc", sizeof("dbc"));
-            load_content       = false;
-            use_filebrowser    = true;
-            info->path         = strdup(settings->paths.directory_cursor);
-         }
-         break;
       case DISPLAYLIST_SHADER_PASS:
       case DISPLAYLIST_SHADER_PRESET:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index be5e11005b..bcd8c0779b 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -125,7 +125,6 @@ enum menu_displaylist_ctl_state
    DISPLAYLIST_SHADER_PASS,
    DISPLAYLIST_SHADER_PRESET,
    DISPLAYLIST_DATABASES,
-   DISPLAYLIST_DATABASE_CURSORS,
    DISPLAYLIST_DATABASE_PLAYLISTS,
    DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL,
    DISPLAYLIST_DATABASE_QUERY,
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index cebebfe723..c7a4e01775 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -7621,9 +7621,6 @@ static int generic_menu_iterate(
                   case FILE_TYPE_RECORD_CONFIG:
                      enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG;
                      break;
-                  case FILE_TYPE_CURSOR:
-                     enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CURSOR;
-                     break;
                   case FILE_TYPE_CONFIG:
                      enum_idx = MENU_ENUM_LABEL_FILE_BROWSER_CONFIG;
                      break;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 9a6da6ff16..bbbef89bd5 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -21019,21 +21019,6 @@ static bool setting_append_list(
                general_write_handler,
                general_read_handler);
          (*list)[list_info->index - 1].action_start = directory_action_start_generic;
-
-         CONFIG_DIR(
-               list, list_info,
-               settings->paths.directory_cursor,
-               sizeof(settings->paths.directory_cursor),
-               MENU_ENUM_LABEL_CURSOR_DIRECTORY,
-               MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
-               g_defaults.dirs[DEFAULT_DIR_CURSOR],
-               MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE,
-               &group_info,
-               &subgroup_info,
-               parent_group,
-               general_write_handler,
-               general_read_handler);
-         (*list)[list_info->index - 1].action_start = directory_action_start_generic;
 #endif
 
          CONFIG_DIR(
diff --git a/msg_hash.c b/msg_hash.c
index 8d78a179c2..126ea24ad2 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -383,7 +383,6 @@ uint32_t msg_hash_calculate(const char *s)
 #define MENU_VALUE_IMAGE                                                       0xbab7ebf9U
 #define MENU_VALUE_MOVIE                                                       0xc43c4bf6U
 #define MENU_VALUE_CORE                                                        0x6a167f7fU
-#define MENU_VALUE_CURSOR                                                      0x57bba8b4U
 #define MENU_VALUE_FILE                                                        0x6a496536U
 #define MENU_VALUE_RDB                                                         0x0b00f54eU
 #define MENU_VALUE_DIR                                                         0x0af95f55U
@@ -430,8 +429,6 @@ enum msg_file_type msg_hash_to_file_type(uint32_t hash)
          return FILE_TYPE_CORE;
       case MENU_VALUE_RDB:
          return FILE_TYPE_RDB;
-      case MENU_VALUE_CURSOR:
-         return FILE_TYPE_CURSOR;
       case MENU_VALUE_FILE:
          return FILE_TYPE_PLAIN;
       case MENU_VALUE_DIR:
diff --git a/msg_hash.h b/msg_hash.h
index 08fca5a1b6..dc9dc4bb1b 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -71,7 +71,6 @@ enum msg_file_type
    FILE_TYPE_RDB,
    FILE_TYPE_RDB_ENTRY,
    FILE_TYPE_RPL_ENTRY,
-   FILE_TYPE_CURSOR,
    FILE_TYPE_BOOL_ON,
    FILE_TYPE_BOOL_OFF,
    FILE_TYPE_RECORD_CONFIG,