diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
index e97c999b5..2df97b9a5 100644
--- a/kcontrol/componentchooser/componentchooser.desktop
+++ b/kcontrol/componentchooser/componentchooser.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell componentchooser
-Icon=application-vnd.tde.misc
+Icon=package_settings
 Type=Application
 X-TDE-Library=componentchooser
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop
index a727945ba..a07952fbc 100644
--- a/kcontrol/smserver/kcmsmserver.desktop
+++ b/kcontrol/smserver/kcmsmserver.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=computer-log-out
+Icon=kmenu
 Type=Application
 X-DocPath=kcontrol/kcmsmserver/index.html
 Exec=tdecmshell kcmsmserver
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
index 520958305..1bc1d0828 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=computer-run
+Icon=konqueror
 Type=Application
 Exec=tdecmshell kcmcgi
 X-DocPath=kcontrol/kcmcgi/index.html