diff --git a/doc/xca.1 b/doc/xca.1
index 21e2a369..4fef55c6 100644
--- a/doc/xca.1
+++ b/doc/xca.1
@@ -63,7 +63,7 @@ Usually after importing the items in
 .I -k -r -c -p -7 -l -t
 the application will startup as usual. With the
 .I -x
-option given it will exit after finishing the import dialog. This is usefull if xca is used as default application for viewing certificates, keys or requests.
+option given it will exit after finishing the import dialog. This is useful if xca is used as default application for viewing certificates, keys or requests.
 
 .SH SEE ALSO
 A more detailed HTML documentation can be found in the doc directory, in the "Help" menu of the application or on http://xca.sf.net
diff --git a/img/Makefile b/img/Makefile
index 914a3399..66b54b38 100644
--- a/img/Makefile
+++ b/img/Makefile
@@ -15,7 +15,7 @@ all: target.obj
 	echo $(OBJS)
 
 install:
-	install -D -m 644 key.xpm $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
+	install -D -m 644 xca-32x32.xpm $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
 
 imgres.cpp: imgres.rcc
 	$(RCC) -o $@ $<
diff --git a/img/xca-32x32.xpm b/img/xca-32x32.xpm
new file mode 100644
index 00000000..71c46686
--- /dev/null
+++ b/img/xca-32x32.xpm
@@ -0,0 +1,153 @@
+/* XPM */
+static char * xca_32x32_xpm[] = {
+"32 32 118 2",
+"  	c None",
+". 	c #FFFFFF",
+"+ 	c #D4D4D4",
+"@ 	c #F4F4F4",
+"# 	c #D1D2D1",
+"$ 	c #EDEDED",
+"% 	c #FBFBFB",
+"& 	c #D6D6D6",
+"* 	c #F5F5F5",
+"= 	c #FEFEFE",
+"- 	c #DBDBDB",
+"; 	c #C9C9C9",
+"> 	c #F6F6F6",
+", 	c #FAFBFA",
+"' 	c #D3D3D3",
+") 	c #FAFAFA",
+"! 	c #E2E2E2",
+"~ 	c #E3E3E3",
+"{ 	c #D0D0D0",
+"] 	c #ECECEC",
+"^ 	c #F7F7F7",
+"/ 	c #D1D1D1",
+"( 	c #F2F2F2",
+"_ 	c #F7F8F7",
+": 	c #DEDFDE",
+"< 	c #EFEFEF",
+"[ 	c #E8E8E8",
+"} 	c #CACACA",
+"| 	c #EBEBEB",
+"1 	c #CECECE",
+"2 	c #F1F1F1",
+"3 	c #DDDDDD",
+"4 	c #EEEEEE",
+"5 	c #E9E9E9",
+"6 	c #CBCBCB",
+"7 	c #F3F3F3",
+"8 	c #E1E2E1",
+"9 	c #EDEEED",
+"0 	c #D8D8D8",
+"a 	c #CDCDCD",
+"b 	c #EBECEB",
+"c 	c #C7C8C7",
+"d 	c #D6D7D6",
+"e 	c #F0F0F0",
+"f 	c #909090",
+"g 	c #C7C7C7",
+"h 	c #E7E8E7",
+"i 	c #C4C4C4",
+"j 	c #EAEAEA",
+"k 	c #D4D5D4",
+"l 	c #939393",
+"m 	c #BBBCBB",
+"n 	c #E4E5E4",
+"o 	c #C2C2C2",
+"p 	c #E7E7E7",
+"q 	c #D2D2D2",
+"r 	c #929292",
+"s 	c #E0E1E0",
+"t 	c #BFC0BF",
+"u 	c #E4E4E4",
+"v 	c #CFD0CF",
+"w 	c #8F8F8F",
+"x 	c #B5B6B5",
+"y 	c #BCBDBC",
+"z 	c #E1E1E1",
+"A 	c #BDBDBD",
+"B 	c #E5E5E5",
+"C 	c #CDCECD",
+"D 	c #E6E6E6",
+"E 	c #DEDEDE",
+"F 	c #DFDFDF",
+"G 	c #E0E0E0",
+"H 	c #888988",
+"I 	c #D5D5D4",
+"J 	c #BBBBBB",
+"K 	c #CACBCA",
+"L 	c #8E8E8E",
+"M 	c #D5D5D5",
+"N 	c #DADADA",
+"O 	c #9F9F9E",
+"P 	c #9C9C9C",
+"Q 	c #A4A4A2",
+"R 	c #BEBFBE",
+"S 	c #6B6B6B",
+"T 	c #C8C8C7",
+"U 	c #696969",
+"V 	c #CFCFCF",
+"W 	c #D9D9D9",
+"X 	c #D7D7D7",
+"Y 	c #666666",
+"Z 	c #989898",
+"` 	c #6F6F6F",
+" .	c #DCDCDC",
+"..	c #636363",
+"+.	c #A7A7A7",
+"@.	c #656565",
+"#.	c #484848",
+"$.	c #828282",
+"%.	c #626262",
+"&.	c #AEAEAE",
+"*.	c #CCCCCC",
+"=.	c #818181",
+"-.	c #C8C8C8",
+";.	c #BABABA",
+">.	c #A6A6A6",
+",.	c #9D9D9D",
+"'.	c #C5C5C5",
+").	c #9B9B9B",
+"!.	c #525252",
+"~.	c #767676",
+"{.	c #9E9E9E",
+"].	c #A3A3A3",
+"^.	c #C3C3C3",
+"/.	c #919191",
+"(.	c #B8B8B8",
+"_.	c #ABABAB",
+":.	c #888888",
+"<.	c #2A2A2A",
+"                                                      . + @     ",
+"                                                # $ % & * = -   ",
+"                                              ; > , ' @ ) ! ~   ",
+"                                            { ] ^ / ( _ : < [   ",
+"                                          } | @ 1 2 * 3 4 @ 5   ",
+"                                            ( 6 < ( - $ 7 @ 5   ",
+"                                        8 ] ; 9 < 0 ] 2 7 ( 0   ",
+"                                    a [ b c ] ] d | e ( ( ( f   ",
+"                                  g $ h i j j k j < 2 2 ( l     ",
+"                                m h n o 5 p q [ 4 < < e r       ",
+"                                1 s t p u v p $ 4 4 e w         ",
+"                          x y   z A B 8 C D | $ $ < w           ",
+"            $ ~ z E F G 3 H I d J u F K B j ] ] $ L             ",
+"          ~ M M N G 3 3 0 E O P ~ 3 ; u 5 | | ] l               ",
+"        - q 3 ! B ~ u ~ p ! G G Q R ~ p 5 | | S                 ",
+"      0 / z ~ G ! ! ~ ~ D D 5 G T ! D [ | | U                   ",
+"    M V q W X W F z z B ~ 5 p p ~ + B 5 j Y                     ",
+"  ; V / Z ` f a X F u ! p D z j u  .W j ..                      ",
+"    6 +.@.#.  $.+ z z B B E G u p p + %.                        ",
+"  &.*.$.        / F ! u  .F ! 5 j 5 =.                          ",
+"  &.-.6         M F u - 3 z j | j j ;.                          ",
+"  +.g { e   F X & ~ - E F [ j $ j | >.                          ",
+"  ,.'.{ V F N M G N E E [ 5 ] $ j 4 ).                          ",
+"  J -.1 W  .- G X 3 3 p [ | ] $ | @ S                           ",
+"    - -.X  . .X 3  .D p j ] ] j $ *.!.                          ",
+"    J M V W F N - B D 5 | | | ] e ~.                            ",
+"      + - / 0 G ! D [ 5 [ 5 ] > {.                              ",
+"        & p 3 0 3 G ~ B p ( 5 ].                                ",
+"          &.! 5 e 7 @ * ! ^.r                                   ",
+"            L /.(.J ;._.:.f                                     ",
+"                    <.                                          ",
+"                                                                "};