diff --git a/data/themes/default.edc b/data/themes/default.edc
index ca02789bf..ce4ae5182 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -32130,7 +32130,7 @@ collections {
    ICON("preferences-dialogs","icon_dummy.png",64)               // *** // "enlightenment/dialogs"
    ICON("preferences-interaction","icon_interaction.png",64)     // *** // "enlightenment/interaction"
    ICON("preferences-imc","icon_imc.png",64)                     // *** // "enlightenment/imc"
-   ICON("preferences-desklock","icon_desklock.png",64)           // *** // "enlightenment/desklock"
+   ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** // "enlightenment/desklock"
    ICON("preferences-icon-theme","icon_icon_theme.png",64)       // *** // "enlightenment/icon_theme"
    ICON("preferences-transitions","icon_transitions.png",64)     // *** // "enlightenment/transitions"
    ICON("preferences-toolbar","icon_toolbar.png",64)             // *** // "enlightenment/toolbar"
@@ -32159,7 +32159,7 @@ collections {
    ICON("preferences-applications-ibar","icon_applications_ibar.png",64)       // *** // "enlightenment/ibar_applications"
    ICON("preferences-applications-restart","icon_applications_restart.png",64) // *** // "enlightenment/restart_applications"
    ICON("preferences-applications-startup","icon_applications_startup.png",64) // *** // "enlightenment/startup_applications"
-   ICON("preferences-applications-default","icon_advanced.png",64)
+   ICON("preferences-desktop-default-applications","icon_advanced.png",64)
    ICON("preferences-preferences","icon_config.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
    ICON("preferences-plugin","icon_modules.png",64)                                   // "enlightenment/modules"
    ICON("preferences-system","icon_configuration.png",64)                             // "enlightenment/configuration" "enlightenment/settings"
diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c
index 31f9661d1..a9f721c7b 100644
--- a/src/modules/conf_applications/e_mod_main.c
+++ b/src/modules/conf_applications/e_mod_main.c
@@ -43,7 +43,7 @@ e_modapi_init(E_Module *m)
                                  e_int_config_apps_startup);
    e_configure_registry_item_add("applications/default_applications", 70,
                                  _("Default Applications"), NULL, 
-                                 "preferences-applications-default", 
+                                 "preferences-desktop-default-applications", 
                                  e_int_config_defapps);
    e_configure_registry_item_add("applications/desktop_environments", 80,
                                  _("Desktop Environments"), NULL, 
diff --git a/src/modules/conf_display/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c
index eafa7017e..f365a0149 100644
--- a/src/modules/conf_display/e_int_config_desklock.c
+++ b/src/modules/conf_display/e_int_config_desklock.c
@@ -74,7 +74,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",
-			     "screen/screen_lock", "preferences-desklock",
+			     "screen/screen_lock", "preferences-system-lock-screen",
 			     0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c
index 914855e69..39d767f5d 100644
--- a/src/modules/conf_display/e_mod_main.c
+++ b/src/modules/conf_display/e_mod_main.c
@@ -26,7 +26,7 @@ e_modapi_init(E_Module *m)
                                  e_int_config_display);
    e_configure_registry_item_add("screen/screen_lock", 30,
                                  _("Screen Lock"), NULL,
-                                 "preferences-desklock",
+                                 "preferences-system-lock-screen",
                                  e_int_config_desklock);
    e_configure_registry_item_add("screen/screen_saver", 40, 
                                  _("Screen Saver"), NULL,