diff --git a/images/Effect.h b/images/Effect.h
index 5080f10b53af..1358fdb4463e 100644
--- a/images/Effect.h
+++ b/images/Effect.h
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * effect_menu_xpm[] = {
+static const char * const effect_menu_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
@@ -21,7 +21,7 @@ static const char * effect_menu_xpm[] = {
 "                "};
 
 /* XPM */
-static const char * effect_play_xpm[] = {
+static const char * const effect_play_xpm[] = {
 "16 16 70 1",
 " 	c None",
 ".	c #000000",
@@ -111,7 +111,7 @@ static const char * effect_play_xpm[] = {
 " CDE            "};
 
 /* XPM */
-static const char * effect_stop_xpm[] = {
+static const char * const effect_stop_xpm[] = {
 "16 16 31 1",
 " 	c None",
 ".	c #000000",
@@ -162,7 +162,7 @@ static const char * effect_stop_xpm[] = {
 "                "};
 
 /* XPM */
-static const char * effect_rewind_xpm[] = {
+static const char * const effect_rewind_xpm[] = {
 "16 16 82 1",
 " 	c None",
 ".	c #000000",
@@ -263,7 +263,7 @@ static const char * effect_rewind_xpm[] = {
 "        PQ   PQ ",
 "                "};
 /* XPM */
-static const char * effect_ffwd_xpm[] = {
+static const char * const effect_ffwd_xpm[] = {
 "16 16 79 1",
 " 	c None",
 ".	c #000000",
@@ -362,7 +362,7 @@ static const char * effect_ffwd_xpm[] = {
 "                "};
 
 /* XPM */
-static const char * effect_play_disabled_xpm[] = {
+static const char * const effect_play_disabled_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #6B6B6B",
@@ -430,7 +430,7 @@ static const char * effect_play_disabled_xpm[] = {
 " ((_            "};
 
 /* XPM */
-static const char * effect_stop_disabled_xpm[] = {
+static const char * const effect_stop_disabled_xpm[] = {
 "16 16 26 1",
 " 	c None",
 ".	c #737373",
@@ -476,7 +476,7 @@ static const char * effect_stop_disabled_xpm[] = {
 "                "};
 
 /* XPM */
-static const char * effect_rewind_disabled_xpm[] = {
+static const char * const effect_rewind_disabled_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #6B6B6B",
@@ -559,7 +559,7 @@ static const char * effect_rewind_disabled_xpm[] = {
 "                "};
 
 /* XPM */
-static const char * effect_ffwd_disabled_xpm[] = {
+static const char * const effect_ffwd_disabled_xpm[] = {
 "16 16 61 1",
 " 	c None",
 ".	c #6B6B6B",
diff --git a/images/GlyphImages.h b/images/GlyphImages.h
index 6236dae599e1..59632efa5aa2 100644
--- a/images/GlyphImages.h
+++ b/images/GlyphImages.h
@@ -1,4 +1,4 @@
-static const char *Glyph0[] = {
+static const char * const Glyph0[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -34,7 +34,7 @@ static const char *Glyph0[] = {
 "..............."
 };
 
-static const char *Glyph1[] = {
+static const char * const Glyph1[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -70,7 +70,7 @@ static const char *Glyph1[] = {
 "..............."
 };
 
-static const char *Glyph2[] = {
+static const char * const Glyph2[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -106,7 +106,7 @@ static const char *Glyph2[] = {
 "..............."
 };
 
-static const char *Glyph3[] = {
+static const char * const Glyph3[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -142,7 +142,7 @@ static const char *Glyph3[] = {
 "..............."
 };
 
-static const char *Glyph4[] = {
+static const char * const Glyph4[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -178,7 +178,7 @@ static const char *Glyph4[] = {
 "..............."
 };
 
-static const char *Glyph5[] = {
+static const char * const Glyph5[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -215,7 +215,7 @@ static const char *Glyph5[] = {
 };
 
 
-static const char *Glyph6[] = {
+static const char * const Glyph6[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -251,7 +251,7 @@ static const char *Glyph6[] = {
 "..............."
 };
 
-static const char *Glyph7[] = {
+static const char * const Glyph7[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -287,7 +287,7 @@ static const char *Glyph7[] = {
 "..............."
 };
 
-static const char *Glyph8[] = {
+static const char * const Glyph8[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -324,7 +324,7 @@ static const char *Glyph8[] = {
 };
 
 
-static const char *Glyph9[] = {
+static const char * const Glyph9[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -360,7 +360,7 @@ static const char *Glyph9[] = {
 "..............."
 };
 
-static const char *Glyph10[] = {
+static const char * const Glyph10[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
@@ -396,7 +396,7 @@ static const char *Glyph10[] = {
 "..............."
 };
 
-static const char *Glyph11[] = {
+static const char * const Glyph11[] = {
 /* columns rows colors const chars-per-pixel */
 "15 23 7 1",
 ". c none",
diff --git a/images/PostfishButtons.h b/images/PostfishButtons.h
index f3499932265c..a7bf6a8b5f9e 100644
--- a/images/PostfishButtons.h
+++ b/images/PostfishButtons.h
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * bar_home_xpm[] = {
+static const char * const bar_home_xpm[] = {
 "19 17 33 1",
 " 	c None",
 ".	c #020202",
@@ -52,7 +52,7 @@ static const char * bar_home_xpm[] = {
 "#*;;*#  >'4*@ >'4*#",
 " #11#    @1#   @1# "};
 /* XPM */
-static const char * bar_bb_xpm[] = {
+static const char * const bar_bb_xpm[] = {
 "17 17 33 1",
 " 	c None",
 ".	c #020202",
@@ -105,7 +105,7 @@ static const char * bar_bb_xpm[] = {
 "      >'4*@ >'4*#",
 "       @1#   @1# "};
 /* XPM */
-static const char * bar_b_xpm[] = {
+static const char * const bar_b_xpm[] = {
 "18 17 33 1",
 " 	c None",
 ".	c #020202",
@@ -158,7 +158,7 @@ static const char * bar_b_xpm[] = {
 "           @2';;*#",
 "             @~1# "};
 /* XPM */
-static const char * bar_p_xpm[] = {
+static const char * const bar_p_xpm[] = {
 "29 17 33 1",
 " 	c None",
 ".	c #020202",
@@ -211,7 +211,7 @@ static const char * bar_p_xpm[] = {
 "#*;;'2@        #1~~~~~~~~~~# ",
 " #1~@                        "};
 /* XPM */
-static const char * bar_f_xpm[] = {
+static const char * const bar_f_xpm[] = {
 "18 17 33 1",
 " 	c None",
 ".	c #020202",
@@ -264,7 +264,7 @@ static const char * bar_f_xpm[] = {
 "#*;;'2@           ",
 " #1~@             "};
 /* XPM */
-static const char * bar_ff_xpm[] = {
+static const char * const bar_ff_xpm[] = {
 "17 17 33 1",
 " 	c None",
 ".	c #020202",
@@ -317,7 +317,7 @@ static const char * bar_ff_xpm[] = {
 "#*4'> @*4'>      ",
 " #1@   #1@       "};
 /* XPM */
-static const char * bar_end_xpm[] = {
+static const char * const bar_end_xpm[] = {
 "19 17 30 1",
 " 	c None",
 ".	c #6682CE",
@@ -367,7 +367,7 @@ static const char * bar_end_xpm[] = {
 ".#$%& @#$%&  .#**#.",
 " .+@   .+@    .++. "};
 /* XPM */
-static const char * bar_l_xpm[] = {
+static const char * const bar_l_xpm[] = {
 "29 17 33 1",
 " 	c None",
 ".	c #020203",
diff --git a/images/UploadImages.h b/images/UploadImages.h
index 79b7221ebd2d..cdcac84464a9 100644
--- a/images/UploadImages.h
+++ b/images/UploadImages.h
@@ -1,5 +1,5 @@
 
-static const char *file_xpm[] = {
+static const char * const file_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 4 1",
 "  c #040404",
@@ -25,7 +25,7 @@ static const char *file_xpm[] = {
 "oo             o"
 };
 
-static const char *folder_xpm[] = {
+static const char * const folder_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 15 1",
 "  c gray30",
@@ -62,7 +62,7 @@ static const char *folder_xpm[] = {
 ";-=***********=-"
 };
 
-static const char *mp3_xpm[] = {
+static const char * const mp3_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 19 1",
 "  c #040404",
@@ -103,7 +103,7 @@ static const char *mp3_xpm[] = {
 "<<<<<<<<<<<<<<<<"
 };
 
-static const char *up_xpm[] = {
+static const char * const up_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 25 1",
 "  c #040404",