diff --git a/RegExpSupport/src/icons/RegExpSupportIcons.java b/RegExpSupport/src/icons/RegExpSupportIcons.java
new file mode 100644
index 000000000000..c754416823d3
--- /dev/null
+++ b/RegExpSupport/src/icons/RegExpSupportIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class RegExpSupportIcons {
+  public static final Icon Regexp_filetype_icon = IconLoader.getIcon("/org/intellij/lang/regexp/regexp-filetype-icon.png"); // 11x16
+}
diff --git a/images/src/icons/ImagesIcons.java b/images/src/icons/ImagesIcons.java
new file mode 100644
index 000000000000..0407210b3bb5
--- /dev/null
+++ b/images/src/icons/ImagesIcons.java
@@ -0,0 +1,20 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class ImagesIcons {
+  public static final Icon EditExternaly = IconLoader.getIcon("/org/intellij/images/icons/EditExternaly.png"); // 16x16
+  public static final Icon ImagesConfigurable = IconLoader.getIcon("/org/intellij/images/icons/ImagesConfigurable.png"); // 32x32
+  public static final Icon ImagesFileType = IconLoader.getIcon("/org/intellij/images/icons/ImagesFileType.png"); // 18x18
+  public static final Icon ThumbnailBlank = IconLoader.getIcon("/org/intellij/images/icons/ThumbnailBlank.png"); // 75x86
+  public static final Icon ThumbnailDirectory = IconLoader.getIcon("/org/intellij/images/icons/ThumbnailDirectory.png"); // 75x82
+  public static final Icon ThumbnailToolWindow = IconLoader.getIcon("/org/intellij/images/icons/ThumbnailToolWindow.png"); // 13x13
+  public static final Icon ToggleGrid = IconLoader.getIcon("/org/intellij/images/icons/ToggleGrid.png"); // 16x16
+  public static final Icon ToggleTransparencyChessboard = IconLoader.getIcon("/org/intellij/images/icons/ToggleTransparencyChessboard.png"); // 18x18
+}
diff --git a/java/java-impl/src/com/intellij/internal/BuildIcons.java b/java/java-impl/src/com/intellij/internal/BuildIcons.java
new file mode 100644
index 000000000000..5eaeacab738d
--- /dev/null
+++ b/java/java-impl/src/com/intellij/internal/BuildIcons.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package com.intellij.internal;
+
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.util.containers.MultiMap;
+
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+
+public class BuildIcons {
+  public static void main(String[] args) throws Exception {
+    File root = new File("/Users/max/IDEA/out/classes/production/");
+    final MultiMap<Pair<Integer, Integer>, String> dimToPath = new MultiMap<Pair<Integer, Integer>, String>();
+
+    walk(root, dimToPath, root);
+
+    ArrayList<Pair<Integer, Integer>> keys = new ArrayList<Pair<Integer, Integer>>(dimToPath.keySet());
+    Collections.sort(keys, new Comparator<Pair<Integer, Integer>>() {
+      @Override
+      public int compare(Pair<Integer, Integer> o1, Pair<Integer, Integer> o2) {
+        int d0 = dimToPath.get(o2).size() - dimToPath.get(o1).size();
+        if (d0 != 0) return d0;
+        int d1 = o1.first - o2.first;
+        if (d1 != 0) {
+          return d1;
+        }
+        return o1.second - o2.second;
+      }
+    });
+
+    int total = 0;
+    for (Pair<Integer, Integer> key : keys) {
+      Collection<String> paths = dimToPath.get(key);
+      System.out.println("------------------------   " + key.first + "x" + key.second + "  (total " +paths.size() + " icons) --------------------------------");
+      for (String path : paths) {
+        System.out.println(path);
+        total ++;
+      }
+      System.out.println("");
+    }
+
+    System.out.println("Total icons: " + total);
+  }
+
+  private static void walk(File root, MultiMap<Pair<Integer,Integer>, String> dimToPath, File file) throws IOException {
+    if (file.isDirectory()) {
+      for (File child : file.listFiles()) {
+        walk(root, dimToPath, child);
+      }
+    }
+    else {
+      String extension = FileUtil.getExtension(file.getName());
+      if ("png".equals(extension) || "gif".equals(extension) || "jpg".equals(extension) || "jpeg".equals(extension)) {
+        String relativePath = file.getAbsolutePath().substring(root.getAbsolutePath().length() + 1);
+        Image image = loadImage(file);
+        File target;
+        int width = image.getWidth(null);
+        int height = image.getHeight(null);
+        if (height != width && (height > 100 || width > 100)) {
+          target = new File("/Users/max/images/other", relativePath);
+        }
+        else {
+          target = new File("/Users/max/images/icons", relativePath);
+          dimToPath.putValue(new Pair<Integer, Integer>(width, height), relativePath);
+        }
+        FileUtil.copy(file, target);
+      }
+    }
+  }
+
+  private static Image loadImage(File path) {
+    Image image = Toolkit.getDefaultToolkit().createImage(path.getAbsolutePath());
+    waitForImage(image);
+    return image;
+  }
+
+  private static boolean waitForImage(Image image) {
+    if (image == null) return false;
+    if (image.getWidth(null) > 0) return true;
+    MediaTracker mediatracker = new MediaTracker(new Component() {});
+    mediatracker.addImage(image, 1);
+    try {
+      mediatracker.waitForID(1, 5000);
+    } catch (InterruptedException ex) {
+
+    }
+    return !mediatracker.isErrorID(1);
+  }
+
+}
diff --git a/java/java-impl/src/com/intellij/internal/DiffFiles.java b/java/java-impl/src/com/intellij/internal/DiffFiles.java
new file mode 100644
index 000000000000..fe005ed7c8db
--- /dev/null
+++ b/java/java-impl/src/com/intellij/internal/DiffFiles.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package com.intellij.internal;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.*;
+
+public class DiffFiles {
+  public static void main(String[] args) throws Exception {
+    String file1 = "/Users/max/IDEA/community/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/usedIcons.txt";
+    String file2 = "/Users/max/IDEA/community/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/allIcons.txt";
+
+    Set<String> used = load(file1);
+    Set<String> all = load(file2);
+
+    Set<String> missing = new HashSet<String>(used);
+    missing.removeAll(all);
+
+    Set<String> unused = new HashSet<String>(all);
+    unused.removeAll(used);
+
+    System.out.println("Missing:");
+    printOrdered(missing);
+
+    System.out.println("");
+
+    System.out.println("Unused:");
+    printOrdered(unused);
+  }
+
+  private static void printOrdered(Set<String> set) {
+    List<String> ordered = new ArrayList<String>(set);
+
+    Collections.sort(ordered);
+    for (String item : ordered) {
+      System.out.println(item);
+    }
+  }
+
+  private static Set<String> load(String file) throws Exception {
+    Set<String> answer = new HashSet<String>();
+    BufferedReader reader = new BufferedReader(new FileReader(file));
+    String line;
+    do {
+      line = reader.readLine();
+      if (line == null) break;
+      if (line.isEmpty()) continue;
+
+      answer.add(line);
+    }
+    while (true);
+
+    return answer;
+  }
+}
diff --git a/java/java-impl/src/com/intellij/internal/DupIconsFinder.java b/java/java-impl/src/com/intellij/internal/DupIconsFinder.java
new file mode 100644
index 000000000000..63ebcdc759de
--- /dev/null
+++ b/java/java-impl/src/com/intellij/internal/DupIconsFinder.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package com.intellij.internal;
+
+import com.intellij.util.containers.MultiMap;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Map;
+
+public class DupIconsFinder {
+
+  private static final MultiMap<Integer, String> hashes = new MultiMap<Integer, String>();
+  private static int totalClusters = 0;
+  private static int totalDups = 0;
+
+  public static void main(String[] args) throws Exception {
+    File root = new File("/Users/max/images/icons");
+
+    processDir(root);
+
+ /*
+    Set<String> allIcons = new HashSet<String>();
+    ArrayList<String> sorted = new ArrayList<String>(allIcons);
+    Collections.sort(sorted);
+
+    for (String icon : sorted) {
+      System.out.println(icon);
+    }
+*/
+    for (Map.Entry<Integer, Collection<String>> entry : hashes.entrySet()) {
+      printDups(entry.getValue());
+    }
+
+    System.out.println("Total: " + totalDups + " files duplicated in " + totalClusters + " clusters");
+  }
+
+  private static void processDir(File root) throws Exception {
+    File[] files = root.listFiles();
+    if (files != null) {
+      for (File file : files) {
+        if (file.isFile() && file.getName().endsWith(".png")) {
+          processFile(file.getPath());
+        }
+        else if (file.isDirectory()) {
+          processDir(file);
+        }
+      }
+    }
+  }
+
+  private static void printDups(Collection<String> files) {
+    if (files.size() > 1) {
+      System.out.println("Duplicate " + files.size() + " files");
+      for (String file : files) {
+        System.out.println(file);
+        totalDups++;
+      }
+      totalClusters++;
+      System.out.println();
+    }
+  }
+
+  private static void processFile(String path) throws Exception {
+    InputStream stream = new BufferedInputStream(new FileInputStream(path));
+
+    int hc = 0;
+    while (true) {
+      int b = stream.read();
+      if (b == -1) break;
+      hc = hc * 31 + b;
+    }
+
+    hashes.putValue(hc, path);
+    stream.close();
+  }
+}
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 6e58cd7325cf..0dd4c4da7b97 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -164,6 +164,7 @@ public class AllIcons {
   public static class Darcula {
     public static final Icon TreeNodeCollapsed = IconLoader.getIcon("/darcula/treeNodeCollapsed.png"); // 9x9
     public static final Icon TreeNodeExpanded = IconLoader.getIcon("/darcula/treeNodeExpanded.png"); // 9x9
+
   }
   
   public static class Debugger {
@@ -597,7 +598,6 @@ public class AllIcons {
   public static class Javaee {
     public static final Icon Application_xml = IconLoader.getIcon("/javaee/application_xml.png"); // 16x16
     public static final Icon BuildOnFrameDeactivation = IconLoader.getIcon("/javaee/buildOnFrameDeactivation.png"); // 16x16
-    public static final Icon DatabaseSchemaImportLegend = IconLoader.getIcon("/javaee/databaseSchemaImportLegend.png"); // 500x20
     public static final Icon DataSourceImport = IconLoader.getIcon("/javaee/dataSourceImport.png"); // 16x16
     public static final Icon DbSchemaImportBig = IconLoader.getIcon("/javaee/dbSchemaImportBig.png"); // 32x32
     public static final Icon Ejb_jar_xml = IconLoader.getIcon("/javaee/ejb-jar_xml.png"); // 16x16
diff --git a/plugins/IntelliLang/src/icons/IntelliLangIcons.java b/plugins/IntelliLang/src/icons/IntelliLangIcons.java
new file mode 100644
index 000000000000..a8cbe1ab66e3
--- /dev/null
+++ b/plugins/IntelliLang/src/icons/IntelliLangIcons.java
@@ -0,0 +1,14 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class IntelliLangIcons {
+  public static final Icon Icon = IconLoader.getIcon("/org/intellij/plugins/intelliLang/icon.png"); // 32x32
+  public static final Icon Icon_small = IconLoader.getIcon("/org/intellij/plugins/intelliLang/icon_small.png"); // 16x16
+}
diff --git a/plugins/IntentionPowerPak/src/icons/IntentionPowerPackPluginIcons.java b/plugins/IntentionPowerPak/src/icons/IntentionPowerPackPluginIcons.java
new file mode 100644
index 000000000000..764ba7c827e6
--- /dev/null
+++ b/plugins/IntentionPowerPak/src/icons/IntentionPowerPackPluginIcons.java
@@ -0,0 +1,14 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class IntentionPowerPackPluginIcons {
+  public static final Icon IPPIcon = IconLoader.getIcon("/IPPIcon.png"); // 32x32
+  public static final Icon IPPIconold = IconLoader.getIcon("/IPPIconold.png"); // 32x32
+}
diff --git a/plugins/android-designer/src/icons/AndroidDesignerIcons.java b/plugins/android-designer/src/icons/AndroidDesignerIcons.java
new file mode 100644
index 000000000000..c8c1291ebb2f
--- /dev/null
+++ b/plugins/android-designer/src/icons/AndroidDesignerIcons.java
@@ -0,0 +1,82 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class AndroidDesignerIcons {
+  public static final Icon AbsoluteLayout = IconLoader.getIcon("/icons/AbsoluteLayout.png"); // 16x16
+  public static final Icon AdapterViewFlipper = IconLoader.getIcon("/icons/AdapterViewFlipper.png"); // 16x16
+  public static final Icon AnalogClock = IconLoader.getIcon("/icons/AnalogClock.png"); // 16x16
+  public static final Icon AutoCompleteTextView = IconLoader.getIcon("/icons/AutoCompleteTextView.png"); // 16x16
+  public static final Icon Button = IconLoader.getIcon("/icons/Button.png"); // 16x16
+  public static final Icon CalendarView = IconLoader.getIcon("/icons/CalendarView.png"); // 16x16
+  public static final Icon CheckBox = IconLoader.getIcon("/icons/CheckBox.png"); // 16x16
+  public static final Icon CheckedTextView = IconLoader.getIcon("/icons/CheckedTextView.png"); // 16x16
+  public static final Icon Chronometer = IconLoader.getIcon("/icons/Chronometer.png"); // 16x16
+  public static final Icon DatePicker = IconLoader.getIcon("/icons/DatePicker.png"); // 16x16
+  public static final Icon DeviceScreen = IconLoader.getIcon("/icons/DeviceScreen.png"); // 16x16
+  public static final Icon DialerFilter = IconLoader.getIcon("/icons/DialerFilter.png"); // 16x16
+  public static final Icon DigitalClock = IconLoader.getIcon("/icons/DigitalClock.png"); // 16x16
+  public static final Icon EditText = IconLoader.getIcon("/icons/EditText.png"); // 16x16
+  public static final Icon ExpandableListView = IconLoader.getIcon("/icons/ExpandableListView.png"); // 16x16
+  public static final Icon Fragment = IconLoader.getIcon("/icons/fragment.png"); // 16x16
+  public static final Icon FrameLayout = IconLoader.getIcon("/icons/FrameLayout.png"); // 16x16
+  public static final Icon Gallery = IconLoader.getIcon("/icons/Gallery.png"); // 16x16
+  public static final Icon GestureOverlayView = IconLoader.getIcon("/icons/GestureOverlayView.png"); // 16x16
+  public static final Icon Gravity = IconLoader.getIcon("/icons/gravity.png"); // 16x16
+  public static final Icon GridLayout = IconLoader.getIcon("/icons/GridLayout.png"); // 16x16
+  public static final Icon GridView = IconLoader.getIcon("/icons/GridView.png"); // 16x16
+  public static final Icon HorizontalScrollView = IconLoader.getIcon("/icons/HorizontalScrollView.png"); // 16x16
+  public static final Icon ImageButton = IconLoader.getIcon("/icons/ImageButton.png"); // 16x16
+  public static final Icon ImageSwitcher = IconLoader.getIcon("/icons/ImageSwitcher.png"); // 16x16
+  public static final Icon ImageView = IconLoader.getIcon("/icons/ImageView.png"); // 16x16
+  public static final Icon Include = IconLoader.getIcon("/icons/include.png"); // 16x16
+  public static final Icon LinearLayout = IconLoader.getIcon("/icons/LinearLayout.png"); // 16x16
+  public static final Icon LinearLayout2 = IconLoader.getIcon("/icons/LinearLayout2.png"); // 16x16
+  public static final Icon LinearLayout3 = IconLoader.getIcon("/icons/LinearLayout3.png"); // 16x16
+  public static final Icon ListView = IconLoader.getIcon("/icons/ListView.png"); // 16x16
+  public static final Icon MediaController = IconLoader.getIcon("/icons/MediaController.png"); // 16x16
+  public static final Icon MultiAutoCompleteTextView = IconLoader.getIcon("/icons/MultiAutoCompleteTextView.png"); // 16x16
+  public static final Icon NumberPicker = IconLoader.getIcon("/icons/NumberPicker.png"); // 16x16
+  public static final Icon ProgressBar = IconLoader.getIcon("/icons/ProgressBar.png"); // 16x16
+  public static final Icon QuickContactBadge = IconLoader.getIcon("/icons/QuickContactBadge.png"); // 16x16
+  public static final Icon RadioButton = IconLoader.getIcon("/icons/RadioButton.png"); // 16x16
+  public static final Icon RadioGroup = IconLoader.getIcon("/icons/RadioGroup.png"); // 16x16
+  public static final Icon RatingBar = IconLoader.getIcon("/icons/RatingBar.png"); // 16x16
+  public static final Icon RelativeLayout = IconLoader.getIcon("/icons/RelativeLayout.png"); // 16x16
+  public static final Icon RequestFocus = IconLoader.getIcon("/icons/requestFocus.png"); // 16x16
+  public static final Icon ScrollView = IconLoader.getIcon("/icons/ScrollView.png"); // 16x16
+  public static final Icon SearchView = IconLoader.getIcon("/icons/SearchView.png"); // 16x16
+  public static final Icon SeekBar = IconLoader.getIcon("/icons/SeekBar.png"); // 16x16
+  public static final Icon SlidingDrawer = IconLoader.getIcon("/icons/SlidingDrawer.png"); // 16x16
+  public static final Icon Space = IconLoader.getIcon("/icons/Space.png"); // 16x16
+  public static final Icon Spinner = IconLoader.getIcon("/icons/Spinner.png"); // 16x16
+  public static final Icon StackView = IconLoader.getIcon("/icons/StackView.png"); // 16x16
+  public static final Icon SurfaceView = IconLoader.getIcon("/icons/SurfaceView.png"); // 16x16
+  public static final Icon Switch = IconLoader.getIcon("/icons/Switch.png"); // 16x16
+  public static final Icon TabHost = IconLoader.getIcon("/icons/TabHost.png"); // 16x16
+  public static final Icon TableLayout = IconLoader.getIcon("/icons/TableLayout.png"); // 16x16
+  public static final Icon TableRow = IconLoader.getIcon("/icons/TableRow.png"); // 16x16
+  public static final Icon TabWidget = IconLoader.getIcon("/icons/TabWidget.png"); // 16x16
+  public static final Icon TextSwitcher = IconLoader.getIcon("/icons/TextSwitcher.png"); // 16x16
+  public static final Icon TextureView = IconLoader.getIcon("/icons/TextureView.png"); // 16x16
+  public static final Icon TextView = IconLoader.getIcon("/icons/TextView.png"); // 16x16
+  public static final Icon TimePicker = IconLoader.getIcon("/icons/TimePicker.png"); // 16x16
+  public static final Icon ToggleButton = IconLoader.getIcon("/icons/ToggleButton.png"); // 16x16
+  public static final Icon TwoLineListItem = IconLoader.getIcon("/icons/TwoLineListItem.png"); // 16x16
+  public static final Icon Unknown = IconLoader.getIcon("/icons/unknown.png"); // 16x16
+  public static final Icon VideoView = IconLoader.getIcon("/icons/VideoView.png"); // 16x13
+  public static final Icon View = IconLoader.getIcon("/icons/View.png"); // 16x16
+  public static final Icon ViewAnimator = IconLoader.getIcon("/icons/ViewAnimator.png"); // 16x16
+  public static final Icon ViewFlipper = IconLoader.getIcon("/icons/ViewFlipper.png"); // 16x16
+  public static final Icon ViewStub = IconLoader.getIcon("/icons/ViewStub.png"); // 16x16
+  public static final Icon ViewSwitcher = IconLoader.getIcon("/icons/ViewSwitcher.png"); // 16x16
+  public static final Icon WebView = IconLoader.getIcon("/icons/WebView.png"); // 16x16
+  public static final Icon ZoomButton = IconLoader.getIcon("/icons/ZoomButton.png"); // 16x16
+  public static final Icon ZoomControls = IconLoader.getIcon("/icons/ZoomControls.png"); // 16x16
+}
diff --git a/plugins/android/resources/icons/AndroidIcons.java b/plugins/android/resources/icons/AndroidIcons.java
new file mode 100644
index 000000000000..85a041082fe4
--- /dev/null
+++ b/plugins/android/resources/icons/AndroidIcons.java
@@ -0,0 +1,26 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class AndroidIcons {
+  public static final Icon Android = IconLoader.getIcon("/icons/android.png"); // 16x16
+  public static final Icon Android24 = IconLoader.getIcon("/icons/android24.png"); // 24x24
+  public static final Icon AndroidLarge = IconLoader.getIcon("/icons/androidLarge.png"); // 64x64
+  public static final Icon AndroidPreview = IconLoader.getIcon("/icons/androidPreview.png"); // 16x16
+  public static final Icon AndroidToolWindow = IconLoader.getIcon("/icons/androidToolWindow.png"); // 13x13
+  public static final Icon AttachDebugger = IconLoader.getIcon("/icons/attachDebugger.png"); // 16x16
+  public static final Icon Ddms = IconLoader.getIcon("/icons/ddms.png"); // 16x16
+  public static final Icon Navigate = IconLoader.getIcon("/icons/navigate.png"); // 7x7
+  public static final Icon RefreshPreview = IconLoader.getIcon("/icons/refreshPreview.png"); // 16x16
+  public static final Icon RestartLogcat = IconLoader.getIcon("/icons/restartLogcat.png"); // 16x16
+  public static final Icon ZoomActual = IconLoader.getIcon("/icons/zoomActual.png"); // 16x16
+  public static final Icon ZoomFit = IconLoader.getIcon("/icons/zoomFit.png"); // 16x16
+  public static final Icon ZoomIn = IconLoader.getIcon("/icons/zoomIn.png"); // 16x16
+  public static final Icon ZoomOut = IconLoader.getIcon("/icons/zoomOut.png"); // 16x16
+}
diff --git a/plugins/copyright/src/icons/CopyrightIcons.java b/plugins/copyright/src/icons/CopyrightIcons.java
new file mode 100644
index 000000000000..11879f4bce17
--- /dev/null
+++ b/plugins/copyright/src/icons/CopyrightIcons.java
@@ -0,0 +1,14 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class CopyrightIcons {
+  public static final Icon Copyright18x18 = IconLoader.getIcon("/resources/copyright18x18.png"); // 18x18
+  public static final Icon Copyright32x32 = IconLoader.getIcon("/resources/copyright32x32.png"); // 32x32
+}
diff --git a/plugins/devkit/resources/icons/DevkitIcons.java b/plugins/devkit/resources/icons/DevkitIcons.java
new file mode 100644
index 000000000000..66646ff8cb71
--- /dev/null
+++ b/plugins/devkit/resources/icons/DevkitIcons.java
@@ -0,0 +1,16 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class DevkitIcons {
+  public static final Icon Add_sdk = IconLoader.getIcon("/add_sdk.png"); // 16x16
+  public static final Icon New_html = IconLoader.getIcon("/new_html.png"); // 16x16
+  public static final Icon Sdk_closed = IconLoader.getIcon("/sdk_closed.png"); // 16x16
+  public static final Icon Sdk_open = IconLoader.getIcon("/sdk_open.png"); // 16x16
+}
diff --git a/plugins/generate-tostring/resources/icons/GenerateTostringIcons.java b/plugins/generate-tostring/resources/icons/GenerateTostringIcons.java
new file mode 100644
index 000000000000..d0f241c0bb87
--- /dev/null
+++ b/plugins/generate-tostring/resources/icons/GenerateTostringIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class GenerateTostringIcons {
+  public static final Icon ConfigurableToStringPlugin = IconLoader.getIcon("/configurableToStringPlugin.png"); // 32x33
+}
diff --git a/plugins/git4idea/resources/icons/Git4ideaIcons.java b/plugins/git4idea/resources/icons/Git4ideaIcons.java
new file mode 100644
index 000000000000..42630a19c8ed
--- /dev/null
+++ b/plugins/git4idea/resources/icons/Git4ideaIcons.java
@@ -0,0 +1,32 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class Git4ideaIcons {
+  public static final Icon AllRevisions = IconLoader.getIcon("/icons/allRevisions.png"); // 16x16
+  public static final Icon Ball0 = IconLoader.getIcon("/icons/ball0.png"); // 8x8
+  public static final Icon Ball1 = IconLoader.getIcon("/icons/ball1.png"); // 8x8
+  public static final Icon Ball2 = IconLoader.getIcon("/icons/ball2.png"); // 8x8
+  public static final Icon Ball3 = IconLoader.getIcon("/icons/ball3.png"); // 8x8
+  public static final Icon Ball4 = IconLoader.getIcon("/icons/ball4.png"); // 8x8
+  public static final Icon Ball5 = IconLoader.getIcon("/icons/ball5.png"); // 8x8
+  public static final Icon Ball6 = IconLoader.getIcon("/icons/ball6.png"); // 8x8
+  public static final Icon Ball7 = IconLoader.getIcon("/icons/ball7.png"); // 8x8
+  public static final Icon Branch = IconLoader.getIcon("/icons/branch.png"); // 16x16
+  public static final Icon CherryPick = IconLoader.getIcon("/icons/cherryPick.png"); // 16x16
+  public static final Icon Filter = IconLoader.getIcon("/icons/filter.png"); // 16x16
+  public static final Icon Gitlogtree = IconLoader.getIcon("/icons/gitlogtree.png"); // 16x16
+  public static final Icon Goto = IconLoader.getIcon("/icons/goto.png"); // 16x16
+  public static final Icon Greyball = IconLoader.getIcon("/icons/greyball.png"); // 8x8
+  public static final Icon Inclusion = IconLoader.getIcon("/icons/inclusion.png"); // 16x16
+  public static final Icon Show = IconLoader.getIcon("/icons/show.png"); // 16x16
+  public static final Icon Star = IconLoader.getIcon("/icons/star.png"); // 13x13
+  public static final Icon Tag = IconLoader.getIcon("/icons/tag.png"); // 16x16
+  public static final Icon User = IconLoader.getIcon("/icons/user.png"); // 16x16
+}
diff --git a/plugins/github/src/icons/GithubIcons.java b/plugins/github/src/icons/GithubIcons.java
new file mode 100644
index 000000000000..aa11434c0388
--- /dev/null
+++ b/plugins/github/src/icons/GithubIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class GithubIcons {
+  public static final Icon Github_icon = IconLoader.getIcon("/org/jetbrains/plugins/github/github_icon.png"); // 16x16
+}
diff --git a/plugins/gradle/src/icons/GradleIcons.java b/plugins/gradle/src/icons/GradleIcons.java
new file mode 100644
index 000000000000..eab85828e4c0
--- /dev/null
+++ b/plugins/gradle/src/icons/GradleIcons.java
@@ -0,0 +1,16 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class GradleIcons {
+  public static final Icon Gradle = IconLoader.getIcon("/icons/gradle.png"); // 16x16
+  public static final Icon GradleImport = IconLoader.getIcon("/icons/gradleImport.png"); // 16x16
+  public static final Icon GradleNavigate = IconLoader.getIcon("/icons/gradleNavigate.png"); // 16x16
+  public static final Icon ToolWindowGradle = IconLoader.getIcon("/icons/toolWindowGradle.png"); // 13x13
+}
diff --git a/plugins/groovy/resources/icons/JetgroovyIcons.java b/plugins/groovy/resources/icons/JetgroovyIcons.java
new file mode 100644
index 000000000000..f7f689eb8b13
--- /dev/null
+++ b/plugins/groovy/resources/icons/JetgroovyIcons.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class JetgroovyIcons {
+  
+  public static class Griffon {
+    public static final Icon Griffon_icon_24x24 = IconLoader.getIcon("/icons/griffon/griffon-icon-24x24.png"); // 24x24
+    public static final Icon Griffon = IconLoader.getIcon("/icons/griffon/griffon.png"); // 16x16
+    public static final Icon GriffonToolWindow = IconLoader.getIcon("/icons/griffon/griffonToolWindow.png"); // 13x13
+
+  }
+  
+  public static class Groovy {
+    public static final Icon AbstractClass = IconLoader.getIcon("/icons/groovy/abstractClass.png"); // 16x16
+    public static final Icon AnnotationType = IconLoader.getIcon("/icons/groovy/annotationType.png"); // 16x16
+    public static final Icon Ant = IconLoader.getIcon("/icons/groovy/ant.png"); // 16x16
+    public static final Icon Ant_task = IconLoader.getIcon("/icons/groovy/ant_task.png"); // 16x16
+    public static final Icon Class = IconLoader.getIcon("/icons/groovy/class.png"); // 16x16
+    public static final Icon Def = IconLoader.getIcon("/icons/groovy/def.png"); // 16x16
+    public static final Icon DynamicProperty = IconLoader.getIcon("/icons/groovy/dynamicProperty.png"); // 16x16
+    public static final Icon DynamicProperty_13 = IconLoader.getIcon("/icons/groovy/dynamicProperty_13.png"); // 13x13
+    public static final Icon Enum = IconLoader.getIcon("/icons/groovy/enum.png"); // 16x16
+    public static final Icon Field = IconLoader.getIcon("/icons/groovy/field.png"); // 16x16
+    public static final Icon Gant_16x16 = IconLoader.getIcon("/icons/groovy/gant_16x16.png"); // 16x16
+    public static final Icon Gant_sdk = IconLoader.getIcon("/icons/groovy/gant_sdk.png"); // 16x16
+    public static final Icon Gant_target = IconLoader.getIcon("/icons/groovy/gant_target.png"); // 16x16
+    public static final Icon Gant_task = IconLoader.getIcon("/icons/groovy/gant_task.png"); // 16x16
+    public static final Icon Groovy_13x13 = IconLoader.getIcon("/icons/groovy/groovy_13x13.png"); // 13x13
+    public static final Icon Groovy_16x16 = IconLoader.getIcon("/icons/groovy/groovy_16x16.png"); // 16x16
+    public static final Icon Groovy_18x18 = IconLoader.getIcon("/icons/groovy/groovy_18x18.png"); // 18x18
+    public static final Icon Groovy_24x24 = IconLoader.getIcon("/icons/groovy/groovy_24x24.png"); // 24x24
+    public static final Icon Groovy_32x32 = IconLoader.getIcon("/icons/groovy/groovy_32x32.png"); // 32x32
+    public static final Icon Groovy_48x48 = IconLoader.getIcon("/icons/groovy/groovy_48x48.png"); // 48x48
+    public static final Icon Groovy_64x64 = IconLoader.getIcon("/icons/groovy/groovy_64x64.png"); // 64x64
+    public static final Icon Groovy_fileType = IconLoader.getIcon("/icons/groovy/groovy_fileType.png"); // 18x18
+    public static final Icon Groovy_sdk = IconLoader.getIcon("/icons/groovy/groovy_sdk.png"); // 16x16
+    public static final Icon GroovyDoc = IconLoader.getIcon("/icons/groovy/GroovyDoc.png"); // 16x16
+    public static final Icon Interface = IconLoader.getIcon("/icons/groovy/interface.png"); // 16x16
+    public static final Icon Method = IconLoader.getIcon("/icons/groovy/method.png"); // 16x16
+    public static final Icon No_gant_sdk = IconLoader.getIcon("/icons/groovy/no_gant_sdk.png"); // 16x16
+    public static final Icon No_groovy_sdk = IconLoader.getIcon("/icons/groovy/no_groovy_sdk.png"); // 16x16
+    public static final Icon Property = IconLoader.getIcon("/icons/groovy/property.png"); // 16x16
+    public static final Icon Static = IconLoader.getIcon("/icons/groovy/static.png"); // 16x16
+    public static final Icon Variable = IconLoader.getIcon("/icons/groovy/variable.png"); // 16x16
+
+  }
+  
+  public static class Mvc {
+    public static final Icon Action_method = IconLoader.getIcon("/icons/mvc/action_method.png"); // 16x16
+    public static final Icon Config_folder_closed = IconLoader.getIcon("/icons/mvc/config_folder_closed.png"); // 16x16
+    public static final Icon Controller = IconLoader.getIcon("/icons/mvc/controller.png"); // 16x16
+    public static final Icon Domain_class = IconLoader.getIcon("/icons/mvc/domain_class.png"); // 16x16
+    public static final Icon Groovy_mvc_plugin = IconLoader.getIcon("/icons/mvc/groovy_mvc_plugin.png"); // 16x16
+    public static final Icon ModelsNode = IconLoader.getIcon("/icons/mvc/modelsNode.png"); // 16x16
+    public static final Icon Refresh = IconLoader.getIcon("/icons/mvc/refresh.png"); // 16x16
+    public static final Icon Service = IconLoader.getIcon("/icons/mvc/service.png"); // 16x16
+
+  }
+}
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/GroovyDoc.png b/plugins/groovy/resources/icons/groovy/GroovyDoc.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/GroovyDoc.png
rename to plugins/groovy/resources/icons/groovy/GroovyDoc.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/abstractClass.png b/plugins/groovy/resources/icons/groovy/abstractClass.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/abstractClass.png
rename to plugins/groovy/resources/icons/groovy/abstractClass.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/annotationType.png b/plugins/groovy/resources/icons/groovy/annotationType.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/annotationType.png
rename to plugins/groovy/resources/icons/groovy/annotationType.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/ant.png b/plugins/groovy/resources/icons/groovy/ant.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/ant.png
rename to plugins/groovy/resources/icons/groovy/ant.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/ant_task.png b/plugins/groovy/resources/icons/groovy/ant_task.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/ant_task.png
rename to plugins/groovy/resources/icons/groovy/ant_task.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/class.png b/plugins/groovy/resources/icons/groovy/class.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/class.png
rename to plugins/groovy/resources/icons/groovy/class.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/def.png b/plugins/groovy/resources/icons/groovy/def.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/def.png
rename to plugins/groovy/resources/icons/groovy/def.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/dynamicProperty.png b/plugins/groovy/resources/icons/groovy/dynamicProperty.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/dynamicProperty.png
rename to plugins/groovy/resources/icons/groovy/dynamicProperty.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/dynamicProperty_13.png b/plugins/groovy/resources/icons/groovy/dynamicProperty_13.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/dynamicProperty_13.png
rename to plugins/groovy/resources/icons/groovy/dynamicProperty_13.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/enum.png b/plugins/groovy/resources/icons/groovy/enum.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/enum.png
rename to plugins/groovy/resources/icons/groovy/enum.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/field.png b/plugins/groovy/resources/icons/groovy/field.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/field.png
rename to plugins/groovy/resources/icons/groovy/field.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_16x16.png b/plugins/groovy/resources/icons/groovy/gant_16x16.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_16x16.png
rename to plugins/groovy/resources/icons/groovy/gant_16x16.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_sdk.png b/plugins/groovy/resources/icons/groovy/gant_sdk.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_sdk.png
rename to plugins/groovy/resources/icons/groovy/gant_sdk.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_target.png b/plugins/groovy/resources/icons/groovy/gant_target.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_target.png
rename to plugins/groovy/resources/icons/groovy/gant_target.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_task.png b/plugins/groovy/resources/icons/groovy/gant_task.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/gant_task.png
rename to plugins/groovy/resources/icons/groovy/gant_task.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy-transparent.ico b/plugins/groovy/resources/icons/groovy/groovy-transparent.ico
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy-transparent.ico
rename to plugins/groovy/resources/icons/groovy/groovy-transparent.ico
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy.ico b/plugins/groovy/resources/icons/groovy/groovy.ico
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy.ico
rename to plugins/groovy/resources/icons/groovy/groovy.ico
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_13x13.png b/plugins/groovy/resources/icons/groovy/groovy_13x13.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_13x13.png
rename to plugins/groovy/resources/icons/groovy/groovy_13x13.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_16x16.png b/plugins/groovy/resources/icons/groovy/groovy_16x16.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_16x16.png
rename to plugins/groovy/resources/icons/groovy/groovy_16x16.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_18x18.png b/plugins/groovy/resources/icons/groovy/groovy_18x18.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_18x18.png
rename to plugins/groovy/resources/icons/groovy/groovy_18x18.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_24x24.png b/plugins/groovy/resources/icons/groovy/groovy_24x24.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_24x24.png
rename to plugins/groovy/resources/icons/groovy/groovy_24x24.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_32x32.png b/plugins/groovy/resources/icons/groovy/groovy_32x32.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_32x32.png
rename to plugins/groovy/resources/icons/groovy/groovy_32x32.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_48x48.png b/plugins/groovy/resources/icons/groovy/groovy_48x48.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_48x48.png
rename to plugins/groovy/resources/icons/groovy/groovy_48x48.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_64x64.png b/plugins/groovy/resources/icons/groovy/groovy_64x64.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_64x64.png
rename to plugins/groovy/resources/icons/groovy/groovy_64x64.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_fileType.png b/plugins/groovy/resources/icons/groovy/groovy_fileType.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_fileType.png
rename to plugins/groovy/resources/icons/groovy/groovy_fileType.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_sdk.png b/plugins/groovy/resources/icons/groovy/groovy_sdk.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/groovy_sdk.png
rename to plugins/groovy/resources/icons/groovy/groovy_sdk.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/interface.png b/plugins/groovy/resources/icons/groovy/interface.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/interface.png
rename to plugins/groovy/resources/icons/groovy/interface.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/method.png b/plugins/groovy/resources/icons/groovy/method.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/method.png
rename to plugins/groovy/resources/icons/groovy/method.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/no_gant_sdk.png b/plugins/groovy/resources/icons/groovy/no_gant_sdk.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/no_gant_sdk.png
rename to plugins/groovy/resources/icons/groovy/no_gant_sdk.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/no_groovy_sdk.png b/plugins/groovy/resources/icons/groovy/no_groovy_sdk.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/no_groovy_sdk.png
rename to plugins/groovy/resources/icons/groovy/no_groovy_sdk.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/property.png b/plugins/groovy/resources/icons/groovy/property.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/property.png
rename to plugins/groovy/resources/icons/groovy/property.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/static.png b/plugins/groovy/resources/icons/groovy/static.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/static.png
rename to plugins/groovy/resources/icons/groovy/static.png
diff --git a/plugins/groovy/resources/org/jetbrains/plugins/groovy/images/variable.png b/plugins/groovy/resources/icons/groovy/variable.png
similarity index 100%
rename from plugins/groovy/resources/org/jetbrains/plugins/groovy/images/variable.png
rename to plugins/groovy/resources/icons/groovy/variable.png
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 0f7f8e4bc66e..447ddf2e0702 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -19,7 +19,7 @@
   <name>Groovy</name>
   <description>Plugin for Groovy language support, including Groovy++, Grape, Gant and Griffon</description>
   <version>9.0</version>
-  <vendor logo="/org/jetbrains/plugins/groovy/images/groovy_16x16.png" url="http://www.jetbrains.com">JetBrains Inc.
+  <vendor logo="/icons/groovy/groovy_16x16.png" url="http://www.jetbrains.com">JetBrains Inc.
   </vendor>
   <depends>com.intellij.properties</depends>
 
@@ -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="/org/jetbrains/plugins/groovy/images/GroovyDoc.png">
+            icon="/icons/groovy/GroovyDoc.png">
       <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="/org/jetbrains/plugins/groovy/images/groovy_16x16.png">
+            icon="/icons/groovy/groovy_16x16.png">
       <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 4793897bbe74..0819a4d6f718 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIcons.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIcons.java
@@ -25,25 +25,25 @@ import javax.swing.*;
  */
 public interface GroovyIcons {
 
-  Icon FILE_TYPE = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/groovy_fileType.png");
-  Icon GROOVY_ICON_13x13 = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/groovy_13x13.png");
-  Icon GROOVY_ICON_16x16 = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/groovy_16x16.png");
-  Icon GROOVY_ICON_32x32 = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/groovy_32x32.png");
-  Icon CLASS = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/class.png");
-  Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/abstractClass.png");
-  Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/interface.png");
-  Icon ANNOTATION_TYPE = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/annotationType.png");
-  Icon ENUM = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/enum.png");
-  Icon PROPERTY = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/property.png");
-  Icon METHOD = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/method.png");
-  Icon DYNAMIC = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/dynamicProperty.png");
-  Icon DEF = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/def.png");
-  Icon FIELD = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/field.png");
-  Icon VARIABLE = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/variable.png");
+  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 NO_GROOVY_SDK = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/no_groovy_sdk.png");
-  Icon GROOVY_SDK = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/groovy_sdk.png");
+  Icon NO_GROOVY_SDK = IconLoader.getIcon("/icons/groovy/no_groovy_sdk.png");
+  Icon GROOVY_SDK = IconLoader.getIcon("/icons/groovy/groovy_sdk.png");
 
-  Icon DYNAMIC_PROPERTY_TOOL_WINDOW_ICON = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/dynamicProperty_13.png");
+  Icon DYNAMIC_PROPERTY_TOOL_WINDOW_ICON = IconLoader.getIcon("/icons/groovy/dynamicProperty_13.png");
 
 }
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 ca4024fcda42..37dcb2b608fe 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantIcons.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantIcons.java
@@ -24,11 +24,11 @@ import javax.swing.*;
  */
 public interface GantIcons {
 
-  Icon GANT_ICON_16x16 = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/gant_16x16.png");
-  Icon GANT_SDK_ICON = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/gant_sdk.png");
-  Icon GANT_NO_SDK_ICON = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/no_gant_sdk.png");
-  Icon GANT_TARGET = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/gant_target.png");
-  Icon GANT_TASK = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/gant_task.png");
-  Icon ANT_TASK = IconLoader.getIcon("/org/jetbrains/plugins/groovy/images/ant_task.png");
+  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");
 
 }
diff --git a/plugins/maven/src/main/java/icons/MavenIcons.java b/plugins/maven/src/main/java/icons/MavenIcons.java
new file mode 100644
index 000000000000..b6ee9bfc88f1
--- /dev/null
+++ b/plugins/maven/src/main/java/icons/MavenIcons.java
@@ -0,0 +1,40 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class MavenIcons {
+  public static final Icon AttachPlugin = IconLoader.getIcon("/images/attachPlugin.png"); // 16x16
+  public static final Icon ChildrenProjects = IconLoader.getIcon("/images/childrenProjects.png"); // 12x12
+  public static final Icon DetachPlugin = IconLoader.getIcon("/images/detachPlugin.png"); // 16x16
+  public static final Icon Download = IconLoader.getIcon("/images/download.png"); // 16x16
+  public static final Icon Error = IconLoader.getIcon("/images/error.png"); // 16x16
+  public static final Icon FilterPhases = IconLoader.getIcon("/images/filterPhases.png"); // 16x16
+  public static final Icon MavenLogo = IconLoader.getIcon("/images/mavenLogo.png"); // 16x16
+  public static final Icon MavenPlugin = IconLoader.getIcon("/images/mavenPlugin.png"); // 16x16
+  public static final Icon MavenProject = IconLoader.getIcon("/images/mavenProject.png"); // 16x16
+  public static final Icon MavenSettings = IconLoader.getIcon("/images/mavenSettings.png"); // 16x16
+  public static final Icon ModulesClosed = IconLoader.getIcon("/images/modulesClosed.png"); // 16x16
+  public static final Icon ModulesOpen = IconLoader.getIcon("/images/modulesOpen.png"); // 16x16
+  public static final Icon OfflineMode = IconLoader.getIcon("/images/offlineMode.png"); // 16x16
+  public static final Icon OverridenDependency = IconLoader.getIcon("/images/overridenDependency.png"); // 10x14
+  public static final Icon OverridingDependency = IconLoader.getIcon("/images/overridingDependency.png"); // 10x14
+  public static final Icon ParentProject = IconLoader.getIcon("/images/parentProject.png"); // 12x12
+  public static final Icon Phase = IconLoader.getIcon("/images/phase.png"); // 16x16
+  public static final Icon PhasesClosed = IconLoader.getIcon("/images/phasesClosed.png"); // 16x16
+  public static final Icon PhasesOpen = IconLoader.getIcon("/images/phasesOpen.png"); // 16x16
+  public static final Icon PluginGoal = IconLoader.getIcon("/images/pluginGoal.png"); // 16x16
+  public static final Icon ProfilesClosed = IconLoader.getIcon("/images/profilesClosed.png"); // 16x16
+  public static final Icon ProfilesOpen = IconLoader.getIcon("/images/profilesOpen.png"); // 16x16
+  public static final Icon Repository = IconLoader.getIcon("/images/repository.png"); // 16x16
+  public static final Icon ToolWindowMaven = IconLoader.getIcon("/images/toolWindowMaven.png"); // 13x13
+  public static final Icon UpdateDependencies = IconLoader.getIcon("/images/updateDependencies.png"); // 16x16
+  public static final Icon UpdateFolders = IconLoader.getIcon("/images/updateFolders.png"); // 16x16
+  public static final Icon UpdateIndices = IconLoader.getIcon("/images/updateIndices.png"); // 16x16
+  public static final Icon Warning = IconLoader.getIcon("/images/warning.png"); // 16x16
+}
diff --git a/plugins/properties/resources/icons/PropertiesIcons.java b/plugins/properties/resources/icons/PropertiesIcons.java
new file mode 100644
index 000000000000..8652023d260c
--- /dev/null
+++ b/plugins/properties/resources/icons/PropertiesIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class PropertiesIcons {
+  public static final Icon XmlProperties = IconLoader.getIcon("/icons/xmlProperties.png"); // 16x16
+}
diff --git a/plugins/rearranger/src/icons/RearrangerIcons.java b/plugins/rearranger/src/icons/RearrangerIcons.java
new file mode 100644
index 000000000000..8a3631cc2a0b
--- /dev/null
+++ b/plugins/rearranger/src/icons/RearrangerIcons.java
@@ -0,0 +1,22 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class RearrangerIcons {
+  public static final Icon ClassInitializer = IconLoader.getIcon("/com/wrq/rearranger/ClassInitializer.png"); // 18x18
+  public static final Icon RearrangerIcon = IconLoader.getIcon("/com/wrq/rearranger/RearrangerIcon.png"); // 32x32
+  public static final Icon ShowComments = IconLoader.getIcon("/com/wrq/rearranger/ShowComments.png"); // 28x28
+  public static final Icon ShowFields = IconLoader.getIcon("/com/wrq/rearranger/ShowFields.png"); // 28x28
+  public static final Icon ShowMatchedRules = IconLoader.getIcon("/com/wrq/rearranger/ShowMatchedRules.png"); // 28x28
+  public static final Icon ShowParamNames = IconLoader.getIcon("/com/wrq/rearranger/ShowParamNames.png"); // 28x28
+  public static final Icon ShowParamTypes = IconLoader.getIcon("/com/wrq/rearranger/ShowParamTypes.png"); // 28x28
+  public static final Icon ShowRules = IconLoader.getIcon("/com/wrq/rearranger/ShowRules.png"); // 28x28
+  public static final Icon ShowTypeAfterMethod = IconLoader.getIcon("/com/wrq/rearranger/ShowTypeAfterMethod.png"); // 28x28
+  public static final Icon StaticClassInitializer = IconLoader.getIcon("/com/wrq/rearranger/StaticClassInitializer.png"); // 18x18
+}
diff --git a/plugins/spellchecker/src/icons/SpellcheckerIcons.java b/plugins/spellchecker/src/icons/SpellcheckerIcons.java
new file mode 100644
index 000000000000..e78b3ab4cf93
--- /dev/null
+++ b/plugins/spellchecker/src/icons/SpellcheckerIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class SpellcheckerIcons {
+  public static final Icon Spellcheck = IconLoader.getIcon("/com/intellij/spellchecker/quickfixes/spellcheck.png"); // 16x16
+}
diff --git a/plugins/svn4idea/resources/icons/Svn4ideaIcons.java b/plugins/svn4idea/resources/icons/Svn4ideaIcons.java
new file mode 100644
index 000000000000..587cb297137e
--- /dev/null
+++ b/plugins/svn4idea/resources/icons/Svn4ideaIcons.java
@@ -0,0 +1,39 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class Svn4ideaIcons {
+  public static final Icon AllRevisions = IconLoader.getIcon("/icons/allRevisions.png"); // 16x16
+  public static final Icon Common = IconLoader.getIcon("/icons/Common.png"); // 16x16
+  public static final Icon ConfigureBranches = IconLoader.getIcon("/icons/ConfigureBranches.png"); // 16x16
+  public static final Icon Conflictc = IconLoader.getIcon("/icons/conflictc.png"); // 16x16
+  public static final Icon Conflictcp = IconLoader.getIcon("/icons/conflictcp.png"); // 16x16
+  public static final Icon Conflictct = IconLoader.getIcon("/icons/conflictct.png"); // 16x16
+  public static final Icon Conflictctp = IconLoader.getIcon("/icons/conflictctp.png"); // 16x16
+  public static final Icon Conflictp = IconLoader.getIcon("/icons/conflictp.png"); // 16x16
+  public static final Icon Conflictt = IconLoader.getIcon("/icons/conflictt.png"); // 16x16
+  public static final Icon Conflicttp = IconLoader.getIcon("/icons/conflicttp.png"); // 16x16
+  public static final Icon FilterIntegrated = IconLoader.getIcon("/icons/FilterIntegrated.png"); // 16x16
+  public static final Icon FilterNotIntegrated = IconLoader.getIcon("/icons/FilterNotIntegrated.png"); // 16x16
+  public static final Icon FilterOthers = IconLoader.getIcon("/icons/FilterOthers.png"); // 16x16
+  public static final Icon Integrated = IconLoader.getIcon("/icons/Integrated.png"); // 16x16
+  public static final Icon IntegrateToBranch = IconLoader.getIcon("/icons/IntegrateToBranch.png"); // 16x16
+  public static final Icon IntegrationStatusUnknown = IconLoader.getIcon("/icons/IntegrationStatusUnknown.png"); // 16x16
+  public static final Icon MarkAsMerged = IconLoader.getIcon("/icons/MarkAsMerged.png"); // 16x16
+  public static final Icon MarkAsNotMerged = IconLoader.getIcon("/icons/MarkAsNotMerged.png"); // 16x16
+  public static final Icon MergeSourcesDetails = IconLoader.getIcon("/icons/mergeSourcesDetails.png"); // 16x16
+  public static final Icon Notintegrated = IconLoader.getIcon("/icons/Notintegrated.png"); // 16x16
+  public static final Icon OnDefault = IconLoader.getIcon("/icons/OnDefault.png"); // 16x16
+  public static final Icon PropertiesDiff = IconLoader.getIcon("/icons/PropertiesDiff.png"); // 16x16
+  public static final Icon PropertiesDiffWithLocal = IconLoader.getIcon("/icons/PropertiesDiffWithLocal.png"); // 16x16
+  public static final Icon ShowIntegratedFrom = IconLoader.getIcon("/icons/ShowIntegratedFrom.png"); // 16x16
+  public static final Icon ShowIntegratedTo = IconLoader.getIcon("/icons/ShowIntegratedTo.png"); // 16x16
+  public static final Icon ShowWorkingCopies = IconLoader.getIcon("/icons/ShowWorkingCopies.png"); // 16x16
+  public static final Icon UndoIntegrateToBranch = IconLoader.getIcon("/icons/UndoIntegrateToBranch.png"); // 16x16
+}
diff --git a/plugins/tasks/jira-connector/src/atlassian/java/icons/JiraConnectorIcons.java b/plugins/tasks/jira-connector/src/atlassian/java/icons/JiraConnectorIcons.java
new file mode 100644
index 000000000000..eb2a0306da02
--- /dev/null
+++ b/plugins/tasks/jira-connector/src/atlassian/java/icons/JiraConnectorIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class JiraConnectorIcons {
+  public static final Icon Jira_blue_16 = IconLoader.getIcon("/resources/jira-blue-16.png"); // 16x16
+}
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 6791f0dccb3b..c560eb1e76a7 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
@@ -12,7 +12,7 @@ import javax.swing.*;
  */
 public class MantisRepositoryType extends BaseRepositoryType<MantisRepository> {
   
-  private static final Icon ICON = IconLoader.getIcon("/com/intellij/tasks/mantis/mantis.png");
+  private static final Icon ICON = IconLoader.getIcon("/icons/mantis.png");
 
   @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 37535044a919..f3fc0c043066 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
@@ -30,7 +30,7 @@ import javax.swing.*;
  */
 public class TracRepositoryType extends BaseRepositoryType<TracRepository> {
 
-  private static final Icon ICON = IconLoader.getIcon("/com/intellij/tasks/trac/trac.png");
+  private static final Icon ICON = IconLoader.getIcon("/icons/trac.png");
 
   @NotNull
   @Override
diff --git a/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java b/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java
new file mode 100644
index 000000000000..908dc5ca55c4
--- /dev/null
+++ b/plugins/tasks/tasks-core/src/icons/TasksCoreIcons.java
@@ -0,0 +1,35 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class TasksCoreIcons {
+  public static final Icon Bug = IconLoader.getIcon("/icons/bug.png"); // 16x16
+  public static final Icon Exception = IconLoader.getIcon("/icons/exception.png"); // 16x16
+  public static final Icon Feature = IconLoader.getIcon("/icons/feature.png"); // 16x16
+  public static final Icon Github = IconLoader.getIcon("/icons/github.png"); // 16x16
+  public static final Icon Mantis = IconLoader.getIcon("/icons/mantis.png"); // 16x16
+  public static final Icon Navigate = IconLoader.getIcon("/icons/navigate.png"); // 16x16
+  public static final Icon Other = IconLoader.getIcon("/icons/other.png"); // 16x16
+  
+  public static class Pivotal {
+    public static final Icon Bug = IconLoader.getIcon("/icons/pivotal/bug.png"); // 14x14
+    public static final Icon Chore = IconLoader.getIcon("/icons/pivotal/chore.png"); // 14x14
+    public static final Icon Feature = IconLoader.getIcon("/icons/pivotal/feature.png"); // 14x14
+    public static final Icon Release = IconLoader.getIcon("/icons/pivotal/release.png"); // 14x14
+
+  }
+  public static final Icon Pivotal = IconLoader.getIcon("/icons/pivotal.png"); // 16x16
+  public static final Icon Redmine = IconLoader.getIcon("/icons/redmine.png"); // 16x16
+  public static final Icon Save = IconLoader.getIcon("/icons/save.png"); // 16x16
+  public static final Icon SavedContext = IconLoader.getIcon("/icons/savedContext.png"); // 16x16
+  public static final Icon Trac = IconLoader.getIcon("/icons/trac.png"); // 16x16
+  public static final Icon Unknown = IconLoader.getIcon("/icons/unknown.png"); // 16x16
+  public static final Icon Web = IconLoader.getIcon("/icons/web.png"); // 16x16
+  public static final Icon Youtrack = IconLoader.getIcon("/icons/youtrack.png"); // 16x16
+}
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/mantis.png b/plugins/tasks/tasks-core/src/icons/mantis.png
similarity index 100%
rename from plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/mantis.png
rename to plugins/tasks/tasks-core/src/icons/mantis.png
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/trac.png b/plugins/tasks/tasks-core/src/icons/trac.png
similarity index 100%
rename from plugins/tasks/tasks-core/src/com/intellij/tasks/trac/trac.png
rename to plugins/tasks/tasks-core/src/icons/trac.png
diff --git a/plugins/testng/src/icons/TestngIcons.java b/plugins/testng/src/icons/TestngIcons.java
new file mode 100644
index 000000000000..40a1845ae94a
--- /dev/null
+++ b/plugins/testng/src/icons/TestngIcons.java
@@ -0,0 +1,13 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class TestngIcons {
+  public static final Icon TestNG = IconLoader.getIcon("/resources/testNG.png"); // 16x16
+}
diff --git a/plugins/ui-designer/src/icons/UIDesignerIcons.java b/plugins/ui-designer/src/icons/UIDesignerIcons.java
new file mode 100644
index 000000000000..b5e1d2013ef7
--- /dev/null
+++ b/plugins/ui-designer/src/icons/UIDesignerIcons.java
@@ -0,0 +1,72 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class UIDesignerIcons {
+  public static final Icon Break = IconLoader.getIcon("/com/intellij/uiDesigner/icons/break.png"); // 18x18
+  public static final Icon Button = IconLoader.getIcon("/com/intellij/uiDesigner/icons/button.png"); // 16x16
+  public static final Icon ButtonGroup = IconLoader.getIcon("/com/intellij/uiDesigner/icons/buttonGroup.png"); // 16x16
+  public static final Icon CheckBox = IconLoader.getIcon("/com/intellij/uiDesigner/icons/checkBox.png"); // 16x16
+  public static final Icon ChooseLocale = IconLoader.getIcon("/com/intellij/uiDesigner/icons/chooseLocale.png"); // 16x16
+  public static final Icon CollapseNode = IconLoader.getIcon("/com/intellij/uiDesigner/icons/collapseNode.png"); // 9x9
+  public static final Icon ComboBox = IconLoader.getIcon("/com/intellij/uiDesigner/icons/comboBox.png"); // 16x16
+  public static final Icon DataBindingWizard = IconLoader.getIcon("/com/intellij/uiDesigner/icons/dataBindingWizard.png"); // 16x16
+  public static final Icon Delete = IconLoader.getIcon("/com/intellij/uiDesigner/icons/delete.png"); // 18x18
+  public static final Icon DeleteCell = IconLoader.getIcon("/com/intellij/uiDesigner/icons/deleteCell.png"); // 7x7
+  public static final Icon Drag = IconLoader.getIcon("/com/intellij/uiDesigner/icons/drag.png"); // 11x11
+  public static final Icon EditorPane = IconLoader.getIcon("/com/intellij/uiDesigner/icons/editorPane.png"); // 16x16
+  public static final Icon Empty = IconLoader.getIcon("/com/intellij/uiDesigner/icons/empty.png"); // 16x16
+  public static final Icon Error_small = IconLoader.getIcon("/com/intellij/uiDesigner/icons/error-small.png"); // 16x16
+  public static final Icon ExpandNode = IconLoader.getIcon("/com/intellij/uiDesigner/icons/expandNode.png"); // 9x9
+  public static final Icon FormattedTextField = IconLoader.getIcon("/com/intellij/uiDesigner/icons/formattedTextField.png"); // 16x16
+  public static final Icon Grid = IconLoader.getIcon("/com/intellij/uiDesigner/icons/grid.png"); // 18x18
+  public static final Icon Horizontal = IconLoader.getIcon("/com/intellij/uiDesigner/icons/horizontal.png"); // 18x18
+  public static final Icon Hspacer = IconLoader.getIcon("/com/intellij/uiDesigner/icons/hspacer.png"); // 16x16
+  public static final Icon InsertColumnLeft = IconLoader.getIcon("/com/intellij/uiDesigner/icons/insertColumnLeft.png"); // 7x7
+  public static final Icon InsertColumnRight = IconLoader.getIcon("/com/intellij/uiDesigner/icons/insertColumnRight.png"); // 7x7
+  public static final Icon InsertRowAbove = IconLoader.getIcon("/com/intellij/uiDesigner/icons/insertRowAbove.png"); // 7x7
+  public static final Icon InsertRowBelow = IconLoader.getIcon("/com/intellij/uiDesigner/icons/insertRowBelow.png"); // 7x7
+  public static final Icon InspectionSuppression = IconLoader.getIcon("/com/intellij/uiDesigner/icons/inspectionSuppression.png"); // 16x16
+  public static final Icon InvalidItemAction = IconLoader.getIcon("/com/intellij/uiDesigner/icons/invalidItemAction.png"); // 18x18
+  public static final Icon Label = IconLoader.getIcon("/com/intellij/uiDesigner/icons/label.png"); // 16x16
+  public static final Icon List = IconLoader.getIcon("/com/intellij/uiDesigner/icons/list.png"); // 16x16
+  public static final Icon Listener = IconLoader.getIcon("/com/intellij/uiDesigner/icons/listener.png"); // 16x16
+  public static final Icon MergeDown = IconLoader.getIcon("/com/intellij/uiDesigner/icons/mergeDown.png"); // 9x9
+  public static final Icon MergeLeft = IconLoader.getIcon("/com/intellij/uiDesigner/icons/mergeLeft.png"); // 9x9
+  public static final Icon MergeRight = IconLoader.getIcon("/com/intellij/uiDesigner/icons/mergeRight.png"); // 9x9
+  public static final Icon MergeUp = IconLoader.getIcon("/com/intellij/uiDesigner/icons/mergeUp.png"); // 9x9
+  public static final Icon Panel = IconLoader.getIcon("/com/intellij/uiDesigner/icons/panel.png"); // 16x16
+  public static final Icon PasswordField = IconLoader.getIcon("/com/intellij/uiDesigner/icons/passwordField.png"); // 16x16
+  public static final Icon Pointer = IconLoader.getIcon("/com/intellij/uiDesigner/icons/pointer.png"); // 18x18
+  public static final Icon Progressbar = IconLoader.getIcon("/com/intellij/uiDesigner/icons/progressbar.png"); // 16x16
+  public static final Icon RadioButton_small = IconLoader.getIcon("/com/intellij/uiDesigner/icons/radioButton-small.png"); // 18x18
+  public static final Icon RadioButton = IconLoader.getIcon("/com/intellij/uiDesigner/icons/radioButton.png"); // 16x16
+  public static final Icon Scrollbar = IconLoader.getIcon("/com/intellij/uiDesigner/icons/scrollbar.png"); // 16x16
+  public static final Icon ScrollPane = IconLoader.getIcon("/com/intellij/uiDesigner/icons/scrollPane.png"); // 18x18
+  public static final Icon Separator = IconLoader.getIcon("/com/intellij/uiDesigner/icons/separator.png"); // 16x16
+  public static final Icon ShowPopup = IconLoader.getIcon("/com/intellij/uiDesigner/icons/showPopup.png"); // 7x7
+  public static final Icon Slider = IconLoader.getIcon("/com/intellij/uiDesigner/icons/slider.png"); // 16x16
+  public static final Icon Spinner = IconLoader.getIcon("/com/intellij/uiDesigner/icons/spinner.png"); // 16x16
+  public static final Icon SplitColumn = IconLoader.getIcon("/com/intellij/uiDesigner/icons/splitColumn.png"); // 7x7
+  public static final Icon SplitPane = IconLoader.getIcon("/com/intellij/uiDesigner/icons/splitPane.png"); // 16x16
+  public static final Icon SplitRow = IconLoader.getIcon("/com/intellij/uiDesigner/icons/splitRow.png"); // 7x7
+  public static final Icon TabbedPane = IconLoader.getIcon("/com/intellij/uiDesigner/icons/tabbedPane.png"); // 16x16
+  public static final Icon Table = IconLoader.getIcon("/com/intellij/uiDesigner/icons/table.png"); // 16x16
+  public static final Icon TextArea = IconLoader.getIcon("/com/intellij/uiDesigner/icons/textArea.png"); // 16x16
+  public static final Icon TextField = IconLoader.getIcon("/com/intellij/uiDesigner/icons/textField.png"); // 16x16
+  public static final Icon TextPane = IconLoader.getIcon("/com/intellij/uiDesigner/icons/textPane.png"); // 16x16
+  public static final Icon Toolbar = IconLoader.getIcon("/com/intellij/uiDesigner/icons/toolbar.png"); // 16x16
+  public static final Icon ToolbarSeparator = IconLoader.getIcon("/com/intellij/uiDesigner/icons/toolbarSeparator.png"); // 16x16
+  public static final Icon ToolWindowUIDesigner = IconLoader.getIcon("/com/intellij/uiDesigner/icons/toolWindowUIDesigner.png"); // 13x13
+  public static final Icon Tree = IconLoader.getIcon("/com/intellij/uiDesigner/icons/tree.png"); // 16x16
+  public static final Icon Unknown_small = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown-small.png"); // 16x16
+  public static final Icon Unknown = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown.png"); // 18x18
+  public static final Icon Vertical = IconLoader.getIcon("/com/intellij/uiDesigner/icons/vertical.png"); // 18x18
+  public static final Icon Vspacer = IconLoader.getIcon("/com/intellij/uiDesigner/icons/vspacer.png"); // 16x16
+}
diff --git a/plugins/ui-designer/ui-designer-new/src/icons/UIDesignerNewIcons.java b/plugins/ui-designer/ui-designer-new/src/icons/UIDesignerNewIcons.java
new file mode 100644
index 000000000000..cc55b26b6200
--- /dev/null
+++ b/plugins/ui-designer/ui-designer-new/src/icons/UIDesignerNewIcons.java
@@ -0,0 +1,15 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class UIDesignerNewIcons {
+  public static final Icon ExpandAll = IconLoader.getIcon("/com/intellij/designer/icons/ExpandAll.png"); // 11x16
+  public static final Icon Filter = IconLoader.getIcon("/com/intellij/designer/icons/filter.png"); // 16x16
+  public static final Icon ToolWindow = IconLoader.getIcon("/com/intellij/designer/icons/toolWindow.png"); // 13x13
+}
diff --git a/plugins/xpath/xpath-lang/src/icons/XpathIcons.java b/plugins/xpath/xpath-lang/src/icons/XpathIcons.java
new file mode 100644
index 000000000000..b00a3a69bee5
--- /dev/null
+++ b/plugins/xpath/xpath-lang/src/icons/XpathIcons.java
@@ -0,0 +1,24 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class XpathIcons {
+  public static final Icon Association = IconLoader.getIcon("/icons/association.png"); // 16x16
+  public static final Icon Association_large = IconLoader.getIcon("/icons/association_large.png"); // 32x32
+  public static final Icon Association_small = IconLoader.getIcon("/icons/association_small.png"); // 11x11
+  public static final Icon Function = IconLoader.getIcon("/icons/function.png"); // 18x18
+  public static final Icon Namespace = IconLoader.getIcon("/icons/namespace.png"); // 21x21
+  public static final Icon Tag = IconLoader.getIcon("/icons/tag.png"); // 16x16
+  public static final Icon Template = IconLoader.getIcon("/icons/template.png"); // 18x18
+  public static final Icon Xml = IconLoader.getIcon("/icons/xml.png"); // 20x20
+  public static final Icon Xml_big = IconLoader.getIcon("/icons/xml_big.png"); // 28x31
+  public static final Icon Xpath = IconLoader.getIcon("/icons/xpath.png"); // 12x16
+  public static final Icon Xslt_filetype_overlay = IconLoader.getIcon("/icons/xslt-filetype-overlay.png"); // 11x16
+  public static final Icon Xslt = IconLoader.getIcon("/icons/xslt.png"); // 16x16
+}
diff --git a/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java b/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java
new file mode 100644
index 000000000000..8d6a1ab7de20
--- /dev/null
+++ b/plugins/xslt-debugger/src/icons/XsltDebuggerIcons.java
@@ -0,0 +1,18 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
+ * Don't repeat mistakes of others ;-)
+ */
+public class XsltDebuggerIcons {
+  
+  public static class Actions {
+    public static final Icon FilterWhitespace = IconLoader.getIcon("/org/intellij/plugins/xsltDebugger/ui/actions/filterWhitespace.png"); // 16x16
+
+  }
+  public static final Icon XmlComment = IconLoader.getIcon("/org/intellij/plugins/xsltDebugger/ui/xmlComment.png"); // 18x18
+}