diff --git a/systemsettings/menu/medianotifications.desktop b/systemsettings/menu/medianotifications.desktop
index d883637..5046578 100644
--- a/systemsettings/menu/medianotifications.desktop
+++ b/systemsettings/menu/medianotifications.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Application
 #X-DocPath=
-Icon=system
+Icon=computer
 Exec=tdecmshell media
 
 
diff --git a/systemsettings/menu/tde-settings-computeradministration.directory b/systemsettings/menu/tde-settings-computeradministration.directory
index 04c5857..1005218 100644
--- a/systemsettings/menu/tde-settings-computeradministration.directory
+++ b/systemsettings/menu/tde-settings-computeradministration.directory
@@ -16,4 +16,4 @@ Name[nl]=Computerbeheer
 Name[pt]=Administração do Computador
 Name[pt_BR]=Administração do computador
 Name[sv]=Datoradministration
-Icon=systemtray
+Icon=computertray
diff --git a/systemsettings/systemsettings.desktop b/systemsettings/systemsettings.desktop
index de1dcf6..e68ef6b 100644
--- a/systemsettings/systemsettings.desktop
+++ b/systemsettings/systemsettings.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=systemsettings -caption "%c" %i %m
-Icon=systemsettings
+Icon=computersettings
 Type=Application
 X-DocPath=systemsettings/index.html
 X-TDE-StartupNotify=true