diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index a0dd045b76..a12920d592 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -324,7 +324,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
          file_list_push(rgui->selection_buf, "Device Type", RGUI_SETTINGS_BIND_DEVICE_TYPE, 0);
          file_list_push(rgui->selection_buf, "Analog D-pad Mode", RGUI_SETTINGS_BIND_ANALOG_MODE, 0);
          file_list_push(rgui->selection_buf, "Input Axis Threshold", RGUI_SETTINGS_INPUT_AXIS_THRESHOLD, 0);
-         file_list_push(rgui->selection_buf, "Autodetect enable", RGUI_SETTINGS_DEVICE_AUTODETECT_ENABLE, 0);
+         file_list_push(rgui->selection_buf, "Autodetect Enable", RGUI_SETTINGS_DEVICE_AUTODETECT_ENABLE, 0);
 
          file_list_push(rgui->selection_buf, "Bind Mode", RGUI_SETTINGS_CUSTOM_BIND_MODE, 0);
          file_list_push(rgui->selection_buf, "Configure All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_ALL, 0);
@@ -339,7 +339,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
       case RGUI_SETTINGS_AUDIO_OPTIONS:
          file_list_clear(rgui->selection_buf);
          file_list_push(rgui->selection_buf, "DSP Filter", RGUI_SETTINGS_AUDIO_DSP_FILTER, 0);
-         file_list_push(rgui->selection_buf, "Mute Audio", RGUI_SETTINGS_AUDIO_MUTE, 0);
+         file_list_push(rgui->selection_buf, "Audio Mute", RGUI_SETTINGS_AUDIO_MUTE, 0);
          file_list_push(rgui->selection_buf, "Rate Control Delta", RGUI_SETTINGS_AUDIO_CONTROL_RATE_DELTA, 0);
 #ifdef __CELLOS_LV2__
          file_list_push(rgui->selection_buf, "System BGM Control", RGUI_SETTINGS_CUSTOM_BGM_CONTROL_ENABLE, 0);
diff --git a/settings_data.c b/settings_data.c
index c25f415c38..00a8aefe7d 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -624,9 +624,9 @@ const rarch_setting_t* setting_data_get_list(void)
          /*********/
          START_GROUP("Audio")
          START_SUB_GROUP("State")
-         CONFIG_BOOL(g_settings.audio.enable,               "audio_enable",               "Enable",                     audio_enable)
+         CONFIG_BOOL(g_settings.audio.enable,               "audio_enable",               "Audio Enable",                     audio_enable)
+         CONFIG_BOOL(g_extern.audio_data.mute,              "audio_mute",                 "Audio Mute",                 DEFAULT_ME_YO)
          CONFIG_FLOAT(g_settings.audio.volume,              "audio_volume",               "Volume Level",               audio_volume)
-         CONFIG_BOOL(g_extern.audio_data.mute,              "audio_mute",                 "Mute Audio",                 DEFAULT_ME_YO)
          END_SUB_GROUP()
 
          START_SUB_GROUP("Sync")
@@ -649,7 +649,7 @@ const rarch_setting_t* setting_data_get_list(void)
          /*********/
          START_GROUP("Input")
          START_SUB_GROUP("Input")
-         CONFIG_BOOL(g_settings.input.autodetect_enable,    "input_autodetect_enable",    "Use joypad autodetection",   input_autodetect_enable)
+         CONFIG_BOOL(g_settings.input.autodetect_enable,    "input_autodetect_enable",    "Autodetect Enable",   input_autodetect_enable)
          CONFIG_PATH(g_settings.input.autoconfig_dir,       "joypad_autoconfig_dir",      "Joypad Autoconfig Directory",DEFAULT_ME_YO)          WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)
          END_SUB_GROUP()
 
@@ -703,16 +703,16 @@ const rarch_setting_t* setting_data_get_list(void)
 
          for (player = 0; player < MAX_PLAYERS; player ++)
          {
+            char buffer[32];
             const struct retro_keybind* const defaults = (player == 0) ? retro_keybinds_1 : retro_keybinds_rest;
 
-            char buffer[32];
             snprintf(buffer, 32, "Player %d", player + 1);
             START_SUB_GROUP(strdup(buffer))
                for (i = 0; i != RARCH_BIND_LIST_END; i ++)
                {
                   if (!input_config_bind_map[i].meta)
                   {
-                     const struct input_bind_map* bind = &input_config_bind_map[i];
+                     const struct input_bind_map* bind = (const struct input_bind_map*)&input_config_bind_map[i];
                      CONFIG_BIND(g_settings.input.binds[player][i], player + 1, bind->base, bind->desc, &defaults[i])
                   }
                }
@@ -725,7 +725,7 @@ const rarch_setting_t* setting_data_get_list(void)
          /********/
          START_GROUP("Misc")
          START_SUB_GROUP("Misc")
-         CONFIG_BOOL(g_extern.config_save_on_exit,          "config_save_on_exit",        "Save Config On Exit",        config_save_on_exit)
+         CONFIG_BOOL(g_extern.config_save_on_exit,          "config_save_on_exit",        "Configuration Save On Exit", config_save_on_exit)
          CONFIG_BOOL(g_settings.network_cmd_enable,         "network_cmd_enable",         "Network Commands",           network_cmd_enable)
          //CONFIG_INT(g_settings.network_cmd_port,            "network_cmd_port",           "Network Command Port",       network_cmd_port)
          CONFIG_BOOL(g_settings.stdin_cmd_enable,           "stdin_cmd_enable",           "stdin command",              stdin_cmd_enable)