diff --git a/kmail.xpm b/kmail.xpm
index 0ad877ebe..1222b002a 100644
--- a/kmail.xpm
+++ b/kmail.xpm
@@ -1,47 +1,47 @@
 /* XPM */
-/* Drawn  by Nico Schwiring for the K Desktop Environment */
-/* See http://www.kde.org */
-static char*kmail[]={
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
 "32 32 9 1",
-"# c #000000",
-"f c #800000",
-"d c #c0c0c0",
-"b c #ffffff",
-"a c #585858",
-"g c #ff8000",
-"e c #ffa85a",
-"c c #ffdca8",
-". c None",
-".........#......#######.........",
-"........#a##...#bcccccc#........",
-"........#add##.#ebcccccc#.......",
-".......#dadbbd##eebcccccc#......",
-".......#badbbbbd##ebcccccc#.....",
-"......#dbadbbbbbbd##bcccccc#....",
-"......#bbadbbbbbbbda#bcccccc#...",
-".....#dbbadbbbbbbaa#eebcccccc#..",
-".....#bbbadbbbbdadd#eeebcccccc#.",
-"....#dbbbadbbbaabb#eeeeebbbbbbb#",
-"....#bbbbadbdadbbd#efeeeceeeeee#",
-"...#dbbbbadaabbbb#eeffeeceeeeee#",
-"...#bbbbbaadbbbbd#eefgfeceeeeee#",
-"..#dbbbbbadbbbbb#eeecggfceeeeee#",
-"..#bbbbbbadbbbbd#eeeecggfffff##.",
-".#dbbbbbbadbbbb#eeeeeecgggggg#..",
-".#bbbbbbbadbbbd#eeeeeeecgggggg#.",
-"#aaaaaaaaadbbb##eeeeeeeeccccccc#",
-"#ddddddadddbbd##eeeefeeeceeeeee#",
-".#bbbbbadbbbb#.#eeeeffeeceeeeee#",
-".#dbbbbadbbbd#.#eeeefgfeceeeeee#",
-"..#bbbbadbbb#..#eeeecggfceeeeee#",
-"..#dbbbadbbd#..#eeeeecggfffff##.",
-"...#bbbadbb#....#eeeeecgggggg#..",
-"...#dbbadbd#.....#eeeeecgggggg#.",
-"....#bbadb#.......#eeeeeccccccc#",
-"....#dbadd#........#eeeeceeeeee#",
-".....#bad#..........#eeeceeeeee#",
-".....#dad#...........#eeceeeeee#",
-"......#a#.............#eceeeeee#",
-"......#a#..............########.",
-".......#........................"};
-
+"  c #000000",
+". c #595959",
+"X c #800000",
+"o c #ff8200",
+"O c #ffaa59",
+"+ c #ffdfaa",
+"@ c #c0c0c0",
+"# c #ffffff",
+"$ c None",
+/* pixels */
+"$$$$$$$$$ $$$$$$       $$$$$$$$$",
+"$$$$$$$$ .  $$$ #++++++ $$$$$$$$",
+"$$$$$$$$ .@@  $ O#++++++ $$$$$$$",
+"$$$$$$$ @.@##@  OO#++++++ $$$$$$",
+"$$$$$$$ #.@####@  O#++++++ $$$$$",
+"$$$$$$ @#.@######@  #++++++ $$$$",
+"$$$$$$ ##.@#######@. #++++++ $$$",
+"$$$$$ @##.@######.. OO#++++++ $$",
+"$$$$$ ###.@####@.@@ OOO#++++++ $",
+"$$$$ @###.@###..## OOOOO####### ",
+"$$$$ ####.@#@.@##@ OXOOO+OOOOOO ",
+"$$$ @####.@..#### OOXXOO+OOOOOO ",
+"$$$ #####..@####@ OOXoXO+OOOOOO ",
+"$$ @#####.@##### OOO+ooX+OOOOOO ",
+"$$ ######.@####@ OOOO+ooXXXXX  $",
+"$ @######.@#### OOOOOO+oooooo $$",
+"$ #######.@###@ OOOOOOO+oooooo $",
+" .........@###  OOOOOOOO+++++++ ",
+" @@@@@@.@@@##@  OOOOXOOO+OOOOOO ",
+"$ #####.@#### $ OOOOXXOO+OOOOOO ",
+"$ @####.@###@ $ OOOOXoXO+OOOOOO ",
+"$$ ####.@### $$ OOOO+ooX+OOOOOO ",
+"$$ @###.@##@ $$ OOOOO+ooXXXXX  $",
+"$$$ ###.@## $$$$ OOOOO+oooooo $$",
+"$$$ @##.@#@ $$$$$ OOOOO+oooooo $",
+"$$$$ ##.@# $$$$$$$ OOOOO+++++++ ",
+"$$$$ @#.@@ $$$$$$$$ OOOO+OOOOOO ",
+"$$$$$ #.@ $$$$$$$$$$ OOO+OOOOOO ",
+"$$$$$ @.@ $$$$$$$$$$$ OO+OOOOOO ",
+"$$$$$$ . $$$$$$$$$$$$$ O+OOOOOO ",
+"$$$$$$ . $$$$$$$$$$$$$$        $",
+"$$$$$$$ $$$$$$$$$$$$$$$$$$$$$$$$"
+};
diff --git a/mini-kmail.xpm b/mini-kmail.xpm
index e5da29b0f..7fda402c6 100644
--- a/mini-kmail.xpm
+++ b/mini-kmail.xpm
@@ -1,31 +1,31 @@
 /* XPM */
-/* Drawn  by Nico Schwiring and Mark Donohoe for the K Desktop Environment */
-/* See http://www.kde.org */
-static char*kmail[]={
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
 "16 16 9 1",
-"# c #000000",
-"g c #ff8000",
-"d c #c0c0c0",
-"e c #585858",
-"b c #ffffff",
-"f c #800000",
-"a c #ffa85a",
-"c c #ffdca8",
-". c None",
-".......#####....",
-"....##.#abcc#...",
-"...#db##aabcc#..",
-"...#dbbb##abcc#.",
-"..#bebbbd#aabbb#",
-"..#bebddb#facaa#",
-".#bbedbb#agfcaa#",
-".#bbebbb#aagff#.",
-"#deeebb#aaaaccc#",
-"#bbdbbb#aafacaa#",
-".#bdbb##aagfcaa#",
-".#bdbb#.#aagff#.",
-"..#db#...#aaccc#",
-"..#db#....#acaa#",
-"...##......#caa#",
-"............###."};
-
+"  c #000000",
+". c #595959",
+"X c #800000",
+"o c #ff8200",
+"O c #ffaa59",
+"+ c #ffdfaa",
+"@ c #c0c0c0",
+"# c #ffffff",
+"$ c None",
+/* pixels */
+"$$$$$$$     $$$$",
+"$$$$  $ O#++ $$$",
+"$$$ @#  OO#++ $$",
+"$$$ @###  O#++ $",
+"$$ #.###@ OO### ",
+"$$ #.#@@# XO+OO ",
+"$ ##.@## OoX+OO ",
+"$ ##.### OOoXX $",
+" @...## OOOO+++ ",
+" ##@### OOXO+OO ",
+"$ #@##  OOoX+OO ",
+"$ #@## $ OOoXX $",
+"$$ @# $$$ OO+++ ",
+"$$ @# $$$$ O+OO ",
+"$$$  $$$$$$ +OO ",
+"$$$$$$$$$$$$   $"
+};
diff --git a/pics/closed.xpm b/pics/closed.xpm
index 62406ce81..63c245be1 100644
Binary files a/pics/closed.xpm and b/pics/closed.xpm differ
diff --git a/pics/pub_key_red.xpm b/pics/pub_key_red.xpm
index 09f28ce73..464a4ef57 100644
--- a/pics/pub_key_red.xpm
+++ b/pics/pub_key_red.xpm
@@ -1,26 +1,26 @@
 /* XPM */
-static char *pub_key_red[] = {
-/* width height num_colors chars_per_pixel */
-"    20    14        5            1",
-/* colors */
-"  s none c none",
-"# c #f80000",
-"a c #f8bcb8",
-"b c #980c18",
-"c c #c00c18",
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"20 14 6 1",
+"  c #000000",
+". c #800000",
+"X c #be0000",
+"o c #ff0000",
+"O c #ffbebe",
+"+ c None",
 /* pixels */
-"                    ",
-"                    ",
-"                    ",
-"   ####             ",
-"  #abb##            ",
-"  #b  bb##########  ",
-"  #b  bbbbbbbbbbbb  ",
-"  #b  bbbbbbbcccbb  ",
-"  #bbbbb     c# b#  ",
-"   bbbb      c# b#  ",
-"             c# b#  ",
-"                    ",
-"                    ",
-"                    "
+"++++++++++++++++++++",
+"++++++++++++++++++++",
+"++++++++++++++++++++",
+"+++oooo+++++++++++++",
+"++oO..oo++++++++++++",
+"++o.++..oooooooooo++",
+"++o.++............++",
+"++o.++.......XXX..++",
+"++o.....+++++Xo+.o++",
+"+++....++++++Xo+.o++",
+"+++++++++++++Xo+.o++",
+"++++++++++++++++++++",
+"++++++++++++++++++++",
+"++++++++++++++++++++"
 };