diff --git a/build.xml b/build.xml
index 9a355d184..b613cfc3d 100644
--- a/build.xml
+++ b/build.xml
@@ -22,6 +22,9 @@
     <property name="PRODUCTNAME" value="JPEXS Free Flash Decompiler" />
     <property name="PRODUCTURL" value="http://www.free-decompiler.com/flash/" />
     <property name="MAINCLASS" value="com.jpexs.decompiler.flash.gui.Main"/>
+    
+    <property name="MACBUNDLE" value="com.jpexs.decompiler.flash"/>
+    <property name="MACCATEGORYTYPE" value="public.app-category.developer-tools"/>
     <property name="NSISPATH" value="c:\program files (x86)\NSIS"/>
     <property name="MAXHEAPSIZEPERCENT" value="100"/>
     <property name="MAXHEAPSIZERUN" value="8094"/> <!-- for run task (MB)-->    
diff --git a/build_common.xml b/build_common.xml
index 531f463b4..f3e48a6c7 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -183,16 +183,45 @@
         </zip>
     </target>
     
-    <target name="osxapp" depends="-loadversion,dist">
+    <target name="osx-app-archive" depends="-loadversion,dist">
         <mkdir dir="${RELEASESDIR}"/>
-        <property  name="app.file.zip" value="${RELEASESDIR}/${PREFIXFILENAME}_${VERSION}${VERSIONSUFFIX}_macosx.zip" />
-        <tempfile property="app.desc.temp" />
-        <echo file="${app.desc.temp}">#!/bin/bash&#10;cd "$(dirname "$${BASH_SOURCE[0]}")"&#10;cd ../Resources&#10;./ffdec.sh</echo>
-        <zip destfile="${app.file.zip}">
-            <zipfileset file="${app.desc.temp}" fullpath="FFDec.app/Contents/MacOS/FFDec" filemode="755" />
+        <property  name="osx.zip.file" value="${RELEASESDIR}/${PREFIXFILENAME}_${VERSION}${VERSIONSUFFIX}_macosx.zip" />
+        <tempfile property="app.script.temp" deleteonexit="true" />
+        <echo file="${app.script.temp}">#!/bin/bash&#10;cd "$(dirname "$${BASH_SOURCE[0]}")"&#10;cd ../Resources&#10;./ffdec.sh</echo>
+        <tempfile property="app.info.temp" deleteonexit="true" />        
+        <echo file="${app.info.temp}"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCTNAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>FFDec</string>
+	<key>CFBundleIconFile</key>
+	<string>Icon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACBUNDLE}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>FFDec</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${VERSION}${VERSIONSUFFIX}</string>
+	<key>CFBundleVersion</key>
+	<string>${VERSION}${VERSIONSUFFIX}</string>
+	<key>LSApplicationCategoryType</key>
+	<string>${MACCATEGORYTYPE}</string>
+</dict>
+</plist>]]></echo>        
+        
+        <zip destfile="${osx.zip.file}">
+            <zipfileset file="${app.script.temp}" fullpath="FFDec.app/Contents/MacOS/FFDec" filemode="755" />
+            <zipfileset file="${app.info.temp}" fullpath="FFDec.app/Contents/Info.plist" />            
             <zipfileset dir="${DISTRIBUTIONDIR}" excludes="ffdec.sh" prefix="FFDec.app/Contents/Resources/" />
             <zipfileset dir="${DISTRIBUTIONDIR}" includes="ffdec.sh" fullpath="FFDec.app/Contents/Resources/ffdec.sh" filemode="755" />           
-        </zip>
+        </zip>      
     </target>
     
     <target name="-set-gui-type">
@@ -290,7 +319,7 @@
 
     </target>
 
-    <target name="release" depends="library,archive,installer,locales">        
+    <target name="release" depends="library,archive,osx-app-archive,installer,locales">        
 
     </target>
          
@@ -370,6 +399,10 @@
             <arg value="-file" />
             <arg value="fileZip" />
             <arg value="${zip.file}" />
+            
+            <arg value="-file" />
+            <arg value="fileOSXZip" />
+            <arg value="${osx.zip.file}" />
 
             <arg value="-file" />
             <arg value="fileLang" />
diff --git a/installer.nsi b/installer.nsi
index 050bcc4f8..65e3da848 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -688,6 +688,7 @@ Section "FFDec" SecDummy
   File "dist\${APP_EXENAME}"
   File "dist\ffdec.bat"
   File "dist\ffdec.jar"
+  File "dist\icon.ico"
   File "dist\license.txt"
   
   SetOutPath "$INSTDIR"  
diff --git a/resources/Icon.icns b/resources/Icon.icns
new file mode 100644
index 000000000..a957db0fb
Binary files /dev/null and b/resources/Icon.icns differ
diff --git a/resources/icon.ico b/resources/icon.ico
new file mode 100644
index 000000000..3e4088949
Binary files /dev/null and b/resources/icon.ico differ