diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index b5e387e5d3..696c519850 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -1480,6 +1480,7 @@ lib_images_files = Split('''
     math-subscript.xpm
     math-superscript.xpm
     note-insert.xpm
+    note-next.xpm
     paste.xpm
     psnfss1.xpm
     psnfss2.xpm
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 71b6adf800..61e74cacd4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -221,6 +221,7 @@ dist_images_DATA = \
 	images/math-subscript.xpm \
 	images/math-superscript.xpm \
 	images/note-insert.xpm \
+	images/note-next.xpm \
 	images/paste.xpm \
 	images/psnfss1.xpm \
 	images/psnfss2.xpm \
diff --git a/lib/images/all-changes-accept.xpm b/lib/images/all-changes-accept.xpm
index e6698c74e1..3a80222d69 100644
--- a/lib/images/all-changes-accept.xpm
+++ b/lib/images/all-changes-accept.xpm
@@ -1,220 +1,194 @@
 /* XPM */
-static char *all-changes-accept[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 190 2",
-"   c black",
-".  c #000100",
-"X  c #000200",
-"o  c #000300",
-"O  c #000C00",
-"+  c #001300",
-"@  c #001B00",
-"#  c #001C00",
-"$  c #002F00",
-"%  c #003000",
-"&  c #003700",
-"*  c #003800",
-"=  c #003A00",
-"-  c #003E00",
-";  c gray14",
-":  c gray18",
-">  c #004200",
-",  c #004500",
-"<  c #004800",
-"1  c #004900",
-"2  c #004B00",
-"3  c #004C00",
-"4  c #004E00",
-"5  c #004F00",
-"6  c #005000",
-"7  c #005100",
-"8  c #005200",
-"9  c #005300",
-"0  c #005400",
-"q  c #005500",
-"w  c #005600",
-"e  c #005700",
-"r  c #005900",
-"t  c #005A00",
-"y  c #005B00",
-"u  c #005C00",
-"i  c #005D00",
-"p  c #005E00",
-"a  c #005F00",
-"s  c #006000",
-"d  c #006200",
-"f  c #006300",
-"g  c #026002",
-"h  c DarkGreen",
-"j  c #006500",
-"k  c #006600",
-"l  c #076507",
-"z  c #076707",
-"x  c #026802",
-"c  c #036A03",
-"v  c #046A04",
-"b  c #076807",
-"n  c #076907",
-"m  c #066C06",
-"M  c #086208",
-"N  c #086E08",
-"B  c #0C710C",
-"V  c #0D710D",
-"C  c #0D730D",
-"Z  c #0F740F",
-"A  c #146114",
-"S  c #176717",
-"D  c #107410",
-"F  c #107510",
-"G  c #167716",
-"H  c #157815",
-"J  c #197B19",
-"K  c #1A7C1A",
-"L  c #1B7D1B",
-"P  c #1F7B1F",
-"I  c #236F23",
-"U  c #246F24",
-"Y  c #307730",
-"T  c #444444",
-"R  c #454645",
-"E  c gray31",
-"W  c gray32",
-"Q  c #555555",
-"!  c #565656",
-"~  c #5B5B5B",
-"^  c #416B41",
-"/  c #447744",
-"(  c #767676",
-")  c #7E7E7E",
-"_  c #208020",
-"`  c #248324",
-"'  c #278527",
-"]  c #288528",
-"[  c #2C812C",
-"{  c #2D892D",
-"}  c #328C32",
-"|  c #338D33",
-" . c #378B37",
-".. c #348E34",
-"X. c #358F35",
-"o. c #3C843C",
-"O. c #3F883F",
-"+. c #3D8F3D",
-"@. c #478047",
-"#. c #4D864D",
-"$. c #409640",
-"%. c #459A45",
-"&. c #469A46",
-"*. c #4E964E",
-"=. c #489B48",
-"-. c #4B9D4B",
-";. c #4B9E4B",
-":. c #508150",
-">. c #5F8B5F",
-",. c #529652",
-"<. c #5A955A",
-"1. c #5E9E5E",
-"2. c #54A354",
-"3. c #55A455",
-"4. c #5EA95E",
-"5. c #5FAA5F",
-"6. c #688C68",
-"7. c #688F68",
-"8. c #639563",
-"9. c #609960",
-"0. c #799779",
-"q. c #789878",
-"w. c #62AB62",
-"e. c #65AE65",
-"r. c #66AE66",
-"t. c #74A674",
-"y. c #77A477",
-"u. c #7CA57C",
-"i. c #7DA87D",
-"p. c #72B672",
-"a. c #78B978",
-"s. c #79B979",
-"d. c #808080",
-"f. c #848484",
-"g. c #9F9F9F",
-"h. c #8AA38A",
-"j. c #94A794",
-"k. c #91A891",
-"l. c #95AC95",
-"z. c #96AD96",
-"x. c #91B991",
-"c. c #A0A3A0",
-"v. c #ACACAC",
-"b. c gray68",
-"n. c #ABB0AB",
-"m. c #AAB6AA",
-"M. c #ABB7AB",
-"N. c #B3BDB3",
-"B. c #B9BFB9",
-"V. c #83C083",
-"C. c #8AC08A",
-"Z. c #8BC58B",
-"A. c #A8C3A8",
-"S. c #BCC2BC",
-"D. c #BEC2BE",
-"F. c #C4C5C4",
-"G. c #C6CBC6",
-"H. c #CACDCA",
-"J. c gray80",
-"K. c #CDCDCD",
-"L. c #CBD1CB",
-"P. c gray83",
-"I. c #D5D7D5",
-"U. c #D7D7D7",
-"Y. c #D6D8D6",
-"T. c #D8D8D8",
-"R. c gray85",
-"E. c gray86",
-"W. c gainsboro",
-"Q. c #DDDDDD",
-"!. c gray87",
-"~. c gray88",
-"^. c gray89",
-"/. c #E4E4E4",
-"(. c #E7E7E7",
-"). c #EAEAEA",
-"_. c #ECECEC",
-"`. c #EFEFEF",
-"'. c gray94",
-"]. c #F1F1F1",
-"[. c gray95",
-"{. c gray96",
-"}. c #F6F6F6",
-"|. c #F8F8F8",
-" X c #F9F9F9",
-".X c #FBFBFB",
-"XX c #FDFDFD",
-"oX c #FEFEFE",
-"OX c gray100",
-"+X c None",
-/* pixels */
-"+X+X+XOXOXOX'.J.v.f.! ;         X X +X+X+X+XR +X",
-"+X+XOXOX{./.u.$.Y P G V b u 6 $ X X X X ~ ! +X+X",
-"+XOXOX'.Y.,.+.X.} { ` L D m k y < X : ) ( ! +X+X",
-"OXOX'.A.*.$.%.-.%.$.X.` L V v k i ^ j.g.W   +X+X",
-"OX{.I.*.%.3.5.w.w.2.%.X.` G N k 7.K.F.R       +X",
-"OX^.,.$.2.e.p.a.p.e.2.$.{ L V 7.W.R./ -       +X",
-"'.u.+.=.5.p.V.Z.x.p.w.%.} L #.W.(.0.u 5 #       ",
-"K.O.X.-.w.a.C.x.Z.p.w.-.X.o.I.`.B.M u e =       ",
-"n.Y X.=.w.i.D.K.l.p.w.%. .S.`.I.U u u e ,       ",
-"0.P { $.<.n.).|.E.t.3.$.k.`.(.>.k s u e 5       ",
-"W S ` X.%.1.G.{.{.A.=.8.^.'.M.l s s y e 6       ",
-"; D K ` X.$.1.W..X/.y.L.{.W.Y k u y y e 6       ",
-"  b D L ` { } l.'.|.'.|.`.h.k s u y e 6 5       ",
-"  y m V H L _ o.W.OXOX.XT.U k u y e e 6 >       ",
-"  5 k c m B F F M.{.OX).q.s s u y e 6 5 $       ",
-"  $ y k c c c m / ^./.j.S s u y y e 6 1 +       ",
-"    1 s s k k s l v.:.s s u y e 6 6 6 %         ",
-"      5 u s s s u A u u y y e e 6 6 =           ",
-"+X    # 1 y u u y y y y e e 6 6 6 - O         +X",
-"+X        - 5 y e e e e 6 e 5 1 %             +X",
-"+X+X        @ & , 5 6 6 1 > % +             +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+X+X"
-};
+static char * all_changes_accept_xpm[] = {
+"24 24 167 2",
+"  	c None",
+". 	c #3F883F",
+"+ 	c #2C812C",
+"@ 	c #1F7B1F",
+"# 	c #167716",
+"$ 	c #0D710D",
+"% 	c #076807",
+"& 	c #005C00",
+"* 	c #005000",
+"= 	c #529652",
+"- 	c #3D8F3D",
+"; 	c #348E34",
+"> 	c #338D33",
+", 	c #2D892D",
+"' 	c #248324",
+") 	c #1A7C1A",
+"! 	c #107410",
+"~ 	c #066C06",
+"{ 	c #006600",
+"] 	c #005B00",
+"^ 	c #004900",
+"/ 	c #767676",
+"( 	c #4E964E",
+"_ 	c #409640",
+": 	c #489B48",
+"< 	c #4B9E4B",
+"[ 	c #278527",
+"} 	c #0D730D",
+"| 	c #046A04",
+"1 	c #006400",
+"2 	c #026002",
+"3 	c #416B41",
+"4 	c #A0A3A0",
+"5 	c #9F9F9F",
+"6 	c #459A45",
+"7 	c #55A455",
+"8 	c #5FAA5F",
+"9 	c #62AB62",
+"0 	c #54A354",
+"a 	c #469A46",
+"b 	c #157815",
+"c 	c #086E08",
+"d 	c #688C68",
+"e 	c #CACDCA",
+"f 	c #C4C5C4",
+"g 	c #65AE65",
+"h 	c #72B672",
+"i 	c #78B978",
+"j 	c #66AE66",
+"k 	c #1B7D1B",
+"l 	c #0C710C",
+"m 	c #688F68",
+"n 	c #DEDEDE",
+"o 	c #D9D9D9",
+"p 	c #447744",
+"q 	c #003E00",
+"r 	c #83C083",
+"s 	c #8BC58B",
+"t 	c #328C32",
+"u 	c #208020",
+"v 	c #4D864D",
+"w 	c #DCDCDC",
+"x 	c #E7E7E7",
+"y 	c #799779",
+"z 	c #004F00",
+"A 	c #001B00",
+"B 	c #4B9D4B",
+"C 	c #8AC08A",
+"D 	c #91B991",
+"E 	c #79B979",
+"F 	c #3C843C",
+"G 	c #D4D4D4",
+"H 	c #EFEFEF",
+"I 	c #B9BFB9",
+"J 	c #086208",
+"K 	c #005700",
+"L 	c #003800",
+"M 	c #5EA95E",
+"N 	c #7DA87D",
+"O 	c #BEC2BE",
+"P 	c #CDCDCD",
+"Q 	c #96AD96",
+"R 	c #378B37",
+"S 	c #BCC2BC",
+"T 	c #F0F0F0",
+"U 	c #D7D7D7",
+"V 	c #246F24",
+"W 	c #006000",
+"X 	c #004500",
+"Y 	c #5A955A",
+"Z 	c #ABB0AB",
+"` 	c #EAEAEA",
+" .	c #F9F9F9",
+"..	c #DBDBDB",
+"+.	c #77A477",
+"@.	c #91A891",
+"#.	c #ECECEC",
+"$.	c #5F8B5F",
+"%.	c #006300",
+"&.	c #005F00",
+"*.	c #004E00",
+"=.	c #000000",
+"-.	c #5E9E5E",
+";.	c #C6CBC6",
+">.	c #F6F6F6",
+",.	c #F5F5F5",
+"'.	c #B3BDB3",
+").	c #639563",
+"!.	c #E0E0E0",
+"~.	c #F2F2F2",
+"{.	c #ABB7AB",
+"].	c #076707",
+"^.	c #006200",
+"/.	c #005E00",
+"(.	c #005A00",
+"_.	c #005600",
+":.	c #005200",
+"<.	c #197B19",
+"[.	c #288528",
+"}.	c #358F35",
+"|.	c #609960",
+"1.	c #DDDDDD",
+"2.	c #FBFBFB",
+"3.	c #E4E4E4",
+"4.	c #74A674",
+"5.	c #CBD1CB",
+"6.	c #307730",
+"7.	c #005900",
+"8.	c #005500",
+"9.	c #005100",
+"0.	c #076907",
+"a.	c #0F740F",
+"b.	c #95AC95",
+"c.	c #F1F1F1",
+"d.	c #F8F8F8",
+"e.	c #8AA38A",
+"f.	c #006500",
+"g.	c #005300",
+"h.	c #004B00",
+"i.	c #FEFEFE",
+"j.	c #FFFFFF",
+"k.	c #D8D8D8",
+"l.	c #236F23",
+"m.	c #004200",
+"n.	c #036A03",
+"o.	c #107510",
+"p.	c #AAB6AA",
+"q.	c #FDFDFD",
+"r.	c #789878",
+"s.	c #005D00",
+"t.	c #003000",
+"u.	c #026802",
+"v.	c #478047",
+"w.	c #94A794",
+"x.	c #176717",
+"y.	c #005400",
+"z.	c #004800",
+"A.	c #001300",
+"B.	c #076507",
+"C.	c #ACACAC",
+"D.	c #508150",
+"E.	c #004C00",
+"F.	c #146114",
+"G.	c #003A00",
+"H.	c #000100",
+"I.	c #000C00",
+"J.	c #003700",
+"                                                ",
+"              . + @ # $ % & *                   ",
+"          = - ; > , ' ) ! ~ { ] ^       /       ",
+"        ( _ : < : _ ; [ ) } | 1 2 3 4 5         ",
+"      ( 6 7 8 9 8 0 a ; ' b c { d e f           ",
+"    = _ 0 g h i h j 0 _ , k l m n o p q         ",
+"    - : 8 h r s r h 8 : t u v w x y & z A       ",
+"  . ; B 9 i C D s E 9 B ; F G H I J & K L       ",
+"  + > : M N O P Q h 8 : R S T U V W ] K X       ",
+"  @ , _ Y Z `  ...+.0 _ @.#.x $.%.&.] K *.=.    ",
+"  # ' ; 6 -.;.>.,.'.6 ).!.~.{.].^./.(._.:.=.    ",
+"  $ <.[.}._ |.1.2.3.4.5.,.w 6.1 W & 7.8.9.=.    ",
+"  0.a.<.' , > b.c. .~.d.T e.f.^./.] K g.h.=.    ",
+"  & ~ } b k u F w i.j.2.k.l.%.W & 7.8.:.m.=.    ",
+"  * { n.c l a.o.p.>.q.` r.%.W s.(._.g.* t.=.    ",
+"    ] 1 { u.n.| v.!.3.w.x.W s.(.K y.:.z.A.      ",
+"    ^ W ^.%.1 1 B.C.D.W /.& (.K y.:.* t.=.      ",
+"      E./.&.W W &.F./.& ] 7.K y.:.* G.H.        ",
+"        ^ ] & & & ] (.7.K 8.g.9.* G.I.          ",
+"          q z K K K _.8.y.:.* z.t.H.            ",
+"            A J.X *.9.9.h.m.t.A.=.              ",
+"                  =.=.=.=.=.=.                  ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/all-changes-reject.xpm b/lib/images/all-changes-reject.xpm
index 27ad3c89d5..6226fcecfa 100644
--- a/lib/images/all-changes-reject.xpm
+++ b/lib/images/all-changes-reject.xpm
@@ -1,207 +1,188 @@
 /* XPM */
-static char *all-changes-reject[] = {
-/* columns rows colors chars-per-pixel */
-"24 24 177 2",
-"   c black",
-".  c #010000",
-"X  c #020000",
-"o  c #040000",
-"O  c #110000",
-"+  c #190000",
-"@  c #250000",
-"#  c #260000",
-"$  c gray14",
-"%  c #420000",
-"&  c #430000",
-"*  c #4D0000",
-"=  c #4E0000",
-"-  c #500000",
-";  c #560000",
-":  c #5B0000",
-">  c #600000",
-",  c #640000",
-"<  c #650000",
-"1  c #680000",
-"2  c #690000",
-"3  c #6B0000",
-"4  c #6E0000",
-"5  c #6F0000",
-"6  c #700000",
-"7  c #710000",
-"8  c #740000",
-"9  c #750000",
-"0  c #760000",
-"q  c #770000",
-"w  c #780000",
-"e  c #790000",
-"r  c #7B0000",
-"t  c #7C0000",
-"y  c #7D0000",
-"u  c #7E0000",
-"i  c #7F0000",
-"p  c #555555",
-"a  c #800000",
-"s  c #820000",
-"d  c #830000",
-"f  c #840000",
-"g  c #850000",
-"h  c #880000",
-"j  c #890000",
-"k  c #8B0000",
-"l  c #8D0000",
-"z  c #8F0707",
-"x  c #8F0A0A",
-"c  c #871616",
-"v  c #891A1A",
-"b  c #8D1B1B",
-"n  c #900202",
-"m  c #910303",
-"M  c #910404",
-"N  c #930606",
-"B  c #900B0B",
-"V  c #960808",
-"C  c #950F0F",
-"Z  c #980D0D",
-"A  c #990C0C",
-"S  c #9A0D0D",
-"D  c #9A0F0F",
-"F  c #9A1010",
-"G  c #981414",
-"H  c #9E1515",
-"J  c #9F1515",
-"K  c #9E1616",
-"L  c #9D1D1D",
-"P  c #9F1F1F",
-"I  c #822121",
-"U  c #912626",
-"Y  c #992B2B",
-"T  c #923939",
-"R  c #9F3F3F",
-"E  c #A11919",
-"W  c #A21A1A",
-"Q  c #A31B1B",
-"!  c #A72424",
-"~  c #A12C2C",
-"^  c #AA2727",
-"/  c #AA2828",
-"(  c #AC2D2D",
-")  c #AD2D2D",
-"_  c #A43F3F",
-"`  c #AE3D3D",
-"'  c #B03232",
-"]  c #B03333",
-"[  c #B13434",
-"{  c #B13535",
-"}  c #834343",
-"|  c #9F4848",
-" . c #9D6868",
-".. c #AC4646",
-"X. c #A15656",
-"o. c #B74040",
-"O. c #B34E4E",
-"+. c #BA4545",
-"@. c #BB4646",
-"#. c #BB4848",
-"$. c #B84F4F",
-"%. c #BC4B4B",
-"&. c #BD4B4B",
-"*. c #B05252",
-"=. c #B55858",
-"-. c #A47272",
-";. c #A67171",
-":. c #AF7272",
-">. c #BE6767",
-",. c #BF6A6A",
-"<. c #B67575",
-"1. c #B57C7C",
-"2. c #C15454",
-"3. c #C25555",
-"4. c #C65E5E",
-"5. c #C75F5F",
-"6. c #C46464",
-"7. c #C86262",
-"8. c #C96565",
-"9. c #CD7878",
-"0. c #D07272",
-"q. c #D27878",
-"w. c #808080",
-"e. c #848484",
-"r. c #A98686",
-"t. c #A98E8E",
-"y. c #A99090",
-"u. c #BC8181",
-"i. c #B39494",
-"p. c #B49999",
-"a. c #BF9696",
-"s. c gray68",
-"d. c #B7A6A6",
-"f. c #BBA1A1",
-"g. c #BDA3A3",
-"h. c #BAA8A8",
-"j. c #B4B4B4",
-"k. c #B9B9B9",
-"l. c #C98C8C",
-"z. c #C19595",
-"x. c #C59898",
-"c. c #D88383",
-"v. c #D88484",
-"b. c #DC8C8C",
-"n. c #CEA8A8",
-"m. c #C4B8B8",
-"M. c #C9BEBE",
-"N. c gray77",
-"B. c #CBC2C2",
-"V. c #CBC3C3",
-"C. c gray80",
-"Z. c #D5C5C5",
-"A. c #D2D2D2",
-"S. c #D8D5D5",
-"D. c #D9D6D6",
-"F. c #DDD6D6",
-"G. c #D8D8D8",
-"H. c gray87",
-"J. c #E1E1E1",
-"K. c gray89",
-"L. c gray90",
-"P. c #E7E7E7",
-"I. c gray91",
-"U. c #EAEAEA",
-"Y. c gray92",
-"T. c #EEEEEE",
-"R. c #EFEFEF",
-"E. c gray94",
-"W. c #F1F1F1",
-"Q. c gray95",
-"!. c #F3F3F3",
-"~. c gray96",
-"^. c gray99",
-"/. c #FDFDFD",
-"(. c #FEFEFE",
-"). c gray100",
-"_. c None",
-/* pixels */
-"_._._.).).).E.C.s.e.p $             _._._._._._.",
-"_._.).).~.K.1._ ~ Q J C z i 5 %         _._._._.",
-"_.).).E.F.*.` { { ( ! W F M l i < o       _._._.",
-").).E.n.$.` &.&.#.o.{ / W S M k g 2 #       _._.",
-").~.S.O.+.$.5.7.7.3.+.{ ! J V l k a ,         _.",
-").K.*.o.3.8.0.q.<.6.$.o.( Q S m k a i ;       _.",
-"E.1.` #.7.0.v.l.k.u.4.+.' X.r.T k g a 5 #       ",
-"C...' #.7.q.b.h.K.B.6.$.i.H.K.j.c g a e *       ",
-"s./ ) 2.5.0.v.a.K.I.x.a.L.I.g.U k g i e :       ",
-"w.Q ) ` $.7.0.9.m.R.R.R.I.f.G m k g i q 5       ",
-"p J ! [ &.3.5.7.,.F.).^.Z.L V l g a e q 5       ",
-"$ S W ) { ` @.$.=.F.).).L.| M l g i i q 5       ",
-"  x S W ! / { ..V.T.R.I.E.H.;.v a a e q 2       ",
-"  i M S H Y ;.G.!.L.:.| V.R.I.N.} e q 5 :       ",
-"  5 l M V A t.K.L.p.C M b d.A.y.i q q 5 &       ",
-"  % i l l m B  . .B l k k g I i e q 5 < +       ",
-"    < g k k k k k k g g g a e e q 5 5 &         ",
-"    o 2 a a g g g a a a i i e q 5 5 -           ",
-"_.    # , i i i i i i e q e q 5 5 - O         _.",
-"_.        ; 5 e e e q q 5 5 5 , &             _.",
-"_._.        # * , 2 5 5 2 : % +             _._.",
-"_._._.                                    _._._.",
-"_._._._.                                _._._._.",
-"_._._._._._.                        _._._._._._."
-};
+static char * all_changes_reject_xpm[] = {
+"24 24 161 2",
+"  	c None",
+". 	c #A43F3F",
+"+ 	c #A12C2C",
+"@ 	c #9F1F1F",
+"# 	c #9E1616",
+"$ 	c #980D0D",
+"% 	c #8F0707",
+"& 	c #7F0000",
+"* 	c #6F0000",
+"= 	c #B05252",
+"- 	c #AE3D3D",
+"; 	c #B13434",
+"> 	c #B03333",
+", 	c #AD2D2D",
+"' 	c #A72424",
+") 	c #A21A1A",
+"! 	c #9A1010",
+"~ 	c #930606",
+"{ 	c #8D0000",
+"] 	c #7E0000",
+"^ 	c #650000",
+"/ 	c #B34E4E",
+"( 	c #B74040",
+"_ 	c #BB4848",
+": 	c #BD4B4B",
+"< 	c #AA2727",
+"[ 	c #9A0D0D",
+"} 	c #910404",
+"| 	c #8B0000",
+"1 	c #850000",
+"2 	c #690000",
+"3 	c #BA4545",
+"4 	c #C25555",
+"5 	c #C75F5F",
+"6 	c #C86262",
+"7 	c #C15454",
+"8 	c #BB4646",
+"9 	c #9F1515",
+"0 	c #960808",
+"a 	c #880000",
+"b 	c #820000",
+"c 	c #640000",
+"d 	c #C96565",
+"e 	c #D07272",
+"f 	c #D27878",
+"g 	c #B67575",
+"h 	c #BE6767",
+"i 	c #AC2D2D",
+"j 	c #A31B1B",
+"k 	c #990C0C",
+"l 	c #900202",
+"m 	c #890000",
+"n 	c #830000",
+"o 	c #560000",
+"p 	c #D88383",
+"q 	c #C98C8C",
+"r 	c #B9B9B9",
+"s 	c #BC8181",
+"t 	c #B03232",
+"u 	c #A15656",
+"v 	c #A98686",
+"w 	c #923939",
+"x 	c #840000",
+"y 	c #6E0000",
+"z 	c #250000",
+"A 	c #BC4B4B",
+"B 	c #DC8C8C",
+"C 	c #BAA8A8",
+"D 	c #E3E3E3",
+"E 	c #C9BEBE",
+"F 	c #C46464",
+"G 	c #B84F4F",
+"H 	c #B39494",
+"I 	c #DEDEDE",
+"J 	c #E1E1E1",
+"K 	c #B4B4B4",
+"L 	c #871616",
+"M 	c #790000",
+"N 	c #4E0000",
+"O 	c #C65E5E",
+"P 	c #D88484",
+"Q 	c #BF9696",
+"R 	c #E8E8E8",
+"S 	c #C59898",
+"T 	c #C19595",
+"U 	c #E5E5E5",
+"V 	c #EAEAEA",
+"W 	c #BDA3A3",
+"X 	c #912626",
+"Y 	c #600000",
+"Z 	c #CD7878",
+"` 	c #C4B8B8",
+" .	c #EEEEEE",
+"..	c #F1F1F1",
+"+.	c #BBA1A1",
+"@.	c #981414",
+"#.	c #6B0000",
+"$.	c #000000",
+"%.	c #BF6A6A",
+"&.	c #DDD6D6",
+"*.	c #FDFDFD",
+"=.	c #FCFCFC",
+"-.	c #D5C5C5",
+";.	c #9D1D1D",
+">.	c #7C0000",
+",.	c #770000",
+"'.	c #710000",
+").	c #A11919",
+"!.	c #AA2828",
+"~.	c #B13535",
+"{.	c #B55858",
+"].	c #FEFEFE",
+"^.	c #9F4848",
+"/.	c #910303",
+"(.	c #800000",
+"_.	c #7B0000",
+":.	c #760000",
+"<.	c #700000",
+"[.	c #9A0F0F",
+"}.	c #AC4646",
+"|.	c #CBC3C3",
+"1.	c #EFEFEF",
+"2.	c #EBEBEB",
+"3.	c #F0F0F0",
+"4.	c #A67171",
+"5.	c #891A1A",
+"6.	c #740000",
+"7.	c #680000",
+"8.	c #9E1515",
+"9.	c #992B2B",
+"0.	c #A47272",
+"a.	c #D8D8D8",
+"b.	c #F3F3F3",
+"c.	c #E7E7E7",
+"d.	c #AF7272",
+"e.	c #9F3F3F",
+"f.	c #CBC2C2",
+"g.	c #C4C4C4",
+"h.	c #834343",
+"i.	c #5B0000",
+"j.	c #A98E8E",
+"k.	c #B49999",
+"l.	c #950F0F",
+"m.	c #8D1B1B",
+"n.	c #B7A6A6",
+"o.	c #D2D2D2",
+"p.	c #A99090",
+"q.	c #7D0000",
+"r.	c #780000",
+"s.	c #430000",
+"t.	c #900B0B",
+"u.	c #9D6868",
+"v.	c #8F0A0A",
+"w.	c #822121",
+"x.	c #750000",
+"y.	c #190000",
+"z.	c #420000",
+"A.	c #500000",
+"B.	c #010000",
+"C.	c #110000",
+"D.	c #4D0000",
+"                                                ",
+"              . + @ # $ % & *                   ",
+"          = - ; > , ' ) ! ~ { ] ^               ",
+"        / ( _ : _ ( ; < ) [ } | 1 2             ",
+"      / 3 4 5 6 5 7 8 ; ' 9 0 { a b c           ",
+"    = ( 7 d e f g h 7 ( i j k l m n ] o         ",
+"    - _ 5 e p q r s 5 _ t u v w | x & y z       ",
+"  . ; A 6 f B C D E F G H I J K L 1 & M N       ",
+"  + > _ O e P Q D R S T U V W X | 1 ] M Y       ",
+"  @ i ( 7 d e Z `  .....V +.@.l m n ] M #.$.    ",
+"  # ' ; 3 7 5 6 %.&.*.=.-.;.0 { a b >.,.'.$.    ",
+"  $ ).!.~.( _ A {.&.*.].U ^./.| 1 (._.:.<.$.    ",
+"  % [.).' i > }.|.1. .2.3.I 4.5.n ] M 6.7.$.    ",
+"  & ~ [ 8.9.0.a.b.c.d.e.f. .2.g.h._.:.'.i.$.    ",
+"  * { /.0 k j.J U k.l.} m.n.o.p.q.r.6.* s.$.    ",
+"    ] | { l t.u.u.v.{ | a 1 w.q.M x.'.c y.      ",
+"    ^ 1 a m | | | m a 1 n (.>.M x.'.* z.$.      ",
+"      2 b n 1 1 x n b (.] _.M x.'.* A.B.        ",
+"        c ] & & & ] >._.M :.6.'.* A.C.          ",
+"          o y M M M ,.:.6.'.* c z.B.            ",
+"            z D.Y #.'.<.7.i.s.y.$.              ",
+"                  $.$.$.$.$.$.                  ",
+"                                                ",
+"                                                "};
diff --git a/lib/images/change-accept.xpm b/lib/images/change-accept.xpm
index d7a0b282c6..5626309443 100644
--- a/lib/images/change-accept.xpm
+++ b/lib/images/change-accept.xpm
@@ -1,30 +1,27 @@
 /* XPM */
-static char *changes-accept[] = {
-/* columns rows colors chars-per-pixel */
+static char * changes_accept_xpm[] = {
 "20 20 4 1",
-"  c black",
-". c #00C000",
-"X c green",
-"o c None",
-/* pixels */
-"oooooooooooooooooooo",
-"oooooooooooooooooooo",
-"ooooooooooooooo  ooo",
-"oooooooooooooo . ooo",
-"ooooooooooooo X oooo",
-"ooooooooooooo . oooo",
-"oooooooooooo . ooooo",
-"ooooooooooo X. ooooo",
-"oooo  ooooo X oooooo",
-"ooo X oooo X. oooooo",
-"ooo XX oo X. ooooooo",
-"ooo X.X o X. ooooooo",
-"ooo X... X. oooooooo",
-"oooo ...... oooooooo",
-"ooooo ..... oooooooo",
-"oooooo .... oooooooo",
-"ooooooo .. ooooooooo",
-"oooooooo  oooooooooo",
-"oooooooooooooooooooo",
-"oooooooooooooooooooo"
-};
+" 	c None",
+".	c #000000",
+"+	c #00C000",
+"@	c #00FF00",
+"                    ",
+"                    ",
+"               ..   ",
+"              .+.   ",
+"             .@.    ",
+"             .+.    ",
+"            .+.     ",
+"           .@+.     ",
+"    ..     .@.      ",
+"   .@.    .@+.      ",
+"   .@@.  .@+.       ",
+"   .@+@. .@+.       ",
+"   .@+++.@+.        ",
+"    .++++++.        ",
+"     .+++++.        ",
+"      .++++.        ",
+"       .++.         ",
+"        ..          ",
+"                    ",
+"                    "};
diff --git a/lib/images/change-next.xpm b/lib/images/change-next.xpm
index edf0fb2e7b..2fb39bad9b 100644
--- a/lib/images/change-next.xpm
+++ b/lib/images/change-next.xpm
@@ -1,52 +1,49 @@
 /* XPM */
-static char *changes-next[] = {
-/* columns rows colors chars-per-pixel */
+static char * changes_next_xpm[] = {
 "24 24 22 1",
-"  c black",
-". c gray32",
-"X c gray37",
-"o c gray40",
-"O c #676767",
-"+ c DimGray",
-"@ c #888888",
-"# c #A5A5A5",
-"$ c #AAAAAA",
-"% c #ACACAC",
-"& c #AEAEAE",
-"* c gray79",
-"= c #E6E6E6",
-"- c gray94",
-"; c #F3F3F3",
-": c #F6F6F6",
-"> c #F9F9F9",
-", c gray98",
-"< c gray99",
-"1 c #FDFDFD",
-"2 c gray100",
-"3 c None",
-/* pixels */
-"333333333333333333333333",
-"333333333333333333333333",
-"33     33333        2333",
-"3                   2333",
-"   =        ,22222222333",
-"  =&:                 23",
-" *&O&:  =   ;22222222223",
-"  O&O$*=$       23333333",
-"   O&O@#O   ;22223333333",
-"    .&XXO          23333",
-"    =@++O   -22222223333",
-"   =$OOOO     3333333333",
-"                      23",
-"                      23",
-"            ,22222222223",
-"                23333333",
-"33         3222223333333",
-"333333333333      233333",
-"333333333333222222233333",
-"333333333333        2333",
-"333333333333222222222333",
-"333333333333333333333333",
-"333333333333333333333333",
-"333333333333333333333333"
-};
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #E6E6E6",
+"#	c #FAFAFA",
+"$	c #AEAEAE",
+"%	c #F6F6F6",
+"&	c #C9C9C9",
+"*	c #666666",
+"=	c #ACACAC",
+"-	c #F3F3F3",
+";	c #FDFDFD",
+">	c #676767",
+",	c #AAAAAA",
+"'	c #888888",
+")	c #A5A5A5",
+"!	c #F0F0F0",
+"~	c #525252",
+"{	c #5E5E5E",
+"]	c #696969",
+"^	c #FCFCFC",
+"/	c #F9F9F9",
+"                        ",
+"                        ",
+"            ........+   ",
+"   .        ........+   ",
+"  .@.    .  #++++++++   ",
+" .@$%.  ..  ..........+ ",
+".&$*=%..@.  -;+++++++++ ",
+" .>$*=&@,.  ....+       ",
+"  .>$*')>.  !;+++       ",
+"   .~${{>.  .......+    ",
+"   .@']]>.  !^++++++    ",
+"  .@,>>>>.              ",
+" .........  ..........+ ",
+"            ..........+ ",
+"            /++++++++++ ",
+"            ....+       ",
+"            +++++       ",
+"            ......+     ",
+"            +++++++     ",
+"            ........+   ",
+"            +++++++++   ",
+"                        ",
+"                        ",
+"                        "};
diff --git a/lib/images/change-reject.xpm b/lib/images/change-reject.xpm
index 8f1c2d7854..b0017e118c 100644
--- a/lib/images/change-reject.xpm
+++ b/lib/images/change-reject.xpm
@@ -1,30 +1,27 @@
 /* XPM */
-static char *changes-reject[] = {
-/* columns rows colors chars-per-pixel */
+static char * changes_reject_xpm[] = {
 "20 20 4 1",
-"  c black",
-". c #C00000",
-"X c red",
-"o c None",
-/* pixels */
-"oooooooooooooooooooo",
-"oooooooooooooooooooo",
-"oooooooooooooooooooo",
-"oooooooooooooooooooo",
-"ooooo  oooooo  ooooo",
-"oooo X ooooo XX oooo",
-"oooo XX ooo X.. oooo",
-"oooo X.X o X.  ooooo",
-"oooo X... X. ooooooo",
-"ooooo ...X. oooooooo",
-"oooooo .... oooooooo",
-"oooooo X.... ooooooo",
-"ooooo X. .... oooooo",
-"oooo X. o ....  oooo",
-"oooo X ooo .... oooo",
-"oooo . oooo    ooooo",
-"ooooo oooooooooooooo",
-"oooooooooooooooooooo",
-"oooooooooooooooooooo",
-"oooooooooooooooooooo"
-};
+" 	c None",
+".	c #000000",
+"+	c #FF0000",
+"@	c #C00000",
+"                    ",
+"                    ",
+"                    ",
+"                    ",
+"     ..      ..     ",
+"    .+.     .++.    ",
+"    .++.   .+@@.    ",
+"    .+@+. .+@..     ",
+"    .+@@@.+@.       ",
+"     .@@@+@.        ",
+"      .@@@@.        ",
+"      .+@@@@.       ",
+"     .+@.@@@@.      ",
+"    .+@. .@@@@..    ",
+"    .+.   .@@@@.    ",
+"    .@.    ....     ",
+"     .              ",
+"                    ",
+"                    ",
+"                    "};
diff --git a/lib/images/changes-merge.xpm b/lib/images/changes-merge.xpm
index 1fc93082e2..2e94731518 100644
--- a/lib/images/changes-merge.xpm
+++ b/lib/images/changes-merge.xpm
@@ -1,45 +1,38 @@
 /* XPM */
-static char *changes-merge[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 17 1",
-"  c black",
-". c #00173B",
-"X c #00153D",
-"o c gray19",
-"O c #353535",
-"+ c #00286B",
-"@ c #484848",
-"# c gray32",
-"$ c #4A9627",
-"% c #44825D",
-"& c #B82A2A",
-"* c #E5C9A0",
-"= c #EBDAC0",
-"- c #F3EAE0",
-"; c #FBF9F6",
-": c gray100",
-"> c None",
-/* pixels */
-">>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>",
-">#################@O>>",
-">#&&&&&&&&&&&&&&&&& >>",
-">#&&&&&&&&&&&&&&&&& >>",
-">@&&&&&&&&&&&&&&&&& >>",
-">o                  >>",
-">>>>>>>>>>>>>>>>>>>>>>",
-">#################@O>>",
-">#:;:;:;:;:;:;:;:;- >>",
-">#:-:-:-:-:-:-:-:-= >>",
-">@-=-=-=-=-=-=-=-=* >>",
-">o                  >>",
-">>>>>>>>>>>>>>>>>>>>>>",
-">#################@O>>",
-">#$$$$$$$$$$$$$$$$$ >>",
-">#$$$$$$$$$$$$$$$$$ >>",
-">@$$$$$$$$$$$$$$$$$ >>",
-">o                  >>",
-">>>>>>>>>>>>>>>>>>>>>>",
-">>>>>>>>>>>>>>>>>>>>>>"
-};
+static char * changes_merge_xpm[] = {
+"22 22 13 1",
+" 	c None",
+".	c #525252",
+"+	c #484848",
+"@	c #353535",
+"#	c #B82A2A",
+"$	c #000000",
+"%	c #303030",
+"&	c #FFFFFF",
+"*	c #FBF9F6",
+"=	c #F3EAE0",
+"-	c #EBDAC0",
+";	c #E5C9A0",
+">	c #4A9627",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"  .................+@ ",
+"  .#################$ ",
+"  .#################$ ",
+"  +#################$ ",
+"  %$$$$$$$$$$$$$$$$$$ ",
+"                      ",
+"  .................+@ ",
+"  .&*&*&*&*&*&*&*&*=$ ",
+"  .&=&=&=&=&=&=&=&=-$ ",
+"  +=-=-=-=-=-=-=-=-;$ ",
+"  %$$$$$$$$$$$$$$$$$$ ",
+"                      ",
+"  .................+@ ",
+"  .>>>>>>>>>>>>>>>>>$ ",
+"  .>>>>>>>>>>>>>>>>>$ ",
+"  +>>>>>>>>>>>>>>>>>$ ",
+"  %$$$$$$$$$$$$$$$$$$ ",
+"                      "};
diff --git a/lib/images/changes-output.xpm b/lib/images/changes-output.xpm
index 6404ad5c26..47e240e5c6 100644
--- a/lib/images/changes-output.xpm
+++ b/lib/images/changes-output.xpm
@@ -1,43 +1,39 @@
 /* XPM */
-static char *changes-output[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 15 1",
-"  c black",
-". c gray19",
-"X c #400000",
-"o c #800000",
-"O c #C00000",
-"+ c #CC0000",
-"@ c red",
-"# c #808080",
-"$ c #AAAAAA",
-"% c gray75",
-"& c #FF8080",
-"* c #C8C8C8",
-"= c gainsboro",
-"- c gray100",
-"; c None",
-/* pixels */
-";;;;;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;; @&++;",
-";;;;;;;;;;;;;;; @&+++;",
-";;;;;;;;;;;;;; @&+++o;",
-";;;;;;;;;;;;; @&+++oo;",
-";            @&+++oo ;",
-"; ---- ---- @&+++oo ;;",
-"; ---- --- @&+++oo ;;;",
-";         @&+++oo ;;;;",
-"; ---- - @&+++oo ;;;;;",
-"; ----  @&+++oo  ;;;;;",
-";      -*+++oo   ;;;;;",
-"; ----=-=*+oo -- ;;;;;",
-"; -----=**#o --- ;;;;;",
-";    -=*$#.      ;;;;;",
-"; ---O*$. - ---- ;;;;;",
-"; --OoX --- ---- ;;;;;",
-";   oX           ;%;;;",
-"; ---- ---- ---- ;;;;;",
-"; ---- ---- ---- ;;;;;",
-";                ;;;;;",
-";;;;;;;;;;;;;;;;;;;;;;"
-};
+static char * changes_output_xpm[] = {
+"22 22 14 1",
+" 	c None",
+".	c #000000",
+"+	c #FF0000",
+"@	c #FF8080",
+"#	c #CC0000",
+"$	c #800000",
+"%	c #FFFFFF",
+"&	c #C8C8C8",
+"*	c #DCDCDC",
+"=	c #808080",
+"-	c #AAAAAA",
+";	c #303030",
+">	c #C00000",
+",	c #400000",
+"                      ",
+"                .+@## ",
+"               .+@### ",
+"              .+@###$ ",
+"             .+@###$$ ",
+" ............+@###$$. ",
+" .%%%%.%%%%.+@###$$.  ",
+" .%%%%.%%%.+@###$$.   ",
+" .........+@###$$.    ",
+" .%%%%.%.+@###$$.     ",
+" .%%%%..+@###$$..     ",
+" ......%&###$$...     ",
+" .%%%%*%*&#$$.%%.     ",
+" .%%%%%*&&=$.%%%.     ",
+" ....%*&-=;......     ",
+" .%%%>&-;.%.%%%%.     ",
+" .%%>$,.%%%.%%%%.     ",
+" ...$,...........     ",
+" .%%%%.%%%%.%%%%.     ",
+" .%%%%.%%%%.%%%%.     ",
+" ................     ",
+"                      "};
diff --git a/lib/images/changes-track.xpm b/lib/images/changes-track.xpm
index d0af1e2def..0c691adddf 100644
--- a/lib/images/changes-track.xpm
+++ b/lib/images/changes-track.xpm
@@ -1,43 +1,39 @@
 /* XPM */
-static char *changes-track[] = {
-/* columns rows colors chars-per-pixel */
-"22 22 15 1",
-"  c black",
-". c gray19",
-"X c #400000",
-"o c #800000",
-"O c #C00000",
-"+ c #CC0000",
-"@ c red",
-"# c #808080",
-"$ c #AAAAAA",
-"% c #FF8080",
-"& c #C8C8C8",
-"* c gainsboro",
-"= c #FFC0C0",
-"- c gray100",
-"; c None",
-/* pixels */
-";;;;;;;;;;;;;;;;;;o@%O",
-";;;;;;;;;;;;;;;;;oO=OO",
-";;;;;;;;;;;;;;;;oO=OOO",
-";;;;;;;;;;;;;;;oO=OOOo",
-";;;;;;;;;;;;;;oO=OOOoo",
-";;;;;;;;;;;;;oO=OOOoo ",
-";;;;;;;;;;;;oO=OOOoo ;",
-";;;;;;;;;;;oO=OOOoo ;;",
-";;;;;;;;;;oO=OOOoo ;;;",
-";;;;;;;;;oO=OOOoo ;;;;",
-";;;;;;;;oO=OOOoo ;;;;;",
-";;;;;;;oO=OOOoo ;;;;;;",
-";;;;;;oO=OOOoo ;;;;;;;",
-";;;;;oO=OOOoo ;;;;;;;;",
-";;;;;-&OOOoo ;;;;;;;;;",
-";;;;*-*&Ooo ;;;;;;;;;;",
-";;;;-*&&#o ;;;;;;;;;;;",
-";;;-*&$#. ;;;;;;;;;;;;",
-";;;O&$. ;;;;;;;;;;;;;;",
-";;OoX ;;;;;;;;;;;;;;;;",
-";;oX;;;;;;;;;;;;;;;;;;",
-";;;;;;;;;;;;;;;;;;;;;;"
-};
+static char * changes_track_xpm[] = {
+"22 22 14 1",
+" 	c None",
+".	c #800000",
+"+	c #FF0000",
+"@	c #FF8080",
+"#	c #C00000",
+"$	c #FFC0C0",
+"%	c #000000",
+"&	c #FFFFFF",
+"*	c #C8C8C8",
+"=	c #DCDCDC",
+"-	c #808080",
+";	c #AAAAAA",
+">	c #303030",
+",	c #400000",
+"                  .+@#",
+"                 .#$##",
+"                .#$###",
+"               .#$###.",
+"              .#$###..",
+"             .#$###..%",
+"            .#$###..% ",
+"           .#$###..%  ",
+"          .#$###..%   ",
+"         .#$###..%    ",
+"        .#$###..%     ",
+"       .#$###..%      ",
+"      .#$###..%       ",
+"     .#$###..%        ",
+"     &*###..%         ",
+"    =&=*#..%          ",
+"    &=**-.%           ",
+"   &=*;->%            ",
+"   #*;>%              ",
+"  #.,%                ",
+"  .,                  ",
+"                      "};
diff --git a/lib/images/note-next.xpm b/lib/images/note-next.xpm
new file mode 100644
index 0000000000..a38f32cc7b
--- /dev/null
+++ b/lib/images/note-next.xpm
@@ -0,0 +1,85 @@
+/* XPM */
+static char * note_next_xpm[] = {
+"24 24 58 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"@	c #E6E6E6",
+"#	c #FAFAFA",
+"$	c #AEAEAE",
+"%	c #F6F6F6",
+"&	c #C9C9C9",
+"*	c #666666",
+"=	c #ACACAC",
+"-	c #F3F3F3",
+";	c #FDFDFD",
+">	c #676767",
+",	c #AAAAAA",
+"'	c #888888",
+")	c #A5A5A5",
+"!	c #F0F0F0",
+"~	c #525252",
+"{	c #5E5E5E",
+"]	c #696969",
+"^	c #FCFCFC",
+"/	c #1E1E1E",
+"(	c #D1D17E",
+"_	c #FFFF76",
+":	c #FFFF8F",
+"<	c #FFFF7C",
+"[	c #FFFF70",
+"}	c #FFFF83",
+"|	c #FFFF89",
+"1	c #D1D152",
+"2	c #444444",
+"3	c #D1D143",
+"4	c #DDDD8F",
+"5	c #D1D18D",
+"6	c #333333",
+"7	c #D1D170",
+"8	c #D5D57C",
+"9	c #FFFF75",
+"0	c #D1D161",
+"a	c #E6E670",
+"b	c #E6E683",
+"c	c #F7F770",
+"d	c #E8E852",
+"e	c #E4E48D",
+"f	c #DBDB61",
+"g	c #E8E843",
+"h	c #DDDD9A",
+"i	c #FFFF85",
+"j	c #FFFF65",
+"k	c #91911B",
+"l	c #A2A267",
+"m	c #A2A22C",
+"n	c #A2A259",
+"o	c #A2A276",
+"p	c #A2A24A",
+"q	c #A2A23B",
+"r	c #8E8E7E",
+"s	c #3E3E3E",
+"                        ",
+"                        ",
+"            ........+   ",
+"   .        ........+   ",
+"  .@.    .  #++++++++   ",
+" .@$%.  ..  ..........+ ",
+".&$*=%..@.  -;+++++++++ ",
+" .>$*=&@,.  ....+       ",
+"  .>$*')>.  !;+++       ",
+"   .~${{>.  .......+    ",
+"   .@']]>.  !^++++++    ",
+"  .@,>>>>.              ",
+" ......... .........../ ",
+"          .(__:<[:}[||12",
+"          .34........[56",
+"          .7899999999}0.",
+"          .5a.......9:3.",
+"          .399999999[[5.",
+"          .0b........<7.",
+"          .5cdefghij::3.",
+"          .kllmnompoqqrs",
+"                        ",
+"                        ",
+"                        "};