diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 14e4625c8..00f067e50 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -150,17 +150,6 @@ e_modapi_init(E_Module *m)
    evry_view_help_init();
    evry_gadget_init();
 
-   /* hack to get start icon right */
-   {
-      Evry_Plugin *p = evry_plugin_find("Start");
-      if (p)
-        {
-           Evry_Item *it = EVRY_ITEM(p);
-           eina_stringshare_replace(&it->icon, "start-here");
-        }
-   }
-
-
    e_module_priority_set(m, -1000);
    e_module_delayed_set(m, 1);
 
diff --git a/src/modules/everything/evry_plug_collection.c b/src/modules/everything/evry_plug_collection.c
index 77dd989a7..0c949dfcf 100644
--- a/src/modules/everything/evry_plug_collection.c
+++ b/src/modules/everything/evry_plug_collection.c
@@ -11,7 +11,6 @@ struct _Plugin
 };
 
 static Eina_List *plugins = NULL;
-static const char _module_icon[] = "preferences-plugin";
 static Evry_Type COLLECTION_PLUGIN;
 static Plugin_Config plugin_config;
 
@@ -139,7 +138,7 @@ _add_plugin(const char *name)
    char path[4096];
    char title[4096];
 
-   p = EVRY_PLUGIN_BASE(name, _module_icon, COLLECTION_PLUGIN,
+   p = EVRY_PLUGIN_BASE(name, NULL, COLLECTION_PLUGIN,
 			_begin, _finish, _fetch);
    p->browse = &_browse;
 
@@ -173,6 +172,8 @@ evry_plug_collection_init(void)
 
    p = _add_plugin("Plugins");
    p->begin = &_begin_all;
+   EVRY_ITEM_ICON_SET(p, "preferences-plugin");
+
    if (evry_plugin_register(p, EVRY_PLUGIN_SUBJECT, 100))
      {
 	p->config->aggregate = EINA_TRUE;
@@ -183,6 +184,7 @@ evry_plug_collection_init(void)
    EINA_LIST_FOREACH(evry_conf->collections, l, pc)
      {
 	p = _add_plugin(pc->name); 
+	EVRY_ITEM_ICON_SET(p, "start-here");
 	p->config = pc;
 	pc->plugin = p;