diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 86d29bc176..0425035ecb 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2042,8 +2042,8 @@ static bool setting_append_list(
          CONFIG_INT(
                list, list_info,
                &settings->state_slot,
-               msg_hash_to_str(MENU_ENUM_LABEL_STATE_SLOT),
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STATE_SLOT),
+               MENU_ENUM_LABEL_STATE_SLOT,
+               MENU_ENUM_LABEL_VALUE_STATE_SLOT,
                0,
                &group_info,
                &subgroup_info,
@@ -3361,8 +3361,8 @@ static bool setting_append_list(
          CONFIG_INT(
                list, list_info,
                &settings->video_viewport_custom.x,
-               msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X),
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X),
+               MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X,
+               MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X,
                0,
                &group_info,
                &subgroup_info,
@@ -3379,8 +3379,8 @@ static bool setting_append_list(
          CONFIG_INT(
                list, list_info,
                &settings->video_viewport_custom.y,
-               msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y),
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y),
+               MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y,
+               MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
                0,
                &group_info,
                &subgroup_info,
diff --git a/setting_list.c b/setting_list.c
index ecf384add8..d0f6dabaf4 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -1501,15 +1501,19 @@ bool CONFIG_INT(
       rarch_setting_t **list,
       rarch_setting_info_t *list_info,
       int *target,
-      const char *name, const char *SHORT,
+      enum msg_hash_enums name_enum_idx,
+      enum msg_hash_enums SHORT_enum_idx,
       int default_value,
       rarch_setting_group_info_t *group_info,
       rarch_setting_group_info_t *subgroup_info,
       const char *parent_group,
       change_handler_t change_handler, change_handler_t read_handler)
 {
-   rarch_setting_t value = setting_int_setting   (name, SHORT, target, default_value,
-                  group_info->name, subgroup_info->name, parent_group, change_handler, read_handler);
+   rarch_setting_t value = setting_int_setting   (
+         msg_hash_to_str(name_enum_idx),
+         msg_hash_to_str(SHORT_enum_idx),
+         target, default_value,
+         group_info->name, subgroup_info->name, parent_group, change_handler, read_handler);
    if (!(settings_list_append(list, list_info)))
       return false;
    if (value.name)
diff --git a/setting_list.h b/setting_list.h
index 230ba67264..8dd65631f1 100644
--- a/setting_list.h
+++ b/setting_list.h
@@ -255,7 +255,8 @@ bool CONFIG_INT(
       rarch_setting_t **list,
       rarch_setting_info_t *list_info,
       int *target,
-      const char *name, const char *SHORT,
+      enum msg_hash_enums name_enum_idx,
+      enum msg_hash_enums SHORT_enum_idx,
       int default_value,
       rarch_setting_group_info_t *group_info,
       rarch_setting_group_info_t *subgroup_info,