diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index e90fe39e3..53e1b6198 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -385,12 +385,24 @@ _e_wizard_check_xdg(void)
      }
    if ((need_xdg_icons) && (!got_icons))
      {
-        /* Advance within 15 secs if no xdg event */
-        if (!next_timer)
-          next_timer = ecore_timer_add(7.0, _e_wizard_cb_next_page, NULL);
-        next_can = 0;
-        _e_wizard_next_eval();
-        return 0;
+        char path[PATH_MAX];
+
+        /* Check if cache already exists */
+        snprintf(path, sizeof(path), "%s/efreet/icon_themes_%s.eet",
+             efreet_cache_home_get(), efreet_hostname_get());
+        if (ecore_file_is_dir(path))
+          {
+             got_icons = EINA_TRUE;
+          }
+        else
+          {
+             /* Advance within 15 secs if no xdg event */
+             if (!next_timer)
+               next_timer = ecore_timer_add(7.0, _e_wizard_cb_next_page, NULL);
+             next_can = 0;
+             _e_wizard_next_eval();
+             return 0;
+          }
      }
    next_can = 1;
    need_xdg_desktops = EINA_FALSE;
diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c
index a10f14238..b681c7f62 100644
--- a/src/modules/wizard/page_070.c
+++ b/src/modules/wizard/page_070.c
@@ -17,7 +17,6 @@ wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 EAPI int
 wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
-   /* TODO: Wait until icon theme list is built */
    Eina_List *l, *themes = efreet_icon_theme_list_get();
    Efreet_Icon_Theme *th;
    int i;