diff --git a/src/xpm/point_layer.xpm b/src/xpm/point_layer.xpm
index 49c1407ef48..140f4ab04d5 100644
--- a/src/xpm/point_layer.xpm
+++ b/src/xpm/point_layer.xpm
@@ -1,33 +1,25 @@
 /* XPM */
-static const char * point_layer_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #60EE0E",
-"+	c #60EF0E",
-"@	c #60ED0E",
-"#	c #5FEE0E",
-"$	c #5DE70E",
-"%	c #5FEB0E",
-"&	c #5CE70D",
-"*	c #5DE70D",
-"=	c #5AE00D",
-"-	c #5CE70E",
-";	c #60EC0E",
-">	c #58DB0D",
-",	c #5BE40E",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"      .++       ",
-"     +++++      ",
-"    +++++++     ",
-"    +++++@+     ",
-"    ##.+$%+     ",
-"     &*=-;      ",
-"      >,%       ",
-"                ",
-"                ",
-"                ",
-"                "};
\ No newline at end of file
+static const char *point_layer_xpm[]={
+"16 16 6 1",
+". c None",
+"c c #008000",
+"b c #54d10c",
+"d c #5fee0e",
+"# c #60ee0e",
+"a c #60ef0e",
+"................",
+"................",
+"................",
+"................",
+"................",
+"......#ab.......",
+".....aaabc......",
+"....aaaabcc.....",
+"....aaaabbc.....",
+"....dd#abcc.....",
+".....bcbcc......",
+"......ccc.......",
+"................",
+"................",
+"................",
+"................"};
diff --git a/src/xpm/polygon_layer.xpm b/src/xpm/polygon_layer.xpm
index 8c3179b1667..862e0c79657 100644
--- a/src/xpm/polygon_layer.xpm
+++ b/src/xpm/polygon_layer.xpm
@@ -1,22 +1,22 @@
 /* XPM */
-static const char * polygon_layer_xpm[] = {
+static const char *polygon_layer_xpm[]={
 "16 16 3 1",
-" 	c None",
-".	c #D86652",
-"+	c #ddfcc9",
-"                ",
-"          ..    ",
-"   .... ......  ",
-"   .++...++++.  ",
-"   ..++++++++.  ",
-"    ...++++..   ",
-"      .++++.    ",
-"    ..+++++..   ",
-"   ..+++++++.   ",
-"  ..++++++++..  ",
-"  .++++++++...  ",
-"  .++...+++.    ",
-"  .......+++.   ",
-"        .....   ",
-"          ..    ",
-"                "};
+". c None",
+"a c #00c000",
+"# c #ddfcc9",
+".........###....",
+".......######...",
+"....####aaa##...",
+"..#####aaaaa##..",
+"..##aaaaaaaa##..",
+".##aaaaaaaa###..",
+".##aaaaaaaaa###.",
+".###aaaaaaaaa##.",
+"...###aaaaaaaa##",
+"....##aaaaaaaa##",
+"....##aaaaaaaa##",
+".....##aaaaaa###",
+".....###aaaa####",
+"......########..",
+"........#####...",
+"................"};