diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 75ea0c47b..377884a7e 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -54,17 +54,18 @@ https://tuxpaint.org/
           (https://freesound.org/people/mudflea2/sounds/708182/)
           Creative Commons 0 by mudflea2
 
-    * WIP - Epitrochoid and Hypotrochoid magic tools:
+    * Epitrochoid and Hypotrochoid magic tools:
       + Tools to draw centered trochoids; to create art similar to a
         Spirograph or Wondergraph.  Drag left/right to adjust the
         radius of the stator (fixed circle). Drag up/down to adjust
         radius of the rotator (the rolling circle). Size option
-        adjusts the position of the virtual pen within the rotator.
-      + If "--nomagicsizes" is set, three versions each of
-        epitrochoid and hypotrochoid drawing tools will be made
-        available, each with differing pen positions.
+        adjusts the position of the virtual pen within (or outside)
+        the rotator.
+        - If "--nomagicsizes" is set, three versions each of
+          epitrochoid and hypotrochoid drawing tools will be made
+          available, each with differing pen positions (inside, edge,
+          and outside).
       + Code: Bill Kendrick <bill@newbreedsoftware.com>
-      + WIP - Needs icons
       + Sounds:
         - Drag: "Running Gear", CC0 1.0 Universal
           by Vurca (https://freesound.org/people/Vurca/)
diff --git a/magic/icons/epitrochoid_edge.png b/magic/icons/epitrochoid_edge.png
new file mode 100644
index 000000000..9036b8231
Binary files /dev/null and b/magic/icons/epitrochoid_edge.png differ
diff --git a/magic/icons/epitrochoid_inside.png b/magic/icons/epitrochoid_inside.png
new file mode 100644
index 000000000..dccd93cad
Binary files /dev/null and b/magic/icons/epitrochoid_inside.png differ
diff --git a/magic/icons/epitrochoid_outside.png b/magic/icons/epitrochoid_outside.png
new file mode 100644
index 000000000..1e0c63164
Binary files /dev/null and b/magic/icons/epitrochoid_outside.png differ
diff --git a/magic/icons/hypotrochoid_edge.png b/magic/icons/hypotrochoid_edge.png
new file mode 100644
index 000000000..06210cc18
Binary files /dev/null and b/magic/icons/hypotrochoid_edge.png differ
diff --git a/magic/icons/hypotrochoid_inside.png b/magic/icons/hypotrochoid_inside.png
new file mode 100644
index 000000000..f146c2dc6
Binary files /dev/null and b/magic/icons/hypotrochoid_inside.png differ
diff --git a/magic/icons/hypotrochoid_outside.png b/magic/icons/hypotrochoid_outside.png
new file mode 100644
index 000000000..550a8aa8a
Binary files /dev/null and b/magic/icons/hypotrochoid_outside.png differ
diff --git a/magic/src/trochoids.c b/magic/src/trochoids.c
index f94e264e3..3631e32a6 100644
--- a/magic/src/trochoids.c
+++ b/magic/src/trochoids.c
@@ -93,14 +93,14 @@ float trochoids_sizes_per_tool[NUM_TOOLS] = {
 };
 
 const char *icon_filenames[NUM_TOOLS] = {
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
-  "1pt_persp_select.png", /* FIXME */
+  "epitrochoid_edge.png", /* use "edge" variation when sizes are available */
+  "epitrochoid_inside.png",
+  "epitrochoid_edge.png",
+  "epitrochoid_outside.png",
+  "hypotrochoid_edge.png", /* use "edge" variation when sizes are available */
+  "hypotrochoid_inside.png",
+  "hypotrochoid_edge.png",
+  "hypotrochoid_outside.png",
 };