diff --git a/java/openapi/src/icons/OpenapiIcons.java b/java/openapi/src/icons/OpenapiIcons.java
new file mode 100644
index 000000000000..eb9eb75de85a
--- /dev/null
+++ b/java/openapi/src/icons/OpenapiIcons.java
@@ -0,0 +1,17 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED
+ * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
+ */
+public class OpenapiIcons {
+  private static Icon load(String path) {
+    return IconLoader.getIcon(path, OpenapiIcons.class);
+  }
+
+  public static final Icon RepositoryLibraryLogo = load("/icons/repositoryLibraryLogo.png"); // 16x16
+}
diff --git a/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryDescription.java b/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryDescription.java
index 2153db6276c4..f5a0aef9f95c 100644
--- a/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryDescription.java
+++ b/java/openapi/src/org/jetbrains/idea/maven/utils/library/RepositoryLibraryDescription.java
@@ -18,8 +18,8 @@ package org.jetbrains.idea.maven.utils.library;
 import com.intellij.jarRepository.RemoteRepositoryDescription;
 import com.intellij.jarRepository.RepositoryLibraryDefinition;
 import com.intellij.openapi.roots.DependencyScope;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.containers.HashMap;
+import icons.OpenapiIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor;
@@ -43,7 +43,7 @@ public class RepositoryLibraryDescription {
   @NotNull
   public static final String SnapshotVersionSuffix = "-SNAPSHOT";
 
-  public static final Icon DEFAULT_ICON = IconLoader.getIcon("/icons/repositoryLibraryLogo.png");
+  public static final Icon DEFAULT_ICON = OpenapiIcons.RepositoryLibraryLogo;
   
   private static volatile Map<String, RepositoryLibraryDescription> ourStaticallyDefinedLibraries;
   
diff --git a/python/educational-python/gen/icons/PythonEducationalIcons.java b/python/educational-python/gen/icons/PythonEducationalIcons.java
index c8828ed8ae68..e2c275ad80d5 100644
--- a/python/educational-python/gen/icons/PythonEducationalIcons.java
+++ b/python/educational-python/gen/icons/PythonEducationalIcons.java
@@ -14,4 +14,6 @@ public class PythonEducationalIcons {
   }
 
   public static final Icon Field = load("/icons/com/jetbrains/edu/Field.png"); // 16x16
+  public static final Icon Student = load("/icons/com/jetbrains/edu/student.png"); // 180x180
+  public static final Icon Teacher = load("/icons/com/jetbrains/edu/teacher.png"); // 180x180
 }
diff --git a/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java b/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java
index 603deb9c8605..82c80d9ad12b 100644
--- a/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java
+++ b/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java
@@ -2,8 +2,8 @@ package com.jetbrains.python.edu;
 
 import com.intellij.ide.customize.AbstractCustomizeWizardStep;
 import com.intellij.openapi.ui.VerticalFlowLayout;
-import com.intellij.openapi.util.IconLoader;
 import com.jetbrains.edu.learning.StudySettings;
+import icons.PythonEducationalIcons;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -13,7 +13,7 @@ public class CustomizeEduStepPanel extends AbstractCustomizeWizardStep {
 
   public CustomizeEduStepPanel() {
     final JPanel studentPanel = new JPanel(new VerticalFlowLayout());
-    final JButton student = new JButton(IconLoader.findIcon("/icons/com/jetbrains/edu/student.png"));
+    final JButton student = new JButton(PythonEducationalIcons.Student);
     student.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -24,7 +24,7 @@ public class CustomizeEduStepPanel extends AbstractCustomizeWizardStep {
     studentPanel.add(new JLabel("Student", SwingConstants.CENTER));
     add(studentPanel);
 
-    final JButton teacher = new JButton(IconLoader.findIcon("/icons/com/jetbrains/edu/teacher.png"));
+    final JButton teacher = new JButton(PythonEducationalIcons.Teacher);
     final JPanel teacherPanel = new JPanel(new VerticalFlowLayout());
     teacherPanel.add(teacher);
     teacherPanel.add(new JLabel("Teacher", SwingConstants.CENTER));