diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index ea46a1998c..1ff8f6d1c8 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -20,8 +20,11 @@
 extern "C" {
 #endif
 
-#define MENU_LABEL_LOG_VERBOSITY                                               0x6648c96dU
+#define MENU_LABEL_VOLUME_UP                                                   0xa66e9681U
+#define MENU_LABEL_VOLUME_DOWN                                                 0xfc64f3d4U
 
+#define MENU_LABEL_LOG_VERBOSITY                                               0x6648c96dU
+#define MENU_LABEL_OVERLAY_NEXT                                                0x7a459145U
 #define MENU_LABEL_AUDIO_VOLUME                                                0x502173aeU
 #define MENU_LABEL_AUDIO_LATENCY                                               0x32695386U
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 1c7d6bfac7..c379620192 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2548,6 +2548,60 @@ static int setting_get_description_compare_label(uint32_t label_hash,
                "If Force Aspect is not set, X/Y will be \n"
                "integer scaled independently.");
          break;
+      case MENU_LABEL_AUDIO_VOLUME:
+         snprintf(s, len,
+               " -- Audio volume, expressed in dB.\n"
+               " \n"
+               " 0 dB is normal volume. No gain will be applied.\n"
+               "Gain can be controlled in runtime with Input\n"
+               "Volume Up / Input Volume Down.");
+         break;
+      case MENU_LABEL_AUDIO_RATE_CONTROL_DELTA:
+         snprintf(s, len,
+               " -- Audio rate control.\n"
+               " \n"
+               "Setting this to 0 disables rate control.\n"
+               "Any other value controls audio rate control \n"
+               "delta.\n"
+               " \n"
+               "Defines how much input rate can be adjusted \n"
+               "dynamically.\n"
+               " \n"
+               " Input rate is defined as: \n"
+               " input rate * (1.0 +/- (rate control delta))");
+         break;
+      case MENU_LABEL_AUDIO_MAX_TIMING_SKEW:
+         snprintf(s, len,
+               " -- Maximum audio timing skew.\n"
+               " \n"
+               "Defines the maximum change in input rate.\n"
+               "You may want to increase this to enable\n"
+               "very large changes in timing, for example\n"
+               "running PAL cores on NTSC displays, at the\n"
+               "cost of inaccurate audio pitch.\n"
+               " \n"
+               " Input rate is defined as: \n"
+               " input rate * (1.0 +/- (max timing skew))");
+         break;
+      case MENU_LABEL_OVERLAY_NEXT:
+         snprintf(s, len,
+               " -- Toggles to next overlay.\n"
+               " \n"
+               "Wraps around.");
+         break;
+      case MENU_LABEL_LOG_VERBOSITY:
+         snprintf(s, len,
+               "-- Enable or disable verbosity level \n"
+               "of frontend.");
+         break;
+      case MENU_LABEL_VOLUME_UP:
+         snprintf(s, len,
+               " -- Increases audio volume.");
+         break;
+      case MENU_LABEL_VOLUME_DOWN:
+         snprintf(s, len,
+               " -- Decreases audio volume.");
+         break;
       default:
          return -1;
    }
@@ -2582,12 +2636,6 @@ int setting_get_description(const char *label, char *s,
             "-- Forcibly disable composition.\n"
             "Only valid on Windows Vista/7 for now.");
    }
-   else if (!strcmp(label, "log_verbosity"))
-   {
-      snprintf(s, len,
-            "-- Enable or disable verbosity level \n"
-            "of frontend.");
-   }
    else if (!strcmp(label, "perfcnt_enable"))
    {
       snprintf(s, len,
@@ -2658,35 +2706,6 @@ int setting_get_description(const char *label, char *s,
             " \n"
             "Maximum is 15.");
    }
-   else if (!strcmp(label, "audio_rate_control_delta"))
-   {
-      snprintf(s, len,
-            " -- Audio rate control.\n"
-            " \n"
-            "Setting this to 0 disables rate control.\n"
-            "Any other value controls audio rate control \n"
-            "delta.\n"
-            " \n"
-            "Defines how much input rate can be adjusted \n"
-            "dynamically.\n"
-            " \n"
-            " Input rate is defined as: \n"
-            " input rate * (1.0 +/- (rate control delta))");
-   }
-   else if (!strcmp(label, "audio_max_timing_skew"))
-   {
-      snprintf(s, len,
-            " -- Maximum audio timing skew.\n"
-            " \n"
-            "Defines the maximum change in input rate.\n"
-            "You may want to increase this to enable\n"
-            "very large changes in timing, for example\n"
-            "running PAL cores on NTSC displays, at the\n"
-            "cost of inaccurate audio pitch.\n"
-            " \n"
-            " Input rate is defined as: \n"
-            " input rate * (1.0 +/- (max timing skew))");
-   }
    else if (!strcmp(label, "video_fullscreen"))
    {
       snprintf(s, len, " -- Toggles fullscreen.");
@@ -2714,15 +2733,6 @@ int setting_get_description(const char *label, char *s,
             "possible cost of latency and more video \n"
             "stuttering.");
    }
-   else if (!strcmp(label, "audio_volume"))
-   {
-      snprintf(s, len,
-            " -- Audio volume, expressed in dB.\n"
-            " \n"
-            " 0 dB is normal volume. No gain will be applied.\n"
-            "Gain can be controlled in runtime with Input\n"
-            "Volume Up / Input Volume Down.");
-   }
    else if (!strcmp(label, "block_sram_overwrite"))
    {
       snprintf(s, len,
@@ -2959,17 +2969,6 @@ int setting_get_description(const char *label, char *s,
    else if (!strcmp(label, "screenshot"))
       snprintf(s, len,
             " -- Take screenshot.");
-   else if (!strcmp(label, "volume_up"))
-      snprintf(s, len,
-            " -- Increases audio volume.");
-   else if (!strcmp(label, "volume_down"))
-      snprintf(s, len,
-            " -- Decreases audio volume.");
-   else if (!strcmp(label, "overlay_next"))
-      snprintf(s, len,
-            " -- Toggles to next overlay.\n"
-            " \n"
-            "Wraps around.");
    else
       snprintf(s, len,
             "-- No info on this item is available. --\n");