diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 467e14dc2..0e98c8831 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1733,7 +1733,7 @@ e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu)
         mn = e_menu_new();
         mi = e_menu_item_new(menu);
         e_menu_item_label_set(mi, _("Move to"));
-        e_util_menu_item_theme_icon_set(mi, "preferences-look");
+        e_util_menu_item_theme_icon_set(mi, "transform-move");
         e_menu_item_submenu_set(mi, mn);
         e_menu_pre_activate_callback_set(mn, _e_gadcon_gadget_move_to_pre_cb, gcc);
         e_object_unref(E_OBJECT(mn));
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 3f273bc70..79b652567 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1632,7 +1632,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
      e_menu_item_label_set(mi, _("Stop Moving Gadgets"));
    else
      e_menu_item_label_set(mi, _("Begin Moving Gadgets"));
-   e_util_menu_item_theme_icon_set(mi, "transform-scale");
+   e_util_menu_item_theme_icon_set(mi, "transform-move");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es);
 }
 
diff --git a/src/modules/conf/e_mod_config.c b/src/modules/conf/e_mod_config.c
index 6e0f93b50..fb876ee5d 100644
--- a/src/modules/conf/e_mod_config.c
+++ b/src/modules/conf/e_mod_config.c
@@ -17,7 +17,6 @@ e_int_config_conf_module(Evas_Object *parent EINA_UNUSED, const char *params EIN
 {
    E_Config_Dialog *cfd = NULL;
    E_Config_Dialog_View *v = NULL;
-   char buf[PATH_MAX];
 
    /* is this config dialog already visible ? */
    if (e_config_dialog_find("Conf", "advanced/conf")) return NULL;
@@ -31,9 +30,8 @@ e_int_config_conf_module(Evas_Object *parent EINA_UNUSED, const char *params EIN
    v->basic.apply_cfdata = _basic_apply;
    v->basic.check_changed = _basic_check_changed;
 
-   snprintf(buf, sizeof(buf), "%s/e-module-conf.edj", conf->module->dir);
    cfd = e_config_dialog_new(NULL, _("Configuration Panel"), "Conf",
-                             "advanced/conf", buf, 0, v, NULL);
+                             "advanced/conf", "preferences-panel", 0, v, NULL);
 
    conf->cfd = cfd;
    return cfd;
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index 83d1975df..903512607 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -261,8 +261,6 @@ E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Conf" };
 E_API void *
 e_modapi_init(E_Module *m)
 {
-   char buf[PATH_MAX];
-
    conf_module = m;
 
    /* add module supplied action */
@@ -276,13 +274,11 @@ e_modapi_init(E_Module *m)
    maug =
      e_int_menus_menu_augmentation_add_sorted("config/0", _("Settings Panel"),
                                               _e_mod_menu_add, NULL, NULL, NULL);
-   snprintf(buf, sizeof(buf), "%s/e-module-conf.edj",
-            e_module_dir_get(conf_module));
 
    e_configure_registry_category_add("advanced", 80, _("Advanced"),
                                      NULL, "preferences-advanced");
    e_configure_registry_item_add("advanced/conf", 110, _("Configuration Panel"),
-                                 NULL, buf, e_int_config_conf_module);
+                                 NULL, "preferences-panel", e_int_config_conf_module);
 
    conf_edd = E_CONFIG_DD_NEW("Config", Config);
 #undef T
diff --git a/src/modules/connman/e_mod_config.c b/src/modules/connman/e_mod_config.c
index 20193cd50..646b1014d 100644
--- a/src/modules/connman/e_mod_config.c
+++ b/src/modules/connman/e_mod_config.c
@@ -69,7 +69,7 @@ e_connman_config_dialog_new(Evas_Object *parent EINA_UNUSED,
 
    dialog = e_config_dialog_new(NULL, _("Connection Manager"),
        _e_connman_Name, "e_connman_config_dialog_new",
-       e_connman_theme_path(), 0, view, ctxt);
+       "preferences-network", 0, view, ctxt);
 
    return dialog;
 }
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 5a7290527..c3bdffe9f 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -604,7 +604,7 @@ _econnman_configure_registry_register(void)
    e_configure_registry_category_add(_reg_cat, 90, _("Extensions"), NULL,
                                      "preferences-extensions");
    e_configure_registry_item_add(_reg_item, 110, _(_e_connman_Name), NULL,
-                                 e_connman_theme_path(),
+                                 "preferences-network",
                                  _econnman_config);
 }
 
diff --git a/src/modules/cpufreq/e_mod_config.c b/src/modules/cpufreq/e_mod_config.c
index 6af5a7d4e..44d1e094a 100644
--- a/src/modules/cpufreq/e_mod_config.c
+++ b/src/modules/cpufreq/e_mod_config.c
@@ -24,7 +24,6 @@ e_int_config_cpufreq_module(Evas_Object *parent EINA_UNUSED, const char *params
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   char buf[PATH_MAX];
 
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
@@ -33,11 +32,9 @@ e_int_config_cpufreq_module(Evas_Object *parent EINA_UNUSED, const char *params
    v->basic.create_widgets = _basic_create_widgets;
    v->basic.check_changed = _basic_check_changed;
 
-   snprintf(buf, sizeof(buf), "%s/e-module-cpufreq.edj",
-            e_module_dir_get(cpufreq_config->module));
    cfd = e_config_dialog_new(NULL, _("Cpu Frequency Control Settings"),
                              "E", "_e_mod_cpufreq_config_dialog",
-                             buf, 0, v, NULL);
+                             "preferences-cpu-speed", 0, v, NULL);
    cpufreq_config->config_dialog = cfd;
    return cfd;
 }
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 677f360bf..0f032374f 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -1435,7 +1435,6 @@ E_API E_Module_Api e_modapi =
 E_API void *
 e_modapi_init(E_Module *m)
 {
-   char buf[PATH_MAX];
    Eina_List *l;
 
    conf_edd = E_CONFIG_DD_NEW("Cpufreq_Config", Config);
@@ -1497,11 +1496,10 @@ e_modapi_init(E_Module *m)
    cpufreq_config->module = m;
 
    e_gadcon_provider_register(&_gadcon_class);
-   snprintf(buf, sizeof(buf), "%s/e-module-cpufreq.edj", e_module_dir_get(m));
    e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL,
                                      "preferences-advanced");
    e_configure_registry_item_add("advanced/cpufreq", 120, _("CPU Frequency"),
-                                 NULL, buf, e_int_config_cpufreq_module);
+                                 NULL, "preferences-cpu-speed", e_int_config_cpufreq_module);
    return m;
 }
 
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 38949a4b2..0a8d35f1c 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -13,7 +13,6 @@ static Eina_List *_evry_types = NULL;
 static E_Int_Menu_Augmentation *maug = NULL;
 static E_Action *act = NULL;
 static Ecore_Timer *cleanup_timer;
-static const char *module_icon = NULL;
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *plugin_conf_edd = NULL;
 static E_Config_DD *gadget_conf_edd = NULL;
@@ -35,7 +34,6 @@ e_modapi_init(E_Module *m)
 {
    Eina_List *l;
    Evry_Module *em;
-   char buf[4096];
 
    _mod_evry = m;
 
@@ -57,12 +55,9 @@ e_modapi_init(E_Module *m)
    e_configure_registry_category_add
      ("launcher", 80, _("Launcher"), NULL, "modules-launcher");
 
-   snprintf(buf, sizeof(buf), "%s/e-module-everything.edj", e_module_dir_get(m));
-   module_icon = eina_stringshare_add(buf);
-
    e_configure_registry_item_add
      ("launcher/run_everything", 40, _("Everything Configuration"),
-     NULL, module_icon, evry_config_dialog);
+     NULL, "everything-launch", evry_config_dialog);
    evry_init();
 
    _evry_type_init("NONE");
@@ -203,9 +198,6 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
         maug = NULL;
      }
 
-   if (module_icon)
-     eina_stringshare_del(module_icon);
-
    /* Clean EET */
    E_CONFIG_DD_FREE(conf_edd);
    E_CONFIG_DD_FREE(plugin_conf_edd);
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index b10fc3040..f30bf5d5f 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -1062,7 +1062,7 @@ _attach_menu(void *data EINA_UNUSED, E_Gadcon_Client *gcc, E_Menu *menu)
    /* Move / resize*/
    mi = e_menu_item_new(menu);
    e_menu_item_label_set(mi, _("Begin move/resize"));
-   e_util_menu_item_theme_icon_set(mi, "transform-scale");
+   e_util_menu_item_theme_icon_set(mi, "transform-move");
    e_menu_item_callback_set(mi, on_menu_edit, gcc);
 
    /* plain / inset */
diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c
index b326dd93d..e71eceea0 100644
--- a/src/modules/notification/e_mod_main.c
+++ b/src/modules/notification/e_mod_main.c
@@ -156,15 +156,13 @@ _notification_cb_close(void *data EINA_UNUSED, unsigned int id)
 E_API void *
 e_modapi_init(E_Module *m)
 {
-   char buf[PATH_MAX];
-
-   snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", m->dir);
    /* register config panel entry */
    e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
                                      "preferences-extensions");
    e_configure_registry_item_add("extensions/notification", 30,
                                  _("Notification"), NULL,
-                                 buf, e_int_config_notification_module);
+                                 "preferences-notification",
+                                 e_int_config_notification_module);
 
 
    conf_edd = E_CONFIG_DD_NEW("Notification_Config", Config);
diff --git a/src/modules/quickaccess/e_mod_config.c b/src/modules/quickaccess/e_mod_config.c
index 57d5e30d9..d4683e73c 100644
--- a/src/modules/quickaccess/e_mod_config.c
+++ b/src/modules/quickaccess/e_mod_config.c
@@ -551,7 +551,6 @@ e_int_config_qa_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   char buf[PATH_MAX];
 
    if (qa_mod->cfd) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
@@ -565,8 +564,7 @@ e_int_config_qa_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_
    v->advanced.create_widgets = _advanced_create_widgets;
    v->advanced.check_changed = _advanced_check_changed;
 
-   snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
    cfd = e_config_dialog_new(NULL, _("Quickaccess Settings"),
-                             "E", "launcher/quickaccess", buf, 32, v, NULL);
+                             "E", "launcher/quickaccess", "preferences-applications-personal", 32, v, NULL);
    return cfd;
 }
diff --git a/src/modules/quickaccess/e_mod_main.c b/src/modules/quickaccess/e_mod_main.c
index 2afdece8d..48b57b733 100644
--- a/src/modules/quickaccess/e_mod_main.c
+++ b/src/modules/quickaccess/e_mod_main.c
@@ -45,13 +45,10 @@ _e_modapi_shutdown(void)
 E_API void *
 e_modapi_init(E_Module *m)
 {
-   char buf[PATH_MAX];
-
-   snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(m));
    e_configure_registry_category_add("launcher", 80, _("Launcher"), NULL,
                                      "modules-launcher");
    e_configure_registry_item_add("launcher/quickaccess", 1, _("Quickaccess"), NULL,
-                                 buf, e_int_config_qa_module);
+                                 "preferences-applications-personal", e_int_config_qa_module);
 
    qa_mod = E_NEW(Mod, 1);
    qa_mod->module = m;