@@ -10,6 +10,7 @@ import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.facet.FacetManager;
 import com.intellij.facet.ui.FacetBasedFrameworkSupportProvider;
 import com.intellij.facet.ui.ValidationResult;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.fileTemplates.FileTemplate;
 import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.ide.util.frameworkSupport.*;
@@ -34,7 +35,6 @@ import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryTable;
 import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import com.intellij.openapi.ui.LabeledComponent;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -231,7 +231,7 @@ public class AppEngineSupportProvider extends FacetBasedFrameworkSupportProvider
       model.addFrameworkListener(this);
 
       myErrorLabel = new HyperlinkLabel();
-      myErrorLabel.setIcon(IconLoader.getIcon("/runConfigurations/configurationWarning.png"));
+      myErrorLabel.setIcon(AllIcons.RunConfigurations.ConfigurationWarning);
       myErrorLabel.setVisible(false);
       myErrorLabel.setHyperlinkTarget(AppEngineSdkUtil.APP_ENGINE_DOWNLOAD_URL);
       myErrorPanel.add(BorderLayout.CENTER, myErrorLabel);

@@ -23,11 +23,11 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.execution.ui.RunContentManager;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.*;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Trinity;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
@@ -44,7 +44,7 @@ import java.util.*;
  */
 public class ExecutorRegistryImpl extends ExecutorRegistry {
   private static final Logger LOG = Logger.getInstance("#com.intellij.execution.ExecutorRegistryImpl");
-  private static final Icon STOP_AND_START_ICON = IconLoader.getIcon("/actions/restart.png");
+  private static final Icon STOP_AND_START_ICON = AllIcons.Actions.Restart;
 
 
   @NonNls public static final String RUNNERS_GROUP = "RunnerActions";

@@ -1,6 +1,6 @@
 package com.jetbrains.python.codeInsight;
 
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.icons.AllIcons;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.Function;
 import com.jetbrains.python.psi.PyClass;
@@ -109,7 +109,7 @@ public class PyDynamicMember {
     if (myTarget != null) {
       return myTarget.getIcon(0);
     }
-    return IconLoader.getIcon("/nodes/method.png");
+    return AllIcons.Nodes.Method;
   }
 
   @Nullable

@@ -1,13 +1,13 @@
 package com.jetbrains.python.packaging.ui;
 
 import com.google.common.collect.Lists;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.table.JBTable;
 import com.intellij.util.Consumer;
@@ -513,7 +513,7 @@ public class PyPackagesPanel extends JPanel {
       final String version = (String)table.getValueAt(row, 1);
       final String availableVersion = (String)table.getValueAt(row, 2);
       cell.setIcon(PyRequirement.VERSION_COMPARATOR.compare(version, availableVersion) < 0 && column == 2 ?
-                   IconLoader.getIcon("/vcs/arrow_right.png") : null);
+                   AllIcons.Vcs.Arrow_right : null);
       final Object pyPackage = table.getValueAt(row, 0);
       if (pyPackage instanceof PyPackage) {
         cell.setToolTipText(PythonSdkType.shortenDirName(((PyPackage)pyPackage).getLocation()));

@@ -1,9 +1,9 @@
 package com.jetbrains.python.sdk;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.projectRoots.SdkType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.HtmlListCellRenderer;
 import com.intellij.ui.LayeredIcon;
 
@@ -35,7 +35,7 @@ public class PySdkListCellRenderer extends HtmlListCellRenderer<Sdk> {
         final LayeredIcon layered = new LayeredIcon(2);
         layered.setIcon(icon, 0);
         // TODO: Create a separate invalid SDK overlay icon
-        final Icon overlay = IconLoader.findIcon("/actions/cancel.png");
+        final Icon overlay = AllIcons.Actions.Cancel;
         layered.setIcon(overlay, 1);
         setIcon(layered);
       }