diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index b4f350e8ed..e73ba3027b 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -2308,7 +2308,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_LOAD_STATE,
-   "loadstate"
+   "load_state"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_LOCATION_ALLOW,
@@ -3552,6 +3552,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_SAVESTATE_MAX_KEEP,
    "savestate_max_keep"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_REPLAY_AUTO_INDEX,
+   "replay_auto_index"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_REPLAY_MAX_KEEP,
    "replay_max_keep"
@@ -3606,7 +3610,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_SAVE_STATE,
-   "savestate"
+   "save_state"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_RECORD_REPLAY,
@@ -4020,11 +4024,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_UNDO_LOAD_STATE,
-   "undoloadstate"
+   "undo_load_state"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_UNDO_SAVE_STATE,
-   "undosavestate"
+   "undo_save_state"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_UPDATER_SETTINGS,
@@ -4480,6 +4484,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_REFRESH_RATE,
    "video_autoswitch_refresh_rate"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_PAL_THRESHOLD,
+   "video_autoswitch_pal_threshold"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_ROTATION,
    "video_rotation"
@@ -4497,8 +4505,12 @@ MSG_HASH(
    "video_scale_integer"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_OVERSCALE,
-   "video_scale_integer_overscale"
+   MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_AXIS,
+   "video_scale_integer_axis"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_SCALING,
+   "video_scale_integer_scaling"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SETTINGS,
@@ -6152,6 +6164,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_PLAYLIST_PORTABLE_PATHS,
    "playlist_portable_paths"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_PLAYLIST_USE_FILENAME,
+   "playlist_use_filename"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_PLAYLIST_ALLOW_NON_PNG,
+   "playlist_allow_non_png"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO,
    "help_send_debug_info"
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 179a517e54..f8c5e8dee3 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -10376,6 +10376,10 @@ static void materialui_list_insert(
       gfx_thumbnail_reset(&node->thumbnails.secondary);
    }
 
+   /* Never show icons in certain lists */
+   if (string_is_equal(fullpath, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS)))
+      menu_materialui_icons_enable = false;
+
    if (menu_materialui_icons_enable)
    {
       switch (type)
@@ -10389,9 +10393,6 @@ static void materialui_list_insert(
             node->icon_texture_index = MUI_TEXTURE_DISK;
             node->icon_type          = MUI_ICON_TYPE_INTERNAL;
             break;
-         case FILE_TYPE_DOWNLOAD_CORE:
-         case FILE_TYPE_CORE:
-         case MENU_SETTING_ACTION_CORE_MANAGER_OPTIONS:
          case MENU_SETTING_ACTION_CORE_LOCK:
          case MENU_SETTING_ACTION_CORE_SET_STANDALONE_EXEMPT:
          case MENU_CONTENTLESS_CORES_TAB:
diff --git a/msg_hash.h b/msg_hash.h
index 0915739740..9e492fec86 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1452,7 +1452,6 @@ enum msg_hash_enums
    MENU_LABEL(VIDEO_SCALE_INTEGER),
    MENU_LABEL(VIDEO_SCALE_INTEGER_AXIS),
    MENU_LABEL(VIDEO_SCALE_INTEGER_SCALING),
-   MENU_LABEL(VIDEO_SCALE_INTEGER_OVERSCALE), /* deprecated */
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING_UNDERSCALE,
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING_OVERSCALE,
    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER_SCALING_SMART,