diff --git a/build/build.xml b/build/build.xml
index da8eaddc9..307b39de5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1055,47 +1055,62 @@
   </target> 
 
 
+  <!-- bundle a bunch of PNGs into an OS X iconset -->
+  <target name="iconset">
+    <mkdir dir="${icon.set}" />
+    <!--<echo message="root = ${icon.root} / set = ${icon.set}" />-->
+    
+    <copy file="${icon.root}-16.png"
+          tofile="${icon.set}/icon_16x16.png" />
+    <copy file="${icon.root}-32.png"
+          tofile="${icon.set}/icon_16x16@2x.png" />
+
+    <copy file="${icon.root}-32.png"
+          tofile="${icon.set}/icon_32x32.png" />
+    <copy file="${icon.root}-64.png"
+          tofile="${icon.set}/icon_32x32@2x.png" />
+    
+    <copy file="${icon.root}-128.png"
+          tofile="${icon.set}/icon_128x128.png" />
+    <copy file="${icon.root}-256.png"
+          tofile="${icon.set}/icon_128x128@2x.png" />
+
+    <copy file="${icon.root}-256.png"
+          tofile="${icon.set}/icon_256x256.png" />
+    <copy file="${icon.root}-512.png"
+          tofile="${icon.set}/icon_256x256@2x.png" />
+
+    <copy file="${icon.root}-512.png"
+          tofile="${icon.set}/icon_512x512.png" />
+    <copy file="${icon.root}-1024.png"
+          tofile="${icon.set}/icon_512x512@2x.png" />
+
+    <exec executable="iconutil" logError="true">
+      <arg line="-c icns -o ${icon.icns} ${icon.set}" />
+    </exec>
+
+    <delete dir="${icon.set}" />
+  </target>
+
+  
   <!-- Target to create the icons... putting this in here rather than docs.
        For OS X (though Linux might work), not intended for general use,
        because it requires things like iconutil (on OS X) or ImageMagick's
        convert tool (primarily in *nix environments). -->
   <target name="icons">
-    
-    <!-- create pde.iconset for Mac OS X -->
-    <property name="icon.src" value="shared/lib/icons" />
     <property name="icon.set" value="/tmp/pde.iconset" />
-    <mkdir dir="${icon.set}" />
-    
-    <copy file="${icon.src}/pde-16.png"
-          tofile="${icon.set}/icon_16x16.png" />
-    <copy file="${icon.src}/pde-32.png"
-          tofile="${icon.set}/icon_16x16@2x.png" />
 
-    <copy file="${icon.src}/pde-32.png"
-          tofile="${icon.set}/icon_32x32.png" />
-    <copy file="${icon.src}/pde-64.png"
-          tofile="${icon.set}/icon_32x32@2x.png" />
-    
-    <copy file="${icon.src}/pde-128.png"
-          tofile="${icon.set}/icon_128x128.png" />
-    <copy file="${icon.src}/pde-256.png"
-          tofile="${icon.set}/icon_128x128@2x.png" />
+    <!-- create iconset for the PDE application for Mac OS X -->
+    <antcall target="iconset">
+      <param name="icon.root" value="shared/lib/icons/pde" />
+      <param name="icon.icns" value="macosx/processing.icns" />
+    </antcall>
 
-    <copy file="${icon.src}/pde-256.png"
-          tofile="${icon.set}/icon_256x256.png" />
-    <copy file="${icon.src}/pde-512.png"
-          tofile="${icon.set}/icon_256x256@2x.png" />
-
-    <copy file="${icon.src}/pde-512.png"
-          tofile="${icon.set}/icon_512x512.png" />
-    <copy file="${icon.src}/pde-1024.png"
-          tofile="${icon.set}/icon_512x512@2x.png" />
-
-    <exec executable="iconutil">
-      <arg line="-c icns -o macosx/processing.icns ${icon.set}" />
-    </exec>
-
-    <delete dir="${icon.set}" />
+    <!-- create iconset for exported sketch on Mac OS X -->
+    <antcall target="iconset">
+      <param name="icon.root" value="../core/src/icon/icon" />
+      <param name="icon.icns" value="../java/application/sketch.icns" />
+    </antcall>
     
     <!-- Create .ico for the PDE itself 
          https://msdn.microsoft.com/en-us/library/dn742485.aspx
@@ -1107,6 +1122,11 @@
     <exec executable="convert" dir="shared/lib/icons">
       <arg line="pde-16.png pde-32.png pde-48.png pde-64.png pde-256.png ../../../windows/application.ico" />
     </exec>
+
+    <!-- Create .ico for exported Java applications -->
+    <exec executable="convert" dir="../core/src/icon">
+      <arg line="icon-16.png icon-32.png icon-48.png icon-64.png icon-256.png ../../../java/application/sketch.ico" />
+    </exec>
   </target>
 
   
diff --git a/java/application/sketch.icns b/java/application/sketch.icns
index 2bdb4dfc2..8a9b3133f 100644
Binary files a/java/application/sketch.icns and b/java/application/sketch.icns differ
diff --git a/java/application/sketch.ico b/java/application/sketch.ico
index c7dbbe92b..e843e90c4 100644
Binary files a/java/application/sketch.ico and b/java/application/sketch.ico differ
diff --git a/todo.txt b/todo.txt
index 4e846ecda..9b58c34e9 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,7 +9,7 @@ X     merged list of sizes: 16, 24, 32, 48, 64, 256
 X   Linux version of updated icon
 X     handled with the .desktop file, nothing has changed for the file location
 X   add larger icons to core folder
-_   update export icons in java/application (export.icns and export.ico)
+X   update export icons in java/application (export.icns and export.ico)
 
 fixed earlier
 X Can't set Breakpoint from the Breakpoint bar at the side