diff --git a/build/build.xml b/build/build.xml
index 6ab9c6b93..c44599038 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -530,19 +530,19 @@
            so double-clicking files no longer works. -->
 
       <bundledocument extensions="pde,pyde"
-                      icon="macos/document.icns"
+                      icon="macos/pde.icns"
                       name="Processing Source Code"
                       role="Editor">
       </bundledocument>
 
       <bundledocument extensions="pdez"
-                      icon="macos/document.icns"
+                      icon="macos/pdez.icns"
                       name="Processing Sketch Bundle"
                       role="Editor">
       </bundledocument>
 
       <bundledocument extensions="pdex"
-                      icon="macos/document.icns"
+                      icon="macos/pdex.icns"
                       name="Processing Contribution Bundle"
                       role="Viewer">
       </bundledocument>
diff --git a/build/macos/pde.icns b/build/macos/pde.icns
new file mode 100644
index 000000000..495646cf3
Binary files /dev/null and b/build/macos/pde.icns differ
diff --git a/build/macos/pdex.icns b/build/macos/pdex.icns
new file mode 100644
index 000000000..4734ce531
Binary files /dev/null and b/build/macos/pdex.icns differ
diff --git a/build/macos/pdez.icns b/build/macos/pdez.icns
new file mode 100644
index 000000000..ecd3efe4e
Binary files /dev/null and b/build/macos/pdez.icns differ
diff --git a/build/shared/lib/icons/foundation-16.png b/build/shared/lib/icons/foundation-16.png
index d2f1ee2d2..5b747ff08 100644
Binary files a/build/shared/lib/icons/foundation-16.png and b/build/shared/lib/icons/foundation-16.png differ
diff --git a/build/shared/lib/icons/foundation-32.png b/build/shared/lib/icons/foundation-32.png
index 2f874f6e6..ed42000b7 100644
Binary files a/build/shared/lib/icons/foundation-32.png and b/build/shared/lib/icons/foundation-32.png differ
diff --git a/build/shared/lib/icons/foundation-64.png b/build/shared/lib/icons/foundation-64.png
index b3f094e4d..67b656aba 100644
Binary files a/build/shared/lib/icons/foundation-64.png and b/build/shared/lib/icons/foundation-64.png differ
diff --git a/core/src/icon/icon-1024.png b/core/src/icon/icon-1024.png
index 7d67a3307..b64f541d0 100644
Binary files a/core/src/icon/icon-1024.png and b/core/src/icon/icon-1024.png differ
diff --git a/core/src/icon/icon-128.png b/core/src/icon/icon-128.png
index 580eb61ab..a6c2ff342 100644
Binary files a/core/src/icon/icon-128.png and b/core/src/icon/icon-128.png differ
diff --git a/core/src/icon/icon-16.png b/core/src/icon/icon-16.png
index 560b9db0b..f73f90e21 100644
Binary files a/core/src/icon/icon-16.png and b/core/src/icon/icon-16.png differ
diff --git a/core/src/icon/icon-256.png b/core/src/icon/icon-256.png
index afd815770..423e13104 100644
Binary files a/core/src/icon/icon-256.png and b/core/src/icon/icon-256.png differ
diff --git a/core/src/icon/icon-32.png b/core/src/icon/icon-32.png
index ec65430d5..b1551f84a 100644
Binary files a/core/src/icon/icon-32.png and b/core/src/icon/icon-32.png differ
diff --git a/core/src/icon/icon-48.png b/core/src/icon/icon-48.png
index a0c50ceb6..31a3fb51a 100644
Binary files a/core/src/icon/icon-48.png and b/core/src/icon/icon-48.png differ
diff --git a/core/src/icon/icon-512.png b/core/src/icon/icon-512.png
index ec7ceb476..98b72fbab 100644
Binary files a/core/src/icon/icon-512.png and b/core/src/icon/icon-512.png differ
diff --git a/core/src/icon/icon-64.png b/core/src/icon/icon-64.png
index 77a356a12..8a804eb05 100644
Binary files a/core/src/icon/icon-64.png and b/core/src/icon/icon-64.png differ
diff --git a/java/application/application.icns b/java/application/application.icns
index e4be24527..3965370e0 100644
Binary files a/java/application/application.icns and b/java/application/application.icns differ
diff --git a/java/application/application.ico b/java/application/application.ico
index e1af8f97c..c4bbdfa11 100644
Binary files a/java/application/application.ico and b/java/application/application.ico differ
diff --git a/todo.txt b/todo.txt
index 48f0c04cb..cd8e6c618 100755
--- a/todo.txt
+++ b/todo.txt
@@ -74,6 +74,16 @@ o continue clearing out ProgressFrame
 o   also hook up the statusNotice() when done
 X   also should be long gone
 
+design
+X icon for exported app
+X icon for document
+X update the foundation icons
+
+design (done in beta 3)
+X update theme
+X selector for theme that uses tiny images
+
+
 manager
 X contrib list entry in the table sometimes contains markdown
 X   at least hide the syntax parts (and show the text)
@@ -116,12 +126,9 @@ _   https://github.com/processing/processing4/issues/194
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-design/next
-X selector for theme that uses tiny images
-_ update theme
-_ icon for exported app
-_ icon for document
-_ update the foundation icons
+design
+_ implement document icons on Windows
+_ implement document icons on Linux
 _ redesign of the Contribution Manager
 _   identify coloring for icons
 _   how much of theme to inherit