diff --git a/config.def.h b/config.def.h
index ac5020585e..686457ae7a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -511,7 +511,7 @@ static bool default_block_config_read = true;
 static unsigned xmb_scale_factor = 100;
 static unsigned xmb_alpha_factor = 75;
 static unsigned xmb_theme = 0;
-static bool xmb_shadows = false;
+static bool xmb_shadows_enable = false;
 static bool xmb_ribbon_enable = false;
 
 static bool show_advanced_settings    = true;
diff --git a/configuration.c b/configuration.c
index ce51498008..b477622899 100644
--- a/configuration.c
+++ b/configuration.c
@@ -483,7 +483,7 @@ static void config_set_defaults(void)
    settings->menu.xmb_scale_factor   = xmb_scale_factor;
    settings->menu.xmb_alpha_factor   = xmb_alpha_factor;
    settings->menu.xmb_theme          = xmb_theme;
-   settings->menu.xmb_shadows        = xmb_shadows;
+   settings->menu.xmb_shadows_enable = xmb_shadows_enable;
    settings->menu.xmb_ribbon_enable  = xmb_ribbon_enable;
    settings->menu.xmb_font[0]        = '\0';
    settings->menu.throttle_framerate = true;
@@ -1542,7 +1542,7 @@ static bool config_load_file(const char *path, bool set_defaults)
    CONFIG_GET_INT_BASE(conf, settings, menu.xmb_scale_factor, "xmb_scale_factor");
    CONFIG_GET_INT_BASE(conf, settings, menu.xmb_alpha_factor, "xmb_alpha_factor");
    CONFIG_GET_INT_BASE(conf, settings, menu.xmb_theme, "xmb_theme");
-   CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows, "xmb_shadows");
+   CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows_enable, "xmb_shadows_enable");
    CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_ribbon_enable, "xmb_ribbon_enable");
    config_get_path(conf, "xmb_font", settings->menu.xmb_font, sizeof(settings->menu.xmb_font));
 #endif
@@ -2775,7 +2775,7 @@ bool config_save_file(const char *path)
    config_set_int(conf, "xmb_scale_factor", settings->menu.xmb_scale_factor);
    config_set_int(conf, "xmb_alpha_factor", settings->menu.xmb_alpha_factor);
    config_set_int(conf, "xmb_theme", settings->menu.xmb_theme);
-   config_set_bool(conf, "xmb_shadows", settings->menu.xmb_shadows);
+   config_set_bool(conf, "xmb_shadows_enable", settings->menu.xmb_shadows_enable);
    config_set_bool(conf, "xmb_ribbon_enable", settings->menu.xmb_ribbon_enable);
    config_set_path(conf, "xmb_font",
          !string_is_empty(settings->menu.xmb_font) ? settings->menu.xmb_font : "");
diff --git a/configuration.h b/configuration.h
index b916d9d39f..49638c1f20 100644
--- a/configuration.h
+++ b/configuration.h
@@ -167,7 +167,7 @@ typedef struct settings
       unsigned xmb_scale_factor;
       unsigned xmb_alpha_factor;
       unsigned xmb_theme;
-      bool xmb_shadows;
+      bool xmb_shadows_enable;
       bool xmb_ribbon_enable;
       char xmb_font[PATH_MAX_LENGTH];
       bool throttle_framerate;
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 98fbcaf9a2..226741f215 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -405,7 +405,7 @@ static void xmb_draw_icon(
    draw.texture         = texture;
    draw.prim_type       = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
 
-   if (settings->menu.xmb_shadows)
+   if (settings->menu.xmb_shadows_enable)
    {
       for (i = 0; i < 16; i++)
          shadow[i]      = 0;
@@ -496,7 +496,7 @@ static void xmb_draw_text(xmb_handle_t *xmb,
    params.full_screen = true;
    params.text_align  = text_align;
 
-   if (settings->menu.xmb_shadows)
+   if (settings->menu.xmb_shadows_enable)
    {
       params.drop_x      = 2.0f;
       params.drop_y      = -2.0f;
diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index b47ea6dfa5..8e18d13efb 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -300,8 +300,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
          return "xmb_font";
       case MENU_LABEL_XMB_THEME:
          return "xmb_theme";
-      case MENU_LABEL_XMB_SHADOWS:
-         return "xmb_shadows";
+      case MENU_LABEL_XMB_SHADOWS_ENABLE:
+         return "xmb_shadows_enable";
       case MENU_LABEL_XMB_RIBBON_ENABLE:
          return "xmb_ribbon_enable";
       case MENU_LABEL_XMB_SCALE_FACTOR:
@@ -1060,8 +1060,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
          return "XMB Font";
       case MENU_LABEL_VALUE_XMB_THEME:
          return "XMB Theme";
-      case MENU_LABEL_VALUE_XMB_SHADOWS:
-         return "XMB Shadows";
+      case MENU_LABEL_VALUE_XMB_SHADOWS_ENABLE:
+         return "XMB Shadows Enable";
       case MENU_LABEL_VALUE_XMB_RIBBON_ENABLE:
          return "XMB Ribbon Enable";
       case MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 0e019fc40e..4478e295fe 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -388,8 +388,8 @@ extern "C" {
 #define MENU_LABEL_VALUE_XMB_FONT                                              0x0020337E7
 #define MENU_LABEL_XMB_THEME                                                   0x824c5a7eU
 #define MENU_LABEL_VALUE_XMB_THEME                                             0x3603f65fU
-#define MENU_LABEL_XMB_SHADOWS                                                 0xf9859e24U
-#define MENU_LABEL_VALUE_XMB_SHADOWS                                           0x7993b645U
+#define MENU_LABEL_XMB_SHADOWS_ENABLE                                          0xd0fcc82aU
+#define MENU_LABEL_VALUE_XMB_SHADOWS_ENABLE                                    0x5982498cU
 #define MENU_LABEL_XMB_RIBBON_ENABLE                                           0x8e89c3edU
 #define MENU_LABEL_VALUE_XMB_RIBBON_ENABLE                                     0xd53e09c8U
 #define MENU_LABEL_VOLUME_UP                                                   0xa66e9681U
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 038c8dddef..11a7296e05 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -5877,10 +5877,10 @@ static bool setting_append_list(
 
             CONFIG_BOOL(
                   list, list_info,
-                  &settings->menu.xmb_shadows,
-                  menu_hash_to_str(MENU_LABEL_XMB_SHADOWS),
-                  menu_hash_to_str(MENU_LABEL_VALUE_XMB_SHADOWS),
-                  xmb_shadows,
+                  &settings->menu.xmb_shadows_enable,
+                  menu_hash_to_str(MENU_LABEL_XMB_SHADOWS_ENABLE),
+                  menu_hash_to_str(MENU_LABEL_VALUE_XMB_SHADOWS_ENABLE),
+                  xmb_shadows_enable,
                   menu_hash_to_str(MENU_VALUE_OFF),
                   menu_hash_to_str(MENU_VALUE_ON),
                   &group_info,