diff --git a/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java b/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java
index b1f0f0f7e991..9f761daceec5 100644
--- a/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java
+++ b/python/pluginSrc/com/jetbrains/python/facet/PythonFacetType.java
@@ -57,7 +57,7 @@ public class PythonFacetType extends FacetType<PythonFacet, PythonFacetConfigura
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Python;
+    return PythonIcons.Python.Python;
   }
 
   public static class PythonFrameworkDetector extends FacetBasedFrameworkDetector<PythonFacet, PythonFacetConfiguration> {
diff --git a/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java b/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
index 98586d34b5df..67b1be902efc 100644
--- a/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
+++ b/python/pluginSrc/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
@@ -22,7 +22,7 @@ public class PythonFrameworkSupportProvider extends FrameworkSupportProvider {
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Python;
+    return PythonIcons.Python.Python;
   }
 
   @NotNull
diff --git a/python/psi-api/python-psi-api.iml b/python/psi-api/python-psi-api.iml
index 5e3914f028e3..e64340eea3fa 100644
--- a/python/psi-api/python-psi-api.iml
+++ b/python/psi-api/python-psi-api.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.png b/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.png
new file mode 100644
index 000000000000..ccd74ff4320c
Binary files /dev/null and b/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.png differ
diff --git a/python/psi-api/src/com/jetbrains/python/PythonFileType.java b/python/psi-api/src/com/jetbrains/python/PythonFileType.java
index abef86b8d2f8..38ebc690451d 100644
--- a/python/psi-api/src/com/jetbrains/python/PythonFileType.java
+++ b/python/psi-api/src/com/jetbrains/python/PythonFileType.java
@@ -3,10 +3,10 @@ package com.jetbrains.python;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;
+import icons.PythonPsiApiIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,15 +27,12 @@ public class PythonFileType extends LanguageFileType {
 
   public static PythonFileType INSTANCE = new PythonFileType();
 
-  private final Icon _icon;
-
   public PythonFileType() {
     this(new PythonLanguage());
   }
 
   public PythonFileType(Language language) {
     super(language);
-    _icon = IconLoader.getIcon("/com/jetbrains/python/icons/pythonFile.png");
   }
 
   @NotNull
@@ -55,7 +52,7 @@ public class PythonFileType extends LanguageFileType {
 
   @NotNull
   public Icon getIcon() {
-    return _icon;
+    return PythonPsiApiIcons.PythonFile;
   }
 
   @Override
diff --git a/python/psi-api/src/icons/PythonPsiApiIcons.java b/python/psi-api/src/icons/PythonPsiApiIcons.java
new file mode 100644
index 000000000000..caeb62572701
--- /dev/null
+++ b/python/psi-api/src/icons/PythonPsiApiIcons.java
@@ -0,0 +1,17 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class PythonPsiApiIcons {
+  private static Icon load(String path) {
+    return IconLoader.getIcon(path, PythonPsiApiIcons.class);
+  }
+
+  public static final Icon PythonFile = load("/icons/com/jetbrains/python/pythonFile.png"); // 16x16
+}
diff --git a/python/rest/resources/icons/com/jetbrains/rest/rst.png b/python/rest/resources/icons/com/jetbrains/rest/rst.png
new file mode 100644
index 000000000000..2b7fcd7d5f78
Binary files /dev/null and b/python/rest/resources/icons/com/jetbrains/rest/rst.png differ
diff --git a/python/rest/src/icons/RestIcons.java b/python/rest/src/icons/RestIcons.java
index 810d775edecd..7be4044574bc 100644
--- a/python/rest/src/icons/RestIcons.java
+++ b/python/rest/src/icons/RestIcons.java
@@ -13,5 +13,5 @@ public class RestIcons {
     return IconLoader.getIcon(path, RestIcons.class);
   }
 
-  public static final Icon Rst = load("/com/jetbrains/rest/res/rst.png"); // 16x16
+  public static final Icon Rst = load("/icons/com/jetbrains/rest/rst.png"); // 16x16
 }
diff --git a/python/src/com/jetbrains/pyqt/tsFile.png b/python/src/com/jetbrains/pyqt/tsFile.png
deleted file mode 100644
index 4f962a2bdae2..000000000000
Binary files a/python/src/com/jetbrains/pyqt/tsFile.png and /dev/null differ
diff --git a/python/src/com/jetbrains/pyqt/uiForm.png b/python/src/com/jetbrains/pyqt/uiForm.png
deleted file mode 100644
index 048cc19dc1c2..000000000000
Binary files a/python/src/com/jetbrains/pyqt/uiForm.png and /dev/null differ
diff --git a/python/src/com/jetbrains/python/PythonModuleTypeBase.java b/python/src/com/jetbrains/python/PythonModuleTypeBase.java
index 939673643984..f6eb24910cb9 100644
--- a/python/src/com/jetbrains/python/PythonModuleTypeBase.java
+++ b/python/src/com/jetbrains/python/PythonModuleTypeBase.java
@@ -26,10 +26,10 @@ public abstract class PythonModuleTypeBase<T extends ModuleBuilder> extends Modu
   }
 
   public Icon getBigIcon() {
-    return PythonIcons.Python.Icons.Python_24;
+    return PythonIcons.Python.Python_24;
   }
 
   public Icon getNodeIcon(final boolean isOpened) {
-    return PythonIcons.Python.Icons.PythonClosed;
+    return PythonIcons.Python.PythonClosed;
   }
 }
diff --git a/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java b/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java
index 8447c8956857..721baca8787f 100644
--- a/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java
+++ b/python/src/com/jetbrains/python/buildout/BuildoutFacetType.java
@@ -50,6 +50,6 @@ public class BuildoutFacetType extends FacetType<BuildoutFacet, BuildoutFacetCon
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Buildout.Buildout;
+    return PythonIcons.Python.Buildout.Buildout;
   }
 }
diff --git a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgFileType.java b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgFileType.java
index 57b92508195c..82409c641bab 100644
--- a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgFileType.java
+++ b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgFileType.java
@@ -38,7 +38,7 @@ public class BuildoutCfgFileType extends LanguageFileType {
 
   @Nullable
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Buildout.Buildout;
+    return PythonIcons.Python.Buildout.Buildout;
   }
 }
 
diff --git a/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java b/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java
index 56f159edba40..130306020fd8 100644
--- a/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java
+++ b/python/src/com/jetbrains/python/codeInsight/completion/PySpecialMethodNamesCompletionContributor.java
@@ -51,7 +51,7 @@ public class PySpecialMethodNamesCompletionContributor extends CompletionContrib
               .create(entry.getKey() + entry.getValue().getSignature())
               .bold()
               .withTypeText("predefined")
-              .withIcon(PythonIcons.Python.Icons.Nodes.Cyan_dot)
+              .withIcon(PythonIcons.Python.Nodes.Cyan_dot)
             ;
             result.addElement(TailTypeDecorator.withTail(item, TailType.CASE_COLON));
           }
diff --git a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
index 8acc4c7d0325..ebdd95d2facb 100644
--- a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
@@ -218,7 +218,7 @@ public class PythonDebugLanguageConsoleView extends JPanel implements ConsoleVie
 
     public ShowDebugConsoleAction(final PythonDebugLanguageConsoleView console) {
       super(ExecutionBundle.message("run.configuration.show.command.line.action.name"), null,
-            PythonIcons.Python.Icons.Debug.CommandLine);
+            PythonIcons.Python.Debug.CommandLine);
       myConsole = console;
     }
 
diff --git a/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java b/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java
index bdacf84f65cb..6040041ed20a 100644
--- a/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java
+++ b/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java
@@ -23,7 +23,6 @@ import com.jetbrains.python.run.PythonCommandLineState;
 import com.jetbrains.python.sdk.PythonSdkType;
 import icons.PythonIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -34,7 +33,7 @@ public class RunPythonConsoleAction extends AnAction implements DumbAware {
 
   public RunPythonConsoleAction() {
     super();
-    getTemplatePresentation().setIcon(PythonIcons.Python.Icons.Python);
+    getTemplatePresentation().setIcon(PythonIcons.Python.Python);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 51a444988de4..8d8cc37eb9c3 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -89,13 +89,13 @@ public class PyFunctionImpl extends PyPresentableElementImpl<PyFunctionStub> imp
       final Property property = getProperty();
       if (property != null) {
         if (property.getGetter().valueOrNull() == this) {
-          return PythonIcons.Python.Icons.PropertyGetter;
+          return PythonIcons.Python.PropertyGetter;
         }
         if (property.getSetter().valueOrNull() == this) {
-          return PythonIcons.Python.Icons.PropertySetter;
+          return PythonIcons.Python.PropertySetter;
         }
         if (property.getDeleter().valueOrNull() == this) {
-          return PythonIcons.Python.Icons.PropertyDeleter;
+          return PythonIcons.Python.PropertyDeleter;
         }
         return PlatformIcons.PROPERTY_ICON;
       }
diff --git a/python/src/com/jetbrains/python/run/PythonConfigurationType.java b/python/src/com/jetbrains/python/run/PythonConfigurationType.java
index dd1501cf292d..4832f40dad3b 100644
--- a/python/src/com/jetbrains/python/run/PythonConfigurationType.java
+++ b/python/src/com/jetbrains/python/run/PythonConfigurationType.java
@@ -48,7 +48,7 @@ public class PythonConfigurationType implements ConfigurationType {
   }
 
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Python;
+    return PythonIcons.Python.Python;
   }
 
   public ConfigurationFactory[] getConfigurationFactories() {
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkType.java b/python/src/com/jetbrains/python/sdk/PythonSdkType.java
index c42eb430951f..4aaba6f4c176 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkType.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkType.java
@@ -94,7 +94,7 @@ public class PythonSdkType extends SdkType {
   }
 
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Python;
+    return PythonIcons.Python.Python;
   }
 
   @NotNull
diff --git a/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java
index 8e1138db9847..7b3b32d1ba6d 100644
--- a/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/flavors/IronPythonSdkFlavor.java
@@ -84,6 +84,6 @@ public class IronPythonSdkFlavor extends PythonSdkFlavor {
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Dotnet;
+    return PythonIcons.Python.Dotnet;
   }
 }
diff --git a/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java
index eca1b1776f99..8a8640481041 100644
--- a/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/flavors/JythonSdkFlavor.java
@@ -66,6 +66,6 @@ public class JythonSdkFlavor extends PythonSdkFlavor {
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Jython;
+    return PythonIcons.Python.Jython;
   }
 }
diff --git a/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java
index a56007fc8e6d..9342d32ecb6f 100644
--- a/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/flavors/PyPySdkFlavor.java
@@ -77,6 +77,6 @@ public class PyPySdkFlavor extends PythonSdkFlavor {
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Pypy;
+    return PythonIcons.Python.Pypy;
   }
 }
diff --git a/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
index 5fad2e1107c8..000f67ba2d8c 100644
--- a/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
@@ -229,6 +229,6 @@ public abstract class PythonSdkFlavor {
   }
 
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Python;
+    return PythonIcons.Python.Python;
   }
 }
diff --git a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java
index b3790d2fc1eb..ed48bb673e4a 100644
--- a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java
@@ -118,6 +118,6 @@ public class VirtualEnvSdkFlavor extends CPythonSdkFlavor {
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.Virtualenv;
+    return PythonIcons.Python.Virtualenv;
   }
 }
diff --git a/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java b/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
index 66b4fab74450..a976ada169d7 100644
--- a/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
+++ b/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
@@ -275,13 +275,13 @@ public class PyStructureViewElement implements StructureViewTreeElement {
           icon.setIcon(normal_icon, 0);
           Icon overlay = null;
           if (myVisibility == Visibility.PRIVATE || myVisibility == Visibility.PROTECTED) {
-            overlay = PythonIcons.Python.Icons.Nodes.Lock;
+            overlay = PythonIcons.Python.Nodes.Lock;
           }
           else if (myVisibility == Visibility.PREDEFINED) {
-            overlay = PythonIcons.Python.Icons.Nodes.Cyan_dot;
+            overlay = PythonIcons.Python.Nodes.Cyan_dot;
           }
           else if (myVisibility == Visibility.INVISIBLE) {
-            overlay = PythonIcons.Python.Icons.Nodes.Red_inv_triangle;
+            overlay = PythonIcons.Python.Nodes.Red_inv_triangle;
           }
           if (overlay != null) {
             icon.setIcon(overlay, 1);
diff --git a/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java b/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
index 3a4de2fbc86c..987c9b2b8544 100644
--- a/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
+++ b/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
@@ -121,7 +121,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
 
   @Override
   public Icon getIcon() {
-    return PythonIcons.Python.Icons.PythonTests;
+    return PythonIcons.Python.PythonTests;
   }
 
   @NotNull