diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index e2109e2e38..815de4261f 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -193,6 +193,26 @@ static const char *menu_hash_to_str_english(uint32_t hash)
 {
    switch (hash)
    {
+      case MENU_LABEL_SAVESTATE_AUTO_SAVE:
+         return "savestate_auto_save";
+      case MENU_LABEL_VALUE_SAVESTATE_AUTO_SAVE:
+         return "Auto Save State";
+      case MENU_LABEL_AUTOSAVE_INTERVAL:
+         return "autosave_interval";
+      case MENU_LABEL_VALUE_AUTOSAVE_INTERVAL:
+         return "SaveRAM Autosave Interval";
+      case MENU_LABEL_BLOCK_SRAM_OVERWRITE:
+         return "block_sram_overwrite";
+      case MENU_LABEL_VALUE_BLOCK_SRAM_OVERWRITE:
+         return "Don't overwrite SaveRAM on loading savestate";
+      case MENU_LABEL_VIDEO_SHARED_CONTEXT:
+         return "video_shared_context";
+      case MENU_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
+         return "HW Shared Context Enable";
+      case MENU_LABEL_RESTART_RETROARCH:
+         return "restart_retroarch";
+      case MENU_LABEL_VALUE_RESTART_RETROARCH:
+         return "Restart RetroArch";
       case MENU_LABEL_NETPLAY_NICKNAME:
          return "netplay_nickname";
       case MENU_LABEL_VALUE_NETPLAY_NICKNAME:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 820f748c12..2c554989b0 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -69,6 +69,7 @@ extern "C" {
 #define MENU_LABEL_VIDEO_GPU_SCREENSHOT                                        0xee2fcb44U
 #define MENU_LABEL_PAUSE_NONACTIVE                                             0x580bf549U
 #define MENU_LABEL_BLOCK_SRAM_OVERWRITE                                        0xc4e88d08U
+#define MENU_LABEL_VALUE_BLOCK_SRAM_OVERWRITE                                  0x9b38260aU
 #define MENU_LABEL_VIDEO_FULLSCREEN                                            0x9506dd4eU
 #define MENU_LABEL_CORE_SPECIFIC_CONFIG                                        0x3c9a55e8U
 #define MENU_LABEL_RGUI_SHOW_START_SCREEN                                      0x6b38f0e8U
@@ -85,6 +86,7 @@ extern "C" {
 #define MENU_LABEL_VIDEO_VSYNC                                                 0x09c2d34eU
 #define MENU_LABEL_VIDEO_HARD_SYNC                                             0xdcd623b6U
 #define MENU_LABEL_SAVESTATE_AUTO_SAVE                                         0xf6f4a05bU
+#define MENU_LABEL_VALUE_SAVESTATE_AUTO_SAVE                                   0x07391f6eU
 #define MENU_LABEL_SYSTEM_DIRECTORY                                            0x35a6fb9eU
 #define MENU_LABEL_VIDEO_DISABLE_COMPOSITION                                   0x5cbb6222U
 #define MENU_LABEL_VOLUME_UP                                                   0xa66e9681U
@@ -164,6 +166,7 @@ extern "C" {
 #define MENU_LABEL_INPUT_BIND_DEVICE_TYPE                                      0xf6e9f041U
 
 #define MENU_LABEL_AUTOSAVE_INTERVAL                                           0xecc87351U
+#define MENU_LABEL_VALUE_AUTOSAVE_INTERVAL                                     0x256f3981U
 #define MENU_LABEL_CONFIG_SAVE_ON_EXIT                                         0x79b590feU
 
 #define MENU_LABEL_INPUT_DRIVER                                                0x4c087840U
@@ -282,6 +285,8 @@ extern "C" {
 #define MENU_LABEL_VALUE_CORE_UPDATER_LIST                                     0x0372767dU
 #define MENU_LABEL_CORE_UPDATER_LIST                                           0xe12f4ee3U
 #define MENU_LABEL_RECORD_CONFIG                                               0x11c3daf9U
+#define MENU_LABEL_VIDEO_SHARED_CONTEXT                                        0x7d7dad16U
+#define MENU_LABEL_VALUE_VIDEO_SHARED_CONTEXT                                  0x353d3287U
 #define MENU_LABEL_UNLOAD_CORE                                                 0x4b622170U
 #define MENU_LABEL_VALUE_UNLOAD_CORE                                           0x9b45e571U
 #define MENU_LABEL_QUIT_RETROARCH                                              0x84b0bc71U
@@ -467,6 +472,8 @@ extern "C" {
 #define MENU_LABEL_VALUE_RESUME_CONTENT                                        0xae6e5911U
 #define MENU_LABEL_VALUE_RESUME                                                0xce8ac2f6U
 #define MENU_LABEL_RESTART_CONTENT                                             0x1ea2e224U
+#define MENU_LABEL_RESTART_RETROARCH                                           0xb57d3d73U
+#define MENU_LABEL_VALUE_RESTART_RETROARCH                                     0xcc0799f4U
 #define MENU_LABEL_VALUE_RESTART_CONTENT                                       0xf23a2e85U
 #define MENU_LABEL_TAKE_SCREENSHOT                                             0x6786e867U
 #define MENU_LABEL_VALUE_TAKE_SCREENSHOT                                       0xab767128U
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 7f7f6ff170..316b2b5de2 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -3702,8 +3702,8 @@ static bool setting_append_list_main_menu_options(
    }
 #ifndef HAVE_DYNAMIC
    CONFIG_ACTION(
-         "restart_retroarch",
-         "Restart RetroArch",
+         menu_hash_to_str(MENU_LABEL_RESTART_RETROARCH),
+         menu_hash_to_str(MENU_LABEL_VALUE_RESTART_RETROARCH),
          group_info.name,
          subgroup_info.name,
          parent_group);
@@ -3907,8 +3907,8 @@ static bool setting_append_list_core_options(
 
    CONFIG_BOOL(
          settings->video.shared_context,
-         "video_shared_context",
-         "HW Shared Context Enable",
+         menu_hash_to_str(MENU_LABEL_VIDEO_SHARED_CONTEXT),
+         menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHARED_CONTEXT),
          false,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),
@@ -4070,8 +4070,8 @@ static bool setting_append_list_saving_options(
 
    CONFIG_BOOL(
          settings->block_sram_overwrite,
-         "block_sram_overwrite",
-         "SRAM Block overwrite",
+         menu_hash_to_str(MENU_LABEL_BLOCK_SRAM_OVERWRITE),
+         menu_hash_to_str(MENU_LABEL_VALUE_BLOCK_SRAM_OVERWRITE),
          block_sram_overwrite,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),
@@ -4085,8 +4085,8 @@ static bool setting_append_list_saving_options(
 #ifdef HAVE_THREADS
    CONFIG_UINT(
          settings->autosave_interval,
-         "autosave_interval",
-         "SRAM Autosave Interval",
+         menu_hash_to_str(MENU_LABEL_AUTOSAVE_INTERVAL),
+         menu_hash_to_str(MENU_LABEL_VALUE_AUTOSAVE_INTERVAL),
          autosave_interval,
          group_info.name,
          subgroup_info.name,
@@ -4115,8 +4115,8 @@ static bool setting_append_list_saving_options(
 
    CONFIG_BOOL(
          settings->savestate_auto_save,
-         "savestate_auto_save",
-         "Auto Save State",
+         menu_hash_to_str(MENU_LABEL_SAVESTATE_AUTO_SAVE),
+         menu_hash_to_str(MENU_LABEL_VALUE_SAVESTATE_AUTO_SAVE),
          savestate_auto_save,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),