diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index f07ce3547..f4fcbb43f 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1448,6 +1448,9 @@ e_config_load(void)
 
      E_CONFIG_LIMIT(e_config->multiscreen_flip, 0, 1);
 
+     if (!e_config->icon_theme)
+       e_config->icon_theme = eina_stringshare_add("hicolor"); // FDO default
+
      /* FIXME: disabled auto apply because it causes problems */
      e_config->cfgdlg_auto_apply = 0;
      /* FIXME: desklock personalized password id disabled for security reasons */
diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
index 2f5e42c62..b78c652a7 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -150,7 +150,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    if (cfdata->icon_overrides || cfdata->match_e17_icon_theme)
      e_config->icon_theme = eina_stringshare_ref(cfdata->icon_theme);
    else
-     e_config->icon_theme = NULL;
+     e_config->icon_theme = eina_stringshare_add("hicolor"); // FDO default
 
    e_config->icon_theme_overrides = !!cfdata->icon_overrides;
    e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;