diff --git a/data/themes/edc/icons.edc b/data/themes/edc/icons.edc
index f02cc2759..5ad225a26 100644
--- a/data/themes/edc/icons.edc
+++ b/data/themes/edc/icons.edc
@@ -32,6 +32,7 @@
    ICON("preferences-desktop-signal-bindings",    80, "icon_preferences-desktop-signal-bindings.png")
    ICON("preferences-variables",                  80, "icon_preferences-variables.png")
    ICON("preferences-interaction",                80, "icon_preferences-interaction.png")
+   ICON("preferences-composite",                  80, "icon_preferences-composite.png")
 
    ICON("enlightenment/wallpaper_stretch",          80, "icon_wallpaper_stretch.png")
    ICON("enlightenment/wallpaper_center",           80, "icon_wallpaper_center.png")
diff --git a/data/themes/img/icon_preferences-composite.png b/data/themes/img/icon_preferences-composite.png
new file mode 100644
index 000000000..b6497df6b
Binary files /dev/null and b/data/themes/img/icon_preferences-composite.png differ
diff --git a/src/modules/Makefile_conf_comp.am b/src/modules/Makefile_conf_comp.am
index f97f2e05b..3eb29bbe2 100644
--- a/src/modules/Makefile_conf_comp.am
+++ b/src/modules/Makefile_conf_comp.am
@@ -1,6 +1,5 @@
 conf_compdir = $(MDIR)/conf_comp
-conf_comp_DATA = conf_comp/e-module-comp.edj \
-	    conf_comp/module.desktop
+conf_comp_DATA = conf_comp/module.desktop
 
 EXTRA_DIST += $(comp_DATA)
 
diff --git a/src/modules/conf_comp/e-module-comp.edj b/src/modules/conf_comp/e-module-comp.edj
deleted file mode 100644
index 2c1f4d26e..000000000
Binary files a/src/modules/conf_comp/e-module-comp.edj and /dev/null differ
diff --git a/src/modules/conf_comp/e_mod_config.c b/src/modules/conf_comp/e_mod_config.c
index 56bed0753..fbde3b998 100644
--- a/src/modules/conf_comp/e_mod_config.c
+++ b/src/modules/conf_comp/e_mod_config.c
@@ -95,7 +95,6 @@ e_int_config_comp_module(E_Container *con,
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   char buf[4096];
    Mod *mod = _comp_mod;
 
    if (e_config_dialog_find("E", "appearance/comp")) return NULL;
@@ -108,10 +107,8 @@ e_int_config_comp_module(E_Container *con,
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
    
-   snprintf(buf, sizeof(buf), "%s/e-module-comp.edj",
-            e_module_dir_get(mod->module));
    cfd = e_config_dialog_new(con, _("Composite Settings"),
-                             "E", "appearance/comp", buf, 0, v, mod);
+                             "E", "appearance/comp", "preferences-composite", 0, v, mod);
    mod->config_dialog = cfd;
    return cfd;
 }
diff --git a/src/modules/conf_comp/e_mod_main.c b/src/modules/conf_comp/e_mod_main.c
index 35b50aa8d..affa2296b 100644
--- a/src/modules/conf_comp/e_mod_main.c
+++ b/src/modules/conf_comp/e_mod_main.c
@@ -27,12 +27,10 @@ static void
 _e_mod_config_menu_create(void *d EINA_UNUSED, E_Menu *m)
 {
    E_Menu_Item *mi;
-   char buf[4096];
 
    mi = e_menu_item_new(m);
-   snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(_comp_mod->module));
    e_menu_item_label_set(mi, _("Composite"));
-   e_menu_item_icon_file_set(mi, buf);
+   e_util_menu_item_theme_icon_set(mi, "preferences-composite");
    e_menu_item_callback_set(mi, _e_mod_comp_conf_cb, NULL);
 }
 
@@ -40,7 +38,6 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    Mod *mod;
-   char buf[4096];
    E_Comp_Config *conf;
 
    conf = e_comp_config_get();
@@ -54,11 +51,10 @@ e_modapi_init(E_Module *m)
    m->data = mod;
 
    mod->module = m;
-   snprintf(buf, sizeof(buf), "%s/e-module-comp.edj", e_module_dir_get(m));
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
                                      "preferences-look");
    e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL,
-                                 buf, e_int_config_comp_module);
+                                 "preferences-composite", e_int_config_comp_module);
 
    mod->conf = conf;
    maug = e_int_menus_menu_augmentation_add_sorted("config/1", _("Composite"), _e_mod_config_menu_create, NULL, NULL, NULL);