diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c
index 71e27d7ab2..7f3e2d4b9b 100644
--- a/menu/drivers/ozone/ozone_texture.c
+++ b/menu/drivers/ozone/ozone_texture.c
@@ -439,6 +439,8 @@ uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
 #endif
       case MENU_SETTING_ACTION:
          return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];
+      case MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_ADC];
    }
 
 #ifdef HAVE_CHEEVOS
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index d782569e71..0a3e06c7ac 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2850,6 +2850,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
       case MENU_ROOM_RELAY:
          return xmb->textures.list[XMB_TEXTURE_ROOM_RELAY];
 #endif
+      case MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE:
+         return xmb->textures.list[XMB_TEXTURE_INPUT_ADC];
    }
 
 #ifdef HAVE_CHEEVOS
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index ce798d0ca3..213cc9262e 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -8998,7 +8998,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         key_type, PARSE_ONLY_UINT, true, 0) == 0)
                   count++;
                if (MENU_DISPLAYLIST_PARSE_SETTINGS(list,
-                        key_analog, PARSE_ONLY_UINT, true, 0) == 0)
+                        key_analog, PARSE_ONLY_UINT, true, MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE) == 0)
                   count++;
             }
 
@@ -9070,8 +9070,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         const struct retro_keybind *keyptr =
                            &input_config_binds[p][retro_id];
 
-                        strlcpy(descriptor,
-                              msg_hash_to_str(keyptr->enum_idx), sizeof(descriptor));
+                        snprintf(desc_label, sizeof(desc_label),
+                              "%s %s", msg_hash_to_str(keyptr->enum_idx), descriptor);
+                        strlcpy(descriptor, desc_label, sizeof(descriptor));
                      }
 
                      /* Add user index when display driver == rgui and sublabels
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index d8f0c3df39..bac1781ed6 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -178,6 +178,8 @@ enum menu_settings_type
    MENU_SETTINGS_PERF_COUNTERS_END = MENU_SETTINGS_PERF_COUNTERS_BEGIN + (MAX_COUNTERS - 1),
    MENU_SETTINGS_CHEAT_BEGIN,
    MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
+
+   MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE,
    MENU_SETTINGS_INPUT_BEGIN,
    MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + RARCH_CUSTOM_BIND_LIST_END + 6,
    MENU_SETTINGS_INPUT_DESC_BEGIN,
@@ -188,7 +190,6 @@ enum menu_settings_type
    MENU_SETTINGS_REMAPPING_PORT_END = MENU_SETTINGS_REMAPPING_PORT_BEGIN + (MAX_USERS),
 
    MENU_SETTINGS_SUBSYSTEM_LOAD,
-
    MENU_SETTINGS_SUBSYSTEM_ADD,
    MENU_SETTINGS_SUBSYSTEM_LAST = MENU_SETTINGS_SUBSYSTEM_ADD + RARCH_MAX_SUBSYSTEMS,
    MENU_SETTINGS_CHEAT_MATCH,