diff --git a/data/themes/default.edc b/data/themes/default.edc
index 9fbe098b2..df571d20e 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -29477,7 +29477,8 @@ collections {
    ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings"
    ICON("preferences-advanced","icon_advanced.png",64)           // *** // "enlightenment/advanced"
    ICON("preferences-behavior","icon_behavior.png",64)           // *** // "enlightenment/behavior"
-   ICON("preferences-appearance","icon_appearance.png",64)       // *** // "enlightenment/appearance"
+   ICON("preferences-look","icon_look.png",64)                   // *** // "enlightenment/look"
+   ICON("preferences-utils","icon_gadget.png",64)                // *** // "enlightenment/utils"
    ICON("preferences-extensions","icon_extensions.png",64)       // *** // "enlightenment/extensions"
    ICON("preferences-file-icons","icon_file_icons.png",64)       // *** // "enlightenment/file_icons"
    ICON("preferences-pager","icon_pager.png",64)                 // *** // "enlightenment/pager"
diff --git a/data/themes/images/icon_gadget.png b/data/themes/images/icon_gadget.png
new file mode 100644
index 000000000..0f8413685
Binary files /dev/null and b/data/themes/images/icon_gadget.png differ
diff --git a/data/themes/images/icon_appearance.png b/data/themes/images/icon_look.png
similarity index 100%
rename from data/themes/images/icon_appearance.png
rename to data/themes/images/icon_look.png
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index dcf9b7b63..891b86ee5 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7718,7 +7718,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, "preferences-appearance");
+	     e_util_menu_item_theme_icon_set(mi, "preferences-look");
 	     e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
 	  }
 	if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
@@ -7878,7 +7878,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, "preferences-appearance");
+	     e_util_menu_item_theme_icon_set(mi, "preferences-look");
 	     e_menu_item_submenu_pre_callback_set(mi, _e_fm2_icon_view_menu_pre, sd);
 	  }
 	if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 61db15c25..8e8808a06 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1327,7 +1327,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-appearance");
+	e_util_menu_item_theme_icon_set(mi, "preferences-look");
 	e_menu_item_submenu_set(mi, mn);
 	e_menu_pre_activate_callback_set(mn, _e_gadcon_gadget_move_to_pre_cb, gcc);
      }
@@ -1393,8 +1393,8 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_main,
              e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc);
 
              mi = e_menu_item_new(menu_gadget);
-             e_menu_item_label_set(mi, _("Appearance"));
-             e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
+             e_menu_item_label_set(mi, _("Look"));
+             e_util_menu_item_theme_icon_set(mi, "preferences-look");
              e_menu_item_submenu_set(mi, mo);
           }
 
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 81d757a94..0b6c6f372 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -49,12 +49,12 @@ static const CFTypes _types[] =
 {
 #define _CFT(k, n, i)				\
   {sizeof(k) - 1, k, n, i}
-  _CFT("appearance", N_("Appearance"), "preferences-appearance"),
+  _CFT("utils", N_("Utils"), "preferences-utils"),
+  _CFT("look", N_("Look"), "preferences-look"),
+  _CFT("system", N_("System"), "system"),
   _CFT("config", N_("Settings"), "preferences-system"),
   _CFT("everything", N_("Everything Launcher"), "system-run"),
   _CFT("fileman", N_("File Manager"), "system-file-manager"),
-  _CFT("shelf", N_("Shelf"), "preferences-desktop-shelf"),
-  _CFT("system", N_("System"), "system"),
 #undef _CFT
   {0, NULL, NULL, NULL}
 };
@@ -452,7 +452,7 @@ _load_modules(const char *dir, Eina_Hash *types_hash)
 	  type = eina_hash_find(desk->x, "X-Enlightenment-ModuleType");
 	else
 	  type = NULL;
-	if (!type) type = "shelf"; // todo: warn?
+	if (!type) type = "utils"; // todo: warn?
 
 	cft = eina_hash_find(types_hash, type);
 	if (cft)
diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop.in
index cea073b60..752926cac 100644
--- a/src/modules/clock/module.desktop.in
+++ b/src/modules/clock/module.desktop.in
@@ -16,6 +16,7 @@ Name[tr]=Saat
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-clock
+X-Enlightenment-ModuleType=utils
 Comment=Nice clock gadget to show current time.
 Comment[cs]=Gadget pro zobrazení aktuálního času.
 Comment[de]=
diff --git a/src/modules/comp/e_mod_main.c b/src/modules/comp/e_mod_main.c
index 5ae600d3c..32aa7090a 100644
--- a/src/modules/comp/e_mod_main.c
+++ b/src/modules/comp/e_mod_main.c
@@ -39,7 +39,7 @@ e_modapi_init(E_Module *m)
    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-appearance");
+                                     "preferences-look");
    e_configure_registry_item_add("appearance/comp", 120, _("Composite"), NULL, 
                                  buf, e_int_config_comp_module);
 
diff --git a/src/modules/comp/module.desktop.in b/src/modules/comp/module.desktop.in
index 9ca1840be..593206f91 100644
--- a/src/modules/comp/module.desktop.in
+++ b/src/modules/comp/module.desktop.in
@@ -5,4 +5,4 @@ Icon=e-module-comp
 Comment=
 Comment[fr]=
 Comment[it]=
-X-Enlightenment-ModuleType=appearance
+X-Enlightenment-ModuleType=look
diff --git a/src/modules/conf_borders/e_mod_main.c b/src/modules/conf_borders/e_mod_main.c
index 78c365292..d35f696f3 100644
--- a/src/modules/conf_borders/e_mod_main.c
+++ b/src/modules/conf_borders/e_mod_main.c
@@ -14,7 +14,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
    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_colors/e_mod_main.c b/src/modules/conf_colors/e_mod_main.c
index 94e4301a6..4be948084 100644
--- a/src/modules/conf_colors/e_mod_main.c
+++ b/src/modules/conf_colors/e_mod_main.c
@@ -15,7 +15,7 @@ EAPI void *
 e_modapi_init(E_Module *m __UNUSED__)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
-                                     "preferences-appearance");
+                                     "preferences-look");
    e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
                                  "preferences-desktop-color",
                                  e_int_config_color_classes);
diff --git a/src/modules/conf_fonts/e_mod_main.c b/src/modules/conf_fonts/e_mod_main.c
index faa0dbe33..66b5a3bb4 100644
--- a/src/modules/conf_fonts/e_mod_main.c
+++ b/src/modules/conf_fonts/e_mod_main.c
@@ -15,7 +15,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-appearance");
+                                     "preferences-look");
    e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, 
                                  "preferences-desktop-font", 
                                  e_int_config_fonts);
diff --git a/src/modules/conf_icon_theme/e_mod_main.c b/src/modules/conf_icon_theme/e_mod_main.c
index 95013a7ed..7d944473d 100644
--- a/src/modules/conf_icon_theme/e_mod_main.c
+++ b/src/modules/conf_icon_theme/e_mod_main.c
@@ -15,7 +15,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
    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);
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c
index ee802fbfd..84aff5cb1 100644
--- a/src/modules/conf_mouse_cursor/e_mod_main.c
+++ b/src/modules/conf_mouse_cursor/e_mod_main.c
@@ -14,7 +14,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
    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_scale/e_mod_main.c b/src/modules/conf_scale/e_mod_main.c
index 0b03dd7ec..92420fefb 100644
--- a/src/modules/conf_scale/e_mod_main.c
+++ b/src/modules/conf_scale/e_mod_main.c
@@ -16,7 +16,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), 
-                                     NULL, "preferences-appearance");
+                                     NULL, "preferences-look");
    e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, 
                                  "preferences-scale", e_int_config_scale);
    conf_module = m;
diff --git a/src/modules/conf_startup/e_mod_main.c b/src/modules/conf_startup/e_mod_main.c
index b6ab93b49..1b4893c4d 100644
--- a/src/modules/conf_startup/e_mod_main.c
+++ b/src/modules/conf_startup/e_mod_main.c
@@ -15,7 +15,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-appearance");
+                                     "preferences-look");
    e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, 
                                  "preferences-startup", e_int_config_startup);
    conf_module = m;
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index e61da81b8..a2919e095 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -19,7 +19,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-appearance");
+                                     "preferences-look");
    e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, 
                                  "preferences-desktop-theme", 
                                  e_int_config_theme);
diff --git a/src/modules/conf_transitions/e_mod_main.c b/src/modules/conf_transitions/e_mod_main.c
index 0df0999ff..a994b7b00 100644
--- a/src/modules/conf_transitions/e_mod_main.c
+++ b/src/modules/conf_transitions/e_mod_main.c
@@ -15,7 +15,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-appearance");
+                                     "preferences-look");
    e_configure_registry_item_add("appearance/transitions", 80, 
                                  _("Transitions"), NULL, 
                                  "preferences-transitions", 
diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c
index 0ccb7db95..db17ad1b1 100644
--- a/src/modules/conf_wallpaper/e_mod_main.c
+++ b/src/modules/conf_wallpaper/e_mod_main.c
@@ -19,7 +19,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-appearance");
+                                     "preferences-look");
    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"), 
diff --git a/src/modules/conf_wallpaper2/e_mod_main.c b/src/modules/conf_wallpaper2/e_mod_main.c
index a57c20773..6c0c7441a 100644
--- a/src/modules/conf_wallpaper2/e_mod_main.c
+++ b/src/modules/conf_wallpaper2/e_mod_main.c
@@ -19,7 +19,7 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
    e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper", wp_conf_show);
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
 //   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper 2"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c
index 1297c2117..0be3bcccf 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, "preferences-appearance");
+   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
    e_configure_registry_item_add("appearance/dropshadow", 150, _("Dropshadow"), NULL, buf, e_int_config_dropshadow_module);
    
    dropshadow_mod = m;
diff --git a/src/modules/dropshadow/module.desktop.in b/src/modules/dropshadow/module.desktop.in
index 6a1e80eab..37ad245e1 100644
--- a/src/modules/dropshadow/module.desktop.in
+++ b/src/modules/dropshadow/module.desktop.in
@@ -21,4 +21,4 @@ Comment[pt_BR]=
 Comment[tr]=Pencerelere gölge ekleyen modül.
 Comment[zh_CN]=
 Comment[zh_TW]=
-X-Enlightenment-ModuleType=appearance
+X-Enlightenment-ModuleType=look
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index e574fd404..ee0414829 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -762,7 +762,7 @@ _attach_menu(void *data __UNUSED__, 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, "preferences-appearance");
+   e_util_menu_item_theme_icon_set(mi, "preferences-look");
    e_menu_item_submenu_set(mi, mn);
    e_object_del(E_OBJECT(mn));
 
@@ -790,7 +790,7 @@ _attach_menu(void *data __UNUSED__, 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, "preferences-appearance");
+   e_util_menu_item_theme_icon_set(mi, "preferences-look");
    e_menu_item_submenu_set(mi, mn);
    e_object_del(E_OBJECT(mn));
 
diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop.in
index 9f75f65f4..d76a45eeb 100644
--- a/src/modules/ibar/module.desktop.in
+++ b/src/modules/ibar/module.desktop.in
@@ -4,6 +4,7 @@ Name=IBar
 Name[cs]=Lišta spouštěčů
 Name[eo]=Breto IBar
 Icon=e-module-ibar
+X-Enlightenment-ModuleType=utils
 Comment=Iconic application launcher.
 Comment[cs]=Lišta se spouštěči.
 Comment[de]=
diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop.in
index fd694fa6f..aeae4abdc 100644
--- a/src/modules/ibox/module.desktop.in
+++ b/src/modules/ibox/module.desktop.in
@@ -3,6 +3,7 @@ Type=Link
 Name=IBox
 Name[eo]=Breto IBox
 Icon=e-module-ibox
+X-Enlightenment-ModuleType=utils
 Comment=A home for your iconified applications.
 Comment[cs]=Zde se zobrazují všechny minimalizované aplikace.
 Comment[de]=
diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop.in
index 6444067a8..f3d239e7e 100644
--- a/src/modules/pager/module.desktop.in
+++ b/src/modules/pager/module.desktop.in
@@ -6,6 +6,7 @@ Name[eo]=Tabulpaĝilo
 Name[hu]=Lapozó
 Name[tr]=Sayfalayıcı
 Icon=e-module-pager
+X-Enlightenment-ModuleType=utils
 Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain.
 Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují.
 Comment[de]=
diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop.in
index cc6cea641..20e6d86fc 100644
--- a/src/modules/start/module.desktop.in
+++ b/src/modules/start/module.desktop.in
@@ -8,6 +8,7 @@ Name[hu]=Start menü
 Name[fr]=Menu E
 Name[tr]=Başlat
 Icon=e-module-start
+X-Enlightenment-ModuleType=utils
 Comment=E17's "Start" button equivalent.
 Comment[cs]=E17 Start menu.
 Comment[de]=
diff --git a/src/modules/systray/module.desktop.in b/src/modules/systray/module.desktop.in
index 188f7eb8a..301552216 100644
--- a/src/modules/systray/module.desktop.in
+++ b/src/modules/systray/module.desktop.in
@@ -14,4 +14,4 @@ Comment[eo]=zono kiu vidigas la piktogramojn de aplikaĵoj kiel Skajpo, Pidgin,
 Comment[fr]=Une zone qui reçoit les icones des applications comme Skype, Pidgin, Kopete et autres.
 Comment[it]=Un'area che contiene le icone di notifica di applicazioni come Skype, Pidgin, Kopete e altre.
 Comment[tr]=Skype, Pidgin, Kopete ve diğerleri gibi uygulamaların simgelerini barındıran sistem çekmecesi.
-X-Enlightenment-ModuleType=shelf
+X-Enlightenment-ModuleType=utils