diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 2e3d7b346..2326dbc80 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1722,6 +1722,10 @@ public class Base {
    * Give this Frame a Processing icon.
    */
   static public void setIcon(Frame frame) {
+    // don't use the low-res icon on Mac OS X; the window should
+    // already have the right icon from the .app file.
+    if (Base.isMacOS()) return;
+    
     Image image = Toolkit.getDefaultToolkit().createImage(PApplet.ICON_IMAGE);
     frame.setIconImage(image);
   }