diff --git a/python/build/Info.plist b/python/build/Info.plist
new file mode 100644
index 000000000000..d65fb84aee1a
--- /dev/null
+++ b/python/build/Info.plist
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+    </array>
+    <key>CFBundleExecutable</key>
+    <string>pycharm</string>
+    <key>CFBundleIconFile</key>
+    <string>PyCharm.icns</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>PyCharm</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.jetbrains.pycharm</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleGetInfoString</key>
+    <string>PyCharm @@version@@, build @@build@@. Copyright JetBrains s.r.o., (c) 2000-2010</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@@version@@</string>
+    <key>CFBundleVersion</key>
+    <string>@@build@@</string>
+    <key>Java</key>
+   <dict>
+      <key>ClassPath</key>
+      <string>$APP_PACKAGE/lib/bootstrap.jar:$APP_PACKAGE/lib/extensions.jar:$APP_PACKAGE/lib/util.jar:$APP_PACKAGE/lib/jdom.jar:$APP_PACKAGE/lib/log4j.jar:/System/Library/Java</string>
+
+      <key>JVMVersion</key>
+      <string>@@jdk_req@@</string>
+
+      <key>JVMArchs</key>
+      <array>
+        <string>i386</string>
+        <string>x86_64</string>
+        <string>ppc</string>
+      </array>
+
+      <key>LSArchitecturePriority</key>
+      <array>
+        <string>i386</string>
+        <string>x86_64</string>
+        <string>ppc</string>
+      </array>
+
+      <key>MainClass</key>
+      <string>com.intellij.idea.Main</string>
+      <key>Properties</key>
+      <dict>
+        <key>CVS_PASSFILE</key>
+        <string>~/.cvspass</string>
+        <key>com.apple.mrj.application.live-resize</key>
+        <string>false</string>
+        <key>idea.config.path</key>
+        <string>~/Library/Preferences/@@system_selector@@/</string>
+        <key>idea.system.path</key>
+        <string>~/Library/Caches/@@system_selector@@/</string>
+        <key>idea.plugins.path</key>
+        <string>~/Library/Application Support/@@system_selector@@/</string>
+        <key>idea.log.path</key>
+        <string>~/Library/Logs/@@system_selector@@/</string>
+        <key>java.endorsed.dirs</key>
+        <string></string>
+        <key>idea.smooth.progress</key>
+        <string>false</string>
+        <key>apple.laf.useScreenMenuBar</key>
+        <string>true</string>
+        <key>apple.awt.graphics.UseQuartz</key>
+        <string>true</string>
+        <key>apple.awt.fullscreencapturealldisplays</key>
+        <string>false</string>
+        <key>idea.platform.prefix</key>
+        <string>Python</string>
+      </dict>
+
+      <key>VMOptions</key>
+      <string>@@vmoptions@@ -Xbootclasspath/a:../lib/boot.jar</string>
+
+      <key>WorkingDirectory</key>
+      <string>$APP_PACKAGE/bin</string>
+   </dict>
+  </dict>
+</plist>
diff --git a/python/build/pycharm.exe4j b/python/build/pycharm.exe4j
index 1bb40fb83e5f..f19375bf93ed 100644
--- a/python/build/pycharm.exe4j
+++ b/python/build/pycharm.exe4j
@@ -4,7 +4,7 @@
   <executable name="pycharm"
               type="1"
               iconSet="true"
-              iconFile="../../community/platform/icons/src/idea.ico"
+              iconFile="../resoures/PyCharm.ico"
               executableDir="bin"
               redirectStderr="false"
               stderrFile="error.log"
@@ -54,7 +54,6 @@
       <archive location="lib/log4j.jar" failOnError="true"/>
       <archive location="lib/jdom.jar" failOnError="true"/>
       <archive location="lib/extensions.jar" failOnError="true"/>
-      <archive location="${EXE4J_JVM_HOME}\..\lib\tools.jar" failOnError="true"/>
     </classPath>
     <nativeLibraryDirectories/>
   </java>
diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 6ee8475a274f..0011e003ad08 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -338,18 +338,27 @@ def layoutMac(Map args, String target) {
       fileset(dir: "$home/community/bin/mac")
       fileset(dir: "$home/community/bin/nix")
     }
+    dir("lib") {
+      fileset(dir: "$home/community/build/conf/mac/lib")
+    }
+    dir("Contents") {
+      dir("MacOS") {
+      }
+      dir("Resources") {
+        fileset(dir: "$home/python/resources", includes: "PyCharm.icns")
+      }
+      fileset(dir: "$home/python/build", includes: "Info.plist")
+    }
   }
 
-  ant.copy(todir: target) {
-    fileset(dir: "$home/community/build/conf/mac")
-  }
+  ant.copy(file: "$home/community/build/conf/mac/Contents/MacOS/idea", todir: "$target/Contents/MacOS/pycharm")
 
   ant.replace(file: "$target/Contents/Info.plist") {
     replacefilter(token: "@@build@@", value: args.buildName)
 
 
     replacefilter(token: "@@version@@", value: args.version)
-    replacefilter(token: "@@vmoptions@@", value: args.vmoptions + " -Xverify:none -XX:+UseCompressedOOPS -XX:+DoEscapeAnalysis -Didea.platform.prefix=Python")
+    replacefilter(token: "@@vmoptions@@", value: args.vmoptions + " -Xverify:none -XX:+UseCompressedOOPS -XX:+DoEscapeAnalysis")
     replacefilter(token: "@@system_selector@@", value: args.system_selector)
     replacefilter(token: "@@jdk_req@@", value: args.jdk_req)
   }
diff --git a/python/build/resources/pycharm_inst.ico b/python/build/resources/pycharm_inst.ico
index ef00183e2990..6c75bcdbc441 100644
Binary files a/python/build/resources/pycharm_inst.ico and b/python/build/resources/pycharm_inst.ico differ
diff --git a/python/build/resources/pycharm_uninst.ico b/python/build/resources/pycharm_uninst.ico
index 481328c427c4..a5b9ad86ae94 100644
Binary files a/python/build/resources/pycharm_uninst.ico and b/python/build/resources/pycharm_uninst.ico differ
diff --git a/python/resources/PyCharm.icns b/python/resources/PyCharm.icns
new file mode 100644
index 000000000000..ea1e74f15082
Binary files /dev/null and b/python/resources/PyCharm.icns differ
diff --git a/python/resources/PyCharm.ico b/python/resources/PyCharm.ico
new file mode 100644
index 000000000000..c037bcbeb53d
Binary files /dev/null and b/python/resources/PyCharm.ico differ
diff --git a/python/resources/PyCharm_12.png b/python/resources/PyCharm_12.png
new file mode 100644
index 000000000000..ca8d9d95a25f
Binary files /dev/null and b/python/resources/PyCharm_12.png differ
diff --git a/python/resources/PyCharm_16.png b/python/resources/PyCharm_16.png
new file mode 100644
index 000000000000..607f2c33d96d
Binary files /dev/null and b/python/resources/PyCharm_16.png differ
diff --git a/python/resources/PyCharm_32.png b/python/resources/PyCharm_32.png
new file mode 100644
index 000000000000..88ff057c96e9
Binary files /dev/null and b/python/resources/PyCharm_32.png differ
diff --git a/python/resources/idea/PythonApplicationInfo.xml b/python/resources/idea/PythonApplicationInfo.xml
index 7e6f90d1bdda..696412d6e5ad 100644
--- a/python/resources/idea/PythonApplicationInfo.xml
+++ b/python/resources/idea/PythonApplicationInfo.xml
@@ -4,7 +4,7 @@
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <logo url="/pycharm_logo.png" textcolor="FFCC00"/>
   <about url="/pycharm_about.png"/>
-  <icon size32="/icon.png" size16="/icon_small.png" size32opaque="/icon.png"/>
+  <icon size32="/PyCharm_32.png" size16="/PyCharm_16.png" size32opaque="/PyCharm_32.png" size12="/PyCharm_12.png"/>
   <package code="__PACKAGE_CODE__"/>
   <names product="PyCharm" fullname="PyCharm"/>
   <install-over minbuild="0" maxbuild="0" version="1.x"/>