diff --git a/magic/icons/Snow_flake4.png b/magic/icons/Snow_flake4.png
index 822a9de2d..bb79ab277 100644
Binary files a/magic/icons/Snow_flake4.png and b/magic/icons/Snow_flake4.png differ
diff --git a/magic/icons/Snow_flake5.png b/magic/icons/Snow_flake5.png
index cd83ce5dc..63ee0b8ce 100644
Binary files a/magic/icons/Snow_flake5.png and b/magic/icons/Snow_flake5.png differ
diff --git a/magic/icons/alien.png b/magic/icons/alien.png
index 86c51b152..325e9e84f 100644
Binary files a/magic/icons/alien.png and b/magic/icons/alien.png differ
diff --git a/magic/icons/calligraphy.png b/magic/icons/calligraphy.png
index ca90869e5..5373cc35d 100644
Binary files a/magic/icons/calligraphy.png and b/magic/icons/calligraphy.png differ
diff --git a/magic/icons/cartoon.png b/magic/icons/cartoon.png
index 5613dd217..c48bf4805 100644
Binary files a/magic/icons/cartoon.png and b/magic/icons/cartoon.png differ
diff --git a/magic/icons/confetti.png b/magic/icons/confetti.png
index fc82ff689..8439527a2 100644
Binary files a/magic/icons/confetti.png and b/magic/icons/confetti.png differ
diff --git a/magic/icons/darken.png b/magic/icons/darken.png
index ce5bade63..95d5e1c20 100644
Binary files a/magic/icons/darken.png and b/magic/icons/darken.png differ
diff --git a/magic/icons/distortion.png b/magic/icons/distortion.png
index a2bea5d2d..d0bb475cb 100644
Binary files a/magic/icons/distortion.png and b/magic/icons/distortion.png differ
diff --git a/magic/icons/edges.png b/magic/icons/edges.png
index 28fc20f0f..7dd9967ef 100644
Binary files a/magic/icons/edges.png and b/magic/icons/edges.png differ
diff --git a/magic/icons/emboss.png b/magic/icons/emboss.png
index b0df8c335..15f69daf7 100644
Binary files a/magic/icons/emboss.png and b/magic/icons/emboss.png differ
diff --git a/magic/icons/flower.png b/magic/icons/flower.png
index 2513bda14..fb7a67214 100644
Binary files a/magic/icons/flower.png and b/magic/icons/flower.png differ
diff --git a/magic/icons/foam.png b/magic/icons/foam.png
index 2aa8b1f16..185bb1ca7 100644
Binary files a/magic/icons/foam.png and b/magic/icons/foam.png differ
diff --git a/magic/icons/fold.png b/magic/icons/fold.png
index a38c7032a..562dc0d75 100644
Binary files a/magic/icons/fold.png and b/magic/icons/fold.png differ
diff --git a/magic/icons/glasstile.png b/magic/icons/glasstile.png
index 5c460cd41..b3b3627bf 100644
Binary files a/magic/icons/glasstile.png and b/magic/icons/glasstile.png differ
diff --git a/magic/icons/kalidescope.png b/magic/icons/kalidescope.png
index 0241a48cc..62aa2d352 100644
Binary files a/magic/icons/kalidescope.png and b/magic/icons/kalidescope.png differ
diff --git a/magic/icons/noise.png b/magic/icons/noise.png
index ea5331e5a..de8ff86e1 100644
Binary files a/magic/icons/noise.png and b/magic/icons/noise.png differ
diff --git a/magic/icons/rails.png b/magic/icons/rails.png
index f0dd58966..1bbabe1a8 100644
Binary files a/magic/icons/rails.png and b/magic/icons/rails.png differ
diff --git a/magic/icons/ripples.png b/magic/icons/ripples.png
index 0967480a2..57262e0b8 100644
Binary files a/magic/icons/ripples.png and b/magic/icons/ripples.png differ
diff --git a/magic/icons/sharpen.png b/magic/icons/sharpen.png
index cdb7fbc66..c62c17037 100644
Binary files a/magic/icons/sharpen.png and b/magic/icons/sharpen.png differ
diff --git a/magic/icons/shift.png b/magic/icons/shift.png
index 28710c812..1f814e017 100644
Binary files a/magic/icons/shift.png and b/magic/icons/shift.png differ
diff --git a/magic/icons/snowball.png b/magic/icons/snowball.png
index d7c096157..c11af20f5 100644
Binary files a/magic/icons/snowball.png and b/magic/icons/snowball.png differ
diff --git a/magic/icons/snowflake.png b/magic/icons/snowflake.png
index 437ebbda0..87d5288df 100644
Binary files a/magic/icons/snowflake.png and b/magic/icons/snowflake.png differ
diff --git a/magic/icons/tint.png b/magic/icons/tint.png
index 7b7b90d0d..da44e8d18 100644
Binary files a/magic/icons/tint.png and b/magic/icons/tint.png differ
diff --git a/magic/icons/toothpaste.png b/magic/icons/toothpaste.png
index 37f356a56..afbfe45ac 100644
Binary files a/magic/icons/toothpaste.png and b/magic/icons/toothpaste.png differ
diff --git a/magic/icons/waves-v.png b/magic/icons/waves-v.png
index 3f99b8c77..c3dca7f89 100755
Binary files a/magic/icons/waves-v.png and b/magic/icons/waves-v.png differ
diff --git a/magic/icons/waves.png b/magic/icons/waves.png
index 5a9674e4c..8fb6cc6d2 100644
Binary files a/magic/icons/waves.png and b/magic/icons/waves.png differ
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 0abef8820..6e8fe5aa4 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -17730,6 +17730,7 @@ int do_new_dialog(void)
   int first_starter;
   int added;
   Uint8 r, g, b;
+  int white_in_palette;
 
   
   do_setcursor(cursor_watch);
@@ -17829,6 +17830,8 @@ int do_new_dialog(void)
 
   /* Throw the color palette at the beginning: */
 
+  white_in_palette = -1;
+
   for (j = -1; j < NUM_COLORS; j++)
   {
     added = 0;
@@ -17866,6 +17869,10 @@ int do_new_dialog(void)
           added = 1;
         }
       }
+      else
+      {
+        white_in_palette = j;
+      }
     }
     else
     {
@@ -18630,10 +18637,23 @@ int do_new_dialog(void)
       /* FIXME: Don't do anything and go back to Open dialog if they
          hit BACK in color picker! */
 
-      canvas_color_r = color_hexes[which][0];
-      canvas_color_g = color_hexes[which][1];
-      canvas_color_b = color_hexes[which][2];
- 
+      if (which == 0) /* White */
+      {
+        canvas_color_r = canvas_color_g = canvas_color_b = 255;
+      }
+      else if (which <= white_in_palette) /* One of the colors before white in the pallete */
+      {
+        canvas_color_r = color_hexes[which - 1][0];
+        canvas_color_g = color_hexes[which - 1][1];
+        canvas_color_b = color_hexes[which - 1][2];
+      }
+      else
+      {
+        canvas_color_r = color_hexes[which][0];
+        canvas_color_g = color_hexes[which][1];
+        canvas_color_b = color_hexes[which][2];
+      }
+
       SDL_FillRect(canvas, NULL, SDL_MapRGB(canvas->format,
     		                canvas_color_r,
     				canvas_color_g,