diff --git a/data/iconsets/gossip/away.png b/data/iconsets/gossip/away.png
deleted file mode 100644
index 359993c9a..000000000
Binary files a/data/iconsets/gossip/away.png and /dev/null differ
diff --git a/data/iconsets/gossip/chat.png b/data/iconsets/gossip/chat.png
deleted file mode 100644
index b7677906d..000000000
Binary files a/data/iconsets/gossip/chat.png and /dev/null differ
diff --git a/data/iconsets/gossip/closed.xpm b/data/iconsets/gossip/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/gossip/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/gossip/connecting.gif b/data/iconsets/gossip/connecting.gif
deleted file mode 100644
index b8803e164..000000000
Binary files a/data/iconsets/gossip/connecting.gif and /dev/null differ
diff --git a/data/iconsets/gossip/dnd.png b/data/iconsets/gossip/dnd.png
deleted file mode 100644
index 190c5ae70..000000000
Binary files a/data/iconsets/gossip/dnd.png and /dev/null differ
diff --git a/data/iconsets/gossip/error.png b/data/iconsets/gossip/error.png
deleted file mode 100644
index 5658e072b..000000000
Binary files a/data/iconsets/gossip/error.png and /dev/null differ
diff --git a/data/iconsets/gossip/invisible.png b/data/iconsets/gossip/invisible.png
deleted file mode 100644
index a28263375..000000000
Binary files a/data/iconsets/gossip/invisible.png and /dev/null differ
diff --git a/data/iconsets/gossip/message.png b/data/iconsets/gossip/message.png
deleted file mode 100644
index 4c6bfc64d..000000000
Binary files a/data/iconsets/gossip/message.png and /dev/null differ
diff --git a/data/iconsets/gossip/not_in_the_roster.png b/data/iconsets/gossip/not_in_the_roster.png
deleted file mode 100644
index df8f0b2da..000000000
Binary files a/data/iconsets/gossip/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/gossip/offline.png b/data/iconsets/gossip/offline.png
deleted file mode 100644
index df06e4b2b..000000000
Binary files a/data/iconsets/gossip/offline.png and /dev/null differ
diff --git a/data/iconsets/gossip/online.png b/data/iconsets/gossip/online.png
deleted file mode 100644
index be9cd475c..000000000
Binary files a/data/iconsets/gossip/online.png and /dev/null differ
diff --git a/data/iconsets/gossip/opened.xpm b/data/iconsets/gossip/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/gossip/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/gossip/requested.png b/data/iconsets/gossip/requested.png
deleted file mode 100644
index 495569e32..000000000
Binary files a/data/iconsets/gossip/requested.png and /dev/null differ
diff --git a/data/iconsets/gossip/typing.png b/data/iconsets/gossip/typing.png
deleted file mode 100644
index 10bebc1b8..000000000
Binary files a/data/iconsets/gossip/typing.png and /dev/null differ
diff --git a/data/iconsets/gossip/xa.png b/data/iconsets/gossip/xa.png
deleted file mode 100644
index 0e61eeb51..000000000
Binary files a/data/iconsets/gossip/xa.png and /dev/null differ
diff --git a/data/iconsets/stellar/away.png b/data/iconsets/stellar/away.png
deleted file mode 100644
index 58e55873d..000000000
Binary files a/data/iconsets/stellar/away.png and /dev/null differ
diff --git a/data/iconsets/stellar/chat.png b/data/iconsets/stellar/chat.png
deleted file mode 100644
index 0427ebc51..000000000
Binary files a/data/iconsets/stellar/chat.png and /dev/null differ
diff --git a/data/iconsets/stellar/closed.xpm b/data/iconsets/stellar/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/stellar/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/stellar/connecting.gif b/data/iconsets/stellar/connecting.gif
deleted file mode 100644
index 5a67e74b1..000000000
Binary files a/data/iconsets/stellar/connecting.gif and /dev/null differ
diff --git a/data/iconsets/stellar/dnd.png b/data/iconsets/stellar/dnd.png
deleted file mode 100644
index 6ea0b2dd7..000000000
Binary files a/data/iconsets/stellar/dnd.png and /dev/null differ
diff --git a/data/iconsets/stellar/error.png b/data/iconsets/stellar/error.png
deleted file mode 100644
index 5658e072b..000000000
Binary files a/data/iconsets/stellar/error.png and /dev/null differ
diff --git a/data/iconsets/stellar/invisible.png b/data/iconsets/stellar/invisible.png
deleted file mode 100644
index 4d959d700..000000000
Binary files a/data/iconsets/stellar/invisible.png and /dev/null differ
diff --git a/data/iconsets/stellar/message.gif b/data/iconsets/stellar/message.gif
deleted file mode 100644
index 7e78a07c9..000000000
Binary files a/data/iconsets/stellar/message.gif and /dev/null differ
diff --git a/data/iconsets/stellar/not_in_the_roster.png b/data/iconsets/stellar/not_in_the_roster.png
deleted file mode 100644
index e209800ca..000000000
Binary files a/data/iconsets/stellar/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/stellar/offline.png b/data/iconsets/stellar/offline.png
deleted file mode 100644
index c591a6926..000000000
Binary files a/data/iconsets/stellar/offline.png and /dev/null differ
diff --git a/data/iconsets/stellar/online.png b/data/iconsets/stellar/online.png
deleted file mode 100644
index 575b73c92..000000000
Binary files a/data/iconsets/stellar/online.png and /dev/null differ
diff --git a/data/iconsets/stellar/opened.xpm b/data/iconsets/stellar/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/stellar/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/stellar/requested.png b/data/iconsets/stellar/requested.png
deleted file mode 100644
index cc34197d4..000000000
Binary files a/data/iconsets/stellar/requested.png and /dev/null differ
diff --git a/data/iconsets/stellar/xa.png b/data/iconsets/stellar/xa.png
deleted file mode 100644
index e1a917d24..000000000
Binary files a/data/iconsets/stellar/xa.png and /dev/null differ
diff --git a/data/iconsets/sun/away.xpm b/data/iconsets/sun/away.xpm
deleted file mode 100644
index 6d7a131f4..000000000
--- a/data/iconsets/sun/away.xpm
+++ /dev/null
@@ -1,125 +0,0 @@
-/* XPM */
-static char * away_xpm[] = {
-"16 16 106 2",
-"  	c None",
-". 	c #E3D244",
-"+ 	c #EAD735",
-"@ 	c #EDDA40",
-"# 	c #ECDA43",
-"$ 	c #ECDB47",
-"% 	c #EDDA42",
-"& 	c #EBD943",
-"* 	c #EAD944",
-"= 	c #EDDC41",
-"- 	c #EFDD47",
-"; 	c #EDDA3E",
-"> 	c #EEDC45",
-", 	c #FFEF98",
-"' 	c #EEDD47",
-") 	c #FFEE5C",
-"! 	c #EFDD46",
-"~ 	c #FFE849",
-"{ 	c #E7D646",
-"] 	c #E7D95E",
-"^ 	c #E9D847",
-"/ 	c #F7E653",
-"( 	c #F1E486",
-"_ 	c #F6EFA2",
-": 	c #EFE48A",
-"< 	c #EFEAAA",
-"[ 	c #E8EEE3",
-"} 	c #E9EFDC",
-"| 	c #E2EBE8",
-"1 	c #E7EBD1",
-"2 	c #EAEED9",
-"3 	c #E8EDE6",
-"4 	c #E9E398",
-"5 	c #E1E7E9",
-"6 	c #BEC3C5",
-"7 	c #CED3D5",
-"8 	c #C3C8CA",
-"9 	c #EAECEE",
-"0 	c #E4E8E0",
-"a 	c #E7EEE5",
-"b 	c #E0E6E6",
-"c 	c #DAE1E0",
-"d 	c #DBE4E5",
-"e 	c #E2EBE9",
-"f 	c #E1E9E9",
-"g 	c #E2E8E3",
-"h 	c #E7EEEF",
-"i 	c #E0E6E7",
-"j 	c #C1C6C8",
-"k 	c #D7DCDE",
-"l 	c #C3C8C9",
-"m 	c #F1F3F4",
-"n 	c #E8EDEB",
-"o 	c #E2E7E3",
-"p 	c #E4ECE5",
-"q 	c #DAE2E1",
-"r 	c #D6DEDE",
-"s 	c #D6DFDF",
-"t 	c #E0E9EA",
-"u 	c #E1EAEB",
-"v 	c #E2EAEB",
-"w 	c #E4EBEC",
-"x 	c #DAE1E2",
-"y 	c #E2E8E9",
-"z 	c #E4EAEB",
-"A 	c #CDD2D2",
-"B 	c #EDF2ED",
-"C 	c #E3E8E6",
-"D 	c #E3EBE4",
-"E 	c #DDE5E2",
-"F 	c #D9E1E0",
-"G 	c #DBE3E3",
-"H 	c #E3EDEE",
-"I 	c #E4EEEF",
-"J 	c #E1E9EA",
-"K 	c #DDE4E5",
-"L 	c #DCE3E4",
-"M 	c #E1E7E8",
-"N 	c #E3EAEB",
-"O 	c #CDD2D3",
-"P 	c #C0C5C7",
-"Q 	c #E5EDEE",
-"R 	c #DEE4E1",
-"S 	c #E0E7E3",
-"T 	c #E6EDE7",
-"U 	c #E6EDED",
-"V 	c #E7F0F1",
-"W 	c #E5EFF0",
-"X 	c #E2E9EA",
-"Y 	c #E6EDEE",
-"Z 	c #D4DCDD",
-"` 	c #D0D7D8",
-" .	c #BEC5C5",
-"..	c #C9D2D2",
-"+.	c #C4CECE",
-"@.	c #C6CECF",
-"#.	c #C9D0D1",
-"$.	c #E8F1F2",
-"%.	c #C3CACB",
-"&.	c #BFC5C6",
-"*.	c #D5DCDD",
-"=.	c #CACFD0",
-"-.	c #CCD1D2",
-";.	c #C4CBCC",
-">.	c #CBD2D2",
-",.	c #B7C0C2",
-"                                ",
-"        .       +               ",
-"  @     #     $ .               ",
-"  % @   & * = -       -         ",
-"    ; > , , , , ' ) -           ",
-"    ! , , ~ ~ , , {             ",
-"] ] , , ~ ~ ~ ~ , , ^ / -       ",
-"  ] ( _ _ ~ ~ ~ ~ , ^           ",
-"  ] : < [ } | 1 2 3 4 5 6   7   ",
-"8 9 ] 0 a b c d e f g h i j k l ",
-"8 m n o p q r s t u v w x y z A ",
-"8 8 B C D E F G H I J K L M N O ",
-"    P Q R S T U V W v X K N Y 6 ",
-"    8 Z `  ...+.@.#.$.%.&.*.=.  ",
-"      -.;.        >.,.    -.    ",
-"                                "};
diff --git a/data/iconsets/sun/chat.xpm b/data/iconsets/sun/chat.xpm
deleted file mode 100644
index 1f1b99d23..000000000
--- a/data/iconsets/sun/chat.xpm
+++ /dev/null
@@ -1,73 +0,0 @@
-/* XPM */
-static char * free for chat_xpm[] = {
-"16 16 54 1",
-" 	c None",
-".	c #E6CB02",
-"+	c #C97508",
-"@	c #E6C104",
-"#	c #E6CA02",
-"$	c #F8EFD0",
-"%	c #E6C603",
-"&	c #FFDE03",
-"*	c #884E03",
-"=	c #E6BA05",
-"-	c #E6C004",
-";	c #FFDA04",
-">	c #FFDC04",
-",	c #E6BA06",
-"'	c #E6BC05",
-")	c #FFD305",
-"!	c #FFD505",
-"~	c #FFD704",
-"{	c #FFD904",
-"]	c #FFD106",
-"^	c #FFD306",
-"/	c #FFD506",
-"(	c #FFD705",
-"_	c #E6B606",
-":	c #FFCD07",
-"<	c #FFCF06",
-"[	c #FFD405",
-"}	c #E6B007",
-"|	c #E6B207",
-"1	c #FFC807",
-"2	c #FFCB07",
-"3	c #FFCC06",
-"4	c #FFCE07",
-"5	c #FFD007",
-"6	c #FFD905",
-"7	c #FFDB04",
-"8	c #E6B307",
-"9	c #FFC808",
-"0	c #FFCA08",
-"a	c #FFCF07",
-"b	c #FFD206",
-"c	c #FFD605",
-"d	c #FFCC07",
-"e	c #FFD006",
-"f	c #FFD406",
-"g	c #E6AE08",
-"h	c #FFC608",
-"i	c #FFCE06",
-"j	c #E6BF04",
-"k	c #E6AA09",
-"l	c #E6B208",
-"m	c #E6B906",
-"n	c #E6BB05",
-"o	c #E6B506",
-"       . ++++++ ",
-"   @   #+$$$$$$+",
-"    @ %&+$****$+",
-" =  -@;>+$$$$$$+",
-"  ,')!~{+$****$+",
-"   =]^/(+$$$$$$+",
-"  _:<])[(+++$$+ ",
-"}|12345^/(67++# ",
-"  890:a]b[c++   ",
-"   |92d<ebf@    ",
-"  g}h90di5bj@   ",
-" k  }l90dmn  @  ",
-"    g |9o m     ",
-"   k   |   m    ",
-"       }        ",
-"                "};
diff --git a/data/iconsets/sun/closed.xpm b/data/iconsets/sun/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/sun/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/sun/connecting.gif b/data/iconsets/sun/connecting.gif
deleted file mode 100644
index 53914b066..000000000
Binary files a/data/iconsets/sun/connecting.gif and /dev/null differ
diff --git a/data/iconsets/sun/dnd.xpm b/data/iconsets/sun/dnd.xpm
deleted file mode 100644
index d1756c6e1..000000000
--- a/data/iconsets/sun/dnd.xpm
+++ /dev/null
@@ -1,64 +0,0 @@
-/* XPM */
-static char * dnd_xpm[] = {
-"16 16 45 1",
-" 	c None",
-".	c #717171",
-"+	c #9E9E9E",
-"@	c #9B9B9B",
-"#	c #9F9F9F",
-"$	c #A1A1A1",
-"%	c #9C9C9C",
-"&	c #989898",
-"*	c #999999",
-"=	c #A3A3A3",
-"-	c #A2A2A2",
-";	c #959595",
-">	c #949494",
-",	c #8F8F8F",
-"'	c #898989",
-")	c #969696",
-"!	c #939393",
-"~	c #888888",
-"{	c #8C8C8C",
-"]	c #828282",
-"^	c #7A7A7A",
-"/	c #858585",
-"(	c #8A8A8A",
-"_	c #868686",
-":	c #9D9D9D",
-"<	c #8D8D8D",
-"[	c #8B8B8B",
-"}	c #9A9A9A",
-"|	c #AAAAAA",
-"1	c #797979",
-"2	c #909090",
-"3	c #838383",
-"4	c #7D7D7D",
-"5	c #808080",
-"6	c #B6A200",
-"7	c #848484",
-"8	c #979797",
-"9	c #8E8E8E",
-"0	c #878787",
-"a	c #B7AE5F",
-"b	c #FFE400",
-"c	c #FEFFA8",
-"d	c #B8AF61",
-"e	c #B7AE60",
-"f	c #FEF466",
-"   ....   ....  ",
-"  .+@+.....#$.. ",
-"  .%&*=.$-*;;$. ",
-"..+>,')!&#;~{@..",
-".-&]^/(_,:)<[}|.",
-".-)1^2345;)6>@..",
-".$)7,890.aab%%. ",
-"..@8....abbca.  ",
-"  ...   bcaa    ",
-"       abca     ",
-"       abca     ",
-"     aaabcd     ",
-"    abbcce      ",
-"    abfaa       ",
-"    aba         ",
-"     a          "};
diff --git a/data/iconsets/sun/error.xpm b/data/iconsets/sun/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/sun/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/sun/invisible.xpm b/data/iconsets/sun/invisible.xpm
deleted file mode 100644
index eab2b7f66..000000000
--- a/data/iconsets/sun/invisible.xpm
+++ /dev/null
@@ -1,68 +0,0 @@
-/* XPM */
-static char * invisible_xpm[] = {
-"16 16 49 1",
-" 	c None",
-".	c #FFF29C",
-"+	c #FFEF9C",
-"@	c #FFF19C",
-"#	c #FFF49C",
-"$	c #FFEE9C",
-"%	c #636464",
-"&	c #6F6F6F",
-"*	c #7A7A7A",
-"=	c #FFF39C",
-"-	c #FFEC9D",
-";	c #434342",
-">	c #4D4E4E",
-",	c #585959",
-"'	c #6E6F6F",
-")	c #858585",
-"!	c #373837",
-"~	c #424242",
-"{	c #4D4D4E",
-"]	c #595959",
-"^	c #636364",
-"/	c #FFEA9D",
-"(	c #212121",
-"_	c #2C2D2C",
-":	c #373738",
-"<	c #424243",
-"[	c #585958",
-"}	c #646464",
-"|	c #FFE89E",
-"1	c #FFE99D",
-"2	c #161616",
-"3	c #212221",
-"4	c #2C2C2D",
-"5	c #4E4E4D",
-"6	c #636463",
-"7	c #FFE99E",
-"8	c #0B0C0B",
-"9	c #2C2C2C",
-"0	c #373838",
-"a	c #FFF09C",
-"b	c #0B0B0B",
-"c	c #161617",
-"d	c #2C2D2D",
-"e	c #434343",
-"f	c #FFE79E",
-"g	c #000000",
-"h	c #383738",
-"i	c #212122",
-"j	c #FFEB9D",
-"                ",
-"       .        ",
-"    + @.. #     ",
-"    $+%&*.=     ",
-"  --;>,%'*)=#   ",
-"   -!~{]^&*.    ",
-"  /(_:<>[}&*.   ",
-" |1234:;5]6&@.  ",
-"  782(90<>]%a   ",
-"   |bc3d:e>$    ",
-"  ffgbc34he$$   ",
-"    f|b2ij-     ",
-"    f |71 j     ",
-"       |        ",
-"                ",
-"                "};
diff --git a/data/iconsets/sun/message.gif b/data/iconsets/sun/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/sun/message.gif and /dev/null differ
diff --git a/data/iconsets/sun/not_in_the_roster.xpm b/data/iconsets/sun/not_in_the_roster.xpm
deleted file mode 100644
index ade0a3916..000000000
--- a/data/iconsets/sun/not_in_the_roster.xpm
+++ /dev/null
@@ -1,50 +0,0 @@
-/* XPM */
-static char * not in list_xpm[] = {
-"16 16 31 1",
-" 	c None",
-".	c #7D7D7D",
-"+	c #757575",
-"@	c #838383",
-"#	c #797979",
-"$	c #989898",
-"%	c #7C7C7C",
-"&	c #7F7F7F",
-"*	c #707070",
-"=	c #959595",
-"-	c #969696",
-";	c #818181",
-">	c #717171",
-",	c #909090",
-"'	c #929292",
-")	c #999999",
-"!	c #8F8F8F",
-"~	c #6E6E6E",
-"{	c #8A8A8A",
-"]	c #8D8D8D",
-"^	c #696969",
-"/	c #6C6C6C",
-"(	c #868686",
-"_	c #898989",
-":	c #8C8C8C",
-"<	c #787878",
-"[	c #686868",
-"}	c #848484",
-"|	c #747474",
-"1	c #656565",
-"2	c #6D6D6D",
-"       .        ",
-"   +   .   @    ",
-"    + #$% &     ",
-" *  ++=-$%.  ;  ",
-"  *>,,'=-$).&   ",
-"   *!,,'=-$%    ",
-"  ~{]!,,'=-$%   ",
-"^/(_{:],,'=-$%. ",
-"  /(_{]!!,'=<   ",
-"   /(_{]]!,+    ",
-"  [^}(_{:]!|+   ",
-" 1  ^/(_{*>  +  ",
-"    [ /(2 *     ",
-"   1   /   *    ",
-"       ^        ",
-"                "};
diff --git a/data/iconsets/sun/offline.xpm b/data/iconsets/sun/offline.xpm
deleted file mode 100644
index 054edb083..000000000
--- a/data/iconsets/sun/offline.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * offline2_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #887D1D",
-"+	c #8A801D",
-"@	c #92851D",
-"#	c #9C8D1D",
-"$	c #AC9D25",
-"%	c #867B1D",
-"&	c #BFB445",
-"*	c #BFB863",
-"=	c #BFBA76",
-"-	c #C0B969",
-";	c #93871D",
-">	c #BFB23B",
-",	c #BFB342",
-"'	c #BFB85D",
-")	c #BFBA77",
-"!	c #BFAE26",
-"~	c #BFB551",
-"{	c #BFB866",
-"]	c #BFB86B",
-"^	c #BFB973",
-"/	c #BFB02D",
-"(	c #BFB134",
-"_	c #BFB65B",
-":	c #BFB860",
-"<	c #BFB13A",
-"[	c #BFB970",
-"}	c #BFB54F",
-"|	c #BFBA80",
-"1	c #BFB975",
-"2	c #BFB974",
-"3	c #BFB33D",
-"4	c #BFBA7A",
-"5	c #BFB030",
-"6	c #BFB136",
-"7	c #BFB868",
-"8	c #BFB450",
-"9	c #BFB85E",
-"0	c #BFB864",
-"a	c #BFB44E",
-"b	c #BFB96E",
-"c	c #BFB550",
-"d	c #C0B64D",
-"         .+@#$  ",
-"       %%&*=-;  ",
-"     %%>,'))%   ",
-"    %!!~{]^%    ",
-"   %!!/'^)%     ",
-"   %/(_:^)%     ",
-"  %!<,^][%      ",
-"  %!,}|12%      ",
-"  %!3,422%      ",
-"  %!56777%      ",
-"   %!!8999%     ",
-"   %!!/'90%     ",
-"    %!!a9b=%    ",
-"     %%!8b=^%   ",
-"       %%c*:d;  ",
-"         .+@#$  "};
diff --git a/data/iconsets/sun/online.xpm b/data/iconsets/sun/online.xpm
deleted file mode 100644
index 42791668d..000000000
--- a/data/iconsets/sun/online.xpm
+++ /dev/null
@@ -1,81 +0,0 @@
-/* XPM */
-static char * online_xpm[] = {
-"16 16 62 1",
-" 	c None",
-".	c #E6CB02",
-"+	c #E6C104",
-"@	c #E6CA02",
-"#	c #E6D101",
-"$	c #E6C603",
-"%	c #FFDE03",
-"&	c #E6C902",
-"*	c #E6CD02",
-"=	c #E6BA05",
-"-	c #E6C004",
-";	c #FFDA04",
-">	c #FFDC04",
-",	c #FFDE04",
-"'	c #E6D001",
-")	c #E6BA06",
-"!	c #E6BC05",
-"~	c #FFD305",
-"{	c #FFD505",
-"]	c #FFD704",
-"^	c #FFD904",
-"/	c #FFDB04",
-"(	c #FFDD03",
-"_	c #FFDF03",
-":	c #E6CC02",
-"<	c #FFD106",
-"[	c #FFD306",
-"}	c #FFD506",
-"|	c #FFD705",
-"1	c #FFDD04",
-"2	c #E6B606",
-"3	c #FFCD07",
-"4	c #FFCF06",
-"5	c #FFD405",
-"6	c #FFD905",
-"7	c #E6C903",
-"8	c #E6B007",
-"9	c #E6B207",
-"0	c #FFC807",
-"a	c #FFCB07",
-"b	c #FFCC06",
-"c	c #FFCE07",
-"d	c #FFD007",
-"e	c #E6B307",
-"f	c #FFC808",
-"g	c #FFCA08",
-"h	c #FFCF07",
-"i	c #FFD206",
-"j	c #FFD605",
-"k	c #E6C404",
-"l	c #FFCC07",
-"m	c #FFD006",
-"n	c #FFD406",
-"o	c #E6AE08",
-"p	c #FFC608",
-"q	c #FFCE06",
-"r	c #E6BF04",
-"s	c #E6AA09",
-"t	c #E6B208",
-"u	c #E6B906",
-"v	c #E6BB05",
-"w	c #E6B506",
-"       .        ",
-"   +   @   #    ",
-"    + $%& *     ",
-" =  -+;>,&.  '  ",
-"  )!~{]^/(_.:   ",
-"   =<[}|^/1&    ",
-"  234<~5|6/(7   ",
-"890abcd[}|6/(7@ ",
-"  efg3h<i5j6k   ",
-"   9fal4min+    ",
-"  o8pfglqdir+   ",
-" s  8tfgluv  +  ",
-"    o 9fw u     ",
-"   s   9   u    ",
-"       8        ",
-"                "};
diff --git a/data/iconsets/sun/opened.xpm b/data/iconsets/sun/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/sun/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/sun/requested.xpm b/data/iconsets/sun/requested.xpm
deleted file mode 100644
index 0cfc57225..000000000
--- a/data/iconsets/sun/requested.xpm
+++ /dev/null
@@ -1,108 +0,0 @@
-/* XPM */
-static char * requested_xpm[] = {
-"16 16 89 1",
-" 	c None",
-".	c #8F8F8F",
-"+	c #808080",
-"@	c #8C8B8C",
-"#	c #969696",
-"$	c #807F7F",
-"%	c #858585",
-"&	c #E49898",
-"*	c #8A8A8A",
-"=	c #737373",
-"-	c #7B7C7C",
-";	c #7E7E7D",
-">	c #FF0000",
-",	c #E39696",
-"'	c #898989",
-")	c #8C8B8B",
-"!	c #949393",
-"~	c #717272",
-"{	c #747474",
-"]	c #D48787",
-"^	c #DE9292",
-"/	c #D78B8B",
-"(	c #8D8D8D",
-"_	c #707070",
-":	c #9B9B9B",
-"<	c #AEA2A2",
-"[	c #A99C9C",
-"}	c #E09494",
-"|	c #DE9191",
-"1	c #B2B3B3",
-"2	c #6A6A6A",
-"3	c #919191",
-"4	c #949494",
-"5	c #989898",
-"6	c #9B9B9C",
-"7	c #A39696",
-"8	c #D09595",
-"9	c #D98C8B",
-"0	c #ADADAD",
-"a	c #848585",
-"b	c #606061",
-"c	c #636363",
-"d	c #888788",
-"e	c #8B8B8B",
-"f	c #939392",
-"g	c #9C9090",
-"h	c #D58A89",
-"i	c #A8A8A8",
-"j	c #ACABAC",
-"k	c #838383",
-"l	c #868686",
-"m	c #626261",
-"n	c #868586",
-"o	c #BE7273",
-"p	c #D98D8C",
-"q	c #A69A9A",
-"r	c #9F9E9F",
-"s	c #A3A2A3",
-"t	c #7C7C7C",
-"u	c #606060",
-"v	c #848484",
-"w	c #878788",
-"x	c #C07474",
-"y	c #CB7F7F",
-"z	c #9A8E8E",
-"A	c #999A99",
-"B	c #767676",
-"C	c #59595A",
-"D	c #5C5D5C",
-"E	c #7F7E7F",
-"F	c #828282",
-"G	c #AF8483",
-"H	c #A4A4A5",
-"I	c #AF8484",
-"J	c #96898A",
-"K	c #727172",
-"L	c #757474",
-"M	c #525353",
-"N	c #5B5B5B",
-"O	c #5E5E5E",
-"P	c #BD7071",
-"Q	c #686868",
-"R	c #6B6B6A",
-"S	c #575757",
-"T	c #5C5C5C",
-"U	c #616262",
-"V	c #676767",
-"W	c #505050",
-"X	c #666666",
-"       .        ",
-"   +   @   #    ",
-"    $ %&* .     ",
-" =  -;>>,')  !  ",
-"  ~{]>^,>>/*(   ",
-"   _:><[}>|1    ",
-"  2345678>90a   ",
-"bcde.fgh>|iijkl ",
-"  mn'(o>pqrst   ",
-"   uvwx>yzAB    ",
-"  CDEFGHIJ4KL   ",
-" M  NOP>>QR  =  ",
-"    S T>U V     ",
-"   W   N   X    ",
-"       S        ",
-"                "};
diff --git a/data/iconsets/sun/xa.xpm b/data/iconsets/sun/xa.xpm
deleted file mode 100644
index 92e736729..000000000
--- a/data/iconsets/sun/xa.xpm
+++ /dev/null
@@ -1,68 +0,0 @@
-/* XPM */
-static char * extend_away_xpm[] = {
-"16 16 49 1",
-" 	c None",
-".	c #B8B8B8",
-"+	c #AEAEAE",
-"@	c #AFAFAF",
-"#	c #B5B5B5",
-"$	c #B7B7B7",
-"%	c #B0B0B0",
-"&	c #A8A8A8",
-"*	c #EAEAEA",
-"=	c #B3B3B3",
-"-	c #ABABAB",
-";	c #E2E2E2",
-">	c #DDDDDD",
-",	c #EBEBEB",
-"'	c #B1B1B1",
-")	c #B6B6B6",
-"!	c #A9A9A9",
-"~	c #D7D7D7",
-"{	c #D9D9D9",
-"]	c #E8E8E8",
-"^	c #EFEFEF",
-"/	c #E3E3E3",
-"(	c #E1E1E1",
-"_	c #DADADA",
-":	c #F5F5F5",
-"<	c #E0E0E0",
-"[	c #E7E7E7",
-"}	c #D6D6D6",
-"|	c #DFDFDF",
-"1	c #E5E5E5",
-"2	c #EDEDED",
-"3	c #F1F1F1",
-"4	c #B2B2B2",
-"5	c #DEDEDE",
-"6	c #E6E6E6",
-"7	c #F0F0F0",
-"8	c #F3F3F3",
-"9	c #EEEEEE",
-"0	c #ECECEC",
-"a	c #ACACAC",
-"b	c #E4E4E4",
-"c	c #F8F8F8",
-"d	c #DCDCDC",
-"e	c #D4D4D4",
-"f	c #ADADAD",
-"g	c #A2A2A2",
-"h	c #B4B4B4",
-"i	c #A3D7F9",
-"j	c #48B1F4",
-"  ...  +@#$     ",
-" %&*=$-;>,'.)## ",
-".!~{]^/(_],:*<[=",
-".]}{|1<[/123;>;4",
-"4[5(//67^890]62#",
-"a6b5~~<6ac923.. ",
-"@!&d}e(,'.32f.  ",
-"  #agg&+  h'    ",
-"   ij  ji  ij   ",
-"                ",
-"  ji  ij  ji    ",
-"                ",
-"     ji         ",
-" ij      ij     ",
-"                ",
-"                "};
diff --git a/data/iconsets/transports/aim/away.png b/data/iconsets/transports/aim/away.png
deleted file mode 100644
index ea601db18..000000000
Binary files a/data/iconsets/transports/aim/away.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/chat.png b/data/iconsets/transports/aim/chat.png
deleted file mode 100644
index f613f407d..000000000
Binary files a/data/iconsets/transports/aim/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/closed.xpm b/data/iconsets/transports/aim/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/transports/aim/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/transports/aim/dnd.png b/data/iconsets/transports/aim/dnd.png
deleted file mode 100644
index ea601db18..000000000
Binary files a/data/iconsets/transports/aim/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/error.xpm b/data/iconsets/transports/aim/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/aim/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/aim/invisible.png b/data/iconsets/transports/aim/invisible.png
deleted file mode 100644
index 17f40d529..000000000
Binary files a/data/iconsets/transports/aim/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/message.gif b/data/iconsets/transports/aim/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/aim/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/aim/not_in_the_roster.png b/data/iconsets/transports/aim/not_in_the_roster.png
deleted file mode 100644
index 77c24a7c1..000000000
Binary files a/data/iconsets/transports/aim/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/offline.png b/data/iconsets/transports/aim/offline.png
deleted file mode 100644
index 17f40d529..000000000
Binary files a/data/iconsets/transports/aim/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/online.png b/data/iconsets/transports/aim/online.png
deleted file mode 100644
index f613f407d..000000000
Binary files a/data/iconsets/transports/aim/online.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/opened.xpm b/data/iconsets/transports/aim/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/transports/aim/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/transports/aim/requested.png b/data/iconsets/transports/aim/requested.png
deleted file mode 100644
index 17f40d529..000000000
Binary files a/data/iconsets/transports/aim/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/aim/xa.png b/data/iconsets/transports/aim/xa.png
deleted file mode 100644
index ea601db18..000000000
Binary files a/data/iconsets/transports/aim/xa.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/away.png b/data/iconsets/transports/gadugadu/away.png
deleted file mode 100644
index 90c650660..000000000
Binary files a/data/iconsets/transports/gadugadu/away.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/chat.png b/data/iconsets/transports/gadugadu/chat.png
deleted file mode 100644
index c7e8e29dc..000000000
Binary files a/data/iconsets/transports/gadugadu/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/closed.xpm b/data/iconsets/transports/gadugadu/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/transports/gadugadu/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/transports/gadugadu/dnd.png b/data/iconsets/transports/gadugadu/dnd.png
deleted file mode 100644
index 90c650660..000000000
Binary files a/data/iconsets/transports/gadugadu/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/error.xpm b/data/iconsets/transports/gadugadu/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/gadugadu/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/gadugadu/invisible.png b/data/iconsets/transports/gadugadu/invisible.png
deleted file mode 100644
index a7c057203..000000000
Binary files a/data/iconsets/transports/gadugadu/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/message.gif b/data/iconsets/transports/gadugadu/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/gadugadu/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/not_in_the_roster.png b/data/iconsets/transports/gadugadu/not_in_the_roster.png
deleted file mode 100644
index 4c69a357e..000000000
Binary files a/data/iconsets/transports/gadugadu/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/offline.png b/data/iconsets/transports/gadugadu/offline.png
deleted file mode 100644
index 0d5351c60..000000000
Binary files a/data/iconsets/transports/gadugadu/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/online.png b/data/iconsets/transports/gadugadu/online.png
deleted file mode 100644
index c7e8e29dc..000000000
Binary files a/data/iconsets/transports/gadugadu/online.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/opened.xpm b/data/iconsets/transports/gadugadu/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/transports/gadugadu/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/transports/gadugadu/requested.png b/data/iconsets/transports/gadugadu/requested.png
deleted file mode 100644
index 0d5351c60..000000000
Binary files a/data/iconsets/transports/gadugadu/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/gadugadu/xa.png b/data/iconsets/transports/gadugadu/xa.png
deleted file mode 100644
index 90c650660..000000000
Binary files a/data/iconsets/transports/gadugadu/xa.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/away.png b/data/iconsets/transports/icq/away.png
deleted file mode 100644
index 95670e607..000000000
Binary files a/data/iconsets/transports/icq/away.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/chat.png b/data/iconsets/transports/icq/chat.png
deleted file mode 100644
index 045b9b0e3..000000000
Binary files a/data/iconsets/transports/icq/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/closed.xpm b/data/iconsets/transports/icq/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/transports/icq/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/transports/icq/dnd.png b/data/iconsets/transports/icq/dnd.png
deleted file mode 100644
index 85ba6774d..000000000
Binary files a/data/iconsets/transports/icq/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/error.xpm b/data/iconsets/transports/icq/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/icq/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/icq/invisible.png b/data/iconsets/transports/icq/invisible.png
deleted file mode 100644
index e75df8e62..000000000
Binary files a/data/iconsets/transports/icq/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/message.gif b/data/iconsets/transports/icq/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/icq/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/icq/not_in_the_roster.png b/data/iconsets/transports/icq/not_in_the_roster.png
deleted file mode 100644
index cbfc948ab..000000000
Binary files a/data/iconsets/transports/icq/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/offline.png b/data/iconsets/transports/icq/offline.png
deleted file mode 100644
index c432f25fd..000000000
Binary files a/data/iconsets/transports/icq/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/online.png b/data/iconsets/transports/icq/online.png
deleted file mode 100644
index fa0c7675a..000000000
Binary files a/data/iconsets/transports/icq/online.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/opened.xpm b/data/iconsets/transports/icq/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/transports/icq/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/transports/icq/requested.png b/data/iconsets/transports/icq/requested.png
deleted file mode 100644
index 4eb8be096..000000000
Binary files a/data/iconsets/transports/icq/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/icq/xa.png b/data/iconsets/transports/icq/xa.png
deleted file mode 100644
index c54a80b33..000000000
Binary files a/data/iconsets/transports/icq/xa.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/away.png b/data/iconsets/transports/irc/away.png
deleted file mode 100644
index 842bb8fc9..000000000
Binary files a/data/iconsets/transports/irc/away.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/chat.png b/data/iconsets/transports/irc/chat.png
deleted file mode 100644
index 842bb8fc9..000000000
Binary files a/data/iconsets/transports/irc/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/dnd.png b/data/iconsets/transports/irc/dnd.png
deleted file mode 100644
index 842bb8fc9..000000000
Binary files a/data/iconsets/transports/irc/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/error.xpm b/data/iconsets/transports/irc/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/irc/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/irc/invisible.png b/data/iconsets/transports/irc/invisible.png
deleted file mode 100644
index 1738fd794..000000000
Binary files a/data/iconsets/transports/irc/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/message.gif b/data/iconsets/transports/irc/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/irc/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/irc/not_in_the_roster.png b/data/iconsets/transports/irc/not_in_the_roster.png
deleted file mode 100644
index 842bb8fc9..000000000
Binary files a/data/iconsets/transports/irc/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/offline.png b/data/iconsets/transports/irc/offline.png
deleted file mode 100644
index 1738fd794..000000000
Binary files a/data/iconsets/transports/irc/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/online.png b/data/iconsets/transports/irc/online.png
deleted file mode 100644
index 842bb8fc9..000000000
Binary files a/data/iconsets/transports/irc/online.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/requested.png b/data/iconsets/transports/irc/requested.png
deleted file mode 100644
index 1738fd794..000000000
Binary files a/data/iconsets/transports/irc/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/irc/xa.png b/data/iconsets/transports/irc/xa.png
deleted file mode 100644
index 842bb8fc9..000000000
Binary files a/data/iconsets/transports/irc/xa.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/away.png b/data/iconsets/transports/msn/away.png
deleted file mode 100644
index d9a615e6e..000000000
Binary files a/data/iconsets/transports/msn/away.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/chat.png b/data/iconsets/transports/msn/chat.png
deleted file mode 100644
index 676d275c6..000000000
Binary files a/data/iconsets/transports/msn/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/closed.xpm b/data/iconsets/transports/msn/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/transports/msn/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/transports/msn/dnd.png b/data/iconsets/transports/msn/dnd.png
deleted file mode 100644
index 465f5149c..000000000
Binary files a/data/iconsets/transports/msn/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/error.xpm b/data/iconsets/transports/msn/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/msn/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/msn/invisible.png b/data/iconsets/transports/msn/invisible.png
deleted file mode 100644
index 40d129191..000000000
Binary files a/data/iconsets/transports/msn/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/message.gif b/data/iconsets/transports/msn/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/msn/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/msn/not_in_the_roster.png b/data/iconsets/transports/msn/not_in_the_roster.png
deleted file mode 100644
index 8918b59d5..000000000
Binary files a/data/iconsets/transports/msn/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/offline.png b/data/iconsets/transports/msn/offline.png
deleted file mode 100644
index 40d129191..000000000
Binary files a/data/iconsets/transports/msn/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/online.png b/data/iconsets/transports/msn/online.png
deleted file mode 100644
index 676d275c6..000000000
Binary files a/data/iconsets/transports/msn/online.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/opened.xpm b/data/iconsets/transports/msn/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/transports/msn/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/transports/msn/requested.png b/data/iconsets/transports/msn/requested.png
deleted file mode 100644
index 40d129191..000000000
Binary files a/data/iconsets/transports/msn/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/msn/xa.png b/data/iconsets/transports/msn/xa.png
deleted file mode 100644
index d9a615e6e..000000000
Binary files a/data/iconsets/transports/msn/xa.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/away.png b/data/iconsets/transports/sms/away.png
deleted file mode 100644
index 94a006dda..000000000
Binary files a/data/iconsets/transports/sms/away.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/chat.png b/data/iconsets/transports/sms/chat.png
deleted file mode 100644
index 94a006dda..000000000
Binary files a/data/iconsets/transports/sms/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/dnd.png b/data/iconsets/transports/sms/dnd.png
deleted file mode 100644
index 94a006dda..000000000
Binary files a/data/iconsets/transports/sms/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/error.xpm b/data/iconsets/transports/sms/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/sms/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/sms/invisible.png b/data/iconsets/transports/sms/invisible.png
deleted file mode 100644
index 4b5754373..000000000
Binary files a/data/iconsets/transports/sms/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/message.gif b/data/iconsets/transports/sms/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/sms/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/sms/offline.png b/data/iconsets/transports/sms/offline.png
deleted file mode 100644
index 4b5754373..000000000
Binary files a/data/iconsets/transports/sms/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/online.png b/data/iconsets/transports/sms/online.png
deleted file mode 100644
index 94a006dda..000000000
Binary files a/data/iconsets/transports/sms/online.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/requested.png b/data/iconsets/transports/sms/requested.png
deleted file mode 100644
index dcadfcf01..000000000
Binary files a/data/iconsets/transports/sms/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/sms/xa.png b/data/iconsets/transports/sms/xa.png
deleted file mode 100644
index 94a006dda..000000000
Binary files a/data/iconsets/transports/sms/xa.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/away.png b/data/iconsets/transports/yahoo/away.png
deleted file mode 100644
index 185c20462..000000000
Binary files a/data/iconsets/transports/yahoo/away.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/chat.png b/data/iconsets/transports/yahoo/chat.png
deleted file mode 100644
index 185c20462..000000000
Binary files a/data/iconsets/transports/yahoo/chat.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/closed.xpm b/data/iconsets/transports/yahoo/closed.xpm
deleted file mode 100644
index 0ae3c97ea..000000000
--- a/data/iconsets/transports/yahoo/closed.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * closed_xpm[] = {
-"6 8 2 1",
-" 	c None",
-".	c #000000",
-".     ",
-"..    ",
-"...   ",
-"....  ",
-"...   ",
-"..    ",
-".     ",
-"      "};
diff --git a/data/iconsets/transports/yahoo/dnd.png b/data/iconsets/transports/yahoo/dnd.png
deleted file mode 100644
index 185c20462..000000000
Binary files a/data/iconsets/transports/yahoo/dnd.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/error.xpm b/data/iconsets/transports/yahoo/error.xpm
deleted file mode 100644
index bda9b7657..000000000
--- a/data/iconsets/transports/yahoo/error.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char * error_xpm[] = {
-"16 16 43 1",
-" 	c None",
-".	c #FFEC00",
-"+	c #FFE400",
-"@	c #F3CD00",
-"#	c #E5C50F",
-"$	c #E0C214",
-"%	c #DEC016",
-"&	c #FFEA00",
-"*	c #FFE800",
-"=	c #FFDA00",
-"-	c #FFDE00",
-";	c #FFD900",
-">	c #FBD505",
-",	c #D6BA21",
-"'	c #D8BB1E",
-")	c #FDD602",
-"!	c #EAC709",
-"~	c #DABC1D",
-"{	c #D0B628",
-"]	c #DDBE1A",
-"^	c #D4B824",
-"/	c #DEBE18",
-"(	c #E0C114",
-"_	c #000000",
-":	c #FFAFAF",
-"<	c #848484",
-"[	c #FF0000",
-"}	c #939393",
-"|	c #888888",
-"1	c #8D8D8D",
-"2	c #A0A0A0",
-"3	c #9C9C9C",
-"4	c #A1A1A1",
-"5	c #A2A2A2",
-"6	c #B3B3B3",
-"7	c #ABABAB",
-"8	c #949494",
-"9	c #B2B2B2",
-"0	c #B4B4B4",
-"a	c #8A8A8A",
-"b	c #A3A3A3",
-"c	c #A4A4A4",
-"d	c #AEAEAE",
-"..+@#$%         ",
-"&*=@            ",
-"-;>,'           ",
-")!~  {'         ",
-"] ^             ",
-"/  ,            ",
-"(  _            ",
-"   _            ",
-"   _            ",
-" : _ :      <  <",
-":[:}:[:     <  <",
-" :[:[:    |  < <",
-"  :[:}____<  123",
-" :[:[:     <4567",
-":[: :[:     8990",
-" :   :   <<abcd9"};
diff --git a/data/iconsets/transports/yahoo/invisible.png b/data/iconsets/transports/yahoo/invisible.png
deleted file mode 100644
index 2fe2c4b79..000000000
Binary files a/data/iconsets/transports/yahoo/invisible.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/message.gif b/data/iconsets/transports/yahoo/message.gif
deleted file mode 100644
index fea7551cf..000000000
Binary files a/data/iconsets/transports/yahoo/message.gif and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/not_in_the_roster.png b/data/iconsets/transports/yahoo/not_in_the_roster.png
deleted file mode 100644
index 6d752059b..000000000
Binary files a/data/iconsets/transports/yahoo/not_in_the_roster.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/offline.png b/data/iconsets/transports/yahoo/offline.png
deleted file mode 100644
index 2fe2c4b79..000000000
Binary files a/data/iconsets/transports/yahoo/offline.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/online.png b/data/iconsets/transports/yahoo/online.png
deleted file mode 100644
index 185c20462..000000000
Binary files a/data/iconsets/transports/yahoo/online.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/opened.xpm b/data/iconsets/transports/yahoo/opened.xpm
deleted file mode 100644
index 44e9298f6..000000000
--- a/data/iconsets/transports/yahoo/opened.xpm
+++ /dev/null
@@ -1,11 +0,0 @@
-/* XPM */
-static char * opened_xpm[] = {
-"7 6 2 1",
-" 	c None",
-".	c #000000",
-".......",
-" ..... ",
-"  ...  ",
-"   .   ",
-"       ",
-"       "};
diff --git a/data/iconsets/transports/yahoo/requested.png b/data/iconsets/transports/yahoo/requested.png
deleted file mode 100644
index 2fe2c4b79..000000000
Binary files a/data/iconsets/transports/yahoo/requested.png and /dev/null differ
diff --git a/data/iconsets/transports/yahoo/xa.png b/data/iconsets/transports/yahoo/xa.png
deleted file mode 100644
index 185c20462..000000000
Binary files a/data/iconsets/transports/yahoo/xa.png and /dev/null differ
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index eba20cad5..c9a477d89 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -1417,7 +1417,7 @@
 		<widget class="GtkButton" id="edit_details_button">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Edit Personal Details...</property>
+		  <property name="label" translatable="yes">Edit Personal Details...</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>