diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
index e3c46f86f..f49adc9bc 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -159,6 +159,14 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;
    e_config_save_queue();
 
+#ifdef EFL_VERSION_1_18
+   if (cfdata->match_e17_icon_theme)
+     {
+        elm_config_icon_theme_set(e_config->icon_theme);
+        elm_config_all_flush();
+        elm_config_save();
+     }
+#endif
    e_util_env_set("E_ICON_THEME", e_config->icon_theme);
 
    ev = E_NEW(E_Event_Config_Icon_Theme, 1);