diff --git a/configuration.c b/configuration.c
index 4cb16f5df9..9256fde0b9 100644
--- a/configuration.c
+++ b/configuration.c
@@ -617,8 +617,6 @@ static int populate_settings_path(settings_t *settings, struct config_path_setti
 #ifdef HAVE_OVERLAY
    SETTING_PATH("input_overlay",
          settings->path.overlay, false, NULL, true);
-   SETTING_PATH("input_osk_overlay",
-         settings->path.osk_overlay, false, NULL, true);
 #endif
    SETTING_PATH("video_font_path",
          settings->path.font, false, NULL, true);
@@ -668,10 +666,6 @@ static int populate_settings_path(settings_t *settings, struct config_path_setti
    SETTING_PATH("overlay_directory",
          settings->directory.overlay, true, NULL, true);
 #endif
-#ifdef HAVE_OVERLAY
-   SETTING_PATH("osk_overlay_directory",
-         dir_get_ptr(RARCH_DIR_OSK_OVERLAY), true, NULL, true);
-#endif
 #ifndef HAVE_DYNAMIC
    SETTING_PATH("libretro_path", 
          path_get_ptr(RARCH_PATH_CORE), false, NULL, false);
@@ -795,7 +789,6 @@ static int populate_settings_bool(settings_t *settings, struct config_bool_setti
    SETTING_BOOL("input_overlay_enable",         &settings->input.overlay_enable, true, config_overlay_enable_default(), false);
    SETTING_BOOL("input_overlay_enable_autopreferred", &settings->input.overlay_enable_autopreferred, true, true, false);
    SETTING_BOOL("input_overlay_hide_in_menu",   &settings->input.overlay_hide_in_menu, true, overlay_hide_in_menu, false);
-   SETTING_BOOL("input_osk_overlay_enable",     &settings->osk.enable, true, true, false);
 #endif
 #ifdef HAVE_COMMAND
    SETTING_BOOL("network_cmd_enable",           &settings->network_cmd_enable, true, network_cmd_enable, false);
@@ -1266,31 +1259,8 @@ static void config_set_defaults(void)
                   sizeof(settings->path.overlay));
 #endif
    }
-
-   if (!string_is_empty(g_defaults.dir.osk_overlay))
-   {
-      char temp_path[PATH_MAX_LENGTH];
-
-      temp_path[0] = '\0';
-
-      fill_pathname_expand_special(temp_path,
-            g_defaults.dir.osk_overlay, sizeof(temp_path));
-
-      dir_set(RARCH_DIR_OSK_OVERLAY, temp_path);
-   }
-   else
-   {
-      char temp_path[PATH_MAX_LENGTH];
-
-      temp_path[0] = '\0';
-
-      strlcpy(temp_path,
-            settings->directory.overlay,
-            sizeof(temp_path));
-
-      dir_set(RARCH_DIR_OSK_OVERLAY, temp_path);
-   }
 #endif
+
 #ifdef HAVE_MENU
    if (!string_is_empty(g_defaults.dir.menu_config))
       strlcpy(settings->directory.menu_config,
@@ -2109,8 +2079,6 @@ static bool config_load_file(const char *path, bool set_defaults,
 #ifdef HAVE_OVERLAY
    if (string_is_equal(settings->directory.overlay, "default"))
       *settings->directory.overlay = '\0';
-   if (string_is_equal(dir_get(RARCH_DIR_OSK_OVERLAY), "default"))
-      dir_clear(RARCH_DIR_OSK_OVERLAY);
 #endif
    if (string_is_equal(settings->directory.system, "default"))
       *settings->directory.system = '\0';
diff --git a/configuration.h b/configuration.h
index 1980612f95..aecfe56fbb 100644
--- a/configuration.h
+++ b/configuration.h
@@ -359,7 +359,6 @@ typedef struct settings
    {
       char cheat_database[PATH_MAX_LENGTH];
       char content_database[PATH_MAX_LENGTH];
-      char osk_overlay[PATH_MAX_LENGTH];
       char overlay[PATH_MAX_LENGTH];
       char menu_wallpaper[PATH_MAX_LENGTH];
       char audio_dsp_plugin[PATH_MAX_LENGTH];
diff --git a/defaults.h b/defaults.h
index ac8e3a6fbc..92bda20fb1 100644
--- a/defaults.h
+++ b/defaults.h
@@ -62,7 +62,6 @@ struct defaults
       char core[PATH_MAX_LENGTH];
       char core_info[PATH_MAX_LENGTH];
       char overlay[PATH_MAX_LENGTH];
-      char osk_overlay[PATH_MAX_LENGTH];
       char port[PATH_MAX_LENGTH];
       char shader[PATH_MAX_LENGTH];
       char savestate[PATH_MAX_LENGTH];
diff --git a/dirs.c b/dirs.c
index 9629ddc8c1..ad53fbd3eb 100644
--- a/dirs.c
+++ b/dirs.c
@@ -42,7 +42,6 @@ struct rarch_dir_list
 
 static struct rarch_dir_list dir_shader_list;
 
-static char dir_osk_overlay[PATH_MAX_LENGTH]            = {0};
 static char dir_system[PATH_MAX_LENGTH]                 = {0};
 static char dir_savefile[PATH_MAX_LENGTH]               = {0};
 static char current_savefile_dir[PATH_MAX_LENGTH]       = {0};
@@ -183,8 +182,6 @@ bool dir_is_empty(enum rarch_dir_type type)
          return string_is_empty(dir_savestate);
       case RARCH_DIR_CURRENT_SAVESTATE:
          return string_is_empty(current_savestate_dir);
-      case RARCH_DIR_OSK_OVERLAY:
-         return string_is_empty(dir_osk_overlay);
       case RARCH_DIR_NONE:
          break;
    }
@@ -208,8 +205,6 @@ size_t dir_get_size(enum rarch_dir_type type)
          return sizeof(dir_savefile);
       case RARCH_DIR_CURRENT_SAVEFILE:
          return sizeof(current_savefile_dir);
-      case RARCH_DIR_OSK_OVERLAY:
-         return sizeof(dir_osk_overlay);
       case RARCH_DIR_NONE:
          break;
    }
@@ -238,9 +233,6 @@ void dir_clear(enum rarch_dir_type type)
       case RARCH_DIR_SYSTEM:
          *dir_system = '\0';
          break;
-      case RARCH_DIR_OSK_OVERLAY:
-         *dir_osk_overlay = '\0';
-         break;
       case RARCH_DIR_NONE:
          break;
    }
@@ -249,7 +241,6 @@ void dir_clear(enum rarch_dir_type type)
 void dir_clear_all(void)
 {
    dir_clear(RARCH_DIR_SYSTEM);
-   dir_clear(RARCH_DIR_OSK_OVERLAY);
    dir_clear(RARCH_DIR_SAVEFILE);
    dir_clear(RARCH_DIR_SAVESTATE);
 }
@@ -260,8 +251,6 @@ char *dir_get_ptr(enum rarch_dir_type type)
 {
    switch (type)
    {
-      case RARCH_DIR_OSK_OVERLAY:
-         return dir_osk_overlay;
       case RARCH_DIR_SAVEFILE:
          return dir_savefile;
       case RARCH_DIR_CURRENT_SAVEFILE:
@@ -283,8 +272,6 @@ const char *dir_get(enum rarch_dir_type type)
 {
    switch (type)
    {
-      case RARCH_DIR_OSK_OVERLAY:
-         return dir_osk_overlay;
       case RARCH_DIR_SAVEFILE:
          return dir_savefile;
       case RARCH_DIR_CURRENT_SAVEFILE:
@@ -326,10 +313,6 @@ void dir_set(enum rarch_dir_type type, const char *path)
          strlcpy(dir_system, path,
                sizeof(dir_system));
          break;
-      case RARCH_DIR_OSK_OVERLAY:
-         strlcpy(dir_osk_overlay, path,
-               sizeof(dir_osk_overlay));
-         break;
       case RARCH_DIR_NONE:
          break;
    }
diff --git a/dirs.h b/dirs.h
index 89bf7681cb..64fff61ab4 100644
--- a/dirs.h
+++ b/dirs.h
@@ -28,8 +28,7 @@ enum rarch_dir_type
    RARCH_DIR_SAVESTATE,
    RARCH_DIR_CURRENT_SAVEFILE,
    RARCH_DIR_CURRENT_SAVESTATE,
-   RARCH_DIR_SYSTEM,
-   RARCH_DIR_OSK_OVERLAY
+   RARCH_DIR_SYSTEM
 };
 
 bool dir_init_shader(void);
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 1e49e36abf..acc567dd57 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -115,8 +115,6 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
          "bundle/info", sizeof(g_defaults.dir.core_info));
    fill_pathname_join(g_defaults.dir.overlay, base_path,
          "bundle/overlays", sizeof(g_defaults.dir.overlay));
-   fill_pathname_join(g_defaults.dir.osk_overlay, base_path,
-         "bundle/overlays", sizeof(g_defaults.dir.osk_overlay));
    fill_pathname_join(g_defaults.dir.shader, base_path,
          "bundle/shaders", sizeof(g_defaults.dir.shader));
 
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 48f8d3fbb9..18fefa76d1 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -1474,8 +1474,6 @@ static void frontend_linux_get_env(int *argc,
                   "shaders", sizeof(g_defaults.dir.shader));
             fill_pathname_join(g_defaults.dir.overlay, app_dir,
                   "overlays", sizeof(g_defaults.dir.overlay));
-            fill_pathname_join(g_defaults.dir.osk_overlay, app_dir,
-                  "overlays", sizeof(g_defaults.dir.osk_overlay));
             fill_pathname_join(g_defaults.dir.core, app_dir,
                   "cores", sizeof(g_defaults.dir.core));
             fill_pathname_join(g_defaults.dir.core_info,
@@ -1726,8 +1724,6 @@ static void frontend_linux_get_env(int *argc,
          "cheats", sizeof(g_defaults.dir.cheats));
    fill_pathname_join(g_defaults.dir.overlay, base_path,
          "overlay", sizeof(g_defaults.dir.overlay));
-   fill_pathname_join(g_defaults.dir.osk_overlay, base_path,
-         "overlay", sizeof(g_defaults.dir.osk_overlay));
    fill_pathname_join(g_defaults.dir.core_assets, base_path,
          "downloads", sizeof(g_defaults.dir.core_assets));
    fill_pathname_join(g_defaults.dir.screenshot, base_path,
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 5fd6043f27..31c1e28561 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -163,8 +163,6 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "BUNDLE/DATABASE/RDB", sizeof(g_defaults.dir.database));
    fill_pathname_join(g_defaults.dir.overlay, base_path,
          "BUNDLE/OVERLAYS", sizeof(g_defaults.dir.overlay));
-   fill_pathname_join(g_defaults.dir.osk_overlay, base_path,
-         "BUNDLE/OVERLAYS", sizeof(g_defaults.dir.osk_overlay));
    fill_pathname_join(g_defaults.dir.shader, base_path,
          "BUNDLE/SHADERS", sizeof(g_defaults.dir.shader));
    */
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 0efdd53d69..78ea284dbf 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -272,10 +272,6 @@ static void frontend_win32_environment_get(int *argc, char *argv[],
       ":\\thumbnails", sizeof(g_defaults.dir.thumbnails));
    fill_pathname_expand_special(g_defaults.dir.overlay,
       ":\\overlays", sizeof(g_defaults.dir.overlay));
-   fill_pathname_expand_special(g_defaults.dir.osk_overlay,
-      ":\\overlays", sizeof(g_defaults.dir.osk_overlay));
-   fill_pathname_expand_special(g_defaults.dir.osk_overlay,
-      ":\\overlays", sizeof(g_defaults.dir.osk_overlay));
    fill_pathname_expand_special(g_defaults.dir.core,
       ":\\cores", sizeof(g_defaults.dir.core));
    fill_pathname_expand_special(g_defaults.dir.core_info,
diff --git a/input/input_driver.c b/input/input_driver.c
index 6ff051a1bc..f8fa558c60 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -113,7 +113,6 @@ const input_driver_t *current_input               = NULL;
 void *current_input_data                          = NULL;
 static bool input_driver_block_hotkey             = false;
 static bool input_driver_block_libretro_input     = false;
-static bool input_driver_osk_enabled              = false;
 static bool input_driver_nonblock_state           = false;
 static bool input_driver_flushing_input           = false;
 static bool input_driver_data_own                 = false;
@@ -1064,21 +1063,6 @@ bool input_driver_owns_driver(void)
    return input_driver_data_own;
 }
 
-void input_driver_set_onscreen_keyboard_enabled(void)
-{
-   input_driver_osk_enabled = true;
-}
-
-void input_driver_unset_onscreen_keyboard_enabled(void)
-{
-   input_driver_osk_enabled = false;
-}
-
-bool input_driver_is_onscreen_keyboard_enabled(void)
-{
-   return input_driver_osk_enabled;
-}
-
 bool input_driver_init_command(void)
 {
 #ifdef HAVE_COMMAND
diff --git a/input/input_driver.h b/input/input_driver.h
index 7841147006..ea9ec5383b 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -281,12 +281,6 @@ void input_driver_unset_own_driver(void);
 
 bool input_driver_owns_driver(void);
 
-void input_driver_set_onscreen_keyboard_enabled(void);
-
-void input_driver_unset_onscreen_keyboard_enabled(void);
-
-bool input_driver_is_onscreen_keyboard_enabled(void);
-
 void input_driver_deinit_command(void);
 
 bool input_driver_init_command(void);
diff --git a/input/input_overlay.c b/input/input_overlay.c
index e3f2166a72..8a4e9867e3 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -523,7 +523,7 @@ void input_overlay_loaded(void *task_data, void *user_data, const char *err)
    /* We can't display when the menu is up */
    if (settings->input.overlay_hide_in_menu && menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
    {
-      if (!input_driver_is_onscreen_keyboard_enabled() && settings->input.overlay_enable)
+      if (settings->input.overlay_enable)
          goto abort_load;
    }
 #endif
@@ -545,11 +545,8 @@ void input_overlay_loaded(void *task_data, void *user_data, const char *err)
    ol->iface_data = video_driver_get_ptr(true);
 
    input_overlay_load_active(ol, settings->input.overlay_opacity);
+   input_overlay_enable(ol, settings->input.overlay_enable);
 
-   if (input_driver_is_onscreen_keyboard_enabled())
-      input_overlay_enable(ol, settings->osk.enable);
-   else
-      input_overlay_enable(ol, settings->input.overlay_enable);
    input_overlay_set_scale_factor(ol, settings->input.overlay_scale);
 
    ol->next_index = (ol->index + 1) % ol->size;
diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h
index 1343318b62..3993cacca5 100644
--- a/intl/msg_hash_eo.h
+++ b/intl/msg_hash_eo.h
@@ -738,8 +738,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
       "Volume -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
       "Volume +")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-      "Display Keyboard Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
       "Display Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -986,8 +984,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
       "Open Archive As Folder")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
       "Optional")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-      "OSK Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
       "Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index ee6639a66f..7f81159d68 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -734,8 +734,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
       "Volume -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
       "Volume +")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-      "Afficher l'overlay clavier")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
       "Activer les overlays")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -978,8 +976,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
       "Ouvrir l'archive")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
       "Optionnel")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-      "Dossier des overlays claviers")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
       "Charger l'overlay préféré automatiquement")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY,
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index 0f43de040f..d1cd29c607 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -746,8 +746,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
       "音量を減る")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
       "音量を増す")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-      "キーボードオーバーレイを表示")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
       "ディスプレイのオーバーレイ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -994,8 +992,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
       "フォルダでアーカイブを開く")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
       "任意")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-      "OSKオーバーレイ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
       "オーバーレイ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index e25711a213..58ff4d78dc 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -442,8 +442,6 @@ MSG_HASH(MENU_ENUM_LABEL_INPUT_MAX_USERS,
       "input_max_users")
 MSG_HASH(MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
       "input_menu_toggle_gamepad_combo")
-MSG_HASH(MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE,
-      "input_osk_overlay_enable")
 MSG_HASH(MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE,
       "input_overlay_enable")
 MSG_HASH(MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -504,8 +502,6 @@ MSG_HASH(MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR,
       "joypad_autoconfig_dir")
 MSG_HASH(MENU_ENUM_LABEL_JOYPAD_DRIVER,
       "input_joypad_driver")
-MSG_HASH(MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET,
-      "input_osk_overlay")
 MSG_HASH(MENU_ENUM_LABEL_LAKKA_SERVICES,
       "lakka_services")
 MSG_HASH(MENU_ENUM_LABEL_LIBRETRO_DIR_PATH,
@@ -650,8 +646,6 @@ MSG_HASH(MENU_ENUM_LABEL_OPEN_ARCHIVE,
       "open_archive")
 MSG_HASH(MENU_ENUM_LABEL_OPEN_ARCHIVE_DETECT_CORE,
       "open_archive_detect_core")
-MSG_HASH(MENU_ENUM_LABEL_OSK_OVERLAY_DIRECTORY,
-      "osk_overlay_directory")
 MSG_HASH(MENU_ENUM_LABEL_OVERLAY_AUTOLOAD_PREFERRED,
       "overlay_autoload_preferred")
 MSG_HASH(MENU_ENUM_LABEL_OVERLAY_DIRECTORY,
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index f71951dd78..3e17063c37 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -738,8 +738,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
       "Volume -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
       "Volume +")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-      "Toetsenbord Overlay Weergeven")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
       "Overlay Weergeven")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -986,8 +984,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
       "Open Archief Als Map")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
       "Optioneel")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-      "OSK Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
       "Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index e14d5f8bbb..5f8ee71c36 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -738,8 +738,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
       "Volume -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
       "Volume +")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-      "Display Keyboard Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
       "Display Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -986,8 +984,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
       "Open Archive As Folder")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
       "Optional")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-      "OSK Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
       "Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 7822864d06..80454c295a 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -738,8 +738,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
       "Volume -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
       "Volume +")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-      "Display Keyboard Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
       "Display Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
@@ -986,8 +984,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
       "Open Archive As Folder")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
       "Optional")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-      "OSK Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
       "Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index de6056f4d1..61cff95e54 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -693,11 +693,6 @@ static int deferred_push_input_overlay(menu_displaylist_info_t *info)
    return deferred_push_dlist(info, DISPLAYLIST_OVERLAYS);
 }
 
-static int deferred_push_input_osk_overlay(menu_displaylist_info_t *info)
-{
-   return deferred_push_dlist(info, DISPLAYLIST_OVERLAYS);
-}
-
 static int deferred_push_video_font_path(menu_displaylist_info_t *info)
 {
    return deferred_push_dlist(info, DISPLAYLIST_FONTS);
@@ -1065,9 +1060,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_ENUM_LABEL_INPUT_OVERLAY:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_input_overlay);
                break;
-            case MENU_ENUM_LABEL_INPUT_OSK_OVERLAY:
-               BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_input_osk_overlay);
-               break;
             case MENU_ENUM_LABEL_VIDEO_FONT_PATH:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_font_path);
                break;
@@ -1328,9 +1320,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_LABEL_INPUT_OVERLAY:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_input_overlay);
                break;
-            case MENU_LABEL_INPUT_OSK_OVERLAY:
-               BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_input_osk_overlay);
-               break;
             case MENU_LABEL_VIDEO_FONT_PATH:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_font_path);
                break;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index cbff267def..2a3868681f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -4697,9 +4697,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU,
                PARSE_ONLY_BOOL, false);
-         menu_displaylist_parse_settings_enum(menu, info,
-               MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE,
-               PARSE_ONLY_BOOL, false);
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_OVERLAY_PRESET,
                PARSE_ONLY_PATH, false);
@@ -4709,9 +4706,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_OVERLAY_SCALE,
                PARSE_ONLY_FLOAT, false);
-         menu_displaylist_parse_settings_enum(menu, info,
-               MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET,
-               PARSE_ONLY_PATH, false);
 
          info->need_refresh = true;
          info->need_push    = true;
@@ -5078,9 +5072,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_OVERLAY_DIRECTORY,
                PARSE_ONLY_DIR, false);
-         menu_displaylist_parse_settings_enum(menu, info,
-               MENU_ENUM_LABEL_OSK_OVERLAY_DIRECTORY,
-               PARSE_ONLY_DIR, false);
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_SCREENSHOT_DIRECTORY,
                PARSE_ONLY_DIR, false);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 3059187b69..13e300c51f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -4550,22 +4550,6 @@ static bool setting_append_list(
                );
          (*list)[list_info->index - 1].change_handler = overlay_enable_toggle_change_handler;
 
-         CONFIG_BOOL(
-               list, list_info,
-               &settings->osk.enable,
-               MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE,
-               MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
-               display_keyboard_overlay,
-               MENU_ENUM_LABEL_VALUE_OFF,
-               MENU_ENUM_LABEL_VALUE_ON,
-               &group_info,
-               &subgroup_info,
-               parent_group,
-               general_write_handler,
-               general_read_handler,
-               SD_FLAG_NONE
-               );
-
          CONFIG_PATH(
                list, list_info,
                settings->path.overlay,
@@ -4617,20 +4601,6 @@ static bool setting_append_list(
 
          START_SUB_GROUP(list, list_info, "Onscreen Keyboard Overlay", &group_info, &subgroup_info, parent_group);
 
-         CONFIG_PATH(
-               list, list_info,
-               settings->path.osk_overlay,
-               sizeof(settings->path.osk_overlay),
-               MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET,
-               MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET,
-               dir_get_ptr(RARCH_DIR_OSK_OVERLAY),
-               &group_info,
-               &subgroup_info,
-               parent_group,
-               general_write_handler,
-               general_read_handler);
-         menu_settings_list_current_add_values(list, list_info, "cfg");
-
          END_SUB_GROUP(list, list_info, parent_group);
          END_GROUP(list, list_info, parent_group);
 #endif
@@ -6207,20 +6177,6 @@ static bool setting_append_list(
                parent_group,
                general_write_handler,
                general_read_handler);
-
-         CONFIG_DIR(
-               list, list_info,
-               dir_get_ptr(RARCH_DIR_OSK_OVERLAY),
-               dir_get_size(RARCH_DIR_OSK_OVERLAY),
-               MENU_ENUM_LABEL_OSK_OVERLAY_DIRECTORY,
-               MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY,
-               g_defaults.dir.osk_overlay,
-               MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT,
-               &group_info,
-               &subgroup_info,
-               parent_group,
-               general_write_handler,
-               general_read_handler);
 #endif
 
          CONFIG_DIR(
diff --git a/retroarch.cfg b/retroarch.cfg
index bf1212275d..d54ef28f6a 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -334,24 +334,6 @@
 # Overlay scale.
 # input_overlay_scale = 1.0
 
-#### OSK (Onscreen Keyboard) Overlay
-
-# Defines a directory where onscreen keyboard overlays are 
-# kept for easy access.
-# osk_overlay_directory =
-
-# Enable onscreen keyboard overlay.
-# input_osk_overlay_enable = true
-
-# Path to onscreen keyboard overlay.
-# input_osk_overlay =
-
-# Onscreen keyboard overlay opacity.
-# input_osk_overlay_opacity = 1.0
-
-# Onscreen keyboard overlay scale
-# input_osk_overlay_scale = 1.0
-
 #### Input
 
 # Input driver. Depending on video driver, it might force a different input driver.
diff --git a/runloop.c b/runloop.c
index fd3f8c38d7..f73e69949e 100644
--- a/runloop.c
+++ b/runloop.c
@@ -773,7 +773,6 @@ static enum runloop_state runloop_check_state(
    static bool old_focus            = true;
 #ifdef HAVE_OVERLAY
    static char prev_overlay_restore = false;
-   bool osk_enable                  = input_driver_is_onscreen_keyboard_enabled();
 #endif
 #ifdef HAVE_NETWORKING
    bool tmp                         = false;
@@ -820,17 +819,9 @@ static enum runloop_state runloop_check_state(
 
 
 #ifdef HAVE_OVERLAY
-   if (osk_enable && !input_keyboard_ctl(
+   if (input_keyboard_ctl(
             RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
    {
-      input_driver_unset_onscreen_keyboard_enabled();
-      prev_overlay_restore  = true;
-      command_event(CMD_EVENT_OVERLAY_DEINIT, NULL);
-   }
-   else if (!osk_enable && input_keyboard_ctl(
-            RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
-   {
-      input_driver_set_onscreen_keyboard_enabled();
       prev_overlay_restore  = false;
       command_event(CMD_EVENT_OVERLAY_INIT, NULL);
    }
@@ -850,13 +841,8 @@ static enum runloop_state runloop_check_state(
          if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
          {
             menu_ctx_iterate_t iter;
-            bool skip = false;
             core_poll();
-      #ifdef HAVE_OVERLAY
-            skip = osk_enable && input_keyboard_return_pressed();
-      #endif
 
-            if (!skip)
             {
                enum menu_action action = (enum menu_action)menu_event(current_input, trigger_input);
                bool focused            = settings->pause_nonactive ? video_driver_is_focused() : true;
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 4b7a319e0c..9743ca86d7 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -799,9 +799,7 @@ bool task_push_overlay_load_default(
       retro_task_callback_t cb, void *user_data)
 {
    settings_t *settings = config_get_ptr();
-   bool osk_enable      = input_driver_is_onscreen_keyboard_enabled();
-   const char *path     = osk_enable ? settings->path.osk_overlay : 
-      settings->path.overlay;
+   const char *path     = settings->path.overlay;
 
    if (string_is_empty(path))
       return false;