diff --git a/python/educational-python/src/com/jetbrains/python/edu/debugger/PyEduStackFrame.java b/python/educational-python/src/com/jetbrains/python/edu/debugger/PyEduStackFrame.java
index 10a81307b2ac..46cc881b9fab 100644
--- a/python/educational-python/src/com/jetbrains/python/edu/debugger/PyEduStackFrame.java
+++ b/python/educational-python/src/com/jetbrains/python/edu/debugger/PyEduStackFrame.java
@@ -36,7 +36,7 @@ public class PyEduStackFrame extends PyStackFrame {
     }
     final VirtualFile file = myPosition.getFile();
     String frameName = myFrameInfo.getName();
-    component.setIcon(MODULE.equals(frameName) ? PythonPsiApiIcons.Python.PythonFile : PythonEducationalIcons.Field);
+    component.setIcon(MODULE.equals(frameName) ? PythonPsiApiIcons.PythonFile : PythonEducationalIcons.Field);
     if (MODULE.equals(frameName)) {
       component.append(GLOBAL_FRAME, SimpleTextAttributes.REGULAR_ATTRIBUTES);
       component.append(" (" + file.getName() + ")", getGrayAttributes(SimpleTextAttributes.REGULAR_ATTRIBUTES));
diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java
index a5948cb713df..026db0ddb736 100644
--- a/python/gen/icons/PythonIcons.java
+++ b/python/gen/icons/PythonIcons.java
@@ -29,6 +29,11 @@ public class PythonIcons {
   }
 
   
+  public static class Cython {
+    public static final Icon CythonFile = load("/icons/com/jetbrains/cython/cythonFile.png"); // 16x16
+
+  }
+  
   public static class Pyqt {
     public static final Icon TsFile = load("/icons/com/jetbrains/pyqt/tsFile.png"); // 16x16
     public static final Icon UiForm = load("/icons/com/jetbrains/pyqt/uiForm.png"); // 16x16
diff --git a/python/psi-api/src/com/jetbrains/python/PythonFileType.java b/python/psi-api/src/com/jetbrains/python/PythonFileType.java
index e1af53002af1..54079deead85 100644
--- a/python/psi-api/src/com/jetbrains/python/PythonFileType.java
+++ b/python/psi-api/src/com/jetbrains/python/PythonFileType.java
@@ -75,7 +75,7 @@ public class PythonFileType extends LanguageFileType {
 
   @NotNull
   public Icon getIcon() {
-    return PythonPsiApiIcons.Python.PythonFile;
+    return PythonPsiApiIcons.PythonFile;
   }
 
   @Override
diff --git a/python/psi-api/src/icons/PythonPsiApiIcons.java b/python/psi-api/src/icons/PythonPsiApiIcons.java
index 75d3197f1ea4..c92a1d08da2e 100644
--- a/python/psi-api/src/icons/PythonPsiApiIcons.java
+++ b/python/psi-api/src/icons/PythonPsiApiIcons.java
@@ -13,14 +13,5 @@ public class PythonPsiApiIcons {
     return IconLoader.getIcon(path, PythonPsiApiIcons.class);
   }
 
-  
-  public static class Cython {
-    public static final Icon CythonFile = load("/icons/com/jetbrains/cython/cythonFile.png"); // 16x16
-
-  }
-  
-  public static class Python {
-    public static final Icon PythonFile = load("/icons/com/jetbrains/python/pythonFile.png"); // 16x16
-
-  }
+  public static final Icon PythonFile = load("/icons/com/jetbrains/python/pythonFile.png"); // 16x16
 }
diff --git a/python/psi-api/resources/icons/com/jetbrains/cython/cythonFile.png b/python/resources/icons/com/jetbrains/cython/cythonFile.png
similarity index 100%
rename from python/psi-api/resources/icons/com/jetbrains/cython/cythonFile.png
rename to python/resources/icons/com/jetbrains/cython/cythonFile.png
diff --git a/python/psi-api/resources/icons/com/jetbrains/cython/cythonFile@2x.png b/python/resources/icons/com/jetbrains/cython/cythonFile@2x.png
similarity index 100%
rename from python/psi-api/resources/icons/com/jetbrains/cython/cythonFile@2x.png
rename to python/resources/icons/com/jetbrains/cython/cythonFile@2x.png
diff --git a/python/psi-api/resources/icons/com/jetbrains/cython/cythonFile@2x_dark.png b/python/resources/icons/com/jetbrains/cython/cythonFile@2x_dark.png
similarity index 100%
rename from python/psi-api/resources/icons/com/jetbrains/cython/cythonFile@2x_dark.png
rename to python/resources/icons/com/jetbrains/cython/cythonFile@2x_dark.png
diff --git a/python/psi-api/resources/icons/com/jetbrains/cython/cythonFile_dark.png b/python/resources/icons/com/jetbrains/cython/cythonFile_dark.png
similarity index 100%
rename from python/psi-api/resources/icons/com/jetbrains/cython/cythonFile_dark.png
rename to python/resources/icons/com/jetbrains/cython/cythonFile_dark.png