diff --git a/magic/icons/noise.png b/magic/icons/noise.png
new file mode 100644
index 000000000..ea5331e5a
Binary files /dev/null and b/magic/icons/noise.png differ
diff --git a/magic/icons/toothpaste.png b/magic/icons/toothpaste.png
new file mode 100644
index 000000000..37f356a56
Binary files /dev/null and b/magic/icons/toothpaste.png differ
diff --git a/magic/src/noise.c b/magic/src/noise.c
index eeffada80..f54a80b4b 100644
--- a/magic/src/noise.c
+++ b/magic/src/noise.c
@@ -57,7 +57,7 @@ const char * noise_snd_filenames[noise_NUM_TOOLS] = {
   "noise.ogg",
 };
 const char * noise_icon_filenames[noise_NUM_TOOLS] = {
-  "flip.png",
+  "noise.png",
 };
 const char * noise_names[noise_NUM_TOOLS] = {
   gettext_noop("Noise"),
diff --git a/magic/src/tint.c b/magic/src/tint.c
index 77dfc6fb5..f2d911e23 100644
--- a/magic/src/tint.c
+++ b/magic/src/tint.c
@@ -65,13 +65,13 @@ const char * tint_icon_filenames[tint_NUM_TOOLS] = {
 };
 const char * tint_names[tint_NUM_TOOLS] = {
   gettext_noop("Tint"),
-  gettext_noop("Black and White") // It does more than this but more intuitive than threshold.
+  gettext_noop("Separate Colors") // It does more than this but more intuitive than threshold.
 };
 const char * tint_descs[tint_NUM_TOOLS][2] = {
   {gettext_noop("Click and move the mouse around to change the color of parts of your picture."),
     gettext_noop("Click to change the color of your entire picture."),},
-  {gettext_noop("Click and move the mouse around to turn parts of your picture into black and white."),
-    gettext_noop("Click to turn your entire picture into black and white.")}
+  {gettext_noop("Click and move the mouse around to turn parts of your picture into separate colors."),
+    gettext_noop("Click to turn your entire picture into separate colors.")}
 };
 
 Uint32 tint_api_version(void) { return(TP_MAGIC_API_VERSION); }
diff --git a/magic/src/toothpaste.c b/magic/src/toothpaste.c
index f17955a62..a2f89e2da 100644
--- a/magic/src/toothpaste.c
+++ b/magic/src/toothpaste.c
@@ -59,7 +59,7 @@ const char * toothpaste_snd_filenames[toothpaste_NUM_TOOLS] = {
   "flip.wav",
 };
 const char * toothpaste_icon_filenames[toothpaste_NUM_TOOLS] = {
-  "flip.png",
+  "toothpaste.png",
 };
 const char * toothpaste_names[toothpaste_NUM_TOOLS] = {
   gettext_noop("Toothpaste"),