diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index bc003bf5d8..7f523aa1c7 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kcmshell4 kwincompositing
-Icon=preferences-desktop-effect
+Icon=preferences-desktop
 Type=Service
 X-KDE-ServiceTypes=KCModule
 X-DocPath=kcontrol/kwincompositing/index.html
diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop
index 8533d9f20b..f629797176 100644
--- a/kcmkwin/kwindesktop/desktop.desktop
+++ b/kcmkwin/kwindesktop/desktop.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-KDE-ServiceTypes=KCModule
 X-DocPath=kcontrol/desktop/index.html
-Icon=preferences-desktop-multiple
+Icon=preferences-desktop
 Exec=kcmshell4 desktop
 
 X-KDE-Library=kcm_kwindesktop
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index 23010be3ae..07d658cb2a 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -107,7 +107,7 @@ Comment[ca]=Aquí podeu configurar l'arranjament del teclat i del ratolí
 Comment[ca@valencia]=Ací podeu configurar l'arranjament del teclat i del ratolí
 Comment[cs]=Nastavení klávesnice a myši
 Comment[csb]=Kònfigùracëjô nastôwù klawiaturë ë mëszë
-Comment[cy]=Ffurfweddu gosodiadau bysellfwrdd a llygoden 
+Comment[cy]=Ffurfweddu gosodiadau bysellfwrdd a llygoden
 Comment[da]=Indstil tastatur og mus
 Comment[de]=Einstellungen für Tastatur und Maus festlegen
 Comment[el]=Ρύθμιση του πληκτρολογίου και του ποντικιού
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index b941e49ec4..b9e3201b2f 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=preferences-system-windows-advanced
+Icon=preferences-system-windows-actions
 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell4 kwinadvanced
@@ -78,7 +78,7 @@ Name[sl]=Napredno
 Name[sr]=Напредно
 Name[sr@latin]=Napredno
 Name[sv]=Avancerat
-Name[ta]=உயர்நிலை 
+Name[ta]=உயர்நிலை
 Name[te]=ఆధునాతన
 Name[tg]=Иловагӣ
 Name[th]=ขั้นสูง
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index b2100c5fb0..217edac25e 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=preferences-system-windows-focus
+Icon=preferences-system-windows
 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell4 kwinfocus
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 3ef06a686f..b58e769953 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kcmshell4 kwinoptions
-Icon=preferences-system-windows-behaviour
+Icon=preferences-system-windows-actions
 Type=Service
 X-KDE-ServiceTypes=KCModule
 X-DocPath=kcontrol/windowbehaviour/index.html
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index 1d5b0af3d1..cc64af84f1 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kcmshell4 kwinrules
-Icon=preferences-system-windows-specific
+Icon=preferences-system-windows-actions
 Type=Service
 X-KDE-ServiceTypes=KCModule
 X-DocPath=kcontrol/windowspecific/index.html
diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
index f34d473d86..159825c482 100644
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kcmshell4 kwinscreenedges
-Icon=preferences-desktop-screenedges
+Icon=preferences-desktop
 Type=Service
 X-KDE-ServiceTypes=KCModule
 X-DocPath=kcontrol/kwinscreenedges/index.html
diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop
index 39003c335b..6dfea0f880 100644
--- a/kcmkwin/kwintabbox/kwintabbox.desktop
+++ b/kcmkwin/kwintabbox/kwintabbox.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=KCModule
-Icon=preferences-system-windows-focus
+Icon=window-duplicate
 Exec=kcmshell4 kwintabbox
 X-DocPath=kcontrol/kwintabbox/index.html
 X-KDE-Library=kcm_kwintabbox