Icon rename finished. Now we have a fully compliant icon theme :)

now I'm going to fix E-MODULE-EXTRA...


SVN revision: 39495

85 files changed, 150 insertions, 150 deletions

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 0a1b5be5f3..ea5f3ebbec 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -3101,7 +3101,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
      {
 	o = edje_object_add(evas);
 	if (!bd->internal_icon) 
-	  e_util_edje_icon_set(o, "enlightenment/e");
+	  e_util_edje_icon_set(o, "enlightenment");
 	else
 	  {
 	     if (!bd->internal_icon_key)
@@ -3112,7 +3112,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
 		  if ((ext) && ((!strcmp(ext, ".edj"))))
 		    {
 		       if (!edje_object_file_set(o, bd->internal_icon, "icon"))
-			 e_util_edje_icon_set(o, "enlightenment/e");	       
+			 e_util_edje_icon_set(o, "enlightenment");
 		    }
 		  else if (ext)
 		    {
@@ -3125,7 +3125,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
 		       evas_object_del(o);
 		       o = e_icon_add(evas);
 		       if (!e_util_icon_theme_set(o, bd->internal_icon))
-			 e_util_icon_theme_set(o, "enlightenment/e"); 
+			 e_util_icon_theme_set(o, "enlightenment");
 		    }
 	       }
 	     else
@@ -3167,8 +3167,8 @@ e_border_icon_add(E_Border *bd, Evas *evas)
 	  }
      }
    
-   o = edje_object_add(evas);
-   e_util_edje_icon_set(o, "enlightenment/unknown");
+   o = e_icon_add(evas);
+   e_util_icon_theme_set(o, "unknown");
    return o;
 }
 
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 90cea3b7b6..f40780786d 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -12,7 +12,7 @@ static Eina_List *handlers = NULL;
 EAPI void
 e_configure_init(void)
 {
-   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
+   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions");
    e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "preferences-plugin", e_int_config_modules);
 
    handlers = eina_list_append
@@ -120,7 +120,7 @@ _e_configure_efreet_desktop_update(void)
 	     snprintf(buf, sizeof(buf), "system/%s", label);
 	     cfg_cat_cfg = buf;
 	     ic = cfg_cat_icon;
-	     if (!ic) ic = "enlightenment/system";
+	     if (!ic) ic = "system";
 	     e_configure_registry_category_add("system",
 					       1000, _("System"),
 					       NULL,
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index 0929ae21b0..f5de983955 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -214,7 +214,7 @@ _e_desktop_edit_view_create(E_Desktop_Edit *editor, E_Container *con)
    editor->cfd = 
      e_config_dialog_new(con, _("Desktop Entry Editor"), "E", 
 			 "_desktop_editor_dialog",
-			 "enlightenment/applications", 0, v, editor);
+			 "preferences-applications", 0, v, editor);
    
    if (!editor->cfd)
      {
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 9588120a9a..afd49b8094 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7041,7 +7041,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("View Mode"));
-	     e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
+	     e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
 	     e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
 	  }
 	if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@@ -7200,7 +7200,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("View Mode"));
-	     e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
+	     e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
 	     e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
 	  }
 	if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@@ -7827,7 +7827,7 @@ _e_fm2_new_directory(void *data, E_Menu *m, E_Menu_Item *mi)
    con = e_container_current_get(man);
    if (!con) return;
    
-   sd->entry_dialog = e_entry_dialog_show(_("Create a new Directory"), "enlightenment/e",
+   sd->entry_dialog = e_entry_dialog_show(_("Create a new Directory"), "enlightenment",
 					  _("New Directory Name:"),
 					  "", NULL, NULL, 
 					  _e_fm2_new_directory_yes_cb, 
@@ -7889,7 +7889,7 @@ _e_fm2_file_rename(void *data, E_Menu *m, E_Menu_Item *mi)
    snprintf(text, PATH_MAX + 256,
 	    _("Rename %s to:"),
 	    ic->info.file);
-   ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "enlightenment/e",
+   ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "enlightenment",
 					  text, ic->info.file, NULL, NULL, 
 					  _e_fm2_file_rename_yes_cb, 
 					  _e_fm2_file_rename_no_cb, ic);
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 6d64808d6a..d26dec2f16 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1264,7 +1264,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
 
 	mi = e_menu_item_new(menu);
 	e_menu_item_label_set(mi, _("Appearance"));
-	e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
+	e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
 	e_menu_item_submenu_set(mi, mn);
      }
 
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index e9ed4aecc2..b09ef3e3ef 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -486,7 +486,7 @@ _e_border_menu_cb_application_add_pre(void *data, E_Menu *m, E_Menu_Item *mi)
    e_menu_item_label_set(submi, _("To Launcher"));
    e_menu_item_submenu_pre_callback_set(submi, 
                                         _e_border_menu_cb_ibar_add_pre, bd);
-   e_util_menu_item_theme_icon_set(submi, "enlightenment/ibar_applications");
+   e_util_menu_item_theme_icon_set(submi, "preferences-applications-ibar");
 }
 
 static void
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 2b597c1c83..b82e51deb1 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -38,11 +38,11 @@ struct _E_Config_Dialog_Data
 */
 const CFTypes _types[] = 
 {
-     {"appearance", N_("Appearance"),    "enlightenment/appearance"},
+     {"appearance", N_("Appearance"),    "preferences-appearance"},
      {"config",     N_("Settings"),      "preferences-system"},
      {"fileman",    N_("File Manager"),  "system-file-manager"},
      {"shelf",      N_("Shelf"),         "preferences-desktop-shelf"}, //FIXME use gadget icon
-     {"system",     N_("System"),        "enlightenment/system"},
+     {"system",     N_("System"),        "system"},
      {NULL, NULL, NULL}
 };
 
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index fdcfe15cdb..2cbc277803 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -107,7 +107,7 @@ e_int_menus_main_new(void)
 	dat->all_apps = subm;
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, _("Applications"));
-	e_util_menu_item_theme_icon_set(mi, "enlightenment/applications");
+	e_util_menu_item_theme_icon_set(mi, "preferences-applications");
 	e_menu_item_submenu_set(mi, subm);
      }
 
@@ -139,7 +139,7 @@ e_int_menus_main_new(void)
    dat->lost_clients = subm;
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Lost Windows"));
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
+   e_util_menu_item_theme_icon_set(mi, "preferences-windows-lost");
    e_menu_item_submenu_set(mi, subm);
  */
 
@@ -156,7 +156,7 @@ e_int_menus_main_new(void)
    dat->enlightenment = subm;
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Enlightenment"));
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/e");
+   e_util_menu_item_theme_icon_set(mi, "enlightenment");
    e_menu_item_submenu_set(mi, subm);
 
    mi = e_menu_item_new(subm);
@@ -1092,7 +1092,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
 	dat->lost_clients = subm;
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, _("Lost Windows"));
-	e_util_menu_item_theme_icon_set(mi, "enlightenment/lost_windows");
+	e_util_menu_item_theme_icon_set(mi, "preferences-windows-lost");
 	e_menu_item_submenu_set(mi, subm);
      }
    
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index e7fcf1ce79..c5a6e0694a 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -503,7 +503,7 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m)
 	    _("Would you like to unload this module?<br>"));
 
    e_dialog_title_set(dia, title);
-   e_dialog_icon_set(dia, "enlightenment/e", 64);
+   e_dialog_icon_set(dia, "enlightenment", 64);
    e_dialog_text_set(dia, buf);
    e_dialog_button_add(dia, _("Yes"), NULL, _e_module_cb_dialog_disable, m);
    e_dialog_button_add(dia, _("No"), NULL, NULL, NULL);
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 749a66bf24..38c015d161 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1220,7 +1220,7 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
      }
    
    e_object_ref(E_OBJECT(es));
-   e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), "enlightenment/e",
+   e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), "enlightenment",
 			 _("You requested to delete this shelf.<br>"
 			      "<br>"
 			      "Are you sure you want to delete it?"), NULL, NULL,
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index 71fa2334f2..8a053758c2 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -329,7 +329,7 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
 
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, _("Configure Toolbar Contents"));
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/toolbar");
+   e_util_menu_item_theme_icon_set(mi, "preferences-toolbar");
    e_menu_item_callback_set(mi, _e_toolbar_menu_cb_contents, tbar);
 }
 
@@ -351,7 +351,7 @@ _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
    subm = e_menu_new();
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, tbar->name);
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/toolbar");
+   e_util_menu_item_theme_icon_set(mi, "preferences-toolbar");
    e_menu_pre_activate_callback_set(subm, _e_toolbar_menu_cb_pre, tbar);
    e_menu_item_submenu_set(mi, subm);
 }
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 23150bf78a..7127768eb3 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -1090,7 +1090,7 @@ e_modapi_init(E_Module *m)
 
    snprintf(buf, sizeof(buf), "%s/e-module-battery.edj", e_module_dir_get(m));
    e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, 
-                                     "enlightenment/advanced");
+                                     "preferences-advanced");
    e_configure_registry_item_add("advanced/battery", 100, _("Battery Meter"), 
                                  NULL, buf, e_int_config_battery_module);
 
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c
index ddbf9d445c..88224493e6 100644
--- a/src/modules/conf_applications/e_int_config_apps.c
+++ b/src/modules/conf_applications/e_int_config_apps.c
@@ -105,7 +105,7 @@ e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("IBar Applications"));
    data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
-   data->icon = eina_stringshare_add("enlightenment/ibar_applications");
+   data->icon = eina_stringshare_add("preferences-applications-ibar");
    data->filename = eina_stringshare_add(buf);
 
    return _create_dialog(con, data);
@@ -120,7 +120,7 @@ e_int_config_apps_ibar_other(E_Container *con, const char *path)
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("IBar Applications"));
    data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
-   data->icon = eina_stringshare_add("enlightenment/ibar_applications");
+   data->icon = eina_stringshare_add("preferences-applications-ibar");
    data->filename = eina_stringshare_add(path);
 
    return _create_dialog(con, data);
@@ -137,7 +137,7 @@ e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("Startup Applications"));
    data->dialog = eina_stringshare_add("_config_apps_startup_dialog");
-   data->icon = eina_stringshare_add("enlightenment/startup_applications");
+   data->icon = eina_stringshare_add("preferences-applications-startup");
    data->filename = eina_stringshare_add(buf);
 
    return _create_dialog(con, data);
@@ -154,7 +154,7 @@ e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__)
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("Restart Applications"));
    data->dialog = eina_stringshare_add("_config_apps_restart_dialog");
-   data->icon = eina_stringshare_add("enlightenment/restart_applications");
+   data->icon = eina_stringshare_add("preferences-applications-restart");
    data->filename = eina_stringshare_add(buf);
 
    return _create_dialog(con, data);
diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c
index 78394e8aa6..87f3e7481b 100644
--- a/src/modules/conf_applications/e_mod_main.c
+++ b/src/modules/conf_applications/e_mod_main.c
@@ -31,14 +31,14 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("applications", 20, _("Apps"), NULL, "enlightenment/applications");
-   e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "enlightenment/add_application", e_int_config_apps_add);
-   e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "enlightenment/ibar_applications", e_int_config_apps_ibar);
-   e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "enlightenment/restart_applications", e_int_config_apps_restart);
-   e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "enlightenment/startup_applications", e_int_config_apps_startup);
+   e_configure_registry_category_add("applications", 20, _("Apps"), NULL, "preferences-applications");
+   e_configure_registry_item_add("applications/new_application", 10, _("New Application"), NULL, "preferences-applications-add", e_int_config_apps_add);
+   e_configure_registry_item_add("applications/ibar_applications", 20, _("IBar Applications"), NULL, "preferences-applications-ibar", e_int_config_apps_ibar);
+   e_configure_registry_item_add("applications/restart_applications", 30, _("Restart Applications"), NULL, "preferences-applications-restart", e_int_config_apps_restart);
+   e_configure_registry_item_add("applications/startup_applications", 40, _("Startup Applications"), NULL, "preferences-applications-startup", e_int_config_apps_startup);
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
    e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "preferences-system-windows", e_int_config_apps_ibar_other);
-   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
+   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
    e_configure_registry_item_add("menus/favorites_menu", 10, _("Favorites Menu"), NULL, "user-bookmarks", e_int_config_apps_favs);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_borders/e_mod_main.c b/src/modules/conf_borders/e_mod_main.c
index 10bf2308bd..3ab22b8950 100644
--- a/src/modules/conf_borders/e_mod_main.c
+++ b/src/modules/conf_borders/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "preferences-system-windows", e_int_config_borders);
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
    e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border);
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.c b/src/modules/conf_clientlist/e_int_config_clientlist.c
index 3d462d82f2..763c34975b 100644
--- a/src/modules/conf_clientlist/e_int_config_clientlist.c
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.c
@@ -39,7 +39,7 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con, _("Client List Settings"), "E", 
 			     "_config_clientlist_dialog",
-			     "enlightenment/winlist", 0, v, NULL);
+			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_clientlist/e_mod_main.c b/src/modules/conf_clientlist/e_mod_main.c
index 4986c72ead..8950f4b32f 100644
--- a/src/modules/conf_clientlist/e_mod_main.c
+++ b/src/modules/conf_clientlist/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
-   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/winlist", e_int_config_clientlist);
+   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
+   e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_colors/e_mod_main.c b/src/modules/conf_colors/e_mod_main.c
index 2d54184046..bfa9fb474c 100644
--- a/src/modules/conf_colors/e_mod_main.c
+++ b/src/modules/conf_colors/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "preferences-desktop-color", e_int_config_color_classes);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
index 0ea5d4684b..c99e925233 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.c
+++ b/src/modules/conf_desklock/e_int_config_desklock.c
@@ -70,7 +70,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
    
    cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E", 
-			     "_config_desklock_dialog", "enlightenment/desklock",
+			     "_config_desklock_dialog", "preferences-desklock",
 			     0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_desklock/e_mod_main.c b/src/modules/conf_desklock/e_mod_main.c
index 50ac19e218..7f74c047a7 100644
--- a/src/modules/conf_desklock/e_mod_main.c
+++ b/src/modules/conf_desklock/e_mod_main.c
@@ -32,7 +32,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("screen", 30, _("Screen"), NULL, "preferences-desktop-display");
-   e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "enlightenment/desklock", e_int_config_desklock);
+   e_configure_registry_item_add("screen/screen_lock", 30, _("Screen Lock"), NULL, "preferences-desklock", e_int_config_desklock);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c
index c416a1e4db..530106a51c 100644
--- a/src/modules/conf_dialogs/e_int_config_dialogs.c
+++ b/src/modules/conf_dialogs/e_int_config_dialogs.c
@@ -35,7 +35,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Dialog Settings"),
 			     "E", "_config_config_dialog_dialog",
-			     "enlightenment/dialogs", 0, v, NULL);
+			     "preferences-dialogs", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c
index f5952732dc..35eb408966 100644
--- a/src/modules/conf_dialogs/e_mod_main.c
+++ b/src/modules/conf_dialogs/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "enlightenment/settings");
+   e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "preferences-system");
    e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "preferences-system", e_int_config_dialogs);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
index 3b66cb2470..0d8cff0334 100644
--- a/src/modules/conf_display/e_int_config_display.c
+++ b/src/modules/conf_display/e_int_config_display.c
@@ -474,16 +474,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
      {
 	of = e_widget_framelist_add(evas, _("Rotation"), 0);
 	rg = e_widget_radio_group_new(&(cfdata->rotation));
-	ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_normal", 24, 24, ECORE_X_RANDR_ROT_0, rg);
+	ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-normal", 24, 24, ECORE_X_RANDR_ROT_0, rg);
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_0)) e_widget_disabled_set(ob, 1);
-	ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_left", 24, 24, ECORE_X_RANDR_ROT_90, rg);
+	ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-left", 24, 24, ECORE_X_RANDR_ROT_90, rg);
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_90)) e_widget_disabled_set(ob, 1);
-	ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_around", 24, 24, ECORE_X_RANDR_ROT_180, rg);
+	ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-around", 24, 24, ECORE_X_RANDR_ROT_180, rg);
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_180)) e_widget_disabled_set(ob, 1);
-	ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/screen_right", 24, 24, ECORE_X_RANDR_ROT_270, rg);
+	ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-right", 24, 24, ECORE_X_RANDR_ROT_270, rg);
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_rotate & ECORE_X_RANDR_ROT_270)) e_widget_disabled_set(ob, 1);
 	e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 0, 1, 0);
@@ -492,10 +492,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    if (cfdata->can_flip)
      {
 	of = e_widget_framelist_add(evas, _("Mirroring"), 0);
-	ob = e_widget_check_icon_add(evas, NULL, "enlightenment/screen_hflip", 24, 24, &(cfdata->flip_x));
+	ob = e_widget_check_icon_add(evas, NULL, "preferences-screen-hflip", 24, 24, &(cfdata->flip_x));
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_flip & ECORE_X_RANDR_FLIP_X)) e_widget_disabled_set(ob, 1);
-	ob = e_widget_check_icon_add(evas, NULL, "enlightenment/screen_vflip", 24, 24, &(cfdata->flip_y));
+	ob = e_widget_check_icon_add(evas, NULL, "preferences-screen-vflip", 24, 24, &(cfdata->flip_y));
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_flip & ECORE_X_RANDR_FLIP_Y)) 
 	  e_widget_disabled_set(ob, 1);
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
index fc8b8aba50..584df00e30 100644
--- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c
+++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
@@ -249,7 +249,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    cfdata->gui.o_del_all = ob;
    e_widget_disabled_set(ob, 1);
    e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
-   ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment/e", _restore_edge_binding_defaults_cb, cfdata, NULL);
+   ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment", _restore_edge_binding_defaults_cb, cfdata, NULL);
    e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 0, 1, 0);
    e_widget_list_object_append(ol, of, 1, 1, 0.5);
    
diff --git a/src/modules/conf_edgebindings/e_mod_main.c b/src/modules/conf_edgebindings/e_mod_main.c
index 8869bcdc02..36b44e2ff2 100644
--- a/src/modules/conf_edgebindings/e_mod_main.c
+++ b/src/modules/conf_edgebindings/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
    e_configure_registry_item_add("keyboard_and_mouse/edge_bindings", 10, _("Edge Bindings"), NULL, "enlightenment/edges", e_int_config_edgebindings);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_engine/e_int_config_engine.c
index a5aa0935cf..0bc8a237e1 100644
--- a/src/modules/conf_engine/e_int_config_engine.c
+++ b/src/modules/conf_engine/e_int_config_engine.c
@@ -37,7 +37,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Engine Settings"),
 			    "E", "_config_engine_dialog",
-			     "enlightenment/engine", 0, v, NULL);
+			     "preferences-engine", 0, v, NULL);
    return cfd;
 }
 
@@ -129,7 +129,7 @@ _cb_composite_change(void *data, Evas_Object *obj)
 	  {
 	     /* pop dialog */
 	     e_confirm_dialog_show(_("Enable Composite Support ?"),
-				   "enlightenment/engine",
+				   "preferences-engine",
 				   _("You have chosen to enable composite "
 				     "support,<br>but your current screen does "
 				     "not support composite.<br><br>"
diff --git a/src/modules/conf_engine/e_mod_main.c b/src/modules/conf_engine/e_mod_main.c
index f206dcd9c3..9e7b756db6 100644
--- a/src/modules/conf_engine/e_mod_main.c
+++ b/src/modules/conf_engine/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
-   e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "enlightenment/engine", e_int_config_engine);
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
+   e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "preferences-engine", e_int_config_engine);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_exebuf/e_mod_main.c b/src/modules/conf_exebuf/e_mod_main.c
index 1f0424ffb1..60230c8bd7 100644
--- a/src/modules/conf_exebuf/e_mod_main.c
+++ b/src/modules/conf_exebuf/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
    e_configure_registry_item_add("advanced/run_command", 40, _("Run Command"), NULL, "system-run", e_int_config_exebuf);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c
index a0591c352b..7e1ccc8ece 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.c
+++ b/src/modules/conf_fonts/e_int_config_fonts.c
@@ -829,8 +829,8 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
 	  tc->font = eina_stringshare_ref(cfdata->cur_font);
 	if (cfdata->cur_enabled)
 	  {
-	     icon = edje_object_add(cfdata->evas);
-	     e_util_edje_icon_set(icon, "enlightenment/e");
+	     icon = e_icon_add(cfdata->evas);
+	     e_util_icon_theme_set(icon, "enlightenment");
 	  }
 	e_widget_ilist_nth_icon_set(cfdata->gui.class_list, n, icon);
      }
diff --git a/src/modules/conf_fonts/e_mod_main.c b/src/modules/conf_fonts/e_mod_main.c
index ac2112cfac..e348db25e7 100644
--- a/src/modules/conf_fonts/e_mod_main.c
+++ b/src/modules/conf_fonts/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "preferences-desktop-font", e_int_config_fonts);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
index 1f1cd12906..e3f2fc5bf3 100644
--- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c
+++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
@@ -42,7 +42,7 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Icon Theme Settings"),
 			     "E", "_config_icon_theme_dialog",
-			     "enlightenment/icon_theme", 0, v, NULL);
+			     "preferences-icon-theme", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_icon_theme/e_mod_main.c b/src/modules/conf_icon_theme/e_mod_main.c
index 63877fc406..8cd48601dd 100644
--- a/src/modules/conf_icon_theme/e_mod_main.c
+++ b/src/modules/conf_icon_theme/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 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/icon_theme", 60, _("Icon Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "preferences-icon-theme", e_int_config_icon_themes);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
index bc1dae0102..6bd4bd9745 100644
--- a/src/modules/conf_imc/e_int_config_imc.c
+++ b/src/modules/conf_imc/e_int_config_imc.c
@@ -108,7 +108,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Input Method Settings"),
 			    "E", "_config_imc_dialog",
-			     "enlightenment/imc", 0, v, NULL);
+			     "preferences-imc", 0, v, NULL);
    return cfd;
 }
 
@@ -900,7 +900,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    o = e_widget_button_add(evas, _("New"), "document-new", _cb_new, cfdata, NULL);
    e_widget_list_object_append(ol, o, 1, 0, 0.5);
-   o = e_widget_button_add(evas, _("Import..."), "enlightenment/imc", _cb_import, cfdata, NULL);
+   o = e_widget_button_add(evas, _("Import..."), "preferences-imc", _cb_import, cfdata, NULL);
    e_widget_list_object_append(ol, o, 1, 0, 0.5);
    e_widget_list_object_append(il, ol, 1, 0, 0.5);
    e_widget_list_object_append(of, il, 1, 0, 0.0);
diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c
index 41ac3c22aa..7bd2888e66 100644
--- a/src/modules/conf_imc/e_int_config_imc_import.c
+++ b/src/modules/conf_imc/e_int_config_imc_import.c
@@ -133,7 +133,7 @@ e_int_config_imc_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/imc");
+   e_win_border_icon_set(win, "preferences-imc");
    
    win->data = import;
    
diff --git a/src/modules/conf_imc/e_mod_main.c b/src/modules/conf_imc/e_mod_main.c
index bc0673e8be..57b5037afe 100644
--- a/src/modules/conf_imc/e_mod_main.c
+++ b/src/modules/conf_imc/e_mod_main.c
@@ -32,7 +32,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("language", 70, _("Language"), NULL, "preferences-desktop-locale");
-   e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "enlightenment/imc", e_int_config_imc);
+   e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "preferences-imc", e_int_config_imc);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index 4785e8154b..729dbe1ee2 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -36,7 +36,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Interaction Settings"),
 			     "E", "_config_config_interaction_dialog",
-			     "enlightenment/interaction", 0, v, NULL);
+			     "preferences-interaction", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c
index a59114ff11..c532763507 100644
--- a/src/modules/conf_interaction/e_mod_main.c
+++ b/src/modules/conf_interaction/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), NULL, "enlightenment/behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, _("Interaction"), NULL, "enlightenment/interaction", e_int_config_interaction);
+   e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), NULL, "preferences-behavior");
+   e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, _("Interaction"), NULL, "preferences-interaction", e_int_config_interaction);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index 327f4abea4..6729ab2dc5 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -243,7 +243,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    cfdata->gui.o_del_all = ob;
    e_widget_disabled_set(ob, 1);
    e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
-   ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment/e", _restore_key_binding_defaults_cb, cfdata, NULL);
+   ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment", _restore_key_binding_defaults_cb, cfdata, NULL);
    e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 0, 1, 0);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c
index 51fd37927a..d541edd4c6 100644
--- a/src/modules/conf_keybindings/e_mod_main.c
+++ b/src/modules/conf_keybindings/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
    e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, _("Key Bindings"), NULL, "preferences-desktop-keyboard", e_int_config_keybindings);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index f3ec73e951..ef977a8a89 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -43,7 +43,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Menu Settings"),
 			     "E", "_config_menus_dialog",
-			     "enlightenment/menus", 0, v, NULL);
+			     "preferences-menus", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_menus/e_mod_main.c b/src/modules/conf_menus/e_mod_main.c
index 21e30fc76e..a23eddabf1 100644
--- a/src/modules/conf_menus/e_mod_main.c
+++ b/src/modules/conf_menus/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "enlightenment/menus");
-   e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
+   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus");
+   e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "preferences-menu-settings", e_int_config_menus);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/conf_mime/e_int_config_mime.c
index c43be5772a..288380075b 100644
--- a/src/modules/conf_mime/e_int_config_mime.c
+++ b/src/modules/conf_mime/e_int_config_mime.c
@@ -62,7 +62,7 @@ e_int_config_mime(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create;
    
    cfd = e_config_dialog_new(con, _("File Icons"), "E", "_config_mime_dialog",
-			     "enlightenment/file_icons", 0, v, NULL);
+			     "preferences-file-icons", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/conf_mime/e_int_config_mime_edit.c
index 514308f4cd..c4866b88e5 100644
--- a/src/modules/conf_mime/e_int_config_mime_edit.c
+++ b/src/modules/conf_mime/e_int_config_mime_edit.c
@@ -68,7 +68,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
 
    cfd = e_config_dialog_new(con, _("File Icon"), "E", 
 			     "_config_mime_edit_dialog", 
-			     "enlightenment/file_icons", 0, v, cfdata);
+			     "preferences-file-icons", 0, v, cfdata);
    return cfd;
 }
 
diff --git a/src/modules/conf_mime/e_mod_main.c b/src/modules/conf_mime/e_mod_main.c
index f2c0aa6ebe..e817803ffa 100644
--- a/src/modules/conf_mime/e_mod_main.c
+++ b/src/modules/conf_mime/e_mod_main.c
@@ -32,7 +32,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("fileman", 100, _("Files"), NULL, "system-file-manager");
-   e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), NULL, "enlightenment/file_icons", e_int_config_mime);
+   e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), NULL, "preferences-file-icons", e_int_config_mime);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
index 4014278348..5bbe5fc6f9 100644
--- a/src/modules/conf_mouse/e_mod_main.c
+++ b/src/modules/conf_mouse/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
    e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 30, _("Mouse Settings"), NULL, "preferences-desktop-mouse", e_int_config_mouse);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c
index d508fd807a..5b0a7baeae 100644
--- a/src/modules/conf_mouse_cursor/e_mod_main.c
+++ b/src/modules/conf_mouse_cursor/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "preferences-desktop-pointer", e_int_config_cursor);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index 6941a5bf05..52682d6dc2 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -292,7 +292,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    cfdata->gui.o_del_all = ob;
    e_widget_disabled_set(ob, 1);
    e_widget_frametable_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
-   ob = e_widget_button_add(evas, _("Restore Mouse and Wheel Binding Defaults"), "enlightenment/e",
+   ob = e_widget_button_add(evas, _("Restore Mouse and Wheel Binding Defaults"), "enlightenment",
 			    _restore_mouse_binding_defaults_cb, cfdata, NULL);
    e_widget_frametable_object_append(ot, ob, 0, 3, 2, 1, 1, 0, 1, 0);
    e_widget_list_object_append(o, ot, 1, 1, 0.5);
diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c
index b5545da85a..4b69d08481 100644
--- a/src/modules/conf_mousebindings/e_mod_main.c
+++ b/src/modules/conf_mousebindings/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "enlightenment/behavior");
+   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior");
    e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Bindings"), NULL, "preferences-desktop-mouse", e_int_config_mousebindings);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c
index 7c215fdb50..4e44060e0e 100644
--- a/src/modules/conf_paths/e_int_config_paths.c
+++ b/src/modules/conf_paths/e_int_config_paths.c
@@ -61,7 +61,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con, _("Search Path Settings"),
 			    "E", "_config_paths_dialog",
-			     "enlightenment/directories", 0, v, NULL);
+			     "preferences-directories", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c
index 5e1f14b1d1..29932ff2ce 100644
--- a/src/modules/conf_paths/e_mod_main.c
+++ b/src/modules/conf_paths/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
-   e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "enlightenment/directories", e_int_config_paths);
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
+   e_configure_registry_item_add("advanced/search_directories", 50, _("Search Directories"), NULL, "preferences-directories", e_int_config_paths);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c
index 3b8e7f2e05..60ff26ccd8 100644
--- a/src/modules/conf_performance/e_mod_main.c
+++ b/src/modules/conf_performance/e_mod_main.c
@@ -31,7 +31,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
+   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
    e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);   
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c
index ae30883f6e..f6c2ad42ba 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.c
+++ b/src/modules/conf_profiles/e_int_config_profiles.c
@@ -55,7 +55,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Profile Selector"),
 			    "E", "_config_profiles_dialog",
-			     "enlightenment/profiles", 0, v, NULL);
+			     "preferences-profiles", 0, v, NULL);
    e_config_dialog_changed_auto_set(cfd, 0);
    return cfd;
 }
diff --git a/src/modules/conf_profiles/e_mod_main.c b/src/modules/conf_profiles/e_mod_main.c
index 3d8d04f32a..2e954e053b 100644
--- a/src/modules/conf_profiles/e_mod_main.c
+++ b/src/modules/conf_profiles/e_mod_main.c
@@ -18,9 +18,9 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("settings", 80, _("Settings"),
-				     NULL, "enlightenment/settings");
+				     NULL, "preferences-system");
    e_configure_registry_item_add("settings/profiles", 50, _("Profiles"),
-				 NULL, "enlightenment/profiles",
+				 NULL, "preferences-profiles",
 				 e_int_config_profiles);
    conf_module = m;
    e_module_delayed_set(m, 1);
diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_scale/e_int_config_scale.c
index 2535396ab7..9abaf6dd7e 100644
--- a/src/modules/conf_scale/e_int_config_scale.c
+++ b/src/modules/conf_scale/e_int_config_scale.c
@@ -40,7 +40,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Scaling Settings"),
 			     "E", "_config_scale_dialog",
-			     "enlightenment/scale", 0, v, NULL);
+			     "preferences-scale", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_scale/e_mod_main.c b/src/modules/conf_scale/e_mod_main.c
index ffe8deb456..ec78ed31da 100644
--- a/src/modules/conf_scale/e_mod_main.c
+++ b/src/modules/conf_scale/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 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/scale", 90, _("Scaling"), NULL, "enlightenment/scale", e_int_config_scale);
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, "preferences-scale", e_int_config_scale);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 942db76057..42405034e8 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -132,47 +132,47 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
 	if (!label) label = _("Shelf #");
 	snprintf(buf, sizeof(buf), "%s %i", label, es->id);
 
-	ob = edje_object_add(evas);
+	ob = e_icon_add(evas);
         switch (es->cfg->orient)
           {
           case E_GADCON_ORIENT_LEFT:
-             e_util_edje_icon_set(ob, "preferences-position-left");
+             e_util_icon_theme_set(ob, "preferences-position-left");
              break;
           case E_GADCON_ORIENT_RIGHT:
-             e_util_edje_icon_set(ob, "preferences-position-right");
+             e_util_icon_theme_set(ob, "preferences-position-right");
              break;
           case E_GADCON_ORIENT_TOP:
-             e_util_edje_icon_set(ob, "preferences-position-top");
+             e_util_icon_theme_set(ob, "preferences-position-top");
              break;
           case E_GADCON_ORIENT_BOTTOM:
-             e_util_edje_icon_set(ob, "preferences-position-bottom");
+             e_util_icon_theme_set(ob, "preferences-position-bottom");
              break;
           case E_GADCON_ORIENT_CORNER_TL:
-             e_util_edje_icon_set(ob, "preferences-position-top-left");
+             e_util_icon_theme_set(ob, "preferences-position-top-left");
              break;
           case E_GADCON_ORIENT_CORNER_TR:
-             e_util_edje_icon_set(ob, "preferences-position-top-right");
+             e_util_icon_theme_set(ob, "preferences-position-top-right");
              break;
           case E_GADCON_ORIENT_CORNER_BL:
-             e_util_edje_icon_set(ob, "preferences-position-bottom-left");
+             e_util_icon_theme_set(ob, "preferences-position-bottom-left");
              break;
           case E_GADCON_ORIENT_CORNER_BR:
-             e_util_edje_icon_set(ob, "preferences-position-bottom-right");
+             e_util_icon_theme_set(ob, "preferences-position-bottom-right");
              break;
           case E_GADCON_ORIENT_CORNER_LT:
-             e_util_edje_icon_set(ob, "preferences-position-left-top");
+             e_util_icon_theme_set(ob, "preferences-position-left-top");
              break;
           case E_GADCON_ORIENT_CORNER_RT:
-             e_util_edje_icon_set(ob, "preferences-position-right-top");
+             e_util_icon_theme_set(ob, "preferences-position-right-top");
              break;
           case E_GADCON_ORIENT_CORNER_LB:
-             e_util_edje_icon_set(ob, "preferences-position-left-bottom");
+             e_util_icon_theme_set(ob, "preferences-position-left-bottom");
              break;
           case E_GADCON_ORIENT_CORNER_RB:
-             e_util_edje_icon_set(ob, "preferences-position-right-bottom");
+             e_util_icon_theme_set(ob, "preferences-position-right-bottom");
              break;
           default:
-             e_util_edje_icon_set(ob, "enlightenment/e");
+             e_util_icon_theme_set(ob, "enlightenment");
              break;
           }
 	e_widget_ilist_append(cfdata->o_list, ob, buf, 
diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c
index be51f71595..60fb9e7a99 100644
--- a/src/modules/conf_shelves/e_mod_main.c
+++ b/src/modules/conf_shelves/e_mod_main.c
@@ -35,7 +35,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
+   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions");
    e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "preferences-desktop-shelf", e_int_config_shelf);
    maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL);
 
diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c
index 1a45630e45..b6af9b0a19 100644
--- a/src/modules/conf_startup/e_int_config_startup.c
+++ b/src/modules/conf_startup/e_int_config_startup.c
@@ -38,7 +38,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Startup Settings"),
 			     "E", "_config_startup_dialog",
-			     "enlightenment/startup", 0, v, NULL);
+			     "preferences-startup", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_startup/e_mod_main.c b/src/modules/conf_startup/e_mod_main.c
index e0dce6b458..9949633190 100644
--- a/src/modules/conf_startup/e_mod_main.c
+++ b/src/modules/conf_startup/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 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/startup", 90, _("Startup"), NULL, "enlightenment/startup", e_int_config_startup);
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, "preferences-startup", e_int_config_startup);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index 447d8db2db..a163e9a03c 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -397,7 +397,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 			   _cb_import, cfdata, NULL);
    e_widget_list_object_append(il, o, 1, 0, 0.5);
 #ifdef HAVE_EXCHANGE
-   o = e_widget_button_add(evas, _(" Online..."), "enlightenment/website",
+   o = e_widget_button_add(evas, _(" Online..."), "network-website",
 			   _cb_web, cfdata, NULL);
    e_widget_list_object_append(il, o, 1, 0, 0.5);
 #endif
@@ -859,8 +859,8 @@ _cb_adv_btn_assign(void *data1, void *data2)
 
    evas = evas_object_evas_get(oc);
    n = e_widget_ilist_selected_get(oc);
-   ic = edje_object_add(evas);
-   e_util_edje_icon_set(ic, "enlightenment/e");
+   ic = e_icon_add(evas);
+   e_util_icon_theme_set(ic, "enlightenment");
    e_widget_ilist_nth_icon_set(oc, n, ic);
 
    newtheme = malloc(sizeof(E_Config_Theme));
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index 37a0e18672..480817149f 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -35,7 +35,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    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);
 
diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c
index 2308561f37..be4e961188 100644
--- a/src/modules/conf_transitions/e_int_config_transitions.c
+++ b/src/modules/conf_transitions/e_int_config_transitions.c
@@ -43,7 +43,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con, _("Transition Settings"),
 			     "E", "_config_transitions_dialog",
-			     "enlightenment/transitions", 0, v, NULL);
+			     "preferences-transitions", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_transitions/e_mod_main.c b/src/modules/conf_transitions/e_mod_main.c
index cc2a707141..909ccb9445 100644
--- a/src/modules/conf_transitions/e_mod_main.c
+++ b/src/modules/conf_transitions/e_mod_main.c
@@ -31,8 +31,8 @@ EAPI E_Module_Api e_modapi =
 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/transitions", 80, _("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL, "preferences-transitions", e_int_config_transitions);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
index e45c5f8a1d..70390e972b 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
@@ -549,13 +549,13 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_button_add(evas, _("Picture..."), "folder-image",
 			    _cb_import, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0);
-   ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
+   ow = e_widget_button_add(evas, _("Gradient..."), "preferences-gradient",
 			    _cb_gradient, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
 #ifdef HAVE_EXCHANGE
    if (online)
      {
-        ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
+        ow = e_widget_button_add(evas, _("Online..."), "network-website",
                                  _cb_web, cfdata, NULL);
         e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
      }
@@ -677,13 +677,13 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_button_add(evas, _("Picture..."), "folder-image",
 			    _cb_import, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 0, 0);
-   ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
+   ow = e_widget_button_add(evas, _("Gradient..."), "preferences-gradient",
 			    _cb_gradient, cfdata, NULL);
    e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
 #ifdef HAVE_EXCHANGE
    if (online)
      {
-        ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
+        ow = e_widget_button_add(evas, _("Online..."), "network-website",
                                  _cb_web, cfdata, NULL);
         e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
      }
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
index fe3fafcf14..cd435be014 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
@@ -201,7 +201,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
    e_dialog_resizable_set(dia, 0);
    e_dialog_show(dia);
    
-   e_dialog_border_icon_set(dia, "enlightenment/gradient");
+   e_dialog_border_icon_set(dia, "preferences-gradient");
    return dia;
 }
 
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
index 0af91960f2..842d3c7053 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
@@ -120,7 +120,7 @@ e_int_config_wallpaper_web(E_Config_Dialog *parent)
    web->parent = parent;
 
    e_dialog_title_set(dia, _("Exchange wallpapers"));
-   e_dialog_border_icon_set(dia, "enlightenment/website");
+   e_dialog_border_icon_set(dia, "network-website");
    e_dialog_resizable_set(dia, 1);
    e_dialog_button_add(dia, _("Close"), NULL, _web_close_cb, web);
 
diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c
index 9c4dabe772..2299699939 100644
--- a/src/modules/conf_wallpaper/e_mod_main.c
+++ b/src/modules/conf_wallpaper/e_mod_main.c
@@ -25,7 +25,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "preferences-desktop-wallpaper", e_int_config_wallpaper);
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
    e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
diff --git a/src/modules/conf_window_focus/e_int_config_focus.c b/src/modules/conf_window_focus/e_int_config_focus.c
index f87dc409ab..e0b1d9320e 100644
--- a/src/modules/conf_window_focus/e_int_config_focus.c
+++ b/src/modules/conf_window_focus/e_int_config_focus.c
@@ -49,7 +49,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Focus Settings"),
 			     "E", "_config_focus_dialog",
-			     "enlightenment/focus", 0, v, NULL);
+			     "preferences-focus", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_window_focus/e_mod_main.c b/src/modules/conf_window_focus/e_mod_main.c
index 5e2d2f83d8..43559c635f 100644
--- a/src/modules/conf_window_focus/e_mod_main.c
+++ b/src/modules/conf_window_focus/e_mod_main.c
@@ -32,7 +32,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
-   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "enlightenment/focus", e_int_config_focus);
+   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "preferences-focus", e_int_config_focus);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
index 09cb955c7a..ab8620bbba 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
@@ -50,7 +50,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Window Geometry"),
 			     "E", "_config_window_geometry_dialog",
-			     "enlightenment/window_manipulation", 0, v, NULL);
+			     "preferences-window-manipulation", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
index 45f319375a..e48f407852 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
@@ -43,7 +43,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Window Maximize Policy"),
 			     "E", "_config_window_maxpolicy_dialog",
-			     "enlightenment/window_manipulation", 0, v, NULL);
+			     "preferences-window-manipulation", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
index 69bf61f14d..033e9619e3 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
@@ -44,7 +44,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Window Stacking"),
 			     "E", "_config_window_stacking_dialog",
-			     "enlightenment/window_stacking", 0, v, NULL);
+			     "preferences-window-stacking", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c
index ce159f3c33..7d38942efd 100644
--- a/src/modules/conf_window_manipulation/e_mod_main.c
+++ b/src/modules/conf_window_manipulation/e_mod_main.c
@@ -32,9 +32,9 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
-   e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "enlightenment/window_geometry", e_int_config_window_geometry);
-   e_configure_registry_item_add("windows/window_stacking", 30, _("Window Stacking"), NULL, "enlightenment/window_stacking", e_int_config_window_stacking);
-   e_configure_registry_item_add("windows/window_maxpolicy", 30, _("Window Maximize Policy"), NULL, "enlightenment/window_maximize", e_int_config_window_maxpolicy);
+   e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "preferences-window-geometry", e_int_config_window_geometry);
+   e_configure_registry_item_add("windows/window_stacking", 30, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking);
+   e_configure_registry_item_add("windows/window_maxpolicy", 30, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c
index 338e376ee3..8cdb450f5e 100644
--- a/src/modules/conf_window_remembers/e_int_config_remembers.c
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.c
@@ -152,8 +152,8 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
    ll = e_config->remembers;
    ll = eina_list_sort(ll, -1, _cb_sort);
 
-   ic = edje_object_add(evas);
-   e_util_edje_icon_set(ic, "enlightenment/applications");
+   ic = e_icon_add(evas);
+   e_util_icon_theme_set(ic, "preferences-applications");
    e_widget_ilist_header_append(cfdata->list, ic, _("Applications"));
 
    for (l = ll; l; l = l->next) 
@@ -177,8 +177,8 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
           e_widget_ilist_append(cfdata->list, NULL, rem->role, NULL, rem, NULL);
      }
 
-   ic = edje_object_add(evas);
-   e_util_edje_icon_set(ic, "enlightenment/e");
+   ic = e_icon_add(evas);
+   e_util_icon_theme_set(ic, "enlightenment");
    e_widget_ilist_header_append(cfdata->list, ic, _("Enlightenment"));
    for (l = ll; l; l = l->next)
      {
diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/conf_winlist/e_int_config_winlist.c
index bf6bdc20a7..8d37e70239 100644
--- a/src/modules/conf_winlist/e_int_config_winlist.c
+++ b/src/modules/conf_winlist/e_int_config_winlist.c
@@ -54,7 +54,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
    cfd = e_config_dialog_new(con,
 			     _("Window List Settings"),
 			     "E", "_config_winlist_dialog",
-			     "enlightenment/winlist", 0, v, NULL);
+			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
 
diff --git a/src/modules/conf_winlist/e_mod_main.c b/src/modules/conf_winlist/e_mod_main.c
index 2cd21b58d2..0d0a05dcb6 100644
--- a/src/modules/conf_winlist/e_mod_main.c
+++ b/src/modules/conf_winlist/e_mod_main.c
@@ -32,7 +32,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
-   e_configure_registry_item_add("windows/window_list", 30, _("Window List"), NULL, "enlightenment/winlist", e_int_config_winlist);
+   e_configure_registry_item_add("windows/window_list", 30, _("Window List"), NULL, "preferences-winlist", e_int_config_winlist);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 5a51553ac5..f35943bb2d 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -382,7 +382,7 @@ _cpufreq_set_governor(const char *governor)
 	dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
 	if (!dia) return;
 	e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
-	e_dialog_icon_set(dia, "enlightenment/e", 64);
+	e_dialog_icon_set(dia, "enlightenment", 64);
 	e_dialog_text_set(dia, _("There was an error trying to set the<br>"
 				 "cpu frequency governor via the module's<br>"
 				 "setfreq utility."));
@@ -408,7 +408,7 @@ _cpufreq_set_frequency(int frequency)
 	dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
 	if (!dia) return;
 	e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
-	e_dialog_icon_set(dia, "enlightenment/e", 64);
+	e_dialog_icon_set(dia, "enlightenment", 64);
 	e_dialog_text_set(dia, _("Your kernel does not support setting the<br>"
 				 "CPU frequency at all. You may be missing<br>"
 				 "Kernel modules or features, or your CPU<br>"
@@ -428,7 +428,7 @@ _cpufreq_set_frequency(int frequency)
 	dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_e_mod_cpufreq_error_setfreq");
 	if (!dia) return;
 	e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
-	e_dialog_icon_set(dia, "enlightenment/e", 64);
+	e_dialog_icon_set(dia, "enlightenment", 64);
 	e_dialog_text_set(dia, _("There was an error trying to set the<br>"
 				 "cpu frequency setting via the module's<br>"
 				 "setfreq utility."));
diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c
index ab2fb88e5f..a6f061423f 100644
--- a/src/modules/dropshadow/e_mod_main.c
+++ b/src/modules/dropshadow/e_mod_main.c
@@ -86,7 +86,7 @@ e_modapi_init(E_Module *m)
    
    ds = _ds_init(m);
    snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(m));
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "enlightenment/appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
    e_configure_registry_item_add("appearance/dropshadow", 150, _("Dropshadow"), NULL, buf, e_int_config_dropshadow_module);
    
    dropshadow_mod = m;
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 1747df7304..e346b73a79 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -1601,7 +1601,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
    e_widget_min_size_get(ot, &mw, &mh);
    e_dialog_content_set(dia, ot, mw, mh);
    e_dialog_show(dia);
-   e_dialog_border_icon_set(dia, "enlightenment/applications");
+   e_dialog_border_icon_set(dia, "preferences-applications");
 }
 
 static void
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 4c1059a7f0..703afd600d 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -699,7 +699,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
 
    mi = e_menu_item_new(menu);
    e_menu_item_label_set(mi, _("Appearance"));
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
+   e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
    e_menu_item_submenu_set(mi, mn);
    e_object_del(E_OBJECT(mn));
 
@@ -727,7 +727,7 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
 
    mi = e_menu_item_new(menu);
    e_menu_item_label_set(mi, _("Behavior"));
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/appearance");
+   e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
    e_menu_item_submenu_set(mi, mn);
    e_object_del(E_OBJECT(mn));
 
diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c
index 4eb8f22b72..9ef427d4d3 100644
--- a/src/modules/gadman/e_mod_main.c
+++ b/src/modules/gadman/e_mod_main.c
@@ -23,7 +23,7 @@ e_modapi_init(E_Module *m)
    /* Set up a new configuration panel */
    snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", m->dir);
    e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, 
-                                     "enlightenment/extensions");
+                                     "preferences-extensions");
    e_configure_registry_item_add("extensions/gadman", 150, _("Gadgets"), NULL, 
                                  buf, _config_gadman_module);
 
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index f721308606..131a63c054 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -164,7 +164,7 @@ _cb_add(void *data, void *data2)
    E_Config_Dialog_Data *cfdata;
    
    cfdata = data;
-   e_entry_dialog_show(_("Create new IBar source"), "enlightenment/e",
+   e_entry_dialog_show(_("Create new IBar source"), "enlightenment",
 		       _("Enter a name for this new source:"), "", NULL, NULL,
 		       _cb_entry_ok, NULL, cfdata);
 }
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 01d673e2d4..31b2a1474a 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -1080,7 +1080,7 @@ static void
 _mixer_configure_registry_register(void)
 {
    e_configure_registry_category_add(_reg_cat, 90, _("Extensions"), NULL,
-                                     "enlightenment/extensions");
+                                     "preferences-extensions");
    e_configure_registry_item_add(_reg_item, 30, _(_Name), NULL,
 				  "preferences-desktop-mixer",
 				 _mixer_module_config);
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 917579d0ea..35dc696adc 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -2795,7 +2795,7 @@ e_modapi_init(E_Module *m)
    e_gadcon_provider_register(&_gadcon_class);
 
    e_configure_registry_item_add("extensions/pager", 40, N_("Pager"), NULL,
-				 "enlightenment/pager", _pager_config_dialog);
+				 "preferences-pager", _pager_config_dialog);
 
    act_popup_show = e_action_add("pager_show");
    if (act_popup_show)
diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c
index 0478cc0d6d..9b3aa1c780 100644
--- a/src/modules/syscon/e_mod_main.c
+++ b/src/modules/syscon/e_mod_main.c
@@ -120,6 +120,6 @@ _e_mod_menu_add(void *data, E_Menu *m)
 
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("System"));
-   e_util_menu_item_theme_icon_set(mi, "enlightenment/system");
+   e_util_menu_item_theme_icon_set(mi, "system");
    e_menu_item_callback_set(mi, _e_mod_syscon_cb, NULL);
 }