diff --git a/python/build/paths.nsi b/python/build/paths.nsi
index f071dc3b7cf7..5720bbdfba65 100644
--- a/python/build/paths.nsi
+++ b/python/build/paths.nsi
@@ -1,5 +1,5 @@
 ; Installer images
-!define IMAGES_LOCATION ${BASE_DIR}\python\build\resources
+!define IMAGES_LOCATION ${BASE_DIR}\python\community\build\resources
 ;!define LICENSE_FILE ${BASE_DIR}\python\license\PyCharm_Preview_License
 !define PRODUCT_PROPERTIES_FILE ${BASE_DIR}\out\pycharmCE\layout\bin\idea.properties
 !define PRODUCT_VM_OPTIONS_NAME pycharm.exe.vmoptions
diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index 5bd43f1e34bf..2daa11cb17e1 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -380,7 +380,7 @@ private layoutMac(Map _args, String target) {
   }
 
   Map args = new HashMap(_args)
-  args.icns = "$home/python/resources/PyCharm.icns"
+  args.icns = "$pythonCommunityHome/python/resources/PyCharmCore.icns"
   args.bundleIdentifier = "com.jetbrains.pycharm"
   args.platform_prefix = "Python"
   args.help_id = "PY"
diff --git a/python/build/resources/PC_instCom.ico b/python/build/resources/PC_instCom.ico
new file mode 100644
index 000000000000..44ecec9c8755
Binary files /dev/null and b/python/build/resources/PC_instCom.ico differ
diff --git a/python/build/resources/PC_uninstCom.ico b/python/build/resources/PC_uninstCom.ico
new file mode 100644
index 000000000000..13e9f96f9987
Binary files /dev/null and b/python/build/resources/PC_uninstCom.ico differ
diff --git a/python/build/strings.nsi b/python/build/strings.nsi
index ed2dd29b1c1a..1f7399ce9e93 100644
--- a/python/build/strings.nsi
+++ b/python/build/strings.nsi
@@ -2,8 +2,8 @@
 !define MUI_PRODUCT  "PyCharm Community Edition"
 !define PRODUCT_FULL_NAME "JetBrains PyCharm Community Edition"
 !define PRODUCT_EXE_FILE "pycharm.exe"
-!define PRODUCT_ICON_FILE "pycharm_inst.ico"
-!define PRODUCT_UNINST_ICON_FILE "pycharm_uninst.ico"
+!define PRODUCT_ICON_FILE "PC_instCom.ico"
+!define PRODUCT_UNINST_ICON_FILE "PC_uninstCom.ico"
 !define PRODUCT_LOGO_FILE "logo.bmp"
 !define PRODUCT_HEADER_FILE "headerlogo.bmp"
 
diff --git a/python/resources/PyCharmCore.icns b/python/resources/PyCharmCore.icns
new file mode 100644
index 000000000000..65167d934ab6
Binary files /dev/null and b/python/resources/PyCharmCore.icns differ
diff --git a/python/resources/PyCharmCore.ico b/python/resources/PyCharmCore.ico
index 157c83e9d39a..095e0e14293f 100644
Binary files a/python/resources/PyCharmCore.ico and b/python/resources/PyCharmCore.ico differ
diff --git a/python/resources/PyCharmCore128.png b/python/resources/PyCharmCore128.png
new file mode 100644
index 000000000000..6f23e62d385d
Binary files /dev/null and b/python/resources/PyCharmCore128.png differ
diff --git a/python/resources/PyCharmCore16.png b/python/resources/PyCharmCore16.png
new file mode 100644
index 000000000000..3328fdb44c8b
Binary files /dev/null and b/python/resources/PyCharmCore16.png differ
diff --git a/python/resources/PyCharmCore32.png b/python/resources/PyCharmCore32.png
new file mode 100644
index 000000000000..0d06345e5189
Binary files /dev/null and b/python/resources/PyCharmCore32.png differ
diff --git a/python/resources/idea/PyCharmCoreApplicationInfo.xml b/python/resources/idea/PyCharmCoreApplicationInfo.xml
index 7ecb2013f08e..3897bdeeeac1 100644
--- a/python/resources/idea/PyCharmCoreApplicationInfo.xml
+++ b/python/resources/idea/PyCharmCoreApplicationInfo.xml
@@ -4,7 +4,7 @@
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
   <logo url="/pycharm_core_logo.png" textcolor="ffffff" progressColor="ffaa16" progressY="230" progressTailIcon="/community_progress_tail.png"/>
   <about url="/pycharm_core_about.png" logoX="300" logoY="265" logoW="75" logoH="30" foreground="ffffff" linkColor="fca11a"/>
-  <icon size32="/PyCharm_32.png" size16="/PyCharm_16.png" size32opaque="/PyCharm_32.png" size12="/PyCharm_13.png" ico="PyCharmCore.ico"/>
+  <icon size32="/PyCharmCore32.png" size16="/PyCharmCore16.png" size32opaque="/PyCharmCore32.png" size12="/PyCharm_13.png" ico="PyCharmCore.ico"/>
   <package code="__PACKAGE_CODE__"/>
   <names product="PyCharm Core" fullname="PyCharm Core" script="charm"/>
   <install-over minbuild="0" maxbuild="0" version="1.x"/>