diff --git a/cheevos.c b/cheevos.c
index 03ac998120..047c0e9d52 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -2109,9 +2109,9 @@ static void cheevos_populate_menu(void *data)
    settings_t *settings          = config_get_ptr();
    menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
    
-   menu_entries_push(info->list, "Unlocked Achievements:",
+   menu_entries_add(info->list, "Unlocked Achievements:",
          "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
-   menu_entries_push(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
+   menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
 
    cheevo = cheevos_locals.core.cheevos;
    end    = cheevos_locals.core.cheevos + cheevos_locals.core.count;
@@ -2119,7 +2119,7 @@ static void cheevos_populate_menu(void *data)
    for (i = 0; cheevo < end; i++, cheevo++)
    {
       if (!cheevo->active)
-         menu_entries_push(info->list, cheevo->title,
+         menu_entries_add(info->list, cheevo->title,
                cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
    }
    
@@ -2132,15 +2132,15 @@ static void cheevos_populate_menu(void *data)
       for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
       {
          if (!cheevo->active)
-            menu_entries_push(info->list, cheevo->title,
+            menu_entries_add(info->list, cheevo->title,
                   cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
       }
    }
    
-   menu_entries_push(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
-   menu_entries_push(info->list, "Locked Achievements:", "",
+   menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
+   menu_entries_add(info->list, "Locked Achievements:", "",
          MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
-   menu_entries_push(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
+   menu_entries_add(info->list, "", "", MENU_SETTINGS_CHEEVOS_NONE, 0, 0);
 
    cheevo = cheevos_locals.core.cheevos;
    end    = cheevos_locals.core.cheevos + cheevos_locals.core.count;
@@ -2148,7 +2148,7 @@ static void cheevos_populate_menu(void *data)
    for (i = 0; cheevo < end; i++, cheevo++)
    {
       if (cheevo->active)
-         menu_entries_push(info->list, cheevo->title,
+         menu_entries_add(info->list, cheevo->title,
                cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
    }
    
@@ -2161,7 +2161,7 @@ static void cheevos_populate_menu(void *data)
       for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
       {
          if (cheevo->active)
-            menu_entries_push(info->list, cheevo->title,
+            menu_entries_add(info->list, cheevo->title,
                   cheevo->description, MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
       }
    }
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index b75aa11b43..17b99661d6 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -247,7 +247,7 @@ static int frontend_ctr_parse_drive_list(void *data)
    if (!list)
       return -1;
 
-   menu_entries_push(list,
+   menu_entries_add(list,
          "sdmc:/", "", MENU_FILE_DIRECTORY, 0, 0);
 #endif
 
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index d93b6833a3..9407124117 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -636,9 +636,9 @@ static int frontend_darwin_parse_drive_list(void *data)
 
    CFSearchPathForDirectoriesInDomains(CFDocumentDirectory, CFUserDomainMask, 1, home_dir_buf, sizeof(home_dir_buf));
 
-   menu_entries_push(list,
+   menu_entries_add(list,
          home_dir_buf, "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list, "/", "",
+   menu_entries_add(list, "/", "",
          MENU_FILE_DIRECTORY, 0, 0);
 
    ret = 0;
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index a01679a8e2..e7269d852d 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -438,14 +438,14 @@ static int frontend_gx_parse_drive_list(void *data)
 #ifndef IS_SALAMANDER
    file_list_t *list = (file_list_t*)data;
 #ifdef HW_RVL
-   menu_entries_push(list,
+   menu_entries_add(list,
          "sd:/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "usb:/", "", MENU_FILE_DIRECTORY, 0, 0);
 #endif
-   menu_entries_push(list,
+   menu_entries_add(list,
          "carda:/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "cardb:/", "", MENU_FILE_DIRECTORY, 0, 0);
 #endif
 
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 82b5edfedb..a699d79ba5 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -2137,14 +2137,14 @@ static int frontend_android_parse_drive_list(void *data)
    file_list_t *list = (file_list_t*)data;
 
    // MENU_FILE_DIRECTORY is not working with labels, placeholders for now
-   menu_entries_push(list,
+   menu_entries_add(list,
          app_dir, "Application Dir", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          ext_dir, "External Application Dir", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          sdcard_dir, "Internal Memory", MENU_FILE_DIRECTORY, 0, 0);
 
-   menu_entries_push(list, "/", "",
+   menu_entries_add(list, "/", "",
          MENU_FILE_DIRECTORY, 0, 0);
 
    return 0;
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 73e3de1874..f7f4cf047b 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -485,27 +485,27 @@ static int frontend_ps3_parse_drive_list(void *data)
 #ifndef IS_SALAMANDER
    file_list_t *list = (file_list_t*)data;
 
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/app_home/",   "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_hdd0/",   "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_hdd1/",   "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/host_root/",  "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb000/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb001/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb002/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb003/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb004/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb005/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "/dev_usb006/", "", MENU_FILE_DIRECTORY, 0, 0);
 #endif
 
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index abecd97b3e..b998ecdcd9 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -371,14 +371,14 @@ static int frontend_psp_parse_drive_list(void *data)
    file_list_t *list = (file_list_t*)data;
 
 #ifdef VITA
-   menu_entries_push(list,
+   menu_entries_add(list,
          "cache0:/", "", MENU_FILE_DIRECTORY, 0, 0);
 #else
-   menu_entries_push(list,
+   menu_entries_add(list,
          "ms0:/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "ef0:/", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "host0:/", "", MENU_FILE_DIRECTORY, 0, 0);
 #endif
 #endif
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index f0a2067541..2b6280c7fa 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -222,7 +222,7 @@ static int frontend_win32_parse_drive_list(void *data)
    {
       drive[0] = 'A' + i;
       if (drives & (1 << i))
-         menu_entries_push(list,
+         menu_entries_add(list,
                drive, "", MENU_FILE_DIRECTORY, 0, 0);
    }
 #endif
diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp
index 6948de4449..1f619a93f0 100644
--- a/frontend/drivers/platform_xdk.cpp
+++ b/frontend/drivers/platform_xdk.cpp
@@ -1365,18 +1365,18 @@ static int frontend_xdk_parse_drive_list(void *data)
    file_list_t *list = (file_list_t*)data;
 
 #if defined(_XBOX1)
-   menu_entries_push(list,
+   menu_entries_add(list,
          "C:", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "D:", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "E:", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "F:", "", MENU_FILE_DIRECTORY, 0, 0);
-   menu_entries_push(list,
+   menu_entries_add(list,
          "G:", "", MENU_FILE_DIRECTORY, 0, 0);
 #elif defined(_XBOX360)
-   menu_entries_push(list,
+   menu_entries_add(list,
          "game:", "", MENU_FILE_DIRECTORY, 0, 0);
 #endif
 #endif
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 6012972932..1b7efa66eb 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -424,8 +424,7 @@ int generic_action_ok_displaylist_push(const char *path,
          info.list          = selection_buf;
          info_path          = menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_SETTINGS);
          info_label         = menu_hash_to_str(MENU_LABEL_CONTENT_SETTINGS);
-         menu_entries_push(menu_stack,
-               info_path, info_label, 0, 0, 0);
+         menu_entries_add(menu_stack, info_path, info_label, 0, 0, 0);
          break;
    }
 
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index a2a9a34f91..3178e480bf 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1396,7 +1396,7 @@ static int mui_list_push(void *data, void *userdata,
    {
       case DISPLAYLIST_LOAD_CONTENT_LIST:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
                menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
                MENU_SETTING_ACTION, 0, 0);
@@ -1404,12 +1404,12 @@ static int mui_list_push(void *data, void *userdata,
          core_info_ctl(CORE_INFO_CTL_LIST_GET, &list);
          if (core_info_list_num_info_files(list))
          {
-            menu_entries_push(info->list,
+            menu_entries_add(info->list,
                   menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
                   menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
                   MENU_SETTING_ACTION, 0, 0);
 
-            menu_entries_push(info->list,
+            menu_entries_add(info->list,
                   menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
                   menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
                   MENU_SETTING_ACTION, 0, 0);
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 801c358beb..75ca198ff9 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -400,7 +400,7 @@ bool generic_menu_init_list(void *data)
    strlcpy(info.label,
          menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label));
 
-   menu_entries_push(menu_stack, info.path,
+   menu_entries_add(menu_stack, info.path,
          info.label, info.type, info.flags, 0);
 
    info.list  = selection_buf;
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index f903a846b5..87e7bf6f8f 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2971,7 +2971,7 @@ static bool xmb_menu_init_list(void *data)
    strlcpy(info.label,
          menu_hash_to_str(MENU_VALUE_MAIN_MENU), sizeof(info.label));
 
-   menu_entries_push(menu_stack, info.path,
+   menu_entries_add(menu_stack, info.path,
          info.label, info.type, info.flags, 0);
 
    info.list  = selection_buf;
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index c05dfc069b..53bd48bf32 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -1299,7 +1299,7 @@ static bool zarch_menu_init_list(void *data)
    strlcpy(info.label,
          menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label));
 
-   menu_entries_push(menu_stack,
+   menu_entries_add(menu_stack,
          info.path, info.label, info.type, info.flags, 0);
 
    event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL);
diff --git a/menu/drivers/zr.c b/menu/drivers/zr.c
index 9468d38e35..d64bec8df7 100644
--- a/menu/drivers/zr.c
+++ b/menu/drivers/zr.c
@@ -424,7 +424,7 @@ static bool zrmenu_init_list(void *data)
    strlcpy(info.label,
          menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label));
 
-   menu_entries_push(menu_stack,
+   menu_entries_add(menu_stack,
          info.path, info.label, info.type, info.flags, 0);
 
    event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 6cbaf82a71..8c8db4df97 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -70,7 +70,7 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
 
    if (!buf || !buf_size)
    {
-      menu_entries_push(list, "No entries to display.", "",
+      menu_entries_add(list, "No entries to display.", "",
             MENU_FILE_NONE, 0, 0);
       return;
    }
@@ -98,7 +98,7 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
       if (line_start[ln] == '\n')
          line_start[ln] = '\0';
 
-      menu_entries_push(list, line_start, "",
+      menu_entries_add(list, line_start, "",
             type, 0, 0);
       if (type == MENU_FILE_DOWNLOAD_CORE)
       {
@@ -148,7 +148,7 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size,
 
    if (!buf || !buf_size)
    {
-      menu_entries_push(list, "No entries to display.", "",
+      menu_entries_add(list, "No entries to display.", "",
             MENU_FILE_NONE, 0, 0);
       return;
    }
@@ -197,7 +197,7 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size,
       RARCH_LOG("elem core pathname: %s\n", core_pathname);
 #endif
 
-      menu_entries_push(list, core_pathname, "",
+      menu_entries_add(list, core_pathname, "",
             type, 0, 0);
       if (type == MENU_FILE_DOWNLOAD_CORE)
       {
@@ -249,7 +249,7 @@ static void menu_displaylist_push_perfcounter(
    unsigned i;
    if (!counters || num == 0)
    {
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_NO_PERFORMANCE_COUNTERS),
             "", 0, 0, 0);
       return;
@@ -257,7 +257,7 @@ static void menu_displaylist_push_perfcounter(
 
    for (i = 0; i < num; i++)
       if (counters[i] && counters[i]->ident)
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                counters[i]->ident, "", id + i, 0, 0);
 }
 
@@ -272,7 +272,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (!core_info || !core_info->config_data)
    {
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(
                MENU_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE),
             "", 0, 0, 0);
@@ -286,7 +286,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    if (core_info->core_name)
       strlcat(tmp, core_info->core_name, sizeof(tmp));
 
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    strlcpy(tmp,
@@ -294,7 +294,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    strlcat(tmp, ": ", sizeof(tmp));
    if (core_info->display_name)
       strlcat(tmp, core_info->display_name, sizeof(tmp));
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    if (core_info->systemname)
@@ -305,7 +305,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       strlcat(tmp, core_info->systemname, sizeof(tmp));
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -316,7 +316,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       strlcat(tmp, core_info->system_manufacturer, sizeof(tmp));
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -327,7 +327,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
             core_info->categories_list, ", ");
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -338,7 +338,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
             core_info->authors_list, ", ");
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -349,7 +349,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
             core_info->permissions_list, ", ");
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -360,7 +360,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
             core_info->licenses_list, ", ");
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -372,7 +372,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
             core_info->supported_extensions_list, ", ");
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -388,7 +388,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
          strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_FIRMWARE),
                sizeof(tmp));
          strlcat(tmp, ": ", sizeof(tmp));
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
          /* FIXME: This looks hacky and probably
@@ -402,7 +402,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
                      menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_NAME),
                      core_info->firmware[i].desc ?
                      core_info->firmware[i].desc : "");
-               menu_entries_push(info->list, tmp, "",
+               menu_entries_add(info->list, tmp, "",
                      MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
                snprintf(tmp, sizeof(tmp), "	%s: %s, %s",
@@ -414,7 +414,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
                      menu_hash_to_str(MENU_VALUE_OPTIONAL) :
                      menu_hash_to_str(MENU_VALUE_REQUIRED)
                      );
-               menu_entries_push(info->list, tmp, "",
+               menu_entries_add(info->list, tmp, "",
                      MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
             }
          }
@@ -427,14 +427,14 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
             menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_CORE_NOTES),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
       for (i = 0; i < core_info->note_list->size; i++)
       {
          strlcpy(tmp,
                core_info->note_list->elems[i].data, sizeof(tmp));
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
    }
@@ -451,14 +451,14 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
 
    bool ret;
 
-   menu_entries_push(info->list, "Directory Tests:", "",
+   menu_entries_add(info->list, "Directory Tests:", "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Assume libretro directory exists and check if stat works */
    ret = path_is_directory(settings->libretro_directory);
    snprintf(tmp, sizeof(tmp), "- stat directory... %s",
          ret ? "passed" : "failed");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Try to create a "test" subdirectory on top of libretro directory */
@@ -467,23 +467,23 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
    ret = path_mkdir(tmp);
    snprintf(tmp, sizeof(tmp), "- create a directory... %s",
          ret ? "passed" : "failed");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
-   menu_entries_push(info->list, "", "",
+   menu_entries_add(info->list, "", "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Check if save directory exists */
-   menu_entries_push(info->list, "Savefile Directory", "",
+   menu_entries_add(info->list, "Savefile Directory", "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    ret = path_is_directory(global->dir.savefile);
    snprintf(tmp, sizeof(tmp), "- directory name: %s",
          global->dir.savefile);
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    snprintf(tmp, sizeof(tmp), "- directory exists: %s",
          ret ? "true" : "false");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Check if save directory is writable */
@@ -492,22 +492,22 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
    ret = path_mkdir(tmp);
    snprintf(tmp, sizeof(tmp), "- directory writable: %s",
          ret ? "true" : "false");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
-   menu_entries_push(info->list, "", "",
+   menu_entries_add(info->list, "", "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Check if state directory exists */
-   menu_entries_push(info->list, "Savestate Directory", "",
+   menu_entries_add(info->list, "Savestate Directory", "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    ret = path_is_directory(global->dir.savestate);
    snprintf(tmp, sizeof(tmp), "- directory name: %s", global->dir.savestate);
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    snprintf(tmp, sizeof(tmp), "- directory exists: %s",
          ret ? "true" : "false");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Check if save directory is writable */
@@ -515,23 +515,23 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
    ret = path_mkdir(tmp);
    snprintf(tmp, sizeof(tmp), "- directory writable: %s",
          ret ? "true" : "false");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
-   menu_entries_push(info->list, "", "",
+   menu_entries_add(info->list, "", "",
       MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Check if system directory exists */
-   menu_entries_push(info->list, "System Directory", "",
+   menu_entries_add(info->list, "System Directory", "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    ret = path_is_directory(settings->system_directory);
    snprintf(tmp, sizeof(tmp), "- directory name: %s",
          settings->system_directory);
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    snprintf(tmp, sizeof(tmp), "- directory exists: %s",
          ret ? "true" : "false");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    /* Check if save directory is writable */
@@ -540,7 +540,7 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
    ret = path_mkdir(tmp);
    snprintf(tmp, sizeof(tmp), "- directory writable: %s",
          ret ? "true" : "false");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    return 0;
@@ -567,7 +567,7 @@ static int menu_displaylist_parse_network_info(menu_displaylist_info_t *info)
       char tmp[PATH_MAX_LENGTH];
       snprintf(tmp, sizeof(tmp), "Interface (%s) : %s\n",
             list->entries[k].name, list->entries[k].host);
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -590,7 +590,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
 
    snprintf(tmp, sizeof(tmp), "%s: %s",
          menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE), __DATE__);
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    (void)tmp_string;
@@ -600,19 +600,19 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          sizeof(tmp));
    strlcat(tmp, ": ", sizeof(tmp));
    strlcat(tmp, rarch_git_version, sizeof(tmp));
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 #endif
 
    rarch_info_get_capabilities(RARCH_CAPABILITIES_COMPILER, tmp, sizeof(tmp));
-   menu_entries_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+   menu_entries_add(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
 #ifdef ANDROID
    bool perms = test_permissions(sdcard_dir);
 
    snprintf(tmp, sizeof(tmp), "%s: %s", "Internal SD card status",
          perms ? "read-write" : "read-only");
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
 #endif
@@ -626,7 +626,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
 
       rarch_info_get_capabilities(RARCH_CAPABILITIES_CPU,
             cpu_str, sizeof(cpu_str));
-      menu_entries_push(info->list, cpu_str, "",
+      menu_entries_add(info->list, cpu_str, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    }
 
@@ -637,12 +637,12 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
            snprintf(tmp, sizeof(tmp), "Port #%d device name: %s (#%d)",
                  controller, settings->input.device_names[controller],
                  settings->input.device_name_index[controller]);
-           menu_entries_push(info->list, tmp, "",
+           menu_entries_add(info->list, tmp, "",
                  MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
            snprintf(tmp, sizeof(tmp), "Port #%d device VID/PID: %d/%d",
                  controller, settings->input.vid[controller],
                  settings->input.pid[controller]);
-           menu_entries_push(info->list, tmp, "",
+           menu_entries_add(info->list, tmp, "",
                  MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
        }
    }
@@ -657,7 +657,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       strlcat(tmp, frontend->ident, sizeof(tmp));
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
       if (frontend->get_name)
@@ -669,7 +669,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          strlcat(tmp, ": ", sizeof(tmp));
          strlcat(tmp, frontend->get_name ?
                tmp2 : menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE), sizeof(tmp));
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
 
@@ -681,14 +681,14 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
                frontend->get_os
                ? tmp2 : menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE),
                major, minor);
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
 
       snprintf(tmp, sizeof(tmp), "%s : %d",
             menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL),
             frontend->get_rating ? frontend->get_rating() : -1);
-      menu_entries_push(info->list, tmp, "",
+      menu_entries_add(info->list, tmp, "",
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
       if (frontend->get_powerstate)
@@ -750,7 +750,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
                sizeof(tmp));
          strlcat(tmp, ": ", sizeof(tmp));
          strlcat(tmp, tmp2, sizeof(tmp));
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
    }
@@ -767,7 +767,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
    strlcat(tmp, tmp_string ? tmp_string 
          : menu_hash_to_str(MENU_VALUE_NOT_AVAILABLE),
          sizeof(tmp));
-   menu_entries_push(info->list, tmp, "",
+   menu_entries_add(info->list, tmp, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    {
@@ -783,7 +783,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
                menu_hash_to_str(
                   MENU_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH),
                val);
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
 
@@ -795,7 +795,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
                menu_hash_to_str(
                   MENU_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT),
                val);
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
 
@@ -807,7 +807,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
                menu_hash_to_str(
                   MENU_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI),
                val);
-         menu_entries_push(info->list, tmp, "",
+         menu_entries_add(info->list, tmp, "",
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
       }
    }
@@ -823,7 +823,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO),
          sizeof(feat_str));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    strlcpy(feat_str,
@@ -835,7 +835,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO),
          sizeof(feat_str));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    strlcpy(feat_str,
@@ -847,7 +847,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          ? menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO),
          sizeof(feat_str));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -857,7 +857,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _network_command_supp 
          ? menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -867,7 +867,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _network_gamepad_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -876,7 +876,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
           _cocoa_supp ? 
           menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
           menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -886,7 +886,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _rpng_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -896,7 +896,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _sdl_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -906,7 +906,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _sdl2_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -915,7 +915,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _vulkan_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -924,7 +924,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _opengl_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -933,7 +933,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _opengles_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -942,7 +942,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _thread_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -951,7 +951,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _kms_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -960,7 +960,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _udev_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -969,7 +969,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _vg_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -978,7 +978,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _egl_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -987,7 +987,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _x11_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -996,7 +996,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _wayland_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1005,7 +1005,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _xvideo_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1014,7 +1014,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _alsa_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1023,7 +1023,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _oss_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1032,7 +1032,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _al_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1041,7 +1041,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _sl_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1050,7 +1050,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _rsound_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1059,7 +1059,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _roar_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1068,7 +1068,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _jack_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1077,7 +1077,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _pulse_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1086,7 +1086,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _dsound_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1095,7 +1095,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _xaudio_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1104,7 +1104,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _zlib_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1113,7 +1113,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _7zip_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1122,7 +1122,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _dylib_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1131,7 +1131,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _dynamic_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1140,7 +1140,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _cg_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1149,7 +1149,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _glsl_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1158,7 +1158,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _hlsl_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1167,7 +1167,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _libxml2_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1176,7 +1176,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _sdl_image_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1185,7 +1185,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _fbo_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1194,7 +1194,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _ffmpeg_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1203,7 +1203,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _coretext_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1212,7 +1212,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _freetype_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) : 
          menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1221,7 +1221,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _netplay_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1230,7 +1230,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _python_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1239,7 +1239,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _v4l2_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    snprintf(feat_str, sizeof(feat_str),
@@ -1249,7 +1249,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          _libusb_supp ? 
          menu_hash_to_str(MENU_LABEL_VALUE_YES) 
          : menu_hash_to_str(MENU_LABEL_VALUE_NO));
-   menu_entries_push(info->list, feat_str, "",
+   menu_entries_add(info->list, feat_str, "",
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    return 0;
@@ -1268,7 +1268,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
 
    if (list_size == 0)
    {
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE),
             menu_hash_to_str(MENU_LABEL_NO_PLAYLIST_ENTRIES_AVAILABLE),
             MENU_INFO_MESSAGE, 0, 0);
@@ -1321,13 +1321,13 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
       }
 
       if (!path)
-         menu_entries_push(info->list, fill_buf, path_playlist,
+         menu_entries_add(info->list, fill_buf, path_playlist,
                MENU_FILE_PLAYLIST_ENTRY, 0, i);
       else if (is_history)
-         menu_entries_push(info->list, fill_buf,
+         menu_entries_add(info->list, fill_buf,
                path, MENU_FILE_RPL_ENTRY, 0, i);
       else
-         menu_entries_push(info->list, label,
+         menu_entries_add(info->list, label,
                path, MENU_FILE_RPL_ENTRY, 0, i);
    }
 
@@ -1345,27 +1345,27 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
    if (!shader)
       return -1;
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_SHADER_APPLY_CHANGES),
          menu_hash_to_str(MENU_LABEL_SHADER_APPLY_CHANGES),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PRESET),
          menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET),
          MENU_FILE_PATH, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS),
          menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PARAMETERS),
          menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PARAMETERS),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS),
          menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES),
          menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_NUM_PASSES),
          0, 0, 0);
@@ -1377,17 +1377,17 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
       snprintf(buf_tmp, sizeof(buf_tmp),
             "%s #%u", menu_hash_to_str(MENU_VALUE_SHADER), i);
 
-      menu_entries_push(info->list, buf_tmp,
+      menu_entries_add(info->list, buf_tmp,
             menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_PASS),
             MENU_SETTINGS_SHADER_PASS_0 + i, 0, 0);
 
       snprintf(buf, sizeof(buf), "%s Filter", buf_tmp);
-      menu_entries_push(info->list, buf,
+      menu_entries_add(info->list, buf,
             menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_FILTER_PASS),
             MENU_SETTINGS_SHADER_PASS_FILTER_0 + i, 0, 0);
 
       snprintf(buf, sizeof(buf), "%s Scale", buf_tmp);
-      menu_entries_push(info->list, buf,
+      menu_entries_add(info->list, buf,
             menu_hash_to_str(MENU_LABEL_VIDEO_SHADER_SCALE_PASS),
             MENU_SETTINGS_SHADER_PASS_SCALE_0 + i, 0, 0);
    }
@@ -1432,7 +1432,7 @@ static int create_string_list_rdb_entry_string(
    strlcpy(tmp, desc, sizeof(tmp));
    strlcat(tmp, ": ", sizeof(tmp));
    strlcat(tmp, actual_string, sizeof(tmp));
-   menu_entries_push(list, tmp, output_label, 0, 0, 0);
+   menu_entries_add(list, tmp, output_label, 0, 0, 0);
 
    if (output_label)
       free(output_label);
@@ -1477,7 +1477,7 @@ static int create_string_list_rdb_entry_int(
    string_list_join_concat(output_label, str_len, str_list, "|");
 
    snprintf(tmp, sizeof(tmp), "%s : %d", desc, actual_int);
-   menu_entries_push(list, tmp, output_label,
+   menu_entries_add(list, tmp, output_label,
          0, 0, 0);
 
    if (output_label)
@@ -1599,7 +1599,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
                sizeof(tmp));
          strlcat(tmp, ": ", sizeof(tmp));
          strlcat(tmp, db_info_entry->name, sizeof(tmp));
-         menu_entries_push(info->list, tmp,
+         menu_entries_add(info->list, tmp,
                menu_hash_to_str(MENU_LABEL_RDB_ENTRY_NAME),
                0, 0, 0);
       }
@@ -1610,7 +1610,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
                sizeof(tmp));
          strlcat(tmp, ": ", sizeof(tmp));
          strlcat(tmp, db_info_entry->description, sizeof(tmp));
-         menu_entries_push(info->list, tmp,
+         menu_entries_add(info->list, tmp,
                menu_hash_to_str(MENU_LABEL_RDB_ENTRY_DESCRIPTION),
                0, 0, 0);
       }
@@ -1621,7 +1621,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
                sizeof(tmp));
          strlcat(tmp, ": ", sizeof(tmp));
          strlcat(tmp, db_info_entry->genre, sizeof(tmp));
-         menu_entries_push(info->list, tmp,
+         menu_entries_add(info->list, tmp,
                menu_hash_to_str(MENU_LABEL_RDB_ENTRY_GENRE),
                0, 0, 0);
       }
@@ -1844,7 +1844,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
    }
 
    if (db_info->count < 1)
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE),
             menu_hash_to_str(MENU_LABEL_NO_PLAYLIST_ENTRIES_AVAILABLE),
             0, 0, 0);
@@ -1876,7 +1876,7 @@ static int menu_database_parse_query(file_list_t *list, const char *path,
    for (i = 0; i < db_list->count; i++)
    {
       if (!string_is_empty(db_list->list[i].name))
-         menu_entries_push(list, db_list->list[i].name,
+         menu_entries_add(list, db_list->list[i].name,
                path, MENU_FILE_RDB_ENTRY, 0, 0);
    }
 
@@ -1896,14 +1896,14 @@ static int deferred_push_video_shader_parameters_common(
 
    if (list_size == 0)
    {
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_NO_SHADER_PARAMETERS),
             "", 0, 0, 0);
       return 0;
    }
 
    for (i = 0; i < list_size; i++)
-      menu_entries_push(info->list, shader->parameters[i].desc,
+      menu_entries_add(info->list, shader->parameters[i].desc,
             info->label, base_parameter + i, 0, 0);
 
    return 0;
@@ -2015,7 +2015,7 @@ static int menu_displaylist_parse_settings(void *data,
          goto loop;
 
 
-      menu_entries_push(info->list, short_description,
+      menu_entries_add(info->list, short_description,
             name, menu_setting_set_flags(setting), 0, 0);
       count++;
 
@@ -2045,7 +2045,7 @@ loop:
    }
 
    if (count == 0 && add_empty_entry)
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_NO_SETTINGS_FOUND),
             menu_hash_to_str(MENU_LABEL_NO_SETTINGS_FOUND),
             0, 0, 0);
@@ -2141,22 +2141,22 @@ static int menu_displaylist_parse_load_content_settings(
 
       runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_RESUME_CONTENT),
             menu_hash_to_str(MENU_LABEL_RESUME_CONTENT),
             MENU_SETTING_ACTION_RUN, 0, 0);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_RESTART_CONTENT),
             menu_hash_to_str(MENU_LABEL_RESTART_CONTENT),
             MENU_SETTING_ACTION_RUN, 0, 0);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_CLOSE_CONTENT),
             menu_hash_to_str(MENU_LABEL_CLOSE_CONTENT),
             MENU_SETTING_ACTION_CLOSE, 0, 0);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT),
             menu_hash_to_str(MENU_LABEL_TAKE_SCREENSHOT),
             MENU_SETTING_ACTION_SCREENSHOT, 0, 0);
@@ -2164,54 +2164,54 @@ static int menu_displaylist_parse_load_content_settings(
       menu_displaylist_parse_settings(menu, info,
             menu_hash_to_str(MENU_LABEL_STATE_SLOT), PARSE_ONLY_INT, true);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_SAVE_STATE),
             menu_hash_to_str(MENU_LABEL_SAVE_STATE),
             MENU_SETTING_ACTION_SAVESTATE, 0, 0);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_LOAD_STATE),
             menu_hash_to_str(MENU_LABEL_LOAD_STATE),
             MENU_SETTING_ACTION_LOADSTATE, 0, 0);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_CORE_OPTIONS),
             menu_hash_to_str(MENU_LABEL_CORE_OPTIONS),
             MENU_SETTING_ACTION, 0, 0);
 
       if (core_ctl(CORE_CTL_HAS_SET_INPUT_DESCRIPTORS, NULL))
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS),
                menu_hash_to_str(MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS),
                MENU_SETTING_ACTION, 0, 0);
 
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_CORE_CHEAT_OPTIONS),
             menu_hash_to_str(MENU_LABEL_CORE_CHEAT_OPTIONS),
             MENU_SETTING_ACTION, 0, 0);
       if (     (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
             && system && system->disk_control_cb.get_num_images)
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_DISK_OPTIONS),
                menu_hash_to_str(MENU_LABEL_DISK_OPTIONS),
                MENU_SETTING_ACTION_CORE_DISK_OPTIONS, 0, 0);
 #ifdef HAVE_SHADER_MANAGER
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS),
             menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS),
             MENU_SETTING_ACTION, 0, 0);
 #endif
 #ifdef HAVE_CHEEVOS
       if(settings->cheevos.enable)
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_ACHIEVEMENT_LIST),
             menu_hash_to_str(MENU_LABEL_ACHIEVEMENT_LIST),
             MENU_SETTING_ACTION, 0, 0);
 #endif
    }
    else
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
             "", MENU_SETTING_NO_ITEM, 0, 0);
 
@@ -2242,7 +2242,7 @@ static int menu_displaylist_parse_horizontal_content_actions(
          && string_is_equal(menu->deferred_path, fullpath))
       menu_displaylist_parse_load_content_settings(info);
    else
-      menu_entries_push(info->list, "Run", "collection",
+      menu_entries_add(info->list, "Run", "collection",
             MENU_FILE_PLAYLIST_ENTRY, 0, idx);
 
    menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
@@ -2259,7 +2259,7 @@ static int menu_displaylist_parse_horizontal_content_actions(
       path_remove_extension(db_path);
       strlcat(db_path, ".rdb", sizeof(db_path));
 
-      menu_entries_push(info->list, label,
+      menu_entries_add(info->list, label,
             db_path, MENU_FILE_RDB_ENTRY, 0, idx);
    }
 
@@ -2271,31 +2271,31 @@ static int menu_displaylist_parse_information_list(
 {
    settings_t *settings        = config_get_ptr();
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFORMATION),
          menu_hash_to_str(MENU_LABEL_CORE_INFORMATION),
          MENU_SETTING_ACTION, 0, 0);
 
 #ifdef HAVE_NETPLAY
 #ifndef HAVE_SOCKET_LEGACY
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_NETWORK_INFORMATION),
          menu_hash_to_str(MENU_LABEL_NETWORK_INFORMATION),
          MENU_SETTING_ACTION, 0, 0);
 #endif
 #endif
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFORMATION),
          menu_hash_to_str(MENU_LABEL_SYSTEM_INFORMATION),
          MENU_SETTING_ACTION, 0, 0);
 
 #ifdef HAVE_LIBRETRODB
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_DATABASE_MANAGER),
          menu_hash_to_str(MENU_LABEL_DATABASE_MANAGER_LIST),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CURSOR_MANAGER),
          menu_hash_to_str(MENU_LABEL_CURSOR_MANAGER_LIST),
          MENU_SETTING_ACTION, 0, 0);
@@ -2303,19 +2303,19 @@ static int menu_displaylist_parse_information_list(
 
    if (runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL))
    {
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_FRONTEND_COUNTERS),
             menu_hash_to_str(MENU_LABEL_FRONTEND_COUNTERS),
             MENU_SETTING_ACTION, 0, 0);
 
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_CORE_COUNTERS),
             menu_hash_to_str(MENU_LABEL_CORE_COUNTERS),
             MENU_SETTING_ACTION, 0, 0);
    }
 
    if(settings->debug_panel_enable)
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_DEBUG_INFORMATION),
             menu_hash_to_str(MENU_LABEL_DEBUG_INFORMATION),
             MENU_SETTING_ACTION, 0, 0);
@@ -2327,19 +2327,19 @@ static int menu_displaylist_parse_add_content_list(
       menu_displaylist_info_t *info)
 {
 #ifdef HAVE_NETWORKING
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOAD_CORE_CONTENT),
          menu_hash_to_str(MENU_LABEL_DOWNLOAD_CORE_CONTENT),
          MENU_SETTING_ACTION, 0, 0);
 #endif
 
 #ifdef HAVE_LIBRETRODB
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_SCAN_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_SCAN_DIRECTORY),
          MENU_SETTING_ACTION, 0, 0);
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_SCAN_FILE),
          menu_hash_to_str(MENU_LABEL_SCAN_FILE),
          MENU_SETTING_ACTION, 0, 0);
@@ -2352,7 +2352,7 @@ static int menu_displaylist_parse_scan_directory_list(
       menu_displaylist_info_t *info)
 {
 #ifdef HAVE_LIBRETRODB
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_SCAN_DIRECTORY),
          menu_hash_to_str(MENU_LABEL_SCAN_DIRECTORY),
          MENU_SETTING_ACTION, 0, 0);
@@ -2367,65 +2367,65 @@ static int menu_displaylist_parse_options(
 #ifdef HAVE_NETWORKING
 
 #ifdef HAVE_LAKKA
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_LAKKA),
          menu_hash_to_str(MENU_LABEL_UPDATE_LAKKA),
          MENU_SETTING_ACTION, 0, 0);
 #endif
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_LIST),
          menu_hash_to_str(MENU_LABEL_CORE_UPDATER_LIST),
          MENU_SETTING_ACTION, 0, 0);
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CORE_INFO_FILES),
          menu_hash_to_str(MENU_LABEL_UPDATE_CORE_INFO_FILES),
          MENU_SETTING_ACTION, 0, 0);
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_ASSETS),
          menu_hash_to_str(MENU_LABEL_UPDATE_ASSETS),
          MENU_SETTING_ACTION, 0, 0);
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES),
          menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES),
          MENU_SETTING_ACTION, 0, 0);
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CHEATS),
          menu_hash_to_str(MENU_LABEL_UPDATE_CHEATS),
          MENU_SETTING_ACTION, 0, 0);
 
 #ifdef HAVE_LIBRETRODB
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_DATABASES),
          menu_hash_to_str(MENU_LABEL_UPDATE_DATABASES),
          MENU_SETTING_ACTION, 0, 0);
 #endif
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_OVERLAYS),
          menu_hash_to_str(MENU_LABEL_UPDATE_OVERLAYS),
          MENU_SETTING_ACTION, 0, 0);
 
 #ifdef HAVE_CG
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CG_SHADERS),
          menu_hash_to_str(MENU_LABEL_UPDATE_CG_SHADERS),
          MENU_SETTING_ACTION, 0, 0);
 #endif
 
 #ifdef HAVE_GLSL
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_GLSL_SHADERS),
          menu_hash_to_str(MENU_LABEL_UPDATE_GLSL_SHADERS),
          MENU_SETTING_ACTION, 0, 0);
 #endif
 
 #else
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
          "", MENU_SETTING_NO_ITEM, 0, 0);
 #endif
@@ -2441,19 +2441,19 @@ static int menu_displaylist_parse_options_cheats(
    if (!cheat_manager_alloc_if_empty())
       return -1;
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_FILE_LOAD),
          menu_hash_to_str(MENU_LABEL_CHEAT_FILE_LOAD),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_FILE_SAVE_AS),
          menu_hash_to_str(MENU_LABEL_CHEAT_FILE_SAVE_AS),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_NUM_PASSES),
          menu_hash_to_str(MENU_LABEL_CHEAT_NUM_PASSES),
          0, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_APPLY_CHANGES),
          menu_hash_to_str(MENU_LABEL_CHEAT_APPLY_CHANGES),
          MENU_SETTING_ACTION, 0, 0);
@@ -2466,7 +2466,7 @@ static int menu_displaylist_parse_options_cheats(
             "%s #%u: ", menu_hash_to_str(MENU_VALUE_CHEAT), i);
       if (cheat_manager_get_desc(i))
          strlcat(cheat_label, cheat_manager_get_desc(i), sizeof(cheat_label));
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             cheat_label, "", MENU_SETTINGS_CHEAT_BEGIN + i, 0, 0);
    }
 
@@ -2502,15 +2502,15 @@ static int menu_displaylist_parse_options_remappings(
             key_analog, PARSE_ONLY_UINT, true);
    }
 
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_LOAD),
          menu_hash_to_str(MENU_LABEL_REMAP_FILE_LOAD),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_SAVE_CORE),
          menu_hash_to_str(MENU_LABEL_REMAP_FILE_SAVE_CORE),
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_push(info->list,
+   menu_entries_add(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_SAVE_GAME),
          menu_hash_to_str(MENU_LABEL_REMAP_FILE_SAVE_GAME),
          MENU_SETTING_ACTION, 0, 0);
@@ -2537,7 +2537,7 @@ static int menu_displaylist_parse_options_remappings(
          snprintf(desc_label, sizeof(desc_label),
                "%s %u %s : ", menu_hash_to_str(MENU_VALUE_USER),
                user, description);
-         menu_entries_push(info->list, desc_label, "",
+         menu_entries_add(info->list, desc_label, "",
                MENU_SETTINGS_INPUT_DESC_BEGIN +
                (p * (RARCH_FIRST_CUSTOM_BIND + 4)) +  retro_id, 0, 0);
       }
@@ -2565,7 +2565,7 @@ static int menu_displaylist_parse_generic(
    if (!*info->path)
    {
       if (frontend_driver_parse_drive_list(info->list) != 0)
-         menu_entries_push(info->list, "/", "",
+         menu_entries_add(info->list, "/", "",
                MENU_FILE_DIRECTORY, 0, 0);
       return 0;
    }
@@ -2588,13 +2588,13 @@ static int menu_displaylist_parse_generic(
             true, true);
 
    if (hash_label == MENU_LABEL_SCAN_DIRECTORY)
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_SCAN_THIS_DIRECTORY),
             menu_hash_to_str(MENU_LABEL_SCAN_THIS_DIRECTORY),
             MENU_FILE_SCAN_DIRECTORY, 0 ,0);
 
    if (push_dir)
-      menu_entries_push(info->list,
+      menu_entries_add(info->list,
             menu_hash_to_str(MENU_LABEL_VALUE_USE_THIS_DIRECTORY),
             menu_hash_to_str(MENU_LABEL_USE_THIS_DIRECTORY),
             MENU_FILE_USE_DIRECTORY, 0 ,0);
@@ -2606,7 +2606,7 @@ static int menu_displaylist_parse_generic(
 
       if (!string_is_empty(out_dir))
       {
-         menu_entries_push(info->list, "..", info->path,
+         menu_entries_add(info->list, "..", info->path,
                MENU_FILE_PARENT_DIRECTORY, 0, 0);
       }
    }
@@ -2617,7 +2617,7 @@ static int menu_displaylist_parse_generic(
          ? menu_hash_to_str(MENU_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE)
          : menu_hash_to_str(MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND);
 
-      menu_entries_push(info->list, str, "", 0, 0, 0);
+      menu_entries_add(info->list, str, "", 0, 0, 0);
       return 0;
    }
 
@@ -2629,7 +2629,7 @@ static int menu_displaylist_parse_generic(
    {
       if (!(info->flags & SL_FLAG_ALLOW_EMPTY_LIST))
       {
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
                "", MENU_SETTING_NO_ITEM, 0, 0);
       }
@@ -2754,7 +2754,7 @@ static int menu_displaylist_parse_generic(
       }
 
       items_found++;
-      menu_entries_push(info->list, path, label,
+      menu_entries_add(info->list, path, label,
             file_type, 0, 0);
    }
 
@@ -2764,7 +2764,7 @@ static int menu_displaylist_parse_generic(
    {
       if (!(info->flags & SL_FLAG_ALLOW_EMPTY_LIST))
       {
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
                "", MENU_SETTING_NO_ITEM, 0, 0);
       }
@@ -2885,7 +2885,7 @@ static void menu_displaylist_parse_playlist_associations(
          }
 
          path_remove_extension(path_base);
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                path_base,
                str_list->elems[i].data,
                MENU_SETTINGS_PLAYLIST_ASSOCIATION_START + i,
@@ -2988,7 +2988,7 @@ static bool menu_displaylist_push(menu_displaylist_ctx_entry_t *entry)
          if (string_is_empty(settings->playlist_directory))
          {
             menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info.list);
-            menu_entries_push(info.list,
+            menu_entries_add(info.list,
                   menu_hash_to_str(
                      MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE),
                   menu_hash_to_str(
@@ -3141,7 +3141,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
       case DISPLAYLIST_NONE:
          break;
       case DISPLAYLIST_INFO:
-         menu_entries_push(info->list, info->path,
+         menu_entries_add(info->list, info->path,
                info->label, info->type, info->directory_ptr, 0);
          break;
       case DISPLAYLIST_GENERIC:
@@ -3155,7 +3155,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             menu_driver_ctl(RARCH_MENU_CTL_LIST_CACHE, &list_info);
 
-            menu_entries_push(info->list, info->path,
+            menu_entries_add(info->list, info->path,
                   info->label, info->type, info->directory_ptr, 0);
             menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
             menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
@@ -3185,7 +3185,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS),
                PARSE_NONE, true);
 #else
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
                "", MENU_SETTING_NO_ITEM, 0, 0);
          ret = 0;
@@ -3194,31 +3194,31 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          info->need_push    = true;
          break;
       case DISPLAYLIST_HELP_SCREEN_LIST:
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_HELP_CONTROLS),
                menu_hash_to_str(MENU_LABEL_HELP_CONTROLS),
                0, 0, 0);
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_HELP_WHAT_IS_A_CORE),
                menu_hash_to_str(MENU_LABEL_HELP_WHAT_IS_A_CORE),
                0, 0, 0);
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_HELP_LOADING_CONTENT),
                menu_hash_to_str(MENU_LABEL_HELP_LOADING_CONTENT),
                0, 0, 0);
 #ifdef HAVE_LIBRETRODB
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_HELP_SCANNING_CONTENT),
                menu_hash_to_str(MENU_LABEL_HELP_SCANNING_CONTENT),
                0, 0, 0);
 #endif
 #ifdef HAVE_OVERLAY
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD),
                menu_hash_to_str(MENU_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD),
                0, 0, 0);
 #endif
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING),
                menu_hash_to_str(MENU_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING),
                0, 0, 0);
@@ -3226,7 +3226,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          info->need_push    = true;
          break;
       case DISPLAYLIST_HELP:
-         menu_entries_push(info->list, info->path,
+         menu_entries_add(info->list, info->path,
                info->label, info->type, info->directory_ptr, 0);
          menu->push_help_screen = false;
          break;
@@ -3501,19 +3501,19 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          info->need_refresh = true;
          break;
       case DISPLAYLIST_LOAD_CONTENT_LIST:
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
                menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
                MENU_SETTING_ACTION, 0, 0);
 
          if (core_info_list_num_info_files(list))
          {
-            menu_entries_push(info->list,
+            menu_entries_add(info->list,
                   menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
                   menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
                   MENU_SETTING_ACTION, 0, 0);
 
-            menu_entries_push(info->list,
+            menu_entries_add(info->list,
                   menu_hash_to_str(
                      MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
                   menu_hash_to_str(
@@ -3522,7 +3522,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          }
 
 #ifdef HAVE_LIBRETRODB
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST),
                menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
                MENU_SETTING_ACTION, 0, 0);
@@ -3560,7 +3560,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   );
          else
          {
-            menu_entries_push(info->list,
+            menu_entries_add(info->list,
                   menu_hash_to_str(MENU_LABEL_VALUE_NO_SHADER_PARAMETERS),
                   "", 0, 0, 0);
             ret = 0;
@@ -3713,15 +3713,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          }
          break;
       case DISPLAYLIST_OPTIONS_DISK:
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_DISK_INDEX),
                menu_hash_to_str(MENU_LABEL_DISK_INDEX),
                MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX, 0, 0);
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS),
                menu_hash_to_str(MENU_LABEL_DISK_CYCLE_TRAY_STATUS),
                MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS, 0, 0);
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_DISK_IMAGE_APPEND),
                menu_hash_to_str(MENU_LABEL_DISK_IMAGE_APPEND),
                MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_IMAGE_APPEND, 0, 0);
@@ -3778,7 +3778,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             if (cores_names_size == 0)
             {
-               menu_entries_push(info->list,
+               menu_entries_add(info->list,
                      menu_hash_to_str(MENU_LABEL_VALUE_NO_CORES_AVAILABLE),
                      "",
                      0, 0, 0);
@@ -3788,10 +3788,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                for (i = 0; i < cores_names_size; i++)
                {
                   if (type == DISPLAYLIST_CORES_COLLECTION_SUPPORTED)
-                     menu_entries_push(info->list, cores_paths->elems[i].data, "",
+                     menu_entries_add(info->list, cores_paths->elems[i].data, "",
                            MENU_FILE_CORE, 0, 0);
                   else
-                     menu_entries_push(info->list, cores_paths->elems[i].data,
+                     menu_entries_add(info->list, cores_paths->elems[i].data,
                            menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST_OK),
                            MENU_FILE_CORE, 0, 0);
                   menu_entries_set_alt_at_offset(info->list, i,
@@ -3817,19 +3817,19 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             if (settings->game_specific_options)
             {
                if (!runloop_ctl(RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE, NULL))
-                  menu_entries_push(info->list,
+                  menu_entries_add(info->list,
                         menu_hash_to_str(
                            MENU_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE), "",
                         MENU_SETTINGS_CORE_OPTION_CREATE, 0, 0);
                else
-                  menu_entries_push(info->list,
+                  menu_entries_add(info->list,
                         menu_hash_to_str(
                            MENU_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE), "",
                         MENU_SETTINGS_CORE_OPTION_CREATE, 0, 0);
             }
             if (opts == 0)
             {
-               menu_entries_push(info->list,
+               menu_entries_add(info->list,
                      menu_hash_to_str(
                         MENU_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE), "",
                      MENU_SETTINGS_CORE_OPTION_NONE, 0, 0);
@@ -3841,13 +3841,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                runloop_ctl(RUNLOOP_CTL_COREOPTS_GET, &coreopts);
 
                for (i = 0; i < opts; i++)
-                  menu_entries_push(info->list,
+                  menu_entries_add(info->list,
                         core_option_get_desc(coreopts, i), "",
                         MENU_SETTINGS_CORE_OPTION_START + i, 0, 0);
             }
          }
          else
-            menu_entries_push(info->list,
+            menu_entries_add(info->list,
                   menu_hash_to_str(MENU_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE), "",
                   MENU_SETTINGS_CORE_OPTION_NONE, 0, 0);
          info->need_push = true;
@@ -3859,12 +3859,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_ARCHIVE_ACTION:
 #ifdef HAVE_COMPRESSION
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_OPEN_ARCHIVE),
                menu_hash_to_str(MENU_LABEL_OPEN_ARCHIVE),
                0, 0, 0);
 #endif
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_LOAD_ARCHIVE),
                menu_hash_to_str(MENU_LABEL_LOAD_ARCHIVE),
                0, 0, 0);
@@ -3872,12 +3872,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE:
 #ifdef HAVE_COMPRESSION
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_OPEN_ARCHIVE),
                menu_hash_to_str(MENU_LABEL_OPEN_ARCHIVE_DETECT_CORE),
                0, 0, 0);
 #endif
-         menu_entries_push(info->list,
+         menu_entries_add(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_LOAD_ARCHIVE),
                menu_hash_to_str(MENU_LABEL_LOAD_ARCHIVE_DETECT_CORE),
                0, 0, 0);
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 24667b8eb7..e663f562ee 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -502,7 +502,7 @@ error:
    return false;
 }
 
-void menu_entries_push(file_list_t *list, const char *path, const char *label,
+void menu_entries_add(file_list_t *list, const char *path, const char *label,
       unsigned type, size_t directory_ptr, size_t entry_idx)
 {
    menu_ctx_list_t list_info;
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index 4d16dee05d..61d903aa33 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -139,7 +139,7 @@ file_list_t *menu_entries_get_selection_buf_ptr(size_t idx);
 
 file_list_t *menu_entries_get_menu_stack_ptr(size_t idx);
 
-void menu_entries_push(file_list_t *list, const char *path, const char *label,
+void menu_entries_add(file_list_t *list, const char *path, const char *label,
       unsigned type, size_t directory_ptr, size_t entry_idx);
 
 void menu_entries_get_last_stack(const char **path, const char **label,