diff --git a/certmanager/lib/pics/CMakeLists.txt b/certmanager/lib/pics/CMakeLists.txt
index 751dcf023..fed74680a 100644
--- a/certmanager/lib/pics/CMakeLists.txt
+++ b/certmanager/lib/pics/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-tde_install_icons( gpg gpgsm )
+tde_install_icons( gpg gpgsm gpg_agent dirmngr scdaemon pinentry )
 
 install( FILES
     key.png key_ok.png key_bad.png key_unknown.png chiasmus_chi.png
diff --git a/certmanager/lib/pics/Makefile.am b/certmanager/lib/pics/Makefile.am
index 33704d1b2..288b438e7 100644
--- a/certmanager/lib/pics/Makefile.am
+++ b/certmanager/lib/pics/Makefile.am
@@ -1,4 +1,4 @@
 picsdir = $(kde_datadir)/libkleopatra/pics
 pics_DATA = key.png key_ok.png key_bad.png key_unknown.png chiasmus_chi.png
 
-KDE_ICON = gpg gpgsm
+KDE_ICON = gpg gpgsm gpg_agent dirmngr scdaemon pinentry
diff --git a/certmanager/lib/pics/cr16-app-dirmngr.png b/certmanager/lib/pics/cr16-app-dirmngr.png
new file mode 100644
index 000000000..ccddf679f
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-dirmngr.png differ
diff --git a/certmanager/lib/pics/cr16-app-gpg_agent.png b/certmanager/lib/pics/cr16-app-gpg_agent.png
new file mode 100644
index 000000000..ccddf679f
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-gpg_agent.png differ
diff --git a/certmanager/lib/pics/cr16-app-pinentry.png b/certmanager/lib/pics/cr16-app-pinentry.png
new file mode 100644
index 000000000..ccddf679f
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-pinentry.png differ
diff --git a/certmanager/lib/pics/cr16-app-scdaemon.png b/certmanager/lib/pics/cr16-app-scdaemon.png
new file mode 100644
index 000000000..ccddf679f
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-scdaemon.png differ
diff --git a/certmanager/lib/pics/cr22-app-dirmngr.png b/certmanager/lib/pics/cr22-app-dirmngr.png
new file mode 100644
index 000000000..d325a8d42
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-dirmngr.png differ
diff --git a/certmanager/lib/pics/cr22-app-gpg_agent.png b/certmanager/lib/pics/cr22-app-gpg_agent.png
new file mode 100644
index 000000000..d325a8d42
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-gpg_agent.png differ
diff --git a/certmanager/lib/pics/cr22-app-pinentry.png b/certmanager/lib/pics/cr22-app-pinentry.png
new file mode 100644
index 000000000..d325a8d42
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-pinentry.png differ
diff --git a/certmanager/lib/pics/cr22-app-scdaemon.png b/certmanager/lib/pics/cr22-app-scdaemon.png
new file mode 100644
index 000000000..d325a8d42
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-scdaemon.png differ
diff --git a/certmanager/lib/pics/cr32-app-dirmngr.png b/certmanager/lib/pics/cr32-app-dirmngr.png
new file mode 100644
index 000000000..b45526c92
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-dirmngr.png differ
diff --git a/certmanager/lib/pics/cr32-app-gpg_agent.png b/certmanager/lib/pics/cr32-app-gpg_agent.png
new file mode 100644
index 000000000..b45526c92
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-gpg_agent.png differ
diff --git a/certmanager/lib/pics/cr32-app-pinentry.png b/certmanager/lib/pics/cr32-app-pinentry.png
new file mode 100644
index 000000000..b45526c92
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-pinentry.png differ
diff --git a/certmanager/lib/pics/cr32-app-scdaemon.png b/certmanager/lib/pics/cr32-app-scdaemon.png
new file mode 100644
index 000000000..b45526c92
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-scdaemon.png differ
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index 944f266b4..cfe154420 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -98,7 +98,11 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
     if ( comp->groupList().empty() )
       continue;
     if ( face() != Plain ) {
-      vbox = addVBoxPage( comp->description(), TQString(), loadIcon( comp->iconName() ) );
+      TQString iconName = comp->iconName();
+      if (iconName == TQString::null || iconName == "") {
+				iconName = "gpg";
+			}
+      vbox = addVBoxPage( comp->description(), TQString(), loadIcon(iconName) );
     }
 
     TQScrollView * scrollView = new TQScrollView( vbox );