diff --git a/lib/images/bookmark-goto.xpm b/lib/images/bookmark-goto.xpm
new file mode 100644
index 0000000000..8060d406e7
--- /dev/null
+++ b/lib/images/bookmark-goto.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char *bookmark-goto[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 28 1",
+"  c #000000",
+". c #080605",
+"X c #0a0807",
+"o c #0f0d0a",
+"O c #100d0b",
+"+ c #14100d",
+"@ c #1a1612",
+"# c #1f1a15",
+"$ c #211b16",
+"% c #241e18",
+"& c #27201a",
+"* c #2b231c",
+"= c #302720",
+"- c #342a23",
+"; c #392f27",
+": c #3b3027",
+"> c #3d3229",
+", c #41352b",
+"< c #45382e",
+"1 c #4b3d32",
+"2 c #4e4034",
+"3 c #514236",
+"4 c #554538",
+"5 c #57483a",
+"6 c #5b4b3d",
+"7 c #625142",
+"8 c white",
+"9 c None",
+/* pixels */
+"99999999999999OOo99999",
+"99999999999 %;55-X9999",
+"9999999999O>15511O9999",
+"999999999O,35745*89999",
+"999999999%35771<X99999",
+"99999999.113611%899999",
+"99999999.1111*O8999999",
+"999999998O%-#889999999",
+"999999*%988889999  999",
+"99999#11%999999  <- 99",
+"99999%151 9999 <,1> 99",
+"999998* @8999 11><< 99",
+"9999998889999 <123@899",
+"999999999999%1<,1-O999",
+"999999999999 1>,1* 999",
+"999999999999 <:>* 8999",
+"999999999999@>>  89999",
+"9999999999X98  8899999",
+"999999999*1+9889999999",
+"999999999 2:+999999999",
+"999999999*-*O999999999",
+"9999999998  8999999999"
+};
diff --git a/lib/images/bookmark-save.xpm b/lib/images/bookmark-save.xpm
new file mode 100644
index 0000000000..88de8db9ca
--- /dev/null
+++ b/lib/images/bookmark-save.xpm
@@ -0,0 +1,93 @@
+/* XPM */
+static char * bookmark_save_xpm[] = {
+"22 22 68 1",
+" 	c None",
+".	c #2A2A2A",
+"+	c #282828",
+"@	c #242424",
+"#	c #C7C7C7",
+"$	c #000000",
+"%	c #212121",
+"&	c #232323",
+"*	c #C0C0C0",
+"=	c #B1B1B1",
+"-	c #474747",
+";	c #484848",
+">	c #555555",
+",	c #2B2B2B",
+"'	c #C1C1C1",
+")	c #AEAEAE",
+"!	c #020202",
+"~	c #A7A7A7",
+"{	c #BBBBBB",
+"]	c #BCBCBC",
+"^	c #BFBFBF",
+"/	c #010101",
+"(	c #747474",
+"_	c #969696",
+":	c #A9A9A9",
+"<	c #A0A0A0",
+"[	c #848484",
+"}	c #C5C5C5",
+"|	c #6D6D6D",
+"1	c #8C8C8C",
+"2	c #959595",
+"3	c #9B9B9B",
+"4	c #C3C3C3",
+"5	c #B9B9B9",
+"6	c #B3B3B3",
+"7	c #ABABAB",
+"8	c #6B6B6B",
+"9	c #888888",
+"0	c #696969",
+"a	c #5B5B5B",
+"b	c #7D7D7D",
+"c	c #676767",
+"d	c #A3A3A3",
+"e	c #B4B4B4",
+"f	c #BDBDBD",
+"g	c #ACACAC",
+"h	c #A4A4A4",
+"i	c #FFFF32",
+"j	c #646464",
+"k	c #7F7F7F",
+"l	c #787878",
+"m	c #FFFF66",
+"n	c #626262",
+"o	c #7C7C7C",
+"p	c #FFFF1A",
+"q	c #C4C100",
+"r	c #A2A119",
+"s	c #FFFF98",
+"t	c #5F5F5F",
+"u	c #797979",
+"v	c #FFFF5D",
+"w	c #FFFF8C",
+"x	c #FFFFB6",
+"y	c #FFFFCC",
+"z	c #5C5C5C",
+"A	c #757575",
+"B	c #FFFFFF",
+"C	c #585858",
+"     .                ",
+"     .+               ",
+"     @#$              ",
+"     %##$             ",
+"     &*=#$            ",
+"--;->,')=#$           ",
+" !~*{]^=~=#$          ",
+"  /(_~~:<[)}$         ",
+"   $|12345674$        ",
+"    $89(0a0b~^$$      ",
+"     $c[def6gh$i$     ",
+"      $jk|j$$l$m$ $$  ",
+"       $no$pq$rsr$qp$ ",
+"        $tu$vwxyxwv$  ",
+"         $zA$ryByr$   ",
+"          $C$ryByr$   ",
+"           $vwxyxwv$  ",
+"          $pq$rsr$qp$ ",
+"           $$ $m$ $$  ",
+"              $i$     ",
+"               $      ",
+"                      "};
diff --git a/lib/images/break-line.xpm b/lib/images/break-line.xpm
new file mode 100644
index 0000000000..25d8a02682
--- /dev/null
+++ b/lib/images/break-line.xpm
@@ -0,0 +1,19 @@
+/* XPM */
+static char * break_line_xpm[] = {
+"11 14 2 1",
+" 	c None",
+".	c #EF1F1F",
+"          .",
+"          .",
+"          .",
+"          .",
+"          .",
+"          .",
+"          .",
+"   .      .",
+"  ..      .",
+" ...      .",
+"...........",
+" ...       ",
+"  ..       ",
+"   .       "};
diff --git a/lib/images/buffer-close.xpm b/lib/images/buffer-close.xpm
index e6dfd86bbe..095cc1e64d 100644
--- a/lib/images/buffer-close.xpm
+++ b/lib/images/buffer-close.xpm
@@ -1,30 +1,51 @@
 /* XPM */
-static char const * close_xpm[] = {
-"20 20 5 1",
-" 	c None",
-".	c #7B7B00000000",
-"X	c #000000000000",
-"o	c #9A9A94949494",
-"O	c #E5E5E0E0E1E1",
-"               .... ",
-"               ..   ",
-"               . .. ",
-" XXXXX         .   .",
-"XXooooX            .",
-"XooooooXXXXXXXX    .",
-"XoooooooooooooX   . ",
-"XoooooooooooooX     ",
-"XoooooooooooooX     ",
-"XooooXXXXXXXXXXXXXXX",
-"XooooXOOOOOOOOOOOOOX",
-"XoooXOOOOOOOOOOOOOX ",
-"XoooXOOOOOOOOOOOOOX ",
-"XooXOOOOOOOOOOOOOX  ",
-"XooXOOOOOOOOOOOOOX  ",
-"XoXOOOOOOOOOOOOOX   ",
-"XoXOOOOOOOOOOOOOX   ",
-"XXOOOOOOOOOOOOOX    ",
-"XXOOOOOOOOOOOOOX    ",
-"XXXXXXXXXXXXXXX     "};
-
-
+static char *buffer-close[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 23 1",
+"  c black",
+". c #0a0a0a",
+"X c #131313",
+"o c #1b1b1b",
+"O c #222222",
+"+ c #2a2a2a",
+"@ c #323232",
+"# c #3b3b3b",
+"$ c #434343",
+"% c #4a4a4a",
+"& c #545454",
+"* c gray36",
+"= c #616161",
+"- c #6c6c6c",
+"; c #737373",
+": c #7a7a7a",
+"> c #838383",
+", c #898989",
+"< c #939393",
+"1 c #999999",
+"2 c #a1a1a1",
+"3 c white",
+"4 c None",
+/* pixels */
+"4444444444444444444444",
+"44444444        444444",
+"444444  %$##@+    4444",
+"44444 %&;;-=&$+O   444",
+"4444 &>,>>:;=&$@o   44",
+"444 &,<11<,:-*%#@o   4",
+"44 %><2112<>;&%#@+o   ",
+"44 &,113311,-33#@+X   ",
+"4 $;,1<333,:333#@+O.  ",
+"4 $;><21333333%#@+oX  ",
+"4 #-:,<1,3333&%#++O.  ",
+"4 #=-:>,:3333%$@+Oo.  ",
+"4 @&=-;-333333@@+oo.  ",
+"4 +%&**333&%333OOoX.  ",
+"4  +$%$33$$#@33Ooo.   ",
+"4  O@####$#@@OOoXX.   ",
+"44  o@@@@++++OooX.    ",
+"44   o+++++OOoXX.     ",
+"444   XoOOoooX..     4",
+"4444    X.X...      44",
+"44444              444",
+"444444            4444"
+};
diff --git a/lib/images/buffer-new.xpm b/lib/images/buffer-new.xpm
index b6b738d36a..9859c0ba56 100644
--- a/lib/images/buffer-new.xpm
+++ b/lib/images/buffer-new.xpm
@@ -1,26 +1,319 @@
 /* XPM */
 static char * buffer_new_xpm[] = {
-"20 20 3 1",
-" 	c None",
-"X	c #000000",
-".	c #FFFFFF",
-"  XXXXXXXXXX        ",
-"  X.......X.X       ",
-"  X.......X..X      ",
-"  X.......X...X     ",
-"  X.......X....X    ",
-"  X.......XXXXXXX   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  X.............X   ",
-"  XXXXXXXXXXXXXXX   "};
+"24 24 292 2",
+"  	c None",
+". 	c #8F816F",
+"+ 	c #8B7E6C",
+"@ 	c #867A69",
+"# 	c #817667",
+"$ 	c #7C7264",
+"% 	c #776E61",
+"& 	c #736A5F",
+"* 	c #6E665C",
+"= 	c #696259",
+"- 	c #645E57",
+"; 	c #5F5A54",
+"> 	c #5E5952",
+", 	c #DEDEDE",
+"' 	c #D6D6D6",
+") 	c #C6C6C6",
+"! 	c #B0B0AE",
+"~ 	c #5E5A53",
+"{ 	c #959594",
+"] 	c #353535",
+"^ 	c #FFFFFF",
+"/ 	c #ECECEC",
+"( 	c #D9D9D8",
+"_ 	c #595653",
+": 	c #BFBFBF",
+"< 	c #989898",
+"[ 	c #9B8650",
+"} 	c #DCD0A6",
+"| 	c #FBFBFB",
+"1 	c #EBEBEB",
+"2 	c #595754",
+"3 	c #EAEAEA",
+"4 	c #C9C9C9",
+"5 	c #C49E2D",
+"6 	c #DAB74C",
+"7 	c #E5E5E5",
+"8 	c #FAFAFA",
+"9 	c #FEFEFE",
+"0 	c #5D5C5B",
+"a 	c #DBDBDB",
+"b 	c #635B4F",
+"c 	c #DFAA0A",
+"d 	c #D9A408",
+"e 	c #C1BDB4",
+"f 	c #F2F2F2",
+"g 	c #707070",
+"h 	c #505050",
+"i 	c #434343",
+"j 	c #4F4D49",
+"k 	c #635A4E",
+"l 	c #60584D",
+"m 	c #E3B937",
+"n 	c #DFAF24",
+"o 	c #D8A71B",
+"p 	c #B9A05C",
+"q 	c #E4E4E4",
+"r 	c #FDFDFD",
+"s 	c #F1EFED",
+"t 	c #D7D4CE",
+"u 	c #96918A",
+"v 	c #857F79",
+"w 	c #5E564B",
+"x 	c #DDAB1B",
+"y 	c #EDD17C",
+"z 	c #E7C248",
+"A 	c #C69615",
+"B 	c #C8C8C8",
+"C 	c #F6F6F6",
+"D 	c #FEFDFC",
+"E 	c #FDFAF7",
+"F 	c #E4E0DB",
+"G 	c #D0C8C1",
+"H 	c #A09B97",
+"I 	c #5B5349",
+"J 	c #DBAD2A",
+"K 	c #D49E07",
+"L 	c #FBEBA4",
+"M 	c #F7DA62",
+"N 	c #C28B05",
+"O 	c #BD9C4A",
+"P 	c #D8CBAC",
+"Q 	c #E6D8BB",
+"R 	c #E6D8BC",
+"S 	c #F0E9DC",
+"T 	c #FEFDFB",
+"U 	c #FCF8F5",
+"V 	c #FBF3EE",
+"W 	c #F9F0E8",
+"X 	c #EADFD5",
+"Y 	c #BBB2AB",
+"Z 	c #585147",
+"` 	c #EEBB0D",
+" .	c #EAB60C",
+"..	c #E4B00B",
+"+.	c #E3B427",
+"@.	c #E3BA40",
+"#.	c #DFB53B",
+"$.	c #E7C868",
+"%.	c #FCE684",
+"&.	c #FADC62",
+"*.	c #DCB63F",
+"=.	c #C99C26",
+"-.	c #C59821",
+";.	c #B58310",
+">.	c #A56E02",
+",.	c #9F6902",
+"'.	c #B18B47",
+").	c #EFEBE8",
+"!.	c #F8F2EC",
+"~.	c #F9EFE7",
+"{.	c #F7EBE1",
+"].	c #F5E6D9",
+"^.	c #C6B8AC",
+"/.	c #554E45",
+"(.	c #CA9D0F",
+"_.	c #F0D472",
+":.	c #FDEFA7",
+"<.	c #FCE88C",
+"[.	c #FBE57E",
+"}.	c #F9DA5C",
+"|.	c #FADA5D",
+"1.	c #FADD5E",
+"2.	c #FAE05C",
+"3.	c #D9B336",
+"4.	c #9C7E41",
+"5.	c #A8A5A2",
+"6.	c #C8C3BE",
+"7.	c #F0E6DE",
+"8.	c #F6EADF",
+"9.	c #F3E1D2",
+"0.	c #D2C0B1",
+"a.	c #524C43",
+"b.	c #A47E0E",
+"c.	c #E2B834",
+"d.	c #FADF68",
+"e.	c #F9D756",
+"f.	c #F8D54E",
+"g.	c #F8D247",
+"h.	c #C8981D",
+"i.	c #978054",
+"j.	c #9C9996",
+"k.	c #BEB8B3",
+"l.	c #E5DCD4",
+"m.	c #F5E8DD",
+"n.	c #F5E6D8",
+"o.	c #F4E1D2",
+"p.	c #F2DDCB",
+"q.	c #D0BCAB",
+"r.	c #4F4941",
+"s.	c #C8930A",
+"t.	c #E4C152",
+"u.	c #FADD64",
+"v.	c #D2A424",
+"w.	c #A16D06",
+"x.	c #918570",
+"y.	c #9E9B97",
+"z.	c #C7C1BB",
+"A.	c #E8DED5",
+"B.	c #F5E8DC",
+"C.	c #F5E5D8",
+"D.	c #F3E1D1",
+"E.	c #F0D8C3",
+"F.	c #CFB8A5",
+"G.	c #4C473F",
+"H.	c #C99719",
+"I.	c #E6CA64",
+"J.	c #F7CF3F",
+"K.	c #D4A624",
+"L.	c #9D6F14",
+"M.	c #9A9794",
+"N.	c #D1CDCA",
+"O.	c #EFE8E1",
+"P.	c #F7ECE3",
+"Q.	c #F7EADE",
+"R.	c #4A443C",
+"S.	c #BD8604",
+"T.	c #F5DD71",
+"U.	c #F3CF49",
+"V.	c #CC9C20",
+"W.	c #C8991D",
+"X.	c #F0C635",
+"Y.	c #EABD2A",
+"Z.	c #925E02",
+"`.	c #A29B93",
+" +	c #E5DED7",
+".+	c #F7EDE3",
+"++	c #F6E8DD",
+"@+	c #F5E5D7",
+"#+	c #F3E0D0",
+"$+	c #F1DCC9",
+"%+	c #EFD8C3",
+"&+	c #EED3BC",
+"*+	c #CEB49F",
+"=+	c #47423A",
+"-+	c #C08E14",
+";+	c #E3C148",
+">+	c #B27D09",
+",+	c #9F6E07",
+"'+	c #9E6D0D",
+")+	c #A36E06",
+"!+	c #D6A51A",
+"~+	c #956405",
+"{+	c #958265",
+"]+	c #DFD5CD",
+"^+	c #F4E7DB",
+"/+	c #F4E4D6",
+"(+	c #EFD8C2",
+"_+	c #ECCEB5",
+":+	c #CCB099",
+"<+	c #443F38",
+"[+	c #BD8B13",
+"}+	c #B17A03",
+"|+	c #AB7402",
+"1+	c #7C5505",
+"2+	c #39332D",
+"3+	c #8C8A8A",
+"4+	c #9C7E4A",
+"5+	c #8C5802",
+"6+	c #855202",
+"7+	c #8F6C36",
+"8+	c #CCC0B6",
+"9+	c #EEDED0",
+"0+	c #F2DFCE",
+"a+	c #F1DBC8",
+"b+	c #EFD6C1",
+"c+	c #EED2BB",
+"d+	c #ECCEB4",
+"e+	c #EAC9AD",
+"f+	c #CBAC93",
+"g+	c #413D36",
+"h+	c #B17B05",
+"i+	c #A77407",
+"j+	c #3D2900",
+"k+	c #49423A",
+"l+	c #C6C3C2",
+"m+	c #E3DDD9",
+"n+	c #B4A591",
+"o+	c #8B611C",
+"p+	c #815716",
+"q+	c #B6AA9F",
+"r+	c #E7D6C6",
+"s+	c #F1DAC7",
+"t+	c #EFD7C1",
+"u+	c #EED2BA",
+"v+	c #E9C5A6",
+"w+	c #C9A88D",
+"x+	c #3E3A34",
+"y+	c #574F46",
+"z+	c #DAD6D3",
+"A+	c #F8EFE7",
+"B+	c #EBDFD6",
+"C+	c #D2C6BB",
+"D+	c #977D5E",
+"E+	c #B0A196",
+"F+	c #E3CEBC",
+"G+	c #EFD6C0",
+"H+	c #ECCDB3",
+"I+	c #EAC9AC",
+"J+	c #E8C5A6",
+"K+	c #E7C2A2",
+"L+	c #C8A487",
+"M+	c #3B3832",
+"N+	c #595248",
+"O+	c #D8D0CA",
+"P+	c #D7CCC4",
+"Q+	c #D2C4BB",
+"R+	c #C5B6AB",
+"S+	c #B7A79B",
+"T+	c #CBB7A7",
+"U+	c #CFB8A6",
+"V+	c #CEB5A0",
+"W+	c #CDB09A",
+"X+	c #CBAD94",
+"Y+	c #C9A88E",
+"Z+	c #C8A488",
+"`+	c #C7A081",
+" @	c #383530",
+".@	c #564F46",
+"+@	c #544E44",
+"@@	c #524C42",
+"#@	c #504A41",
+"$@	c #4E483F",
+"%@	c #4A453D",
+"&@	c #47423B",
+"*@	c #46413A",
+"=@	c #454039",
+"-@	c #433E37",
+";@	c #403C36",
+">@	c #3E3B34",
+",@	c #3C3933",
+"'@	c #3A3731",
+")@	c #36332E",
+"                                                ",
+"                                                ",
+"              . + @ # $ % & * = - ; >           ",
+"              + , , , , , , ' ) ! ~ { ]         ",
+"              @ , ^ ^ ^ ^ ^ ^ / ( _ : < ]       ",
+"              [ } | ^ ^ ^ ^ ^ ^ 1 2 3 4 < ]     ",
+"              5 6 7 8 ^ ^ ^ ^ ^ 9 0 a ^ 4 < b   ",
+"              c d e f ^ ^ ^ ^ ^ ^ g h i j k l   ",
+"            m n o p q r ^ ^ ^ ^ ^ 8 s t u v w   ",
+"            x y z A B C ^ ^ ^ ^ ^ D E F G H I   ",
+"          J K L M N O P Q R S r T U V W X Y Z   ",
+"`  ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.  ",
+"  (.c _.:.<.[.&.}.|.1.2.3.,.4.5.6.7.8.].9.0.a.  ",
+"    b.K c.d.&.}.e.f.g.h.,.i.j.k.l.m.n.o.p.q.r.  ",
+"        s.t.u.e.f.g.v.w.x.y.z.A.B.C.D.p.E.F.G.  ",
+"        H.I.e.f.g.J.K.L.M.N.O.P.Q.C.D.p.E.F.R.  ",
+"        S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+  ",
+"        -+;+>+,+'+)+!+~+{+]+^+/+#+$+(+&+_+:+<+  ",
+"      [+}+|+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+q+r+s+t+u+d+e+v+w+x+  ",
+"              y+z+A+B+C+D+E+F+G+u+H+I+J+K+L+M+  ",
+"              N+O+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @  ",
+"              .@+@@@#@$@%@&@*@=@-@;@>@,@'@ @)@  ",
+"                                                "};
diff --git a/lib/images/buffer-print.xpm b/lib/images/buffer-print.xpm
index 3c5b8253ca..0dfa3eafcf 100644
--- a/lib/images/buffer-print.xpm
+++ b/lib/images/buffer-print.xpm
@@ -1,32 +1,205 @@
 /* XPM */
-static char const * print1_xpm[] = {
-"24 20 7 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFFFFFFFFFF",
-"o	c #7B7B00000000",
-"O	c #B2B2ABABACAC",
-"+	c navy",
-"@	c #9A9A94949494",
-"                        ",
-"                        ",
-"                        ",
-"      ............      ",
-"      .XXXXXXXXXX.      ",
-"     .XXooooooooXX.     ",
-"     .XXXXXXXXXXXX.     ",
-"    .XXooooooooooXX.    ",
-"    .XXXXXXXXXXXXXX.    ",
-" ...................... ",
-" .OOOOOOOOOOOOOOOOOOOO. ",
-" .OOOOOOOOOOOOOOO++++O. ",
-" .OOOOOOOOOOOOOOOOOOOO. ",
-" .OOOOOOOOOOOOOOOOOOOO. ",
-" .OOOOOOOOOOOOOOOOOOOO. ",
-"  ..................... ",
-"  .@@@@@@@@@@@@@@@@@@.  ",
-"  .@@@@@@@@@@@@@@@@@@.  ",
-"   ..................   ",
-"                        "};
-
-
+static char * buffer_print_xpm[] = {
+"24 24 178 2",
+"  	c None",
+". 	c #565656",
+"+ 	c #303030",
+"@ 	c #594F45",
+"# 	c #ECDFCB",
+"$ 	c #393836",
+"% 	c #4F4928",
+"& 	c #ECDEC9",
+"* 	c #F6F3F0",
+"= 	c #F7F7F7",
+"- 	c #F6F5F3",
+"; 	c #F6F4F1",
+"> 	c #F7F7F6",
+", 	c #F8F8F8",
+"' 	c #F3EDE6",
+") 	c #333331",
+"! 	c #EDE0CC",
+"~ 	c #F7F6F5",
+"{ 	c #F6F2EE",
+"] 	c #F5F1EC",
+"^ 	c #F2EBE2",
+"/ 	c #EBE0CE",
+"( 	c #EAD7BC",
+"_ 	c #000000",
+": 	c #F6F2EF",
+"< 	c #F4EFE9",
+"[ 	c #F4EEE6",
+"} 	c #EEE5D8",
+"| 	c #E7DBC9",
+"1 	c #E4CAA8",
+"2 	c #F3ECE3",
+"3 	c #F5F3F0",
+"4 	c #F7F6F4",
+"5 	c #F8F6F5",
+"6 	c #F3EEE7",
+"7 	c #F3EDE4",
+"8 	c #F1E9DE",
+"9 	c #EBDFCE",
+"0 	c #E6D8C2",
+"a 	c #363636",
+"b 	c #333333",
+"c 	c #424242",
+"d 	c #625B57",
+"e 	c #EEE0CF",
+"f 	c #F1E9DF",
+"g 	c #F3EFE7",
+"h 	c #F4F0E9",
+"i 	c #F4EEE7",
+"j 	c #F1E9DD",
+"k 	c #EFE3D3",
+"l 	c #ECDFCD",
+"m 	c #050403",
+"n 	c #494949",
+"o 	c #BABABA",
+"p 	c #A7A7A7",
+"q 	c #4A4543",
+"r 	c #E4C7A3",
+"s 	c #EBDECA",
+"t 	c #EDE3D5",
+"u 	c #F1E7DB",
+"v 	c #F0E7DC",
+"w 	c #F0E8DB",
+"x 	c #EEE5D7",
+"y 	c #EDE2D2",
+"z 	c #E8D9C6",
+"A 	c #E9D7BE",
+"B 	c #907F0B",
+"C 	c #D7D178",
+"D 	c #4F4F4F",
+"E 	c #A4A4A4",
+"F 	c #717171",
+"G 	c #B7996E",
+"H 	c #E8C08D",
+"I 	c #E4CBA9",
+"J 	c #EEE3D3",
+"K 	c #E9DAC5",
+"L 	c #E8D8C4",
+"M 	c #E8D8C1",
+"N 	c #E7D3BB",
+"O 	c #E8D3B8",
+"P 	c #B9B24A",
+"Q 	c #373737",
+"R 	c #A3A3A3",
+"S 	c #9D9D9D",
+"T 	c #A0A0A0",
+"U 	c #646464",
+"V 	c #E8D7BF",
+"W 	c #E8D5BB",
+"X 	c #E6CEB3",
+"Y 	c #E7CEAF",
+"Z 	c #E7CFB5",
+"` 	c #FFFFFF",
+" .	c #F6F6F6",
+"..	c #ACACAC",
+"+.	c #9C9C9C",
+"@.	c #989898",
+"#.	c #999999",
+"$.	c #575756",
+"%.	c #B79A6F",
+"&.	c #E7C08D",
+"*.	c #E4C8A5",
+"=.	c #E6E6E6",
+"-.	c #EAEAEA",
+";.	c #FEFEFE",
+">.	c #959595",
+",.	c #929292",
+"'.	c #DCDCDC",
+").	c #E1E1E1",
+"!.	c #E3E3E3",
+"~.	c #E5E5E5",
+"{.	c #FDFDFD",
+"].	c #919191",
+"^.	c #8B8B8B",
+"/.	c #3F3F3F",
+"(.	c #5F5F5F",
+"_.	c #707070",
+":.	c #7A7A7A",
+"<.	c #454545",
+"[.	c #CACACA",
+"}.	c #CFCFCF",
+"|.	c #D7D7D7",
+"1.	c #D4D4D4",
+"2.	c #D6D6D6",
+"3.	c #DBDBDB",
+"4.	c #DADADA",
+"5.	c #888888",
+"6.	c #868686",
+"7.	c #848484",
+"8.	c #828282",
+"9.	c #7C7C7C",
+"0.	c #858585",
+"a.	c #8E8E8E",
+"b.	c #AEAEAE",
+"c.	c #C3C3C3",
+"d.	c #C1C1C1",
+"e.	c #C7C7C7",
+"f.	c #CCCCCC",
+"g.	c #C9C9C9",
+"h.	c #CDCDCD",
+"i.	c #D3D3D3",
+"j.	c #D5D5D5",
+"k.	c #818181",
+"l.	c #444444",
+"m.	c #797979",
+"n.	c #B7B7B7",
+"o.	c #B4B4B4",
+"p.	c #BEBEBE",
+"q.	c #CBCBCB",
+"r.	c #D0D0D0",
+"s.	c #D9D9D9",
+"t.	c #C6C6C6",
+"u.	c #3C3C3C",
+"v.	c #414141",
+"w.	c #6D6D6D",
+"x.	c #AFAFAF",
+"y.	c #AAAAAA",
+"z.	c #B5B5B5",
+"A.	c #B6B6B6",
+"B.	c #B3B3B3",
+"C.	c #BCBCBC",
+"D.	c #383838",
+"E.	c #323232",
+"F.	c #3E3E3E",
+"G.	c #616161",
+"H.	c #808080",
+"I.	c #969696",
+"J.	c #A2A2A2",
+"K.	c #A6A6A6",
+"L.	c #008700",
+"M.	c #00FF00",
+"N.	c #666666",
+"O.	c #464646",
+"P.	c #353535",
+"Q.	c #5C5C5C",
+"R.	c #7B7B7B",
+"S.	c #979797",
+"T.	c #404040",
+"U.	c #6A6A6A",
+"                    . + @                       ",
+"                    + # # @ $ @                 ",
+"                  % & * = = - # @ + @           ",
+"                  . ; > , , = - ; ' # ) @       ",
+"                % ! , , , , ~ { ] ^ / ( _       ",
+"                . , , , , , : < [ } | 1 _       ",
+"              % 2 3 4 5 4 ; 6 7 8 9 0 @         ",
+"        a b c d e f g < h i 2 j k l 1 m % %     ",
+"      n o p q r s t u v j w x y z A @ B C %     ",
+"    D o E F c G H I J l K L M N O I _ P %       ",
+"  Q o R S T U _ . G H 1 V W X Y Z @ B C %       ",
+"_ `  ...+.@.#.#.T U _ $.%.&.*.r I _ P _         ",
+"c =.-.` ;. ...>.,.,.#.T U _ . G c _ C _ _       ",
+". '.).!.).~.` {. ...].].^.#.T . _ /.(._.:._     ",
+"<.[.}.|.1.2.3.4.).` `  ...5.6.7.8.9.0.]./._     ",
+"_ a.b.c.d.e.f.g.h.i.j.'.` `  ...k.9.^./.l._     ",
+"  _ _ m.,.p n.o.p.d.p.c.q.r.s.`  .t.u.<.v._     ",
+"      c _ _ w.0.T x.y.z.A.B.C.c.d.,.<.D.E.F.    ",
+"            c _ _ G.H.I.J.K.L.M...N.O.P._       ",
+"                  v._ _ Q.R.,.S.].N.c _         ",
+"                        T._ _ Q.U._._           ",
+"                              c _ _             ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/buffer-reload.xpm b/lib/images/buffer-reload.xpm
new file mode 100644
index 0000000000..902430f454
--- /dev/null
+++ b/lib/images/buffer-reload.xpm
@@ -0,0 +1,63 @@
+/* XPM */
+static char *buffer-reload[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 35 1",
+"  c #010101",
+". c #121212",
+"X c gray11",
+"o c #222222",
+"O c gray16",
+"+ c gray20",
+"@ c #393939",
+"# c gray26",
+"$ c gray30",
+"% c #555555",
+"& c #5f5f5f",
+"* c gray40",
+"= c #777777",
+"- c #6600cc",
+"; c magenta",
+": c #cc66ff",
+"> c #818181",
+", c gray59",
+"< c #a0a0a4",
+"1 c #b2b2b2",
+"2 c #cc99ff",
+"3 c #cccc99",
+"4 c #c0c0c0",
+"5 c #cbcbcb",
+"6 c #d7d7d7",
+"7 c #dddddd",
+"8 c #efd6c6",
+"9 c #ffcccc",
+"0 c #e7e7d6",
+"q c gray89",
+"w c #eaeaea",
+"e c #f1f1f1",
+"r c #fffbf0",
+"t c #fefefe",
+"y c None",
+/* pixels */
+"          yyyy yy   yy",
+" ttttttt.e yyy       y",
+" tttttttot6 yy   yy   ",
+" ttttttt#1tt y    yy  ",
+" t>t>5%>$#+O.yyyyyyy  ",
+" tttttttte64 yyyyyy  y",
+" t=4&t>5>410 yyyyyy yy",
+" tttttttewew yyyyyyyyy",
+" t%4&<r>%O           y",
+" ttttrrrro=tttttttttt ",
+" t>4>%,%=O=t22:-----t ",
+" ttttwee8o=tttttttttt ",
+" t==%%,==o*t--------t ",
+" rtre0988o*tttttttttt ",
+" 66551533X&%%%%%%%$%# ",
+"         X%%%%%%$$$@@ ",
+"yyyyyyyyy.%$7ewq666$O ",
+"yyyyyyyyy $$w$%7444$O ",
+"yyyyyyyyy $#q$%6444$+ ",
+"yyyyyyyyyO#@7##4111#o ",
+"yyyyyyyyy @#7444451#X ",
+"yyyyyyyyyy           y"
+};
diff --git a/lib/images/buffer-write-as.xpm b/lib/images/buffer-write-as.xpm
new file mode 100644
index 0000000000..667fe4e85a
--- /dev/null
+++ b/lib/images/buffer-write-as.xpm
@@ -0,0 +1,160 @@
+/* XPM */
+static char * buffer_write_as_xpm[] = {
+"24 24 133 2",
+"  	c None",
+". 	c #FDD7A6",
+"+ 	c #E08F4D",
+"@ 	c #9A6234",
+"# 	c #FD8504",
+"$ 	c #F6E0AB",
+"% 	c #1A1A1A",
+"& 	c #3F3F3F",
+"* 	c #404040",
+"= 	c #1C1C1C",
+"- 	c #DD6F04",
+"; 	c #F3F2F1",
+"> 	c #FBF9F7",
+", 	c #FCF9F6",
+"' 	c #FCF7F3",
+") 	c #FBF5F0",
+"! 	c #FAF3EE",
+"~ 	c #F9F2EB",
+"{ 	c #F9F0E8",
+"] 	c #F8EEE5",
+"^ 	c #767676",
+"/ 	c #757575",
+"( 	c #000000",
+"_ 	c #649D9D",
+": 	c #68A3A3",
+"< 	c #69A5A5",
+"[ 	c #ABBBB6",
+"} 	c #F7ECE2",
+"| 	c #747474",
+"1 	c #727272",
+"2 	c #E6DFDA",
+"3 	c #F7EFE8",
+"4 	c #F8EFE7",
+"5 	c #F8EDE4",
+"6 	c #F7EBE2",
+"7 	c #F6EADF",
+"8 	c #717171",
+"9 	c #707070",
+"0 	c #151515",
+"a 	c #DE6935",
+"b 	c #F9BEA1",
+"c 	c #E1A183",
+"d 	c #609898",
+"e 	c #F5E7DC",
+"f 	c #6F6F6F",
+"g 	c #6D6D6D",
+"h 	c #616161",
+"i 	c #D06517",
+"j 	c #C37B5A",
+"k 	c #E3D8CF",
+"l 	c #F4E7DC",
+"m 	c #F5E7DB",
+"n 	c #F5E5D8",
+"o 	c #6C6C6C",
+"p 	c #6B6B6B",
+"q 	c #7C7C7C",
+"r 	c #3A3A3A",
+"s 	c #C1BCB7",
+"t 	c #454038",
+"u 	c #774F34",
+"v 	c #945935",
+"w 	c #A9B9B4",
+"x 	c #F4E3D5",
+"y 	c #6A6A6A",
+"z 	c #686868",
+"A 	c #7B7B7B",
+"B 	c #797979",
+"C 	c #EEE7E0",
+"D 	c #E3DBD3",
+"E 	c #BFB7B0",
+"F 	c #B6ADA7",
+"G 	c #B6ACA5",
+"H 	c #B5ABA2",
+"I 	c #B7ADA3",
+"J 	c #C7BAAF",
+"K 	c #EBDACD",
+"L 	c #F3E1D2",
+"M 	c #676767",
+"N 	c #666666",
+"O 	c #787878",
+"P 	c #777777",
+"Q 	c #3D3D3D",
+"R 	c #3C3C3C",
+"S 	c #656565",
+"T 	c #636363",
+"U 	c #737373",
+"V 	c #6E6E6E",
+"W 	c #696969",
+"X 	c #646464",
+"Y 	c #626262",
+"Z 	c #606060",
+"` 	c #5F5F5F",
+" .	c #5D5D5D",
+"..	c #5C5C5C",
+"+.	c #E6E6E6",
+"@.	c #DEDEDE",
+"#.	c #D7D7D7",
+"$.	c #CFCFCF",
+"%.	c #C8C8C8",
+"&.	c #C0C0C0",
+"*.	c #8E8E8E",
+"=.	c #8B8B8B",
+"-.	c #5B5B5B",
+";.	c #5A5A5A",
+">.	c #E0E0E0",
+",.	c #424242",
+"'.	c #C9C9C9",
+").	c #C2C2C2",
+"!.	c #BABABA",
+"~.	c #878787",
+"{.	c #858585",
+"].	c #595959",
+"^.	c #575757",
+"/.	c #DADADA",
+"(.	c #C3C3C3",
+"_.	c #BCBCBC",
+":.	c #B4B4B4",
+"<.	c #818181",
+"[.	c #7F7F7F",
+"}.	c #565656",
+"|.	c #555555",
+"1.	c #D4D4D4",
+"2.	c #BDBDBD",
+"3.	c #B6B6B6",
+"4.	c #AEAEAE",
+"5.	c #545454",
+"6.	c #535353",
+"7.	c #CECECE",
+"8.	c #C6C6C6",
+"9.	c #BFBFBF",
+"0.	c #B7B7B7",
+"a.	c #B0B0B0",
+"b.	c #A8A8A8",
+"                                                ",
+"                                                ",
+"  . + @                                         ",
+"  # $ . + @ % & * * * * * * * * * = = =         ",
+"  - # # $ . + @ ; > , ' ) ! ~ { ] * ^ / =       ",
+"  ( - - # # $ . + @ _ : < < < [ } * | 1 =       ",
+"    ( ( - - # # $ . + 2 3 4 5 6 7 * 8 9 =       ",
+"      0 ( ( - - # a b c d : < [ e * f g =       ",
+"      % | h ( ( i j j c c k l m n * o p =       ",
+"      = q ^ r s ( t u u v ( d w x * y z =       ",
+"      = A B & C D E F G H I J K L * M N =       ",
+"      = O P ^ * & Q R R R R Q & * N S T =       ",
+"      = ^ | U 1 9 f V o p W z M S X Y h =       ",
+"      = U 1 8 f V o p y z M S X T h Z ` =       ",
+"      = 8 9 V g * * * * * * * * * `  ...=       ",
+"      = V g o * +.@.#.$.%.&.* *.=.* -.;.=       ",
+"      = o p W * >.,.,.'.).!.* ~.{.* ].^.=       ",
+"      = W z M * /.,.N (._.:.* <.[.* }.|.=       ",
+"      = M = X * 1.,.N 2.3.4.* A O * 5.6.=       ",
+"      = S T Y * 7.8.9.0.a.b.* ^ U * 6.6.=       ",
+"        = = = = * * * * * * = = = = = =         ",
+"                                                ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/buffer-write.xpm b/lib/images/buffer-write.xpm
index ef2ba02bb5..a6cfd524f2 100644
--- a/lib/images/buffer-write.xpm
+++ b/lib/images/buffer-write.xpm
@@ -1,30 +1,147 @@
 /* XPM */
-static char const * save_xpm[] = {
-"20 20 5 1",
-" 	c None",
-".	c black",
-"X	c gray70",
-"o	c gray90",
-"O	c gray60",
-"                    ",
-" .................. ",
-" .XX.oooooooooo.XX. ",
-" .XX.oooooooooo.XX. ",
-" .XX.oooooooooo.X.. ",
-" .XX.oooooooooo.XX. ",
-" .XX.oooooooooo.XX. ",
-" .XX.oooooooooo.XX. ",
-" .XX.oooooooooo.XX. ",
-" .XX.oooooooooo.XX. ",
-" .XX............XX. ",
-" .XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXX. ",
-" .XX............XX. ",
-" .XX.OOOOOOO.oo.XX. ",
-" .XX.OOOOOOO.oo.XX. ",
-" .XX.OOOOOOO.oo.XX. ",
-"  .X.OOOOOOO.oo.XX. ",
-"   ................ ",
-"                    "};
-
-
+static char * buffer_write_xpm[] = {
+"24 24 120 2",
+"  	c None",
+". 	c #1C1C1C",
+"+ 	c #404040",
+"@ 	c #878787",
+"# 	c #FFFFFF",
+"$ 	c #FEFDFC",
+"% 	c #FDFBF9",
+"& 	c #FCF9F6",
+"* 	c #FCF7F3",
+"= 	c #FBF5F0",
+"- 	c #FAF3EE",
+"; 	c #F9F2EB",
+"> 	c #F9F0E8",
+", 	c #F8EEE5",
+"' 	c #767676",
+") 	c #757575",
+"! 	c #868686",
+"~ 	c #FEFCFB",
+"{ 	c #ABBBB6",
+"] 	c #69A5A5",
+"^ 	c #F7ECE2",
+"/ 	c #747474",
+"( 	c #727272",
+"_ 	c #858585",
+": 	c #838383",
+"< 	c #FDFAF8",
+"[ 	c #FCF8F5",
+"} 	c #FBF7F2",
+"| 	c #FAF3ED",
+"1 	c #F9F1EA",
+"2 	c #F8EFE7",
+"3 	c #F8EDE4",
+"4 	c #F7EBE2",
+"5 	c #F6EADF",
+"6 	c #717171",
+"7 	c #707070",
+"8 	c #828282",
+"9 	c #818181",
+"0 	c #F5E7DC",
+"a 	c #6F6F6F",
+"b 	c #6D6D6D",
+"c 	c #808080",
+"d 	c #7E7E7E",
+"e 	c #FBF6F2",
+"f 	c #FAF4EF",
+"g 	c #FAF2EC",
+"h 	c #F9F0E9",
+"i 	c #F8EFE6",
+"j 	c #F7EBE1",
+"k 	c #F6E9DE",
+"l 	c #F5E7DB",
+"m 	c #F5E5D8",
+"n 	c #6C6C6C",
+"o 	c #6B6B6B",
+"p 	c #7D7D7D",
+"q 	c #7C7C7C",
+"r 	c #FAF4EE",
+"s 	c #F4E3D5",
+"t 	c #6A6A6A",
+"u 	c #686868",
+"v 	c #7B7B7B",
+"w 	c #797979",
+"x 	c #F7ECE3",
+"y 	c #F7EAE0",
+"z 	c #F6E8DD",
+"A 	c #F5E7DA",
+"B 	c #F4E5D7",
+"C 	c #F3E1D2",
+"D 	c #676767",
+"E 	c #666666",
+"F 	c #787878",
+"G 	c #777777",
+"H 	c #656565",
+"I 	c #636363",
+"J 	c #737373",
+"K 	c #6E6E6E",
+"L 	c #696969",
+"M 	c #646464",
+"N 	c #626262",
+"O 	c #616161",
+"P 	c #606060",
+"Q 	c #5F5F5F",
+"R 	c #5D5D5D",
+"S 	c #5C5C5C",
+"T 	c #E6E6E6",
+"U 	c #DEDEDE",
+"V 	c #D7D7D7",
+"W 	c #CFCFCF",
+"X 	c #C8C8C8",
+"Y 	c #C0C0C0",
+"Z 	c #8E8E8E",
+"` 	c #8B8B8B",
+" .	c #5B5B5B",
+"..	c #5A5A5A",
+"+.	c #E0E0E0",
+"@.	c #424242",
+"#.	c #C9C9C9",
+"$.	c #C2C2C2",
+"%.	c #BABABA",
+"&.	c #595959",
+"*.	c #575757",
+"=.	c #DADADA",
+"-.	c #C3C3C3",
+";.	c #BCBCBC",
+">.	c #B4B4B4",
+",.	c #7F7F7F",
+"'.	c #565656",
+").	c #555555",
+"!.	c #D4D4D4",
+"~.	c #BDBDBD",
+"{.	c #B6B6B6",
+"].	c #AEAEAE",
+"^.	c #545454",
+"/.	c #535353",
+"(.	c #CECECE",
+"_.	c #C6C6C6",
+":.	c #BFBFBF",
+"<.	c #B7B7B7",
+"[.	c #B0B0B0",
+"}.	c #A8A8A8",
+"                                                ",
+"                                                ",
+"                                                ",
+"        . . . + + + + + + + + + + . . .         ",
+"      . @ @ + # $ % & * = - ; > , + ' ) .       ",
+"      . @ ! + ~ { ] ] ] ] ] ] { ^ + / ( .       ",
+"      . _ : + < [ } = | 1 2 3 4 5 + 6 7 .       ",
+"      . 8 9 + [ { ] ] ] ] ] ] { 0 + a b .       ",
+"      . c d + e f g h i 3 j k l m + n o .       ",
+"      . p q + r { ] ] ] ] ] ] { s + t u .       ",
+"      . v w + ; > , x y z A B s C + D E .       ",
+"      . F G ' + + + + + + + + + + E H I .       ",
+"      . ' / J ( 7 a K n o L u D H M N O .       ",
+"      . J ( 6 a K n o t u D H M I O P Q .       ",
+"      . 6 7 K b + + + + + + + + + Q R S .       ",
+"      . K b n + T U V W X Y + Z ` +  ....       ",
+"      . n o L + +.@.@.#.$.%.+ @ _ + &.*..       ",
+"      . L u D + =.@.E -.;.>.+ 9 ,.+ '.)..       ",
+"      . D . M + !.@.E ~.{.].+ v F + ^./..       ",
+"      . H I N + (._.:.<.[.}.+ ' J + /./..       ",
+"        . . . . + + + + + + . . . . . .         ",
+"                                                ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/copy.xpm b/lib/images/copy.xpm
index 81e5e9d36a..1d7ef06159 100644
--- a/lib/images/copy.xpm
+++ b/lib/images/copy.xpm
@@ -1,30 +1,151 @@
 /* XPM */
-static char const * copy_xpm[] = {
-"20 20 5 1",
-" 	c #000000000000",
-".	c None",
-"X	c #FFFFFFFFFFFF",
-"o	c navy",
-"O	c #B2B2ABABACAC",
-"         ...........",
-" XXXXXXX  ......o...",
-" XXXXXXX O .....o...",
-" X     X    ..ooooo.",
-" XXXXXXXXXX ....o...",
-" X       XX ....o...",
-" XXXXXXXXXX ........",
-" X    XX         ...",
-" XXXXXXX XXXXXXX  ..",
-" X    XX XXXXXXX O .",
-" XXXXXXX X     X    ",
-" XXXXXXX XXXXXXXXXX ",
-" XXXXXXX X        X ",
-"         XXXXXXXXXX ",
-"........ X        X ",
-"........ XXXXXXXXXX ",
-"........ X        X ",
-"........ XXXXXXXXXX ",
-"........ XXXXXXXXXX ",
-"........            "};
-
-
+static char * copy_xpm[] = {
+"24 24 124 2",
+"  	c None",
+". 	c #8F7F6E",
+"+ 	c #8B7C6B",
+"@ 	c #887969",
+"# 	c #857666",
+"$ 	c #817364",
+"% 	c #7E7062",
+"& 	c #7B6D5F",
+"* 	c #776B5D",
+"= 	c #74685A",
+"- 	c #8A7B6A",
+"; 	c #FFFFFF",
+"> 	c #73675A",
+", 	c #898989",
+"' 	c #6A6054",
+") 	c #867767",
+"! 	c #6F6357",
+"~ 	c #C9C9C9",
+"{ 	c #827464",
+"] 	c #828282",
+"^ 	c #C6C6C6",
+"/ 	c #5D544A",
+"( 	c #7E7061",
+"_ 	c #665C51",
+": 	c #63594E",
+"< 	c #60564C",
+"[ 	c #5C5449",
+"} 	c #595147",
+"| 	c #796C5E",
+"1 	c #5C5B5B",
+"2 	c #FEFCFB",
+"3 	c #A4A4A4",
+"4 	c #747474",
+"5 	c #554D44",
+"6 	c #655B50",
+"7 	c #75695B",
+"8 	c #FDFBF9",
+"9 	c #FCF7F3",
+"0 	c #FAF4EE",
+"a 	c #F0EAE6",
+"b 	c #C1BAB3",
+"c 	c #504941",
+"d 	c #C3C3C3",
+"e 	c #716558",
+"f 	c #5A5552",
+"g 	c #7E7873",
+"h 	c #9F958D",
+"i 	c #7D746E",
+"j 	c #D8D0C8",
+"k 	c #4C463E",
+"l 	c #6D6255",
+"m 	c #FCF8F5",
+"n 	c #FBF5F0",
+"o 	c #F9F1EA",
+"p 	c #F8EEE5",
+"q 	c #F7EADF",
+"r 	c #F5E7DA",
+"s 	c #D6CABF",
+"t 	c #48423B",
+"u 	c #685E52",
+"v 	c #5B5959",
+"w 	c #C4C0BD",
+"x 	c #807C79",
+"y 	c #5A5653",
+"z 	c #C0B5AC",
+"A 	c #998778",
+"B 	c #7B6F65",
+"C 	c #7A6D62",
+"D 	c #D3C3B4",
+"E 	c #443F38",
+"F 	c #645A4F",
+"G 	c #FBF6F2",
+"H 	c #FAF2EC",
+"I 	c #F9EFE7",
+"J 	c #F7EBE1",
+"K 	c #F6E8DC",
+"L 	c #F4E4D6",
+"M 	c #F3E0D0",
+"N 	c #F2DDCB",
+"O 	c #D1BCAA",
+"P 	c #3F3B35",
+"Q 	c #4D4D4D",
+"R 	c #60574C",
+"S 	c #7F7A76",
+"T 	c #595551",
+"U 	c #7B6F64",
+"V 	c #564C45",
+"W 	c #786A5C",
+"X 	c #CEB6A0",
+"Y 	c #3B3732",
+"Z 	c #5C5349",
+"` 	c #F8EDE3",
+" .	c #F6E9DD",
+"..	c #F5E5D8",
+"+.	c #F3E2D2",
+"@.	c #F2DECD",
+"#.	c #F1DAC7",
+"$.	c #EFD7C2",
+"%.	c #EED3BC",
+"&.	c #CCAF97",
+"*.	c #37342F",
+"=.	c #574F46",
+"-.	c #D7CCC1",
+";.	c #D5C7BA",
+">.	c #D3C2B3",
+",.	c #D1BEAC",
+"'.	c #CFB9A5",
+").	c #CEB49F",
+"!.	c #CCB097",
+"~.	c #CAAB90",
+"{.	c #C9A88C",
+"].	c #33302C",
+"^.	c #534C43",
+"/.	c #504940",
+"(.	c #49433C",
+"_.	c #464039",
+":.	c #423E37",
+"<.	c #3F3B34",
+"[.	c #3C3832",
+"}.	c #383530",
+"|.	c #35322D",
+"1.	c #322F2B",
+"2.	c #2F2D29",
+"3.	c #4B453D",
+"                                                ",
+"                                                ",
+"    . + @ # $ % & * =                           ",
+"    - ; ; ; ; ; ; > , '                         ",
+"    ) ; ; ; ; ; ; ! ; ~ '                       ",
+"    { ; ] ~ ] ^ ; ' ~ ; , /                     ",
+"    ( ; ; ; ; ; ; _ : < [ }                     ",
+"    | ; ] 1 ~ ] ~ 2 ^ 3 4 5 6 % & * =           ",
+"    7 ; ; ; ; ; 8 9 0 a b c d ; ; > , '         ",
+"    e ; 1 ] ^ ] f g h i j k d ; ; ! ; ~ '       ",
+"    l ; ; 2 m n o p q r s t ] ^ ; ' ~ ; , /     ",
+"    u ; v w x y z A B C D E d ; ; _ : < [ }     ",
+"    F ; G H I J K L M N O P Q ] ~ 2 ^ 3 4 5     ",
+"    R ; S T z A U V A W X Y d ; 8 9 0 a b c     ",
+"    Z ; `  ...+.@.#.$.%.&.*.3 ] f g h i j k     ",
+"    =.j -.;.>.,.'.).!.~.{.].d n o p q r s t     ",
+"    ^./.k (._.:.<.[.}.|.1.2.] y z A B C D E     ",
+"                    3.d d d d J K L M N O P     ",
+"                    R ; S T z A U V A W X Y     ",
+"                    Z ; `  ...+.@.#.$.%.&.*.    ",
+"                    =.j -.;.>.,.'.).!.~.{.].    ",
+"                    ^./.k (._.:.<.[.}.|.1.2.    ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/cut.xpm b/lib/images/cut.xpm
index f7925f47b7..8878140b07 100644
--- a/lib/images/cut.xpm
+++ b/lib/images/cut.xpm
@@ -1,29 +1,39 @@
 /* XPM */
-static char const * cut_xpm[] = {
-"20 20 3 1",
-"     c None",
-".    c #000000000000",
-"X    c #7B7B00000000",
-"                    ",
-"                    ",
-"                    ",
-"                ..  ",
-"               ..   ",
-"  XXX         ..    ",
-" XXXXX       ..     ",
-" X   XX     ..      ",
-" X   XX    ..       ",
-" XXXXXX............ ",
-"  XXX    .........  ",
-"        ..          ",
-"    XXXX.           ",
-"   XXXXX            ",
-"  XX  XX            ",
-"  XX  XX            ",
-"  XX  XX            ",
-"   XXXX             ",
-"                    ",
-"                    "};
-
-
-
+static char * cut_xpm[] = {
+"24 24 12 1",
+" 	c None",
+".	c #000000",
+"+	c #080203",
+"@	c #3F3F3F",
+"#	c #FFFFFF",
+"$	c #E8E8E8",
+"%	c #9B9B9B",
+"&	c #010101",
+"*	c #A0A0A0",
+"=	c #515151",
+"-	c #6A6A6A",
+";	c #E2E2E2",
+"                        ",
+"                        ",
+"                        ",
+"   ..+.                 ",
+"  ... ..          @@@   ",
+"  ..   ..        @#$%@  ",
+"  ..    ..      @#$%@   ",
+"   ..    .     @#$%@    ",
+"    ... ..    @#$%@     ",
+"      ....&  @#$%@      ",
+"        ....@#$%@       ",
+"          *.#$%@        ",
+"          .#=%@         ",
+"        ....#@-@        ",
+"      ....&.@#;%@       ",
+"    ... ..   @#;%@      ",
+"   ..    .    @#;%@     ",
+"  ..    ..     @#;%@    ",
+"  ..   ..       @#;%@   ",
+"  ..  ..         @#;%@  ",
+"   ..+.           @@@   ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/lib/images/depth-decrement.xpm b/lib/images/depth-decrement.xpm
index a63f14d14d..39d7a7a3a2 100644
--- a/lib/images/depth-decrement.xpm
+++ b/lib/images/depth-decrement.xpm
@@ -1,27 +1,28 @@
 /* XPM */
-static char *depth[]={
-"20 20 4 1",
-"# c None",
-". c #000000",
-"b c #7b0000",
-"a c #ffffff",
-".##a##a##a##a##a##a.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aaaaaaabbbbbbbbbaa.",
-".aa.aaaaaaaaaaaaaaa.",
-"#a..aaaabbbbbbbbbaa.",
-"#......aaaaaaaaaaaa.",
-"#a..aaaabbbbbbbbbaa.",
-".aa.aaaaaaaaaaaaaaa.",
-".aaaaaaabbbbbbbbbaa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".##a##a##a##a##a##a."};
+static char * depth_decrement_xpm[] = {
+"20 20 5 1",
+" 	c None",
+".	c #00FFFF",
+"+	c #0000FF",
+"@	c #000000",
+"#	c #0000BC",
+"                    ",
+"                    ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"      #+            ",
+"     #++            ",
+"    #+++            ",
+"   #+++++++++  .+   ",
+"  #++++++++++  ++@  ",
+"   #+++++++++   @@  ",
+"    #+++            ",
+"     #++            ",
+"      #+            ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/depth-increment.xpm b/lib/images/depth-increment.xpm
index a8c9d28897..a1cd8b3b24 100644
--- a/lib/images/depth-increment.xpm
+++ b/lib/images/depth-increment.xpm
@@ -1,27 +1,28 @@
 /* XPM */
-static char *depth[]={
-"20 20 4 1",
-"# c None",
-". c #000000",
-"b c #7b0000",
-"a c #ffffff",
-".##a##a##a##a##a##a.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aaaaaaabbbbbbbbbaa.",
-".aaa.aaaaaaaaaaaaaa.",
-"#aaa..aabbbbbbbbbaa.",
-"#......aaaaaaaaaaaa.",
-"#aaa..aabbbbbbbbbaa.",
-".aaa.aaaaaaaaaaaaaa.",
-".aaaaaaabbbbbbbbbaa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".aa..............aa.",
-".aaaaaaaaaaaaaaaaaa.",
-".##a##a##a##a##a##a."};
+static char * depth_increment_xpm[] = {
+"20 20 5 1",
+" 	c None",
+".	c #00FFFF",
+"+	c #0000FF",
+"@	c #000000",
+"#	c #0000BC",
+"                    ",
+"                    ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"             +#     ",
+"             ++#    ",
+"             +++#   ",
+"   .+   +++++++++#  ",
+"   ++@  ++++++++++# ",
+"    @@  +++++++++#  ",
+"             +++#   ",
+"             ++#    ",
+"             +#     ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/dialog-preferences.xpm b/lib/images/dialog-preferences.xpm
new file mode 100644
index 0000000000..2abdd6245f
--- /dev/null
+++ b/lib/images/dialog-preferences.xpm
@@ -0,0 +1,254 @@
+/* XPM */
+static char * dialog_preferences_xpm[] = {
+"24 24 227 2",
+"  	c None",
+". 	c #191819",
+"+ 	c #222222",
+"@ 	c #4F4F4F",
+"# 	c #484848",
+"$ 	c #5B5B5B",
+"% 	c #4E4E4E",
+"& 	c #232323",
+"* 	c #1E1E1E",
+"= 	c #030303",
+"- 	c #242425",
+"; 	c #010101",
+"> 	c #6D6D6C",
+", 	c #4A4A4A",
+"' 	c #4D4D4D",
+") 	c #8F8F8F",
+"! 	c #ACACAC",
+"~ 	c #A4A4A4",
+"{ 	c #ADADAD",
+"] 	c #8C8C8C",
+"^ 	c #A0A0A0",
+"/ 	c #7D7D7D",
+"( 	c #171718",
+"_ 	c #626262",
+": 	c #424242",
+"< 	c #090909",
+"[ 	c #787878",
+"} 	c #A3A3A3",
+"| 	c #AAAAAA",
+"1 	c #969696",
+"2 	c #7F7F7F",
+"3 	c #606060",
+"4 	c #464645",
+"5 	c #666666",
+"6 	c #595959",
+"7 	c #888787",
+"8 	c #939393",
+"9 	c #979797",
+"0 	c #959595",
+"a 	c #3D3D3D",
+"b 	c #383838",
+"c 	c #020202",
+"d 	c #9B9B9A",
+"e 	c #6C6C6C",
+"f 	c #464646",
+"g 	c #525252",
+"h 	c #717171",
+"i 	c #7C7C7C",
+"j 	c #949494",
+"k 	c #A7A7A7",
+"l 	c #535353",
+"m 	c #151515",
+"n 	c #7E7F7E",
+"o 	c #777777",
+"p 	c #404040",
+"q 	c #282827",
+"r 	c #555555",
+"s 	c #4B4B4A",
+"t 	c #565655",
+"u 	c #343434",
+"v 	c #5A5A5A",
+"w 	c #1C1D1D",
+"x 	c #090A0B",
+"y 	c #0C0C0C",
+"z 	c #989898",
+"A 	c #313131",
+"B 	c #8E8E8E",
+"C 	c #3B3B3B",
+"D 	c #868686",
+"E 	c #393939",
+"F 	c #1B1B1B",
+"G 	c #9A9A9A",
+"H 	c #929292",
+"I 	c #363635",
+"J 	c #2C2C2C",
+"K 	c #878787",
+"L 	c #858585",
+"M 	c #898989",
+"N 	c #7B7B7B",
+"O 	c #7A7A7A",
+"P 	c #8B8B8B",
+"Q 	c #828282",
+"R 	c #848484",
+"S 	c #3F3F3F",
+"T 	c #8B8C8C",
+"U 	c #313233",
+"V 	c #050505",
+"W 	c #8C9090",
+"X 	c #BAB3B2",
+"Y 	c #878281",
+"Z 	c #293132",
+"` 	c #AAABAB",
+" .	c #5A4C3A",
+"..	c #B19773",
+"+.	c #7E5C27",
+"@.	c #452022",
+"#.	c #846A74",
+"$.	c #6F7480",
+"%.	c #56424E",
+"&.	c #3D171B",
+"*.	c #A8A9A9",
+"=.	c #806438",
+"-.	c #CE9330",
+";.	c #A16A14",
+">.	c #541C1C",
+",.	c #EC3433",
+"'.	c #F33231",
+").	c #C10101",
+"!.	c #6C1111",
+"~.	c #7E7C7C",
+"{.	c #5C6565",
+"].	c #463B3B",
+"^.	c #8C5120",
+"/.	c #FFB438",
+"(.	c #CB810D",
+"_.	c #0E0904",
+":.	c #541C1D",
+"<.	c #EC3535",
+"[.	c #FF5656",
+"}.	c #C00202",
+"|.	c #871414",
+"1.	c #EB3333",
+"2.	c #D42C2C",
+"3.	c #A10000",
+"4.	c #A0591D",
+"5.	c #FFBB3C",
+"6.	c #CB8110",
+"7.	c #221403",
+"8.	c #541B1C",
+"9.	c #EE3636",
+"0.	c #FF6262",
+"a.	c #C20202",
+"b.	c #801313",
+"c.	c #EA3737",
+"d.	c #E13131",
+"e.	c #A20000",
+"f.	c #A26B2B",
+"g.	c #FFC946",
+"h.	c #CC8311",
+"i.	c #3B2407",
+"j.	c #591918",
+"k.	c #EE3737",
+"l.	c #F84040",
+"m.	c #801212",
+"n.	c #F73E3E",
+"o.	c #EC3737",
+"p.	c #A67F40",
+"q.	c #FFD655",
+"r.	c #CC8312",
+"s.	c #482C00",
+"t.	c #561C1D",
+"u.	c #ED3838",
+"v.	c #E22929",
+"w.	c #C00303",
+"x.	c #7F1212",
+"y.	c #FE5858",
+"z.	c #F04F4F",
+"A.	c #AC7834",
+"B.	c #FFC848",
+"C.	c #C98214",
+"D.	c #503100",
+"E.	c #67696D",
+"F.	c #4D1E20",
+"G.	c #EC3838",
+"H.	c #DA2424",
+"I.	c #BE0404",
+"J.	c #7B1414",
+"K.	c #FD5151",
+"L.	c #ED4141",
+"M.	c #B36722",
+"N.	c #FFB83B",
+"O.	c #C57F14",
+"P.	c #583702",
+"Q.	c #5D5F62",
+"R.	c #4A4B4E",
+"S.	c #2C2C2F",
+"T.	c #161717",
+"U.	c #3F0E0F",
+"V.	c #F03636",
+"W.	c #D82222",
+"X.	c #C10303",
+"Y.	c #781616",
+"Z.	c #F63B3B",
+"`.	c #E32E2E",
+" +	c #9F0000",
+".+	c #B8621E",
+"++	c #FDB238",
+"@+	c #C27F15",
+"#+	c #4D2F01",
+"$+	c #1D1E1F",
+"%+	c #000000",
+"&+	c #65494F",
+"*+	c #7C545B",
+"=+	c #4D343B",
+"-+	c #601C1D",
+";+	c #F23939",
+">+	c #DA2B2B",
+",+	c #B96620",
+"'+	c #FAAE36",
+")+	c #B57715",
+"!+	c #2F2519",
+"~+	c #2B2D2E",
+"{+	c #181919",
+"]+	c #28292B",
+"^+	c #363638",
+"/+	c #37373A",
+"(+	c #292829",
+"_+	c #212020",
+":+	c #353334",
+"<+	c #301D1E",
+"[+	c #F23838",
+"}+	c #D62828",
+"|+	c #7E0000",
+"1+	c #211D15",
+"2+	c #493210",
+"3+	c #2B2722",
+"4+	c #65686F",
+"5+	c #65676B",
+"6+	c #505155",
+"7+	c #3E3F41",
+"8+	c #2E3435",
+"9+	c #471A1B",
+"0+	c #771A1A",
+"a+	c #281819",
+"b+	c #2E3233",
+"c+	c #404144",
+"d+	c #525357",
+"                              . +               ",
+"                              @ #               ",
+"                              $ %               ",
+"                & * = - % ;   > ,               ",
+"          = ' ) ! ~ { ] ^ / ( _ :               ",
+"        < [ } ~ | ^ 1 1 2 3 4 5 #               ",
+"        6 7 8 9 0 0 a b ; c d e f               ",
+"      g h i j k ~ l ] m     n o p               ",
+"      q r s t u v w ] x   y z [ A               ",
+"                B C D E F G H h I               ",
+"                j J ) K L M N O u               ",
+"              c } J ' P Q R S T U               ",
+"            V W X Y Z ` Q K  ...+.              ",
+"            @.#.$.%.&.*.R T =.-.;.              ",
+"            >.,.'.).!.~.{.].^./.(._.            ",
+"            :.<.[.}.|.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.v.w.x.y.z.3.A.B.C.D.            ",
+"          E.F.G.H.I.J.K.L.3.M.N.O.P.            ",
+"    Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+            ",
+"    $+c %+%+c &+*+=+-+;+>+ +,+'+)+!+            ",
+"    ~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+            ",
+"              5+6+7+8+9+0+a+b+c+d+              "};
diff --git a/lib/images/citation-insert.xpm b/lib/images/dialog-show-new-inset_citation.xpm
similarity index 100%
rename from lib/images/citation-insert.xpm
rename to lib/images/dialog-show-new-inset_citation.xpm
diff --git a/lib/images/dialog-show-new-inset_graphics.xpm b/lib/images/dialog-show-new-inset_graphics.xpm
index 9b3d06380a..c9a84a9d9c 100644
--- a/lib/images/dialog-show-new-inset_graphics.xpm
+++ b/lib/images/dialog-show-new-inset_graphics.xpm
@@ -1,29 +1,155 @@
 /* XPM */
-static char const * fig_xpm[] = {
-"20 20 4 1",
-" 	c None",
-".	c #FFFFFFFFFFFF",
-"X	c #7B7B00000000",
-"o	c gray70",
-"                    ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ....XXXXXXXXXX.... ",
-" ....X........X.... ",
-" ....X....  ..X.... ",
-" ....X... .. .X.... ",
-" ....X.. oooo X.... ",
-" ....X. ooooooX.... ",
-" ....X oooooooX.... ",
-" ....XXXXXXXXXX.... ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-" ..              .. ",
-" .................. ",
-"                    "};
-
-
+static char * dialog_show_new_inset_graphics_xpm[] = {
+"22 22 130 2",
+"  	c None",
+". 	c #777777",
+"+ 	c #FFFFFF",
+"@ 	c #1B4260",
+"# 	c #1E4869",
+"$ 	c #1E4B6D",
+"% 	c #1E4A6B",
+"& 	c #204F73",
+"* 	c #215175",
+"= 	c #325C7C",
+"- 	c #37607E",
+"; 	c #000000",
+"> 	c #255B84",
+", 	c #296491",
+"' 	c #4D7CA0",
+") 	c #6A90AB",
+"! 	c #7697B0",
+"~ 	c #235174",
+"{ 	c #2C6894",
+"] 	c #3375A7",
+"^ 	c #3677A8",
+"/ 	c #4E8BBA",
+"( 	c #81ADCE",
+"_ 	c #AFCBE0",
+": 	c #C7DAE9",
+"< 	c #42759D",
+"[ 	c #275478",
+"} 	c #326D9B",
+"| 	c #3C81B7",
+"1 	c #447FAE",
+"2 	c #5390BF",
+"3 	c #5994C2",
+"4 	c #5C95C2",
+"5 	c #92B8D6",
+"6 	c #C8DBEA",
+"7 	c #4D7EA4",
+"8 	c #2D5B80",
+"9 	c #366E9D",
+"0 	c #3974A3",
+"a 	c #336893",
+"b 	c #3D7DB0",
+"c 	c #5592C3",
+"d 	c #5792C3",
+"e 	c #89B3D5",
+"f 	c #B4CFE4",
+"g 	c #CADDEC",
+"h 	c #4A7DA6",
+"i 	c #3E6688",
+"j 	c #42749D",
+"k 	c #BDBDBD",
+"l 	c #326088",
+"m 	c #4380B5",
+"n 	c #396D99",
+"o 	c #6C9FCA",
+"p 	c #8CB6D8",
+"q 	c #99BDDD",
+"r 	c #6EA2CE",
+"s 	c #3C74A4",
+"t 	c #446B8C",
+"u 	c #5F5F5F",
+"v 	c #969696",
+"w 	c #959595",
+"x 	c #447AA5",
+"y 	c #3D6B94",
+"z 	c #6198C9",
+"A 	c #6BA1D1",
+"B 	c #639CCE",
+"C 	c #4E8FC8",
+"D 	c #4279A9",
+"E 	c #424242",
+"F 	c #7F7F7F",
+"G 	c #606060",
+"H 	c #636363",
+"I 	c #484848",
+"J 	c #1E1E1E",
+"K 	c #7A7A7A",
+"L 	c #5C80A2",
+"M 	c #6594C1",
+"N 	c #70A5D6",
+"O 	c #6FA3D4",
+"P 	c #5E8AB4",
+"Q 	c #F3F3F3",
+"R 	c #8C8C8C",
+"S 	c #383838",
+"T 	c #3D3D3D",
+"U 	c #5D5D5D",
+"V 	c #B8B8B8",
+"W 	c #6A6A6A",
+"X 	c #4C4C4C",
+"Y 	c #171717",
+"Z 	c #94BCE2",
+"` 	c #205B07",
+" .	c #1F5A06",
+"..	c #D6D6D6",
+"+.	c #2A2A2A",
+"@.	c #4E4E4E",
+"#.	c #4B4B4B",
+"$.	c #585858",
+"%.	c #727272",
+"&.	c #454545",
+"*.	c #050505",
+"=.	c #2B2B2B",
+"-.	c #121212",
+";.	c #36960D",
+">.	c #318A0C",
+",.	c #999999",
+"'.	c #246608",
+").	c #363636",
+"!.	c #323232",
+"~.	c #4D4D4D",
+"{.	c #3E3E3E",
+"].	c #1B1B1B",
+"^.	c #154700",
+"/.	c #236308",
+"(.	c #5B5B5B",
+"_.	c #3E7326",
+":.	c #468A29",
+"<.	c #2B780A",
+"[.	c #0B0B0B",
+"}.	c #040404",
+"|.	c #31840E",
+"1.	c #838383",
+"2.	c #517D3E",
+"3.	c #328E0B",
+"4.	c #308C09",
+"5.	c #2F840B",
+"6.	c #F6F6F6",
+"7.	c #DFDFDF",
+"8.	c #989898",
+"9.	c #565656",
+"                                            ",
+"                                            ",
+"    . . . . . . . . . . . . . . . . .       ",
+"    . + + + + + + + + + + + + + + + + .     ",
+"    . + @ # $ % & * * * * = - = * * + ;     ",
+"    . + $ > , , , , , , ' ) ! ) ' , + ;     ",
+"    . + ~ { ] ] ^ ^ ] / ( _ : _ ( < + ;     ",
+"    . + [ } | | 1 2 3 4 5 6 + 6 5 7 + ;     ",
+"    . + 8 9 0 + a b c d e f g f e h + ;     ",
+"    . + i j + k + l m n o p q p r s + ;     ",
+"    . + t ; u v w + x + y z A B C D + ;     ",
+"    . + ; E F G H I J K + L M N O P Q ;     ",
+"    . + ; R E S T ; U V W X Y Z `  ...;     ",
+"    . + +.@.; ; #.$.%.&.*.=.-.` ;.>.,.;     ",
+"    . + '.` ).!.X ~.{.].; ^./.(.(.(.; $.    ",
+"    . + _.:.<./.[.}.^./.<.|.;.(.+ + ,.1.    ",
+"    . + 2.;.;.3.|.|.<.|.4.;.5.(.+ ,.$.      ",
+"    . + + + + + + + + + 6.7.,.; 8.$.        ",
+"      . ; ; ; ; ; ; ; ; ; ; ; 9.1.          ",
+"                                            ",
+"                                            ",
+"                                            "};
diff --git a/lib/images/file-open.xpm b/lib/images/file-open.xpm
index 90b133ab5a..d9911762a1 100644
--- a/lib/images/file-open.xpm
+++ b/lib/images/file-open.xpm
@@ -1,30 +1,173 @@
 /* XPM */
-static char const * open_xpm[] = {
-"20 20 5 1",
-" 	c None",
-".	c navy",
-"X	c #000000000000",
-"o	c #9A9A94949494",
-"O	c #E5E5E0E0E1E1",
-"                    ",
-"              ...   ",
-"             .   . .",
-" XXXXX           . .",
-"XXooooX           ..",
-"XooooooXXXXXXXX ....",
-"XoooooooooooooX     ",
-"XoooooooooooooX     ",
-"XoooooooooooooX     ",
-"XooooXXXXXXXXXXXXXXX",
-"XooooXOOOOOOOOOOOOOX",
-"XoooXOOOOOOOOOOOOOX ",
-"XoooXOOOOOOOOOOOOOX ",
-"XooXOOOOOOOOOOOOOX  ",
-"XooXOOOOOOOOOOOOOX  ",
-"XoXOOOOOOOOOOOOOX   ",
-"XoXOOOOOOOOOOOOOX   ",
-"XXOOOOOOOOOOOOOX    ",
-"XXOOOOOOOOOOOOOX    ",
-"XXXXXXXXXXXXXXX     "};
-
-
+static char * file_open_xpm[] = {
+"24 24 146 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #093759",
+"@ 	c #2A5C7A",
+"# 	c #2E607E",
+"$ 	c #568EA8",
+"% 	c #578FA8",
+"& 	c #578FA7",
+"* 	c #2B5D7B",
+"= 	c #2D607F",
+"- 	c #548EA7",
+"; 	c #558EA8",
+"> 	c #568FA8",
+", 	c #538AA3",
+"' 	c #285A78",
+") 	c #528CA7",
+"! 	c #538DA7",
+"~ 	c #548DA7",
+"{ 	c #558EA7",
+"] 	c #588FA8",
+"^ 	c #052339",
+"/ 	c #2F6583",
+"( 	c #508BA6",
+"_ 	c #518CA7",
+": 	c #366A87",
+"< 	c #4D8AA6",
+"[ 	c #4E8AA6",
+"} 	c #4F8BA6",
+"| 	c #528DA7",
+"1 	c #336684",
+"2 	c #316887",
+"3 	c #4C89A5",
+"4 	c #4D89A6",
+"5 	c #367D9B",
+"6 	c #316481",
+"7 	c #4987A5",
+"8 	c #4A88A5",
+"9 	c #3E84A7",
+"0 	c #4288AA",
+"a 	c #373737",
+"b 	c #395A71",
+"c 	c #3B5B70",
+"d 	c #4B88A5",
+"e 	c #367B9F",
+"f 	c #3A7FA2",
+"g 	c #3D83A6",
+"h 	c #4187A8",
+"i 	c #448BAC",
+"j 	c #447994",
+"k 	c #363636",
+"l 	c #5D5D5D",
+"m 	c #F4F4F4",
+"n 	c #F0F0F0",
+"o 	c #2D7198",
+"p 	c #31759B",
+"q 	c #35799F",
+"r 	c #387EA1",
+"s 	c #3C82A5",
+"t 	c #3F86A7",
+"u 	c #438AAB",
+"v 	c #468DAD",
+"w 	c #06243B",
+"x 	c #C3C3C3",
+"y 	c #F2F2F2",
+"z 	c #EDEDED",
+"A 	c #E9E9E9",
+"B 	c #E4E4E4",
+"C 	c #2C7097",
+"D 	c #30749A",
+"E 	c #33789E",
+"F 	c #377CA0",
+"G 	c #3B80A4",
+"H 	c #4288A9",
+"I 	c #2B6C8B",
+"J 	c #EEEEEE",
+"K 	c #EBEBEB",
+"L 	c #E7E7E7",
+"M 	c #E2E2E2",
+"N 	c #DDDDDD",
+"O 	c #D9D9D9",
+"P 	c #2F7399",
+"Q 	c #32779C",
+"R 	c #134468",
+"S 	c #275B81",
+"T 	c #08304F",
+"U 	c #343434",
+"V 	c #E1E1E1",
+"W 	c #E0E0E0",
+"X 	c #DBDBDB",
+"Y 	c #D7D7D7",
+"Z 	c #D2D2D2",
+"` 	c #CDCDCD",
+" .	c #2F6E90",
+"..	c #0F3E62",
+"+.	c #397099",
+"@.	c #3C739C",
+"#.	c #356B92",
+"$.	c #3B3B3B",
+"%.	c #A0A0A0",
+"&.	c #D4D4D4",
+"*.	c #D0D0D0",
+"=.	c #CBCBCB",
+"-.	c #C7C7C7",
+";.	c #C2C2C2",
+">.	c #114165",
+",.	c #23567D",
+"'.	c #356B95",
+").	c #386F98",
+"!.	c #3B729A",
+"~.	c #474747",
+"{.	c #3D3D3D",
+"].	c #9E9E9E",
+"^.	c #C9C9C9",
+"/.	c #C4C4C4",
+"(.	c #C0C0C0",
+"_.	c #BEBEBE",
+":.	c #727272",
+"<.	c #294E67",
+"[.	c #2E648E",
+"}.	c #316791",
+"|.	c #346A93",
+"1.	c #454545",
+"2.	c #3F3F3F",
+"3.	c #9D9D9D",
+"4.	c #1E5179",
+"5.	c #2B5F8A",
+"6.	c #2D628C",
+"7.	c #434343",
+"8.	c #414141",
+"9.	c #9A9A9A",
+"0.	c #465967",
+"a.	c #245783",
+"b.	c #275B86",
+"c.	c #202020",
+"d.	c #949494",
+"e.	c #184A73",
+"f.	c #20537F",
+"g.	c #222222",
+"h.	c #999999",
+"i.	c #194B78",
+"j.	c #232323",
+"k.	c #464646",
+"l.	c #515151",
+"m.	c #164774",
+"n.	c #252525",
+"o.	c #484848",
+"                                  . . . .       ",
+"            + +             .   . . . . . . .   ",
+"          + @ # + +         . . . .         . . ",
+"          + $ % & * + +     . . .             . ",
+"        + = - ; > % , ' +   . . . .           . ",
+"        + ) ! ~ { $ % ] + ^                   . ",
+"      + / ( _ ) ! ~ ; > : + +               .   ",
+"      + < [ } ! ~ | ! - ; > 1 + +           .   ",
+"    + 2 3 4 ( _ ) 5 5 ! ~ { $ % 6 + +     .     ",
+"    + 7 8 < [ } 5 9 0 5 5 ! - ; > % # +         ",
+"  a b c d 3 4 5 e f g h i 5 5 ~ { $ j +         ",
+"k l m n c c 5 o p q r s t u v 5 5 ~ + w         ",
+"a x y z A B c c C D E F G 9 H v v I +           ",
+"a J n K L M N O c c P Q e f g h i R S + + T     ",
+"U V z A B W X Y Z ` c c p q r s  ...+.@.#.+     ",
+"$.%.K L M N O &.*.=.-.;.c c E F >.,.'.).!.+     ",
+"  ~.{.].W X Y Z ` ^./.(._.:.c <.>.[.}.|.+       ",
+"      1.2.3.&.*.=.-.;.:.:._._.+ 4.5.6.+         ",
+"          7.8.9.^.:.:._._.:.0.+ a.b.+           ",
+"            c.8.7.d._.:.:._.U e.f.+             ",
+"                g.2.1.h._.:.U i.+               ",
+"                    j.{.k.l.m.+                 ",
+"                        n.$.o.                  ",
+"                                                "};
diff --git a/lib/images/find-replace.xpm b/lib/images/find-replace.xpm
index 2d730053e4..3af00396d5 100644
--- a/lib/images/find-replace.xpm
+++ b/lib/images/find-replace.xpm
@@ -1,29 +1,223 @@
 /* XPM */
 static char * find_replace_xpm[] = {
-"20 20 6 1",
-" 	c None",
-".	c #000000",
-"+	c #010101",
-"@	c #FFFFFF",
-"#	c #A7DAE4",
-"$	c #25C6E4",
-"    .......         ",
-"  ...........       ",
-" ...+@@@@@+...      ",
-" ..+@@@@@@@+..      ",
-"..+@@@@@@@##+..     ",
-"..@@@@@@@@#$$..     ",
-"..@@@@@@@@#$$..     ",
-"..@@@@@@@@#$$..     ",
-"..@@@@@@@#$$$..     ",
-"..@@@@@@#$$$$..     ",
-"..+@@###$$$$+..     ",
-" ..+##$$$$$+..      ",
-" ...+$$$$$+...+     ",
-"  .............+    ",
-"    ....... +...+   ",
-"             +...+  ",
-"              +...+ ",
-"               +...+",
-"                +...",
-"                 +. "};
+"24 24 196 2",
+"  	c None",
+". 	c #6B6B6B",
+"+ 	c #6D6D6D",
+"@ 	c #6F6F6F",
+"# 	c #717171",
+"$ 	c #737373",
+"% 	c #979797",
+"& 	c #5B5B5B",
+"* 	c #646465",
+"= 	c #6E6E6F",
+"- 	c #9CA2A3",
+"; 	c #CCD7D9",
+"> 	c #E1EEF1",
+", 	c #CAD7D8",
+"' 	c #9BA3A4",
+") 	c #747576",
+"! 	c #747475",
+"~ 	c #3D3D3D",
+"{ 	c #5F5F60",
+"] 	c #8D9192",
+"^ 	c #E4EFF1",
+"/ 	c #DFF1F4",
+"( 	c #DDF2F7",
+"_ 	c #DAF3F9",
+": 	c #D4F0F7",
+"< 	c #D5EFF5",
+"[ 	c #DCEFF3",
+"} 	c #8E9495",
+"| 	c #747474",
+"1 	c #8B8F90",
+"2 	c #E6F3F5",
+"3 	c #F8FCFC",
+"4 	c #EEF9FB",
+"5 	c #D4F1F7",
+"6 	c #C3EBF3",
+"7 	c #B5E3EE",
+"8 	c #A6DCE8",
+"9 	c #ACDDE7",
+"0 	c #CCEAEF",
+"a 	c #8B9294",
+"b 	c #8A8A8A",
+"c 	c #767676",
+"d 	c #636464",
+"e 	c #E4F2F4",
+"f 	c #FFFFFF",
+"g 	c #FCFEFE",
+"h 	c #EBF9FB",
+"i 	c #C9ECF2",
+"j 	c #AADFEA",
+"k 	c #98D6E2",
+"l 	c #8ECFDA",
+"m 	c #99D4DE",
+"n 	c #CAE8ED",
+"o 	c #707272",
+"p 	c #838383",
+"q 	c #6C6C6C",
+"r 	c #4A4A4A",
+"s 	c #535353",
+"t 	c #959B9C",
+"u 	c #EBF7FA",
+"v 	c #F3FBFC",
+"w 	c #DAF2F6",
+"x 	c #BCE6EF",
+"y 	c #A5DDE9",
+"z 	c #93D4E2",
+"A 	c #82C9D8",
+"B 	c #7AC2D1",
+"C 	c #A4D6E1",
+"D 	c #919C9E",
+"E 	c #494949",
+"F 	c #505050",
+"G 	c #C8D4D6",
+"H 	c #D2ECF3",
+"I 	c #D4EDF4",
+"J 	c #ECF8FA",
+"K 	c #C0E8F0",
+"L 	c #97D8E6",
+"M 	c #85CFE0",
+"N 	c #6EC0D3",
+"O 	c #60B0C2",
+"P 	c #82C3CF",
+"Q 	c #BBD2D4",
+"R 	c #575757",
+"S 	c #4D4D4D",
+"T 	c #454545",
+"U 	c #373737",
+"V 	c #4D4D4E",
+"W 	c #DFEEF0",
+"X 	c #C9E8EF",
+"Y 	c #C3E8F0",
+"Z 	c #C9EBF2",
+"` 	c #BAE7EF",
+" .	c #A8DFEB",
+"..	c #86D1E1",
+"+.	c #73C5D9",
+"@.	c #5CB2C5",
+"#.	c #4EA2B2",
+"$.	c #6BB7C4",
+"%.	c #CEE9ED",
+"&.	c #696969",
+"*.	c #484848",
+"=.	c #4A4A4B",
+"-.	c #C5D2D5",
+";.	c #C1E3EA",
+">.	c #AFE0E9",
+",.	c #A7DEE9",
+"'.	c #A2DCE9",
+").	c #95D7E6",
+"!.	c #86D0E1",
+"~.	c #71C8DB",
+"{.	c #5CB8CB",
+"].	c #4CA1B1",
+"^.	c #4799A7",
+"/.	c #72BCC7",
+"(.	c #B8CFD3",
+"_.	c #666666",
+":.	c #474748",
+"<.	c #8C9496",
+"[.	c #C1E2EA",
+"}.	c #98D4E0",
+"|.	c #91D3E0",
+"1.	c #8DD0DF",
+"2.	c #81CBDC",
+"3.	c #6FC5D8",
+"4.	c #59B9CC",
+"5.	c #46A4B4",
+"6.	c #4092A0",
+"7.	c #509CA9",
+"8.	c #98D0DA",
+"9.	c #889699",
+"0.	c #636364",
+"a.	c #535556",
+"b.	c #CEE9EE",
+"c.	c #9CD5DF",
+"d.	c #83C9D6",
+"e.	c #75C1D0",
+"f.	c #68BACA",
+"g.	c #55B2C4",
+"h.	c #46A2B3",
+"i.	c #4091A0",
+"j.	c #4996A5",
+"k.	c #72B8C5",
+"l.	c #BEE4EA",
+"m.	c #606263",
+"n.	c #434344",
+"o.	c #798182",
+"p.	c #C1E4ED",
+"q.	c #92CCD7",
+"r.	c #75BDCC",
+"s.	c #62B2C0",
+"t.	c #54A5B3",
+"u.	c #4E9BA9",
+"v.	c #56A0AE",
+"w.	c #79BCCB",
+"x.	c #B2DFE8",
+"y.	c #798486",
+"z.	c #5B5B5C",
+"A.	c #424243",
+"B.	c #777F81",
+"C.	c #CCE8EE",
+"D.	c #B3DEE7",
+"E.	c #9AD2DD",
+"F.	c #88CAD7",
+"G.	c #8ECEDC",
+"H.	c #ACDCE6",
+"I.	c #C6E8ED",
+"J.	c #778284",
+"K.	c #565657",
+"L.	c #675B22",
+"M.	c #8C6F4F",
+"N.	c #896D4F",
+"O.	c #414142",
+"P.	c #4E5052",
+"Q.	c #828E90",
+"R.	c #B6CDD1",
+"S.	c #CCE9ED",
+"T.	c #B4CCD1",
+"U.	c #819092",
+"V.	c #555858",
+"W.	c #525252",
+"X.	c #635920",
+"Y.	c #84682E",
+"Z.	c #CA8F49",
+"`.	c #D79D49",
+" +	c #434343",
+".+	c #474747",
+"++	c #4B4B4B",
+"@+	c #3C3938",
+"#+	c #B47648",
+"$+	c #BF8248",
+"%+	c #CB9049",
+"&+	c #363637",
+"*+	c #A76848",
+"=+	c #B37548",
+"-+	c #9D9D9D",
+";+	c #906741",
+"          . + @ # $                 % &         ",
+"      * = - ; > , ' ) !             & ~   %     ",
+"    { ] ^ / ( _ : < [ } |                 &     ",
+"  & 1 2 3 4 5 6 7 8 9 0 a $         b c         ",
+"  d e 3 f g h i j k l m n o       p q & r       ",
+"s t / u g v w x y z A B C D @     c & s E       ",
+"F G H I J w K j L M N O P Q q     R S T U       ",
+"V W X Y Z `  .L ..+.@.#.$.%.&.      *.U         ",
+"=.-.;.>.,.'.).!.~.{.].^./.(._.                  ",
+":.<.[.}.|.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.q.r.s.t.u.v.w.x.y.z.                    ",
+"    A.B.C.D.E.F.G.H.I.J.K.L.M.N.                ",
+"      O.P.Q.R.S.T.U.V.W.X.Y.Z.`.N.              ",
+"           +T .+E ++    @+#+$+%+`.N.            ",
+"  % &                   &+*+=+$+%+`.N.          ",
+"  & ~   % &               &+*+=+$+%+`.N.        ",
+"        & ~                 &+*+=+$+%+`.N.      ",
+"-+b c                         &+*+=+$+%+`.N.    ",
+"p q & r   % &                   &+*+=+$+%+N.    ",
+"c & s E   & ~                     &+*+=+;+&+    ",
+"R S T U                             &+&+&+      ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/font-emph.xpm b/lib/images/font-emph.xpm
index 92bbade7fe..fab84f4c89 100644
--- a/lib/images/font-emph.xpm
+++ b/lib/images/font-emph.xpm
@@ -1,27 +1,27 @@
 /* XPM */
-static char const * emph_xpm[] = {
-"20 20 2 1",
+static char * font_emph_xpm[] = {
+"22 22 2 1",
 " 	c None",
-".	c #000000000000",
-"                    ",
-"         ..         ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"         ..         ",
-"                    ",
-"                    ",
-"         ..         ",
-"        ....        ",
-"        ....        ",
-"        ....        ",
-"         ..         ",
-"                    ",
-"                    "};
-
-
+".	c #000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"     ............     ",
+"      ...........     ",
+"      ...      .      ",
+"      ...             ",
+"      ...             ",
+"     ...              ",
+"     .........        ",
+"     ........         ",
+"     ...              ",
+"    ...               ",
+"    ...               ",
+"    ...       ..      ",
+"    ...........       ",
+"   ............       ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/lib/images/footnote-insert.xpm b/lib/images/footnote-insert.xpm
index f3ce034d7a..08c4eb5181 100644
--- a/lib/images/footnote-insert.xpm
+++ b/lib/images/footnote-insert.xpm
@@ -1,27 +1,26 @@
 /* XPM */
-static char *footnote[]={
-"20 20 4 1",
-"# c None",
-". c #000000",
-"b c #7b0000",
-"a c #ffffff",
-".##a##a##a##a##a##a#",
-".aaaaaaaaaaaaaaaaaa#",
-".aaa...............a",
-".aaaaaaaaaaaaaaaaaa#",
-".aaa...............#",
-".aaaaaaaaaaaaaaaaaaa",
-".aaa...............#",
-".aaaaaaaaaaaaaaaaaa#",
-".aaa...............a",
-".aaaaaaaaaaaaaaaaaa#",
-".aaaaaaaaaaaaaaaaaa#",
-".aaaaaaaaaaaaaaaaaaa",
-".aaaaaaaaaaaaaaa.aa#",
-".aaabbbbbbbbaaa..aa#",
-".aaaaaaaaaaaaa.....a",
-".aaabbbbbbbbaaa..aa#",
-".aaaaaaaaaaaaaaa.aa#",
-".aaaaaaaaaaaaaaaaaaa",
-".aaaaaaaaaaaaaaaaaa#",
+static char * footnote_insert_xpm[] = {
+"20 20 3 1",
+" 	c None",
+".	c #000000",
+"+	c #7B0000",
+".                   ",
+".                   ",
+".   ............... ",
+".                   ",
+".   ............... ",
+".                   ",
+".   ............... ",
+".                   ",
+".   ............... ",
+".                   ",
+".                   ",
+".                   ",
+".                   ",
+".   ++++++++        ",
+".                   ",
+".   ++++++++        ",
+".                   ",
+".                   ",
+".                   ",
 "...................."};
diff --git a/lib/images/layout.xpm b/lib/images/layout.xpm
deleted file mode 100644
index 8ff7965ef8..0000000000
--- a/lib/images/layout.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char const * layout_std_xpm[] = {
-"20 20 3 1",
-" 	c gray50",
-".	c #000000000000",
-"X	c #FFFFFFFFFFFF",
-"                    ",
-".XXXXXXXXXXXXXXXXXX ",
-".XXXXXX............ ",
-".XXXXXXXXXXXXXXXXXX ",
-".X................. ",
-".XXXXXXXXXXXXXXXXXX ",
-".X................. ",
-".XXXXXXXXXXXXXXXXXX ",
-".X................. ",
-".XXXXXXXXXXXXXXXXXX ",
-".XXXXXXXXXXXXXXXXXX ",
-".XXXXXX............ ",
-".XXXXXXXXXXXXXXXXXX ",
-".X................. ",
-".XXXXXXXXXXXXXXXXXX ",
-".X................. ",
-".XXXXXXXXXXXXXXXXXX ",
-".XXXXXXXXXXXXXXXXXX ",
-".XXXXXXXXXXXXXXXXXX ",
-"................... "};
-
-
diff --git a/lib/images/layout_Enumerate.xpm b/lib/images/layout_Enumerate.xpm
new file mode 100644
index 0000000000..4443d7bebd
--- /dev/null
+++ b/lib/images/layout_Enumerate.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * layout_Enumerate_xpm[] = {
+"20 20 2 1",
+" 	g None",
+".	g #000000",
+"                    ",
+"   .                ",
+"  ..                ",
+"   .     ........   ",
+"   .                ",
+"  ... .             ",
+"                    ",
+"  ..                ",
+"    .               ",
+"   .     ........   ",
+"  .                 ",
+"  ... .             ",
+"                    ",
+"  ..                ",
+"    .               ",
+"  ..     ........   ",
+"    .               ",
+"  ..  .             ",
+"                    ",
+"                    "};
diff --git a/lib/images/layout_Itemize.xpm b/lib/images/layout_Itemize.xpm
new file mode 100644
index 0000000000..628f01ebdb
--- /dev/null
+++ b/lib/images/layout_Itemize.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * layout_Itemize_xpm[] = {
+"20 20 4 1",
+" 	c None",
+".	c #00FFFF",
+"+	c #0000FF",
+"@	c #000000",
+"                    ",
+"                    ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"                    ",
+"                    ",
+"                    ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"                    ",
+"                    ",
+"                    ",
+"   .+               ",
+"   ++@   @@@@@@@@   ",
+"    @@              ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/lyx-quit.xpm b/lib/images/lyx-quit.xpm
index 82c0b8c552..d33d757fcb 100644
--- a/lib/images/lyx-quit.xpm
+++ b/lib/images/lyx-quit.xpm
@@ -1,36 +1,324 @@
 /* XPM */
-static char const * quit_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    20    20        7            1",
-/* colors */
-". c None",
-"# c #4d4d4d",
-"a c #000000",
-"b c #737373",
-"c c #ffffff",
-"d c #d9d9d9",
-"e c #ffff00",
-/* pixels */
-"....................",
-"....................",
-"....................",
-".........####.......",
-"........#....#......",
-".......#......#.....",
-".......#......#.....",
-".....aaaa......##...",
-"....aaabba.....##...",
-"...abccdaaaa.....#..",
-"..aacbbbaaaaa....#..",
-"..aacbbbaaaaa....#..",
-"..abdbbaaabba....e..",
-"..abaaaaaaeea....ee.",
-"..aaaaaaabdda.....e.",
-"..aaaaaa#bbba..ee...",
-"..aaaaaa#bbba..ee...",
-"...aa###b#aa........",
-"....aaaaaa..........",
-"...................."
-};
-
-
+static char * lyx_quit_xpm[] = {
+"22 22 299 2",
+"  	c None",
+". 	c #80170A",
+"+ 	c #7F2316",
+"@ 	c #812518",
+"# 	c #802418",
+"$ 	c #802417",
+"% 	c #802316",
+"& 	c #7F2215",
+"* 	c #7F2214",
+"= 	c #7D2013",
+"- 	c #81180C",
+"; 	c #761207",
+"> 	c #C23D29",
+", 	c #D17D66",
+"' 	c #DA9074",
+") 	c #D88B6D",
+"! 	c #D6896C",
+"~ 	c #D6896A",
+"{ 	c #D78969",
+"] 	c #D7896A",
+"^ 	c #D68968",
+"/ 	c #D68866",
+"( 	c #D58563",
+"_ 	c #D48361",
+": 	c #D3825F",
+"< 	c #D3825E",
+"[ 	c #D2815D",
+"} 	c #C86949",
+"| 	c #BF3721",
+"1 	c #771409",
+"2 	c #CC9177",
+"3 	c #C57957",
+"4 	c #BC603D",
+"5 	c #BB603C",
+"6 	c #BC643F",
+"7 	c #BE6843",
+"8 	c #BC653E",
+"9 	c #BA603A",
+"0 	c #BA6139",
+"a 	c #BC663E",
+"b 	c #C06F48",
+"c 	c #C3744E",
+"d 	c #C2754E",
+"e 	c #C37750",
+"f 	c #C47952",
+"g 	c #C9875E",
+"h 	c #C17A57",
+"i 	c #BF3521",
+"j 	c #B54925",
+"k 	c #B95531",
+"l 	c #BA5B36",
+"m 	c #BA5A33",
+"n 	c #B7542A",
+"o 	c #C36C48",
+"p 	c #D1886A",
+"q 	c #D59477",
+"r 	c #D18A6A",
+"s 	c #C5724B",
+"t 	c #BD653B",
+"u 	c #C3714A",
+"v 	c #C4754E",
+"w 	c #C4764F",
+"x 	c #C47750",
+"y 	c #C56243",
+"z 	c #BB5E39",
+"A 	c #B95932",
+"B 	c #C5714E",
+"C 	c #E9C1B0",
+"D 	c #F6E8E1",
+"E 	c #FFFEFE",
+"F 	c #FEFFFF",
+"G 	c #FEFDFC",
+"H 	c #F4E5DD",
+"I 	c #E7BDA8",
+"J 	c #C67953",
+"K 	c #C3754D",
+"L 	c #C67C55",
+"M 	c #C67D56",
+"N 	c #C68059",
+"O 	c #CE7650",
+"P 	c #7D1F11",
+"Q 	c #B95931",
+"R 	c #CC7F5E",
+"S 	c #F8EBE5",
+"T 	c #FFFFFF",
+"U 	c #FFFBF9",
+"V 	c #F2DFD6",
+"W 	c #E7CBBD",
+"X 	c #F4E5DE",
+"Y 	c #CC8762",
+"Z 	c #C57B53",
+"` 	c #C7805A",
+" .	c #C7835D",
+"..	c #CE754F",
+"+.	c #7E1F11",
+"@.	c #C87655",
+"#.	c #F7E9E3",
+"$.	c #F2D9CD",
+"%.	c #D28E6F",
+"&.	c #C6734D",
+"*.	c #C97C58",
+"=.	c #C97A54",
+"-.	c #D89E81",
+";.	c #F7EBE3",
+">.	c #F3E3D9",
+",.	c #CA835D",
+"'.	c #C7825B",
+").	c #C8875F",
+"!.	c #CD724D",
+"~.	c #7E1E11",
+"{.	c #BE6742",
+"].	c #B8562D",
+"^.	c #EAC9B9",
+"/.	c #F1D5C9",
+"(.	c #C46F48",
+"_.	c #BB5F34",
+":.	c #E2B39D",
+"<.	c #D59B7F",
+"[.	c #BD673C",
+"}.	c #CF8C68",
+"|.	c #F9F0E8",
+"1.	c #E5BDA6",
+"2.	c #C57E55",
+"3.	c #C98A63",
+"4.	c #CC714B",
+"5.	c #7E1E10",
+"6.	c #BB623C",
+"7.	c #C97755",
+"8.	c #FBEFEB",
+"9.	c #FFFDFC",
+"0.	c #CD8766",
+"a.	c #BD653C",
+"b.	c #C27048",
+"c.	c #ECC6B3",
+"d.	c #DEAD93",
+"e.	c #C57A52",
+"f.	c #C3754C",
+"g.	c #DDA98D",
+"h.	c #F4E5DC",
+"i.	c #CC8B65",
+"j.	c #C88962",
+"k.	c #CC704A",
+"l.	c #7E1D10",
+"m.	c #D78A6A",
+"n.	c #B95E37",
+"o.	c #D49276",
+"p.	c #EDD4C9",
+"q.	c #BF663E",
+"r.	c #C3744D",
+"s.	c #C26F46",
+"t.	c #EAC4B1",
+"u.	c #DEAC93",
+"v.	c #C57951",
+"w.	c #C67E58",
+"x.	c #CF8D68",
+"y.	c #F9EEE8",
+"z.	c #FFFAF7",
+"A.	c #D79F7F",
+"B.	c #C88861",
+"C.	c #CC6F4A",
+"D.	c #7D1D0F",
+"E.	c #D68969",
+"F.	c #BA5F36",
+"G.	c #D59B82",
+"H.	c #EACFC3",
+"I.	c #BD6439",
+"J.	c #C57750",
+"K.	c #EBC5B3",
+"L.	c #DEAF95",
+"M.	c #C8835C",
+"N.	c #CD8B65",
+"O.	c #F5E9E2",
+"P.	c #FFFCFA",
+"Q.	c #D9A383",
+"R.	c #C98B65",
+"S.	c #CC6C48",
+"T.	c #7D1C0F",
+"U.	c #D68867",
+"V.	c #BB643B",
+"W.	c #D5977A",
+"X.	c #EDD6CA",
+"Y.	c #C16C43",
+"Z.	c #C57852",
+"`.	c #C3734B",
+" +	c #EBC7B3",
+".+	c #DFB097",
+"++	c #C67E57",
+"@+	c #C8855E",
+"#+	c #D1926E",
+"$+	c #F9EFE9",
+"%+	c #FFFAF8",
+"&+	c #DAA687",
+"*+	c #CB8E6A",
+"=+	c #CB6A46",
+"-+	c #7D1C0E",
+";+	c #D58664",
+">+	c #BE6A42",
+",+	c #CF8664",
+"'+	c #FDF6F1",
+")+	c #D08F6F",
+"!+	c #C17047",
+"~+	c #C67B53",
+"{+	c #EDCAB8",
+"]+	c #E0B39A",
+"^+	c #C9855D",
+"/+	c #C58057",
+"(+	c #DDAD91",
+"_+	c #F5E7DF",
+":+	c #D39977",
+"<+	c #CF9673",
+"[+	c #CA6844",
+"}+	c #7D1B0E",
+"|+	c #C2744E",
+"1+	c #BF683E",
+"2+	c #EDD3C7",
+"3+	c #F3DACD",
+"4+	c #C87D55",
+"5+	c #C17147",
+"6+	c #E8C3AD",
+"7+	c #DCAC91",
+"8+	c #C37A4F",
+"9+	c #D29976",
+"0+	c #F9F0E9",
+"a+	c #EDCFBC",
+"b+	c #CF936F",
+"c+	c #D19B7A",
+"d+	c #C96643",
+"e+	c #7D1B0D",
+"f+	c #C3764F",
+"g+	c #C16E46",
+"h+	c #CE8967",
+"i+	c #FCF2EE",
+"j+	c #D29675",
+"k+	c #CB8660",
+"l+	c #D29572",
+"m+	c #CD8B64",
+"n+	c #D9A688",
+"o+	c #F8EEE7",
+"p+	c #F6E8E0",
+"q+	c #D59C7B",
+"r+	c #D49D7D",
+"s+	c #D29B7C",
+"t+	c #C86341",
+"u+	c #7C1A0D",
+"v+	c #C4754F",
+"w+	c #C27249",
+"x+	c #D99F81",
+"y+	c #FDF5F1",
+"z+	c #FCF7F4",
+"A+	c #F1DED4",
+"B+	c #EAD4C6",
+"C+	c #F8EEE8",
+"D+	c #D9A586",
+"E+	c #D29978",
+"F+	c #D5A183",
+"G+	c #D39E80",
+"H+	c #C86240",
+"I+	c #7C1A0C",
+"J+	c #C4784F",
+"K+	c #D19270",
+"L+	c #EDD0BF",
+"M+	c #FAF1EC",
+"N+	c #FEFEFE",
+"O+	c #FFFFFE",
+"P+	c #F9EFEA",
+"Q+	c #EED0BE",
+"R+	c #D6A07F",
+"S+	c #D29A78",
+"T+	c #D49F80",
+"U+	c #D7A588",
+"V+	c #D39E82",
+"W+	c #C45737",
+"X+	c #7B1A0D",
+"Y+	c #C9875D",
+"Z+	c #C8805A",
+"`+	c #C67F58",
+" @	c #C67E55",
+".@	c #DDAE92",
+"+@	c #DEB297",
+"@@	c #E0B296",
+"#@	c #D79F7E",
+"$@	c #D39C7C",
+"%@	c #DAAE94",
+"&@	c #CE9072",
+"*@	c #B93D21",
+"=@	c #811A0E",
+"-@	c #C7835C",
+";@	c #C88760",
+">@	c #C7865F",
+",@	c #C7845D",
+"'@	c #CA8B67",
+")@	c #CE9571",
+"!@	c #B45032",
+"~@	c #BB2B16",
+"{@	c #CC704B",
+"]@	c #CC6D49",
+"^@	c #CB6B47",
+"/@	c #CA6944",
+"(@	c #78170C",
+"                                            ",
+"        . + @ # $ $ $ % % % & & * = -       ",
+"    ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1   ",
+"    > 2 3 4 5 6 7 8 9 0 a b c d e f g h i   ",
+"  . , 3 j k l m n o p q r s t u v w x g y - ",
+"  + ' 4 k z A B C D E F G H I J K L M N O P ",
+"  @ ) 5 l Q R S T U V W X T T H Y Z `  ...+.",
+"  # ! 6 A @.#.T $.%.&.*.=.-.;.T >.,.'.).!.~.",
+"  $ ] {.].^.T /.(._.:.T <.[.}.|.T 1.2.3.4.5.",
+"  $ ] 6.7.8.9.0.a.b.c.T d.e.f.g.T h.i.j.k.l.",
+"  $ m.n.o.T p.q.r.s.t.T u.v.w.x.y.z.A.B.C.D.",
+"  % E.F.G.T H.I.J.b.K.T L.Z M.N.O.P.Q.R.S.T.",
+"  % U.V.W.T X.Y.Z.`. +T .+++@+#+$+%+&+*+=+-+",
+"  % ;+>+,+'+9.)+!+~+{+T ]+^+/+(+T _+:+<+[+}+",
+"  & _ |+1+2+T 3+4+5+6+T 7+8+9+0+T a+b+c+d+e+",
+"  & : f+g+h+i+T $.j+k+l+m+n+o+T p+q+r+s+t+u+",
+"  * < e v+w+x+y+T z+A+B+h.P.T C+D+E+F+G+H+I+",
+"  = [ f w L J+K+L+M+T N+O+P+Q+R+S+T+U+V+W+X+",
+"  - } Y+x M Z+`+ @l+.@+@@@#@b+$@F+U+%@&@*@=@",
+"    | h g N -@;@3.>@,@B.'@)@c+s+G+V+&@!@~@  ",
+"    1 i y O ..!.4.{@C.]@^@/@d+t+H+W+*@~@(@  ",
+"        - P +.~.5.l.D.T.-+}+e+u+I+X+=@      "};
diff --git a/lib/images/marginalnote-insert.xpm b/lib/images/marginalnote-insert.xpm
index ad33ae233c..3c533115d4 100644
--- a/lib/images/marginalnote-insert.xpm
+++ b/lib/images/marginalnote-insert.xpm
@@ -1,27 +1,26 @@
 /* XPM */
-static char *marginalnote[]={
-"20 20 4 1",
-". c None",
-"a c #000000",
-"b c #7b0000",
-"# c #ffffff",
-".#..#..#..#..#..#..a",
-".##################a",
-"###################a",
-".##################a",
-".aaaaaaaaa##bbbbb##a",
-"###################a",
-".aaaaaaaaa##bbbbb##a",
-".##################a",
-"aaaaaaaaaa##bbbbb##a",
-".##################a",
-".aaaaaaaaa####a####a",
-"#############aaa###a",
-".aa#########aaaaa##a",
-".#############a####a",
-"aaaaaaaaaa####a####a",
-".##################a",
-".aaaaaaaaa########.a",
-"###################a",
-".##################a",
-".#..#..#..#..#..#..a"};
+static char * marginalnote_insert_xpm[] = {
+"20 20 3 1",
+" 	c None",
+".	c #000000",
+"+	c #7B0000",
+"....................",
+"                   .",
+"                   .",
+"                   .",
+" .........  +++++  .",
+"                   .",
+" .........  +++++  .",
+"                   .",
+" .........  +++++  .",
+"                   .",
+" .........         .",
+"                   .",
+" ..                .",
+"                   .",
+" .........         .",
+"                   .",
+" .........         .",
+"                   .",
+"                   .",
+"                   ."};
diff --git a/lib/images/math-display.xpm b/lib/images/math-display.xpm
new file mode 100644
index 0000000000..e5c28b087e
--- /dev/null
+++ b/lib/images/math-display.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * image5_data[] = {
+"20 20 3 1",
+". c None",
+"# c #000000",
+"a c #0000ff",
+"....................",
+"....................",
+"....................",
+"...##############...",
+"....................",
+"...##############...",
+"....................",
+"....................",
+".......aaaaaa.......",
+".......a....a.......",
+".......a....a.......",
+".......aaaaaa.......",
+"....................",
+"....................",
+"...##############...",
+"....................",
+"...##############...",
+"....................",
+"....................",
+"...................."};
diff --git a/lib/images/math-matrix.xpm b/lib/images/math-matrix.xpm
new file mode 100644
index 0000000000..b94377c669
--- /dev/null
+++ b/lib/images/math-matrix.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char *math-matrix[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 4 1",
+"  c black",
+". c #0000c0",
+"X c #800080",
+"o c None",
+/* pixels */
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"oooooooooooooooooooooo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"oooooooooooooooooooooo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"oooooooooooooooooooooo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXooXoXooXoXooXoXooXo",
+"ooXXXXoXXXXoXXXXoXXXXo",
+"oooooooooooooooooooooo"
+};
diff --git a/lib/images/math-mode.xpm b/lib/images/math-mode.xpm
index 60c3a0fe14..2f816d5c39 100644
--- a/lib/images/math-mode.xpm
+++ b/lib/images/math-mode.xpm
@@ -1,29 +1,26 @@
 /* XPM */
-static char const * math_xpm[] = {
-"20 20 4 1",
+static char * math_mode_xpm[] = {
+"20 20 3 1",
 " 	c None",
-".	c #242423238E8E",
-"X	c #000000000000",
-"o	c #FFFFFFFFFFFF",
-"              ..    ",
-"              ..    ",
-"              ..    ",
-"  ....        ....  ",
-" .. ..   .    .. .. ",
-" .. ..   .    .. .. ",
-" .. .. .....  .. .. ",
-" .. ..   .    .. .. ",
-"  ....   .    ....  ",
+".	c #24238E",
+"+	c #000000",
 "                    ",
-" XXXXXXXXXXXXXXXXXX ",
+"                 .  ",
+"                ..  ",
+"   ...    .     .   ",
+"  .. ..   .    ...  ",
+"  .. .  .....  .... ",
+" ..  .    .   ..  . ",
+" .. ..    .   .. .. ",
+"  ... .        ...  ",
 "                    ",
-"        ...         ",
+" ++++++++++++++++++ ",
+"                    ",
+"         ...        ",
+"        .. ..       ",
+"        .. .        ",
 "       ..           ",
-"       ..    X      ",
-"       ..   XoX     ",
-"       ..   XooX    ",
-"        ...  XooX   ",
-"              XooX  ",
-"               XooX "};
-
-
+"       .. ..        ",
+"        ...         ",
+"                    ",
+"                    "};
diff --git a/lib/images/math-panel.xpm b/lib/images/math-panel.xpm
index 0a70a58321..ef091c8741 100644
--- a/lib/images/math-panel.xpm
+++ b/lib/images/math-panel.xpm
@@ -1,25 +1,30 @@
 /* XPM */
-static char const * sans_xpm[] = {
-"20 20 2 1",
+static char * math_panel_xpm[] = {
+"20 20 7 1",
 " 	c None",
-".	c #000000000000",
-" .      .           ",
-" ..    ..     . .   ",
-" ...  ...    ....   ",
-" .. .. ..     . .   ",
-" .. .. .. ... . ... ",
-" ..    .. . . . .  .",
-" ..    .. . . . .  .",
-" ..    .. .... ..  .",
-"                    ",
-"                    ",
-"                    ",
-"                 .  ",
-"                 .  ",
-" ... ... ... ... .  ",
-" . . . . . . ... .  ",
-" . . . . . . .   .  ",
-" ... ..... . ... .. ",
-" .                  ",
-" .                  ",
+".	c #777777",
+"+	c #C9C9C9",
+"@	c #919191",
+"#	c #606060",
+"$	c #24238E",
+"%	c #000000",
+".................+@ ",
+"..+++++++++++++++@@#",
+".+            $$ @@#",
+".+ $$$   $    $$ @@#",
+".+$$ $   $    $$$@@#",
+".+$ $$   $   $$ $@@#",
+".+$ $    $   $  $@@#",
+".+$$$$       $$$ @@#",
+".+               @@#",
+".+%%%%%%%%%%%%%%%@@#",
+".+               @@#",
+".+      $$$      @@#",
+".+     $$ $$     @@#",
+".+     $         @@#",
+".+    $$         @@#",
+".+     $$$       @@#",
+"+@@@@@@    @@@@@@@@#",
+"@@@@@@@@@@@@@@@@@@##",
+" ###################",
 "                    "};
diff --git a/lib/images/math/cases.xpm b/lib/images/math/cases.xpm
new file mode 100644
index 0000000000..c1abd50341
--- /dev/null
+++ b/lib/images/math/cases.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * cases_xpm[] = {
+"20 20 2 1",
+" 	c None",
+".	c #000000",
+"                    ",
+"   ..       ...     ",
+"  ....     .. ..    ",
+"  ..       .  ..    ",
+"  ..      ..  .     ",
+"  ..      .. ..     ",
+"   ..      .. ..    ",
+"   ..               ",
+"   ..       ..      ",
+"   ..       ..      ",
+" ..         ..      ",
+"   ..       ..      ",
+"   ..      .. .     ",
+"   ..      .....    ",
+"   ..      .. ..    ",
+"  ..      ..  ..    ",
+"  ..      .. ..     ",
+"  ....     ...      ",
+"   ..               ",
+"                    "};
diff --git a/lib/images/math/root.xpm b/lib/images/math/root.xpm
new file mode 100644
index 0000000000..6eb3993280
--- /dev/null
+++ b/lib/images/math/root.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * root_xpm[] = {
+"20 20 3 1",
+" 	c None",
+".	c #000000",
+"+	c #0000FF",
+"                    ",
+"                    ",
+"                    ",
+"      ...........   ",
+"  +++ ...........   ",
+"  + + ..       ..   ",
+"  + + ..            ",
+"  +++ ..  ++++++    ",
+"      ..  ++++++    ",
+"  ... ..  ++  ++    ",
+"  ... ..  ++  ++    ",
+"    ....  ++  ++    ",
+"     ...  ++  ++    ",
+"      ..  ++  ++    ",
+"      ..  ++++++    ",
+"      ..  ++++++    ",
+"                    ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/melt.xpm b/lib/images/melt.xpm
deleted file mode 100644
index 9b287f6aad..0000000000
--- a/lib/images/melt.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char const * melt_xpm[] = {
-"20 20 5 1",
-" 	c None",
-".	c #000000000000",
-"X	c gray60",
-"o	c gray70",
-"O	c gray90",
-"                    ",
-" ...           ...  ",
-"..XX.        ..oo.  ",
-".XXXX.      .ooooo. ",
-".XXXXX.     .ooooo. ",
-".XXXXX.      .oooo. ",
-" .....   .   .ooo.  ",
-"         .    ...   ",
-"       .....        ",
-"        ...         ",
-"         .          ",
-"                    ",
-"        ....        ",
-"     ....OOO...     ",
-"   ..OOOOOOOOOO.    ",
-"   .OOOOOOOOOOOO.   ",
-"   .OOOOOOOOOOOO.   ",
-"   .OOOOOOOOOOOO.   ",
-"    ..OOOOO..OO..   ",
-"      .....  ...    "};
-
-
diff --git a/lib/images/note-insert.xpm b/lib/images/note-insert.xpm
new file mode 100644
index 0000000000..0322463743
--- /dev/null
+++ b/lib/images/note-insert.xpm
@@ -0,0 +1,35 @@
+/* XPM */
+static char *note-insert[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 7 1",
+"  c black",
+". c #7f7f00",
+"X c gray50",
+"o c yellow",
+"O c gray75",
+"+ c white",
+"@ c None",
+/* pixels */
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@@                @@@",
+"@@ o+o+o+o+o+o+o+o+ O@",
+"@@ +o+o+o+o+o+o+o+o X@",
+"@O o+.   .   .. +o+ X@",
+"@O +o+o+o+o+o+o+o+o @@",
+"@O o+ ...  o.   +o+ @@",
+"@O +o+o+o+o+o+o+o+o @@",
+"@@ o+..  ..  o+o+o+ @@",
+"@O +o+o+o+o+o+o+o+o @@",
+"@O o+... .. +o+o+o+ @@",
+"@@ +o+o+o+o+o+o+o+o @@",
+"@@ o+o+o+o+o+o+o+o+ @@",
+"@@O                @O@",
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@O@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@"
+};
diff --git a/lib/images/paste.xpm b/lib/images/paste.xpm
index ca37486208..01b8244401 100644
--- a/lib/images/paste.xpm
+++ b/lib/images/paste.xpm
@@ -1,31 +1,213 @@
 /* XPM */
-static char const * paste_xpm[] = {
-"20 20 6 1",
-"      c None",
-".     c #000000000000",
-"X     c #E5E5E0E0E1E1",
-"o     c navy",
-"O     c #9A9A94949494",
-"+     c #FFFFFFFFFFFF",
-"      ..            ",
-"     .XX.      ooo  ",
-".....X..X.....   o  ",
-".OO.XXXXXX.OO.   o  ",
-".O..........O. ooooo",
-".OOOOOOOOOOOO.  ooo ",
-".OOOOOOOOOOOO.   o  ",
-".OOOOOOOOOOOO.      ",
-".OOOOOOO.........   ",
-".OOOOOOO.+++++++..  ",
-".OOOOOOO.+++++++.O. ",
-".OOOOOOO.+.....+....",
-".OOOOOOO.++++++++++.",
-".OOOOOOO.+........+.",
-".OOOOOOO.++++++++++.",
-".OOOOOOO.+........+.",
-".........++++++++++.",
-"        .+........+.",
-"        .++++++++++.",
-"        ............"};
-
-
+static char * paste_xpm[] = {
+"24 24 186 2",
+"  	c None",
+". 	c #716B32",
+"+ 	c #8A7E2D",
+"@ 	c #5A5000",
+"# 	c #5C3805",
+"$ 	c #A49941",
+"% 	c #FFFFFF",
+"& 	c #D2CC8F",
+"* 	c #ABA062",
+"= 	c #503104",
+"- 	c #5A3704",
+"; 	c #FFCF77",
+"> 	c #86761F",
+", 	c #F6F6DB",
+"' 	c #BBB574",
+") 	c #857414",
+"! 	c #C99939",
+"~ 	c #E2AC40",
+"{ 	c #F4C263",
+"] 	c #EAB650",
+"^ 	c #FDCC73",
+"/ 	c #E0AA3E",
+"( 	c #E3DFB2",
+"_ 	c #D0CB94",
+": 	c #B6AF6A",
+"< 	c #A09646",
+"[ 	c #8D8028",
+"} 	c #807116",
+"| 	c #C49536",
+"1 	c #DDA83D",
+"2 	c #FBCA6F",
+"3 	c #DBA53B",
+"4 	c #4B452A",
+"5 	c #8C6A25",
+"6 	c #CC9A37",
+"7 	c #F9C86C",
+"8 	c #D6A037",
+"9 	c #C79533",
+"0 	c #8C6924",
+"a 	c #7D5E20",
+"b 	c #7D5D20",
+"c 	c #F7C568",
+"d 	c #D19B34",
+"e 	c #CE9933",
+"f 	c #C39030",
+"g 	c #C08E2F",
+"h 	c #837464",
+"i 	c #7F7162",
+"j 	c #7C6F60",
+"k 	c #7A6C5D",
+"l 	c #76695B",
+"m 	c #74675A",
+"n 	c #726558",
+"o 	c #75695B",
+"p 	c #74685A",
+"q 	c #F5C365",
+"r 	c #CC9630",
+"s 	c #8A7B6A",
+"t 	c #73675A",
+"u 	c #898989",
+"v 	c #6A6054",
+"w 	c #F3C161",
+"x 	c #C7912D",
+"y 	c #867767",
+"z 	c #6F6357",
+"A 	c #C9C9C9",
+"B 	c #F1BE5E",
+"C 	c #C28C29",
+"D 	c #827464",
+"E 	c #828282",
+"F 	c #C6C6C6",
+"G 	c #5D544A",
+"H 	c #EFBC5A",
+"I 	c #BD8726",
+"J 	c #7E7061",
+"K 	c #665C51",
+"L 	c #63594E",
+"M 	c #60564C",
+"N 	c #5C5449",
+"O 	c #595147",
+"P 	c #EDBA56",
+"Q 	c #B98222",
+"R 	c #796C5E",
+"S 	c #5B5A5A",
+"T 	c #FDFBFA",
+"U 	c #A4A4A4",
+"V 	c #747474",
+"W 	c #554D44",
+"X 	c #EBB753",
+"Y 	c #B47D1F",
+"Z 	c #FDFAF8",
+"` 	c #FCF6F1",
+" .	c #FAF3ED",
+"..	c #F0E9E5",
+"+.	c #C2B9B1",
+"@.	c #504941",
+"#.	c #E9B54F",
+"$.	c #AF781B",
+"%.	c #716558",
+"&.	c #5A5451",
+"*.	c #7E7771",
+"=.	c #A0948B",
+"-.	c #7D736C",
+";.	c #D9CFC6",
+">.	c #4C463E",
+",.	c #E7B34C",
+"'.	c #AA7318",
+").	c #6D6255",
+"!.	c #FCF7F3",
+"~.	c #FBF4EE",
+"{.	c #F9F0E8",
+"].	c #F9EDE2",
+"^.	c #F8E9DD",
+"/.	c #F7E6D6",
+"(.	c #D7C9BC",
+"_.	c #48423B",
+":.	c #E5B048",
+"<.	c #A56E14",
+"[.	c #685E52",
+"}.	c #5A5959",
+"|.	c #C3BFBC",
+"1.	c #7F7B78",
+"2.	c #5A5551",
+"3.	c #C1B4AA",
+"4.	c #9B8574",
+"5.	c #7D6E62",
+"6.	c #7B6C60",
+"7.	c #D5C1B0",
+"8.	c #443F38",
+"9.	c #E3AE45",
+"0.	c #A06911",
+"a.	c #645A4F",
+"b.	c #FBF5F0",
+"c.	c #FAF1EA",
+"d.	c #FAEEE5",
+"e.	c #F8EADF",
+"f.	c #F8E7D9",
+"g.	c #F6E3D3",
+"h.	c #F5DECC",
+"i.	c #F5DBC6",
+"j.	c #D4BAA5",
+"k.	c #3F3B35",
+"l.	c #E1AC41",
+"m.	c #9B640D",
+"n.	c #60574C",
+"o.	c #7E7975",
+"p.	c #595450",
+"q.	c #7C6E61",
+"r.	c #564B43",
+"s.	c #7A6959",
+"t.	c #D2B59B",
+"u.	c #3B3732",
+"v.	c #C28B28",
+"w.	c #965F0A",
+"x.	c #5C5349",
+"y.	c #F9ECE0",
+"z.	c #F7E8DA",
+"A.	c #F7E4D4",
+"B.	c #F5E0CE",
+"C.	c #F5DCC8",
+"D.	c #F4D9C3",
+"E.	c #F2D5BD",
+"F.	c #F2D1B7",
+"G.	c #D0AD91",
+"H.	c #37342F",
+"I.	c #574F46",
+"J.	c #D8CBBF",
+"K.	c #D7C6B6",
+"L.	c #D3BCA8",
+"M.	c #D2B8A1",
+"N.	c #D2B199",
+"O.	c #D0AF91",
+"P.	c #CFA98A",
+"Q.	c #CEA685",
+"R.	c #33302C",
+"S.	c #534C43",
+"T.	c #504940",
+"U.	c #49433C",
+"V.	c #464039",
+"W.	c #423E37",
+"X.	c #3F3B34",
+"Y.	c #3C3832",
+"Z.	c #383530",
+"`.	c #35322D",
+" +	c #322F2B",
+".+	c #2F2D29",
+"                                                ",
+"                    . + @                       ",
+"      # # # # # # $ % & * @ = - # # # #         ",
+"    # ; ; ; ; ; > , & ' $ ) @ ! ~ ; { ] #       ",
+"    # ^ / / / > , ( _ : < [ } @ | 1 / / #       ",
+"    # 2 3 3 3 > @ @ 4 4 4 4 4 4 5 6 3 3 #       ",
+"    # 7 8 8 8 9 0 a a b b b a a 0 9 8 8 #       ",
+"    # c d d d e f g h i j k l m n o p d #       ",
+"    # q r r r r r r s % % % % % % t u v #       ",
+"    # w x x x x x x y % % % % % % z % A v       ",
+"    # B C C C C C C D % E A E F % v A % u G     ",
+"    # H I I I I I I J % % % % % % K L M N O     ",
+"    # P Q Q Q Q Q Q R % E S A E A T F U V W     ",
+"    # X Y Y Y Y Y Y o % % % % % Z `  ...+.@.    ",
+"    # #.$.$.$.$.$.$.%.% S E F E &.*.=.-.;.>.    ",
+"    # ,.'.'.'.'.'.'.).% % T !.~.{.].^./.(._.    ",
+"    # :.<.<.<.<.<.<.[.% }.|.1.2.3.4.5.6.7.8.    ",
+"    # 9.0.0.0.0.0.0.a.% b.c.d.e.f.g.h.i.j.k.    ",
+"    # l.m.m.m.m.m.m.n.% o.p.3.4.q.r.4.s.t.u.    ",
+"    # v.w.w.w.w.w.w.x.% y.z.A.B.C.D.E.F.G.H.    ",
+"      # # # # # # # I.;.J.K.7.L.M.N.O.P.Q.R.    ",
+"                    S.T.>.U.V.W.X.Y.Z.`. +.+    ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/redo.xpm b/lib/images/redo.xpm
index 7d1369ae35..fab8eba682 100644
--- a/lib/images/redo.xpm
+++ b/lib/images/redo.xpm
@@ -1,25 +1,91 @@
 /* XPM */
-static char const * redo_bw_xpm[] = {
-"20 20 2 1",
+static char * redo_xpm[] = {
+"22 22 66 1",
 " 	c None",
-".	c black",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"      ......        ",
-"     ..    ..       ",
-"    ..      ..   .  ",
-"   ..        .. ..  ",
-"  ..          ....  ",
-"  .           ....  ",
-"             .....  ",
-"            ......  ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
+".	c #135628",
+"+	c #8FBEA0",
+"@	c #C4DDCB",
+"#	c #E0EBE3",
+"$	c #FFFFFF",
+"%	c #76C98D",
+"&	c #5DB275",
+"*	c #BEDBC7",
+"=	c #F4F7F5",
+"-	c #0E3D1C",
+";	c #369D62",
+">	c #299451",
+",	c #2E9951",
+"'	c #74BD8C",
+")	c #C1DCCA",
+"!	c #000000",
+"~	c #020202",
+"{	c #37A65E",
+"]	c #3FB86D",
+"^	c #4BC674",
+"/	c #6DBE82",
+"(	c #226135",
+"_	c #17602F",
+":	c #DFEAE2",
+"<	c #61AC78",
+"[	c #297640",
+"}	c #071C0D",
+"|	c #040B06",
+"1	c #092413",
+"2	c #2B9252",
+"3	c #9EBFA9",
+"4	c #6DA27C",
+"5	c #217C3F",
+"6	c #0E3D1D",
+"7	c #07180D",
+"8	c #5AB57A",
+"9	c #70C090",
+"0	c #57976E",
+"a	c #219648",
+"b	c #14552A",
+"c	c #092613",
+"d	c #308F54",
+"e	c #37AA62",
+"f	c #279A58",
+"g	c #2F8853",
+"h	c #0B3218",
+"i	c #051009",
+"j	c #4BB673",
+"k	c #2E9F5E",
+"l	c #34A360",
+"m	c #3B9A5C",
+"n	c #040D07",
+"o	c #438C58",
+"p	c #398851",
+"q	c #378251",
+"r	c #307D4D",
+"s	c #2E7B49",
+"t	c #102317",
+"u	c #0A190F",
+"v	c #0B1C11",
+"w	c #0C1F12",
+"x	c #0C2112",
+"y	c #173E24",
+"z	c #0E2314",
+"A	c #0E1D12",
+"                      ",
+"                      ",
+"      .....           ",
+"    ..+@#@+..         ",
+"   .+$%&&&&*=--       ",
+"  .#%;>>>>,,')=!    ~ ",
+" .+%>{]^^^^]>,/=!  -! ",
+" .$>{(_!!!!{^]>/=!-:! ",
+"-+<[_}|    1!{^2/3:4! ",
+"-$567        !{^2890! ",
+"-abc          !de2fg! ",
+" -hi          -:jklm! ",
+" !-n         -:opqrs! ",
+"  -t        ~!!!!!!!! ",
+"  |-u                 ",
+"   v-w                ",
+"    xyz               ",
+"     !-A              ",
+"       !!!            ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/lib/images/spellchecker.xpm b/lib/images/spellchecker.xpm
new file mode 100644
index 0000000000..b9952eda53
--- /dev/null
+++ b/lib/images/spellchecker.xpm
@@ -0,0 +1,59 @@
+/* XPM */
+static char *spellchecker[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 31 1",
+"  c #000000",
+". c gray4",
+"X c #150000",
+"o c #1a0000",
+"O c #151515",
+"+ c #220000",
+"@ c #340000",
+"# c #550000",
+"$ c #590000",
+"% c #6c0000",
+"& c #7c0000",
+"* c #585858",
+"= c #800000",
+"- c #920000",
+"; c #b40000",
+": c #cc0000",
+"> c #d30202",
+", c #e00000",
+"< c red2",
+"1 c #f50000",
+"2 c #fd0000",
+"3 c #ff1b1b",
+"4 c #fd2323",
+"5 c #fc2a2a",
+"6 c #f43b3b",
+"7 c #ec4848",
+"8 c #f64f4f",
+"9 c #c0c0c0",
+"0 c gainsboro",
+"q c #ffc0c0",
+"w c None",
+/* pixels */
+"wwwwwwwwwwwwwwwwwwwwww",
+"wwwwwwwwwwwwwwwwwwwwww",
+"ww   0w     0ww .  0ww",
+"w *0* 0w.0w*O0 *0w* 0w",
+"w 0ww 0w.0ww 0 0www 0w",
+"w 0ww 0w.0w* 0 0wwwwww",
+"w     0w.   w0 0wwwwww",
+"w 0ww 0w.0w* 0 0wwwwww",
+"w 0ww 0w.0ww 0 0www 0w",
+"w 0ww 0w.0w* 0 *0w* 0w",
+"w 0ww 0     0ww    0wq",
+"wwwwwwwwwwwwwwwwwwwwq3",
+"wwwwwwwwwwwwwwwwwwwq5>",
+"wwwwwwwwwwq8wwwwwwq6>%",
+"wwwwwwwwwq71>wwwwq6:=o",
+"wwwwwwww $;22>wwq4>& w",
+"wwwwwwwwwX#;228q4>%+ww",
+"wwwwwwwwww+#;<56>%@www",
+"wwwwwwwwwwwo#;,:&+wwww",
+"wwwwwwwwwwww $-= wwwww",
+"wwwwwwwwwwwwwXXowwwwww",
+"wwwwwwwwwwwwwwwwwwwwww"
+};
diff --git a/lib/images/tabular-feature_append-column.xpm b/lib/images/tabular-feature_append-column.xpm
new file mode 100644
index 0000000000..1a6be4646a
--- /dev/null
+++ b/lib/images/tabular-feature_append-column.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char *tabular-feature_append-column[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 5 1",
+"  c black",
+". c #606060",
+"X c #00c200",
+"o c white",
+"O c None",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOO O O.OOO.O O O OOO",
+"OOO OOOO.OOO.OOOO  OOO",
+"OO                 OOO",
+"OOO OOOO.OOO. OOO  OOO",
+"OOOO OOO.OOO.O O OOOOO",
+"OOOO OOO.OOO.ooOOOOOOO",
+"OOOO             OOOOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOO ooo XXX ooo O OOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOO ooo XXX ooo OOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOO OOOOOOOOOO  OOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO"
+};
diff --git a/lib/images/tabular-feature_append-row.xpm b/lib/images/tabular-feature_append-row.xpm
new file mode 100644
index 0000000000..60821f5e32
--- /dev/null
+++ b/lib/images/tabular-feature_append-row.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char *tabular-feature_append-row[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 5 1",
+"  c black",
+". c #606060",
+"X c #00c200",
+"o c white",
+"O c None",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOO    OOOOOOO OOOOOOO",
+"OOOO   OOOOOOOOOOOOOOO",
+"OOO O O O         OOOO",
+"OOOOO OOO ooooooooOOOO",
+"OOO O O o ooooooooOOOO",
+"OOOOO  Oo ooooooooOOOO",
+"OOO.. ...         OOOO",
+"OOOOO OOO XXXXXXXXOOOO",
+"OOOOO OOO XXXXXXXXOOOO",
+"OOOOO OOO XXXXXXXXOOOO",
+"OOO.. ...         OOOO",
+"OOOOO OOO ooooooooOOOO",
+"OOO O OOO ooooooooOOOO",
+"OOOOO OOO ooooooooOOOO",
+"OOO O O           OOOO",
+"OOOO   OOOOOOOOOOOOOOO",
+"OOOOO OOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOO"
+};
diff --git a/lib/images/tabular-feature_delete-column.xpm b/lib/images/tabular-feature_delete-column.xpm
new file mode 100644
index 0000000000..67912fe6e2
--- /dev/null
+++ b/lib/images/tabular-feature_delete-column.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char *tabular-feature_delete-column[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 4 1",
+"  c black",
+". c red",
+"X c white",
+"o c None",
+/* pixels */
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"ooo XXX ... XXX oooooo",
+"ooo XXX ... XXX oooooo",
+"ooo XXX ... XXX oooooo",
+"ooo XXX ... XXX oooooo",
+"ooo XXX ... XXX oooooo",
+"ooo XXX ... XXX oooooo",
+"ooo XXX ... XXX oooooo",
+"ooo             oooooo",
+"oooooooooooooooooooooo",
+"ooooooooooooo..oo..ooo",
+"ooooooooooooo..o...ooo",
+"oooooooooooooo....oooo",
+"ooooooooooooooo..ooooo",
+"oooooooooooooo...ooooo",
+"ooooooooooooo..oo.oooo",
+"ooooooooooooo.ooo.oooo",
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo"
+};
diff --git a/lib/images/tabular-feature_delete-row.xpm b/lib/images/tabular-feature_delete-row.xpm
new file mode 100644
index 0000000000..8c4ce946ca
--- /dev/null
+++ b/lib/images/tabular-feature_delete-row.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char *tabular-feature_delete-row[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 4 1",
+"  c black",
+". c red",
+"X c white",
+"o c None",
+/* pixels */
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"ooo         oooooooooo",
+"oooXXXXXXXX oooooooooo",
+"oooXXXXXXXX oooooooooo",
+"oooXXXXXXXX oooooooooo",
+"ooo         oooooooooo",
+"ooo........ oooooooooo",
+"ooo........ oooooooooo",
+"ooo........ oooooooooo",
+"ooo         oooooooooo",
+"oooXXXXXXXX o..oo..ooo",
+"oooXXXXXXXX o..o...ooo",
+"oooXXXXXXXX oo....oooo",
+"ooo         ooo..ooooo",
+"oooooooooooooo...ooooo",
+"ooooooooooooo..oo.oooo",
+"ooooooooooooo.ooo.oooo",
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo",
+"oooooooooooooooooooooo"
+};
diff --git a/lib/images/tabular-feature_multicolumn.xpm b/lib/images/tabular-feature_multicolumn.xpm
new file mode 100644
index 0000000000..4122f53747
--- /dev/null
+++ b/lib/images/tabular-feature_multicolumn.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * tabular_feature_multicolumn_xpm[] = {
+"22 22 4 1",
+" 	c None",
+".	c #4808F6",
+"+	c #FFFFFF",
+"@	c #0CFF00",
+"                      ",
+"                      ",
+"                      ",
+"   .................  ",
+"   .+++.@@@@@@@@@@@.  ",
+"   .+++.@@@@@@@@@@@.  ",
+"   .+++.@@@@@@@@@@@.  ",
+"   .................  ",
+"   .+++.+++++.+++++.  ",
+"   .+++.+++++.+++++.  ",
+"   .+++.+++++.+++++.  ",
+"   .+++.+++++.+++++.  ",
+"   .................  ",
+"   .+++.+++++.+++++.  ",
+"   .+++.+++++.+++++.  ",
+"   .+++.+++++.+++++.  ",
+"   .+++.+++++.+++++.  ",
+"   .................  ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/lib/images/tabular-feature_set-all-lines.xpm b/lib/images/tabular-feature_set-all-lines.xpm
new file mode 100644
index 0000000000..10cfe2dadf
--- /dev/null
+++ b/lib/images/tabular-feature_set-all-lines.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * tabular_feature_set_all_lines_xpm[] = {
+"20 20 2 1",
+" 	c None",
+".	c #000000",
+"                    ",
+"                    ",
+"                    ",
+"                    ",
+"   ..............   ",
+"   ..............   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..          ..   ",
+"   ..............   ",
+"   ..............   ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/tabular-feature_set-rotate-cell.xpm b/lib/images/tabular-feature_set-rotate-cell.xpm
new file mode 100644
index 0000000000..7c7220cfd7
--- /dev/null
+++ b/lib/images/tabular-feature_set-rotate-cell.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char * tabular_feature_set_rotate_cell_xpm[] = {
+"22 22 18 1",
+" 	c None",
+".	c #000000",
+"+	c #0A0A0A",
+"@	c #131313",
+"#	c #838383",
+"$	c #1B1B1B",
+"%	c #3B3B3B",
+"&	c #5D5D5D",
+"*	c #343434",
+"=	c #6D6D6D",
+"-	c #949494",
+";	c #626262",
+">	c #414141",
+",	c #FFFFFF",
+"'	c #242424",
+")	c #7A7A7A",
+"!	c #525252",
+"~	c #484848",
+"          .           ",
+"          +@          ",
+"        ..+#$         ",
+"      .%&*+=-@        ",
+"     .;=...$;-+       ",
+"    .&@....>;.,       ",
+"  ,.>$$@..$;.         ",
+" ,=+$*';,.+.          ",
+" ,%+;% ,  +,          ",
+"  +$=;,               ",
+"  .%.,  .......       ",
+"  .;.   .,,,,,.       ",
+" ,').   .,,,,,.       ",
+" ,%;.,  .,,,,,.       ",
+" , +.;, .,,,,,.       ",
+"  ,!=., .......       ",
+"   ,.=.               ",
+"     .~+ ,            ",
+"      .$@&,           ",
+"      ,)~@...         ",
+"       ,,             ",
+"                      "};
diff --git a/lib/images/tabular-feature_set-rotate-tabular.xpm b/lib/images/tabular-feature_set-rotate-tabular.xpm
new file mode 100644
index 0000000000..4d34756de6
--- /dev/null
+++ b/lib/images/tabular-feature_set-rotate-tabular.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char * tabular_feature_set_rotate_table_xpm[] = {
+"22 22 18 1",
+" 	c None",
+".	c #000000",
+"+	c #0A0A0A",
+"@	c #131313",
+"#	c #838383",
+"$	c #1B1B1B",
+"%	c #3B3B3B",
+"&	c #5D5D5D",
+"*	c #343434",
+"=	c #6D6D6D",
+"-	c #949494",
+";	c #FFFFFF",
+">	c #626262",
+",	c #414141",
+"'	c #242424",
+")	c #7A7A7A",
+"!	c #525252",
+"~	c #484848",
+"          .           ",
+"          +@          ",
+"        ..+#$         ",
+"   ....%&*+=-@.....   ",
+"   .;.>=...$>-+;;;.   ",
+"   ..&@....,>.;;;;.   ",
+"  ;.,$$@..$>.......   ",
+" ;=+$*'>;.+.;.;;;;.   ",
+" ;%+>%;;.;+;;.;;;;.   ",
+"  +$=>;............   ",
+"  .%.;;;.;;;;.;;;;.   ",
+"  .>.;;;.;;;;.;;;;.   ",
+" ;')...............   ",
+" ;%>.;;;.;;;;.;;;;.   ",
+" ; +.>;;.;;;;.;;;;.   ",
+"  ;!=.;............   ",
+"   ;.=.;.;;;;.;;;;.   ",
+"   .;.~+.;;;;.;;;;.   ",
+"   ....$@&;........   ",
+"      ;)~@...         ",
+"       ;;             ",
+"                      "};
diff --git a/lib/images/tabular-feature_toggle-line-bottom.xpm b/lib/images/tabular-feature_toggle-line-bottom.xpm
new file mode 100644
index 0000000000..a5c3c86422
--- /dev/null
+++ b/lib/images/tabular-feature_toggle-line-bottom.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *tabular-feature_toggle-line-bottom[] = {
+/* columns rows colors chars-per-pixel */
+"20 20 2 1",
+"  c black",
+". c None",
+/* pixels */
+"....................",
+"....................",
+"....................",
+"....................",
+".... . . . . . . ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....             ...",
+"....             ...",
+"....................",
+"....................",
+"...................."
+};
diff --git a/lib/images/tabular-feature_toggle-line-left.xpm b/lib/images/tabular-feature_toggle-line-left.xpm
new file mode 100644
index 0000000000..3dbf31bd25
--- /dev/null
+++ b/lib/images/tabular-feature_toggle-line-left.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *tabular-feature_toggle-line-left[] = {
+/* columns rows colors chars-per-pixel */
+"20 20 2 1",
+"  c black",
+". c None",
+/* pixels */
+"....................",
+"....................",
+"....................",
+"....................",
+"...  . . . . . . ...",
+"...  ...............",
+"...  ........... ...",
+"...  ...............",
+"...  ........... ...",
+"...  ...............",
+"...  ........... ...",
+"...  ...............",
+"...  ........... ...",
+"...  ...............",
+"...  ........... ...",
+"...  ...............",
+"...  . . . . . . ...",
+"....................",
+"....................",
+"...................."
+};
diff --git a/lib/images/tabular-feature_toggle-line-right.xpm b/lib/images/tabular-feature_toggle-line-right.xpm
new file mode 100644
index 0000000000..7b143190c7
--- /dev/null
+++ b/lib/images/tabular-feature_toggle-line-right.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *tabular-feature_toggle-line-right[] = {
+/* columns rows colors chars-per-pixel */
+"20 20 2 1",
+"  c black",
+". c None",
+/* pixels */
+"....................",
+"....................",
+"....................",
+"....................",
+".... . . . . .   ...",
+"...............  ...",
+".... ..........  ...",
+"...............  ...",
+".... ..........  ...",
+"...............  ...",
+".... ..........  ...",
+"...............  ...",
+".... ..........  ...",
+"...............  ...",
+".... ..........  ...",
+"...............  ...",
+".... . . . . .   ...",
+"....................",
+"....................",
+"...................."
+};
diff --git a/lib/images/tabular-feature_toggle-line-top.xpm b/lib/images/tabular-feature_toggle-line-top.xpm
new file mode 100644
index 0000000000..3854a4db54
--- /dev/null
+++ b/lib/images/tabular-feature_toggle-line-top.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char *tabular-feature_toggle-line-top[] = {
+/* columns rows colors chars-per-pixel */
+"20 20 2 1",
+"  c black",
+". c None",
+/* pixels */
+"....................",
+"....................",
+"....................",
+"....             ...",
+"....             ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... ........... ...",
+"....................",
+".... . . . . . . ...",
+"....................",
+"....................",
+"...................."
+};
diff --git a/lib/images/tabular-feature_unset-all-lines.xpm b/lib/images/tabular-feature_unset-all-lines.xpm
new file mode 100644
index 0000000000..89588fb001
--- /dev/null
+++ b/lib/images/tabular-feature_unset-all-lines.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * tabular_feature_unset_all_lines_xpm[] = {
+"20 20 2 1",
+" 	c None",
+".	c #000000",
+"                    ",
+"                    ",
+"                    ",
+"                    ",
+"   .. . . . . . .   ",
+"   .                ",
+"                .   ",
+"   .                ",
+"                .   ",
+"   .                ",
+"                .   ",
+"   .                ",
+"                .   ",
+"   .                ",
+"                .   ",
+"   .                ",
+"    . . . . . . .   ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/tabular-insert.xpm b/lib/images/tabular-insert.xpm
index 3287a1eca2..606843ef08 100644
--- a/lib/images/tabular-insert.xpm
+++ b/lib/images/tabular-insert.xpm
@@ -1,28 +1,31 @@
 /* XPM */
-static char const * tab_xpm[] = {
-"20 20 3 1",
-" 	c None",
-".	c #000000000000",
-"X	c #FFFFFFFFFFFF",
-"                    ",
-"  ................  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  ................  ",
-"                    ",
-"  ................  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  ................  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  ................  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  .XXXX.XXXX.XXXX.  ",
-"  ................  "};
-
-
+static char *show-dialog-new-inset_tabular[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 3 1",
+"  c black",
+". c white",
+"X c None",
+/* pixels */
+"XXXXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXXXX",
+"XXX                XXX",
+"XXX .... .... .... XXX",
+"XXX .... .... .... XXX",
+"XXX                XXX",
+"XXX .... .... .... XXX",
+"XXX .... .... .... XXX",
+"XXX                XXX",
+"XXX .... .... .... XXX",
+"XXX .... .... .... XXX",
+"XXX                XXX",
+"XXX .... .... .... XXX",
+"XXX .... .... .... XXX",
+"XXX                XXX",
+"XXX .... .... .... XXX",
+"XXX .... .... .... XXX",
+"XXX                XXX",
+"XXXXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXXXXXXXXX"
+};
diff --git a/lib/images/thesaurus-entry.xpm b/lib/images/thesaurus-entry.xpm
new file mode 100644
index 0000000000..2f1479738e
--- /dev/null
+++ b/lib/images/thesaurus-entry.xpm
@@ -0,0 +1,208 @@
+/* XPM */
+static char * thesaurus_entry_xpm[] = {
+"22 22 183 2",
+"  	c None",
+". 	c #E8E7E1",
+"+ 	c #FFFFFF",
+"@ 	c #E1DFD7",
+"# 	c #ECEBE5",
+"$ 	c #D1D1CA",
+"% 	c #A9A499",
+"& 	c #8B7E68",
+"* 	c #A09B8F",
+"= 	c #CAC6B9",
+"- 	c #E8E8E1",
+"; 	c #D4D4CD",
+"> 	c #D8D7D1",
+", 	c #EAEAE3",
+"' 	c #CDC8BF",
+") 	c #B7AF9D",
+"! 	c #938C7D",
+"~ 	c #C5C0B2",
+"{ 	c #D3D3D3",
+"] 	c #BEBDB8",
+"^ 	c #D9D8D2",
+"/ 	c #B6B6AF",
+"( 	c #B6B6B1",
+"_ 	c #C4C4BD",
+": 	c #D2D2CB",
+"< 	c #E9E9E2",
+"[ 	c #F0F0EA",
+"} 	c #F2F1EC",
+"| 	c #D5D3CC",
+"1 	c #C0B8A6",
+"2 	c #B2A994",
+"3 	c #524D44",
+"4 	c #979183",
+"5 	c #C2BBAD",
+"6 	c #A9A8A4",
+"7 	c #BEBEB8",
+"8 	c #E6E5E0",
+"9 	c #2E8AD3",
+"0 	c #8A96AE",
+"a 	c #C8CCD2",
+"b 	c #EFEEE9",
+"c 	c #E0E0D9",
+"d 	c #D4D4CF",
+"e 	c #CFCFCD",
+"f 	c #C7C5BF",
+"g 	c #C7C0B1",
+"h 	c #978E7A",
+"i 	c #5A5449",
+"j 	c #8F8A80",
+"k 	c #C9C8C3",
+"l 	c #D7D7D0",
+"m 	c #3C5D72",
+"n 	c #236BAD",
+"o 	c #2D70AF",
+"p 	c #F0EFEA",
+"q 	c #C9C9C2",
+"r 	c #B7B7B1",
+"s 	c #D5D5D0",
+"t 	c #E8E8E3",
+"u 	c #CAC8C3",
+"v 	c #AAA498",
+"w 	c #928772",
+"x 	c #564F42",
+"y 	c #969081",
+"z 	c #C0B9AB",
+"A 	c #BDBDB7",
+"B 	c #D6D6CF",
+"C 	c #484941",
+"D 	c #2C85CC",
+"E 	c #BCBCB6",
+"F 	c #C0C0BA",
+"G 	c #D9D9D3",
+"H 	c #D0D0CB",
+"I 	c #CDCDC9",
+"J 	c #C2BFBB",
+"K 	c #C8C1B2",
+"L 	c #908670",
+"M 	c #50483B",
+"N 	c #928B7C",
+"O 	c #D2D2D2",
+"P 	c #E7E6E1",
+"Q 	c #CCCCC6",
+"R 	c #D7D6D2",
+"S 	c #E7E7E2",
+"T 	c #AAA497",
+"U 	c #8F856F",
+"V 	c #4E4639",
+"W 	c #8F8776",
+"X 	c #C9C1B2",
+"Y 	c #8F846F",
+"Z 	c #4D4538",
+"` 	c #918876",
+" .	c #ABA498",
+"..	c #8E846E",
+"+.	c #A8A7A3",
+"@.	c #8C867C",
+"#.	c #B8B7B3",
+"$.	c #F3F3EC",
+"%.	c #BFBEB9",
+"&.	c #BAB9B3",
+"*.	c #A1A09C",
+"=.	c #999994",
+"-.	c #F8F8F3",
+";.	c #E4E1DC",
+">.	c #898986",
+",.	c #8F8E8B",
+"'.	c #9E9E99",
+").	c #C1C1BB",
+"!.	c #D8D8D1",
+"~.	c #3071B1",
+"{.	c #E1E1DB",
+"].	c #E3E0DB",
+"^.	c #93918C",
+"/.	c #92928F",
+"(.	c #9D9C99",
+"_.	c #A9A9A4",
+":.	c #C7C7C1",
+"<.	c #3978B3",
+"[.	c #DFDFD8",
+"}.	c #D4D4C8",
+"|.	c #B7B7AB",
+"1.	c #98998F",
+"2.	c #8A8378",
+"3.	c #8A7E69",
+"4.	c #696257",
+"5.	c #645D52",
+"6.	c #6E6D62",
+"7.	c #717167",
+"8.	c #8A8A7F",
+"9.	c #C4C4BE",
+"0.	c #DFDFD9",
+"a.	c #427EB5",
+"b.	c #DBDBD3",
+"c.	c #B9B9AD",
+"d.	c #929484",
+"e.	c #6D7167",
+"f.	c #666B64",
+"g.	c #6B675D",
+"h.	c #584D3E",
+"i.	c #958A74",
+"j.	c #60533F",
+"k.	c #6E6553",
+"l.	c #707060",
+"m.	c #6D6D5D",
+"n.	c #69695A",
+"o.	c #7A7A6B",
+"p.	c #A1A195",
+"q.	c #528BBB",
+"r.	c #99998C",
+"s.	c #717163",
+"t.	c #646455",
+"u.	c #545447",
+"v.	c #474840",
+"w.	c #5D503E",
+"x.	c #524939",
+"y.	c #635542",
+"z.	c #4A4639",
+"A.	c #5B5D52",
+"B.	c #606051",
+"C.	c #2B84CB",
+"D.	c #3F7FB7",
+"E.	c #7E7E6F",
+"F.	c #616153",
+"G.	c #26498F",
+"H.	c #1A4292",
+"I.	c #103B95",
+"J.	c #143C93",
+"K.	c #324F83",
+"L.	c #50534D",
+"M.	c #324E74",
+"N.	c #153D95",
+"O.	c #184192",
+"P.	c #284A8F",
+"Q.	c #384156",
+"R.	c #3B5664",
+"S.	c #2572B5",
+"T.	c #616F74",
+"U.	c #31528C",
+"V.	c #0B2E77",
+"W.	c #33476A",
+"X.	c #0D327C",
+"Y.	c #113D93",
+"Z.	c #3270AA",
+"                          . + . .           ",
+"                        @ # + . .           ",
+"            $ % &     * = - + . .           ",
+"        ; > , ' ) &   ! ~ . { ] ^ / (       ",
+"    _ : < [ } | 1 2 3 4 5 6 + . . 7 8 9     ",
+"0 a b c c d e f g h i 4 j k { ] ^ 7 l m n   ",
+"o p c q r s t u v w x y z 6 + . . A B C D   ",
+"o p E F G H I J K L M N j k O ] ^ A B C 9   ",
+"o P Q q r R S u T U V W z 6 + . . A B C 9   ",
+"o p E F G H I J X Y Z ` j k O ] ^ A B C 9   ",
+"o P Q q r R S u  ...Z ` z +.+ . . A B C 9   ",
+"o p E F G H I J X ..Z ` @.#.$.. %.A B C 9   ",
+"o P Q q r R S u  ...Z ` z . &.*.=.7 l C 9   ",
+"o p E F G p -.;.X ..Z ` z . >.,.'.).!.C 9   ",
+"~.P Q c {.[ -.].X Y Z ` z ^./.(._.:.G C 9   ",
+"<.p c [.}.|.1.2.3...Z ` 4.5.6.7.8.9.0.C 9   ",
+"a.p b.c.d.e.f.g.h...Z i.j.k.l.m.n.o.p.C 9   ",
+"q.r.s.t.u.C C C v.w.x.y.C C C C z.A.B.C C.  ",
+"D.E.F.C C G.H.I.J.K.L.M.N.I.O.P.Q.C C R.S.  ",
+"o m.C T.U.U.      V.W.I.      U.U.X.Y.Z.9   ",
+"o o o o                                     ",
+"                                            "};
diff --git a/lib/images/undo.xpm b/lib/images/undo.xpm
index af1816fa4b..8f63087777 100644
--- a/lib/images/undo.xpm
+++ b/lib/images/undo.xpm
@@ -1,25 +1,92 @@
 /* XPM */
-static char const * undo_bw_xpm[] = {
-"20 20 2 1",
+static char * undo_xpm[] = {
+"22 22 67 1",
 " 	c None",
-".	c black",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"        ......      ",
-"       ..    ..     ",
-"  .   ..      ..    ",
-"  .. ..        ..   ",
-"  ....          ..  ",
-"  ....           .  ",
-"  .....             ",
-"  ......            ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
+".	c #135628",
+"+	c #8FBEA0",
+"@	c #C4DDCB",
+"#	c #E0EBE3",
+"$	c #F4F7F5",
+"%	c #BEDBC7",
+"&	c #5DB275",
+"*	c #76C98D",
+"=	c #C1DCCA",
+"-	c #74BD8C",
+";	c #2E9951",
+">	c #299451",
+",	c #369D62",
+"'	c #000000",
+")	c #6DBE82",
+"!	c #3FB86D",
+"~	c #4BC674",
+"{	c #37A65E",
+"]	c #CDE0D2",
+"^	c #17602F",
+"/	c #226135",
+"(	c #FFFFFF",
+"_	c #DFEAE2",
+":	c #9EBFA9",
+"<	c #2B9252",
+"[	c #092413",
+"}	c #040B06",
+"|	c #071C0D",
+"1	c #297640",
+"2	c #61AC78",
+"3	c #0E3D1C",
+"4	c #E8F1EB",
+"5	c #70C090",
+"6	c #5AB57A",
+"7	c #07180D",
+"8	c #0E3D1D",
+"9	c #217C3F",
+"0	c #279A58",
+"a	c #239854",
+"b	c #37AA62",
+"c	c #308F54",
+"d	c #092613",
+"e	c #14552A",
+"f	c #219648",
+"g	c #C5E0CE",
+"h	c #34A360",
+"i	c #35A662",
+"j	c #59C67A",
+"k	c #051009",
+"l	c #0B3218",
+"m	c #78B58E",
+"n	c #2B7846",
+"o	c #2E7D46",
+"p	c #458858",
+"q	c #297845",
+"r	c #3C8552",
+"s	c #040D07",
+"t	c #020202",
+"u	c #102317",
+"v	c #0A190F",
+"w	c #0C1F12",
+"x	c #0B1C11",
+"y	c #0E2314",
+"z	c #173E24",
+"A	c #0C2112",
+"B	c #0E1D12",
+"                      ",
+"                      ",
+"          .....       ",
+"        ..+@#@+..     ",
+"      ..$%&&&&*#+.    ",
+".    .$=-;;>>>>,*#'   ",
+"..  .$);>!~~~~!{>*+'  ",
+".]..$)>!~{''''^/{>('  ",
+".]_:)<~{'[    }|^12+3 ",
+".456<~{'        789(3 ",
+".40abc'          def3 ",
+".ghaij3          kl3  ",
+".mnopqr3         s3'  ",
+".'''''''t        u3   ",
+"                v3}   ",
+"               w3x    ",
+"              yzA     ",
+"             B3'      ",
+"           '''        ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/lib/images/unknown.xpm b/lib/images/unknown.xpm
index 9a4a03d799..7dda46db15 100644
--- a/lib/images/unknown.xpm
+++ b/lib/images/unknown.xpm
@@ -1,32 +1,124 @@
 /* XPM */
-static char const * unknown_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    20    20        2            1",
-/* colors */
-". c #000000000000",
-"# c None",
-/* pixels */
-"####################",
-"####################",
-"####################",
-"####################",
-"####################",
-"########.....#######",
-"#######..##..#######",
-"#######..##..#######",
-"##########..########",
-"########...#########",
-"########..##########",
-"####################",
-"########..##########",
-"########..##########",
-"####################",
-"####################",
-"####################",
-"####################",
-"####################",
-"####################"
-};
-
-
-
+static char * unknown_xpm[] = {
+"22 22 99 2",
+"  	c None",
+". 	c #020204",
+"+ 	c #F0F0EE",
+"@ 	c #CBCBCC",
+"# 	c #F2F2F0",
+"$ 	c #B0B0B0",
+"% 	c #DEDEDC",
+"& 	c #F0F0EF",
+"* 	c #8E8E8D",
+"= 	c #E4E4E4",
+"- 	c #C6C6C4",
+"; 	c #E9E9E7",
+"> 	c #DADAD8",
+", 	c #D9D9D8",
+"' 	c #E1E1E0",
+") 	c #C5C5C4",
+"! 	c #858584",
+"~ 	c #E8E8E6",
+"{ 	c #DFDFDE",
+"] 	c #DBDBDA",
+"^ 	c #D5D5D4",
+"/ 	c #D3D3D4",
+"( 	c #D1D1D1",
+"_ 	c #CFCFCF",
+": 	c #D5D5D5",
+"< 	c #CCCCCC",
+"[ 	c #5B5B5C",
+"} 	c #DDDDDC",
+"| 	c #D8D8D8",
+"1 	c #D7D7D7",
+"2 	c #CCCCCD",
+"3 	c #CACACB",
+"4 	c #C7C7C7",
+"5 	c #BCBCBC",
+"6 	c #DFDFE0",
+"7 	c #DADADC",
+"8 	c #D7D7D6",
+"9 	c #969694",
+"0 	c #656566",
+"a 	c #B1B1B2",
+"b 	c #C7C7C5",
+"c 	c #C4C4C4",
+"d 	c #BDBDBC",
+"e 	c #898987",
+"f 	c #393939",
+"g 	c #040404",
+"h 	c #070709",
+"i 	c #C1C1C2",
+"j 	c #BDBDBF",
+"k 	c #A4A4A5",
+"l 	c #D3D3D2",
+"m 	c #090909",
+"n 	c #BABABA",
+"o 	c #B1B1B1",
+"p 	c #9F9F9E",
+"q 	c #AFAFAD",
+"r 	c #CACAC9",
+"s 	c #B1B1B0",
+"t 	c #D0D0CF",
+"u 	c #101012",
+"v 	c #B8B8B7",
+"w 	c #ADADAC",
+"x 	c #8C8C8E",
+"y 	c #7C7C7C",
+"z 	c #747474",
+"A 	c #B7B7B6",
+"B 	c #B4B4B5",
+"C 	c #D1D1CF",
+"D 	c #CBCBCB",
+"E 	c #C6C6C5",
+"F 	c #B6B6B4",
+"G 	c #B5B5B3",
+"H 	c #ACACAD",
+"I 	c #595958",
+"J 	c #D2D2D1",
+"K 	c #C7C7C6",
+"L 	c #C3C3C4",
+"M 	c #BEBEBC",
+"N 	c #B4B4B4",
+"O 	c #9A9A9A",
+"P 	c #C1C1C0",
+"Q 	c #BFBFBE",
+"R 	c #BFBFBF",
+"S 	c #BBBBBA",
+"T 	c #ABABAD",
+"U 	c #9C9C9E",
+"V 	c #929293",
+"W 	c #B3B3B1",
+"X 	c #AEAEAC",
+"Y 	c #A7A7A6",
+"Z 	c #686869",
+"` 	c #8E8E8F",
+" .	c #19191B",
+"..	c #222224",
+"+.	c #A9A9A8",
+"@.	c #848486",
+"#.	c #2B2B2C",
+"$.	c #878788",
+"%.	c #1C1C1D",
+"                                            ",
+"                    . .                     ",
+"                  . + @ .                   ",
+"        . .       . # $ .       . .         ",
+"      . % # .   . . & * . .   . = - .       ",
+"      . # % ; . # # > , ' ) . = - ! .       ",
+"        . ~ { % ' ] ^ / ( _ : < [ .         ",
+"          . % } | 1 / ( 2 3 4 5 .           ",
+"        . # 6 7 8 9 0 0 a b c d e .         ",
+"    . . . # ] 1 9 f g h * 3 i j k . . .     ",
+"  . + # # > ^ l 0 g     m = d n o p q o .   ",
+"  . r s * , / t 0 h     u # 5 v w x y z .   ",
+"    . . . ' ( 2 q * m u # > A B x . . .     ",
+"        . ) C D E 3 = # , F G H I .         ",
+"          . J K L i M 5 A N a O .           ",
+"        . = K P Q R S v B T U a V .         ",
+"      . = E [ . e k W X x I . O Y y .       ",
+"      . - ! .   . . Z `  ..   . y z .       ",
+"        . .       ..+.@..       . .         ",
+"                  #.- $..                   ",
+"                    . %.                    ",
+"                                            "};