diff --git a/headeritem.cpp b/headeritem.cpp
index 8ef25c71d..f75e047ad 100644
--- a/headeritem.cpp
+++ b/headeritem.cpp
@@ -236,7 +236,6 @@ const QPixmap *HeaderItem::cryptoIcon(KMMsgBase *msgBase) const
     case KMMsgFullyEncrypted        : return KMHeaders::pixFullyEncrypted;
     case KMMsgPartiallyEncrypted    : return KMHeaders::pixPartiallyEncrypted;
     case KMMsgEncryptionStateUnknown: return KMHeaders::pixUndefinedEncrypted;
-    case KMMsgEncryptionProblematic : return KMHeaders::pixEncryptionProblematic;
     default                         : return 0;
   }
 }
@@ -248,7 +247,6 @@ const QPixmap *HeaderItem::signatureIcon(KMMsgBase *msgBase) const
     case KMMsgFullySigned          : return KMHeaders::pixFullySigned;
     case KMMsgPartiallySigned      : return KMHeaders::pixPartiallySigned;
     case KMMsgSignatureStateUnknown: return KMHeaders::pixUndefinedSigned;
-    case KMMsgSignatureProblematic : return KMHeaders::pixSignatureProblematic;
     default                        : return 0;
   }
 }
diff --git a/kmheaders.cpp b/kmheaders.cpp
index 368e026d2..7f245519e 100644
--- a/kmheaders.cpp
+++ b/kmheaders.cpp
@@ -99,8 +99,6 @@ QPixmap* KMHeaders::pixUndefinedSigned = 0;
 QPixmap* KMHeaders::pixFullyEncrypted = 0;
 QPixmap* KMHeaders::pixPartiallyEncrypted = 0;
 QPixmap* KMHeaders::pixUndefinedEncrypted = 0;
-QPixmap* KMHeaders::pixEncryptionProblematic = 0;
-QPixmap* KMHeaders::pixSignatureProblematic = 0;
 QPixmap* KMHeaders::pixAttachment = 0;
 QPixmap* KMHeaders::pixReadFwd = 0;
 QPixmap* KMHeaders::pixReadReplied = 0;
@@ -200,8 +198,6 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
     pixFullyEncrypted        = new QPixmap( UserIcon( "mail-encrypted-full"         ) );
     pixPartiallyEncrypted    = new QPixmap( UserIcon( "mail-encrypted-part"         ) );
     pixUndefinedEncrypted    = new QPixmap( UserIcon( "mail-encrypted"              ) );
-    pixEncryptionProblematic = new QPixmap( UserIcon( "mail-problematic-encryption" ) );
-    pixSignatureProblematic  = new QPixmap( UserIcon( "mail-problematic-signature"  ) );
     pixAttachment            = new QPixmap( SmallIcon( "mail-attachment"            ) );
     pixReadFwd               = new QPixmap( UserIcon( "mail-forwarded"              ) );
     pixReadReplied           = new QPixmap( UserIcon( "mail-replied"                ) );
diff --git a/kmheaders.h b/kmheaders.h
index 1c1499155..092e19cf1 100644
--- a/kmheaders.h
+++ b/kmheaders.h
@@ -302,8 +302,7 @@ protected:
     *pixQueued, *pixFwd, *pixFlag, *pixWatched, *pixIgnored, *pixSpam, *pixHam,
     *pixFullySigned, *pixPartiallySigned, *pixUndefinedSigned,
     *pixFullyEncrypted, *pixPartiallyEncrypted, *pixUndefinedEncrypted,
-    *pixFiller, *pixEncryptionProblematic,
-    *pixSignatureProblematic, *pixAttachment,
+    *pixFiller, *pixAttachment,
     *pixReadFwd, *pixReadReplied, *pixReadFwdReplied,*pixTodo;
 
   /** Look for color changes */
diff --git a/pics/mail-problematic-encryption.png b/pics/mail-problematic-encryption.png
deleted file mode 100644
index ea5082d97..000000000
Binary files a/pics/mail-problematic-encryption.png and /dev/null differ
diff --git a/pics/mail-problematic-signature.png b/pics/mail-problematic-signature.png
deleted file mode 100644
index 49520e844..000000000
Binary files a/pics/mail-problematic-signature.png and /dev/null differ