diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index b455e8ecd..20c083395 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -11,7 +11,6 @@ https://tuxpaint.org/
     ----------------
     + WIP: Heart, Sparkle, and Star emitters
       Click and drag to leave a short trail of shapes.
-      - TODO: Icons
       - TODO: Documentation
       Closes https://sourceforge.net/p/tuxpaint/feature-requests/266/
       - Code: Bill Kendrick <bill@newbreedsoftware.com>
diff --git a/magic/icons/emitter0.png b/magic/icons/emitter0.png
index 23a009220..ea7f52616 100644
Binary files a/magic/icons/emitter0.png and b/magic/icons/emitter0.png differ
diff --git a/magic/icons/emitter0_icon.png b/magic/icons/emitter0_icon.png
new file mode 100644
index 000000000..ea7f52616
Binary files /dev/null and b/magic/icons/emitter0_icon.png differ
diff --git a/magic/icons/emitter1_icon.png b/magic/icons/emitter1_icon.png
new file mode 100644
index 000000000..b4803f805
Binary files /dev/null and b/magic/icons/emitter1_icon.png differ
diff --git a/magic/icons/emitter2_icon.png b/magic/icons/emitter2_icon.png
new file mode 100644
index 000000000..db83e5812
Binary files /dev/null and b/magic/icons/emitter2_icon.png differ
diff --git a/magic/src/emitter.c b/magic/src/emitter.c
index 96ce6499a..dd7deabad 100644
--- a/magic/src/emitter.c
+++ b/magic/src/emitter.c
@@ -246,11 +246,11 @@ int emitter_get_tool_count(magic_api *api ATTRIBUTE_UNUSED)
 }
 
 // Load our icons:
-SDL_Surface *emitter_get_icon(magic_api *api, int which ATTRIBUTE_UNUSED)
+SDL_Surface *emitter_get_icon(magic_api *api, int which)
 {
   char fname[1024];
 
-  snprintf(fname, sizeof(fname), "%simages/magic/light.png", api->data_directory); // FIXME
+  snprintf(fname, sizeof(fname), "%simages/magic/emitter%d_icon.png", api->data_directory, which);
 
   return (IMG_Load(fname));
 }