Add a convenience routine to convert pixbuf data generated by

gdk-pixbuf-csource to a GtkImage. Use it to load the expert indicator
images. Add prettier indicator images. The "chat" indicator is more blue
in order to differentiate it from the "none" indicator; make the chat
text background more blue to match.

svn path=/trunk/; revision=30825

16 files changed, 730 insertions, 449 deletions

diff --git a/image/expert_chat.h b/image/expert_chat.h
new file mode 100644
index 0000000000..75556ea1f7
--- /dev/null
+++ b/image/expert_chat.h
@@ -0,0 +1,60 @@
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (expert_chat_pb_data)
+#endif
+#ifdef __GNUC__
+static const guint8 expert_chat_pb_data[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 expert_chat_pb_data[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (784) */
+  "\0\0\3("
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (56) */
+  "\0\0\0""8"
+  /* width (14) */
+  "\0\0\0\16"
+  /* height (14) */
+  "\0\0\0\16"
+  /* pixel_data: */
+  "\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\15\1\2\17\206\1\3\23"
+  "\314\1\3\24\345\2\4\25\345\1\3\23\314\1\2\17\206\0\0\0\15\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\0\1\5G\6\10"
+  "\30\343HQ\223\373ht\302\377\206\217\324\377\210\221\325\377ht\302\377"
+  "EN\221\373\6\10\30\343\0\1\5G\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\0\1\5G\20\25""3\357dr\304\377{\210\323\377z\207\323\377z\207\323\377"
+  "z\207\323\377z\207\323\377z\207\323\377dr\304\377\17\24""3\357\0\1\5"
+  "G\377\377\377\0\0\0\0\15\2\5\25\343EY\274\377cu\320\377cu\320\377cu\320"
+  "\377cu\320\377cu\320\377cu\320\377cu\320\377cu\320\377Re\301\377\2\5"
+  "\25\343\0\0\0\15\2\4\21\206\13\40x\372D^\312\377Me\315\377Me\315\377"
+  "Me\315\377Me\315\377Me\315\377Me\315\377Ib\314\377F`\313\377Me\315\377"
+  "\26*~\372\2\4\21\206\2\7\26\314\22""5\264\377\23""9\302\377\30=\303\377"
+  "\40D\305\377!E\306\377!E\306\377\40D\305\377\32\77\304\377\23""9\302"
+  "\377\23""9\302\377\26<\303\377\22""5\264\377\2\7\26\314\3\10\31\345\25"
+  "\77\310\377\25\77\310\377\25\77\310\377\25\77\310\377\25\77\310\377\25"
+  "\77\310\377\25\77\310\377\25\77\310\377\25\77\310\377\25\77\310\377\25"
+  "\77\310\377\25\77\310\377\3\10\31\345\3\11\31\345\30F\316\377\30F\316"
+  "\377\30F\316\377\30F\316\377\30F\316\377\30F\316\377\30F\316\377\30F"
+  "\316\377\30F\316\377\30F\316\377\30F\316\377\30F\316\377\3\11\31\345"
+  "\3\11\31\314\30G\304\377\32M\324\377\32M\324\377\32M\324\377\32M\324"
+  "\377\32M\324\377\32M\324\377\32M\324\377\32M\324\377\32M\324\377\32M"
+  "\324\377\30G\304\377\3\11\31\314\3\7\24\206\22""5\214\372\34S\332\377"
+  "\34S\332\377\34S\332\377\34S\332\377\34S\332\377\34S\332\377\34S\332"
+  "\377\34S\332\377\34S\332\377\34S\332\377\22""5\214\372\3\7\24\206\0\0"
+  "\0\15\3\12\31\343\34S\317\377\36Z\340\377\36Z\340\377\36Z\340\377\36"
+  "Z\340\377\36Z\340\377\36Z\340\377\36Z\340\377\36Z\340\377\34S\317\377"
+  "\3\12\31\343\0\0\0\15\377\377\377\0\1\3\7G\7\26""4\356\36Z\326\377\40"
+  "a\347\377\40a\347\377\40a\347\377\40a\347\377\40a\347\377\40a\347\377"
+  "\36Z\326\377\7\26""4\356\1\3\7G\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\1\3\7G\4\14\33\343\26B\230\372\37_\333\377\"g\355\377\"g\355\377\37"
+  "_\333\377\26B\230\372\4\14\33\343\1\3\7G\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\15\3\12\26\206\4\14"
+  "\34\314\4\15\36\345\4\15\36\345\4\14\34\314\3\12\26\206\0\0\0\15\377"
+  "\377\377\0\377\377\377\0\377\377\377\0"};
+
+
diff --git a/image/expert_chat.png b/image/expert_chat.png
new file mode 100644
index 0000000000..e8fde81590
--- /dev/null
+++ b/image/expert_chat.png
diff --git a/image/expert_chat.xpm b/image/expert_chat.xpm
deleted file mode 100644
index 209a793607..0000000000
--- a/image/expert_chat.xpm
+++ /dev/null
@@ -1,88 +0,0 @@
-/* XPM */

-static const char * expert_chat_xpm[] = {

-"14 14 71 1",

-" 	c None",

-".	c #191919",

-"+	c #1A1A1A",

-"@	c #101010",

-"#	c #0D0D0D",

-"$	c #0A0A0A",

-"%	c #282828",

-"&	c #6E6E6E",

-"*	c #969696",

-"=	c #A7A7A7",

-"-	c #A2A2A2",

-";	c #848484",

-">	c #535353",

-",	c #0B0B0B",

-"'	c #3E3E3E",

-")	c #AAAAAA",

-"!	c #C5C5C5",

-"~	c #C9C9C9",

-"{	c #B8B8B8",

-"]	c #9F9F9F",

-"^	c #838383",

-"/	c #121212",

-"(	c #313131",

-"_	c #ACACAC",

-":	c #D1D1D1",

-"<	c #DFDFDF",

-"[	c #E3E3E3",

-"}	c #DEDEDE",

-"|	c #CFCFCF",

-"1	c #BABABA",

-"2	c #9D9D9D",

-"3	c #818181",

-"4	c #212121",

-"5	c #747474",

-"6	c #C7C7C7",

-"7	c #EAEAEA",

-"8	c #EDEDED",

-"9	c #E9E9E9",

-"0	c #DCDCDC",

-"a	c #9E9E9E",

-"b	c #9A9A9A",

-"c	c #505050",

-"d	c #080808",

-"e	c #1F1F1F",

-"f	c #979797",

-"g	c #C6C6C6",

-"h	c #DDDDDD",

-"i	c #ECECEC",

-"j	c #C4C4C4",

-"k	c #7D7D7D",

-"l	c #0E0E0E",

-"m	c #111111",

-"n	c #A4A4A4",

-"o	c #E0E0E0",

-"p	c #DBDBDB",

-"q	c #CDCDCD",

-"r	c #A6A6A6",

-"s	c #9C9C9C",

-"t	c #999999",

-"u	c #0C0C0C",

-"v	c #A9A9A9",

-"w	c #B7B7B7",

-"x	c #C2C2C2",

-"y	c #C1C1C1",

-"z	c #B6B6B6",

-"A	c #A8A8A8",

-"B	c #0F0F0F",

-"C	c #7F7F7F",

-"D	c #A3A3A3",

-"E	c #515151",

-"F	c #9B9B9B",

-"    .+@#@$    ",

-"   %&*=-;>,   ",

-"  ')!~!{)]^/  ",

-" (_:<[}|1=23$ ",

-"456}7890!_abcd",

-"efgh9i90j_abkl",

-"mn1|0opq{rst*d",

-"usvwxgyzAabt*d",

-"BCaDA)AD2bttkl",

-"dEbFsssFbtttcd",

-" $3tttttttt3$ ",

-"  /3tttttt3/  ",

-"   $ck**kc$   ",

-"    dlddld    "};

diff --git a/image/expert_error.h b/image/expert_error.h
new file mode 100644
index 0000000000..73d59e178f
--- /dev/null
+++ b/image/expert_error.h
@@ -0,0 +1,62 @@
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (expert_error_pb_data)
+#endif
+#ifdef __GNUC__
+static const guint8 expert_error_pb_data[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 expert_error_pb_data[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (784) */
+  "\0\0\3("
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (56) */
+  "\0\0\0""8"
+  /* width (14) */
+  "\0\0\0\16"
+  /* height (14) */
+  "\0\0\0\16"
+  /* pixel_data: */
+  "\377\377\377\0\377\377\377\0\377\377\377\0\351\24\0\15\344\23\0\206\343"
+  "\22\1\314\342\22\1\345\342\23\2\345\343\22\1\314\344\23\0\206\351\24"
+  "\0\15\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\346\23\0G\343\27\6\343\327KE\373\325ge\377\333\204\203\377\334"
+  "\206\205\377\325ge\377\327HB\373\343\27\6\343\346\23\0G\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\342\22\0G\334\35\16\357\325b_\377\332xv"
+  "\377\332wu\377\332wu\377\332wu\377\332wu\377\332wu\377\325b_\377\334"
+  "\34\15\357\342\22\0G\377\377\377\0\337\21\1\15\333\20\1\343\320B>\377"
+  "\326_\\\377\326_\\\377\326_\\\377\326_\\\377\326_\\\377\326_\\\377\326"
+  "_\\\377\326_\\\377\323OK\377\333\20\1\343\337\21\1\15\330\17\1\206\314"
+  "\14\3\372\321\77:\377\323HC\377\323HC\377\323HC\377\323HC\377\323HC\377"
+  "\323HC\377\322C\77\377\321A<\377\323HC\377\316\27\16\372\330\17\1\206"
+  "\323\16\2\314\311\13\3\377\310\13\3\377\311\20\10\377\313\30\20\377\313"
+  "\32\22\377\313\32\22\377\313\31\21\377\312\22\12\377\310\13\3\377\310"
+  "\13\3\377\311\16\7\377\311\13\3\377\323\16\2\314\320\15\2\345\314\14"
+  "\3\377\314\14\3\377\314\14\3\377\314\14\3\377\314\14\3\377\314\14\3\377"
+  "\314\14\3\377\314\14\3\377\314\14\3\377\314\14\3\377\314\14\3\377\314"
+  "\14\3\377\320\15\2\345\314\14\3\345\321\15\2\377\321\15\2\377\321\15"
+  "\2\377\321\15\2\377\321\15\2\377\321\15\2\377\321\15\2\377\321\15\2\377"
+  "\321\15\2\377\321\15\2\377\321\15\2\377\321\15\2\377\314\14\3\345\311"
+  "\13\3\314\324\16\2\377\325\16\2\377\325\16\2\377\325\16\2\377\325\16"
+  "\2\377\325\16\2\377\325\16\2\377\325\16\2\377\325\16\2\377\325\16\2\377"
+  "\325\16\2\377\324\16\2\377\311\13\3\314\304\13\4\206\321\16\2\372\331"
+  "\20\1\377\331\20\1\377\331\20\1\377\331\20\1\377\331\20\1\377\331\20"
+  "\1\377\331\20\1\377\331\20\1\377\331\20\1\377\331\20\1\377\321\16\2\372"
+  "\304\13\4\206\275\10\4\15\301\11\4\343\333\20\1\377\335\21\1\377\335"
+  "\21\1\377\335\21\1\377\335\21\1\377\335\21\1\377\335\21\1\377\335\21"
+  "\1\377\335\21\1\377\333\20\1\377\301\11\4\343\275\10\4\15\377\377\377"
+  "\0\271\7\5G\301\11\4\356\337\21\0\377\342\22\0\377\342\22\0\377\342\22"
+  "\0\377\342\22\0\377\342\22\0\377\342\22\0\377\337\21\0\377\301\11\4\356"
+  "\271\7\5G\377\377\377\0\377\377\377\0\377\377\377\0\266\6\5G\272\7\4"
+  "\343\324\16\2\372\342\22\0\377\346\23\0\377\346\23\0\377\342\22\0\377"
+  "\324\16\2\372\272\7\4\343\266\6\5G\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\263\6\5\15\270\7\5\206\271\10\4\314"
+  "\272\10\4\345\272\10\4\345\271\10\4\314\270\7\5\206\263\6\5\15\377\377"
+  "\377\0\377\377\377\0\377\377\377\0"};
+
+
diff --git a/image/expert_error.png b/image/expert_error.png
new file mode 100644
index 0000000000..8fc149e425
--- /dev/null
+++ b/image/expert_error.png
diff --git a/image/expert_error.xpm b/image/expert_error.xpm
deleted file mode 100644
index 914b8399ba..0000000000
--- a/image/expert_error.xpm
+++ /dev/null
@@ -1,112 +0,0 @@
-/* XPM */

-static const char * expert_error_xpm[] = {

-"14 14 95 2",

-"  	c None",

-". 	c #1D1111",

-"+ 	c #230D0D",

-"@ 	c #160808",

-"# 	c #130505",

-"$ 	c #1A0303",

-"% 	c #0F0202",

-"& 	c #2F2020",

-"* 	c #9A2C2C",

-"= 	c #DA3131",

-"- 	c #FB2A2A",

-"; 	c #FB1C1C",

-"> 	c #D30D0D",

-", 	c #870404",

-"' 	c #120101",

-") 	c #482F2F",

-"! 	c #E45252",

-"~ 	c #FF6F6F",

-"{ 	c #FF7979",

-"] 	c #FF6D6D",

-"^ 	c #FF4E4E",

-"/ 	c #FF2A2A",

-"( 	c #FF1010",

-"_ 	c #D80404",

-": 	c #1E0000",

-"< 	c #372828",

-"[ 	c #E55858",

-"} 	c #FF8C8C",

-"| 	c #FFAEAE",

-"1 	c #FFB8B8",

-"2 	c #FFACAC",

-"3 	c #FF8888",

-"4 	c #FF5353",

-"5 	c #FF2222",

-"6 	c #FF0909",

-"7 	c #D70101",

-"8 	c #110000",

-"9 	c #261A1A",

-"0 	c #9E3535",

-"a 	c #FF7373",

-"b 	c #FFADAD",

-"c 	c #FFCACA",

-"d 	c #FFD1D1",

-"e 	c #FFC9C9",

-"f 	c #FFA8A8",

-"g 	c #FF6E6E",

-"h 	c #FF3030",

-"i 	c #FF0D0D",

-"j 	c #FF0202",

-"k 	c #850000",

-"l 	c #0D0000",

-"m 	c #281212",

-"n 	c #DA3333",

-"o 	c #FF7171",

-"p 	c #FFABAB",

-"q 	c #FFD0D0",

-"r 	c #FFC7C7",

-"s 	c #FFA7A7",

-"t 	c #FF6C6C",

-"u 	c #FF2F2F",

-"v 	c #FF0C0C",

-"w 	c #D10000",

-"x 	c #180000",

-"y 	c #170A0A",

-"z 	c #FB2323",

-"A 	c #FF8686",

-"B 	c #FFB2B2",

-"C 	c #FFA6A6",

-"D 	c #FF8383",

-"E 	c #FF2020",

-"F 	c #FF0808",

-"G 	c #FF0101",

-"H 	c #FA0000",

-"I 	c #0E0000",

-"J 	c #120404",

-"K 	c #FA0F0F",

-"L 	c #FF2828",

-"M 	c #FF4A4A",

-"N 	c #FF6666",

-"O 	c #FF6565",

-"P 	c #FF4848",

-"Q 	c #FF2626",

-"R 	c #FF0303",

-"S 	c #FF0000",

-"T 	c #190101",

-"U 	c #D20404",

-"V 	c #FF1919",

-"W 	c #FF2B2B",

-"X 	c #FF2525",

-"Y 	c #FF1818",

-"Z 	c #FF0B0B",

-"` 	c #850101",

-" .	c #FF0404",

-"..	c #FF0707",

-"+.	c #D70000",

-"        . + @ # $ %         ",

-"      & * = - ; > , '       ",

-"    ) ! ~ { ] ^ / ( _ :     ",

-"  < [ } | 1 2 3 4 5 6 7 8   ",

-"9 0 a b c d e f g h i j k l ",

-"m n o p e q r s t u v j w x ",

-"y z 4 A f B C D ^ E F G H I ",

-"J K L M N o O P Q i R S H I ",

-"T U v V Q W X Y Z R G S w x ",

-"l ` j  ...F .. .j S S S k l ",

-"  8 +.S G G G S S S S +.8   ",

-"    : +.S S S S S S +.:     ",

-"      8 k w H H w k 8       ",

-"        l x I I x l         "};

diff --git a/image/expert_indicators.svg b/image/expert_indicators.svg
new file mode 100644
index 0000000000..a257a3cba7
--- /dev/null
+++ b/image/expert_indicators.svg
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="Expert Indicators.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/tmp/expert_none.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3872">
+      <stop
+         style="stop-color:#f7f253;stop-opacity:1;"
+         offset="0"
+         id="stop3874" />
+      <stop
+         style="stop-color:#bec00a;stop-opacity:1;"
+         offset="1"
+         id="stop3876" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3866">
+      <stop
+         style="stop-color:#2fd0f2;stop-opacity:1;"
+         offset="0"
+         id="stop3868" />
+      <stop
+         style="stop-color:#0a98b6;stop-opacity:1;"
+         offset="1"
+         id="stop3870" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3860">
+      <stop
+         style="stop-color:#e91400;stop-opacity:1;"
+         offset="0"
+         id="stop3862" />
+      <stop
+         style="stop-color:#b30606;stop-opacity:1;"
+         offset="1"
+         id="stop3864" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3824">
+      <stop
+         style="stop-color:#a1a1a1;stop-opacity:1;"
+         offset="0"
+         id="stop3826" />
+      <stop
+         style="stop-color:#565656;stop-opacity:1;"
+         offset="1"
+         id="stop3828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3152">
+      <stop
+         style="stop-color:#1ba0df;stop-opacity:1;"
+         offset="0"
+         id="stop3154" />
+      <stop
+         style="stop-color:#1373a1;stop-opacity:1;"
+         offset="1"
+         id="stop3156" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1702">
+      <stop
+         id="stop1703"
+         offset="0.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.690722;" />
+      <stop
+         id="stop1704"
+         offset="1.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1697">
+      <stop
+         id="stop1698"
+         offset="0"
+         style="stop-color:#246cf1;stop-opacity:1;" />
+      <stop
+         id="stop1699"
+         offset="1"
+         style="stop-color:#0917a3;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1702"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.3943894e-2,0,0,2.2340667e-2,-3.6045422,-2.3119352)"
+       x1="213.82799"
+       y1="183.48366"
+       x2="214.59154"
+       y2="463.47311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1697"
+       id="linearGradient3267"
+       gradientUnits="userSpaceOnUse"
+       x1="520.57166"
+       y1="506.28723"
+       x2="520.57166"
+       y2="466.2785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3824"
+       id="linearGradient3818"
+       gradientUnits="userSpaceOnUse"
+       x1="520.57166"
+       y1="506.28723"
+       x2="520.57166"
+       y2="466.2785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1702"
+       id="linearGradient3822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.3943894e-2,0,0,2.2340667e-2,44.395442,-2.3119352)"
+       x1="213.82799"
+       y1="183.48366"
+       x2="214.59154"
+       y2="463.47311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3860"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
+       x1="520.57166"
+       y1="506.28723"
+       x2="520.57166"
+       y2="466.2785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1702"
+       id="linearGradient3838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.3943894e-2,0,0,2.2340667e-2,12.39545,-2.3119608)"
+       x1="213.82799"
+       y1="183.48366"
+       x2="214.59154"
+       y2="463.47311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3866"
+       id="linearGradient3844"
+       gradientUnits="userSpaceOnUse"
+       x1="520.57166"
+       y1="506.28723"
+       x2="520.57166"
+       y2="466.2785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1702"
+       id="linearGradient3848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.3943894e-2,0,0,2.2340667e-2,28.39545,-2.3119608)"
+       x1="213.82799"
+       y1="183.48366"
+       x2="214.59154"
+       y2="463.47311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3872"
+       id="linearGradient3854"
+       gradientUnits="userSpaceOnUse"
+       x1="520.57166"
+       y1="506.28723"
+       x2="520.57166"
+       y2="466.2785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1702"
+       id="linearGradient3858"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.3943894e-2,0,0,2.2340667e-2,60.39545,-2.3119608)"
+       x1="213.82799"
+       y1="183.48366"
+       x2="214.59154"
+       y2="463.47311" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="43.625"
+     inkscape:cy="8.3960288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1044"
+     inkscape:window-height="674"
+     inkscape:window-x="1498"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       d="M 544.06634,487.06226 A 20.783747,20.783747 0 1 1 502.49885,487.06226 A 20.783747,20.783747 0 1 1 544.06634,487.06226 z"
+       id="path1070"
+       sodipodi:cx="523.28259"
+       sodipodi:cy="487.06226"
+       sodipodi:rx="20.783747"
+       sodipodi:ry="20.783747"
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3267);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.45258416;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0.3180319,0,0,0.3180319,-158.42054,-146.90131)"
+       inkscape:export-filename="/tmp/expert_chat.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       d="M 12.801525,6.2587544 C 14.341739,6.2251921 12.371052,1.9834825 8.0913372,1.9609208 C 3.4200112,1.9370674 2.46415,5.8129627 3.2062378,5.8836379 C 3.2062378,5.8836379 4.485983,6.0593873 5.7036321,6.3993685 C 7.6640897,6.9524092 10.062091,5.9456684 11.007025,5.7993662 C 12.06037,5.6362785 12.651601,6.3337166 12.801525,6.2587544 z"
+       id="path1713"
+       sodipodi:nodetypes="cccccc"
+       style="opacity:0.9;fill:url(#linearGradient3264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:export-filename="/tmp/expert_chat.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(0.3180319,0,0,0.3180319,-110.42056,-146.90131)"
+       style="fill:url(#linearGradient3818);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.45325397999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc"
+       sodipodi:ry="20.783747"
+       sodipodi:rx="20.783747"
+       sodipodi:cy="487.06226"
+       sodipodi:cx="523.28259"
+       id="path3814"
+       d="M 544.06634,487.06226 A 20.783747,20.783747 0 1 1 502.49885,487.06226 A 20.783747,20.783747 0 1 1 544.06634,487.06226 z"
+       inkscape:export-filename="/tmp/expert_none.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="opacity:0.9;fill:url(#linearGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       sodipodi:nodetypes="cccccc"
+       id="path3816"
+       d="M 60.801509,6.2587544 C 62.341723,6.2251921 60.371036,1.9834825 56.091321,1.9609208 C 51.419995,1.9370674 50.464134,5.8129627 51.206222,5.8836379 C 51.206222,5.8836379 52.485967,6.0593873 53.703616,6.3993685 C 55.664074,6.9524092 58.062075,5.9456684 59.007009,5.7993662 C 60.060354,5.6362785 60.651585,6.3337166 60.801509,6.2587544 z"
+       inkscape:export-filename="/tmp/expert_none.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(0.3180319,0,0,0.3180319,-142.42056,-146.90134)"
+       style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.45258415999999979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc"
+       sodipodi:ry="20.783747"
+       sodipodi:rx="20.783747"
+       sodipodi:cy="487.06226"
+       sodipodi:cx="523.28259"
+       id="path3830"
+       d="M 544.06634,487.06226 A 20.783747,20.783747 0 1 1 502.49885,487.06226 A 20.783747,20.783747 0 1 1 544.06634,487.06226 z"
+       inkscape:export-filename="/tmp/expert_error.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="opacity:0.90000000000000002;fill:url(#linearGradient3838);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.78;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:nodetypes="cccccc"
+       id="path3832"
+       d="M 28.801517,6.2587288 C 30.341731,6.2251665 28.371044,1.9834569 24.091329,1.9608952 C 19.420003,1.9370418 18.464142,5.8129371 19.20623,5.8836123 C 19.20623,5.8836123 20.485975,6.0593617 21.703624,6.3993429 C 23.664082,6.9523836 26.062083,5.9456428 27.007017,5.7993406 C 28.060362,5.6362529 28.651593,6.333691 28.801517,6.2587288 z"
+       inkscape:export-filename="/tmp/expert_error.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       d="M 544.06634,487.06226 A 20.783747,20.783747 0 1 1 502.49885,487.06226 A 20.783747,20.783747 0 1 1 544.06634,487.06226 z"
+       id="path3840"
+       sodipodi:cx="523.28259"
+       sodipodi:cy="487.06226"
+       sodipodi:rx="20.783747"
+       sodipodi:ry="20.783747"
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3844);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.45325397999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0.3180319,0,0,0.3180319,-126.42056,-146.90134)"
+       inkscape:export-filename="/tmp/expert_note.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       d="M 44.801517,6.2587288 C 46.341731,6.2251665 44.371044,1.9834569 40.091329,1.9608952 C 35.420003,1.9370418 34.464142,5.8129371 35.20623,5.8836123 C 35.20623,5.8836123 36.485975,6.0593617 37.703624,6.3993429 C 39.664082,6.9523836 42.062083,5.9456428 43.007017,5.7993406 C 44.060362,5.6362529 44.651593,6.333691 44.801517,6.2587288 z"
+       id="path3842"
+       sodipodi:nodetypes="cccccc"
+       style="opacity:0.9;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:export-filename="/tmp/expert_note.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       transform="matrix(0.3180319,0,0,0.3180319,-94.420556,-146.90134)"
+       style="fill:url(#linearGradient3854);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.45325397999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc"
+       sodipodi:ry="20.783747"
+       sodipodi:rx="20.783747"
+       sodipodi:cy="487.06226"
+       sodipodi:cx="523.28259"
+       id="path3850"
+       d="M 544.06634,487.06226 A 20.783747,20.783747 0 1 1 502.49885,487.06226 A 20.783747,20.783747 0 1 1 544.06634,487.06226 z"
+       inkscape:export-filename="/tmp/expert_warn.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="opacity:0.9;fill:url(#linearGradient3858);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       sodipodi:nodetypes="cccccc"
+       id="path3852"
+       d="M 76.801517,6.2587288 C 78.341731,6.2251665 76.371044,1.9834569 72.091329,1.9608952 C 67.420003,1.9370418 66.464142,5.8129371 67.20623,5.8836123 C 67.20623,5.8836123 68.485975,6.0593617 69.703624,6.3993429 C 71.664082,6.9523836 74.062083,5.9456428 75.007017,5.7993406 C 76.060362,5.6362529 76.651593,6.333691 76.801517,6.2587288 z"
+       inkscape:export-filename="/tmp/expert_warn.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier;-inkscape-font-specification:Courier"
+       x="3.7314625"
+       y="-2.0742188"
+       id="text3878"><tspan
+         sodipodi:role="line"
+         id="tspan3880"
+         x="3.7314625"
+         y="-2.0742188"
+         style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Helvetica;-inkscape-font-specification:Helvetica">Chat</tspan></text>
+    <text
+       id="text3882"
+       y="-2.0742188"
+       x="19.397459"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier;-inkscape-font-specification:Courier"
+       xml:space="preserve"><tspan
+         style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Helvetica;-inkscape-font-specification:Helvetica"
+         y="-2.0742188"
+         x="19.397459"
+         id="tspan3884"
+         sodipodi:role="line">Error</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier;-inkscape-font-specification:Courier"
+       x="35.705074"
+       y="-2.0742188"
+       id="text3886"><tspan
+         sodipodi:role="line"
+         id="tspan3888"
+         x="35.705074"
+         y="-2.0742188"
+         style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Helvetica;-inkscape-font-specification:Helvetica">Note</tspan></text>
+    <text
+       id="text3890"
+       y="-2.0742188"
+       x="51.150387"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier;-inkscape-font-specification:Courier"
+       xml:space="preserve"><tspan
+         style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Helvetica;-inkscape-font-specification:Helvetica"
+         y="-2.0742188"
+         x="51.150387"
+         id="tspan3892"
+         sodipodi:role="line">None</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier;-inkscape-font-specification:Courier"
+       x="67.314453"
+       y="-2.0742188"
+       id="text3894"><tspan
+         sodipodi:role="line"
+         id="tspan3896"
+         x="67.314453"
+         y="-2.0742188"
+         style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Helvetica;-inkscape-font-specification:Helvetica">Warn</tspan></text>
+    <text
+       id="text3898"
+       y="-2.0742188"
+       x="66.824219"
+       style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier;-inkscape-font-specification:Courier"
+       xml:space="preserve"><tspan
+         style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Helvetica;-inkscape-font-specification:Helvetica"
+         y="-2.0742188"
+         x="66.824219"
+         id="tspan3900"
+         sodipodi:role="line" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:4.00000477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Helvetica;-inkscape-font-specification:Helvetica"
+       x="0.84374857"
+       y="22.115261"
+       id="text4583"
+       transform="scale(1.0000012,0.9999988)"><tspan
+         sodipodi:role="line"
+         x="0.84374857"
+         y="22.115261"
+         id="tspan4595">Originally from the public domain image at </tspan><tspan
+         sodipodi:role="line"
+         x="0.84374857"
+         y="27.115269"
+         id="tspan4599">http://openclipart.org/Xiph/files/Anonymous/13273</tspan></text>
+  </g>
+</svg>
diff --git a/image/expert_none.h b/image/expert_none.h
new file mode 100644
index 0000000000..b1e12eba73
--- /dev/null
+++ b/image/expert_none.h
@@ -0,0 +1,55 @@
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (expert_none_pb_data)
+#endif
+#ifdef __GNUC__
+static const guint8 expert_none_pb_data[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 expert_none_pb_data[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (784) */
+  "\0\0\3("
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (56) */
+  "\0\0\0""8"
+  /* width (14) */
+  "\0\0\0\16"
+  /* height (14) */
+  "\0\0\0\16"
+  /* pixel_data: */
+  "\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\15\6\6\6\206\7\7\7\314"
+  "\10\10\10\345\11\11\11\345\7\7\7\314\6\6\6\206\0\0\0\15\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\2\2\2G\15\15"
+  "\15\343ccc\373\210\210\210\377\241\241\241\377\243\243\243\377\210\210"
+  "\210\377```\373\15\15\15\343\2\2\2G\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\2\2\2G\35\35\35\357\207\207\207\377\233\233\233\377\232\232\232"
+  "\377\232\232\232\377\232\232\232\377\232\232\232\377\232\232\232\377"
+  "\207\207\207\377\34\34\34\357\2\2\2G\377\377\377\0\0\0\0\15\11\11\11"
+  "\343qqq\377\213\213\213\377\213\213\213\377\213\213\213\377\213\213\213"
+  "\377\213\213\213\377\213\213\213\377\213\213\213\377\213\213\213\377"
+  "{{{\377\11\11\11\343\0\0\0\15\7\7\7\206555\372www\377}}}\377}}}\377}"
+  "}}\377}}}\377}}}\377}}}\377zzz\377yyy\377}}}\377>>>\372\7\7\7\206\12"
+  "\12\12\314QQQ\377XXX\377\\\\\\\377aaa\377bbb\377bbb\377aaa\377]]]\377"
+  "XXX\377XXX\377ZZZ\377QQQ\377\12\12\12\314\13\13\13\345]]]\377]]]\377"
+  "]]]\377]]]\377]]]\377]]]\377]]]\377]]]\377]]]\377]]]\377]]]\377]]]\377"
+  "\13\13\13\345\14\14\14\345bbb\377bbb\377bbb\377bbb\377bbb\377bbb\377"
+  "bbb\377bbb\377bbb\377bbb\377bbb\377bbb\377\14\14\14\345\14\14\14\314"
+  "___\377ggg\377ggg\377ggg\377ggg\377ggg\377ggg\377ggg\377ggg\377ggg\377"
+  "ggg\377___\377\14\14\14\314\12\12\12\206EEE\372lll\377lll\377lll\377"
+  "lll\377lll\377lll\377lll\377lll\377lll\377lll\377EEE\372\12\12\12\206"
+  "\0\0\0\15\15\15\15\343iii\377qqq\377qqq\377qqq\377qqq\377qqq\377qqq\377"
+  "qqq\377qqq\377iii\377\15\15\15\343\0\0\0\15\377\377\377\0\4\4\4G\33\33"
+  "\33\356mmm\377vvv\377vvv\377vvv\377vvv\377vvv\377vvv\377mmm\377\33\33"
+  "\33\356\4\4\4G\377\377\377\0\377\377\377\0\377\377\377\0\4\4\4G\16\16"
+  "\16\343OOO\372rrr\377{{{\377{{{\377rrr\377OOO\372\16\16\16\343\4\4\4"
+  "G\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\0\0\0\15\13\13\13\206\17\17\17\314\20\20\20\345\20\20\20\345\17\17"
+  "\17\314\13\13\13\206\0\0\0\15\377\377\377\0\377\377\377\0\377\377\377"
+  "\0"};
+
+
diff --git a/image/expert_none.png b/image/expert_none.png
new file mode 100644
index 0000000000..a880d6b171
--- /dev/null
+++ b/image/expert_none.png
diff --git a/image/expert_none.xpm b/image/expert_none.xpm
deleted file mode 100644
index 82e1109391..0000000000
--- a/image/expert_none.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */

-static const char * expert_none_xpm[] = {

-"14 14 2 1",

-" 	c None",

-".	c #000000",

-"    ......    ",

-"   ..    ..   ",

-"  .        .  ",

-" .          . ",

-"..          ..",

-".            .",

-".            .",

-".            .",

-".            .",

-"..          ..",

-" .          . ",

-"  .        .  ",

-"   ..    ..   ",

-"    ......    "};

diff --git a/image/expert_note.h b/image/expert_note.h
new file mode 100644
index 0000000000..9961e0e41b
--- /dev/null
+++ b/image/expert_note.h
@@ -0,0 +1,63 @@
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (expert_note_pb_data)
+#endif
+#ifdef __GNUC__
+static const guint8 expert_note_pb_data[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 expert_note_pb_data[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (784) */
+  "\0\0\3("
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (56) */
+  "\0\0\0""8"
+  /* width (14) */
+  "\0\0\0\16"
+  /* height (14) */
+  "\0\0\0\16"
+  /* pixel_data: */
+  "\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\15\1\16\20\206\1\22"
+  "\25\314\1\23\26\345\2\24\27\345\1\22\25\314\1\16\20\206\0\0\0\15\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\0"
+  "\5\6G\6\27\32\343I\215\233\373j\273\315\377\207\316\335\377\211\317\336"
+  "\377j\273\315\377F\213\232\373\6\27\32\343\0\5\6G\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\0\5\6G\21""06\357f\273\315\377|\314\334\377{\313"
+  "\334\377{\313\334\377{\313\334\377{\313\334\377{\313\334\377f\273\315"
+  "\377\20/5\357\0\5\6G\377\377\377\0\0\0\0\15\2\23\26\343H\260\306\377"
+  "f\305\331\377f\305\331\377f\305\331\377f\305\331\377f\305\331\377f\305"
+  "\331\377f\305\331\377f\305\331\377U\266\312\377\2\23\26\343\0\0\0\15"
+  "\2\17\22\206\15m\201\372G\274\325\377P\277\327\377P\277\327\377P\277"
+  "\327\377P\277\327\377P\277\327\377P\277\327\377L\276\326\377I\275\325"
+  "\377P\277\327\377\27s\206\372\2\17\22\206\3\24\30\314\26\241\277\377"
+  "\30\256\316\377\35\260\317\377$\262\321\377&\263\321\377&\263\321\377"
+  "%\263\321\377\37\260\317\377\30\256\316\377\30\256\316\377\33\257\317"
+  "\377\26\241\277\377\3\24\30\314\3\26\32\345\33\262\322\377\33\262\322"
+  "\377\33\262\322\377\33\262\322\377\33\262\322\377\33\262\322\377\33\262"
+  "\322\377\33\262\322\377\33\262\322\377\33\262\322\377\33\262\322\377"
+  "\33\262\322\377\3\26\32\345\4\26\32\345\36\267\327\377\36\267\327\377"
+  "\36\267\327\377\36\267\327\377\36\267\327\377\36\267\327\377\36\267\327"
+  "\377\36\267\327\377\36\267\327\377\36\267\327\377\36\267\327\377\36\267"
+  "\327\377\4\26\32\345\4\26\31\314\37\255\314\377!\273\334\377!\273\334"
+  "\377!\273\334\377!\273\334\377!\273\334\377!\273\334\377!\273\334\377"
+  "!\273\334\377!\273\334\377!\273\334\377\37\255\314\377\4\26\31\314\3"
+  "\21\24\206\27{\220\372$\300\340\377$\300\340\377$\300\340\377$\300\340"
+  "\377$\300\340\377$\300\340\377$\300\340\377$\300\340\377$\300\340\377"
+  "$\300\340\377\27{\220\372\3\21\24\206\0\0\0\15\4\26\32\343$\265\324\377"
+  "'\304\345\377'\304\345\377'\304\345\377'\304\345\377'\304\345\377'\304"
+  "\345\377'\304\345\377'\304\345\377$\265\324\377\4\26\32\343\0\0\0\15"
+  "\377\377\377\0\1\6\7G\11-5\356'\271\331\377*\310\352\377*\310\352\377"
+  "*\310\352\377*\310\352\377*\310\352\377*\310\352\377'\271\331\377\11"
+  "-5\356\1\6\7G\377\377\377\0\377\377\377\0\377\377\377\0\1\6\7G\5\27\33"
+  "\343\35\203\231\372*\276\335\377-\315\357\377-\315\357\377*\276\335\377"
+  "\35\203\231\372\5\27\33\343\1\6\7G\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\0\0\0\15\4\23\26\206\5\30\34\314\6"
+  "\32\36\345\6\32\36\345\5\30\34\314\4\23\26\206\0\0\0\15\377\377\377\0"
+  "\377\377\377\0\377\377\377\0"};
+
+
diff --git a/image/expert_note.png b/image/expert_note.png
new file mode 100644
index 0000000000..3cffee0adc
--- /dev/null
+++ b/image/expert_note.png
diff --git a/image/expert_note.xpm b/image/expert_note.xpm
deleted file mode 100644
index d1e1e82df1..0000000000
--- a/image/expert_note.xpm
+++ /dev/null
@@ -1,115 +0,0 @@
-/* XPM */

-static const char * expert_note_xpm[] = {

-"14 14 98 2",

-"  	c None",

-". 	c #131F1F",

-"+ 	c #0E2525",

-"@ 	c #0B1818",

-"# 	c #061414",

-"$ 	c #041B1B",

-"% 	c #020F0F",

-"& 	c #253434",

-"* 	c #349E9E",

-"= 	c #39DBDB",

-"- 	c #32FBFB",

-"; 	c #20FBFB",

-"> 	c #0FD4D4",

-", 	c #058787",

-"' 	c #011212",

-") 	c #384F4F",

-"! 	c #60E6E6",

-"~ 	c #82FFFF",

-"{ 	c #8EFFFF",

-"] 	c #80FFFF",

-"^ 	c #5CFFFF",

-"/ 	c #31FFFF",

-"( 	c #12FFFF",

-"_ 	c #04D8D8",

-": 	c #001E1E",

-"< 	c #303E3E",

-"[ 	c #66E7E7",

-"} 	c #A4FFFF",

-"| 	c #CCFFFF",

-"1 	c #D7FFFF",

-"2 	c #C9FFFF",

-"3 	c #9FFFFF",

-"4 	c #60FFFF",

-"5 	c #28FFFF",

-"6 	c #0AFFFF",

-"7 	c #01D7D7",

-"8 	c #001111",

-"9 	c #1E2929",

-"0 	c #3EA3A3",

-"a 	c #86FFFF",

-"b 	c #CAFFFF",

-"c 	c #EDFFFF",

-"d 	c #F5FFFF",

-"e 	c #EBFFFF",

-"f 	c #C5FFFF",

-"g 	c #38FFFF",

-"h 	c #0FFFFF",

-"i 	c #02FFFF",

-"j 	c #008585",

-"k 	c #000D0D",

-"l 	c #142A2A",

-"m 	c #3BDCDC",

-"n 	c #84FFFF",

-"o 	c #C8FFFF",

-"p 	c #F4FFFF",

-"q 	c #E9FFFF",

-"r 	c #C3FFFF",

-"s 	c #7EFFFF",

-"t 	c #36FFFF",

-"u 	c #0EFFFF",

-"v 	c #00D1D1",

-"w 	c #001818",

-"x 	c #0C1919",

-"y 	c #28FBFB",

-"z 	c #61FFFF",

-"A 	c #9DFFFF",

-"B 	c #D1FFFF",

-"C 	c #C2FFFF",

-"D 	c #99FFFF",

-"E 	c #5BFFFF",

-"F 	c #25FFFF",

-"G 	c #09FFFF",

-"H 	c #01FFFF",

-"I 	c #00FAFA",

-"J 	c #000E0E",

-"K 	c #041212",

-"L 	c #12FAFA",

-"M 	c #2FFFFF",

-"N 	c #57FFFF",

-"O 	c #78FFFF",

-"P 	c #76FFFF",

-"Q 	c #54FFFF",

-"R 	c #2CFFFF",

-"S 	c #10FFFF",

-"T 	c #04FFFF",

-"U 	c #00FFFF",

-"V 	c #011919",

-"W 	c #04D2D2",

-"X 	c #1DFFFF",

-"Y 	c #2DFFFF",

-"Z 	c #33FFFF",

-"` 	c #2BFFFF",

-" .	c #1CFFFF",

-"..	c #0DFFFF",

-"+.	c #018585",

-"@.	c #05FFFF",

-"#.	c #08FFFF",

-"$.	c #00D7D7",

-"        . + @ # $ %         ",

-"      & * = - ; > , '       ",

-"    ) ! ~ { ] ^ / ( _ :     ",

-"  < [ } | 1 2 3 4 5 6 7 8   ",

-"9 0 a b c d e f ] g h i j k ",

-"l m n o e p q r s t u i v w ",

-"x y z A f B C D E F G H I J ",

-"K L M N O n P Q R S T U I J ",

-"V W u X Y Z `  ...T H U v w ",

-"k +.i @.#.6 #.@.i H U U j k ",

-"  8 $.U H H H U U U U $.8   ",

-"    : $.U U U U U U $.:     ",

-"      8 j v I I v j 8       ",

-"        k w J J w k         "};

diff --git a/image/expert_warn.h b/image/expert_warn.h
new file mode 100644
index 0000000000..f9d9d3bf6f
--- /dev/null
+++ b/image/expert_warn.h
@@ -0,0 +1,63 @@
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (expert_warn_pb_data)
+#endif
+#ifdef __GNUC__
+static const guint8 expert_warn_pb_data[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const guint8 expert_warn_pb_data[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (784) */
+  "\0\0\3("
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (56) */
+  "\0\0\0""8"
+  /* width (14) */
+  "\0\0\0\16"
+  /* height (14) */
+  "\0\0\0\16"
+  /* pixel_data: */
+  "\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\15\21\21\1\206\26\26"
+  "\1\314\27\30\1\345\30\31\2\345\26\26\1\314\21\21\1\206\0\0\0\15\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\6\6\0"
+  "G\33\33\7\343\236\240J\373\321\322l\377\341\342\210\377\341\342\213\377"
+  "\321\322l\377\235\236H\373\33\33\7\343\6\6\0G\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\6\6\1G88\22\357\322\322i\377\340\341\177\377\340\341"
+  "\177\377\340\341\177\377\340\341\177\377\340\341\177\377\340\341\177"
+  "\377\322\322i\37777\21\357\6\6\1G\377\377\377\0\0\0\0\15\27\27\3\343"
+  "\313\314N\377\335\336k\377\335\336k\377\335\336k\377\335\336k\377\335"
+  "\336k\377\335\336k\377\335\336k\377\335\336k\377\317\320Z\377\27\27\3"
+  "\343\0\0\0\15\23\23\3\206\205\205\25\372\332\332Q\377\334\334Y\377\334"
+  "\334Y\377\334\334Y\377\334\334Y\377\334\334Y\377\334\334Y\377\333\333"
+  "U\377\332\332R\377\334\334Y\377\212\212\37\372\23\23\3\206\31\31\5\314"
+  "\304\304$\377\324\324'\377\325\325,\377\326\3262\377\327\3274\377\327"
+  "\3274\377\326\3263\377\325\325-\377\324\324'\377\324\324'\377\325\325"
+  "*\377\304\304$\377\31\31\5\314\33\32\6\345\331\327-\377\331\327-\377"
+  "\331\327-\377\331\327-\377\331\327-\377\331\327-\377\331\327-\377\331"
+  "\327-\377\331\327-\377\331\327-\377\331\327-\377\331\327-\377\33\32\6"
+  "\345\33\33\6\345\335\3332\377\335\3332\377\335\3332\377\335\3332\377"
+  "\335\3332\377\335\3332\377\335\3332\377\335\3332\377\335\3332\377\335"
+  "\3332\377\335\3332\377\335\3332\377\33\33\6\345\32\32\6\314\321\3164"
+  "\377\342\3378\377\342\3378\377\342\3378\377\342\3378\377\342\3378\377"
+  "\342\3378\377\342\3378\377\342\3378\377\342\3378\377\342\3378\377\321"
+  "\3164\377\32\32\6\314\25\24\6\206\223\221(\372\346\343>\377\346\343>"
+  "\377\346\343>\377\346\343>\377\346\343>\377\346\343>\377\346\343>\377"
+  "\346\343>\377\346\343>\377\346\343>\377\223\221(\372\25\24\6\206\0\0"
+  "\0\15\33\32\10\343\331\326\77\377\353\347D\377\353\347D\377\353\347D"
+  "\377\353\347D\377\353\347D\377\353\347D\377\353\347D\377\353\347D\377"
+  "\331\326\77\377\33\32\10\343\0\0\0\15\377\377\377\0\7\7\2G65\21\356\335"
+  "\331D\377\357\353I\377\357\353I\377\357\353I\377\357\353I\377\357\353"
+  "I\377\357\353I\377\335\331D\37765\21\356\7\7\2G\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\10\7\2G\34\33\11\343\234\2313\372\342\335I\377\364"
+  "\357O\377\364\357O\377\342\335I\377\234\2313\372\34\33\11\343\10\7\2"
+  "G\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\0\0\0\15\26\26\7\206\35\34\12\314\36\36\12\345\36\36\12\345\35\34"
+  "\12\314\26\26\7\206\0\0\0\15\377\377\377\0\377\377\377\0\377\377\377"
+  "\0"};
+
+
diff --git a/image/expert_warn.png b/image/expert_warn.png
new file mode 100644
index 0000000000..4f443a1a0f
--- /dev/null
+++ b/image/expert_warn.png
diff --git a/image/expert_warn.xpm b/image/expert_warn.xpm
deleted file mode 100644
index b820a8665e..0000000000
--- a/image/expert_warn.xpm
+++ /dev/null
@@ -1,115 +0,0 @@
-/* XPM */

-static const char * expert_warn_xpm[] = {

-"14 14 98 2",

-"  	c None",

-". 	c #1F1F13",

-"+ 	c #25250E",

-"@ 	c #18180B",

-"# 	c #141406",

-"$ 	c #1B1B04",

-"% 	c #0F0F02",

-"& 	c #343425",

-"* 	c #9E9E34",

-"= 	c #DBDB39",

-"- 	c #FBFB32",

-"; 	c #FBFB20",

-"> 	c #D4D40F",

-", 	c #878705",

-"' 	c #121201",

-") 	c #4F4F38",

-"! 	c #E6E660",

-"~ 	c #FFFF82",

-"{ 	c #FFFF8E",

-"] 	c #FFFF80",

-"^ 	c #FFFF5C",

-"/ 	c #FFFF31",

-"( 	c #FFFF12",

-"_ 	c #D8D804",

-": 	c #1E1E00",

-"< 	c #3E3E30",

-"[ 	c #E7E766",

-"} 	c #FFFFA4",

-"| 	c #FFFFCC",

-"1 	c #FFFFD7",

-"2 	c #FFFFC9",

-"3 	c #FFFF9F",

-"4 	c #FFFF60",

-"5 	c #FFFF28",

-"6 	c #FFFF0A",

-"7 	c #D7D701",

-"8 	c #111100",

-"9 	c #29291E",

-"0 	c #A3A33E",

-"a 	c #FFFF86",

-"b 	c #FFFFCA",

-"c 	c #FFFFED",

-"d 	c #FFFFF5",

-"e 	c #FFFFEB",

-"f 	c #FFFFC5",

-"g 	c #FFFF38",

-"h 	c #FFFF0F",

-"i 	c #FFFF02",

-"j 	c #858500",

-"k 	c #0D0D00",

-"l 	c #2A2A14",

-"m 	c #DCDC3B",

-"n 	c #FFFF84",

-"o 	c #FFFFC8",

-"p 	c #FFFFF4",

-"q 	c #FFFFE9",

-"r 	c #FFFFC3",

-"s 	c #FFFF7E",

-"t 	c #FFFF36",

-"u 	c #FFFF0E",

-"v 	c #D1D100",

-"w 	c #181800",

-"x 	c #19190C",

-"y 	c #FBFB28",

-"z 	c #FFFF61",

-"A 	c #FFFF9D",

-"B 	c #FFFFD1",

-"C 	c #FFFFC2",

-"D 	c #FFFF99",

-"E 	c #FFFF5B",

-"F 	c #FFFF25",

-"G 	c #FFFF09",

-"H 	c #FFFF01",

-"I 	c #FAFA00",

-"J 	c #0E0E00",

-"K 	c #121204",

-"L 	c #FAFA12",

-"M 	c #FFFF2F",

-"N 	c #FFFF57",

-"O 	c #FFFF78",

-"P 	c #FFFF76",

-"Q 	c #FFFF54",

-"R 	c #FFFF2C",

-"S 	c #FFFF10",

-"T 	c #FFFF04",

-"U 	c #FFFF00",

-"V 	c #191901",

-"W 	c #D2D204",

-"X 	c #FFFF1D",

-"Y 	c #FFFF2D",

-"Z 	c #FFFF33",

-"` 	c #FFFF2B",

-" .	c #FFFF1C",

-"..	c #FFFF0D",

-"+.	c #858501",

-"@.	c #FFFF05",

-"#.	c #FFFF08",

-"$.	c #D7D700",

-"        . + @ # $ %         ",

-"      & * = - ; > , '       ",

-"    ) ! ~ { ] ^ / ( _ :     ",

-"  < [ } | 1 2 3 4 5 6 7 8   ",

-"9 0 a b c d e f ] g h i j k ",

-"l m n o e p q r s t u i v w ",

-"x y z A f B C D E F G H I J ",

-"K L M N O n P Q R S T U I J ",

-"V W u X Y Z `  ...T H U v w ",

-"k +.i @.#.6 #.@.i H U U j k ",

-"  8 $.U H H H U U U U $.8   ",

-"    : $.U U U U U U $.:     ",

-"      8 j v I I v j 8       ",

-"        k w J J w k         "};