diff --git a/images/Aqua.xpm b/images/Aqua.xpm
index c01480cfa..ac2d95bb3 100644
--- a/images/Aqua.xpm
+++ b/images/Aqua.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Background[] = {
+static const char * const Background[] = {
 /* columns rows colors chars-per-pixel */
 "8 8 3 1",
 "  c #e7e7e7",
@@ -16,7 +16,7 @@ static const char *Background[] = {
 "........"
 };
 /* XPM */
-static const char *Div[] = {
+static const char * const Div[] = {
 /* columns rows colors chars-per-pixel */
 "15 48 4 1",
 "  c #909090",
@@ -74,7 +74,7 @@ static const char *Div[] = {
 "XXXXXXXXXXXXXXX"
 };
 /* XPM */
-static const char *IBeamDown[] = {
+static const char * const IBeamDown[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 144 2",
 "   c #17232e",
@@ -251,7 +251,7 @@ static const char *IBeamDown[] = {
 "x.c.j.g.~ T = = * * * * * * * * * * * * * * * * * * * "
 };
 /* XPM */
-static const char *IBeamOver[] = {
+static const char * const IBeamOver[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 35 1",
 "  c #2d2d2d",
@@ -319,7 +319,7 @@ static const char *IBeamOver[] = {
 "qq;1*$#OOOOOOOOOOOOOOOOOOO+"
 };
 /* XPM */
-static const char *IBeamUp[] = {
+static const char * const IBeamUp[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 35 1",
 "  c #2d2d2d",
@@ -387,7 +387,7 @@ static const char *IBeamUp[] = {
 "qq;1*$#OOOOOOOOOOOOOOOOOOO+"
 };
 /* XPM */
-static const char *Loud[] = {
+static const char * const Loud[] = {
 /* columns rows colors chars-per-pixel */
 "27 48 47 1",
 "  c #181818",
@@ -488,7 +488,7 @@ static const char *Loud[] = {
 "ggggggggggggggggggggggggggg"
 };
 /* XPM */
-static const char *MoveDown[] = {
+static const char * const MoveDown[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 129 2",
 "   c #192430",
@@ -650,7 +650,7 @@ static const char *MoveDown[] = {
 "i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i."
 };
 /* XPM */
-static const char *MoveOver[] = {
+static const char * const MoveOver[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 29 1",
 "  c Gray18",
@@ -712,7 +712,7 @@ static const char *MoveOver[] = {
 "000000000000000000000000000"
 };
 /* XPM */
-static const char *MoveUp[] = {
+static const char * const MoveUp[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 29 1",
 "  c Gray18",
@@ -774,7 +774,7 @@ static const char *MoveUp[] = {
 "000000000000000000000000000"
 };
 /* XPM */
-static const char *Mute[] = {
+static const char * const Mute[] = {
 /* columns rows colors chars-per-pixel */
 "27 48 47 1",
 "  c #181818",
@@ -875,7 +875,7 @@ static const char *Mute[] = {
 "ggggggggggggggggggggggggggg"
 };
 /* XPM */
-static const char *PlayDisabled[] = {
+static const char * const PlayDisabled[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 191 2",
 "   c #272727",
@@ -1120,7 +1120,7 @@ static const char *PlayDisabled[] = {
 "(.E.(.(.(.(.(.(.(.(.(.E.(.(.(.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.(.(.(.(.(.(.(.(.(._.(.(._."
 };
 /* XPM */
-static const char *PlayDown[] = {
+static const char * const PlayDown[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 255 2",
 "   c #033b95",
@@ -1429,7 +1429,7 @@ static const char *PlayDown[] = {
 "MXMXMXMXmXmXmXmXmXmXmXmXMXMXbXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXcXbXbXMXMXMXmXmXmXmXmXmXmXmXmXmXmX"
 };
 /* XPM */
-static const char *PlayOver[] = {
+static const char * const PlayOver[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 256 2",
 "   c #222e33",
@@ -1739,7 +1739,7 @@ static const char *PlayOver[] = {
 "NXNXNXNXMXMXMXMXMXMXMXMXNXNXnXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXvXnXnXNXNXNXMXMXMXMXMXMXMXMXMXMXMX"
 };
 /* XPM */
-static const char *PlayUp[] = {
+static const char * const PlayUp[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 254 2",
 "   c #1f272f",
@@ -2047,7 +2047,7 @@ static const char *PlayUp[] = {
 "mXbXbXmXmXmXmXmXmXmXmXmXmXvXvXvXcXxXxXxXxXxXxXxXxXxXxXxXxXxXcXcXvXvXvXbXmXmXmXmXmXmXmXmXmXmXmXSX"
 };
 /* XPM */
-static const char *RecordDisabled[] = {
+static const char * const RecordDisabled[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 194 2",
 "   c #282828",
@@ -2295,7 +2295,7 @@ static const char *RecordDisabled[] = {
 "`.!.`.`.`.`.`.`.`.`.`.!.`.`.`.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.`.`.`.`.`.`.`.`.`.].`.`.]."
 };
 /* XPM */
-static const char *RecordDown[] = {
+static const char * const RecordDown[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 254 2",
 "   c #033b95",
@@ -2603,7 +2603,7 @@ static const char *RecordDown[] = {
 "nXnXnXnXnXbXbXbXbXbXbXbXnXnXcXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXcXcXnXnXnXbXbXbXbXbXbXbXbXbXbXbX"
 };
 /* XPM */
-static const char *RecordOver[] = {
+static const char * const RecordOver[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 255 2",
 "   c #232f33",
@@ -2912,7 +2912,7 @@ static const char *RecordOver[] = {
 "mXmXmXmXmXnXnXnXnXnXnXnXmXmXvXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXvXvXmXmXmXnXnXnXnXnXnXnXnXnXnXnX"
 };
 /* XPM */
-static const char *RecordUp[] = {
+static const char * const RecordUp[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 255 2",
 "   c #232a33",
@@ -3221,7 +3221,7 @@ static const char *RecordUp[] = {
 "MXnXnXMXMXMXMXMXMXMXMXMXMXbXbXbXvXcXcXcXcXcXcXcXcXcXcXcXcXcXvXvXbXbXbXnXMXMXMXMXMXMXMXMXMXMXMXDX"
 };
 /* XPM */
-static const char *SelectDown[] = {
+static const char * const SelectDown[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 180 2",
 "   c #17232e",
@@ -3434,7 +3434,7 @@ static const char *SelectDown[] = {
 "3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 ..+.~.^.`._._."
 };
 /* XPM */
-static const char *SelectOver[] = {
+static const char * const SelectOver[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 64 1",
 "  c #2d2d2d",
@@ -3531,7 +3531,7 @@ static const char *SelectOver[] = {
 "**==******==****===<47auccc"
 };
 /* XPM */
-static const char *SelectUp[] = {
+static const char * const SelectUp[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 64 1",
 "  c #2d2d2d",
@@ -3628,7 +3628,7 @@ static const char *SelectUp[] = {
 "**==******==****===<47auccc"
 };
 /* XPM */
-static const char *Slider[] = {
+static const char * const Slider[] = {
 /* columns rows colors chars-per-pixel */
 "100 28 23 1",
 "  c Gray29",
@@ -3685,7 +3685,7 @@ static const char *Slider[] = {
 "3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333"
 };
 /* XPM */
-static const char *SliderThumb[] = {
+static const char * const SliderThumb[] = {
 /* columns rows colors chars-per-pixel */
 "17 28 117 2",
 "   c #000063",
@@ -3836,7 +3836,7 @@ static const char *SliderThumb[] = {
 "4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4."
 };
 /* XPM */
-static const char *StopDisabled[] = {
+static const char * const StopDisabled[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 187 2",
 "   c #272727",
@@ -4077,7 +4077,7 @@ static const char *StopDisabled[] = {
 "!.U.!.!.!.!.!.!.!.!.!.U.!.!.!.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.!.!.!.!.!.!.!.!.!.^.!.!.^."
 };
 /* XPM */
-static const char *StopDown[] = {
+static const char * const StopDown[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 256 2",
 "   c #033b95",
@@ -4387,7 +4387,7 @@ static const char *StopDown[] = {
 "MXMXMXMXMXmXmXmXmXmXmXmXMXMXbXbXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXbXbXMXMXMXmXmXmXmXmXmXmXmXmXmXmX"
 };
 /* XPM */
-static const char *StopOver[] = {
+static const char * const StopOver[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 256 2",
 "   c #222e33",
@@ -4697,7 +4697,7 @@ static const char *StopOver[] = {
 "MXMXMXMXMXmXmXmXmXmXmXmXMXMXbXbXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXbXbXMXMXMXmXmXmXmXmXmXmXmXmXmXmX"
 };
 /* XPM */
-static const char *StopUp[] = {
+static const char * const StopUp[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 256 2",
 "   c #1f272f",
@@ -5007,7 +5007,7 @@ static const char *StopUp[] = {
 "MXbXbXMXMXMXMXMXMXMXMXMXMXvXvXvXcXxXxXxXxXxXxXxXxXxXxXxXxXxXcXcXvXvXvXbXMXMXMXMXMXMXMXMXMXMXMXFX"
 };
 /* XPM */
-static const char *ZoomDown[] = {
+static const char * const ZoomDown[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 208 2",
 "   c #1c272f",
@@ -5248,7 +5248,7 @@ static const char *ZoomDown[] = {
 "5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X"
 };
 /* XPM */
-static const char *ZoomOver[] = {
+static const char * const ZoomOver[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 89 1",
 "  c #2d2d2d",
@@ -5370,7 +5370,7 @@ static const char *ZoomOver[] = {
 "'''''''''''''''''''''''''''"
 };
 /* XPM */
-static const char *ZoomUp[] = {
+static const char * const ZoomUp[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 89 1",
 "  c #2d2d2d",
diff --git a/images/Aqua/Down.xpm b/images/Aqua/Down.xpm
index e79843c13..520ef2041 100644
--- a/images/Aqua/Down.xpm
+++ b/images/Aqua/Down.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Down[] = {
+static const char * const Down[] = {
 "27 27 81 1",
 " 	c None",
 ".	c #949494",
diff --git a/images/Aqua/DownButtonSquare.xpm b/images/Aqua/DownButtonSquare.xpm
index bfc24ef0e..547bf6550 100644
--- a/images/Aqua/DownButtonSquare.xpm
+++ b/images/Aqua/DownButtonSquare.xpm
@@ -1,5 +1,5 @@
 /* XPM */ 
-static const char * DownButton[] = {
+static const char * const DownButton[] = {
 "36 36 69 1",
 " 	c None",
 "!	c #E6E6E6",
@@ -105,4 +105,4 @@ static const char * DownButton[] = {
 "VW2RRRRRRRRRRRRRRRRRRRRRRRRRRRRRR2WV",
 "XYZ[RRRRRRRRRRRRRRRRRRRRRRRRRRRR[ZYX",
 "]V^_`abbbbbbbbbbbbbbbbbbbbbbbba`_^V]",
-"cde*fg666666666666666666666666gf*edc"};
\ No newline at end of file
+"cde*fg666666666666666666666666gf*edc"};
diff --git a/images/Aqua/DownButtonStripes.xpm b/images/Aqua/DownButtonStripes.xpm
index 49f0ada88..f5c9b6a24 100644
--- a/images/Aqua/DownButtonStripes.xpm
+++ b/images/Aqua/DownButtonStripes.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DownButton[] = {
+static const char * const DownButton[] = {
 "48 48 1141 2",
 "  	c None",
 ". 	c #E7E7E7",
diff --git a/images/Aqua/DownButtonWhite.xpm b/images/Aqua/DownButtonWhite.xpm
index 9336f3140..a2123ca74 100644
--- a/images/Aqua/DownButtonWhite.xpm
+++ b/images/Aqua/DownButtonWhite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DownButton[] = {
+static const char * const DownButton[] = {
 "48 48 1065 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/images/Aqua/Hilite.xpm b/images/Aqua/Hilite.xpm
index d9757d748..90e5de866 100644
--- a/images/Aqua/Hilite.xpm
+++ b/images/Aqua/Hilite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Hilite[] = {
+static const char * const Hilite[] = {
 "27 27 55 1",
 " 	c None",
 ".	c #ADADAD",
diff --git a/images/Aqua/HiliteButtonSquare.xpm b/images/Aqua/HiliteButtonSquare.xpm
index b983df735..2013f7fe8 100644
--- a/images/Aqua/HiliteButtonSquare.xpm
+++ b/images/Aqua/HiliteButtonSquare.xpm
@@ -1,5 +1,5 @@
 /* XPM */ 
-static const char * HiliteButton[] = {
+static const char * const HiliteButton[] = {
 "36 36 74 1",
 " 	c None",
 "!	c #E6E6E6",
@@ -110,4 +110,4 @@ static const char * HiliteButton[] = {
 "_`2YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY2`:",
 "abcdYYYYYYYYYYYYYYYYYYYYYYYYYYYYdcba",
 "E_efghiiiiiiiiiiiiiiiiiiiiiiiihgfe_E",
-"9Lj*[kllllllllllllllllllllllllk[*jL9"};
\ No newline at end of file
+"9Lj*[kllllllllllllllllllllllllk[*jL9"};
diff --git a/images/Aqua/HiliteButtonStripes.xpm b/images/Aqua/HiliteButtonStripes.xpm
index 02adbd1d0..7c7a694ba 100644
--- a/images/Aqua/HiliteButtonStripes.xpm
+++ b/images/Aqua/HiliteButtonStripes.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * HiliteButton[] = {
+static const char * const HiliteButton[] = {
 "48 48 1141 2",
 "  	c None",
 ". 	c #E7E7E7",
diff --git a/images/Aqua/HiliteButtonWhite.xpm b/images/Aqua/HiliteButtonWhite.xpm
index ab63ebf82..659b8aa0a 100644
--- a/images/Aqua/HiliteButtonWhite.xpm
+++ b/images/Aqua/HiliteButtonWhite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * HiliteButton[] = {
+static const char * const HiliteButton[] = {
 "48 48 1065 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/images/Aqua/Slider.xpm b/images/Aqua/Slider.xpm
index a5b3b2a1c..f2e858e3e 100644
--- a/images/Aqua/Slider.xpm
+++ b/images/Aqua/Slider.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Slider[] = {
+static const char * const Slider[] = {
 /* columns rows colors chars-per-pixel */
 "100 28 23 1",
 "  c Gray29",
diff --git a/images/Aqua/SliderThumb.xpm b/images/Aqua/SliderThumb.xpm
index 4bab00d66..d090cb7ef 100644
--- a/images/Aqua/SliderThumb.xpm
+++ b/images/Aqua/SliderThumb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *SliderThumb[] = {
+static const char * const SliderThumb[] = {
 /* columns rows colors chars-per-pixel */
 "17 28 117 2",
 "   c #000063",
diff --git a/images/Aqua/Up.xpm b/images/Aqua/Up.xpm
index 25f800a12..19336076c 100644
--- a/images/Aqua/Up.xpm
+++ b/images/Aqua/Up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Up[] = {
+static const char * const Up[] = {
 "27 27 55 1",
 " 	c None",
 ".	c #ADADAD",
diff --git a/images/Aqua/UpButtonSquare.xpm b/images/Aqua/UpButtonSquare.xpm
index 4767a8c85..87b5e2699 100644
--- a/images/Aqua/UpButtonSquare.xpm
+++ b/images/Aqua/UpButtonSquare.xpm
@@ -1,5 +1,5 @@
 /* XPM */ 
-static const char * UpButton[] = {
+static const char * const UpButton[] = {
 "36 36 75 1",
 " 	c None",
 "!	c white",
@@ -111,4 +111,4 @@ static const char * UpButton[] = {
 "_`2!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2`_",
 "abcd!!!!!!!!!!!!!!!!!!!!!!!!!!!!dcba",
 "G_efghiiiiiiiiiiiiiiiiiiiiiiiihgfe_G",
-"!Nj*klmmmmmmmmmmmmmmmmmmmmmmmmlk*jN!"};
\ No newline at end of file
+"!Nj*klmmmmmmmmmmmmmmmmmmmmmmmmlk*jN!"};
diff --git a/images/Aqua/UpButtonStripes.xpm b/images/Aqua/UpButtonStripes.xpm
index 6dfbbbdba..3d1d97b19 100644
--- a/images/Aqua/UpButtonStripes.xpm
+++ b/images/Aqua/UpButtonStripes.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * UpButton[] = {
+static const char * const UpButton[] = {
 "48 48 1223 2",
 "  	c None",
 ". 	c #E7E7E7",
diff --git a/images/Aqua/UpButtonWhite.xpm b/images/Aqua/UpButtonWhite.xpm
index 9557f942f..8b7ce0580 100644
--- a/images/Aqua/UpButtonWhite.xpm
+++ b/images/Aqua/UpButtonWhite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * UpButton[] = {
+static const char * const UpButton[] = {
 "48 48 1154 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/images/Arrow.xpm b/images/Arrow.xpm
index 496821a25..93b04469f 100644
--- a/images/Arrow.xpm
+++ b/images/Arrow.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * arrow_xpm[] = {
+static const char * const arrow_xpm[] = {
 "9 16 3 1",
 "# c #000000", 
 "+ c #808080",
diff --git a/images/Arrow15x15.xpm b/images/Arrow15x15.xpm
index 88718d64b..f8663757e 100644
--- a/images/Arrow15x15.xpm
+++ b/images/Arrow15x15.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * arrow15x15_xpm[] = {
+static const char * const arrow15x15_xpm[] = {
 "15 15 24 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/AudacityLogo.xpm b/images/AudacityLogo.xpm
index f1667e9ee..38cd71d4a 100644
--- a/images/AudacityLogo.xpm
+++ b/images/AudacityLogo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AudacityLogo_xpm[] = {
+static const char * const AudacityLogo_xpm[] = {
 "215 190 2218 2",
 "  	c #FFFFFF",
 ". 	c #F4F4F9",
diff --git a/images/AudacityLogo48x48.xpm b/images/AudacityLogo48x48.xpm
index d188a9fe9..60db4a342 100644
--- a/images/AudacityLogo48x48.xpm
+++ b/images/AudacityLogo48x48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AudacityLogo48x48_xpm[] = {
+static const char * const AudacityLogo48x48_xpm[] = {
 "48 48 665 2",
 "  	c #FFFFFF",
 ". 	c #FBFBFD",
diff --git a/images/AudacityLogoAlpha.xpm b/images/AudacityLogoAlpha.xpm
index d5fd6fd32..dd4fa3572 100644
--- a/images/AudacityLogoAlpha.xpm
+++ b/images/AudacityLogoAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AudacityLogoAlpha_xpm[] = {
+static const char * const AudacityLogoAlpha_xpm[] = {
 "48 48 389 2",
 "  	c None",
 ". 	c #000092",
diff --git a/images/AudacityLogoWithName.xpm b/images/AudacityLogoWithName.xpm
index 8fed7ba98..472922e61 100644
--- a/images/AudacityLogoWithName.xpm
+++ b/images/AudacityLogoWithName.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * AudacityLogoWithName_xpm[] = {
+static const char * const AudacityLogoWithName_xpm[] = {
 "506 200 8358 2",
 "  	c #FFFFFF",
 ". 	c #FFFFFE",
diff --git a/images/Checked.xpm b/images/Checked.xpm
index 3a518ffda..fcbf1822d 100644
--- a/images/Checked.xpm
+++ b/images/Checked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * checked_xpm[] = {
+static const char * const checked_xpm[] = {
 "15 15 70 1",
 " 	c #FFFFFF",
 ".	c #8E8F8F",
diff --git a/images/ControlButtons/Disabled.xpm b/images/ControlButtons/Disabled.xpm
index 25bdd54dd..6ee0209df 100644
--- a/images/ControlButtons/Disabled.xpm
+++ b/images/ControlButtons/Disabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Disabled[] = {
+static const char * const Disabled[] = {
 "27 27 52 1",
 " 	c None",
 ".	c #AAAAAA",
diff --git a/images/ControlButtons/Down.xpm b/images/ControlButtons/Down.xpm
index 69bd5b436..1488cd3c4 100644
--- a/images/ControlButtons/Down.xpm
+++ b/images/ControlButtons/Down.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Down[] = {
+static const char * const Down[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #424242",
diff --git a/images/ControlButtons/DownButton.xpm b/images/ControlButtons/DownButton.xpm
index f1eef5a3f..edf89b72b 100644
--- a/images/ControlButtons/DownButton.xpm
+++ b/images/ControlButtons/DownButton.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DownButton[] = {
+static const char * const DownButton[] = {
 "48 48 108 2",
 "  	c None",
 ". 	c #CCCCCC",
diff --git a/images/ControlButtons/Draw.xpm b/images/ControlButtons/Draw.xpm
index a6ec04519..319ea6346 100644
--- a/images/ControlButtons/Draw.xpm
+++ b/images/ControlButtons/Draw.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Draw[] = {
+static const char * const Draw[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #D6D6D6",
diff --git a/images/ControlButtons/DrawAlpha.xpm b/images/ControlButtons/DrawAlpha.xpm
index 0b3ddaaa7..0df3999ab 100644
--- a/images/ControlButtons/DrawAlpha.xpm
+++ b/images/ControlButtons/DrawAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DrawAlpha[] = {
+static const char * const DrawAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/Envelope.xpm b/images/ControlButtons/Envelope.xpm
index e3b35a0b4..b25dbc8a1 100644
--- a/images/ControlButtons/Envelope.xpm
+++ b/images/ControlButtons/Envelope.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Envelope[] = {
+static const char * const Envelope[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ControlButtons/EnvelopeAlpha.xpm b/images/ControlButtons/EnvelopeAlpha.xpm
index 612667b26..6491e1cc4 100644
--- a/images/ControlButtons/EnvelopeAlpha.xpm
+++ b/images/ControlButtons/EnvelopeAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * EnvelopeAlpha[] = {
+static const char * const EnvelopeAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/FFwd.xpm b/images/ControlButtons/FFwd.xpm
index 74ab68b67..992f9e185 100644
--- a/images/ControlButtons/FFwd.xpm
+++ b/images/ControlButtons/FFwd.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * FFwd[] = {
+static const char * const FFwd[] = {
 "16 16 79 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/FFwdAlpha.xpm b/images/ControlButtons/FFwdAlpha.xpm
index d5f45bcb4..8d264141e 100644
--- a/images/ControlButtons/FFwdAlpha.xpm
+++ b/images/ControlButtons/FFwdAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * FFwdAlpha[] = {
+static const char * const FFwdAlpha[] = {
 "16 16 13 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/FFwdDisabled.xpm b/images/ControlButtons/FFwdDisabled.xpm
index 13d4daff4..8819aadf0 100644
--- a/images/ControlButtons/FFwdDisabled.xpm
+++ b/images/ControlButtons/FFwdDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * FFwdDisabled[] = {
+static const char * const FFwdDisabled[] = {
 "16 16 61 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/ControlButtons/Hilite.xpm b/images/ControlButtons/Hilite.xpm
index 0529afab6..7b4061f3c 100644
--- a/images/ControlButtons/Hilite.xpm
+++ b/images/ControlButtons/Hilite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Hilite[] = {
+static const char * const Hilite[] = {
 "27 27 85 1",
 " 	c None",
 ".	c #FBFBFB",
diff --git a/images/ControlButtons/HiliteButton.xpm b/images/ControlButtons/HiliteButton.xpm
index 1f173d840..2111f71e1 100644
--- a/images/ControlButtons/HiliteButton.xpm
+++ b/images/ControlButtons/HiliteButton.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * HiliteButton[] = {
+static const char * const HiliteButton[] = {
 "48 48 113 2",
 "  	c None",
 ". 	c #CCCCCC",
diff --git a/images/ControlButtons/IBeam.xpm b/images/ControlButtons/IBeam.xpm
index fb678320e..da65a0c7a 100644
--- a/images/ControlButtons/IBeam.xpm
+++ b/images/ControlButtons/IBeam.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * IBeam[] = {
+static const char * const IBeam[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ControlButtons/IBeamAlpha.xpm b/images/ControlButtons/IBeamAlpha.xpm
index f144903ef..197627b3d 100644
--- a/images/ControlButtons/IBeamAlpha.xpm
+++ b/images/ControlButtons/IBeamAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * IBeamAlpha[] = {
+static const char * const IBeamAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/Loop.xpm b/images/ControlButtons/Loop.xpm
index 2d9ed6286..dc68d5280 100644
--- a/images/ControlButtons/Loop.xpm
+++ b/images/ControlButtons/Loop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * Loop[] = {
+static const char * const Loop[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #1B1B1B",
diff --git a/images/ControlButtons/LoopAlpha.xpm b/images/ControlButtons/LoopAlpha.xpm
index 53b747889..22b998c81 100644
--- a/images/ControlButtons/LoopAlpha.xpm
+++ b/images/ControlButtons/LoopAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * LoopAlpha[] = {
+static const char * const LoopAlpha[] = {
 "16 16 11 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/LoopDisabled.xpm b/images/ControlButtons/LoopDisabled.xpm
index a90d1226d..43423b4e9 100644
--- a/images/ControlButtons/LoopDisabled.xpm
+++ b/images/ControlButtons/LoopDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * LoopDisabled[] = {
+static const char * const LoopDisabled[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #1B1B1B",
diff --git a/images/ControlButtons/Multi.xpm b/images/ControlButtons/Multi.xpm
index b6da673b5..ea27963ff 100644
--- a/images/ControlButtons/Multi.xpm
+++ b/images/ControlButtons/Multi.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Multi[] = {
+static const char * const Multi[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 3 1",
 ". c #FFFFFF",
diff --git a/images/ControlButtons/MultiAlpha.xpm b/images/ControlButtons/MultiAlpha.xpm
index 157439243..1b98817ef 100644
--- a/images/ControlButtons/MultiAlpha.xpm
+++ b/images/ControlButtons/MultiAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * MultiAlpha[] = {
+static const char * const MultiAlpha[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 2 1",
 ". c #000000",
diff --git a/images/ControlButtons/Pause.xpm b/images/ControlButtons/Pause.xpm
index 4de034d69..579fe10da 100644
--- a/images/ControlButtons/Pause.xpm
+++ b/images/ControlButtons/Pause.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Pause[] = {
+static const char * const Pause[] = {
 "16 16 79 1",
 " 	c None",
 ".	c #F5F5F5",
diff --git a/images/ControlButtons/PauseAlpha.xpm b/images/ControlButtons/PauseAlpha.xpm
index 3d872df6f..f47e55cd9 100644
--- a/images/ControlButtons/PauseAlpha.xpm
+++ b/images/ControlButtons/PauseAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * PauseAlpha[] = {
+static const char * const PauseAlpha[] = {
 "16 16 29 1",
 " 	c None",
 ".	c #010101",
diff --git a/images/ControlButtons/PauseDisabled.xpm b/images/ControlButtons/PauseDisabled.xpm
index 2ef8c1376..429f46932 100644
--- a/images/ControlButtons/PauseDisabled.xpm
+++ b/images/ControlButtons/PauseDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * PauseDisabled[] = {
+static const char * const PauseDisabled[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #8D8D8D",
diff --git a/images/ControlButtons/Play.xpm b/images/ControlButtons/Play.xpm
index f7b4bd7ae..0084871b9 100644
--- a/images/ControlButtons/Play.xpm
+++ b/images/ControlButtons/Play.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Play[] = {
+static const char * const Play[] = {
 "16 16 70 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/PlayAlpha.xpm b/images/ControlButtons/PlayAlpha.xpm
index 1b6c09f44..92b45c5ce 100644
--- a/images/ControlButtons/PlayAlpha.xpm
+++ b/images/ControlButtons/PlayAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * PlayAlpha[] = {
+static const char * const PlayAlpha[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/PlayDisabled.xpm b/images/ControlButtons/PlayDisabled.xpm
index f79876d46..f52588264 100644
--- a/images/ControlButtons/PlayDisabled.xpm
+++ b/images/ControlButtons/PlayDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * PlayDisabled[] = {
+static const char * const PlayDisabled[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/ControlButtons/Record.xpm b/images/ControlButtons/Record.xpm
index 570c6915e..26dd9cfa4 100644
--- a/images/ControlButtons/Record.xpm
+++ b/images/ControlButtons/Record.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Record[] = {
+static const char * const Record[] = {
 "16 16 82 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/RecordAlpha.xpm b/images/ControlButtons/RecordAlpha.xpm
index 6e099555b..6694b9ca4 100644
--- a/images/ControlButtons/RecordAlpha.xpm
+++ b/images/ControlButtons/RecordAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * RecordAlpha[] = {
+static const char * const RecordAlpha[] = {
 "16 16 28 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/RecordDisabled.xpm b/images/ControlButtons/RecordDisabled.xpm
index 342c72341..dbcd6aa2b 100644
--- a/images/ControlButtons/RecordDisabled.xpm
+++ b/images/ControlButtons/RecordDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * RecordDisabled[] = {
+static const char * const RecordDisabled[] = {
 "16 16 50 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/ControlButtons/Rewind.xpm b/images/ControlButtons/Rewind.xpm
index 96ca34bbc..162a26927 100644
--- a/images/ControlButtons/Rewind.xpm
+++ b/images/ControlButtons/Rewind.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Rewind[] = {
+static const char * const Rewind[] = {
 "16 16 82 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/RewindAlpha.xpm b/images/ControlButtons/RewindAlpha.xpm
index c810c5c55..b7eb33ec5 100644
--- a/images/ControlButtons/RewindAlpha.xpm
+++ b/images/ControlButtons/RewindAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * RewindAlpha[] = {
+static const char * const RewindAlpha[] = {
 "16 16 13 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/RewindDisabled.xpm b/images/ControlButtons/RewindDisabled.xpm
index a3f341665..5cd437f9f 100644
--- a/images/ControlButtons/RewindDisabled.xpm
+++ b/images/ControlButtons/RewindDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * RewindDisabled[] = {
+static const char * const RewindDisabled[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/ControlButtons/Slider.xpm b/images/ControlButtons/Slider.xpm
index 73094cf5a..4107e27fa 100644
--- a/images/ControlButtons/Slider.xpm
+++ b/images/ControlButtons/Slider.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Slider[] = {
+static const char * const Slider[] = {
 /* columns rows colors chars-per-pixel */
 "100 28 60 1",
 "  c #9d9c9a",
diff --git a/images/ControlButtons/SliderThumb.xpm b/images/ControlButtons/SliderThumb.xpm
index a888f823a..cf0798db9 100644
--- a/images/ControlButtons/SliderThumb.xpm
+++ b/images/ControlButtons/SliderThumb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *SliderThumb[] = {
+static const char * const SliderThumb[] = {
 /* columns rows colors chars-per-pixel */
 "10 28 4 1",
 "  c #9a9997",
diff --git a/images/ControlButtons/Stop.xpm b/images/ControlButtons/Stop.xpm
index 4d88bebb6..c6cac6520 100644
--- a/images/ControlButtons/Stop.xpm
+++ b/images/ControlButtons/Stop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Stop[] = {
+static const char * const Stop[] = {
 "16 16 31 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/StopAlpha.xpm b/images/ControlButtons/StopAlpha.xpm
index 9fe2a76be..661c24f0e 100644
--- a/images/ControlButtons/StopAlpha.xpm
+++ b/images/ControlButtons/StopAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StopAlpha[] = {
+static const char * const StopAlpha[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/StopDisabled.xpm b/images/ControlButtons/StopDisabled.xpm
index 114cee169..cf1a5187a 100644
--- a/images/ControlButtons/StopDisabled.xpm
+++ b/images/ControlButtons/StopDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StopDisabled[] = {
+static const char * const StopDisabled[] = {
 "16 16 26 1",
 " 	c None",
 ".	c #737373",
diff --git a/images/ControlButtons/TimeShift.xpm b/images/ControlButtons/TimeShift.xpm
index 97d94cfc3..266f0359a 100644
--- a/images/ControlButtons/TimeShift.xpm
+++ b/images/ControlButtons/TimeShift.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TimeShift[] = {
+static const char * const TimeShift[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ControlButtons/TimeShiftAlpha.xpm b/images/ControlButtons/TimeShiftAlpha.xpm
index 22cd4f4a9..96e939979 100644
--- a/images/ControlButtons/TimeShiftAlpha.xpm
+++ b/images/ControlButtons/TimeShiftAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TimeShiftAlpha[] = {
+static const char * const TimeShiftAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ControlButtons/Up.xpm b/images/ControlButtons/Up.xpm
index e2adc075c..f2b9baa1c 100644
--- a/images/ControlButtons/Up.xpm
+++ b/images/ControlButtons/Up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Up[] = {
+static const char * const Up[] = {
 "27 27 15 1",
 " 	c None",
 ".	c #FBFBFB",
diff --git a/images/ControlButtons/UpButton.xpm b/images/ControlButtons/UpButton.xpm
index 0ddf6264d..5f6317d0d 100644
--- a/images/ControlButtons/UpButton.xpm
+++ b/images/ControlButtons/UpButton.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * UpButton[] = {
+static const char * const UpButton[] = {
 "48 48 108 2",
 "  	c None",
 ". 	c #CCCCCC",
diff --git a/images/ControlButtons/Zoom.xpm b/images/ControlButtons/Zoom.xpm
index 298ca9a6e..7b5bca7d3 100644
--- a/images/ControlButtons/Zoom.xpm
+++ b/images/ControlButtons/Zoom.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Zoom[] = {
+static const char * const Zoom[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ControlButtons/ZoomAlpha.xpm b/images/ControlButtons/ZoomAlpha.xpm
index 18a4779ad..3f6307952 100644
--- a/images/ControlButtons/ZoomAlpha.xpm
+++ b/images/ControlButtons/ZoomAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomAlpha[] = {
+static const char * const ZoomAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/Cursors16/BandWidthCursor.xpm b/images/Cursors16/BandWidthCursor.xpm
index 6c5ea7a62..a6bcbff13 100644
--- a/images/Cursors16/BandWidthCursor.xpm
+++ b/images/Cursors16/BandWidthCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * BandWidthCursorXpm[] = {
+static const char * const BandWidthCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/BottomFrequencyCursor.xpm b/images/Cursors16/BottomFrequencyCursor.xpm
index 20b129c6f..092767541 100644
--- a/images/Cursors16/BottomFrequencyCursor.xpm
+++ b/images/Cursors16/BottomFrequencyCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * BottomFrequencyCursorXpm[] = {
+static const char * const BottomFrequencyCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/DisabledCursor.xpm b/images/Cursors16/DisabledCursor.xpm
index fc4fb0fc6..0e710d592 100644
--- a/images/Cursors16/DisabledCursor.xpm
+++ b/images/Cursors16/DisabledCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DisabledCursorXpm[] = {
+static const char * const DisabledCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/DrawCursor.xpm b/images/Cursors16/DrawCursor.xpm
index 5e2f1b693..f80472cc6 100644
--- a/images/Cursors16/DrawCursor.xpm
+++ b/images/Cursors16/DrawCursor.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 //Image of a pencil.
-static const char * DrawCursorXpm[] = {
+static const char * const DrawCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/EnvCursor.xpm b/images/Cursors16/EnvCursor.xpm
index c631478e3..4af28c133 100644
--- a/images/Cursors16/EnvCursor.xpm
+++ b/images/Cursors16/EnvCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * EnvCursorXpm[] = {
+static const char * const EnvCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/IBeamCursor.xpm b/images/Cursors16/IBeamCursor.xpm
index 70e691e31..150108ebf 100644
--- a/images/Cursors16/IBeamCursor.xpm
+++ b/images/Cursors16/IBeamCursor.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 // Classic optical illusion.
 // the beam looks taller than the arrow.
-static const char * IBeamCursorXpm[] = {
+static const char * const IBeamCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/LabelCursorLeft.xpm b/images/Cursors16/LabelCursorLeft.xpm
index cc6ecb377..51c6df691 100644
--- a/images/Cursors16/LabelCursorLeft.xpm
+++ b/images/Cursors16/LabelCursorLeft.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * LabelCursorLeftXpm[] = {
+static const char * const LabelCursorLeftXpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #FF0000",
diff --git a/images/Cursors16/LabelCursorRight.xpm b/images/Cursors16/LabelCursorRight.xpm
index f4901e493..b4c50802e 100644
--- a/images/Cursors16/LabelCursorRight.xpm
+++ b/images/Cursors16/LabelCursorRight.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * LabelCursorRightXpm[] = {
+static const char * const LabelCursorRightXpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #FF0000",
diff --git a/images/Cursors16/StretchCursor.xpm b/images/Cursors16/StretchCursor.xpm
index 0db37674f..754f308ff 100644
--- a/images/Cursors16/StretchCursor.xpm
+++ b/images/Cursors16/StretchCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StretchCursorXpm[] = {
+static const char * const StretchCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/StretchLeftCursor.xpm b/images/Cursors16/StretchLeftCursor.xpm
index 9c517404e..ce1eab5a9 100644
--- a/images/Cursors16/StretchLeftCursor.xpm
+++ b/images/Cursors16/StretchLeftCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StretchLeftCursorXpm[] = {
+static const char * const StretchLeftCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/StretchRightCursor.xpm b/images/Cursors16/StretchRightCursor.xpm
index 9541f1344..cc39b236b 100644
--- a/images/Cursors16/StretchRightCursor.xpm
+++ b/images/Cursors16/StretchRightCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StretchRightCursorXpm[] = {
+static const char * const StretchRightCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/TimeCursor.xpm b/images/Cursors16/TimeCursor.xpm
index 7b90ef337..be2209cac 100644
--- a/images/Cursors16/TimeCursor.xpm
+++ b/images/Cursors16/TimeCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TimeCursorXpm[] = {
+static const char * const TimeCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/TopFrequencyCursor.xpm b/images/Cursors16/TopFrequencyCursor.xpm
index 24a718e0d..5f6a750e5 100644
--- a/images/Cursors16/TopFrequencyCursor.xpm
+++ b/images/Cursors16/TopFrequencyCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TopFrequencyCursorXpm[] = {
+static const char * const TopFrequencyCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/ZoomInCursor.xpm b/images/Cursors16/ZoomInCursor.xpm
index cc409b1ed..77b5abb73 100644
--- a/images/Cursors16/ZoomInCursor.xpm
+++ b/images/Cursors16/ZoomInCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomInCursorXpm[] = {
+static const char * const ZoomInCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors16/ZoomOutCursor.xpm b/images/Cursors16/ZoomOutCursor.xpm
index c2d8376d3..0616340f9 100644
--- a/images/Cursors16/ZoomOutCursor.xpm
+++ b/images/Cursors16/ZoomOutCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomOutCursorXpm[] = {
+static const char * const ZoomOutCursorXpm[] = {
 "16 16 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/BandWidthCursor.xpm b/images/Cursors32/BandWidthCursor.xpm
index 6a2f746a7..08c8211d6 100644
--- a/images/Cursors32/BandWidthCursor.xpm
+++ b/images/Cursors32/BandWidthCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * BandWidthCursorXpm[] = {
+static const char * const BandWidthCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/BottomFrequencyCursor.xpm b/images/Cursors32/BottomFrequencyCursor.xpm
index ace32fd63..f7db5fa1a 100644
--- a/images/Cursors32/BottomFrequencyCursor.xpm
+++ b/images/Cursors32/BottomFrequencyCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * BottomFrequencyCursorXpm[] = {
+static const char * const BottomFrequencyCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/DisabledCursor.xpm b/images/Cursors32/DisabledCursor.xpm
index b62b7d647..da583cc92 100644
--- a/images/Cursors32/DisabledCursor.xpm
+++ b/images/Cursors32/DisabledCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DisabledCursorXpm[] = {
+static const char * const DisabledCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/DrawCursor.xpm b/images/Cursors32/DrawCursor.xpm
index 2f99761ee..71978f5eb 100644
--- a/images/Cursors32/DrawCursor.xpm
+++ b/images/Cursors32/DrawCursor.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 //Image of a pencil.
-static const char * DrawCursorXpm[] = {
+static const char * const DrawCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/EnvCursor.xpm b/images/Cursors32/EnvCursor.xpm
index 97c4ad11b..981e1930d 100644
--- a/images/Cursors32/EnvCursor.xpm
+++ b/images/Cursors32/EnvCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * EnvCursorXpm[] = {
+static const char * const EnvCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/IBeamCursor.xpm b/images/Cursors32/IBeamCursor.xpm
index 4f007c8d0..599640cfe 100644
--- a/images/Cursors32/IBeamCursor.xpm
+++ b/images/Cursors32/IBeamCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * IBeamCursorXpm[] = {
+static const char * const IBeamCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
@@ -70,4 +70,4 @@ static const char * IBeamCursorXpm[] = {
 "................................",
 "................................",
 "................................"};
-#endif
\ No newline at end of file
+#endif
diff --git a/images/Cursors32/LabelCursorLeft.xpm b/images/Cursors32/LabelCursorLeft.xpm
index b150aa9f7..fe85e586d 100644
--- a/images/Cursors32/LabelCursorLeft.xpm
+++ b/images/Cursors32/LabelCursorLeft.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * LabelCursorLeftXpm[] = {
+static const char * const LabelCursorLeftXpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #FF0000",
diff --git a/images/Cursors32/LabelCursorRight.xpm b/images/Cursors32/LabelCursorRight.xpm
index 00fa3ba17..368c32df0 100644
--- a/images/Cursors32/LabelCursorRight.xpm
+++ b/images/Cursors32/LabelCursorRight.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * LabelCursorRightXpm[] = {
+static const char * const LabelCursorRightXpm[] = {
 "32 32 4 1",
 " 	c None",
 ".	c #FF0000",
diff --git a/images/Cursors32/StretchCursor.xpm b/images/Cursors32/StretchCursor.xpm
index 303a57f5e..07575c75c 100644
--- a/images/Cursors32/StretchCursor.xpm
+++ b/images/Cursors32/StretchCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StretchCursorXpm[] = {
+static const char * const StretchCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/StretchLeftCursor.xpm b/images/Cursors32/StretchLeftCursor.xpm
index 0241c2578..19edb3961 100644
--- a/images/Cursors32/StretchLeftCursor.xpm
+++ b/images/Cursors32/StretchLeftCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StretchLeftCursorXpm[] = {
+static const char * const StretchLeftCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/StretchRightCursor.xpm b/images/Cursors32/StretchRightCursor.xpm
index eea3f9e21..6c4675dc6 100644
--- a/images/Cursors32/StretchRightCursor.xpm
+++ b/images/Cursors32/StretchRightCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * StretchRightCursorXpm[] = {
+static const char * const StretchRightCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/TimeCursor.xpm b/images/Cursors32/TimeCursor.xpm
index 199596bd6..11cf4f365 100644
--- a/images/Cursors32/TimeCursor.xpm
+++ b/images/Cursors32/TimeCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TimeCursorXpm[] = {
+static const char * const TimeCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/TopFrequencyCursor.xpm b/images/Cursors32/TopFrequencyCursor.xpm
index c8a133aeb..61c0cc9b9 100644
--- a/images/Cursors32/TopFrequencyCursor.xpm
+++ b/images/Cursors32/TopFrequencyCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TopFrequencyCursorXpm[] = {
+static const char * const TopFrequencyCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/Cursors32/ZoomInCursor.xpm b/images/Cursors32/ZoomInCursor.xpm
index bbcc3b4e0..b5d18729d 100644
--- a/images/Cursors32/ZoomInCursor.xpm
+++ b/images/Cursors32/ZoomInCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomInCursorXpm[] = {
+static const char * const ZoomInCursorXpm[] = {
 "32 32 3 1",
 "+	c #FFFFFF",
 ".	c #FF0000", // mask color = RGB:255,0,0
diff --git a/images/Cursors32/ZoomOutCursor.xpm b/images/Cursors32/ZoomOutCursor.xpm
index 0e6de7735..1e5be7419 100644
--- a/images/Cursors32/ZoomOutCursor.xpm
+++ b/images/Cursors32/ZoomOutCursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomOutCursorXpm[] = {
+static const char * const ZoomOutCursorXpm[] = {
 "32 32 3 1",
 ".	c #FF0000", // mask color = RGB:255,0,0
 "#	c #000000",
diff --git a/images/DarkAudacityLogoWithName.xpm b/images/DarkAudacityLogoWithName.xpm
index 239e8e00f..cb3fc6403 100644
--- a/images/DarkAudacityLogoWithName.xpm
+++ b/images/DarkAudacityLogoWithName.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * AudacityLogoWithName_xpm[] = {
+static char const * const AudacityLogoWithName_xpm[] = {
 "629 200 21 1",
 " 	c None",
 ".	c #ADADAD",
diff --git a/images/EditButtons/Copy.xpm b/images/EditButtons/Copy.xpm
index d44c8f5fc..5e3dbfe1a 100644
--- a/images/EditButtons/Copy.xpm
+++ b/images/EditButtons/Copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Copy[] = {
+static const char * const const Copy[] = {
 "26 24 11 1",
 " 	c None",
 ".	c #CCCCCC",
diff --git a/images/EditButtons/CopyAlpha.xpm b/images/EditButtons/CopyAlpha.xpm
index 21afc75da..9888ed662 100644
--- a/images/EditButtons/CopyAlpha.xpm
+++ b/images/EditButtons/CopyAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * CopyAlpha[] = {
+static const char * const CopyAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/CopyDisabled.xpm b/images/EditButtons/CopyDisabled.xpm
index 8e900dedd..9f6090fc9 100644
--- a/images/EditButtons/CopyDisabled.xpm
+++ b/images/EditButtons/CopyDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * CopyDisabled[] = {
+static const char * const CopyDisabled[] = {
 "26 24 11 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EditButtons/Cut.xpm b/images/EditButtons/Cut.xpm
index ccb7c3255..0ea5b6168 100644
--- a/images/EditButtons/Cut.xpm
+++ b/images/EditButtons/Cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Cut[] = {
+static const char * const Cut[] = {
 "26 24 6 1",
 " 	c None",
 ".	c #808080",
diff --git a/images/EditButtons/CutAlpha.xpm b/images/EditButtons/CutAlpha.xpm
index 55129b44a..fa4f17ef0 100644
--- a/images/EditButtons/CutAlpha.xpm
+++ b/images/EditButtons/CutAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * CutAlpha[] = {
+static const char * const CutAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/CutDisabled.xpm b/images/EditButtons/CutDisabled.xpm
index 544b323cc..810bbf9fe 100644
--- a/images/EditButtons/CutDisabled.xpm
+++ b/images/EditButtons/CutDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * CutDisabled[] = {
+static const char * const CutDisabled[] = {
 "26 24 6 1",
 " 	c None",
 ".	c #919191",
diff --git a/images/EditButtons/Disabled.xpm b/images/EditButtons/Disabled.xpm
index 62594eff9..37ccd7653 100644
--- a/images/EditButtons/Disabled.xpm
+++ b/images/EditButtons/Disabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Disabled[] = {
+static const char * const Disabled[] = {
 "48 48 165 2",
 "  	c None",
 ". 	c #CACACA",
diff --git a/images/EditButtons/Down.xpm b/images/EditButtons/Down.xpm
index 1db8aef25..98127a798 100644
--- a/images/EditButtons/Down.xpm
+++ b/images/EditButtons/Down.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Down[] = {
+static const char * const Down[] = {
 "27 27 27 1",
 " 	c None",
 ".	c #3B3B3B",
diff --git a/images/EditButtons/Effects.xpm b/images/EditButtons/Effects.xpm
index 7d194be2a..18a89940f 100644
--- a/images/EditButtons/Effects.xpm
+++ b/images/EditButtons/Effects.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Effects_xpm[] = {
+static const char * const Effects_xpm[] = {
 "26 24 78 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/EditButtons/Hilite.xpm b/images/EditButtons/Hilite.xpm
index 0529afab6..7b4061f3c 100644
--- a/images/EditButtons/Hilite.xpm
+++ b/images/EditButtons/Hilite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Hilite[] = {
+static const char * const Hilite[] = {
 "27 27 85 1",
 " 	c None",
 ".	c #FBFBFB",
diff --git a/images/EditButtons/Paste.xpm b/images/EditButtons/Paste.xpm
index 1fabf0c92..bcefdb587 100644
--- a/images/EditButtons/Paste.xpm
+++ b/images/EditButtons/Paste.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Paste[] = {
+static const char * const Paste[] = {
 "26 24 14 1",
 " 	c None",
 ".	c #222222",
diff --git a/images/EditButtons/PasteAlpha.xpm b/images/EditButtons/PasteAlpha.xpm
index 2a0840bb4..d75782161 100644
--- a/images/EditButtons/PasteAlpha.xpm
+++ b/images/EditButtons/PasteAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * PasteAlpha[] = {
+static const char * const PasteAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/PasteDisabled.xpm b/images/EditButtons/PasteDisabled.xpm
index 406c5227f..71a025d07 100644
--- a/images/EditButtons/PasteDisabled.xpm
+++ b/images/EditButtons/PasteDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * PasteDisabled[] = {
+static const char * const PasteDisabled[] = {
 "26 24 14 1",
 " 	c None",
 ".	c #757575",
diff --git a/images/EditButtons/Redo.xpm b/images/EditButtons/Redo.xpm
index 8348106cd..7880433bb 100644
--- a/images/EditButtons/Redo.xpm
+++ b/images/EditButtons/Redo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * Redo[] = {
+static const char * const Redo[] = {
 "26 24 4 1",
 " 	c None",
 ".	c #686868",
diff --git a/images/EditButtons/RedoAlpha.xpm b/images/EditButtons/RedoAlpha.xpm
index 931443fe4..c2905fb88 100644
--- a/images/EditButtons/RedoAlpha.xpm
+++ b/images/EditButtons/RedoAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * RedoAlpha[] = {
+static const char * const RedoAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/RedoDisabled.xpm b/images/EditButtons/RedoDisabled.xpm
index 5cadfdbc5..1e4c701a9 100644
--- a/images/EditButtons/RedoDisabled.xpm
+++ b/images/EditButtons/RedoDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * RedoDisabled[] = {
+static const char * const RedoDisabled[] = {
 "26 24 4 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EditButtons/Silence.xpm b/images/EditButtons/Silence.xpm
index 8220337c6..73423511d 100644
--- a/images/EditButtons/Silence.xpm
+++ b/images/EditButtons/Silence.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * Silence[] = {
+static const char * const Silence[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/SilenceAlpha.xpm b/images/EditButtons/SilenceAlpha.xpm
index 7a9eabc92..14b7c9df2 100644
--- a/images/EditButtons/SilenceAlpha.xpm
+++ b/images/EditButtons/SilenceAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SilenceAlpha[] = {
+static const char * const SilenceAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/SilenceDisabled.xpm b/images/EditButtons/SilenceDisabled.xpm
index 4c8a8bd91..0f0462ecc 100644
--- a/images/EditButtons/SilenceDisabled.xpm
+++ b/images/EditButtons/SilenceDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SilenceDisabled[] = {
+static const char * const SilenceDisabled[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/EditButtons/Trim.xpm b/images/EditButtons/Trim.xpm
index 643e60d70..5f450f668 100644
--- a/images/EditButtons/Trim.xpm
+++ b/images/EditButtons/Trim.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * Trim[] = {
+static const char * const Trim[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/TrimAlpha.xpm b/images/EditButtons/TrimAlpha.xpm
index 5d453db81..c89f71e9d 100644
--- a/images/EditButtons/TrimAlpha.xpm
+++ b/images/EditButtons/TrimAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * TrimAlpha[] = {
+static const char * const TrimAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/TrimDisabled.xpm b/images/EditButtons/TrimDisabled.xpm
index 1efb3af53..81679ae84 100644
--- a/images/EditButtons/TrimDisabled.xpm
+++ b/images/EditButtons/TrimDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * TrimDisabled[] = {
+static const char * const TrimDisabled[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/EditButtons/Undo.xpm b/images/EditButtons/Undo.xpm
index f9e11909c..6c0974a83 100644
--- a/images/EditButtons/Undo.xpm
+++ b/images/EditButtons/Undo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * Undo[] = {
+static const char * const Undo[] = {
 "26 24 4 1",
 " 	c None",
 ".	c #222222",
diff --git a/images/EditButtons/UndoAlpha.xpm b/images/EditButtons/UndoAlpha.xpm
index 11eeada60..b8ecb5d6d 100644
--- a/images/EditButtons/UndoAlpha.xpm
+++ b/images/EditButtons/UndoAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * UndoAlpha[] = {
+static const char * const UndoAlpha[] = {
 "26 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/UndoDisabled.xpm b/images/EditButtons/UndoDisabled.xpm
index ae9e9a35d..633ee2927 100644
--- a/images/EditButtons/UndoDisabled.xpm
+++ b/images/EditButtons/UndoDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * UndoDisabled[] = {
+static const char * const UndoDisabled[] = {
 "26 24 4 1",
 " 	c None",
 ".	c #757575",
diff --git a/images/EditButtons/Up.xpm b/images/EditButtons/Up.xpm
index e2adc075c..f2b9baa1c 100644
--- a/images/EditButtons/Up.xpm
+++ b/images/EditButtons/Up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Up[] = {
+static const char * const Up[] = {
 "27 27 15 1",
 " 	c None",
 ".	c #FBFBFB",
diff --git a/images/EditButtons/ZoomFit.xpm b/images/EditButtons/ZoomFit.xpm
index 1b3007f45..5c763ba02 100644
--- a/images/EditButtons/ZoomFit.xpm
+++ b/images/EditButtons/ZoomFit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomFit[] = {
+static const char * const ZoomFit[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/EditButtons/ZoomFitAlpha.xpm b/images/EditButtons/ZoomFitAlpha.xpm
index fda2575f1..35e8533c7 100644
--- a/images/EditButtons/ZoomFitAlpha.xpm
+++ b/images/EditButtons/ZoomFitAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomFitAlpha[] = {
+static const char * const ZoomFitAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/ZoomFitDisabled.xpm b/images/EditButtons/ZoomFitDisabled.xpm
index bd8502519..d4666f9fe 100644
--- a/images/EditButtons/ZoomFitDisabled.xpm
+++ b/images/EditButtons/ZoomFitDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomFitDisabled[] = {
+static const char * const ZoomFitDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EditButtons/ZoomIn.xpm b/images/EditButtons/ZoomIn.xpm
index dfb086bd6..98c23b4e7 100644
--- a/images/EditButtons/ZoomIn.xpm
+++ b/images/EditButtons/ZoomIn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomIn[] = {
+static const char * const ZoomIn[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/EditButtons/ZoomInAlpha.xpm b/images/EditButtons/ZoomInAlpha.xpm
index fd47441ec..9ef75ad64 100644
--- a/images/EditButtons/ZoomInAlpha.xpm
+++ b/images/EditButtons/ZoomInAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomInAlpha[] = {
+static const char * const ZoomInAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/ZoomInDisabled.xpm b/images/EditButtons/ZoomInDisabled.xpm
index 4baf3c0a5..3a109fa47 100644
--- a/images/EditButtons/ZoomInDisabled.xpm
+++ b/images/EditButtons/ZoomInDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomInDisabled[] = {
+static const char * const ZoomInDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EditButtons/ZoomOut.xpm b/images/EditButtons/ZoomOut.xpm
index 718d3e3f8..ac31e33a0 100644
--- a/images/EditButtons/ZoomOut.xpm
+++ b/images/EditButtons/ZoomOut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomOut[] = {
+static const char * const ZoomOut[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/EditButtons/ZoomOutAlpha.xpm b/images/EditButtons/ZoomOutAlpha.xpm
index f9261a552..3861c4bbb 100644
--- a/images/EditButtons/ZoomOutAlpha.xpm
+++ b/images/EditButtons/ZoomOutAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomOutAlpha[] = {
+static const char * const ZoomOutAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/ZoomOutDisabled.xpm b/images/EditButtons/ZoomOutDisabled.xpm
index 2e8d96e06..32dd68e3c 100644
--- a/images/EditButtons/ZoomOutDisabled.xpm
+++ b/images/EditButtons/ZoomOutDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomOutDisabled[] = {
+static const char * const ZoomOutDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EditButtons/ZoomSel.xpm b/images/EditButtons/ZoomSel.xpm
index a2cdd79f3..b530163e6 100644
--- a/images/EditButtons/ZoomSel.xpm
+++ b/images/EditButtons/ZoomSel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomSel[] = {
+static const char * const ZoomSel[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/EditButtons/ZoomSelAlpha.xpm b/images/EditButtons/ZoomSelAlpha.xpm
index 99dc5cf8f..2d10ff75a 100644
--- a/images/EditButtons/ZoomSelAlpha.xpm
+++ b/images/EditButtons/ZoomSelAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomSelAlpha[] = {
+static const char * const ZoomSelAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/ZoomSelDisabled.xpm b/images/EditButtons/ZoomSelDisabled.xpm
index 506810a89..d3b658d6e 100644
--- a/images/EditButtons/ZoomSelDisabled.xpm
+++ b/images/EditButtons/ZoomSelDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomSelDisabled[] = {
+static const char * const ZoomSelDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EditButtons/ZoomToggle.xpm b/images/EditButtons/ZoomToggle.xpm
index 9ffc82f57..708efd6a7 100644
--- a/images/EditButtons/ZoomToggle.xpm
+++ b/images/EditButtons/ZoomToggle.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomToggle[] = {
+static const char * const ZoomToggle[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/EditButtons/ZoomToggleAlpha.xpm b/images/EditButtons/ZoomToggleAlpha.xpm
index 3d0e8e0f3..e72df3bf3 100644
--- a/images/EditButtons/ZoomToggleAlpha.xpm
+++ b/images/EditButtons/ZoomToggleAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomToggleAlpha[] = {
+static const char * const ZoomToggleAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EditButtons/ZoomToggleDisabled.xpm b/images/EditButtons/ZoomToggleDisabled.xpm
index d65c8d560..aa8d96049 100644
--- a/images/EditButtons/ZoomToggleDisabled.xpm
+++ b/images/EditButtons/ZoomToggleDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomToggleDisabled[] = {
+static const char * const ZoomToggleDisabled[] = {
 "27 27 7 1",
 " 	c None",
 ".	c #A8A8A8",
diff --git a/images/EffectRack/down-9x16.xpm b/images/EffectRack/down-9x16.xpm
index c658eda4b..bbc4c4aa9 100644
--- a/images/EffectRack/down-9x16.xpm
+++ b/images/EffectRack/down-9x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *down_9x16_xpm[] = {
+static const char * const down_9x16_xpm[] = {
 "9 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EffectRack/fav-down-16x16.xpm b/images/EffectRack/fav-down-16x16.xpm
index 102e1fa1c..c4a1e432d 100644
--- a/images/EffectRack/fav-down-16x16.xpm
+++ b/images/EffectRack/fav-down-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *fav_down_16x16_xpm[] = {
+static const char * const fav_down_16x16_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EffectRack/fav-up-16x16.xpm b/images/EffectRack/fav-up-16x16.xpm
index e612760a1..59d9cafcd 100644
--- a/images/EffectRack/fav-up-16x16.xpm
+++ b/images/EffectRack/fav-up-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *fav_up_16x16_xpm[] = {
+static const char * const fav_up_16x16_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/EffectRack/power-off-16x16.xpm b/images/EffectRack/power-off-16x16.xpm
index afaf45bd4..9014d93cf 100644
--- a/images/EffectRack/power-off-16x16.xpm
+++ b/images/EffectRack/power-off-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *power_off_16x16_xpm[] = {
+static const char * const power_off_16x16_xpm[] = {
 "16 16 4 1",
 " 	c None",
 "a c #FF0000",
diff --git a/images/EffectRack/power-on-16x16.xpm b/images/EffectRack/power-on-16x16.xpm
index b4ac365f4..945dcdc90 100644
--- a/images/EffectRack/power-on-16x16.xpm
+++ b/images/EffectRack/power-on-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *power_on_16x16_xpm[] = {
+static const char * const power_on_16x16_xpm[] = {
 "16 16 4 1",
 " 	c None",
 "a c #00FF00",
diff --git a/images/EffectRack/remove-16x16.xpm b/images/EffectRack/remove-16x16.xpm
index 8d3f331f0..50e80f1c8 100644
--- a/images/EffectRack/remove-16x16.xpm
+++ b/images/EffectRack/remove-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *remove_16x16_xpm[] = {
+static const char * const remove_16x16_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #FF0000",
diff --git a/images/EffectRack/settings-down-16x16.xpm b/images/EffectRack/settings-down-16x16.xpm
index 1b21d5441..54cfa9e18 100644
--- a/images/EffectRack/settings-down-16x16.xpm
+++ b/images/EffectRack/settings-down-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *settings_down_16x16_xpm[] = {
+static const char * const settings_down_16x16_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #020202",
diff --git a/images/EffectRack/settings-up-16x16.xpm b/images/EffectRack/settings-up-16x16.xpm
index 7b5290c12..3212818c3 100644
--- a/images/EffectRack/settings-up-16x16.xpm
+++ b/images/EffectRack/settings-up-16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *settings_up_16x16_xpm[] = {
+static const char * const settings_up_16x16_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #020202",
diff --git a/images/EffectRack/up-9x16.xpm b/images/EffectRack/up-9x16.xpm
index 7ae59a868..4e291e958 100644
--- a/images/EffectRack/up-9x16.xpm
+++ b/images/EffectRack/up-9x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *up_9x16_xpm[] = {
+static const char * const up_9x16_xpm[] = {
 "9 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/Empty9x16.xpm b/images/Empty9x16.xpm
index 48cfef414..41fa92886 100644
--- a/images/Empty9x16.xpm
+++ b/images/Empty9x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * empty9x16_xpm[] = {
+static const char * const empty9x16_xpm[] = {
 "9 16 2 1",
 "# c #000000", 
 ". c #FFFFFF", 
diff --git a/images/ExpandingToolBar/ToolBarGrabber.xpm b/images/ExpandingToolBar/ToolBarGrabber.xpm
index 4d7120943..16b8d3fb4 100644
--- a/images/ExpandingToolBar/ToolBarGrabber.xpm
+++ b/images/ExpandingToolBar/ToolBarGrabber.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *ToolBarGrabber[] = {
+static const char * const ToolBarGrabber[] = {
 /* columns rows colors chars-per-pixel */
 "17 8 6 1",
 "  c cyan",
diff --git a/images/ExpandingToolBar/ToolBarTarget.xpm b/images/ExpandingToolBar/ToolBarTarget.xpm
index 6bf44c8fd..71245bcaa 100644
--- a/images/ExpandingToolBar/ToolBarTarget.xpm
+++ b/images/ExpandingToolBar/ToolBarTarget.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *ToolBarTarget[] = {
+static const char * const ToolBarTarget[] = {
 /* columns rows colors chars-per-pixel */
 "17 26 3 1",
 "  c cyan",
diff --git a/images/ExpandingToolBar/ToolBarToggle.xpm b/images/ExpandingToolBar/ToolBarToggle.xpm
index 90c4afe5d..54b1092c2 100644
--- a/images/ExpandingToolBar/ToolBarToggle.xpm
+++ b/images/ExpandingToolBar/ToolBarToggle.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *ToolBarToggle[] = {
+static const char * const ToolBarToggle[] = {
 /* columns rows colors chars-per-pixel */
 "43 35 14 1",
 "  c #777777",
diff --git a/images/Help.xpm b/images/Help.xpm
index 572cdf7ae..1f34a011d 100644
--- a/images/Help.xpm
+++ b/images/Help.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * Help_xpm[] = {
+static const char * const Help_xpm[] = {
 "21 21 31 1",
 " 	c None",
 ".	c #6699FF",
diff --git a/images/MicMenu.xpm b/images/MicMenu.xpm
index 02cfb9867..f4422b574 100644
--- a/images/MicMenu.xpm
+++ b/images/MicMenu.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * MicMenu_xpm[] = {
+static const char * const MicMenu_xpm[] = {
 "24 19 18 1",
 " 	c None",
 ".	c #000000",
@@ -40,7 +40,7 @@ static const char * MicMenu_xpm[] = {
 ".                   .   "};
 
 /* XPM */
-static const char * MicMenuNarrow_xpm[] = {
+static const char * const MicMenuNarrow_xpm[] = {
 "19 19 18 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/MixerImages/Mic.xpm b/images/MixerImages/Mic.xpm
index 659a933d1..f99f715e0 100644
--- a/images/MixerImages/Mic.xpm
+++ b/images/MixerImages/Mic.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Mic[] = {
+static const char * const Mic[] = {
 "25 25 19 1",
 " 	c None",
 ".	c #DEDEDE",
diff --git a/images/MixerImages/MicAlpha.xpm b/images/MixerImages/MicAlpha.xpm
index 2fb175569..17dd2969d 100644
--- a/images/MixerImages/MicAlpha.xpm
+++ b/images/MixerImages/MicAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * MicAlpha[] = {
+static const char * const MicAlpha[] = {
 "25 25 2 1",
 ".	c #000000",
 "#	c #FFFFFF",
diff --git a/images/MixerImages/Speaker.xpm b/images/MixerImages/Speaker.xpm
index d688ab281..afdb69511 100644
--- a/images/MixerImages/Speaker.xpm
+++ b/images/MixerImages/Speaker.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Speaker[] = {
+static const char * const Speaker[] = {
 "25 25 17 1",
 " 	c None",
 ".	c #DEDEDE",
diff --git a/images/MixerImages/SpeakerAlpha.xpm b/images/MixerImages/SpeakerAlpha.xpm
index d28d28a47..2a1781bc3 100644
--- a/images/MixerImages/SpeakerAlpha.xpm
+++ b/images/MixerImages/SpeakerAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * SpeakerAlpha[] = {
+static const char * const SpeakerAlpha[] = {
 "25 25 2 1",
 ".	c #000000",
 "#	c #FFFFFF",
diff --git a/images/MusicalInstruments/_default_instrument.xpm b/images/MusicalInstruments/_default_instrument.xpm
index 0df8490dc..3538b9c47 100644
--- a/images/MusicalInstruments/_default_instrument.xpm
+++ b/images/MusicalInstruments/_default_instrument.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * _default_instrument_xpm[] = {
+static const char * const _default_instrument_xpm[] = {
 "48 48 555 2",
 "  	c #969696",
 ". 	c #939395",
diff --git a/images/MusicalInstruments/acoustic_guitar_gtr.xpm b/images/MusicalInstruments/acoustic_guitar_gtr.xpm
index f4baa277a..1f2f71877 100644
--- a/images/MusicalInstruments/acoustic_guitar_gtr.xpm
+++ b/images/MusicalInstruments/acoustic_guitar_gtr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * acoustic_guitar_gtr_xpm[] = {
+static const char * const acoustic_guitar_gtr_xpm[] = {
 "48 48 935 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/acoustic_piano_pno.xpm b/images/MusicalInstruments/acoustic_piano_pno.xpm
index 1ebcf764f..8d8e1873d 100644
--- a/images/MusicalInstruments/acoustic_piano_pno.xpm
+++ b/images/MusicalInstruments/acoustic_piano_pno.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * acoustic_piano_pno_xpm[] = {
+static const char * const acoustic_piano_pno_xpm[] = {
 "48 48 750 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/back_vocal_bg_vox.xpm b/images/MusicalInstruments/back_vocal_bg_vox.xpm
index 90c3bdc71..a23f97e54 100644
--- a/images/MusicalInstruments/back_vocal_bg_vox.xpm
+++ b/images/MusicalInstruments/back_vocal_bg_vox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * back_vocal_bg_vox_xpm[] = {
+static const char * const back_vocal_bg_vox_xpm[] = {
 "48 48 530 2",
 "  	c #969696",
 ". 	c #636A71",
diff --git a/images/MusicalInstruments/clap.xpm b/images/MusicalInstruments/clap.xpm
index e4d343d91..4599c9de8 100644
--- a/images/MusicalInstruments/clap.xpm
+++ b/images/MusicalInstruments/clap.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * clap_xpm[] = {
+static const char * const clap_xpm[] = {
 "48 48 587 2",
 "  	c #969696",
 ". 	c #57575F",
diff --git a/images/MusicalInstruments/drums_dr.xpm b/images/MusicalInstruments/drums_dr.xpm
index 0030f85c6..1fcc5cc6a 100644
--- a/images/MusicalInstruments/drums_dr.xpm
+++ b/images/MusicalInstruments/drums_dr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * drums_dr_xpm[] = {
+static const char * const drums_dr_xpm[] = {
 "48 48 828 2",
 "  	c #969696",
 ". 	c #707477",
diff --git a/images/MusicalInstruments/electric_bass_guitar_bs_gtr.xpm b/images/MusicalInstruments/electric_bass_guitar_bs_gtr.xpm
index 4e46af91f..8a65ab911 100644
--- a/images/MusicalInstruments/electric_bass_guitar_bs_gtr.xpm
+++ b/images/MusicalInstruments/electric_bass_guitar_bs_gtr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * electric_bass_guitar_bs_gtr_xpm[] = {
+static const char * const electric_bass_guitar_bs_gtr_xpm[] = {
 "48 48 866 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/electric_guitar_gtr.xpm b/images/MusicalInstruments/electric_guitar_gtr.xpm
index ff8291f51..8e2e7737f 100644
--- a/images/MusicalInstruments/electric_guitar_gtr.xpm
+++ b/images/MusicalInstruments/electric_guitar_gtr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * electric_guitar_gtr_xpm[] = {
+static const char * const electric_guitar_gtr_xpm[] = {
 "48 48 1042 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/electric_piano_pno_key.xpm b/images/MusicalInstruments/electric_piano_pno_key.xpm
index acd86f7bb..7342354f2 100644
--- a/images/MusicalInstruments/electric_piano_pno_key.xpm
+++ b/images/MusicalInstruments/electric_piano_pno_key.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * electric_piano_pno_key_xpm[] = {
+static const char * const electric_piano_pno_key_xpm[] = {
 "48 48 862 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/kick.xpm b/images/MusicalInstruments/kick.xpm
index 9b838fc82..c31270445 100644
--- a/images/MusicalInstruments/kick.xpm
+++ b/images/MusicalInstruments/kick.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * kick_xpm[] = {
+static const char * const kick_xpm[] = {
 "48 48 256 2",
 "  	c #FFFFFF",
 ". 	c #636363",
diff --git a/images/MusicalInstruments/loop.xpm b/images/MusicalInstruments/loop.xpm
index ef17c17ee..3dfd28e73 100644
--- a/images/MusicalInstruments/loop.xpm
+++ b/images/MusicalInstruments/loop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * loop_xpm[] = {
+static const char * const loop_xpm[] = {
 "48 48 958 2",
 "  	c #969696",
 ". 	c #6E4137",
diff --git a/images/MusicalInstruments/organ_org.xpm b/images/MusicalInstruments/organ_org.xpm
index 11d6b8b6b..ffa41a0b0 100644
--- a/images/MusicalInstruments/organ_org.xpm
+++ b/images/MusicalInstruments/organ_org.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * organ_org_xpm[] = {
+static const char * const organ_org_xpm[] = {
 "48 48 862 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/perc.xpm b/images/MusicalInstruments/perc.xpm
index 9f3d565b3..4306818e7 100644
--- a/images/MusicalInstruments/perc.xpm
+++ b/images/MusicalInstruments/perc.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * perc_xpm[] = {
+static const char * const perc_xpm[] = {
 "48 48 370 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/sax.xpm b/images/MusicalInstruments/sax.xpm
index f6d0e792b..8d241c6e4 100644
--- a/images/MusicalInstruments/sax.xpm
+++ b/images/MusicalInstruments/sax.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * sax_xpm[] = {
+static const char * const sax_xpm[] = {
 "48 48 459 2",
 "  	c #969696",
 ". 	c #75797D",
diff --git a/images/MusicalInstruments/snare.xpm b/images/MusicalInstruments/snare.xpm
index d5d1bfbc7..4ae584607 100644
--- a/images/MusicalInstruments/snare.xpm
+++ b/images/MusicalInstruments/snare.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * snare_xpm[] = {
+static const char * const snare_xpm[] = {
 "48 48 1369 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/string_violin_cello.xpm b/images/MusicalInstruments/string_violin_cello.xpm
index 996242247..90401c8d8 100644
--- a/images/MusicalInstruments/string_violin_cello.xpm
+++ b/images/MusicalInstruments/string_violin_cello.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * string_violin_cello_xpm[] = {
+static const char * const string_violin_cello_xpm[] = {
 "48 48 599 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/synth.xpm b/images/MusicalInstruments/synth.xpm
index 754f90c18..99af82e47 100644
--- a/images/MusicalInstruments/synth.xpm
+++ b/images/MusicalInstruments/synth.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * synth_xpm[] = {
+static const char * const synth_xpm[] = {
 "48 48 363 2",
 "  	c None",
 ". 	c #969696",
diff --git a/images/MusicalInstruments/tambo.xpm b/images/MusicalInstruments/tambo.xpm
index b75099b20..db4bb9deb 100644
--- a/images/MusicalInstruments/tambo.xpm
+++ b/images/MusicalInstruments/tambo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * tambo_xpm[] = {
+static const char * const tambo_xpm[] = {
 "48 48 1133 2",
 "  	c #969696",
 ". 	c #7F8285",
diff --git a/images/MusicalInstruments/trumpet_horn.xpm b/images/MusicalInstruments/trumpet_horn.xpm
index df0a49d8f..5d8a1fa95 100644
--- a/images/MusicalInstruments/trumpet_horn.xpm
+++ b/images/MusicalInstruments/trumpet_horn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * trumpet_horn_xpm[] = {
+static const char * const trumpet_horn_xpm[] = {
 "48 48 46 1",
 " 	c #969696",
 ".	c #C7A179",
diff --git a/images/MusicalInstruments/turntable.xpm b/images/MusicalInstruments/turntable.xpm
index 6807718a3..c878b3991 100644
--- a/images/MusicalInstruments/turntable.xpm
+++ b/images/MusicalInstruments/turntable.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * turntable_xpm[] = {
+static const char * const turntable_xpm[] = {
 "48 48 685 2",
 "  	c #969696",
 ". 	c #6A6D70",
diff --git a/images/MusicalInstruments/vibraphone_vibes.xpm b/images/MusicalInstruments/vibraphone_vibes.xpm
index b68237632..c60e23707 100644
--- a/images/MusicalInstruments/vibraphone_vibes.xpm
+++ b/images/MusicalInstruments/vibraphone_vibes.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * vibraphone_vibes_xpm[] = {
+static const char * const vibraphone_vibes_xpm[] = {
 "48 48 714 2",
 "  	c #969696",
 ". 	c #444E59",
diff --git a/images/MusicalInstruments/vocal_vox.xpm b/images/MusicalInstruments/vocal_vox.xpm
index 62b3e2ba0..9c54f2695 100644
--- a/images/MusicalInstruments/vocal_vox.xpm
+++ b/images/MusicalInstruments/vocal_vox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * vocal_vox_xpm[] = {
+static const char * const vocal_vox_xpm[] = {
 "48 48 699 2",
 "  	c #969696",
 ". 	c #55575C",
diff --git a/images/SliderThumb.xpm b/images/SliderThumb.xpm
index 02f609cf7..7d58bef01 100644
--- a/images/SliderThumb.xpm
+++ b/images/SliderThumb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * SliderThumb[] = {
+static const char * const SliderThumb[] = {
 "11 14 7 1",
 " 	c None",
 ".	c #DEDEDE",
diff --git a/images/SliderThumbAlpha.xpm b/images/SliderThumbAlpha.xpm
index 0cb633e67..5a3bad66e 100644
--- a/images/SliderThumbAlpha.xpm
+++ b/images/SliderThumbAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  *SliderThumbAlpha[] = {
+static const char * const SliderThumbAlpha[] = {
 "11 14 2 1",
 ".  c #000000",
 "#  c #ffffff",
diff --git a/images/SliderThumbDisabled.xpm b/images/SliderThumbDisabled.xpm
index da0d520f5..5bcfb4354 100644
--- a/images/SliderThumbDisabled.xpm
+++ b/images/SliderThumbDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * SliderThumbDisabled[] = {
+static const char * const SliderThumbDisabled[] = {
 "11 14 7 1",
 " 	c None",
 ".	c #DEDEDE",
diff --git a/images/SliderThumb_Vertical.xpm b/images/SliderThumb_Vertical.xpm
index 8d0f2f167..6083d5be1 100644
--- a/images/SliderThumb_Vertical.xpm
+++ b/images/SliderThumb_Vertical.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SliderThumb_Vertical[] = {
+static const char * const SliderThumb_Vertical[] = {
 "14 11 7 1",
 " 	c None",
 ".	c #DEDEDE",
diff --git a/images/SliderThumb_VerticalAlpha.xpm b/images/SliderThumb_VerticalAlpha.xpm
index b374066c4..1fab23d77 100644
--- a/images/SliderThumb_VerticalAlpha.xpm
+++ b/images/SliderThumb_VerticalAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * SliderThumb_VerticalAlpha[] = {
+static const char * const SliderThumb_VerticalAlpha[] = {
 "14 11 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/SliderThumb_VerticalDisabled.xpm b/images/SliderThumb_VerticalDisabled.xpm
index 59a42f3b8..8cad9bbad 100644
--- a/images/SliderThumb_VerticalDisabled.xpm
+++ b/images/SliderThumb_VerticalDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * SliderThumb_VerticalDisabled[] = {
+static const char * const SliderThumb_VerticalDisabled[] = {
 "14 11 7 1",
 " 	c None",
 ".	c #DEDEDE",
diff --git a/images/SpeakerMenu.xpm b/images/SpeakerMenu.xpm
index c08ce542c..c9f0b1dc8 100644
--- a/images/SpeakerMenu.xpm
+++ b/images/SpeakerMenu.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * SpeakerMenu_xpm[] = {
+static const char * const SpeakerMenu_xpm[] = {
 "24 19 14 1",
 " 	c None",
 ".	c #C1C1C1",
@@ -36,7 +36,7 @@ static const char * SpeakerMenu_xpm[] = {
 "                    $   "};
 
 /* XPM */
-static const char * SpeakerMenuNarrow_xpm[] = {
+static const char * const SpeakerMenuNarrow_xpm[] = {
 "19 19 14 1",
 " 	c None",
 ".	c #C1C1C1",
@@ -71,4 +71,4 @@ static const char * SpeakerMenuNarrow_xpm[] = {
 "             $$$$$ ",
 "              $$$  ",
 "               $   "};
- 
\ No newline at end of file
+ 
diff --git a/images/ToolBarImages/DockDown.xpm b/images/ToolBarImages/DockDown.xpm
index 178e093ba..d6d354fa2 100644
--- a/images/ToolBarImages/DockDown.xpm
+++ b/images/ToolBarImages/DockDown.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * DockDown[] = {
+static const char * const DockDown[] = {
 "15 55 6 1",
 " 	c None",
 ".	c #8E8E8E",
diff --git a/images/ToolBarImages/DockDownShort.xpm b/images/ToolBarImages/DockDownShort.xpm
index 2625b1927..43a7e8093 100644
--- a/images/ToolBarImages/DockDownShort.xpm
+++ b/images/ToolBarImages/DockDownShort.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * DockDownShort[] = {
+static const char * const DockDownShort[] = {
 "15 27 6 1",
 " 	c None",
 ".	c #8E8E8E",
diff --git a/images/ToolBarImages/DockOver.xpm b/images/ToolBarImages/DockOver.xpm
index 9b9cb2b5d..31aafc48e 100644
--- a/images/ToolBarImages/DockOver.xpm
+++ b/images/ToolBarImages/DockOver.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * DockOver[] = {
+static const char * const DockOver[] = {
 "15 55 35 1",
 " 	c None",
 ".	c #E2E2DE",
diff --git a/images/ToolBarImages/DockOverShort.xpm b/images/ToolBarImages/DockOverShort.xpm
index 7d3d73d0d..38b1be7eb 100644
--- a/images/ToolBarImages/DockOverShort.xpm
+++ b/images/ToolBarImages/DockOverShort.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * DockOverShort[] = {
+static const char * const DockOverShort[] = {
 "15 27 35 1",
 " 	c None",
 ".	c #E2E2DE",
diff --git a/images/ToolBarImages/DockUp.xpm b/images/ToolBarImages/DockUp.xpm
index dcb12be0e..b8b55f0d0 100644
--- a/images/ToolBarImages/DockUp.xpm
+++ b/images/ToolBarImages/DockUp.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * DockUp[] = {
+static const char * const DockUp[] = {
 "15 55 6 1",
 " 	c None",
 ".	c #E2E2DE",
diff --git a/images/ToolBarImages/DockUpShort.xpm b/images/ToolBarImages/DockUpShort.xpm
index 951516a73..a492d4a3c 100644
--- a/images/ToolBarImages/DockUpShort.xpm
+++ b/images/ToolBarImages/DockUpShort.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * DockUpShort[] = {
+static const char * const DockUpShort[] = {
 "15 27 6 1",
 " 	c None",
 ".	c #E2E2DE",
diff --git a/images/ToolsButtons/Draw.xpm b/images/ToolsButtons/Draw.xpm
index a6ec04519..319ea6346 100644
--- a/images/ToolsButtons/Draw.xpm
+++ b/images/ToolsButtons/Draw.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Draw[] = {
+static const char * const Draw[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #D6D6D6",
diff --git a/images/ToolsButtons/DrawAlpha.xpm b/images/ToolsButtons/DrawAlpha.xpm
index 0b3ddaaa7..0df3999ab 100644
--- a/images/ToolsButtons/DrawAlpha.xpm
+++ b/images/ToolsButtons/DrawAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * DrawAlpha[] = {
+static const char * const DrawAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ToolsButtons/Envelope.xpm b/images/ToolsButtons/Envelope.xpm
index e3b35a0b4..b25dbc8a1 100644
--- a/images/ToolsButtons/Envelope.xpm
+++ b/images/ToolsButtons/Envelope.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Envelope[] = {
+static const char * const Envelope[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ToolsButtons/EnvelopeAlpha.xpm b/images/ToolsButtons/EnvelopeAlpha.xpm
index 612667b26..6491e1cc4 100644
--- a/images/ToolsButtons/EnvelopeAlpha.xpm
+++ b/images/ToolsButtons/EnvelopeAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * EnvelopeAlpha[] = {
+static const char * const EnvelopeAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ToolsButtons/IBeam.xpm b/images/ToolsButtons/IBeam.xpm
index fb678320e..da65a0c7a 100644
--- a/images/ToolsButtons/IBeam.xpm
+++ b/images/ToolsButtons/IBeam.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * IBeam[] = {
+static const char * const IBeam[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ToolsButtons/IBeamAlpha.xpm b/images/ToolsButtons/IBeamAlpha.xpm
index f144903ef..197627b3d 100644
--- a/images/ToolsButtons/IBeamAlpha.xpm
+++ b/images/ToolsButtons/IBeamAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * IBeamAlpha[] = {
+static const char * const IBeamAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ToolsButtons/Multi.xpm b/images/ToolsButtons/Multi.xpm
index b6da673b5..ea27963ff 100644
--- a/images/ToolsButtons/Multi.xpm
+++ b/images/ToolsButtons/Multi.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Multi[] = {
+static const char * const Multi[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 3 1",
 ". c #FFFFFF",
diff --git a/images/ToolsButtons/MultiAlpha.xpm b/images/ToolsButtons/MultiAlpha.xpm
index 157439243..1b98817ef 100644
--- a/images/ToolsButtons/MultiAlpha.xpm
+++ b/images/ToolsButtons/MultiAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * MultiAlpha[] = {
+static const char * const MultiAlpha[] = {
 /* columns rows colors chars-per-pixel */
 "27 27 2 1",
 ". c #000000",
diff --git a/images/ToolsButtons/TimeShift.xpm b/images/ToolsButtons/TimeShift.xpm
index 97d94cfc3..266f0359a 100644
--- a/images/ToolsButtons/TimeShift.xpm
+++ b/images/ToolsButtons/TimeShift.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TimeShift[] = {
+static const char * const TimeShift[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ToolsButtons/TimeShiftAlpha.xpm b/images/ToolsButtons/TimeShiftAlpha.xpm
index 22cd4f4a9..96e939979 100644
--- a/images/ToolsButtons/TimeShiftAlpha.xpm
+++ b/images/ToolsButtons/TimeShiftAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * TimeShiftAlpha[] = {
+static const char * const TimeShiftAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/ToolsButtons/Zoom.xpm b/images/ToolsButtons/Zoom.xpm
index 298ca9a6e..7b5bca7d3 100644
--- a/images/ToolsButtons/Zoom.xpm
+++ b/images/ToolsButtons/Zoom.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Zoom[] = {
+static const char * const Zoom[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/ToolsButtons/ZoomAlpha.xpm b/images/ToolsButtons/ZoomAlpha.xpm
index 18a4779ad..3f6307952 100644
--- a/images/ToolsButtons/ZoomAlpha.xpm
+++ b/images/ToolsButtons/ZoomAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * ZoomAlpha[] = {
+static const char * const ZoomAlpha[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/Automate.xpm b/images/TranscriptionImages/Automate.xpm
index 9b85ca5aa..64cebf889 100644
--- a/images/TranscriptionImages/Automate.xpm
+++ b/images/TranscriptionImages/Automate.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOn[] = {
+static const char * const EndOn[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/AutomateSelection.xpm b/images/TranscriptionImages/AutomateSelection.xpm
index 30bb23b40..b2f6681fa 100644
--- a/images/TranscriptionImages/AutomateSelection.xpm
+++ b/images/TranscriptionImages/AutomateSelection.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AutomateSelection[] = {
+static const char * const AutomateSelection[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/AutomateSelectionAlpha.xpm b/images/TranscriptionImages/AutomateSelectionAlpha.xpm
index e6b1b31b8..6c85aaf4f 100644
--- a/images/TranscriptionImages/AutomateSelectionAlpha.xpm
+++ b/images/TranscriptionImages/AutomateSelectionAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AutomateSelectionAlpha[] = {
+static const char * const AutomateSelectionAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/AutomateSelectionDisabled.xpm b/images/TranscriptionImages/AutomateSelectionDisabled.xpm
index 9dc5ed5bc..233177f79 100644
--- a/images/TranscriptionImages/AutomateSelectionDisabled.xpm
+++ b/images/TranscriptionImages/AutomateSelectionDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AutomateSelectionDisabled[] = {
+static const char * const AutomateSelectionDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/CalibrateAlpha.xpm b/images/TranscriptionImages/CalibrateAlpha.xpm
index 8b941580f..68f7f081f 100644
--- a/images/TranscriptionImages/CalibrateAlpha.xpm
+++ b/images/TranscriptionImages/CalibrateAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * CalibrateAlpha[] = {
+static const char * const CalibrateAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/CalibrateDisabled.xpm b/images/TranscriptionImages/CalibrateDisabled.xpm
index 7fc66ef19..8f4c5a144 100644
--- a/images/TranscriptionImages/CalibrateDisabled.xpm
+++ b/images/TranscriptionImages/CalibrateDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * CalibrateDisabled[] = {
+static const char * const CalibrateDisabled[] = {
 "27 27 13 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/CalibrateUp.xpm b/images/TranscriptionImages/CalibrateUp.xpm
index b67e78cba..f17961e41 100644
--- a/images/TranscriptionImages/CalibrateUp.xpm
+++ b/images/TranscriptionImages/CalibrateUp.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * CalibrateUp[] = {
+static const char * const CalibrateUp[] = {
 "27 27 14 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/Down.xpm b/images/TranscriptionImages/Down.xpm
index 1db8aef25..98127a798 100644
--- a/images/TranscriptionImages/Down.xpm
+++ b/images/TranscriptionImages/Down.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Down[] = {
+static const char * const Down[] = {
 "27 27 27 1",
 " 	c None",
 ".	c #3B3B3B",
diff --git a/images/TranscriptionImages/EndOff.xpm b/images/TranscriptionImages/EndOff.xpm
index b4eec535a..631258842 100644
--- a/images/TranscriptionImages/EndOff.xpm
+++ b/images/TranscriptionImages/EndOff.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOff[] = {
+static const char * const EndOff[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/EndOffAlpha.xpm b/images/TranscriptionImages/EndOffAlpha.xpm
index 72c006199..100f363bd 100644
--- a/images/TranscriptionImages/EndOffAlpha.xpm
+++ b/images/TranscriptionImages/EndOffAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOffAlpha[] = {
+static const char * const EndOffAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/EndOffDisabled.xpm b/images/TranscriptionImages/EndOffDisabled.xpm
index bfc141dc1..bad254a48 100644
--- a/images/TranscriptionImages/EndOffDisabled.xpm
+++ b/images/TranscriptionImages/EndOffDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOffDisabled[] = {
+static const char * const EndOffDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/EndOn.xpm b/images/TranscriptionImages/EndOn.xpm
index 9b85ca5aa..64cebf889 100644
--- a/images/TranscriptionImages/EndOn.xpm
+++ b/images/TranscriptionImages/EndOn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOn[] = {
+static const char * const EndOn[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/EndOnAlpha.xpm b/images/TranscriptionImages/EndOnAlpha.xpm
index fe903a2c1..a42d92e15 100644
--- a/images/TranscriptionImages/EndOnAlpha.xpm
+++ b/images/TranscriptionImages/EndOnAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOnAlpha[] = {
+static const char * const EndOnAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/EndOnDisabled.xpm b/images/TranscriptionImages/EndOnDisabled.xpm
index f08285586..7141104e1 100644
--- a/images/TranscriptionImages/EndOnDisabled.xpm
+++ b/images/TranscriptionImages/EndOnDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * EndOnDisabled[] = {
+static const char * const EndOnDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/Hilite.xpm b/images/TranscriptionImages/Hilite.xpm
index 0529afab6..7b4061f3c 100644
--- a/images/TranscriptionImages/Hilite.xpm
+++ b/images/TranscriptionImages/Hilite.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *Hilite[] = {
+static const char * const Hilite[] = {
 "27 27 85 1",
 " 	c None",
 ".	c #FBFBFB",
diff --git a/images/TranscriptionImages/MakeTag.xpm b/images/TranscriptionImages/MakeTag.xpm
index e8945252e..18084c22d 100644
--- a/images/TranscriptionImages/MakeTag.xpm
+++ b/images/TranscriptionImages/MakeTag.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * MakeTag[] = {
+static const char * const MakeTag[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/MakeTagAlpha.xpm b/images/TranscriptionImages/MakeTagAlpha.xpm
index 197c4cc7b..2dcae6835 100644
--- a/images/TranscriptionImages/MakeTagAlpha.xpm
+++ b/images/TranscriptionImages/MakeTagAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * MakeTagAlpha[] = {
+static const char * const MakeTagAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/MakeTagDisabled.xpm b/images/TranscriptionImages/MakeTagDisabled.xpm
index 1329dde18..e1bf9f5a5 100644
--- a/images/TranscriptionImages/MakeTagDisabled.xpm
+++ b/images/TranscriptionImages/MakeTagDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * MakeTagDisabled[] = {
+static const char * const MakeTagDisabled[] = {
 "27 27 4 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/SelectSilence.xpm b/images/TranscriptionImages/SelectSilence.xpm
index dfea3884a..972a69786 100644
--- a/images/TranscriptionImages/SelectSilence.xpm
+++ b/images/TranscriptionImages/SelectSilence.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SelectSilence[] = {
+static const char * const SelectSilence[] = {
 "24 24 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/SelectSilenceAlpha.xpm b/images/TranscriptionImages/SelectSilenceAlpha.xpm
index 2805198fd..cf2d9db46 100644
--- a/images/TranscriptionImages/SelectSilenceAlpha.xpm
+++ b/images/TranscriptionImages/SelectSilenceAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SelectSilenceAlpha[] = {
+static const char * const SelectSilenceAlpha[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/SelectSilenceDisabled.xpm b/images/TranscriptionImages/SelectSilenceDisabled.xpm
index 74849dc4a..1e47eb2ec 100644
--- a/images/TranscriptionImages/SelectSilenceDisabled.xpm
+++ b/images/TranscriptionImages/SelectSilenceDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SelectSilenceDisabled[] = {
+static const char * const SelectSilenceDisabled[] = {
 "24 24 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/SelectSound.xpm b/images/TranscriptionImages/SelectSound.xpm
index 206871849..ec0f7347f 100644
--- a/images/TranscriptionImages/SelectSound.xpm
+++ b/images/TranscriptionImages/SelectSound.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SelectSound[] = {
+static const char * const SelectSound[] = {
 "24 24 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/SelectSoundAlpha.xpm b/images/TranscriptionImages/SelectSoundAlpha.xpm
index ff4f34d67..ed11e44a0 100644
--- a/images/TranscriptionImages/SelectSoundAlpha.xpm
+++ b/images/TranscriptionImages/SelectSoundAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SelectSoundAlpha[] = {
+static const char * const SelectSoundAlpha[] = {
 "24 24 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/SelectSoundDisabled.xpm b/images/TranscriptionImages/SelectSoundDisabled.xpm
index 37048f409..84118cf3d 100644
--- a/images/TranscriptionImages/SelectSoundDisabled.xpm
+++ b/images/TranscriptionImages/SelectSoundDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * SelectSoundDisabled[] = {
+static const char * const SelectSoundDisabled[] = {
 "24 24 5 1",
 " 	c None",
 ".	c #777777",
diff --git a/images/TranscriptionImages/StartOff.xpm b/images/TranscriptionImages/StartOff.xpm
index 255d3e112..08e37e2f0 100644
--- a/images/TranscriptionImages/StartOff.xpm
+++ b/images/TranscriptionImages/StartOff.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * StartOff[] = {
+static const char * const StartOff[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/StartOffAlpha.xpm b/images/TranscriptionImages/StartOffAlpha.xpm
index b5e556cac..268f7a732 100644
--- a/images/TranscriptionImages/StartOffAlpha.xpm
+++ b/images/TranscriptionImages/StartOffAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * StartOffAlpha[] = {
+static const char * const StartOffAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/StartOffDisabled.xpm b/images/TranscriptionImages/StartOffDisabled.xpm
index 6ee4a4e04..8fd42261f 100644
--- a/images/TranscriptionImages/StartOffDisabled.xpm
+++ b/images/TranscriptionImages/StartOffDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * StartOffDisabled[] = {
+static const char * const StartOffDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/StartOn.xpm b/images/TranscriptionImages/StartOn.xpm
index c40e05fd7..c3608700c 100644
--- a/images/TranscriptionImages/StartOn.xpm
+++ b/images/TranscriptionImages/StartOn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * StartOn[] = {
+static const char * const StartOn[] = {
 "27 27 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/StartOnAlpha.xpm b/images/TranscriptionImages/StartOnAlpha.xpm
index c4904146b..a03b8c39d 100644
--- a/images/TranscriptionImages/StartOnAlpha.xpm
+++ b/images/TranscriptionImages/StartOnAlpha.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * StartOnAlpha[] = {
+static const char * const StartOnAlpha[] = {
 "27 27 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/images/TranscriptionImages/StartOnDisabled.xpm b/images/TranscriptionImages/StartOnDisabled.xpm
index 407cefcbd..51bbde365 100644
--- a/images/TranscriptionImages/StartOnDisabled.xpm
+++ b/images/TranscriptionImages/StartOnDisabled.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * StartOnDisabled[] = {
+static const char * const StartOnDisabled[] = {
 "27 27 6 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/TranscriptionImages/Up.xpm b/images/TranscriptionImages/Up.xpm
index e2adc075c..f2b9baa1c 100644
--- a/images/TranscriptionImages/Up.xpm
+++ b/images/TranscriptionImages/Up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * Up[] = {
+static const char * const Up[] = {
 "27 27 15 1",
 " 	c None",
 ".	c #FBFBFB",
diff --git a/images/Unchecked.xpm b/images/Unchecked.xpm
index 7baa85be7..d57ea4d3c 100644
--- a/images/Unchecked.xpm
+++ b/images/Unchecked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * unchecked_xpm[] = {
+static const char * const unchecked_xpm[] = {
 "15 15 56 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/images/gnome-mime-application-x-audacity-project.xpm b/images/gnome-mime-application-x-audacity-project.xpm
index dfe337da3..dac9867a2 100644
--- a/images/gnome-mime-application-x-audacity-project.xpm
+++ b/images/gnome-mime-application-x-audacity-project.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gnome_mime_application_x_audacity_project_xpm[] = {
+static char * const gnome_mime_application_x_audacity_project_xpm[] = {
 "48 48 476 2",
 "  	c None",
 ". 	c #9D9D9D",
diff --git a/images/icons/16x16/audacity16.xpm b/images/icons/16x16/audacity16.xpm
index 4404b9f3a..692df3749 100644
--- a/images/icons/16x16/audacity16.xpm
+++ b/images/icons/16x16/audacity16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * audacity16_xpm[] = {
+static const char * const audacity16_xpm[] = {
 "16 16 95 2",
 "  	c None",
 ". 	c #0000EB",
diff --git a/images/icons/32x32/audacity32.xpm b/images/icons/32x32/audacity32.xpm
index 4c97c8186..fe4688d97 100644
--- a/images/icons/32x32/audacity32.xpm
+++ b/images/icons/32x32/audacity32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * audacity32_xpm[] = {
+static const char * const audacity32_xpm[] = {
 "32 32 244 2",
 "  	c None",
 ". 	c #000082",
diff --git a/images/icons/48x48/audacity.xpm b/images/icons/48x48/audacity.xpm
index ee99ee68b..d555f7db8 100644
--- a/images/icons/48x48/audacity.xpm
+++ b/images/icons/48x48/audacity.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char  * AudacityLogo48x48_xpm[] = {
+static const char * const AudacityLogo48x48_xpm[] = {
 "48 48 389 2",
 "  	c None",
 ". 	c #000092",