diff --git a/python/build/DMG_background.png b/python/build/DMG_background.png
index a8cde3b7fb1c..cff10c4a8fe9 100644
Binary files a/python/build/DMG_background.png and b/python/build/DMG_background.png differ
diff --git a/python/build/resources/PC_instCom.ico b/python/build/resources/PC_instCom.ico
index 44ecec9c8755..3e4f37a7346c 100644
Binary files a/python/build/resources/PC_instCom.ico 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
index 13e9f96f9987..d35ec8f3f9a7 100644
Binary files a/python/build/resources/PC_uninstCom.ico and b/python/build/resources/PC_uninstCom.ico differ
diff --git a/python/edu/build/DMG_background.png b/python/edu/build/DMG_background.png
index a8cde3b7fb1c..0a77e74f4111 100644
Binary files a/python/edu/build/DMG_background.png and b/python/edu/build/DMG_background.png differ
diff --git a/python/edu/build/pycharm_edu_build.gant b/python/edu/build/pycharm_edu_build.gant
index 6900f9a1c07d..a556470c58f4 100644
--- a/python/edu/build/pycharm_edu_build.gant
+++ b/python/edu/build/pycharm_edu_build.gant
@@ -435,7 +435,7 @@ private layoutMac(Map _args, String target) {
   }
 
   Map args = new HashMap(_args)
-  args.icns = "$pythonCommunityHome/resources/PyCharmCore.icns"
+  args.icns = "$pythonCommunityHome/resources/PyCharmEdu.icns"
   args.bundleIdentifier = "com.jetbrains.pycharm"
   args.platform_prefix = "PyCharmEdu"
   args.help_id = "PE"
diff --git a/python/edu/build/resources/PC_instCom.ico b/python/edu/build/resources/PC_instCom.ico
index 44ecec9c8755..a5ceaff5b4a0 100644
Binary files a/python/edu/build/resources/PC_instCom.ico and b/python/edu/build/resources/PC_instCom.ico differ
diff --git a/python/edu/build/resources/PC_uninstCom.ico b/python/edu/build/resources/PC_uninstCom.ico
index 13e9f96f9987..306c72c410bf 100644
Binary files a/python/edu/build/resources/PC_uninstCom.ico and b/python/edu/build/resources/PC_uninstCom.ico differ
diff --git a/python/edu/build/resources/headerlogo.bmp b/python/edu/build/resources/headerlogo.bmp
index c06099264961..037396c168af 100644
Binary files a/python/edu/build/resources/headerlogo.bmp and b/python/edu/build/resources/headerlogo.bmp differ
diff --git a/python/edu/build/resources/logo.bmp b/python/edu/build/resources/logo.bmp
index 2462a5af3580..0e87a00bac46 100644
Binary files a/python/edu/build/resources/logo.bmp and b/python/edu/build/resources/logo.bmp differ
diff --git a/python/edu/resources/PyCharmEdu.icns b/python/edu/resources/PyCharmEdu.icns
new file mode 100755
index 000000000000..79f5663826d0
Binary files /dev/null and b/python/edu/resources/PyCharmEdu.icns differ
diff --git a/python/edu/resources/PyCharmEdu.ico b/python/edu/resources/PyCharmEdu.ico
new file mode 100755
index 000000000000..79f5663826d0
Binary files /dev/null and b/python/edu/resources/PyCharmEdu.ico differ
diff --git a/python/edu/resources/PyCharmEdu128.png b/python/edu/resources/PyCharmEdu128.png
new file mode 100755
index 000000000000..e4eb52a199ab
Binary files /dev/null and b/python/edu/resources/PyCharmEdu128.png differ
diff --git a/python/edu/resources/PyCharmEdu128@2x.png b/python/edu/resources/PyCharmEdu128@2x.png
new file mode 100755
index 000000000000..fe5c335b8eb1
Binary files /dev/null and b/python/edu/resources/PyCharmEdu128@2x.png differ
diff --git a/python/edu/resources/PyCharmEdu13.png b/python/edu/resources/PyCharmEdu13.png
new file mode 100755
index 000000000000..9f73e6cd4deb
Binary files /dev/null and b/python/edu/resources/PyCharmEdu13.png differ
diff --git a/python/edu/resources/PyCharmEdu13@2x.png b/python/edu/resources/PyCharmEdu13@2x.png
new file mode 100755
index 000000000000..3449007c7728
Binary files /dev/null and b/python/edu/resources/PyCharmEdu13@2x.png differ
diff --git a/python/edu/resources/PyCharmEdu13@2x_dark.png b/python/edu/resources/PyCharmEdu13@2x_dark.png
new file mode 100755
index 000000000000..648fa51a8227
Binary files /dev/null and b/python/edu/resources/PyCharmEdu13@2x_dark.png differ
diff --git a/python/edu/resources/PyCharmEdu13_dark.png b/python/edu/resources/PyCharmEdu13_dark.png
new file mode 100755
index 000000000000..b174f28eded5
Binary files /dev/null and b/python/edu/resources/PyCharmEdu13_dark.png differ
diff --git a/python/edu/resources/PyCharmEdu16.png b/python/edu/resources/PyCharmEdu16.png
new file mode 100755
index 000000000000..fec78bcbf11c
Binary files /dev/null and b/python/edu/resources/PyCharmEdu16.png differ
diff --git a/python/edu/resources/PyCharmEdu16@2x.png b/python/edu/resources/PyCharmEdu16@2x.png
new file mode 100755
index 000000000000..e9cd68a35c6e
Binary files /dev/null and b/python/edu/resources/PyCharmEdu16@2x.png differ
diff --git a/python/edu/resources/PyCharmEdu256.png b/python/edu/resources/PyCharmEdu256.png
new file mode 100755
index 000000000000..fe5c335b8eb1
Binary files /dev/null and b/python/edu/resources/PyCharmEdu256.png differ
diff --git a/python/edu/resources/PyCharmEdu256@2x.png b/python/edu/resources/PyCharmEdu256@2x.png
new file mode 100755
index 000000000000..d47ed9b7641a
Binary files /dev/null and b/python/edu/resources/PyCharmEdu256@2x.png differ
diff --git a/python/edu/resources/PyCharmEdu32.png b/python/edu/resources/PyCharmEdu32.png
new file mode 100755
index 000000000000..ff04b79912f8
Binary files /dev/null and b/python/edu/resources/PyCharmEdu32.png differ
diff --git a/python/edu/resources/PyCharmEdu32@2x.png b/python/edu/resources/PyCharmEdu32@2x.png
new file mode 100755
index 000000000000..7fd06e6f7140
Binary files /dev/null and b/python/edu/resources/PyCharmEdu32@2x.png differ
diff --git a/python/edu/resources/PyCharmEdu512.png b/python/edu/resources/PyCharmEdu512.png
new file mode 100755
index 000000000000..d47ed9b7641a
Binary files /dev/null and b/python/edu/resources/PyCharmEdu512.png differ
diff --git a/python/edu/resources/PyCharmEdu512@2x.png b/python/edu/resources/PyCharmEdu512@2x.png
new file mode 100755
index 000000000000..a2d92a3daec9
Binary files /dev/null and b/python/edu/resources/PyCharmEdu512@2x.png differ
diff --git a/python/edu/resources/PyCharmEdu64.png b/python/edu/resources/PyCharmEdu64.png
new file mode 100755
index 000000000000..7fd06e6f7140
Binary files /dev/null and b/python/edu/resources/PyCharmEdu64.png differ
diff --git a/python/edu/resources/PyCharmEdu64@2x.png b/python/edu/resources/PyCharmEdu64@2x.png
new file mode 100755
index 000000000000..e4eb52a199ab
Binary files /dev/null and b/python/edu/resources/PyCharmEdu64@2x.png differ
diff --git a/python/edu/resources/PyCharmEduWelcomeScreen.png b/python/edu/resources/PyCharmEduWelcomeScreen.png
new file mode 100755
index 000000000000..e2a8e70788ab
Binary files /dev/null and b/python/edu/resources/PyCharmEduWelcomeScreen.png differ
diff --git a/python/edu/resources/PyCharmEduWelcomeScreen@2x.png b/python/edu/resources/PyCharmEduWelcomeScreen@2x.png
new file mode 100755
index 000000000000..6e177617b6c1
Binary files /dev/null and b/python/edu/resources/PyCharmEduWelcomeScreen@2x.png differ
diff --git a/python/edu/resources/idea/PyCharmEduApplicationInfo.xml b/python/edu/resources/idea/PyCharmEduApplicationInfo.xml
index f74dd4f095c6..864bef101e74 100644
--- a/python/edu/resources/idea/PyCharmEduApplicationInfo.xml
+++ b/python/edu/resources/idea/PyCharmEduApplicationInfo.xml
@@ -2,13 +2,15 @@
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
   <version major="2" minor="0.2" eap="false"/>
   <build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
-  <logo url="/pycharm_edu_logo.png" textcolor="5a8179" progressColor="ffaa16" progressY="230" progressTailIcon="/community_progress_tail.png"/>
-  <about url="/pycharm_edu_about.png" logoX="300" logoY="265" logoW="75" logoH="30" foreground="ffffff" linkColor="fca11a"/>
-  <icon size128="/PyCharmCore128.png" size32="/PyCharmCore32.png" size16="/PyCharmCore16.png" size12="/PyCharmCore13.png" ico="PyCharmCore.ico"/>
+  <logo url="/pycharm_edu_logo.png" textcolor="313131" progressColor="20d688" progressY="281" progressTailIcon="/community_progress_tail.png"/>
+  <about url="/pycharm_edu_about.png" logoX="300" logoY="265" logoW="75" logoH="30" foreground="313131"
+         copyrightForeground="313131" linkColor="1f29b2"/>
+  <icon size32="/PyCharmEdu32.png" size16="/PyCharmEdu16.png" ico="PyCharmEdu.ico"/>
+  <package code="__PACKAGE_CODE__"/>
   <names product="PyCharm" fullname="PyCharm Edu" script="charm"/>
   <install-over minbuild="0" maxbuild="0" version="2.x"/>
 
-  <welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png"/>
+  <welcome-screen logo-url="/PyCharmEduWelcomeScreen.png"/>
 
   <plugins url="http://plugins.jetbrains.com/"/>
   <update-urls check="http://www.jetbrains.com/updates/updates.xml"
diff --git a/python/edu/resources/pycharm_edu_about.png b/python/edu/resources/pycharm_edu_about.png
index 27af2f3306d6..c194f3e14a08 100644
Binary files a/python/edu/resources/pycharm_edu_about.png and b/python/edu/resources/pycharm_edu_about.png differ
diff --git a/python/edu/resources/pycharm_edu_about@2x.png b/python/edu/resources/pycharm_edu_about@2x.png
index e09744812030..27cf95447f8f 100644
Binary files a/python/edu/resources/pycharm_edu_about@2x.png and b/python/edu/resources/pycharm_edu_about@2x.png differ
diff --git a/python/edu/resources/pycharm_edu_logo.png b/python/edu/resources/pycharm_edu_logo.png
index f443ed3c21c4..d755d009ec2f 100644
Binary files a/python/edu/resources/pycharm_edu_logo.png and b/python/edu/resources/pycharm_edu_logo.png differ
diff --git a/python/edu/resources/pycharm_edu_logo@2x.png b/python/edu/resources/pycharm_edu_logo@2x.png
index f7f05c81e66d..47ad226316c6 100644
Binary files a/python/edu/resources/pycharm_edu_logo@2x.png and b/python/edu/resources/pycharm_edu_logo@2x.png differ
diff --git a/python/resources/PyCharmCore.icns b/python/resources/PyCharmCore.icns
index aec44bb348aa..179cfda0ba46 100644
Binary files a/python/resources/PyCharmCore.icns and b/python/resources/PyCharmCore.icns differ
diff --git a/python/resources/PyCharmCore.ico b/python/resources/PyCharmCore.ico
index 09788308fff6..a3ac9136a8b7 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
index e5cdab2d90ca..3967e2133b3c 100644
Binary files a/python/resources/PyCharmCore128.png and b/python/resources/PyCharmCore128.png differ
diff --git a/python/resources/PyCharmCore128@2x.png b/python/resources/PyCharmCore128@2x.png
new file mode 100755
index 000000000000..d3bff89ff896
Binary files /dev/null and b/python/resources/PyCharmCore128@2x.png differ
diff --git a/python/resources/PyCharmCore13.png b/python/resources/PyCharmCore13.png
index bc2c7c8b4639..0d8992f6151a 100644
Binary files a/python/resources/PyCharmCore13.png and b/python/resources/PyCharmCore13.png differ
diff --git a/python/resources/PyCharmCore13@2x.png b/python/resources/PyCharmCore13@2x.png
new file mode 100755
index 000000000000..87a4e2bae87f
Binary files /dev/null and b/python/resources/PyCharmCore13@2x.png differ
diff --git a/python/resources/PyCharmCore13@2x_dark.png b/python/resources/PyCharmCore13@2x_dark.png
new file mode 100755
index 000000000000..59e14aec2170
Binary files /dev/null and b/python/resources/PyCharmCore13@2x_dark.png differ
diff --git a/python/resources/PyCharmCore13_dark.png b/python/resources/PyCharmCore13_dark.png
new file mode 100755
index 000000000000..2c4886e2c8f4
Binary files /dev/null and b/python/resources/PyCharmCore13_dark.png differ
diff --git a/python/resources/PyCharmCore16.png b/python/resources/PyCharmCore16.png
index 8d9f3c61ac0e..e8f9474f8b11 100644
Binary files a/python/resources/PyCharmCore16.png and b/python/resources/PyCharmCore16.png differ
diff --git a/python/resources/PyCharmCore16@2x.png b/python/resources/PyCharmCore16@2x.png
new file mode 100755
index 000000000000..71e73002ecc0
Binary files /dev/null and b/python/resources/PyCharmCore16@2x.png differ
diff --git a/python/resources/PyCharmCore256.png b/python/resources/PyCharmCore256.png
new file mode 100755
index 000000000000..d3bff89ff896
Binary files /dev/null and b/python/resources/PyCharmCore256.png differ
diff --git a/python/resources/PyCharmCore256@2x.png b/python/resources/PyCharmCore256@2x.png
new file mode 100755
index 000000000000..3deeb657754c
Binary files /dev/null and b/python/resources/PyCharmCore256@2x.png differ
diff --git a/python/resources/PyCharmCore32.png b/python/resources/PyCharmCore32.png
index b03b80f1b572..1dab74f44cc3 100644
Binary files a/python/resources/PyCharmCore32.png and b/python/resources/PyCharmCore32.png differ
diff --git a/python/resources/PyCharmCore32@2x.png b/python/resources/PyCharmCore32@2x.png
new file mode 100755
index 000000000000..45324f58e80a
Binary files /dev/null and b/python/resources/PyCharmCore32@2x.png differ
diff --git a/python/resources/PyCharmCore512.png b/python/resources/PyCharmCore512.png
new file mode 100755
index 000000000000..3deeb657754c
Binary files /dev/null and b/python/resources/PyCharmCore512.png differ
diff --git a/python/resources/PyCharmCore512@2x.png b/python/resources/PyCharmCore512@2x.png
new file mode 100755
index 000000000000..22f000db2dc6
Binary files /dev/null and b/python/resources/PyCharmCore512@2x.png differ
diff --git a/python/resources/PyCharmCore64.png b/python/resources/PyCharmCore64.png
new file mode 100755
index 000000000000..45324f58e80a
Binary files /dev/null and b/python/resources/PyCharmCore64.png differ
diff --git a/python/resources/PyCharmCore64@2x.png b/python/resources/PyCharmCore64@2x.png
new file mode 100755
index 000000000000..3967e2133b3c
Binary files /dev/null and b/python/resources/PyCharmCore64@2x.png differ
diff --git a/python/resources/PyCharmCoreWelcomeScreen.png b/python/resources/PyCharmCoreWelcomeScreen.png
index 67ad229ed928..a5a5abdb806f 100644
Binary files a/python/resources/PyCharmCoreWelcomeScreen.png and b/python/resources/PyCharmCoreWelcomeScreen.png differ
diff --git a/python/resources/PyCharmCoreWelcomeScreen@2x.png b/python/resources/PyCharmCoreWelcomeScreen@2x.png
index 16aeb07b7d31..3731df24beac 100644
Binary files a/python/resources/PyCharmCoreWelcomeScreen@2x.png and b/python/resources/PyCharmCoreWelcomeScreen@2x.png differ
diff --git a/python/resources/idea/PyCharmCoreApplicationInfo.xml b/python/resources/idea/PyCharmCoreApplicationInfo.xml
index 036f9a03d096..cfb21cd52a37 100644
--- a/python/resources/idea/PyCharmCoreApplicationInfo.xml
+++ b/python/resources/idea/PyCharmCoreApplicationInfo.xml
@@ -2,9 +2,11 @@
   <company name="JetBrains s.r.o." url="https://www.jetbrains.com/?fromIDE"/>
   <version major="5" minor="0" eap="true"/>
   <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 size128="/PyCharmCore128.png" size32="/PyCharmCore32.png" size16="/PyCharmCore16.png" size12="/PyCharmCore13.png" ico="PyCharmCore.ico"/>
+  <logo url="/pycharm_core_logo.png" textcolor="313131" progressColor="20d688" progressY="281" progressTailIcon="/community_progress_tail.png"/>
+  <about url="/pycharm_core_about.png" logoX="300" logoY="265" logoW="75" logoH="30" foreground="313131"
+         copyrightForeground="313131" linkColor="1f29b2"/>
+  <icon size32="/PyCharmCore32.png" size16="/PyCharmCore16.png" ico="PyCharmCore.ico"/>
+  <package code="__PACKAGE_CODE__"/>
   <names product="PyCharm" fullname="PyCharm Community Edition" script="charm"/>
   <install-over minbuild="0" maxbuild="0" version="1.x"/>