diff --git a/kmail_config_accounts.desktop b/kmail_config_accounts.desktop
index 9d46b6417..b68be64dc 100644
--- a/kmail_config_accounts.desktop
+++ b/kmail_config_accounts.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=network
+Icon=network-workgroup
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
diff --git a/kmail_config_appearance.desktop b/kmail_config_appearance.desktop
index d83ab5ed1..cfe32e7c9 100644
--- a/kmail_config_appearance.desktop
+++ b/kmail_config_appearance.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=preferences-desktop-default-applications
+Icon=preferences-desktop-theme
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
diff --git a/kmail_config_composer.desktop b/kmail_config_composer.desktop
index 5200abf11..2f724c0e9 100644
--- a/kmail_config_composer.desktop
+++ b/kmail_config_composer.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=edit
+Icon=accessories-text-editor
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
diff --git a/kmail_config_identity.desktop b/kmail_config_identity.desktop
index e30102812..90206e7d6 100644
--- a/kmail_config_identity.desktop
+++ b/kmail_config_identity.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=contact
+Icon=user-identity
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
diff --git a/kmail_config_security.desktop b/kmail_config_security.desktop
index 8847ef280..a26a5290c 100644
--- a/kmail_config_security.desktop
+++ b/kmail_config_security.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=encrypted
+Icon=security-high
 Type=Service
 X-KDE-ServiceTypes=KCModule