diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
index 7706c35acd10..2e347e39ff70 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
@@ -17,8 +17,8 @@ package org.intellij.lang.regexp;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.LayeredIcon;
+import icons.RegExpSupportIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,7 +35,7 @@ public class RegExpFileType extends LanguageFileType {
 
         myIcon = new LayeredIcon(2);
         ((LayeredIcon)myIcon).setIcon(AllIcons.FileTypes.Text, 0);
-        ((LayeredIcon)myIcon).setIcon(IconLoader.getIcon("regexp-filetype-icon.png"), 1);
+        ((LayeredIcon)myIcon).setIcon(RegExpSupportIcons.Regexp_filetype_icon, 1);
 
 //        myIcon = LayeredIcon.create(
 //                IconLoader.getIcon("/fileTypes/text.png"),
diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml
index dab33be1048e..40642d8c2abc 100644
--- a/images/src/META-INF/ImagesPlugin.xml
+++ b/images/src/META-INF/ImagesPlugin.xml
@@ -27,7 +27,7 @@
   <actions>
     <action class="org.intellij.images.actions.EditExternallyAction"
             id="Images.EditExternaly"
-            icon="/org/intellij/images/icons/EditExternaly.png"
+            icon="ImagesIcons.EditExternaly"
             text="Open Image in External Editor">
       <keyboard-shortcut first-keystroke="control alt F4" keymap="$default"/>
       <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="EditSource"/>
@@ -40,7 +40,7 @@
     </action>
     <action class="org.intellij.images.actions.ToggleTransparencyChessboardAction"
             id="Images.ToggleTransparencyChessboard"
-            icon="/org/intellij/images/icons/ToggleTransparencyChessboard.png"
+            icon="ImagesIcons.ToggleTransparencyChessboard"
             text="Show Chessboard"
             description="Show a chessboard on transparent image parts">
     </action>
@@ -48,24 +48,24 @@
       <reference id="Images.ToggleTransparencyChessboard"/>
       <action class="org.intellij.images.editor.actions.ToggleGridAction"
               id="Images.Editor.ToggleGrid"
-              icon="/org/intellij/images/icons/ToggleGrid.png"
+              icon="ImagesIcons.ToggleGrid"
               text="Show Grid">
         <keyboard-shortcut first-keystroke="control QUOTE" keymap="$default"/>
       </action>
       <separator/>
       <action class="org.intellij.images.editor.actions.ZoomInAction"
               id="Images.Editor.ZoomIn"
-              icon="/graph/zoomIn.png"
+              icon="AllIcons.Graph.ZoomIn"
               text="Zoom In"
               use-shortcut-of="ExpandAll" />
       <action class="org.intellij.images.editor.actions.ZoomOutAction"
               id="Images.Editor.ZoomOut"
-              icon="/graph/zoomOut.png"
+              icon="AllIcons.Graph.ZoomOut"
               text="Zoom Out"
               use-shortcut-of="CollapseAll"/>
       <action class="org.intellij.images.editor.actions.ActualSizeAction"
               id="Images.Editor.ActualSize"
-              icon="/graph/actualZoom.png"
+              icon="AllIcons.Graph.ActualZoom"
               text="Zoom to Actual Size">
         <keyboard-shortcut first-keystroke="control DIVIDE" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control SLASH" keymap="$default"/>
diff --git a/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java b/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
index d1af0a440dd6..adc75a4f19ac 100644
--- a/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
+++ b/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
@@ -17,10 +17,10 @@ package org.intellij.images.fileTypes.impl;
 
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import gnu.trove.THashSet;
+import icons.ImagesIcons;
 import org.intellij.images.ImagesBundle;
 import org.intellij.images.fileTypes.ImageFileTypeManager;
 import org.intellij.images.vfs.IfsUtil;
@@ -44,7 +44,7 @@ final class ImageFileTypeManagerImpl extends ImageFileTypeManager implements App
 
   static {
     imageFileType = new ImageFileType();
-    imageFileType.setIcon(IconLoader.getIcon("/org/intellij/images/icons/ImagesFileType.png"));
+    imageFileType.setIcon(ImagesIcons.ImagesFileType);
     imageFileType.setName(IMAGE_FILE_TYPE_NAME);
     imageFileType.setDescription(IMAGE_FILE_TYPE_DESCRIPTION);
   }
diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java
index e499cfa99eca..ae540eeee893 100644
--- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java
+++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java
@@ -19,11 +19,11 @@
 package org.intellij.images.thumbnail.impl;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowManager;
+import icons.ImagesIcons;
 import org.intellij.images.editor.actionSystem.ImageEditorActions;
 import org.intellij.images.thumbnail.ThumbnailView;
 import org.intellij.images.vfs.IfsUtil;
@@ -37,7 +37,7 @@ import javax.swing.*;
  * @author <a href="mailto:aefimov.box@gmail.com">Alexey Efimov</a>
  */
 final class ThumbnailViewImpl implements ThumbnailView {
-  private static final Icon TOOL_WINDOW_ICON = IconLoader.getIcon("/org/intellij/images/icons/ThumbnailToolWindow.png");
+  private static final Icon TOOL_WINDOW_ICON = ImagesIcons.ThumbnailToolWindow;
 
   private final Project project;
   private final ToolWindow toolWindow;
diff --git a/images/src/org/intellij/images/ui/ThumbnailComponentUI.java b/images/src/org/intellij/images/ui/ThumbnailComponentUI.java
index f4eab33fde62..0b88d432699b 100644
--- a/images/src/org/intellij/images/ui/ThumbnailComponentUI.java
+++ b/images/src/org/intellij/images/ui/ThumbnailComponentUI.java
@@ -19,8 +19,8 @@
 package org.intellij.images.ui;
 
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.ui.UIUtil;
+import icons.ImagesIcons;
 import org.intellij.images.ImagesBundle;
 import org.intellij.images.editor.ImageDocument;
 import org.jetbrains.annotations.NonNls;
@@ -41,8 +41,8 @@ public class ThumbnailComponentUI extends ComponentUI {
     @NonNls
     private static final String THUMBNAIL_COMPONENT_ERROR_STRING = "ThumbnailComponent.errorString";
 
-    private static final Icon BLANK_ICON = IconLoader.getIcon("/org/intellij/images/icons/ThumbnailBlank.png");
-    private static final Icon DIRECTORY_ICON = IconLoader.getIcon("/org/intellij/images/icons/ThumbnailDirectory.png");
+    private static final Icon BLANK_ICON = ImagesIcons.ThumbnailBlank;
+    private static final Icon DIRECTORY_ICON = ImagesIcons.ThumbnailDirectory;
     private static final Icon ERROR_ICON = Messages.getErrorIcon();
 
     private static final Color LINE_COLOR = new Color(0x8E, 0xA8, 0xCE);
diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
index 4bbd6427c547..09a040537547 100644
--- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
@@ -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";
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/Gravity.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/Gravity.java
index 740298e0f4ff..0ba1adfa47f8 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/Gravity.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/Gravity.java
@@ -18,9 +18,9 @@ package com.intellij.android.designer.model.layout;
 import com.android.sdklib.SdkConstants;
 import com.intellij.android.designer.model.RadViewComponent;
 import com.intellij.designer.model.RadComponent;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
+import icons.AndroidDesignerIcons;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -33,7 +33,7 @@ import java.util.List;
 public enum Gravity {
   left, right, center, top, bottom;
 
-  public static Icon ICON = IconLoader.getIcon("/icons/gravity.png");
+  public static Icon ICON = AndroidDesignerIcons.Gravity;
 
   public static final int NONE = 0;
   public static final int TOP = 1 << 0;
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/actions/OrientationAction.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/actions/OrientationAction.java
index 71290ded0ec4..42b68fefecdc 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/actions/OrientationAction.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/actions/OrientationAction.java
@@ -23,8 +23,8 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.ThrowableRunnable;
+import icons.AndroidDesignerIcons;
 
 import javax.swing.*;
 import java.util.List;
@@ -33,9 +33,9 @@ import java.util.List;
  * @author Alexander Lobas
  */
 public class OrientationAction extends AnAction {
-  private static final Icon myHorizontalIcon = IconLoader.getIcon("/icons/LinearLayout.png");
-  private static final Icon myVerticalIcon = IconLoader.getIcon("/icons/LinearLayout2.png");
-  private static final Icon myHorizontalOverrideIcon = IconLoader.getIcon("/icons/LinearLayout3.png");
+  private static final Icon myHorizontalIcon = AndroidDesignerIcons.LinearLayout;
+  private static final Icon myVerticalIcon = AndroidDesignerIcons.LinearLayout2;
+  private static final Icon myHorizontalOverrideIcon = AndroidDesignerIcons.LinearLayout3;
 
   private final DesignerEditorPanel myDesigner;
   private final List<RadComponent> myComponents;
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
index 1d579a386f81..12eb4955c621 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
@@ -9,21 +9,21 @@
         tag="&lt;root&gt;"
         delete="false">
 
-    <palette title="Device Screen" icon="/icons/DeviceScreen.png"/>
+    <palette title="Device Screen" icon="AndroidDesignerIcons.DeviceScreen"/>
   </meta>
 
   <meta model="com.intellij.android.designer.model.RadViewComponent"
         tag="merge"
         delete="false">
 
-    <palette title="Device Screen (#merge)" icon="/icons/DeviceScreen.png"/>
+    <palette title="Device Screen (#merge)" icon="AndroidDesignerIcons.DeviceScreen"/>
   </meta>
 
   <meta model="com.intellij.android.designer.model.RadRequestFocus"
         class="java.lang.Object"
         tag="requestFocus">
 
-    <palette title="requestFocus" icon="/icons/requestFocus.png"
+    <palette title="requestFocus" icon="AndroidDesignerIcons.RequestFocus"
              tooltip="Requests focus for the parent element or one of its descendants."/>
 
   </meta>
@@ -34,7 +34,7 @@
 
     <presentation title=" - %layout:xml%"/>
 
-    <palette title="&lt;Include&gt;" icon="/icons/include.png"
+    <palette title="&lt;Include&gt;" icon="AndroidDesignerIcons.Include"
              tooltip="Lets you statically include XML layout inside other XML layouts."/>
 
     <properties inplace="layout:xml"/>
@@ -46,7 +46,7 @@
 
     <presentation title=" - %name%"/>
 
-    <palette title="&lt;Fragment&gt;" icon="/icons/fragment.png"
+    <palette title="&lt;Fragment&gt;" icon="AndroidDesignerIcons.Fragment"
              tooltip="A Fragment is a piece of an application's user interface or behavior that can be placed in an Activity."/>
 
     <properties inplace="name"/>
@@ -55,7 +55,7 @@
 
   <meta model="com.intellij.android.designer.model.RadCustomViewComponent"
         tag="view">
-    <palette title="CustomView" icon="/icons/unknown.png"/>
+    <palette title="CustomView" icon="AndroidDesignerIcons.Unknown"/>
   </meta>
 
   <meta class="android.view.View">
@@ -79,7 +79,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="TextView" icon="/icons/TextView.png"
+    <palette title="TextView" icon="AndroidDesignerIcons.TextView"
              tooltip="Displays text to the user and optionally allows them to edit it."/>
 
     <morphing to="EditText ImageView CheckedTextView"/>
@@ -107,7 +107,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="Button" icon="/icons/Button.png"
+    <palette title="Button" icon="AndroidDesignerIcons.Button"
              tooltip="Represents a push-button widget."/>
 
     <morphing to="RadioButton CheckBox ToggleButton ZoomButton ImageButton TextView EditText"/>
@@ -140,7 +140,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="Switch" icon="/icons/Switch.png"
+    <palette title="Switch" icon="AndroidDesignerIcons.Switch"
              version="Android 4.0 (API Level 14)"
              tooltip="A Switch is a two-state toggle switch widget that can select between two options."/>
 
@@ -161,7 +161,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="RadioButton" icon="/icons/RadioButton.png"
+    <palette title="RadioButton" icon="AndroidDesignerIcons.RadioButton"
              tooltip="A radio button is a two-states button that can be either checked or unchecked."/>
 
     <morphing to="Button CheckBox ToggleButton ZoomButton ImageButton TextView EditText"/>
@@ -185,7 +185,7 @@
 
     <morphing to="Button RadioButton ToggleButton ZoomButton ImageButton TextView EditText"/>
 
-    <palette title="CheckBox" icon="/icons/CheckBox.png"
+    <palette title="CheckBox" icon="AndroidDesignerIcons.CheckBox"
              tooltip="A checkbox is a specific type of two-states button that can be either checked or unchecked."/>
 
     <creation>
@@ -205,7 +205,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="ToggleButton" icon="/icons/ToggleButton.png"
+    <palette title="ToggleButton" icon="AndroidDesignerIcons.ToggleButton"
              tooltip="Displays checked/unchecked states as a button with a 'light' indicator and by default accompanied with the text 'ON' or 'OFF'. "/>
 
     <morphing to="Button RadioButton CheckBox ZoomButton ImageButton TextView EditText"/>
@@ -229,7 +229,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="CheckedTextView" icon="/icons/CheckedTextView.png"
+    <palette title="CheckedTextView" icon="AndroidDesignerIcons.CheckedTextView"
              tooltip="An extension to TextView that supports the Checkable interface."/>
 
     <morphing to="TextView EditText ImageView"/>
@@ -253,7 +253,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="EditText" icon="/icons/EditText.png"
+    <palette title="EditText" icon="AndroidDesignerIcons.EditText"
              tooltip="EditText is a thin veneer over TextView that configures itself to be editable."/>
 
     <morphing to="TextView CheckedTextView ImageView SearchView"/>
@@ -277,7 +277,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="AutoCompleteTextView" icon="/icons/AutoCompleteTextView.png"
+    <palette title="AutoCompleteTextView" icon="AndroidDesignerIcons.AutoCompleteTextView"
              tooltip="An editable text view that shows completion suggestions automatically while the user is typing."/>
 
     <morphing to="TextView CheckedTextView EditText MultiAutoCompleteTextView ImageView SearchView"/>
@@ -301,7 +301,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="MultiAutoCompleteTextView" icon="/icons/MultiAutoCompleteTextView.png"
+    <palette title="MultiAutoCompleteTextView" icon="AndroidDesignerIcons.MultiAutoCompleteTextView"
              tooltip="An editable text view, extending AutoCompleteTextView, that can show completion suggestions for the substring of the text where the user is typing instead of necessarily for the entire thing."/>
 
     <morphing to="TextView CheckedTextView EditText AutoCompleteTextView ImageView SearchView"/>
@@ -323,7 +323,7 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
-    <palette title="ExtractEditText" icon="/icons/TextView.png"
+    <palette title="ExtractEditText" icon="AndroidDesignerIcons.TextView"
              tooltip="Specialization of EditText for showing and interacting with the extracted text in a full-screen input method."/>
 
     <creation>
@@ -341,7 +341,7 @@
         class="android.widget.AnalogClock"
         tag="AnalogClock">
 
-    <palette title="AnalogClock" icon="/icons/AnalogClock.png"
+    <palette title="AnalogClock" icon="AndroidDesignerIcons.AnalogClock"
              tooltip="This widget display an analogic clock with two hands for hours and minutes."/>
 
     <morphing to="DigitalClock"/>
@@ -362,7 +362,7 @@
         class="android.widget.DigitalClock"
         tag="DigitalClock">
 
-    <palette title="DigitalClock" icon="/icons/DigitalClock.png"
+    <palette title="DigitalClock" icon="AndroidDesignerIcons.DigitalClock"
              tooltip="Like AnalogClock, but digital. Shows seconds."/>
 
     <morphing to="AnalogClock"/>
@@ -383,7 +383,7 @@
 
     <presentation title=" - &quot;%format%&quot;"/>
 
-    <palette title="Chronometer" icon="/icons/Chronometer.png"
+    <palette title="Chronometer" icon="AndroidDesignerIcons.Chronometer"
              tooltip="Class that implements a simple timer."/>
 
     <properties inplace="format text"
@@ -403,7 +403,7 @@
         class="android.view.SurfaceView"
         tag="SurfaceView">
 
-    <palette title="SurfaceView" icon="/icons/SurfaceView.png"
+    <palette title="SurfaceView" icon="AndroidDesignerIcons.SurfaceView"
              tooltip="Provides a dedicated drawing surface embedded inside of a view hierarchy. You can control the format of this surface and, if you like, its size; the SurfaceView takes care of placing the surface at the correct location on the screen."/>
 
     <creation>
@@ -420,7 +420,7 @@
         class="android.view.TextureView"
         tag="TextureView">
 
-    <palette title="TextureView" icon="/icons/TextureView.png"
+    <palette title="TextureView" icon="AndroidDesignerIcons.TextureView"
              tooltip="A TextureView can be used to display a content stream. Such a content stream can for instance be a video or an OpenGL scene."/>
 
     <creation>
@@ -437,7 +437,7 @@
         class="android.widget.VideoView"
         tag="VideoView">
 
-    <palette title="VideoView" icon="/icons/VideoView.png"
+    <palette title="VideoView" icon="AndroidDesignerIcons.VideoView"
              tooltip="Displays a video file. The VideoView class can load images from various sources (such as resources or content providers), takes care of computing its measurement from the video so that it can be used in any layout manager, and provides various display options such as scaling and tinting."/>
 
     <creation>
@@ -454,7 +454,7 @@
         class="android.widget.ProgressBar"
         tag="ProgressBar">
 
-    <palette title="ProgressBar" icon="/icons/ProgressBar.png"
+    <palette title="ProgressBar" icon="AndroidDesignerIcons.ProgressBar"
              tooltip="Visual indicator of progress in some operation."/>
 
     <morphing to="SeekBar RatingBar"/>
@@ -476,7 +476,7 @@
         class="android.widget.SeekBar"
         tag="SeekBar">
 
-    <palette title="SeekBar" icon="/icons/SeekBar.png"
+    <palette title="SeekBar" icon="AndroidDesignerIcons.SeekBar"
              tooltip="A SeekBar is an extension of ProgressBar that adds a draggable thumb."/>
 
     <morphing to="ProgressBar RatingBar"/>
@@ -497,7 +497,7 @@
         class="android.widget.RatingBar"
         tag="RatingBar">
 
-    <palette title="RatingBar" icon="/icons/RatingBar.png"
+    <palette title="RatingBar" icon="AndroidDesignerIcons.RatingBar"
              tooltip="A RatingBar is an extension of SeekBar and ProgressBar that shows a rating in stars."/>
 
     <morphing to="ProgressBar SeekBar"/>
@@ -520,7 +520,7 @@
         class="android.widget.ImageView"
         tag="ImageView">
 
-    <palette title="ImageView" icon="/icons/ImageView.png"
+    <palette title="ImageView" icon="AndroidDesignerIcons.ImageView"
              tooltip="Displays an arbitrary image, such as an icon."/>
 
     <morphing to="TextView EditText CheckedTextView"/>
@@ -542,7 +542,7 @@
         class="android.widget.ImageButton"
         tag="ImageButton">
 
-    <palette title="ImageButton" icon="/icons/ImageButton.png"
+    <palette title="ImageButton" icon="AndroidDesignerIcons.ImageButton"
              tooltip="Displays a button with an image (instead of text) that can be pressed or clicked by the user."/>
 
     <morphing to="Button RadioButton CheckBox ToggleButton ZoomButton TextView EditText"/>
@@ -561,7 +561,7 @@
         class="android.widget.ZoomButton"
         tag="ZoomButton">
 
-    <palette title="ZoomButton" icon="/icons/ZoomButton.png"/>
+    <palette title="ZoomButton" icon="AndroidDesignerIcons.ZoomButton"/>
 
     <morphing to="Button RadioButton CheckBox ToggleButton ImageButton TextView EditText"/>
 
@@ -579,7 +579,7 @@
         class="android.widget.QuickContactBadge"
         tag="QuickContactBadge">
 
-    <palette title="QuickContactBadge" icon="/icons/QuickContactBadge.png"
+    <palette title="QuickContactBadge" icon="AndroidDesignerIcons.QuickContactBadge"
              version="Android 2.0 (API Level 5)"
              tooltip="Widget used to show an image with the standard QuickContact badge and on-click behavior."/>
 
@@ -599,7 +599,7 @@
         class="android.widget.Space"
         tag="Space">
 
-    <palette title="Space" icon="/icons/Space.png"
+    <palette title="Space" icon="AndroidDesignerIcons.Space"
              version="Android 4.0 (API Level 14)"
              tooltip="Space is a lightweight View subclass that may be used to create gaps between components in general purpose layouts."/>
 
@@ -617,7 +617,7 @@
         class="android.inputmethodservice.KeyboardView"
         tag="KeyboardView">
 
-    <palette title="KeyboardView" icon="/icons/TextView.png"
+    <palette title="KeyboardView" icon="AndroidDesignerIcons.TextView"
              tooltip="A view that renders a virtual Keyboard. It handles rendering of keys and detecting key presses and touch movements."/>
 
     <creation>
@@ -634,7 +634,7 @@
         class="android.gesture.GestureOverlayView"
         tag="GestureOverlayView">
 
-    <palette title="GestureOverlayView" icon="/icons/GestureOverlayView.png"
+    <palette title="GestureOverlayView" icon="AndroidDesignerIcons.GestureOverlayView"
              tooltip="A transparent overlay for gesture input that can be placed on top of other widgets or contain other widgets."/>
 
     <properties inplace="gestureColor orientation"
@@ -655,7 +655,7 @@
         class="android.view.ViewStub"
         tag="ViewStub">
 
-    <palette title="ViewStub" icon="/icons/ViewStub.png"
+    <palette title="ViewStub" icon="AndroidDesignerIcons.ViewStub"
              tooltip="A ViewStub is an invisible, zero-sized View that can be used to lazily inflate layout resources at runtime."/>
 
     <properties inplace="layout inflatedId"
@@ -677,7 +677,7 @@
         class="android.widget.DatePicker"
         tag="DatePicker">
 
-    <palette title="DatePicker" icon="/icons/DatePicker.png"
+    <palette title="DatePicker" icon="AndroidDesignerIcons.DatePicker"
              tooltip="This class is a widget for selecting a date."/>
 
     <morphing to="TimePicker CalendarView"/>
@@ -698,7 +698,7 @@
         class="android.widget.CalendarView"
         tag="CalendarView">
 
-    <palette title="CalendarView" icon="/icons/CalendarView.png"
+    <palette title="CalendarView" icon="AndroidDesignerIcons.CalendarView"
              version="Android 3.0 (API Level 11)"
              tooltip="This class is a calendar widget for displaying and selecting dates."/>
 
@@ -721,7 +721,7 @@
         class="android.widget.TimePicker"
         tag="TimePicker">
 
-    <palette title="TimePicker" icon="/icons/TimePicker.png"
+    <palette title="TimePicker" icon="AndroidDesignerIcons.TimePicker"
              tooltip="A view for selecting the time of day, in either 24 hour or AM/PM mode."/>
 
     <morphing to="DatePicker CalendarView"/>
@@ -743,7 +743,7 @@
         class="android.widget.NumberPicker"
         tag="NumberPicker">
 
-    <palette title="NumberPicker" icon="/icons/NumberPicker.png"
+    <palette title="NumberPicker" icon="AndroidDesignerIcons.NumberPicker"
              version="Android 3.0 (API Level 11)"
              tooltip="A widget that enables the user to select a number form a predefined range. The widget presents an input field and up and down buttons for selecting the current value. Pressing/long-pressing the up and down buttons increments and decrements the current value respectively."/>
 
@@ -763,7 +763,7 @@
         class="android.widget.ZoomControls"
         tag="ZoomControls">
 
-    <palette title="ZoomControls" icon="/icons/ZoomControls.png"
+    <palette title="ZoomControls" icon="AndroidDesignerIcons.ZoomControls"
              tooltip="The ZoomControls class displays a simple set of controls used for zooming and provides callbacks to register for events."/>
 
     <creation>
@@ -780,7 +780,7 @@
         class="android.widget.SearchView"
         tag="SearchView">
 
-    <palette title="SearchView" icon="/icons/SearchView.png"
+    <palette title="SearchView" icon="AndroidDesignerIcons.SearchView"
              version="Android 3.0 (API Level 11)"
              tooltip="A widget that provides a user interface for the user to enter a search query and submit a request to a search provider. Shows a list of query suggestions or results, if available, and allows the user to pick a suggestion or result to launch into."/>
 
@@ -806,7 +806,7 @@
         class="android.widget.ListView"
         tag="ListView">
 
-    <palette title="ListView" icon="/icons/ListView.png"
+    <palette title="ListView" icon="AndroidDesignerIcons.ListView"
              tooltip="A view that shows items in a vertically scrolling list. The items come from the ListAdapter associated with this view."/>
 
     <morphing to="ExpandableListView GridView"/>
@@ -827,7 +827,7 @@
         class="android.widget.ExpandableListView"
         tag="ExpandableListView">
 
-    <palette title="ExpandableListView" icon="/icons/ExpandableListView.png"
+    <palette title="ExpandableListView" icon="AndroidDesignerIcons.ExpandableListView"
              tooltip="A view that shows items in a vertically scrolling two-level list. This differs from the ListView by allowing two levels: groups which can individually be expanded to show its children."/>
 
     <morphing to="ListView GridView"/>
@@ -848,7 +848,7 @@
         class="android.widget.GridView"
         tag="GridView">
 
-    <palette title="GridView" icon="/icons/GridView.png"
+    <palette title="GridView" icon="AndroidDesignerIcons.GridView"
              tooltip="A view that shows items in two-dimensional scrolling grid. The items in the grid come from the ListAdapter associated with this view."/>
 
     <morphing to="ListView ExpandableListView"/>
@@ -870,7 +870,7 @@
         class="android.webkit.WebView"
         tag="WebView">
 
-    <palette title="WebView" icon="/icons/WebView.png"
+    <palette title="WebView" icon="AndroidDesignerIcons.WebView"
              tooltip="A View that displays web pages. This class is the basis upon which you can roll your own web browser or simply display some online content within your Activity."/>
 
     <creation>
@@ -888,7 +888,7 @@
         class="android.widget.ScrollView"
         tag="ScrollView">
 
-    <palette title="ScrollView" icon="/icons/ScrollView.png"
+    <palette title="ScrollView" icon="AndroidDesignerIcons.ScrollView"
              tooltip="Layout container for a view hierarchy that can be scrolled by the user, allowing it to be larger than the physical display. ScrollView only supports vertical scrolling."/>
 
     <morphing to="HorizontalScrollView"/>
@@ -911,7 +911,7 @@
         class="android.widget.HorizontalScrollView"
         tag="HorizontalScrollView">
 
-    <palette title="HorizontalScrollView" icon="/icons/HorizontalScrollView.png"
+    <palette title="HorizontalScrollView" icon="AndroidDesignerIcons.HorizontalScrollView"
              tooltip="Layout container for a view hierarchy that can be scrolled by the user, allowing it to be larger than the physical display."/>
 
     <morphing to="ScrollView"/>
@@ -933,7 +933,7 @@
         class="android.widget.Gallery"
         tag="Gallery">
 
-    <palette title="Gallery" icon="/icons/Gallery.png"
+    <palette title="Gallery" icon="AndroidDesignerIcons.Gallery"
              tooltip="A view that shows items in a center-locked, horizontally scrolling list."/>
 
     <properties important="gravity animationDuration spacing unselectedAlpha"/>
@@ -952,7 +952,7 @@
         class="android.widget.Spinner"
         tag="Spinner">
 
-    <palette title="Spinner" icon="/icons/Spinner.png"
+    <palette title="Spinner" icon="AndroidDesignerIcons.Spinner"
              tooltip="A view that displays one child at a time and lets the user pick among them."/>
 
     <properties inplace="spinnerMode"
@@ -972,7 +972,7 @@
         class="android.widget.MediaController"
         tag="MediaController">
 
-    <palette title="MediaController" icon="/icons/MediaController.png"
+    <palette title="MediaController" icon="AndroidDesignerIcons.MediaController"
              tooltip="A view containing controls for a MediaPlayer. Typically contains the buttons like 'Play/Pause', 'Rewind', 'Fast Forward' and a progress slider. It takes care of synchronizing the controls with the state of the MediaPlayer."/>
 
     <creation>
@@ -989,7 +989,7 @@
         class="android.widget.StackView"
         tag="StackView">
 
-    <palette title="StackView" icon="/icons/StackView.png"
+    <palette title="StackView" icon="AndroidDesignerIcons.StackView"
              version="Android 3.0 (API Level 11)"
              tooltip="A view that displays its children in a stack and allows users to discretely swipe through the children."/>
 
@@ -1009,7 +1009,7 @@
         class="android.widget.AdapterViewFlipper"
         tag="AdapterViewFlipper">
 
-    <palette title="AdapterViewFlipper" icon="/icons/AdapterViewFlipper.png"
+    <palette title="AdapterViewFlipper" icon="AndroidDesignerIcons.AdapterViewFlipper"
              version="Android 3.0 (API Level 11)"
              tooltip="Simple ViewAnimator that will animate between two or more views that have been added to it. Only one child is shown at a time. If requested, can automatically flip between each child at a regular interval."/>
 
@@ -1030,7 +1030,7 @@
         class="android.widget.ViewAnimator"
         tag="ViewAnimator">
 
-    <palette title="ViewAnimator" icon="/icons/ViewAnimator.png"
+    <palette title="ViewAnimator" icon="AndroidDesignerIcons.ViewAnimator"
              tooltip="Container that will perform animations when switching between its views."/>
 
     <properties important="inAnimation outAnimation animateFirstView"/>
@@ -1050,7 +1050,7 @@
         class="android.widget.ViewFlipper"
         tag="ViewFlipper">
 
-    <palette title="ViewFlipper" icon="/icons/ViewFlipper.png"
+    <palette title="ViewFlipper" icon="AndroidDesignerIcons.ViewFlipper"
              tooltip="Simple ViewAnimator that will animate between two or more views that have been added to it. Only one child is shown at a time. If requested, can automatically flip between each child at a regular interval."/>
 
     <properties important="flipInterval autoStart"/>
@@ -1070,7 +1070,7 @@
         class="android.widget.ViewSwitcher"
         tag="ViewSwitcher">
 
-    <palette title="ViewSwitcher" icon="/icons/ViewSwitcher.png"
+    <palette title="ViewSwitcher" icon="AndroidDesignerIcons.ViewSwitcher"
              tooltip="ViewAnimator that switches between two views, and has a factory from which these views are created. You can either use the factory to create the views, or add them yourself. A ViewSwitcher can only have two child views, of which only one is shown at a time."/>
 
     <creation>
@@ -1088,7 +1088,7 @@
         class="android.widget.ImageSwitcher"
         tag="ImageSwitcher">
 
-    <palette title="ImageSwitcher" icon="/icons/ImageSwitcher.png"/>
+    <palette title="ImageSwitcher" icon="AndroidDesignerIcons.ImageSwitcher"/>
 
     <creation>
       <![CDATA[
@@ -1105,7 +1105,7 @@
         class="android.widget.TextSwitcher"
         tag="TextSwitcher">
 
-    <palette title="TextSwitcher" icon="/icons/TextSwitcher.png"
+    <palette title="TextSwitcher" icon="AndroidDesignerIcons.TextSwitcher"
              tooltip="Specialized ViewSwitcher that contains only children of type TextView. A TextSwitcher is useful to animate a label on screen."/>
 
     <creation>
@@ -1125,7 +1125,7 @@
 
     <presentation title=" (%orientation%)"/>
 
-    <palette title="RadioGroup" icon="/icons/RadioGroup.png"
+    <palette title="RadioGroup" icon="AndroidDesignerIcons.RadioGroup"
              tooltip="This class is used to create a multiple-exclusion scope for a set of radio buttons. Checking one radio button that belongs to a radio group unchecks any previously checked radio button within the same group."/>
 
     <morphing to="LinearLayout TableLayout GridLayout RelativeLayout"/>
@@ -1152,7 +1152,7 @@
     <properties inplace="mode"
                 important="mode"/>
 
-    <palette title="TwoLineListItem" icon="/icons/TwoLineListItem.png"
+    <palette title="TwoLineListItem" icon="AndroidDesignerIcons.TwoLineListItem"
              tooltip="A view group with two children, intended for use in ListViews."/>
 
     <creation>
@@ -1170,7 +1170,7 @@
         class="android.widget.DialerFilter"
         tag="DialerFilter">
 
-    <palette title="DialerFilter" icon="/icons/DialerFilter.png"/>
+    <palette title="DialerFilter" icon="AndroidDesignerIcons.DialerFilter"/>
 
     <creation>
       <![CDATA[
@@ -1200,7 +1200,7 @@
         class="android.widget.TabHost"
         tag="TabHost">
 
-    <palette title="TabHost" icon="/icons/TabHost.png"
+    <palette title="TabHost" icon="AndroidDesignerIcons.TabHost"
              tooltip="Container for a tabbed window view. This object holds two children: a set of tab labels that the user clicks to select a specific tab, and a FrameLayout object that displays the contents of that page. The individual elements are typically controlled using this container object, rather than setting values on the child elements themselves."/>
 
     <creation>
@@ -1247,7 +1247,7 @@
         class="android.widget.TabWidget"
         tag="TabWidget">
 
-    <palette title="TabWidget" icon="/icons/TabWidget.png"/>
+    <palette title="TabWidget" icon="AndroidDesignerIcons.TabWidget"/>
 
     <properties important="divider tabStripEnabled tabStripLeft tabStripRight tabLayout"/>
   </meta>
@@ -1260,7 +1260,7 @@
                 important="orientation"
                 expert="handle content"/>
 
-    <palette title="SlidingDrawer" icon="/icons/SlidingDrawer.png"
+    <palette title="SlidingDrawer" icon="AndroidDesignerIcons.SlidingDrawer"
              tooltip="SlidingDrawer hides content out of the screen and allows the user to drag a handle to bring the content on screen. SlidingDrawer can be used vertically or horizontally. A special widget composed of two children views: the handle, that the users drags, and the content, attached to the handle and dragged with it."/>
 
     <creation>
@@ -1294,7 +1294,7 @@
 
     <presentation title=" (%orientation%)"/>
 
-    <palette title="LinearLayout" icon="/icons/LinearLayout.png"
+    <palette title="LinearLayout" icon="AndroidDesignerIcons.LinearLayout"
              tooltip="A Layout that arranges its children in a single column or a single row."/>
 
     <morphing to="RadioGroup TableLayout GridLayout RelativeLayout"/>
@@ -1321,7 +1321,7 @@
         class="android.widget.FrameLayout"
         tag="FrameLayout">
 
-    <palette title="FrameLayout" icon="/icons/FrameLayout.png"
+    <palette title="FrameLayout" icon="AndroidDesignerIcons.FrameLayout"
              tooltip="FrameLayout is designed to block out an area on the screen to display a single item."/>
 
     <morphing to="TableLayout GridLayout RelativeLayout"/>
@@ -1345,7 +1345,7 @@
         class="android.widget.AbsoluteLayout"
         tag="AbsoluteLayout">
 
-    <palette title="AbsoluteLayout" icon="/icons/AbsoluteLayout.png"
+    <palette title="AbsoluteLayout" icon="AndroidDesignerIcons.AbsoluteLayout"
              tooltip="A layout that lets you specify exact locations (x/y coordinates) of its children. Absolute layouts are less flexible and harder to maintain than other types of layouts without absolute positioning."/>
 
     <morphing to="RelativeLayout"/>
@@ -1367,7 +1367,7 @@
 
     <properties important="stretchColumns shrinkColumns collapseColumns"/>
 
-    <palette title="TableLayout" icon="/icons/TableLayout.png"
+    <palette title="TableLayout" icon="AndroidDesignerIcons.TableLayout"
              tooltip="A layout that arranges its children into rows and columns. A TableLayout consists of a number of TableRow objects, each defining a row (actually, you can have other children, which will be explained below). TableLayout containers do not display border lines for their rows, columns, or cells. Each row has zero or more cells; each cell can hold one View object. The table has as many columns as the row with the most cells. A table can leave cells empty. Cells can span columns, as they can in HTML."/>
 
     <morphing to="GridLayout RelativeLayout"/>
@@ -1387,7 +1387,7 @@
         class="android.widget.TableRow"
         tag="TableRow">
 
-    <palette title="TableRow" icon="/icons/TableRow.png"
+    <palette title="TableRow" icon="AndroidDesignerIcons.TableRow"
              tooltip="A layout that arranges its children horizontally. A TableRow should always be used as a child of a TableLayout. If a TableRow's parent is not a TableLayout, the TableRow will behave as an horizontal LinearLayout."/>
 
     <creation>
@@ -1413,7 +1413,7 @@
 
     <morphing to="TableLayout RelativeLayout"/>
 
-    <palette title="GridLayout" icon="/icons/GridLayout.png"
+    <palette title="GridLayout" icon="AndroidDesignerIcons.GridLayout"
              version="Android 4.0 (API Level 14)"
              tooltip="A layout that places its children in a rectangular grid."/>
 
@@ -1440,7 +1440,7 @@
 
     <morphing to="TableLayout RelativeLayout"/>
 
-    <palette title="v7.GridLayout" icon="/icons/GridLayout.png"
+    <palette title="v7.GridLayout" icon="AndroidDesignerIcons.GridLayout"
              version="Android 2.1 (API Level 7)"
              tooltip="A layout that places its children in a rectangular grid."/>
 
@@ -1462,7 +1462,7 @@
 
     <properties important="gravity ignoreGravity"/>
 
-    <palette title="RelativeLayout" icon="/icons/RelativeLayout.png"
+    <palette title="RelativeLayout" icon="AndroidDesignerIcons.RelativeLayout"
              tooltip="A Layout where the positions of the children can be described in relation to each other or to the parent."/>
 
     <creation>
diff --git a/plugins/android/src/META-INF/plugin.xml b/plugins/android/src/META-INF/plugin.xml
index 2fcca50b9090..f340493a27e9 100644
--- a/plugins/android/src/META-INF/plugin.xml
+++ b/plugins/android/src/META-INF/plugin.xml
@@ -40,7 +40,7 @@
     <action id="Android.CreateResourceDirectory" class="org.jetbrains.android.actions.CreateResourceDirectoryAction">
       <add-to-group group-id="NewGroup" anchor="after" relative-to-action="Android.CreateResourcesActionGroup"/>
     </action>
-    <group id="AndroidToolsGroup" popup="true" text="Android" icon="/icons/android.png"
+    <group id="AndroidToolsGroup" popup="true" text="Android" icon="AndroidIcons.Android"
            class="org.jetbrains.android.actions.AndroidToolsActionGroup">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>
@@ -79,7 +79,7 @@
             class="org.jetbrains.android.actions.AndroidConnectDebuggerAction"
             text="Attach debugger to Android process"
             description="Attach debugger to Android process"
-            icon="/icons/attachDebugger.png">
+            icon="AndroidIcons.AttachDebugger">
       <add-to-group group-id="ToolbarRunGroup" anchor="after" relative-to-action="RunnerActions"/>
     </action>
     <action id="AndroidExtractStyleAction" class="org.jetbrains.android.refactoring.AndroidExtractStyleAction" text="St_yle..."
@@ -199,7 +199,7 @@
     <facet.toolWindow id="Android"
                       facetIdList="android"
                       anchor="bottom"
-                      icon="/icons/android.png"
+                      icon="AndroidIcons.Android"
                       factoryClass="org.jetbrains.android.logcat.AndroidLogcatToolWindowFactory"/>
     <projectService serviceInterface="org.jetbrains.android.logcat.AndroidLogcatFiltersPreferences"
                     serviceImplementation="org.jetbrains.android.logcat.AndroidLogcatFiltersPreferences"/>
@@ -258,4 +258,4 @@
     <extensionPoint name="lightBuildProvider" interface="org.jetbrains.android.compiler.AndroidLightBuildProvider"/>
     <extensionPoint name="refactoringContextProvider" interface="org.jetbrains.android.refactoring.AndroidRefactoringContextProvider"/>
   </extensionPoints>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlFileType.java b/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlFileType.java
index 913047903b6a..75fa89b3c8cd 100644
--- a/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlFileType.java
+++ b/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlFileType.java
@@ -16,7 +16,7 @@
 package org.jetbrains.android.fileTypes;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.IconLoader;
+import icons.AndroidIcons;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -52,7 +52,7 @@ public class AndroidIdlFileType extends LanguageFileType {
 
     @Nullable
     public Icon getIcon() {
-        return IconLoader.getIcon("/icons/android.png");
+        return AndroidIcons.Android;
     }
 
     @NotNull
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
index 01e66537f39f..a0f311e3784f 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java
@@ -27,7 +27,6 @@ import com.android.resources.ScreenSize;
 import com.android.resources.UiMode;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.CheckboxAction;
@@ -42,14 +41,15 @@ import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.ui.CollectionComboBoxModel;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
+import icons.AndroidIcons;
 import org.jetbrains.android.dom.manifest.Activity;
 import org.jetbrains.android.dom.manifest.Application;
 import org.jetbrains.android.dom.manifest.Manifest;
@@ -74,11 +74,11 @@ import java.util.List;
  * @author Eugene.Kudelevsky
  */
 class AndroidLayoutPreviewToolWindowForm implements Disposable {
-  private static final Icon ZOOM_TO_FIT_ICON = IconLoader.getIcon("/icons/zoomFit.png");
-  private static final Icon ZOOM_IN_ICON = IconLoader.getIcon("/icons/zoomIn.png");
-  private static final Icon ZOOM_OUT_ICON = IconLoader.getIcon("/icons/zoomOut.png");
-  private static final Icon ZOOM_ACTUAL_ICON = IconLoader.getIcon("/icons/zoomActual.png");
-  private static final Icon REFRESH_ICON = IconLoader.getIcon("/icons/refreshPreview.png");
+  private static final Icon ZOOM_TO_FIT_ICON = AndroidIcons.ZoomFit;
+  private static final Icon ZOOM_IN_ICON = AndroidIcons.ZoomIn;
+  private static final Icon ZOOM_OUT_ICON = AndroidIcons.ZoomOut;
+  private static final Icon ZOOM_ACTUAL_ICON = AndroidIcons.ZoomActual;
+  private static final Icon REFRESH_ICON = AndroidIcons.RefreshPreview;
 
   private static final String CUSTOM_DEVICE_STRING = "Edit...";
 
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
index ba3e47d69164..fe451b659874 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java
@@ -43,7 +43,6 @@ import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.*;
 import com.intellij.openapi.wm.ToolWindow;
@@ -61,6 +60,7 @@ import com.intellij.util.containers.HashMap;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.update.MergingUpdateQueue;
 import com.intellij.util.ui.update.Update;
+import icons.AndroidIcons;
 import org.jetbrains.android.dom.layout.LayoutDomFileDescription;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.maven.AndroidMavenUtil;
@@ -90,7 +90,7 @@ import java.util.Map;
  * @author Eugene.Kudelevsky
  */
 public class AndroidLayoutPreviewToolWindowManager implements ProjectComponent {
-  private static final Icon ANDROID_PREVIEW_ICON = IconLoader.getIcon("/icons/androidPreview.png");
+  private static final Icon ANDROID_PREVIEW_ICON = AndroidIcons.AndroidPreview;
 
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.uipreview.AndroidLayoutPreviewToolWindowManager");
 
diff --git a/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java b/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
index 122a5eec96a1..d4cd874d41e2 100644
--- a/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
+++ b/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
@@ -55,7 +55,6 @@ import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -77,6 +76,7 @@ import com.intellij.util.ui.UIUtil;
 import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.DomFileElement;
 import com.intellij.util.xml.DomManager;
+import icons.AndroidIcons;
 import org.jetbrains.android.dom.AndroidDomUtil;
 import org.jetbrains.android.dom.manifest.Activity;
 import org.jetbrains.android.dom.manifest.Application;
@@ -103,11 +103,11 @@ public class AndroidUtils {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.util.AndroidUtils");
 
   // Icons
-  public static final Icon ANDROID_TOOLWINDOW_ICON = IconLoader.getIcon("/icons/androidToolWindow.png");
-  public static final Icon ANDROID_ICON = IconLoader.getIcon("/icons/android.png");
-  public static final Icon DDMS_ICON = IconLoader.getIcon("/icons/ddms.png");
-  public static final Icon RESTART_LOGCAT_ICON = IconLoader.getIcon("/icons/restartLogcat.png");
-  public static final Icon ANDROID_ICON_24 = IconLoader.getIcon("/icons/android24.png");
+  public static final Icon ANDROID_TOOLWINDOW_ICON = AndroidIcons.AndroidToolWindow;
+  public static final Icon ANDROID_ICON = AndroidIcons.Android;
+  public static final Icon DDMS_ICON = AndroidIcons.Ddms;
+  public static final Icon RESTART_LOGCAT_ICON = AndroidIcons.RestartLogcat;
+  public static final Icon ANDROID_ICON_24 = AndroidIcons.Android24;
 
   @NonNls public static final String NAMESPACE_KEY = "android";
   @NonNls public static final String SYSTEM_RESOURCE_PACKAGE = "android";
diff --git a/plugins/copyright/src/META-INF/plugin.xml b/plugins/copyright/src/META-INF/plugin.xml
index 37787959da56..cdede4285882 100644
--- a/plugins/copyright/src/META-INF/plugin.xml
+++ b/plugins/copyright/src/META-INF/plugin.xml
@@ -38,16 +38,16 @@
 
 
     <actions>
-        <action id="UpdateCopyright" class="com.maddyhome.idea.copyright.actions.UpdateCopyrightAction" text="Update Copyright..." description="Generate/Update the copyright notice." icon="/resources/copyright18x18.png">
+        <action id="UpdateCopyright" class="com.maddyhome.idea.copyright.actions.UpdateCopyrightAction" text="Update Copyright..." description="Generate/Update the copyright notice." icon="CopyrightIcons.Copyright18x18">
             <add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
             <add-to-group group-id="CodeMenu" anchor="last"/>
             <add-to-group group-id="NavbarPopupMenu" anchor="last"/>
         </action>
-        <action id="GenerateCopyright" class="com.maddyhome.idea.copyright.actions.GenerateCopyrightAction" text="Copyright" description="Generate/Update the copyright notice." icon="/resources/copyright18x18.png">
+        <action id="GenerateCopyright" class="com.maddyhome.idea.copyright.actions.GenerateCopyrightAction" text="Copyright" description="Generate/Update the copyright notice." icon="CopyrightIcons.Copyright18x18">
             <add-to-group group-id="GenerateGroup" anchor="last"/>
         </action>
-        <action id="UpdateFileCopyright" class="com.maddyhome.idea.copyright.actions.GenerateCopyrightAction" text="Update Copyright" description="Generate/Update the copyright notice." icon="/resources/copyright18x18.png">
+        <action id="UpdateFileCopyright" class="com.maddyhome.idea.copyright.actions.GenerateCopyrightAction" text="Update Copyright" description="Generate/Update the copyright notice." icon="CopyrightIcons.Copyright18x18">
             <add-to-group group-id="EditorPopupMenu" anchor="last"/>
         </action>
     </actions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java
index c1a0401e8c5d..7402545d4084 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
+import icons.CopyrightIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -30,7 +30,7 @@ public class CopyrightProjectConfigurable extends SearchableConfigurable.Parent.
   private final Project project;
   private ProjectSettingsPanel optionsPanel = null;
 
-  private static final Icon icon = IconLoader.getIcon("/resources/copyright32x32.png");
+  private static final Icon icon = CopyrightIcons.Copyright32x32;
 
   private static final Logger logger = Logger.getInstance(CopyrightProjectConfigurable.class.getName());
   private final CopyrightProfilesPanel myProfilesPanel;
diff --git a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java
index b45054fe7ac4..4c9bc88976b3 100644
--- a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java
+++ b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java
@@ -28,7 +28,6 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -38,6 +37,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
+import icons.DevkitIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.devkit.DevKitBundle;
@@ -56,7 +56,7 @@ public class CreateHtmlDescriptionFix implements LocalQuickFix, Iconable {
   private final String myFilename;
   private final Module myModule;  
   @NonNls private static final String TEMPLATE_NAME = "InspectionDescription.html";
-  private static final Icon NEW_HTML_ICON = IconLoader.getIcon("/new_html.png");
+  private static final Icon NEW_HTML_ICON = DevkitIcons.New_html;
   private final boolean isIntention;
 
   public CreateHtmlDescriptionFix(String filename, Module module, boolean isIntention) {
diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java
index 6f525a4753c9..223dfd72af10 100644
--- a/plugins/devkit/src/projectRoots/IdeaJdk.java
+++ b/plugins/devkit/src/projectRoots/IdeaJdk.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.roots.AnnotationOrderRootType;
 import com.intellij.openapi.roots.JavadocOrderRootType;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.WriteExternalException;
@@ -35,6 +34,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.cls.BytePointer;
 import com.intellij.util.cls.ClsFormatException;
 import com.intellij.util.cls.ClsUtil;
+import icons.DevkitIcons;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -54,9 +54,9 @@ import java.util.List;
  * Date: Nov 22, 2004
  */
 public class IdeaJdk extends SdkType implements JavaSdkType {
-  private static final Icon ADD_SDK = IconLoader.getIcon("/add_sdk.png");
-  private static final Icon SDK_OPEN = IconLoader.getIcon("/sdk_open.png");
-  private static final Icon SDK_CLOSED = IconLoader.getIcon("/sdk_closed.png");
+  private static final Icon ADD_SDK = DevkitIcons.Add_sdk;
+  private static final Icon SDK_OPEN = DevkitIcons.Sdk_open;
+  private static final Icon SDK_CLOSED = DevkitIcons.Sdk_closed;
 
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit.projectRoots.IdeaJdk");
   @NonNls private static final String LIB_DIR_NAME = "lib";
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index 46672076a08c..5943261a71aa 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -36,7 +36,7 @@
     </group>
 
     <group id="GitRepositoryActions">
-      <action id="Git.Branches" class="git4idea.ui.branch.GitBranchesAction" text="_Branches" icon="/icons/branch.png"/>
+      <action id="Git.Branches" class="git4idea.ui.branch.GitBranchesAction" text="_Branches" icon="Git4ideaIcons.Branch"/>
       <action id="Git.Tag" class="git4idea.actions.GitTag" text="Tag Files..."/>
       <action id="Git.Merge" class="git4idea.actions.GitMerge" text="Merge Changes..." icon="AllIcons.Vcs.MergeSourcesTree"/>
       <action id="Git.Stash" class="git4idea.actions.GitStash" text="Stash Changes..."/>
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
index 5ffa1a566c98..093d793ff9b2 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
@@ -69,6 +69,7 @@ import git4idea.history.browser.*;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
 import git4idea.ui.branch.GitBranchUiUtil;
+import icons.Git4ideaIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -93,7 +94,7 @@ import java.util.List;
  */
 public class GitLogUI implements Disposable {
   private final static Logger LOG = Logger.getInstance("#git4idea.history.wholeTree.GitLogUI");
-  static final Icon ourMarkIcon = IconLoader.getIcon("/icons/star.png");
+  static final Icon ourMarkIcon = Git4ideaIcons.Star;
   public static final SimpleTextAttributes HIGHLIGHT_TEXT_ATTRIBUTES =
     new SimpleTextAttributes(SimpleTextAttributes.STYLE_SEARCH_MATCH, UIUtil.getTableForeground());
   public static final String GIT_LOG_TABLE_PLACE = "git log table";
@@ -1657,7 +1658,7 @@ public class GitLogUI implements Disposable {
     private final Set<AbstractHash> myIdsInProgress;
 
     private MyCherryPick() {
-      super("Cherry-pick", "Cherry-pick", IconLoader.getIcon("/icons/cherryPick.png"));
+      super("Cherry-pick", "Cherry-pick", Git4ideaIcons.CherryPick);
       myIdsInProgress = new HashSet<AbstractHash>();
     }
 
@@ -1928,7 +1929,7 @@ public class GitLogUI implements Disposable {
     private final GitLogSettings myInstance;
 
     public MyShowTreeAction() {
-      super(SHOW_GRAPH_TITLE, SHOW_GRAPH_DESCRIPTION, IconLoader.getIcon("/icons/branch.png"));
+      super(SHOW_GRAPH_TITLE, SHOW_GRAPH_DESCRIPTION, Git4ideaIcons.Branch);
       myInstance = GitLogSettings.getInstance(myProject);
       myIsSelected = myInstance.isShowTree();
     }
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GraphGutter.java b/plugins/git4idea/src/git4idea/history/wholeTree/GraphGutter.java
index 80fd28391f0b..088cd64ab9bc 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/GraphGutter.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/GraphGutter.java
@@ -16,12 +16,12 @@
 package git4idea.history.wholeTree;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.Gray;
 import com.intellij.ui.table.JBTable;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.UIUtil;
+import icons.Git4ideaIcons;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -479,10 +479,10 @@ public class GraphGutter {
     }
   }
 
-  private final static Icon[] ourIcons = new Icon[] {IconLoader.getIcon("/icons/ball0.png"), IconLoader.getIcon("/icons/ball1.png"),
-    IconLoader.getIcon("/icons/ball2.png"), IconLoader.getIcon("/icons/ball3.png"), IconLoader.getIcon("/icons/ball4.png"),
-    IconLoader.getIcon("/icons/ball5.png"), IconLoader.getIcon("/icons/ball6.png"), IconLoader.getIcon("/icons/ball7.png")};
-  private final static Icon ourGrey = IconLoader.getIcon("/icons/greyball.png");
+  private final static Icon[] ourIcons = new Icon[] {Git4ideaIcons.Ball0, Git4ideaIcons.Ball1,
+    Git4ideaIcons.Ball2, Git4ideaIcons.Ball3, Git4ideaIcons.Ball4,
+    Git4ideaIcons.Ball5, Git4ideaIcons.Ball6, Git4ideaIcons.Ball7};
+  private final static Icon ourGrey = Git4ideaIcons.Greyball;
 
   public static enum PresentationStyle {
     multicolour() {
diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java
index 06b9d0b9560d..7612796fd216 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java
@@ -18,12 +18,12 @@ package git4idea.ui.branch;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.TabbedPaneImpl;
 import git4idea.GitUtil;
 import git4idea.repo.GitRepository;
 import git4idea.util.GitCommitCompareInfo;
 import git4idea.util.GitUIUtil;
+import icons.Git4ideaIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -67,7 +67,7 @@ public class GitCompareBranchesDialog extends DialogWrapper {
     JPanel diffPanel = new GitCompareBranchesDiffPanel(myProject, myBranchName, myCurrentBranchName, myCompareInfo);
 
     TabbedPaneImpl tabbedPane = new TabbedPaneImpl(SwingConstants.TOP);
-    tabbedPane.addTab("Log", IconLoader.getIcon("/icons/branch.png"), myLogPanel);
+    tabbedPane.addTab("Log", Git4ideaIcons.Branch, myLogPanel);
     tabbedPane.addTab("Diff", AllIcons.Actions.Diff, diffPanel);
     tabbedPane.setKeyboardNavigation(TabbedPaneImpl.DEFAULT_PREV_NEXT_SHORTCUTS);
     return tabbedPane;
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
index a0ab2f64d989..8ec71116de4f 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.tasks.github.GithubApiUtil;
@@ -34,6 +33,7 @@ import git4idea.config.GitVersion;
 import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
+import icons.GithubIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.github.ui.GithubLoginDialog;
@@ -52,7 +52,7 @@ import java.util.List;
  */
 public class GithubUtil {
 
-  public static final Icon GITHUB_ICON = IconLoader.getIcon("/org/jetbrains/plugins/github/github_icon.png");
+  public static final Icon GITHUB_ICON = GithubIcons.Github_icon;
 
   public static final Logger LOG = Logger.getInstance("github");
 
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index fc3b175b8b1c..5b5bd702432e 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -68,7 +68,7 @@
     <projectService serviceImplementation="org.jetbrains.plugins.gradle.config.GradleLocalSettings"/>
     <projectService serviceImplementation="org.jetbrains.plugins.gradle.config.GradleProjectState"/>
 
-    <toolWindow id="JetGradle" anchor="right" icon="/icons/toolWindowGradle.png"
+    <toolWindow id="JetGradle" anchor="right" icon="GradleIcons.ToolWindowGradle"
                 factoryClass="org.jetbrains.plugins.gradle.ui.GradleToolWindowFactory"/>
   </extensions>
 
@@ -111,7 +111,7 @@
     <!-- Tool window toolbar actions -->
     <action id="Gradle.LinkToProject" class="org.jetbrains.plugins.gradle.action.GradleLinkToProjectAction"/>
     <action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="AllIcons.Actions.Sync"/>
-    <action id="Gradle.OpenScript" class="org.jetbrains.plugins.gradle.action.GradleOpenScriptAction" icon="/icons/gradleNavigate.png"/>
+    <action id="Gradle.OpenScript" class="org.jetbrains.plugins.gradle.action.GradleOpenScriptAction" icon="GradleIcons.GradleNavigate"/>
     <action id="Gradle.Help.ToolWindow" class="org.jetbrains.plugins.gradle.action.GradleToolWindowHelpAction" icon="AllIcons.Actions.Help"/>
     <group id="Gradle.ChangeActionsToolbar">
       <reference id="Gradle.RefreshProject"/>
@@ -120,7 +120,7 @@
     </group>
 
     <!-- 'Sync project structure' tree nodes actions -->
-    <action id="Gradle.ImportEntity" class="org.jetbrains.plugins.gradle.action.GradleImportEntityAction" icon="/icons/gradleImport.png"/>
+    <action id="Gradle.ImportEntity" class="org.jetbrains.plugins.gradle.action.GradleImportEntityAction" icon="GradleIcons.GradleImport"/>
     <action id="Gradle.ShowConflict" class="org.jetbrains.plugins.gradle.action.GradleShowConflictDetailsAction" icon="AllIcons.Actions.Diff"/>
     <group id="Gradle.SyncTreeGroup">
       <reference id="Gradle.ImportEntity"/>
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java
index 926ad866a49c..f27b2acf146e 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java
@@ -12,7 +12,7 @@ import javax.swing.*;
  */
 public class GradleIcons {
 
-  public static final Icon GRADLE_ICON       = IconLoader.getIcon("/icons/gradle.png");
+  public static final Icon GRADLE_ICON       = icons.GradleIcons.Gradle;
   public static final Icon PROJECT_ICON      = getProjectIcon();
 
   private GradleIcons() {
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 447ddf2e0702..5a54ad594050 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -1235,7 +1235,7 @@
     <projectStructureDetector implementation="org.jetbrains.plugins.groovy.griffon.GriffonProjectStructureDetector"/>
     <programRunner implementation="org.jetbrains.plugins.groovy.griffon.GriffonDebuggerRunner"/>
     <configurationType implementation="org.jetbrains.plugins.groovy.griffon.GriffonRunConfigurationType"/>
-    <toolWindow id="Griffon View" anchor="left" secondary="false" icon="/icons/griffon/griffonToolWindow.png"
+    <toolWindow id="Griffon View" anchor="left" secondary="false" icon="JetgroovyIcons.Griffon.GriffonToolWindow"
                 factoryClass="org.jetbrains.plugins.groovy.griffon.GriffonToolWindowFactory"
                 conditionClass="org.jetbrains.plugins.groovy.griffon.GriffonToolWindowFactory"/>
 
@@ -1345,13 +1345,13 @@
     <action id="Groovy.Doc.Generating"
             class="org.jetbrains.plugins.groovy.doc.actions.GenerateGroovyDocAction"
             text="Generate GroovyDoc" description="Generating Groovy Documentation"
-            icon="/icons/groovy/GroovyDoc.png">
+            icon="JetgroovyIcons.Groovy.GroovyDoc">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
     <action id="Groovy.Console"
             class="org.jetbrains.plugins.groovy.console.GroovyShellAction"
             text="Groovy Shell..." description="Launch Groovy Shell"
-            icon="/icons/groovy/groovy_16x16.png">
+            icon="JetgroovyIcons.Groovy.Groovy_16x16">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIcons.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIcons.java
index 0819a4d6f718..0ca0881df85b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIcons.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIcons.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.plugins.groovy;
 
-import com.intellij.openapi.util.IconLoader;
+import icons.JetgroovyIcons;
 
 import javax.swing.*;
 
@@ -25,25 +25,25 @@ import javax.swing.*;
  */
 public interface GroovyIcons {
 
-  Icon FILE_TYPE = IconLoader.getIcon("/icons/groovy/groovy_fileType.png");
-  Icon GROOVY_ICON_13x13 = IconLoader.getIcon("/icons/groovy/groovy_13x13.png");
-  Icon GROOVY_ICON_16x16 = IconLoader.getIcon("/icons/groovy/groovy_16x16.png");
-  Icon GROOVY_ICON_32x32 = IconLoader.getIcon("/icons/groovy/groovy_32x32.png");
-  Icon CLASS = IconLoader.getIcon("/icons/groovy/class.png");
-  Icon ABSTRACT_CLASS = IconLoader.getIcon("/icons/groovy/abstractClass.png");
-  Icon INTERFACE = IconLoader.getIcon("/icons/groovy/interface.png");
-  Icon ANNOTATION_TYPE = IconLoader.getIcon("/icons/groovy/annotationType.png");
-  Icon ENUM = IconLoader.getIcon("/icons/groovy/enum.png");
-  Icon PROPERTY = IconLoader.getIcon("/icons/groovy/property.png");
-  Icon METHOD = IconLoader.getIcon("/icons/groovy/method.png");
-  Icon DYNAMIC = IconLoader.getIcon("/icons/groovy/dynamicProperty.png");
-  Icon DEF = IconLoader.getIcon("/icons/groovy/def.png");
-  Icon FIELD = IconLoader.getIcon("/icons/groovy/field.png");
-  Icon VARIABLE = IconLoader.getIcon("/icons/groovy/variable.png");
+  Icon FILE_TYPE = JetgroovyIcons.Groovy.Groovy_fileType;
+  Icon GROOVY_ICON_13x13 = JetgroovyIcons.Groovy.Groovy_13x13;
+  Icon GROOVY_ICON_16x16 = JetgroovyIcons.Groovy.Groovy_16x16;
+  Icon GROOVY_ICON_32x32 = JetgroovyIcons.Groovy.Groovy_32x32;
+  Icon CLASS = JetgroovyIcons.Groovy.Class;
+  Icon ABSTRACT_CLASS = JetgroovyIcons.Groovy.AbstractClass;
+  Icon INTERFACE = JetgroovyIcons.Groovy.Interface;
+  Icon ANNOTATION_TYPE = JetgroovyIcons.Groovy.AnnotationType;
+  Icon ENUM = JetgroovyIcons.Groovy.Enum;
+  Icon PROPERTY = JetgroovyIcons.Groovy.Property;
+  Icon METHOD = JetgroovyIcons.Groovy.Method;
+  Icon DYNAMIC = JetgroovyIcons.Groovy.DynamicProperty;
+  Icon DEF = JetgroovyIcons.Groovy.Def;
+  Icon FIELD = JetgroovyIcons.Groovy.Field;
+  Icon VARIABLE = JetgroovyIcons.Groovy.Variable;
 
-  Icon NO_GROOVY_SDK = IconLoader.getIcon("/icons/groovy/no_groovy_sdk.png");
-  Icon GROOVY_SDK = IconLoader.getIcon("/icons/groovy/groovy_sdk.png");
+  Icon NO_GROOVY_SDK = JetgroovyIcons.Groovy.No_groovy_sdk;
+  Icon GROOVY_SDK = JetgroovyIcons.Groovy.Groovy_sdk;
 
-  Icon DYNAMIC_PROPERTY_TOOL_WINDOW_ICON = IconLoader.getIcon("/icons/groovy/dynamicProperty_13.png");
+  Icon DYNAMIC_PROPERTY_TOOL_WINDOW_ICON = JetgroovyIcons.Groovy.DynamicProperty_13;
 
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantIcons.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantIcons.java
index 37dcb2b608fe..d980af5d1f9d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantIcons.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantIcons.java
@@ -15,7 +15,7 @@
  */
 package org.jetbrains.plugins.groovy.gant;
 
-import com.intellij.openapi.util.IconLoader;
+import icons.JetgroovyIcons;
 
 import javax.swing.*;
 
@@ -24,11 +24,11 @@ import javax.swing.*;
  */
 public interface GantIcons {
 
-  Icon GANT_ICON_16x16 = IconLoader.getIcon("/icons/groovy/gant_16x16.png");
-  Icon GANT_SDK_ICON = IconLoader.getIcon("/icons/groovy/gant_sdk.png");
-  Icon GANT_NO_SDK_ICON = IconLoader.getIcon("/icons/groovy/no_gant_sdk.png");
-  Icon GANT_TARGET = IconLoader.getIcon("/icons/groovy/gant_target.png");
-  Icon GANT_TASK = IconLoader.getIcon("/icons/groovy/gant_task.png");
-  Icon ANT_TASK = IconLoader.getIcon("/icons/groovy/ant_task.png");
+  Icon GANT_ICON_16x16 = JetgroovyIcons.Groovy.Gant_16x16;
+  Icon GANT_SDK_ICON = JetgroovyIcons.Groovy.Gant_sdk;
+  Icon GANT_NO_SDK_ICON = JetgroovyIcons.Groovy.No_gant_sdk;
+  Icon GANT_TARGET = JetgroovyIcons.Groovy.Gant_target;
+  Icon GANT_TASK = JetgroovyIcons.Groovy.Gant_task;
+  Icon ANT_TASK = JetgroovyIcons.Groovy.Ant_task;
 
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
index dac9f767412c..ae1079e96994 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
@@ -30,7 +30,6 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryKind;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
@@ -41,6 +40,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import gnu.trove.TIntArrayList;
+import icons.JetgroovyIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -64,8 +64,8 @@ import java.util.regex.Pattern;
  * @author peter
  */
 public class GriffonFramework extends MvcFramework {
-  public static final Icon GRIFFON_ICON = IconLoader.getIcon("/icons/griffon/griffon.png");
-  public static final Icon GRIFFON_ICON_13 = IconLoader.getIcon("/icons/griffon/griffonToolWindow.png");
+  public static final Icon GRIFFON_ICON = JetgroovyIcons.Griffon.Griffon;
+  public static final Icon GRIFFON_ICON_13 = JetgroovyIcons.Griffon.GriffonToolWindow;
 
   @NonNls private static final String GRIFFON_COMMON_PLUGINS = "-griffonPlugins";
   private static final String GLOBAL_PLUGINS_MODULE_NAME = "GriffonGlobalPlugins";
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java
index 1b448a411fa5..839c30333d89 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonModuleBuilder.java
@@ -1,6 +1,6 @@
 package org.jetbrains.plugins.groovy.griffon;
 
-import com.intellij.openapi.util.IconLoader;
+import icons.JetgroovyIcons;
 import org.jetbrains.plugins.groovy.mvc.MvcModuleBuilder;
 
 import javax.swing.*;
@@ -9,7 +9,7 @@ import javax.swing.*;
  * @author peter
  */
 public class GriffonModuleBuilder extends MvcModuleBuilder {
-  private static final Icon GRIFFON_ICON_24x24 = IconLoader.getIcon("/icons/griffon/griffon-icon-24x24.png");
+  private static final Icon GRIFFON_ICON_24x24 = JetgroovyIcons.Griffon.Griffon_icon_24x24;
 
   public GriffonModuleBuilder() {
     super(GriffonFramework.getInstance(), GRIFFON_ICON_24x24);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java
index fd3966da0aa4..dd6f8db5534c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java
@@ -1,7 +1,7 @@
 package org.jetbrains.plugins.groovy.mvc;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.util.IconLoader;
+import icons.JetgroovyIcons;
 
 import javax.swing.*;
 
@@ -11,13 +11,13 @@ import javax.swing.*;
 public interface MvcIcons {
   String ICONS_PATH = "/icons/mvc/";
 
-  Icon CONTROLLER = IconLoader.getIcon(ICONS_PATH + "controller.png");
-  Icon SERVICE = IconLoader.getIcon(ICONS_PATH + "service.png");
-  Icon DOMAIN_CLASS = IconLoader.getIcon(ICONS_PATH + "domain_class.png");
-  Icon CONFIG_FOLDER = IconLoader.getIcon(ICONS_PATH + "config_folder_closed.png");
-  Icon ACTION_NODE = IconLoader.getIcon(ICONS_PATH + "action_method.png");
+  Icon CONTROLLER = JetgroovyIcons.Mvc.Controller;
+  Icon SERVICE = JetgroovyIcons.Mvc.Service;
+  Icon DOMAIN_CLASS = JetgroovyIcons.Mvc.Domain_class;
+  Icon CONFIG_FOLDER = JetgroovyIcons.Mvc.Config_folder_closed;
+  Icon ACTION_NODE = JetgroovyIcons.Mvc.Action_method;
   Icon CONTROLLERS_FOLDER = AllIcons.Nodes.KeymapTools;
-  Icon DOMAIN_CLASSES_FOLDER = IconLoader.getIcon(ICONS_PATH + "modelsNode.png");
-  Icon PLUGINS_REFRESH = IconLoader.getIcon(ICONS_PATH + "refresh.png");
-  Icon PLUGIN = IconLoader.getIcon(ICONS_PATH + "groovy_mvc_plugin.png");
+  Icon DOMAIN_CLASSES_FOLDER = JetgroovyIcons.Mvc.ModelsNode;
+  Icon PLUGINS_REFRESH = JetgroovyIcons.Mvc.Refresh;
+  Icon PLUGIN = JetgroovyIcons.Mvc.Groovy_mvc_plugin;
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomPlugin.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomPlugin.java
index d56aee9c1c3c..c8f842e0f4d2 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomPlugin.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomPlugin.java
@@ -32,7 +32,7 @@ import org.jetbrains.idea.maven.dom.MavenDomElement;
  * 4.0.0
  * </pre>
  */
-@Presentation(typeName = "Plugin", icon = "/images/mavenPlugin.png")
+@Presentation(typeName = "Plugin", icon = "MavenIcons.MavenPlugin")
 public interface MavenDomPlugin extends MavenDomElement, MavenDomArtifactCoordinates {
   @Required(value = false, nonEmpty = true)
   GenericDomValue<String> getGroupId();
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomRepository.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomRepository.java
index f599a6af0bb5..9211e84270c9 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomRepository.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/model/MavenDomRepository.java
@@ -22,7 +22,7 @@ package org.jetbrains.idea.maven.dom.model;
 import com.intellij.ide.presentation.Presentation;
 import org.jetbrains.annotations.NotNull;
 
-@Presentation(typeName = "Repository", icon = "/images/mavenPlugin.png")
+@Presentation(typeName = "Repository", icon = "MavenIcons.MavenPlugin")
 public interface MavenDomRepository extends MavenDomRepositoryBase {
   @NotNull
   MavenDomRepositoryPolicy getReleases();
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java
index 5a6993061bc5..a480d9906ae3 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java
@@ -25,11 +25,11 @@ import com.intellij.execution.executors.DefaultRunExecutor;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
+import icons.MavenIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -46,7 +46,7 @@ import java.util.List;
  */
 public class MavenRunConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = IconLoader.getIcon("/images/phase.png");
+  private static final Icon ICON = MavenIcons.Phase;
   private static final int MAX_NAME_LENGTH = 40;
 
   public static MavenRunConfigurationType getInstance() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
index 22577b3eb601..a85bf4029cfa 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
@@ -26,13 +26,17 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.ui.treeStructure.SimpleTree;
 import com.intellij.util.containers.ContainerUtil;
+import icons.MavenIcons;
 import org.jdom.Element;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.idea.maven.execution.MavenRunner;
@@ -213,7 +217,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen
 
     final ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(myProject);
     myToolWindow = manager.registerToolWindow(TOOL_WINDOW_ID, panel, ToolWindowAnchor.RIGHT, myProject, true);
-    myToolWindow.setIcon(IconLoader.getIcon("/images/toolWindowMaven.png"));
+    myToolWindow.setIcon(MavenIcons.ToolWindowMaven);
 
     final ToolWindowManagerAdapter listener = new ToolWindowManagerAdapter() {
       boolean wasVisible = false;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java
index ac164625db0e..a94cdba7b7c4 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java
@@ -16,28 +16,27 @@
 package org.jetbrains.idea.maven.utils;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.util.IconLoader;
 
 import javax.swing.*;
 
 public class MavenIcons {
-  public static final Icon MAVEN_ICON = IconLoader.getIcon("/images/mavenLogo.png");
-  public static final Icon MAVEN_PROJECT_ICON = IconLoader.getIcon("/images/mavenProject.png");
+  public static final Icon MAVEN_ICON = icons.MavenIcons.MavenLogo;
+  public static final Icon MAVEN_PROJECT_ICON = icons.MavenIcons.MavenProject;
 
-  public static final Icon CLOSED_PROFILES_ICON = IconLoader.getIcon("/images/profilesClosed.png");
-  public static final Icon CLOSED_PHASES_ICON = IconLoader.getIcon("/images/phasesClosed.png");
-  public static final Icon PHASE_ICON = IconLoader.getIcon("/images/phase.png");
-  public static final Icon CLOSED_PLUGINS_ICON = IconLoader.getIcon("/images/phasesClosed.png");
-  public static final Icon PLUGIN_ICON = IconLoader.getIcon("/images/mavenPlugin.png");
-  public static final Icon REPOSITORY_ICON = IconLoader.getIcon("/images/mavenPlugin.png");
-  public static final Icon PLUGIN_GOAL_ICON = IconLoader.getIcon("/images/pluginGoal.png");
+  public static final Icon CLOSED_PROFILES_ICON = icons.MavenIcons.ProfilesClosed;
+  public static final Icon CLOSED_PHASES_ICON = icons.MavenIcons.PhasesClosed;
+  public static final Icon PHASE_ICON = icons.MavenIcons.Phase;
+  public static final Icon CLOSED_PLUGINS_ICON = icons.MavenIcons.PhasesClosed;
+  public static final Icon PLUGIN_ICON = icons.MavenIcons.MavenPlugin;
+  public static final Icon REPOSITORY_ICON = icons.MavenIcons.MavenPlugin;
+  public static final Icon PLUGIN_GOAL_ICON = icons.MavenIcons.PluginGoal;
   public static final Icon CLOSED_DEPENDENCIES_ICON = AllIcons.Nodes.PpLibFolder;
   public static final Icon DEPENDENCY_ICON = AllIcons.Nodes.PpLib;
-  public static final Icon CLOSED_MODULES_ICON = IconLoader.getIcon("/images/modulesClosed.png");
+  public static final Icon CLOSED_MODULES_ICON = icons.MavenIcons.ModulesClosed;
 
-  public static final Icon OVERRIDING_DEPENDENCY = IconLoader.getIcon("/images/overridingDependency.png");
-  public static final Icon OVERRIDEN_DEPENDENCY = IconLoader.getIcon("/images/overridenDependency.png");
+  public static final Icon OVERRIDING_DEPENDENCY = icons.MavenIcons.OverridingDependency;
+  public static final Icon OVERRIDEN_DEPENDENCY = icons.MavenIcons.OverridenDependency;
 
-  public static final Icon PARENT_PROJECT = IconLoader.getIcon("/images/parentProject.png");
-  public static final Icon CHILDREN_PROJECTS = IconLoader.getIcon("/images/childrenProjects.png");
+  public static final Icon PARENT_PROJECT = icons.MavenIcons.ParentProject;
+  public static final Icon CHILDREN_PROJECTS = icons.MavenIcons.ChildrenProjects;
 }
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index ee619083bfd2..eaad3090e896 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -166,43 +166,43 @@
 
     <action id="Maven.UpdateFolders" class="org.jetbrains.idea.maven.project.actions.UpdateFoldersAction"
             text="Generate Sources and Update Folders For All Projects"
-            icon="/images/updateFolders.png">
+            icon="MavenIcons.UpdateFolders">
     </action>
 
     <action id="Maven.UpdateFoldersForProject" class="org.jetbrains.idea.maven.project.actions.UpdateFoldersForProjectAction"
             text="Generate Sources and Update Folders"
-            icon="/images/updateFolders.png">
+            icon="MavenIcons.UpdateFolders">
     </action>
 
     <action id="Maven.DownloadAllSources" class="org.jetbrains.idea.maven.project.actions.DownloadAllSourcesAction"
             text="Download Sources" description="Download sources for all dependencies"
-            icon="/images/download.png">
+            icon="MavenIcons.Download">
     </action>
 
     <action id="Maven.DownloadAllDocs" class="org.jetbrains.idea.maven.project.actions.DownloadAllDocsAction"
             text="Download Documentation" description="Download documentation for all dependencies"
-            icon="/images/download.png">
+            icon="MavenIcons.Download">
     </action>
 
     <action id="Maven.DownloadAllSourcesAndDocs" class="org.jetbrains.idea.maven.project.actions.DownloadAllSourcesAndDocsAction"
             text="Download Sources and Documentation" description="Download sources and documentation for all dependencies"
-            icon="/images/download.png">
+            icon="MavenIcons.Download">
     </action>
 
     <action id="Maven.DownloadSelectedSourcesAndDocs" class="org.jetbrains.idea.maven.project.actions.DownloadSelectedSourcesAndDocsAction"
             text="Download Sources and Documentation"
             description="Download sources and documentation for all dependencies for selected projects"
-            icon="/images/download.png">
+            icon="MavenIcons.Download">
     </action>
 
     <action id="Maven.DownloadSelectedSources" class="org.jetbrains.idea.maven.project.actions.DownloadSelectedSourcesAction"
             text="Download Sources" description="Download sources for all dependencies for selected projects"
-            icon="/images/download.png">
+            icon="MavenIcons.Download">
     </action>
 
     <action id="Maven.DownloadSelectedDocs" class="org.jetbrains.idea.maven.project.actions.DownloadSelectedDocsAction"
             text="Download Documentation" description="Download documentation for all dependencies for selected projects"
-            icon="/images/download.png">
+            icon="MavenIcons.Download">
     </action>
 
     <action id="Maven.AddManagedFiles"
@@ -265,7 +265,7 @@
     <action id="Maven.ToggleOffline"
             class="org.jetbrains.idea.maven.project.actions.ToggleOfflineAction" text="Toggle Offline Mode"
             description="Toggle offline mode for Maven builds"
-            icon="/images/offlineMode.png">
+            icon="MavenIcons.OfflineMode">
     </action>
 
     <action id="Maven.ToggleSkipTests"
@@ -305,7 +305,7 @@
     </group>
 
     <group id="Maven.DownloadAllGroup" popup="true" class="org.jetbrains.idea.maven.project.actions.DownloadActionGroup"
-           icon="/images/download.png">
+           icon="MavenIcons.Download">
       <reference id="Maven.DownloadAllSources"/>
       <reference id="Maven.DownloadAllDocs"/>
       <reference id="Maven.DownloadAllSourcesAndDocs"/>
@@ -342,7 +342,7 @@
               text="Show Basic Phases Only"
               description="Show basic phases only"
               secondary="true"
-              icon="/images/filterPhases.png"/>
+              icon="MavenIcons.FilterPhases"/>
     </group>
 
     <group id="Maven.DependencyMenu">
@@ -382,7 +382,7 @@
     </group>
 
     <group id="Maven.GlobalProjectMenu" class="org.jetbrains.idea.maven.utils.actions.MavenActionGroup" popup="true" text="Maven"
-           icon="/images/mavenLogo.png">
+           icon="MavenIcons.MavenLogo">
       <add-to-group group-id="EditorPopupMenu" anchor="last"/>
       <add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
       <reference ref="Maven.BaseProjectMenu"/>
diff --git a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIconProvider.java b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIconProvider.java
index 5cfa68a1c4c3..56298c482792 100644
--- a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIconProvider.java
+++ b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIconProvider.java
@@ -1,9 +1,9 @@
 package com.intellij.lang.properties.xml;
 
 import com.intellij.ide.IconProvider;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlFile;
+import icons.PropertiesIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -14,7 +14,7 @@ import javax.swing.*;
  */
 public class XmlPropertiesIconProvider extends IconProvider {
 
-  private static final Icon ICON = IconLoader.getIcon("/icons/xmlProperties.png");
+  private static final Icon ICON = PropertiesIcons.XmlProperties;
 
   @Override
   public Icon getIcon(@NotNull PsiElement element, int flags) {
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index 63d3b346fea7..d71b37aa2283 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -32,11 +32,11 @@
     </group>
 
 
-    <action id="IntegrateChangeSetAction" class="org.jetbrains.idea.svn.actions.IntegrateChangeSetAction" popup="true" icon="/icons/IntegrateToBranch.png">
+    <action id="IntegrateChangeSetAction" class="org.jetbrains.idea.svn.actions.IntegrateChangeSetAction" popup="true" icon="Svn4ideaIcons.IntegrateToBranch">
       <add-to-group group-id="RepositoryChangesBrowserToolbar" anchor="last"/>
     </action>
 
-    <action id="PropertiesDiff" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction" popup="true" icon="/icons/PropertiesDiff.png">
+    <action id="PropertiesDiff" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffAction" popup="true" icon="Svn4ideaIcons.PropertiesDiff">
       <add-to-group group-id="RepositoryChangesBrowserToolbar" anchor="last"/>
     </action>
 
@@ -56,7 +56,7 @@
       <separator/>
       <action id="Subversion.ShowProperties" class="org.jetbrains.idea.svn.actions.ShowPropertiesAction"/>
       <action id="Subversion.SetProperty" class="org.jetbrains.idea.svn.actions.SetPropertyAction"/>
-      <action id="ShowPropertiesDiffVsLocal" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffWithLocalAction" icon="/icons/PropertiesDiffWithLocal.png">
+      <action id="ShowPropertiesDiffVsLocal" class="org.jetbrains.idea.svn.actions.ShowPropertiesDiffWithLocalAction" icon="Svn4ideaIcons.PropertiesDiffWithLocal">
       </action>
       <reference id="ChangesView.Revert"/>
       <action id="Subversion.Resolve" class="org.jetbrains.idea.svn.actions.ResolveAction"/>
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java
index 01b9a1112838..2a4349e5282c 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ConfigureBranchesAction.java
@@ -21,10 +21,10 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.openapi.vcs.changes.ChangeList;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
+import icons.Svn4ideaIcons;
 import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.SvnVcs;
 import org.jetbrains.idea.svn.dialogs.BranchConfigurationDialog;
@@ -43,7 +43,7 @@ public class ConfigureBranchesAction extends AnAction implements DumbAware {
 
     presentation.setText(SvnBundle.message("configure.branches.item"));
     presentation.setDescription(SvnBundle.message("configure.branches.item"));
-    presentation.setIcon(IconLoader.getIcon("/icons/ConfigureBranches.png"));
+    presentation.setIcon(Svn4ideaIcons.ConfigureBranches);
 
     presentation.setVisible(true);
     
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java
index 77a36f1885b9..ac9a0ee00dd0 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowAllSubmittedFilesAction.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
 import com.intellij.openapi.vcs.AbstractVcsHelper;
@@ -31,6 +30,7 @@ import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vfs.VirtualFile;
+import icons.Svn4ideaIcons;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.*;
 import org.jetbrains.idea.svn.history.SvnChangeList;
@@ -51,7 +51,7 @@ public class ShowAllSubmittedFilesAction extends AnAction implements DumbAware {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.actions.ShowAllSubmittedFilesAction");
 
   public ShowAllSubmittedFilesAction() {
-    super(SvnBundle.message("action.name.show.all.paths.affected"), null, IconLoader.getIcon("/icons/allRevisions.png"));
+    super(SvnBundle.message("action.name.show.all.paths.affected"), null, Svn4ideaIcons.AllRevisions);
   }
 
   public void update(AnActionEvent e) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java
index 05a8ec14d3f8..5ef1a5d447be 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowPropertiesDiffWithLocalAction.java
@@ -17,9 +17,9 @@ package org.jetbrains.idea.svn.actions;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataKey;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.openapi.vcs.changes.Change;
+import icons.Svn4ideaIcons;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.SvnVcs;
@@ -33,7 +33,7 @@ public class ShowPropertiesDiffWithLocalAction extends AbstractShowPropertiesDif
 
   public ShowPropertiesDiffWithLocalAction() {
     super(SvnBundle.message("action.Subversion.properties.diff.with.local.name"));
-    myIcon = IconLoader.getIcon("/icons/PropertiesDiffWithLocal.png");
+    myIcon = Svn4ideaIcons.PropertiesDiffWithLocal;
   }
 
   @Override
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
index d9431366a131..cac2b8db1f5a 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowId;
@@ -30,6 +29,7 @@ import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
 import com.intellij.ui.content.ContentManager;
 import com.intellij.util.ContentsUtil;
+import icons.Svn4ideaIcons;
 import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.dialogs.CopiesPanel;
 
@@ -47,7 +47,7 @@ public class ShowSvnMapAction extends AnAction implements DumbAware {
     presentation.setEnabled(project != null);
 
     presentation.setDescription(SvnBundle.message("action.show.svn.map.description"));
-    presentation.setIcon(IconLoader.getIcon("/icons/ShowWorkingCopies.png"));
+    presentation.setIcon(Svn4ideaIcons.ShowWorkingCopies);
   }
 
   public void actionPerformed(final AnActionEvent e) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java
index 3eba3a97499f..f01ca7d91a77 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/MergeSourceDetailsAction.java
@@ -21,10 +21,10 @@ import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vfs.VirtualFile;
+import icons.Svn4ideaIcons;
 
 import javax.swing.*;
 import java.awt.event.KeyEvent;
@@ -39,7 +39,7 @@ public class MergeSourceDetailsAction extends AnAction implements DumbAware {
   }
 
   private static class IconHolder {
-    private static final Icon myIcon = IconLoader.getIcon("/icons/mergeSourcesDetails.png");
+    private static final Icon myIcon = Svn4ideaIcons.MergeSourcesDetails;
   }
 
   private Icon getIcon() {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
index f5c90a4ddb8d..e88dec62c29b 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MultiLineLabelUI;
 import com.intellij.openapi.util.Getter;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.RepositoryLocation;
 import com.intellij.openapi.vcs.changes.BackgroundFromStartOption;
@@ -34,6 +33,7 @@ import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.util.Consumer;
 import com.intellij.util.NullableFunction;
 import com.intellij.util.messages.Topic;
+import icons.Svn4ideaIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.SvnBundle;
@@ -468,7 +468,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
     public void update(final AnActionEvent e) {
       super.update(e);
       final Presentation presentation = e.getPresentation();
-      presentation.setIcon(IconLoader.getIcon("/icons/ShowIntegratedTo.png"));
+      presentation.setIcon(Svn4ideaIcons.ShowIntegratedTo);
     }
 
     public boolean isSelected(final AnActionEvent e) {
@@ -489,7 +489,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
     public void update(final AnActionEvent e) {
       super.update(e);
       final Presentation presentation = e.getPresentation();
-      presentation.setIcon(IconLoader.getIcon("/icons/ShowIntegratedFrom.png"));
+      presentation.setIcon(Svn4ideaIcons.ShowIntegratedFrom);
       presentation.setText(SvnBundle.message("committed.changes.action.enable.merge.highlighting"));
       presentation.setDescription(SvnBundle.message("committed.changes.action.enable.merge.highlighting.description.text"));
     }
@@ -537,19 +537,19 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
 
   private class FilterOutMerged extends CommonFilter {
     private FilterOutMerged() {
-      super(IconLoader.getIcon("/icons/FilterIntegrated.png"), SvnBundle.message("tab.repository.merge.panel.filter.plus"));
+      super(Svn4ideaIcons.FilterIntegrated, SvnBundle.message("tab.repository.merge.panel.filter.plus"));
     }
   }
 
   private class FilterOutNotMerged extends CommonFilter {
     private FilterOutNotMerged() {
-      super(IconLoader.getIcon("/icons/FilterNotIntegrated.png"), SvnBundle.message("tab.repository.merge.panel.filter.minus"));
+      super(Svn4ideaIcons.FilterNotIntegrated, SvnBundle.message("tab.repository.merge.panel.filter.minus"));
     }
   }
 
   private class FilterOutAlien extends CommonFilter {
     private FilterOutAlien() {
-      super(IconLoader.getIcon("/icons/FilterOthers.png"), SvnBundle.message("tab.repository.merge.panel.filter.others"));
+      super(Svn4ideaIcons.FilterOthers, SvnBundle.message("tab.repository.merge.panel.filter.others"));
     }
   }
 
@@ -601,7 +601,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
     @Override
     protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) {
       final Presentation presentation = e.getPresentation();
-      presentation.setIcon(IconLoader.getIcon("/icons/MarkAsMerged.png"));
+      presentation.setIcon(Svn4ideaIcons.MarkAsMerged);
       presentation.setText(myText);
       presentation.setDescription(myDescription);
       presentation.setEnabled(presentation.isEnabled() && mergeEnabled(checker.getSelectedLists(), true));
@@ -653,7 +653,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
     @Override
     protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) {
       final Presentation presentation = e.getPresentation();
-      presentation.setIcon(IconLoader.getIcon("/icons/MarkAsNotMerged.png"));
+      presentation.setIcon(Svn4ideaIcons.MarkAsNotMerged);
       presentation.setText(myText);
       presentation.setDescription(myDescription);
       presentation.setEnabled(presentation.isEnabled() && mergeEnabled(checker.getSelectedLists(), false));
@@ -689,7 +689,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
 
     @Override
     protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) {
-      e.getPresentation().setIcon(IconLoader.getIcon("/icons/UndoIntegrateToBranch.png"));
+      e.getPresentation().setIcon(Svn4ideaIcons.UndoIntegrateToBranch);
       e.getPresentation().setText(SvnBundle.message("undo.integrate.to.branch"));
       e.getPresentation().setDescription(SvnBundle.message("undo.integrate.to.branch.description"));
     }
@@ -742,7 +742,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
 
     @Override
     protected void updateWithChecker(AnActionEvent e, SelectedCommittedStuffChecker checker) {
-      e.getPresentation().setIcon(IconLoader.getIcon("/icons/IntegrateToBranch.png"));
+      e.getPresentation().setIcon(Svn4ideaIcons.IntegrateToBranch);
     }
 
     protected String getSelectedBranchUrl(SelectedCommittedStuffChecker checker) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
index 11f91e8258df..e6499f46b9a0 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.*;
@@ -41,6 +40,7 @@ import com.intellij.util.PairConsumer;
 import com.intellij.util.ThrowableConsumer;
 import com.intellij.util.containers.MultiMap;
 import com.intellij.util.messages.MessageBusConnection;
+import icons.Svn4ideaIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.*;
@@ -445,7 +445,7 @@ public class SvnCommittedChangesProvider implements CachingCommittedChangesProvi
     public void update(final AnActionEvent e) {
       super.update(e);
       final Presentation presentation = e.getPresentation();
-      presentation.setIcon(IconLoader.getIcon("/icons/ShowIntegratedFrom.png"));
+      presentation.setIcon(Svn4ideaIcons.ShowIntegratedFrom);
       presentation.setText(SvnBundle.message("committed.changes.action.enable.merge.highlighting"));
       presentation.setDescription(SvnBundle.message("committed.changes.action.enable.merge.highlighting.description.text"));
     }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java
index 230fd01c6f4f..22fd4b5b9452 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/MergeInfoHolder.java
@@ -18,13 +18,13 @@ package org.jetbrains.idea.svn.mergeinfo;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Getter;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.changes.committed.CommittedChangeListsListener;
 import com.intellij.openapi.vcs.changes.committed.DecoratorManager;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.Consumer;
+import icons.Svn4ideaIcons;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.dialogs.WCInfoWithBranches;
@@ -166,12 +166,12 @@ public class MergeInfoHolder {
   }
 
   public static enum ListMergeStatus {
-    COMMON(IconLoader.getIcon("/icons/Common.png")),
-    MERGED(IconLoader.getIcon("/icons/Integrated.png")),
-    NOT_MERGED(IconLoader.getIcon("/icons/Notintegrated.png")),
+    COMMON(Svn4ideaIcons.Common),
+    MERGED(Svn4ideaIcons.Integrated),
+    NOT_MERGED(Svn4ideaIcons.Notintegrated),
     //ALIEN(IconLoader.getIcon("/icons/OnDefault.png")),
     ALIEN(null),
-    REFRESHING(IconLoader.getIcon("/icons/IntegrationStatusUnknown.png"));
+    REFRESHING(Svn4ideaIcons.IntegrationStatusUnknown);
 
     private final Icon myIcon;
 
diff --git a/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraRepositoryType.java b/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraRepositoryType.java
index 7ea20f1d97b6..197b1b735c1a 100644
--- a/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraRepositoryType.java
+++ b/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraRepositoryType.java
@@ -1,7 +1,7 @@
 package com.intellij.tasks.jira;
 
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.impl.BaseRepositoryType;
+import icons.JiraConnectorIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -20,7 +20,7 @@ public class JiraRepositoryType extends BaseRepositoryType<JiraRepository> {
   }
 
   public Icon getIcon() {
-    return IconLoader.getIcon("/resources/jira-blue-16.png");
+    return JiraConnectorIcons.Jira_blue_16;
   }
 
   @NotNull
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java
index 5add4fcaf8b5..6d21f250f56c 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskCellRenderer.java
@@ -1,5 +1,6 @@
 package com.intellij.tasks.actions;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.gotoByName.ChooseByNameBase;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.IconLoader;
@@ -15,6 +16,7 @@ import com.intellij.util.text.Matcher;
 import com.intellij.util.text.MatcherHolder;
 import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.UIUtil;
+import icons.TasksCoreIcons;
 
 import javax.swing.*;
 import java.awt.*;
@@ -59,7 +61,7 @@ public class TaskCellRenderer extends DefaultListCellRenderer implements Matcher
       panel.add(c, BorderLayout.CENTER);
     } else if (GotoTaskAction.CREATE_NEW_TASK_ACTION == value) {
       final SimpleColoredComponent c = new SimpleColoredComponent();
-      c.setIcon(LayeredIcon.create(IconLoader.getIcon("/icons/unknown.png"), IconLoader.getIcon("/actions/new.png")));
+      c.setIcon(LayeredIcon.create(TasksCoreIcons.Unknown, AllIcons.Actions.New));
       c.append(GotoTaskAction.CREATE_NEW_TASK_ACTION.getActionText());
       panel.add(c, BorderLayout.CENTER);
     } else if (ChooseByNameBase.NON_PREFIX_SEPARATOR == value) {
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java
index 5080c1de263a..3a3dcf595898 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopupAdapter;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.LightweightWindowEvent;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.tasks.LocalTask;
@@ -37,6 +36,7 @@ import com.intellij.util.Function;
 import com.intellij.util.NullableFunction;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.text.DateFormatUtil;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -50,7 +50,7 @@ import java.util.*;
 public class LoadContextAction extends BaseTaskAction {
 
   private static final int MAX_ROW_COUNT = 10;
-  private static final Icon SAVED_CONTEXT_ICON = IconLoader.getIcon("/icons/savedContext.png");
+  private static final Icon SAVED_CONTEXT_ICON = TasksCoreIcons.SavedContext;
 
   @Override
   public void actionPerformed(AnActionEvent e) {
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java
index 2772f0483324..743a053fa28d 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepositoryType.java
@@ -1,12 +1,12 @@
 package com.intellij.tasks.github;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.TaskRepository;
 import com.intellij.tasks.TaskState;
 import com.intellij.tasks.config.TaskRepositoryEditor;
 import com.intellij.tasks.impl.BaseRepositoryType;
 import com.intellij.util.Consumer;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -16,7 +16,7 @@ import java.util.EnumSet;
  * @author Dennis.Ushakov
  */
 public class GitHubRepositoryType extends BaseRepositoryType<GitHubRepository> {
-  static final Icon ICON = IconLoader.getIcon("/icons/github.png");
+  static final Icon ICON = TasksCoreIcons.Github;
 
   @NotNull
   @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java
index 29a40cfcd07a..a384f5cdd9d5 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java
@@ -23,6 +23,7 @@ import com.intellij.util.xmlb.annotations.AbstractCollection;
 import com.intellij.util.xmlb.annotations.Attribute;
 import com.intellij.util.xmlb.annotations.Property;
 import com.intellij.util.xmlb.annotations.Tag;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -40,11 +41,11 @@ public class LocalTaskImpl extends LocalTask {
 
   @NonNls static final String DEFAULT_TASK_ID = "Default";
 
-  private final static Icon BUG_ICON = IconLoader.getIcon("/icons/bug.png", LocalTask.class);
-  private final static Icon EXCEPTION_ICON = IconLoader.getIcon("/icons/exception.png", LocalTask.class);
-  private final static Icon FEATURE_ICON = IconLoader.getIcon("/icons/feature.png", LocalTask.class);
-  private final static Icon OTHER_ICON = IconLoader.getIcon("/icons/other.png", LocalTask.class);
-  private final static Icon UNKNOWN_ICON = IconLoader.getIcon("/icons/unknown.png", LocalTask.class);
+  private final static Icon BUG_ICON = TasksCoreIcons.Bug;
+  private final static Icon EXCEPTION_ICON = TasksCoreIcons.Exception;
+  private final static Icon FEATURE_ICON = TasksCoreIcons.Feature;
+  private final static Icon OTHER_ICON = TasksCoreIcons.Other;
+  private final static Icon UNKNOWN_ICON = TasksCoreIcons.Unknown;
 
   private String myId = "";
   private String mySummary = "";
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/MantisRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/MantisRepositoryType.java
index c560eb1e76a7..4f17ff9c3ce8 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/MantisRepositoryType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/MantisRepositoryType.java
@@ -1,8 +1,8 @@
 package com.intellij.tasks.mantis;
 
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.TaskRepository;
 import com.intellij.tasks.impl.BaseRepositoryType;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -12,7 +12,7 @@ import javax.swing.*;
  */
 public class MantisRepositoryType extends BaseRepositoryType<MantisRepository> {
   
-  private static final Icon ICON = IconLoader.getIcon("/icons/mantis.png");
+  private static final Icon ICON = TasksCoreIcons.Mantis;
 
   @NotNull
   @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java
index 5e48b95851cf..19c043517433 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepositoryType.java
@@ -1,12 +1,12 @@
 package com.intellij.tasks.pivotal;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.TaskRepository;
 import com.intellij.tasks.TaskState;
 import com.intellij.tasks.config.TaskRepositoryEditor;
 import com.intellij.tasks.impl.BaseRepositoryType;
 import com.intellij.util.Consumer;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -16,7 +16,7 @@ import java.util.EnumSet;
  * @author Dennis.Ushakov
  */
 public class PivotalTrackerRepositoryType extends BaseRepositoryType<PivotalTrackerRepository> {
-  static final Icon ICON = IconLoader.getIcon("/icons/pivotal.png");
+  static final Icon ICON = TasksCoreIcons.Pivotal;
 
   @NotNull
   @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryType.java
index 1ea03c4f7b52..68606f4aaa05 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryType.java
@@ -1,11 +1,11 @@
 package com.intellij.tasks.redmine;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.TaskRepository;
 import com.intellij.tasks.config.TaskRepositoryEditor;
 import com.intellij.tasks.impl.BaseRepositoryType;
 import com.intellij.util.Consumer;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -14,7 +14,7 @@ import javax.swing.*;
  * @author Dennis.Ushakov
  */
 public class RedmineRepositoryType extends BaseRepositoryType<RedmineRepository> {
-  static final Icon ICON = IconLoader.getIcon("/icons/redmine.png");
+  static final Icon ICON = TasksCoreIcons.Redmine;
 
   @NotNull
   @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java
index f3fc0c043066..258644809e74 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepositoryType.java
@@ -16,11 +16,11 @@
 package com.intellij.tasks.trac;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.TaskRepository;
 import com.intellij.tasks.config.TaskRepositoryEditor;
 import com.intellij.tasks.impl.BaseRepositoryType;
 import com.intellij.util.Consumer;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -30,7 +30,7 @@ import javax.swing.*;
  */
 public class TracRepositoryType extends BaseRepositoryType<TracRepository> {
 
-  private static final Icon ICON = IconLoader.getIcon("/icons/trac.png");
+  private static final Icon ICON = TasksCoreIcons.Trac;
 
   @NotNull
   @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java
index 76228c985822..a9016018efbd 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepositoryType.java
@@ -1,11 +1,11 @@
 package com.intellij.tasks.youtrack;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.tasks.TaskState;
 import com.intellij.tasks.config.TaskRepositoryEditor;
 import com.intellij.tasks.impl.BaseRepositoryType;
 import com.intellij.util.Consumer;
+import icons.TasksCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -16,7 +16,7 @@ import java.util.EnumSet;
  */
 public class YouTrackRepositoryType extends BaseRepositoryType<YouTrackRepository> {
 
-  private static final Icon ICON = IconLoader.getIcon("/icons/youtrack.png");
+  private static final Icon ICON = TasksCoreIcons.Youtrack;
 
   @NotNull
   public String getName() {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java
index 7dfc48dfa35b..158b4dbe55b3 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java
@@ -31,16 +31,16 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiElement;
 import com.theoryinpractice.testng.model.TestData;
+import icons.TestngIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
 public class TestNGConfigurationType implements ConfigurationType
 {
-  public static final Icon ICON = IconLoader.getIcon("/resources/testNG.png");
+  public static final Icon ICON = TestngIcons.TestNG;
   private static final Logger LOGGER = Logger.getInstance("TestNG Runner");
 
     private final ConfigurationFactory myFactory;
diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index 7da570f6d2cc..2d1df6a9e9ff 100644
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -157,7 +157,7 @@
       <action id="GuiDesigner.PreviewForm" class="com.intellij.uiDesigner.actions.PreviewFormAction"
               icon="AllIcons.Actions.Preview"/>
       <action id="GuiDesigner.DataBindingWizard" class="com.intellij.uiDesigner.actions.DataBindingWizardAction"
-              icon="/com/intellij/uiDesigner/icons/dataBindingWizard.png"/>
+              icon="UIDesignerIcons.DataBindingWizard"/>
       <action id="GuiDesigner.ReloadCustomComponents" class="com.intellij.uiDesigner.actions.ReloadCustomComponentsAction"
               icon="AllIcons.Actions.Refresh"/>
       <action id="GuiDesigner.ChooseLocale" class="com.intellij.uiDesigner.actions.ChooseLocaleAction"/>
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ChooseLocaleAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ChooseLocaleAction.java
index c2478697844e..3f7d68d76e78 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ChooseLocaleAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ChooseLocaleAction.java
@@ -20,12 +20,12 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.uiDesigner.FormEditingUtil;
 import com.intellij.uiDesigner.UIDesignerBundle;
 import com.intellij.uiDesigner.designSurface.GuiEditor;
-import org.jetbrains.annotations.Nullable;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.Arrays;
@@ -42,7 +42,7 @@ public class ChooseLocaleAction extends ComboBoxAction {
   public ChooseLocaleAction() {
     getTemplatePresentation().setText("");
     getTemplatePresentation().setDescription(UIDesignerBundle.message("choose.locale.description"));
-    getTemplatePresentation().setIcon(IconLoader.getIcon("/com/intellij/uiDesigner/icons/chooseLocale.png"));
+    getTemplatePresentation().setIcon(UIDesignerIcons.ChooseLocale);
   }
 
   @Override public JComponent createCustomComponent(Presentation presentation) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DeleteAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DeleteAction.java
index 69c649652f3a..6897e3698fef 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DeleteAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DeleteAction.java
@@ -19,18 +19,18 @@ package com.intellij.uiDesigner.actions;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.uiDesigner.CaptionSelection;
 import com.intellij.uiDesigner.FormEditingUtil;
 import com.intellij.uiDesigner.UIDesignerBundle;
 import com.intellij.uiDesigner.designSurface.GuiEditor;
+import icons.UIDesignerIcons;
 
 /**
  * @author yole
 */
 public final class DeleteAction extends AnAction {
   public DeleteAction() {
-    getTemplatePresentation().setIcon(IconLoader.getIcon("/com/intellij/uiDesigner/icons/deleteCell.png"));
+    getTemplatePresentation().setIcon(UIDesignerIcons.DeleteCell);
   }
 
   public void actionPerformed(final AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
index 7341d7a65afa..517a23b802e5 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
@@ -30,7 +30,6 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiField;
 import com.intellij.ui.ColoredTreeCellRenderer;
@@ -50,6 +49,7 @@ import com.intellij.uiDesigner.radComponents.*;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -92,8 +92,8 @@ public final class ComponentTree extends Tree implements DataProvider {
   private final StartInplaceEditingAction myStartInplaceEditingAction;
   private final MyDeleteProvider myDeleteProvider = new MyDeleteProvider();
 
-  private final Icon myButtonGroupIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/buttonGroup.png");
-  private final Icon myInspectionSuppressionIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/inspectionSuppression.png");
+  private final Icon myButtonGroupIcon = UIDesignerIcons.ButtonGroup;
+  private final Icon myInspectionSuppressionIcon = UIDesignerIcons.InspectionSuppression;
 
   @NonNls private static final String ourHelpID = "guiDesigner.uiTour.compsTree";
   private final Project myProject;
@@ -365,12 +365,12 @@ public final class ComponentTree extends Tree implements DataProvider {
         icon = item.getSmallIcon();
       }
       else {
-        icon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown-small.png");
+        icon = UIDesignerIcons.Unknown_small;
       }
       return icon;
     }
     else {
-      return IconLoader.getIcon("/com/intellij/uiDesigner/icons/error-small.png");
+      return UIDesignerIcons.Error_small;
     }
   }
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java
index 91e1223c5118..31d9276b8b70 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.DefUseUtil;
@@ -38,6 +37,7 @@ import com.intellij.uiDesigner.UIDesignerBundle;
 import com.intellij.uiDesigner.lw.IRootContainer;
 import com.intellij.uiDesigner.radComponents.RadComponent;
 import com.intellij.util.Processor;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -59,7 +59,7 @@ public class ListenerNavigateButton extends JButton implements ActionListener {
 
   public ListenerNavigateButton(RadComponent component) {
     myComponent = component;
-    setIcon(IconLoader.getIcon("/com/intellij/uiDesigner/icons/listener.png"));
+    setIcon(UIDesignerIcons.Listener);
     setOpaque(false);
     setFocusable(false);
     setBorderPainted(false);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/PassiveDecorationLayer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/PassiveDecorationLayer.java
index bb27ef14618e..218a95ce23ca 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/PassiveDecorationLayer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/PassiveDecorationLayer.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.uiDesigner.designSurface;
 
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.uiDesigner.FormEditingUtil;
 import com.intellij.uiDesigner.componentTree.ComponentTree;
 import com.intellij.uiDesigner.propertyInspector.UIDesignerToolWindowManager;
@@ -23,6 +22,7 @@ import com.intellij.uiDesigner.radComponents.RadButtonGroup;
 import com.intellij.uiDesigner.radComponents.RadComponent;
 import com.intellij.uiDesigner.radComponents.RadRootContainer;
 import com.intellij.util.containers.HashSet;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -98,7 +98,7 @@ class PassiveDecorationLayer extends JComponent{
   }
 
   private static class IconHolder {
-    private static final Icon ourDragIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/drag.png");
+    private static final Icon ourDragIcon = UIDesignerIcons.Drag;
   }
 
   private static Icon getDragIcon() {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java
index dfabb2291277..e11ac2cacd72 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java
@@ -39,6 +39,7 @@ import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.lw.StringDescriptor;
 import com.intellij.uiDesigner.propertyInspector.IntrospectedProperty;
 import com.intellij.uiDesigner.radComponents.RadAtomicComponent;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -195,7 +196,7 @@ public final class ComponentItem implements Cloneable, PaletteItem {
       }
     }
     if(myIcon == null){
-      myIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown.png");
+      myIcon = UIDesignerIcons.Unknown;
      }
     LOG.assertTrue(myIcon != null);
     return myIcon;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
index 55f9102d0db2..69dbbf467aeb 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
@@ -29,7 +29,6 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
 import com.intellij.psi.JavaPsiFacade;
@@ -53,6 +52,7 @@ import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.IndentedIcon;
 import com.intellij.util.ui.Table;
 import com.intellij.util.ui.UIUtil;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -995,8 +995,8 @@ public final class PropertyInspectorTable extends Table implements DataProvider{
         }
       };
 
-      myExpandIcon=IconLoader.getIcon("/com/intellij/uiDesigner/icons/expandNode.png");
-      myCollapseIcon=IconLoader.getIcon("/com/intellij/uiDesigner/icons/collapseNode.png");
+      myExpandIcon= UIDesignerIcons.ExpandNode;
+      myCollapseIcon= UIDesignerIcons.CollapseNode;
       for(int i=0; i<myIndentIcons.length; i++) {
         myIndentIcons [i] = new EmptyIcon(9 + 11 * i, 9);
       }
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
index 9d4db6976e88..82bff0979708 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
@@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
@@ -42,6 +41,7 @@ import com.intellij.uiDesigner.designSurface.GuiEditor;
 import com.intellij.uiDesigner.editor.UIFormEditor;
 import com.intellij.util.ui.update.MergingUpdateQueue;
 import com.intellij.util.ui.update.Update;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -107,7 +107,7 @@ public class UIDesignerToolWindowManager implements ProjectComponent {
     myToolWindow = ToolWindowManager.getInstance(myProject).registerToolWindow(UIDesignerBundle.message("toolwindow.ui.designer"),
                                                                                myToolWindowPanel,
                                                                                ToolWindowAnchor.LEFT, myProject, true);
-    myToolWindow.setIcon(IconLoader.getIcon("/com/intellij/uiDesigner/icons/toolWindowUIDesigner.png"));
+    myToolWindow.setIcon(UIDesignerIcons.ToolWindowUIDesigner);
     myToolWindow.setAvailable(false, null);
   }
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/ColorRenderer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/ColorRenderer.java
index e382809efee5..0367ca66409b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/ColorRenderer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/renderers/ColorRenderer.java
@@ -15,13 +15,13 @@
  */
 package com.intellij.uiDesigner.propertyInspector.renderers;
 
+import com.intellij.ui.ColoredListCellRenderer;
+import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.uiDesigner.lw.ColorDescriptor;
 import com.intellij.uiDesigner.propertyInspector.PropertyRenderer;
 import com.intellij.uiDesigner.radComponents.RadRootContainer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.ui.UIUtil;
-import com.intellij.ui.ColoredListCellRenderer;
-import com.intellij.ui.SimpleTextAttributes;
+import icons.UIDesignerIcons;
 
 import javax.swing.*;
 import java.awt.*;
@@ -32,7 +32,7 @@ import java.awt.*;
  */
 public class ColorRenderer extends ColoredListCellRenderer implements PropertyRenderer<ColorDescriptor> {
   private ColorDescriptor myColorDescriptor;
-  private final Icon myEmptyIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/empty.png");
+  private final Icon myEmptyIcon = UIDesignerIcons.Empty;
 
   public ColorRenderer() {
     setOpaque(true);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
index ff0b6ee82aa9..5e8c5c4dd27b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
@@ -45,7 +45,6 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.psi.*;
@@ -62,6 +61,7 @@ import com.intellij.uiDesigner.radComponents.LayoutManagerRegistry;
 import com.intellij.uiDesigner.radComponents.RadComponentFactory;
 import com.intellij.uiDesigner.radComponents.RadContainer;
 import com.intellij.util.IncorrectOperationException;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
@@ -324,7 +324,7 @@ public class CreateSnapShotAction extends AnAction {
     private final PsiDirectory myDirectory;
     @NonNls private static final String SWING_PACKAGE = "javax.swing.";
 
-    private final Icon myUnknownComponentIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown.png");
+    private final Icon myUnknownComponentIcon = UIDesignerIcons.Unknown;
 
     private MyDialog(Project project, final SnapShotClient client, final PsiDirectory dir) {
       super(project, true);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java
index 7b0e3f1a12ef..991bd49daf23 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java
@@ -17,12 +17,12 @@ package com.intellij.uiDesigner.wizard;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.ColoredTableCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.uiDesigner.lw.LwComponent;
 import com.intellij.uiDesigner.palette.ComponentItem;
 import com.intellij.uiDesigner.palette.Palette;
+import icons.UIDesignerIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -72,7 +72,7 @@ final class FormPropertyTableCellRenderer extends ColoredTableCellRenderer{
       icon = item.getSmallIcon();
     }
     else {
-      icon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown-small.png");
+      icon = UIDesignerIcons.Unknown_small;
     }
     setIcon(icon);
 
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
index 2346d75ed316..c5ec367da5e1 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
@@ -26,7 +26,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.openapi.wm.ex.ToolWindowEx;
@@ -36,6 +35,7 @@ import com.intellij.ui.SideBorder;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManager;
 import com.intellij.util.ui.tree.TreeUtil;
+import icons.UIDesignerNewIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -148,7 +148,7 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
     myToolWindow =
       ToolWindowManager.getInstance(myProject)
         .registerToolWindow(DesignerBundle.message("designer.toolwindow.name"), false, ToolWindowAnchor.LEFT, myProject, true);
-    myToolWindow.setIcon(IconLoader.getIcon("/com/intellij/designer/icons/toolWindow.png"));
+    myToolWindow.setIcon(UIDesignerNewIcons.ToolWindow);
 
     ((ToolWindowEx)myToolWindow).setTitleActions(createActions());
 
@@ -163,7 +163,7 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
   }
 
   private AnAction[] createActions() {
-    AnAction expandAll = new AnAction("Expand All", null, IconLoader.getIcon("/com/intellij/designer/icons/ExpandAll.png")) {
+    AnAction expandAll = new AnAction("Expand All", null, UIDesignerNewIcons.ExpandAll) {
       @Override
       public void actionPerformed(AnActionEvent e) {
         if (myTreeBuilder != null) {
@@ -190,4 +190,4 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
   public String getComponentName() {
     return "UIDesignerToolWindowManager2";
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java
index ab7e79e97926..2715fd2d1020 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ToggleAction;
-import com.intellij.openapi.util.IconLoader;
+import icons.UIDesignerNewIcons;
 
 import javax.swing.*;
 
@@ -29,7 +29,7 @@ import javax.swing.*;
  * @author Alexander Lobas
  */
 public class ShowExpert extends ToggleAction {
-  private static final Icon ICON = IconLoader.getIcon("/com/intellij/designer/icons/filter.png");
+  private static final Icon ICON = UIDesignerNewIcons.Filter;
 
   private final RadPropertyTable myTable;
 
@@ -68,4 +68,4 @@ public class ShowExpert extends ToggleAction {
       getTemplatePresentation().putClientProperty(SELECTED_PROPERTY, state);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathFileType.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathFileType.java
index 6373d89689f1..0d5feca83819 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathFileType.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/XPathFileType.java
@@ -17,7 +17,7 @@ package org.intellij.lang.xpath;
 
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.IconLoader;
+import icons.XpathIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -47,6 +47,6 @@ public final class XPathFileType extends LanguageFileType {
     }
 
     public Icon getIcon() {
-        return IconLoader.getIcon("/icons/xpath.png");
+        return XpathIcons.Xpath;
     }
 }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/FunctionLookup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/FunctionLookup.java
index c5870d09ad94..06691223d72b 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/FunctionLookup.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/FunctionLookup.java
@@ -16,8 +16,8 @@
 package org.intellij.lang.xpath.completion;
 
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.context.functions.Function;
 
 import javax.swing.*;
@@ -53,7 +53,7 @@ public class FunctionLookup extends AbstractLookup implements Iconable {
     }
 
     public Icon getIcon(int flags) {
-        return IconLoader.getIcon("/icons/function.png");
+        return XpathIcons.Function;
     }
 
   @Override
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NamespaceLookup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NamespaceLookup.java
index d804f8d6f301..0d336e6b214d 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NamespaceLookup.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NamespaceLookup.java
@@ -16,7 +16,7 @@
 package org.intellij.lang.xpath.completion;
 
 import com.intellij.openapi.util.Iconable;
-import com.intellij.openapi.util.IconLoader;
+import icons.XpathIcons;
 
 import javax.swing.*;
 
@@ -26,6 +26,6 @@ public class NamespaceLookup extends AbstractLookup implements Lookup, Iconable
     }
 
     public Icon getIcon(int flags) {
-        return IconLoader.getIcon("/icons/namespace.png");
+        return XpathIcons.Namespace;
     }
 }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NodeLookup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NodeLookup.java
index 4f96ad4ec9ef..695c05eb51e1 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NodeLookup.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NodeLookup.java
@@ -15,9 +15,9 @@
  */
 package org.intellij.lang.xpath.completion;
 
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.util.PlatformIcons;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.psi.XPathNodeTest;
 
 import javax.swing.*;
@@ -31,6 +31,6 @@ public class NodeLookup extends AbstractLookup implements Lookup, Iconable {
     }
 
     public Icon getIcon(int flags) {
-        return principalType == XPathNodeTest.PrincipalType.ATTRIBUTE ? PlatformIcons.ANNOTATION_TYPE_ICON : IconLoader.getIcon("/icons/tag.png");
+        return principalType == XPathNodeTest.PrincipalType.ATTRIBUTE ? PlatformIcons.ANNOTATION_TYPE_ICON : XpathIcons.Tag;
     }
 }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathFunctionCallImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathFunctionCallImpl.java
index 31edc71120f9..f5df9f33aeff 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathFunctionCallImpl.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathFunctionCallImpl.java
@@ -18,13 +18,13 @@ package org.intellij.lang.xpath.psi.impl;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.light.LightElement;
 import com.intellij.util.IncorrectOperationException;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.XPath2ElementTypes;
 import org.intellij.lang.xpath.XPathTokenTypes;
 import org.intellij.lang.xpath.context.ContextProvider;
@@ -217,7 +217,7 @@ public class XPathFunctionCallImpl extends XPathElementImpl implements XPathFunc
       }
 
       public Icon getIcon(int i) {
-        return IconLoader.getIcon("/icons/function.png");
+        return XpathIcons.Function;
       }
 
       public void accept(@NotNull PsiElementVisitor visitor) {
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
index 76887f89f3eb..9572f07ac4a2 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
@@ -16,7 +16,6 @@
 package org.intellij.lang.xpath.xslt;
 
 import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -30,6 +29,7 @@ import com.intellij.util.SmartList;
 import com.intellij.util.xml.NanoXmlUtil;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.XPathFile;
 import org.intellij.lang.xpath.xslt.impl.XsltChecker;
 import org.jetbrains.annotations.NotNull;
@@ -48,7 +48,7 @@ public class XsltSupport {
     public static final String PLUGIN_EXTENSIONS_NS = "urn:idea:xslt-plugin#extensions";
     public static final Key<ParameterizedCachedValue<XsltChecker.LanguageLevel, PsiFile>> FORCE_XSLT_KEY = Key.create("FORCE_XSLT");
 
-    private static final Icon XSLT_OVERLAY = IconLoader.getIcon("/icons/xslt-filetype-overlay.png");
+    private static final Icon XSLT_OVERLAY = XpathIcons.Xslt_filetype_overlay;
     private static final Map<String, String> XPATH_ATTR_MAP = new THashMap<String, String>(10);
     private static final Map<String, Set<String>> XPATH_AVT_MAP = new THashMap<String, Set<String>>(10);
 
@@ -373,4 +373,4 @@ public class XsltSupport {
           return CachedValueProvider.Result.create(xsltChecker.getLanguageLevel(), psiFile);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java
index 170e78d8719f..b7f72146cd7f 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java
@@ -17,7 +17,6 @@ import com.intellij.openapi.progress.Progressive;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
@@ -26,6 +25,7 @@ import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.IconUtil;
 import com.intellij.util.config.StorageAccessors;
 import com.intellij.util.ui.UIUtil;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.xslt.XsltSupport;
 import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager;
 import org.jetbrains.annotations.NonNls;
@@ -46,7 +46,7 @@ import java.util.Collections;
 import java.util.List;
 
 class AssociationsEditor {
-  private static final Icon LINK_OVERLAY = IconLoader.getIcon("/icons/association_small.png");
+  private static final Icon LINK_OVERLAY = XpathIcons.Association_small;
   @NonNls private static final String DIVIDER_PROPORTION = "dividerProportion";
 
   private JPanel myComponent;
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java
index 9ec3a3bf98c0..281d093bafed 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java
@@ -17,19 +17,18 @@ package org.intellij.lang.xpath.xslt.associations.impl;
 
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
+import icons.XpathIcons;
 import org.intellij.lang.xpath.xslt.XsltSupport;
 import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class AssociationsGroup extends ActionGroup {
 
     public AssociationsGroup() {
-        getTemplatePresentation().setIcon(IconLoader.getIcon("/icons/association.png"));
+        getTemplatePresentation().setIcon(XpathIcons.Association);
     }
 
     @NotNull
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java
index f043ae52af95..c1fe17f68bb2 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java
@@ -22,9 +22,9 @@ import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.projectView.impl.nodes.PsiFileNode;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.LayeredIcon;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.xslt.XsltConfig;
 import org.intellij.lang.xpath.xslt.XsltSupport;
 import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager;
@@ -73,7 +73,7 @@ public class XsltTreeStructureProvider implements TreeStructureProvider {
   }
 
   private static class XsltFileNode extends PsiFileNode {
-    private static final Icon LINK_OVERLAY = IconLoader.getIcon("/icons/association_small.png");
+    private static final Icon LINK_OVERLAY = XpathIcons.Association_small;
     private final FileAssociationsManager myInstance;
     private final XsltConfig myConfig;
 
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/ImplicitModeElement.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/ImplicitModeElement.java
index c59bf78700b3..ec892e20b3da 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/ImplicitModeElement.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/ImplicitModeElement.java
@@ -2,7 +2,6 @@ package org.intellij.lang.xpath.xslt.psi.impl;
 
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.NavigationItem;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiElement;
@@ -15,6 +14,7 @@ import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.IncorrectOperationException;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.completion.CompletionLists;
 import org.intellij.lang.xpath.xslt.context.XsltNamespaceContext;
 import org.intellij.lang.xpath.xslt.impl.references.PrefixReference;
@@ -56,7 +56,7 @@ public class ImplicitModeElement extends LightElement implements PsiNamedElement
 
     @Override
     public Icon getIcon(int i) {
-        return IconLoader.getIcon("/icons/template.png");
+        return XpathIcons.Template;
     }
 
     public String getName() {
@@ -229,4 +229,4 @@ public class ImplicitModeElement extends LightElement implements PsiNamedElement
     public boolean hasPrefix() {
         return myAttribute.getValue().indexOf(':') != -1;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFunctionImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFunctionImpl.java
index 7461b394f348..bc3a7bb0cd8a 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFunctionImpl.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltFunctionImpl.java
@@ -16,12 +16,12 @@
 package org.intellij.lang.xpath.xslt.psi.impl;
 
 import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.containers.ContainerUtil;
+import icons.XpathIcons;
 import org.intellij.lang.xpath.context.functions.Function;
 import org.intellij.lang.xpath.context.functions.FunctionImpl;
 import org.intellij.lang.xpath.context.functions.Parameter;
@@ -79,7 +79,7 @@ public class XsltFunctionImpl extends XsltElementImpl implements XsltFunction, I
 
   @Override
   public Icon getIcon(boolean open) {
-    return IconLoader.getIcon("/icons/function.png");
+    return XpathIcons.Function;
   }
 
   @Override
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltTemplateImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltTemplateImpl.java
index 415746a4541e..73800ae56f5a 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltTemplateImpl.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltTemplateImpl.java
@@ -15,20 +15,19 @@
  */
 package org.intellij.lang.xpath.xslt.psi.impl;
 
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlTag;
-import org.intellij.lang.xpath.xslt.util.QNameUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
+import icons.XpathIcons;
 import org.intellij.lang.xpath.psi.XPathExpression;
 import org.intellij.lang.xpath.psi.impl.ResolveUtil;
 import org.intellij.lang.xpath.xslt.XsltSupport;
 import org.intellij.lang.xpath.xslt.psi.XsltParameter;
 import org.intellij.lang.xpath.xslt.psi.XsltTemplate;
 import org.intellij.lang.xpath.xslt.util.ParamMatcher;
+import org.intellij.lang.xpath.xslt.util.QNameUtil;
 import org.intellij.lang.xpath.xslt.util.XsltCodeInsightUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.xml.namespace.QName;
@@ -41,7 +40,7 @@ public class XsltTemplateImpl extends XsltElementImpl implements XsltTemplate {
 
     @Override
     public Icon getIcon(int flags) {
-        return IconLoader.getIcon("/icons/template.png");
+        return XpathIcons.Template;
     }
 
     @Override
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfigType.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfigType.java
index 422736808db5..6d9ff7e55300 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfigType.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfigType.java
@@ -19,7 +19,7 @@ import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
+import icons.XpathIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,7 +43,7 @@ public class XsltRunConfigType implements ConfigurationType {
     }
 
     public Icon getIcon() {
-        return IconLoader.getIcon("/icons/xslt.png");
+        return XpathIcons.Xslt;
     }
 
     public ConfigurationFactory[] getConfigurationFactories() {
diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java
index e3bcf14f24c9..a8cc8f08e972 100644
--- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java
+++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java
@@ -33,7 +33,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Factory;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.StatusBar;
@@ -48,6 +47,7 @@ import com.intellij.psi.xml.XmlFile;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usages.*;
 import com.intellij.util.Processor;
+import icons.XpathIcons;
 import org.intellij.plugins.xpathView.eval.EvalExpressionDialog;
 import org.intellij.plugins.xpathView.support.XPathSupport;
 import org.intellij.plugins.xpathView.ui.InputExpressionDialog;
@@ -120,7 +120,7 @@ public class XPathEvalAction extends XPathAction {
 
     private static final Logger LOG = Logger.getInstance("org.intellij.plugins.xpathView.XPathEvalAction");
 
-    private final Icon myIcon = IconLoader.getIcon("/icons/xml.png");
+    private final Icon myIcon = XpathIcons.Xml;
 
     protected void updateToolbar(AnActionEvent event) {
         super.updateToolbar(event);
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java
index abea9b08d824..d39abd69b292 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java
@@ -17,10 +17,10 @@
 package org.intellij.plugins.xsltDebugger.ui;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.PlatformIcons;
+import icons.XsltDebuggerIcons;
 import org.intellij.plugins.xsltDebugger.rt.engine.OutputEventQueue;
 
 import javax.swing.*;
@@ -32,7 +32,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
  * Date: 09.06.2007
  */
 class GeneratedStructureRenderer extends ColoredTreeCellRenderer {
-  private static final Icon XML_COMMENT_ICON = IconLoader.getIcon("xmlComment.png");
+  private static final Icon XML_COMMENT_ICON = XsltDebuggerIcons.XmlComment;
 
   public void customizeCellRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
     final DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/HideWhitespaceAction.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/HideWhitespaceAction.java
index 10899b5d92fa..76944b25fdf4 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/HideWhitespaceAction.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/HideWhitespaceAction.java
@@ -18,8 +18,8 @@ package org.intellij.plugins.xsltDebugger.ui.actions;
 import com.intellij.ide.util.treeView.TreeState;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.treeStructure.Tree;
+import icons.XsltDebuggerIcons;
 import org.intellij.plugins.xsltDebugger.ui.GeneratedStructureModel;
 
 @SuppressWarnings({ "ComponentNotRegistered" })
@@ -32,7 +32,7 @@ public class HideWhitespaceAction extends ToggleAction {
     myStructureTree = structureTree;
     myEventModel = eventModel;
 
-    getTemplatePresentation().setIcon(IconLoader.getIcon("filterWhitespace.png"));
+    getTemplatePresentation().setIcon(XsltDebuggerIcons.Actions.FilterWhitespace);
   }
 
   public boolean isSelected(AnActionEvent e) {
@@ -44,4 +44,4 @@ public class HideWhitespaceAction extends ToggleAction {
     myEventModel.setFilterWhitespace(state);
     treeState.applyTo(myStructureTree);
   }
-}
\ No newline at end of file
+}