diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 34a5516a9a..f18655383e 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -4063,10 +4063,6 @@ static int xmb_list_push(void *data, void *userdata,
             entry.enum_idx      = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
             menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
 #if defined(HAVE_NETWORKING)
-#ifdef HAVE_LAKKA
-            entry.enum_idx      = MENU_ENUM_LABEL_UPDATE_LAKKA;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
-#else
             {
                settings_t *settings      = config_get_ptr();
                if (settings->bools.menu_show_online_updater)
@@ -4075,7 +4071,6 @@ static int xmb_list_push(void *data, void *userdata,
                   menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
                }
             }
-#endif
 #endif
             entry.enum_idx      = MENU_ENUM_LABEL_INFORMATION_LIST;
             menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index f96521cac2..31c6456cd2 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3178,6 +3178,23 @@ static int menu_displaylist_parse_netplay_room_list(
 static int menu_displaylist_parse_options(
       menu_displaylist_info_t *info)
 {
+#ifdef HAVE_LAKKA
+   menu_entries_append_enum(info->list,
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA),
+         msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_LAKKA),
+         MENU_ENUM_LABEL_UPDATE_LAKKA,
+         MENU_SETTING_ACTION, 0, 0);
+   menu_entries_append_enum(info->list,
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST),
+         msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST),
+         MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
+         MENU_SETTING_ACTION, 0, 0);
+   menu_entries_append_enum(info->list,
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT),
+         msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS),
+         MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS,
+         MENU_SETTING_ACTION, 0, 0);
+#else
 #ifdef HAVE_NETWORKING
    settings_t *settings         = config_get_ptr();
 
@@ -3275,6 +3292,7 @@ static int menu_displaylist_parse_options(
          msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS),
          MENU_ENUM_LABEL_NO_ITEMS,
          MENU_SETTING_NO_ITEM, 0, 0);
+#endif
 #endif
 
    return 0;
@@ -4055,7 +4073,7 @@ static void wifi_scan_callback(void *task_data,
 bool menu_displaylist_process(menu_displaylist_info_t *info)
 {
    size_t idx   = 0;
-#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA)
+#if defined(HAVE_NETWORKING)
    settings_t *settings         = config_get_ptr();
 #endif
 
@@ -4074,7 +4092,7 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
    if (info->need_sort)
       file_list_sort_on_alt(info->list);
 
-#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA)
+#if defined(HAVE_NETWORKING)
    if (settings->bools.menu_show_core_updater)
       if (info->download_core)
       {
@@ -6132,16 +6150,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   PARSE_ACTION, false);
 #endif
 #if defined(HAVE_NETWORKING)
-#ifdef HAVE_LAKKA
-            menu_displaylist_parse_settings_enum(menu, info,
-                  MENU_ENUM_LABEL_UPDATE_LAKKA,
-                  PARSE_ACTION, false);
-#else
             if (settings->bools.menu_show_online_updater)
                menu_displaylist_parse_settings_enum(menu, info,
                      MENU_ENUM_LABEL_ONLINE_UPDATER,
                      PARSE_ACTION, false);
-#endif
 #endif
             menu_displaylist_parse_settings_enum(menu, info,
                   MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 1f9f377b39..2ba3d5b399 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2343,15 +2343,6 @@ static bool setting_append_list(
                &subgroup_info,
                parent_group);
 
-#ifdef HAVE_LAKKA
-         CONFIG_ACTION(
-               list, list_info,
-               MENU_ENUM_LABEL_UPDATE_LAKKA,
-               MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA,
-               &group_info,
-               &subgroup_info,
-               parent_group);
-#else
          CONFIG_ACTION(
                list, list_info,
                MENU_ENUM_LABEL_ONLINE_UPDATER,
@@ -2359,8 +2350,6 @@ static bool setting_append_list(
                &group_info,
                &subgroup_info,
                parent_group);
-#endif
-
 #endif
 
          CONFIG_ACTION(