diff --git a/data/themes/default.edc b/data/themes/default.edc
index 78d345209..684abc6bd 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -22710,7 +22710,7 @@ ICON("enlightenment/reboot","icon_reboot.png",128)
ICON("enlightenment/suspend","icon_suspend.png",128)
ICON("enlightenment/hibernate","icon_hibernate.png",128)
ICON("enlightenment/colors","icon_colors.png",64)
-ICON("enlightenment/themes","icon_theme.png",64)
+//ICON("enlightenment/themes","icon_theme.png",64) TODO some still around.....
ICON("enlightenment/screen_setup","icon_screen_setup.png",64)
ICON("enlightenment/windows","icon_windows.png",64)
ICON("enlightenment/showhide","icon_windows.png",64)
diff --git a/src/bin/e_theme_about.c b/src/bin/e_theme_about.c
index 3ab1de383..f5ccab73b 100644
--- a/src/bin/e_theme_about.c
+++ b/src/bin/e_theme_about.c
@@ -26,5 +26,5 @@ EAPI void
e_theme_about_show(E_Theme_About *about)
{
e_obj_dialog_show((E_Obj_Dialog *)about);
- e_obj_dialog_icon_set((E_Obj_Dialog *)about, "enlightenment/themes");
+ e_obj_dialog_icon_set((E_Obj_Dialog *)about, "preferences-desktop-theme");
}
diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c
index 4e0370afb..89ecc1e97 100644
--- a/src/bin/e_widget_button.c
+++ b/src/bin/e_widget_button.c
@@ -70,9 +70,9 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
if (icon)
{
- o = edje_object_add(evas);
+ o = e_icon_add(evas);
wd->o_icon = o;
- e_util_edje_icon_set(o, icon);
+ e_util_icon_theme_set(o, icon);
edje_object_part_swallow(wd->o_button, "e.swallow.icon", o);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index 9c2fc1cf6..61df54d57 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -345,13 +345,12 @@ _e_configure_category_cb(void *data, void *data2)
if (!ci) continue;
if (ci->icon)
{
- if (e_util_edje_icon_check(ci->icon))
+ o = e_icon_add(eco->evas);
+ if (!e_util_icon_theme_set(o, ci->icon))
{
- o = edje_object_add(eco->evas);
- e_util_edje_icon_set(o, ci->icon);
+ evas_object_del(o);
+ o = e_util_icon_add(ci->icon, eco->evas);
}
- else
- o = e_util_icon_add(ci->icon, eco->evas);
}
e_widget_ilist_append(eco->item_list, o, ci->label, _e_configure_item_cb, ci, NULL);
}
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index a046f299e..75ff3afb7 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -60,7 +60,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
cfd = e_config_dialog_new(con,
_("Theme Selector"),
"E", "_config_theme_dialog",
- "enlightenment/themes", 0, v, NULL);
+ "preferences-desktop-theme", 0, v, NULL);
return cfd;
}
@@ -393,7 +393,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
of = e_widget_list_add(evas, 0, 0);
il = e_widget_list_add(evas, 0, 1);
- o = e_widget_button_add(evas, _(" Import..."), "enlightenment/themes",
+ o = e_widget_button_add(evas, _(" Import..."), "preferences-desktop-theme",
_cb_import, cfdata, NULL);
e_widget_list_object_append(il, o, 1, 0, 0.5);
#ifdef HAVE_EXCHANGE
@@ -755,8 +755,8 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata, const char *header, const char *d
if (_theme_file_used(cfdata->theme_list, themefiles->data))
{
- ic = edje_object_add(evas);
- e_util_edje_icon_set(ic, "enlightenment/themes");
+ ic = e_icon_add(evas);
+ e_util_icon_theme_set(ic, "preferences-desktop-theme");
}
tmp = strdup(strrchr(themefiles->data, '/') + 1);
strncpy(themename, tmp, strlen(tmp) - 3);
@@ -871,8 +871,8 @@ _cb_adv_btn_assign(void *data1, void *data2)
newtheme->category = strdup(buf);
n = e_widget_ilist_selected_get(of);
- ic = edje_object_add(evas);
- e_util_edje_icon_set(ic, "enlightenment/themes");
+ ic = e_icon_add(evas);
+ e_util_icon_theme_set(ic, "preferences-desktop-theme");
e_widget_ilist_nth_icon_set(of, n, ic);
newtheme->file = _files_ilist_nth_label_to_file(cfdata, n);
diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c
index 39b24a21b..3a30499bf 100644
--- a/src/modules/conf_theme/e_int_config_theme_import.c
+++ b/src/modules/conf_theme/e_int_config_theme_import.c
@@ -134,7 +134,7 @@ e_int_config_theme_import(E_Config_Dialog *parent)
e_win_size_min_set(win, w, h);
e_win_size_max_set(win, 99999, 99999);
e_win_show(win);
- e_win_border_icon_set(win, "enlightenment/themes");
+ e_win_border_icon_set(win, "preferences-desktop-theme");
win->data = import;
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index 5ecbc8da6..37a0e1867 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -36,7 +36,7 @@ EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
- e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme);
+ e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "preferences-desktop-theme", e_int_config_theme);
maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL);
conf_module = m;
diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in
index e484c350e..0d775c297 100644
--- a/src/modules/conf_theme/module.desktop.in
+++ b/src/modules/conf_theme/module.desktop.in
@@ -13,7 +13,7 @@ Name[pt]=
Name[pt_BR]=
Name[zh_CN]=
Name[zh_TW]=
-Icon=e-module-conf_theme
+Icon=preferences-desktop-theme
Comment=E17 Settings Applet
Used to configure your theme preferences.
Comment[cs]=E17 applet nastavení
Použit k nastavení vašeho tématu.
Comment[de]=