22 files changed, 33 insertions, 36 deletions

diff --git a/lisp/toolbar/attach.pbm b/lisp/toolbar/attach.pbm
index bdcc5f4ef94..e8fcd988f0c 100644
--- a/lisp/toolbar/attach.pbm
+++ b/lisp/toolbar/attach.pbm
diff --git a/lisp/toolbar/cancel.pbm b/lisp/toolbar/cancel.pbm
index 2b741503d89..bd85b764c27 100644
--- a/lisp/toolbar/cancel.pbm
+++ b/lisp/toolbar/cancel.pbm
diff --git a/lisp/toolbar/copy.pbm b/lisp/toolbar/copy.pbm
index 65841733072..155be369266 100644
--- a/lisp/toolbar/copy.pbm
+++ b/lisp/toolbar/copy.pbm
diff --git a/lisp/toolbar/exit.pbm b/lisp/toolbar/exit.pbm
index 0002b2b2b7e..a6dd11e7769 100644
--- a/lisp/toolbar/exit.pbm
+++ b/lisp/toolbar/exit.pbm
diff --git a/lisp/toolbar/fld_open.pbm b/lisp/toolbar/fld_open.pbm
index 8fe11dd3b5d..3d2be258a67 100644
--- a/lisp/toolbar/fld_open.pbm
+++ b/lisp/toolbar/fld_open.pbm
diff --git a/lisp/toolbar/help.pbm b/lisp/toolbar/help.pbm
index 68bae42965b..562cc6137b5 100644
--- a/lisp/toolbar/help.pbm
+++ b/lisp/toolbar/help.pbm
diff --git a/lisp/toolbar/home.pbm b/lisp/toolbar/home.pbm
index 265fce6a427..117955f2a74 100644
--- a/lisp/toolbar/home.pbm
+++ b/lisp/toolbar/home.pbm
diff --git a/lisp/toolbar/index.pbm b/lisp/toolbar/index.pbm
index 020a2306880..5411d49f071 100644
--- a/lisp/toolbar/index.pbm
+++ b/lisp/toolbar/index.pbm
diff --git a/lisp/toolbar/jump_to.pbm b/lisp/toolbar/jump_to.pbm
index f7fd7fff836..effcdcc8bfd 100644
--- a/lisp/toolbar/jump_to.pbm
+++ b/lisp/toolbar/jump_to.pbm
diff --git a/lisp/toolbar/mail.pbm b/lisp/toolbar/mail.pbm
index ba2fb1a9b0a..744f38609e8 100644
--- a/lisp/toolbar/mail.pbm
+++ b/lisp/toolbar/mail.pbm
diff --git a/lisp/toolbar/mail_compose.pbm b/lisp/toolbar/mail_compose.pbm
index 686efe42a01..ca6328d27a5 100644
--- a/lisp/toolbar/mail_compose.pbm
+++ b/lisp/toolbar/mail_compose.pbm
diff --git a/lisp/toolbar/mail_send.pbm b/lisp/toolbar/mail_send.pbm
index 3e18f65b4b9..36b60b7dbdd 100644
--- a/lisp/toolbar/mail_send.pbm
+++ b/lisp/toolbar/mail_send.pbm
diff --git a/lisp/toolbar/new.pbm b/lisp/toolbar/new.pbm
index ebfc90eb6d6..93415bf901e 100644
--- a/lisp/toolbar/new.pbm
+++ b/lisp/toolbar/new.pbm
diff --git a/lisp/toolbar/open.pbm b/lisp/toolbar/open.pbm
index 8fe11dd3b5d..3d2be258a67 100644
--- a/lisp/toolbar/open.pbm
+++ b/lisp/toolbar/open.pbm
diff --git a/lisp/toolbar/paste.pbm b/lisp/toolbar/paste.pbm
index 70f5e79cd5a..e51819c682a 100644
--- a/lisp/toolbar/paste.pbm
+++ b/lisp/toolbar/paste.pbm
diff --git a/lisp/toolbar/preferences.pbm b/lisp/toolbar/preferences.pbm
index ce5ec23850d..08819766ec0 100644
--- a/lisp/toolbar/preferences.pbm
+++ b/lisp/toolbar/preferences.pbm
diff --git a/lisp/toolbar/preferences.xpm b/lisp/toolbar/preferences.xpm
index 98df6393cc9..e9a7656bcdc 100644
--- a/lisp/toolbar/preferences.xpm
+++ b/lisp/toolbar/preferences.xpm
@@ -1,38 +1,35 @@
 /* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
+static char * preferences_xpm[] = {
 "24 24 8 1",
-"  c Gray0",
-". c #9adf6c4a4e4e",
-"X c #adad8e8e3030",
-"o c #858585857979",
-"O c #a4ffa1fc996c",
-"+ c #d791c99a9b6c",
-"@ c #e113e0eee0c4",
-"# c None",
-/* pixels */
-"########################",
-"########################",
-"########################",
-"#############  #########",
-"###########  @@ ##### ##",
-"#########  @@@@ #### + #",
-"######   @@@@@@+ ## +. #",
-"####  @@@@@@@+@@ # +. ##",
-"### @@@@@.@@@@o@@ +. ###",
-"### @@@@@.O@oo@@ +. ####",
-"#### @@@@.@o@@@ +. #####",
-"#### @@.O.@@@@ +. @ ####",
-"##### @@..@@@ +. @@+ ###",
-"##### @@@@@@ +. @@@+o ##",
-"###### @@@@X@  +OOOOo ##",
-"###### @@@@  OOOOOO+ ###",
-"####### @OooO@@@@@  ####",
-"####### @@@@@@@@@ ######",
-"######## @@@@@@  #######",
-"######## @@@@+ #########",
-"######### @@  ##########",
-"##########  ############",
-"########################",
-"########################"
-};
+" 	c None",
+".	c #000000",
+"+	c #E1E0E0",
+"@	c #D7C99B",
+"#	c #9A6C4E",
+"$	c #A4A199",
+"%	c #858579",
+"&	c #AD8E30",
+"                        ",
+"                        ",
+"                        ",
+"             ..         ",
+"           ..++.     .  ",
+"         ..++++.    .@. ",
+"      ...+++++++.  .@#. ",
+"    ..++++++++++. .@#.  ",
+"   .++++++#++++++.@#.   ",
+"   .+++++#++++++.@#.    ",
+"    .++#+#+++++.@#.     ",
+"    .++#$#++++.@#.+.    ",
+"     .++##+++.@#.++@.   ",
+"     .++++++.@#.+++@%.  ",
+"      .++++&+..@$$$$%.  ",
+"      .++++..$$$$$$@.   ",
+"       .+$%%$+++++..    ",
+"       .+++++++++.      ",
+"        .++++++..       ",
+"        .++++@.         ",
+"         .++..          ",
+"          ..            ",
+"                        ",
+"                        "};
diff --git a/lisp/toolbar/print.pbm b/lisp/toolbar/print.pbm
index 0a4aed95869..63cea6d84d2 100644
--- a/lisp/toolbar/print.pbm
+++ b/lisp/toolbar/print.pbm
diff --git a/lisp/toolbar/save.pbm b/lisp/toolbar/save.pbm
index 016fb5aa188..e153a144432 100644
--- a/lisp/toolbar/save.pbm
+++ b/lisp/toolbar/save.pbm
diff --git a/lisp/toolbar/saveas.pbm b/lisp/toolbar/saveas.pbm
index 0a55f61fcea..9a9022e058e 100644
--- a/lisp/toolbar/saveas.pbm
+++ b/lisp/toolbar/saveas.pbm
diff --git a/lisp/toolbar/search-replace.pbm b/lisp/toolbar/search-replace.pbm
index e6e84b0bb89..3e444cf7bb6 100644
--- a/lisp/toolbar/search-replace.pbm
+++ b/lisp/toolbar/search-replace.pbm
diff --git a/lisp/toolbar/search.pbm b/lisp/toolbar/search.pbm
index 44762dc8580..9336eea6874 100644
--- a/lisp/toolbar/search.pbm
+++ b/lisp/toolbar/search.pbm