Configurables no longer have icons.

images/src/org/intellij/images/options/impl/OptionsConfigurabe.java

@@ -19,7 +19,6 @@ import com.intellij.openapi.options.BaseConfigurableWithChangeSupport;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import org.intellij.images.ImagesBundle;
 import org.intellij.images.options.Options;
 import org.intellij.images.options.OptionsManager;
@@ -44,11 +43,7 @@ public final class OptionsConfigurabe extends BaseConfigurableWithChangeSupport
         return DISPLAY_NAME;
     }
 
-    public Icon getIcon() {
-        return IconLoader.getIcon("/org/intellij/images/icons/ImagesConfigurable.png");
-    }
-
-    public String getHelpTopic() {
+  public String getHelpTopic() {
         return "preferences.images";
     }
 

java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java

@@ -47,10 +47,6 @@ public class EclipseCompilerConfigurable implements Configurable {
     return null;
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java

@@ -45,10 +45,6 @@ public class JavacConfigurable implements Configurable{
     return null;
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return null;
   }

java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/jikes/JikesConfigurable.java

@@ -62,10 +62,6 @@ public class JikesConfigurable implements Configurable {
     return null;
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return null;
   }

java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java

@@ -47,10 +47,6 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable,
     return "Annotation Processors";
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.projectsettings.compiler.annotationProcessors";
   }

java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java

@@ -60,10 +60,6 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf
     return CompilerBundle.message("compiler.configurable.display.name");
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public String getHelpTopic() {
     return "project.propCompiler";
   }
@@ -165,10 +161,6 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf
         return "Excludes";
       }
 
-      public Icon getIcon() {
-        return null;
-      }
-
       public String getHelpTopic() {
         return "reference.projectsettings.compiler.excludes";
       }

java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java

@@ -178,10 +178,6 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
     return "General";
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return null;
   }

java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java

@@ -94,10 +94,6 @@ public class JavaCompilersTab implements SearchableConfigurable, Configurable.No
     return CompilerBundle.message("java.compiler.description");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.projectsettings.compiler.javacompiler";
   }

java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java

@@ -63,10 +63,6 @@ public class RmicConfigurable implements SearchableConfigurable, Configurable.No
     return CompilerBundle.message("rmi.compiler.description");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.projectsettings.compiler.rmicompiler";
   }

java/debugger/impl/src/com/intellij/debugger/actions/AdjustArrayRangeAction.java

@@ -23,7 +23,6 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
 import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl;
 import com.intellij.debugger.ui.impl.watch.ValueDescriptorImpl;
 import com.intellij.debugger.ui.tree.render.*;
-import com.intellij.debugger.ui.tree.render.Renderer;
 import com.intellij.ide.actions.ShowSettingsUtilImpl;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.options.Configurable;
@@ -32,8 +31,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 public class AdjustArrayRangeAction extends DebuggerAction {
   public void actionPerformed(AnActionEvent e) {
     DebuggerContextImpl debuggerContext = DebuggerAction.getDebuggerContext(e.getDataContext());
@@ -146,10 +143,6 @@ public class AdjustArrayRangeAction extends DebuggerAction {
       return myTitle;
     }
 
-    public Icon getIcon() {
-      return null;
-    }
-
     public String getHelpTopic() {
       return null;
     }

java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java

@@ -33,7 +33,6 @@ import com.intellij.openapi.options.ex.SingleConfigurableEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 
-import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -64,10 +63,6 @@ public class CustomizeContextViewAction extends DebuggerAction{
         return DebuggerBundle.message("title.customize.data.views");
       }
 
-      public Icon getIcon() {
-        return null;
-      }
-
       public String getHelpTopic() {
         return null;
       }

java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java

@@ -176,10 +176,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
     return panel;
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public void apply() {
     final ViewsGeneralSettings generalSettings = ViewsGeneralSettings.getInstance();
     final NodeRendererSettings rendererSettings = NodeRendererSettings.getInstance();

java/debugger/impl/src/com/intellij/debugger/settings/DebuggerHotswapConfigurable.java

@@ -79,10 +79,6 @@ public class DebuggerHotswapConfigurable implements SearchableConfigurable {
     return DebuggerBundle.message("debugger.hotswap.configurable.display.name");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.idesettings.debugger.hotswap";
   }
@@ -139,4 +135,4 @@ public class DebuggerHotswapConfigurable implements SearchableConfigurable {
   public void disposeUIResources() {
   }
 
-}
+}

java/debugger/impl/src/com/intellij/debugger/settings/DebuggerLaunchingConfigurable.java

@@ -24,7 +24,6 @@ import com.intellij.ui.components.panels.VerticalBox;
 
 import javax.swing.*;
 import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
 import java.awt.*;
 
 public class DebuggerLaunchingConfigurable implements Configurable{
@@ -84,10 +83,6 @@ public class DebuggerLaunchingConfigurable implements Configurable{
     return DebuggerBundle.message("debugger.launching.configurable.display.name");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.idesettings.debugger.launching";
   }

java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java

@@ -78,10 +78,6 @@ public class DebuggerSteppingConfigurable implements SearchableConfigurable, Con
     return DebuggerBundle.message("debugger.stepping.configurable.display.name");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   @NotNull
   public String getHelpTopic() {
     return "reference.idesettings.debugger.stepping";
@@ -126,4 +122,4 @@ public class DebuggerSteppingConfigurable implements SearchableConfigurable, Con
     myProject = null;
   }
 
-}
+}

java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java

@@ -58,10 +58,6 @@ public class ThreadsViewConfigurable extends BaseConfigurable {
     return myPanel;
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public void apply() {
     myDataBinding.saveData(mySettings);
     final Project[] openProjects = ProjectManager.getInstance().getOpenProjects();

java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java

@@ -64,10 +64,6 @@ public class UserRenderersConfigurable implements SearchableConfigurable, Config
     return DebuggerBundle.message("user.renderers.configurable.display.name");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.idesettings.debugger.typerenderers"; 
   }

java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java

@@ -82,7 +82,7 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
         if (c != null) {
           UIUtil.addInsets(c, UIUtil.PANEL_SMALL_INSETS);
         }
-        tabbedPane.addTab(editorTab.getDisplayName(), editorTab.getIcon(), c, null);
+        tabbedPane.addTab(editorTab.getDisplayName(), c);
       }
       tabbedPane.addChangeListener(new ChangeListener() {
         public void stateChanged(ChangeEvent e) {

java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java

@@ -21,8 +21,8 @@ import com.intellij.facet.ProjectFacetManager;
 import com.intellij.facet.ui.DefaultFacetSettingsEditor;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectBundle;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -48,10 +48,6 @@ public class DefaultFacetSettingsConfigurable<C extends FacetConfiguration> impl
     return ProjectBundle.message("facet.defaults.display.name");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return myDelegate.getHelpTopic();
   }

java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java

@@ -121,7 +121,7 @@ public class FacetTypeEditor extends UnnamedConfigurableGroup {
 
     myTabbedPane = new TabbedPaneWrapper(myDisposable);
     for (Configurable configurable : myCurrentConfigurables) {
-      myTabbedPane.addTab(configurable.getDisplayName(), configurable.getIcon(), configurable.createComponent(), null);
+      myTabbedPane.addTab(configurable.getDisplayName(), configurable.createComponent());
     }
     return myTabbedPane.getComponent();
   }
@@ -146,10 +146,6 @@ public class FacetTypeEditor extends UnnamedConfigurableGroup {
       return ProjectBundle.message("tab.name.all.facets");
     }
 
-    public Icon getIcon() {
-      return null;
-    }
-
     public String getHelpTopic() {
       return myEditor.getHelpTopic();
     }

java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java

@@ -112,10 +112,6 @@ public class SdkEditor implements Configurable, Place.Navigator {
     return ProjectBundle.message("sdk.configure.editor.title");
   }
 
-  public Icon getIcon(){
-    return null;
-  }
-
   public String getHelpTopic(){
     return null;
   }

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java

@@ -58,10 +58,6 @@ public class AnnotationsEditor extends ModuleElementsEditor {
     return NAME;
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public void saveData() {
     TableUtil.stopEditing(myTable);
     final int count = myTable.getRowCount();

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java

@@ -232,10 +232,6 @@ public class BuildElementsEditor extends ModuleElementsEditor {
     return ProjectBundle.message("output.tab.title");
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java

@@ -72,10 +72,6 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL
     return NAME;
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public void saveData() {
     myPanel.stopEditing();
     flushChangesToModel();

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java

@@ -61,10 +61,6 @@ public class JavadocEditor extends ModuleElementsEditor {
     return NAME;
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public void saveData() {
     TableUtil.stopEditing(myTable);
     final int count = myTable.getRowCount();

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurableWrapper.java

@@ -42,10 +42,6 @@ class ModuleConfigurableWrapper implements ModuleConfigurationEditor {
     return myModuleConfigurable.getDisplayName();
   }
 
-  public Icon getIcon() {
-    return myModuleConfigurable.getIcon();
-  }
-
   public String getHelpTopic() {
     return myModuleConfigurable.getHelpTopic();
   }

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java

@@ -70,10 +70,6 @@ public class OutputEditor extends ModuleElementsEditor {
     return ProjectBundle.message("project.roots.path.tab.title");
   }
 
-  public Icon getIcon() {
-    return myCompilerOutputEditor.getIcon();
-  }
-
 
   public void moduleStateChanged() {
     super.moduleStateChanged();

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java

@@ -245,7 +245,7 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
     return ProjectBundle.message("project.roots.project.display.name");
   }
 
-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
     return PROJECT_ICON;
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java

@@ -44,7 +44,6 @@ import com.intellij.util.containers.Convertor;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.*;
@@ -206,11 +205,6 @@ public class ProjectJdksConfigurable extends MasterDetailsComponent {
     return null;
   }
 
-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java

@@ -16,7 +16,6 @@
 package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.facet.Facet;
-import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.components.ServiceManager;
@@ -157,11 +156,6 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
     return ProjectBundle.message("project.settings.display.name");
   }
 
-  @Nullable
-  public Icon getIcon() {
-    return AllIcons.Modules.Modules;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/TabbedModuleEditor.java

@@ -43,7 +43,7 @@ public abstract class TabbedModuleEditor extends ModuleEditor {
     myTabbedPane = new TabbedPaneWrapper(this);
 
     for (ModuleConfigurationEditor editor : myEditors) {
-      myTabbedPane.addTab(editor.getDisplayName(), editor.getIcon(), editor.createComponent(), null);
+      myTabbedPane.addTab(editor.getDisplayName(), editor.createComponent());
       editor.reset();
     }
     restoreSelectedEditor();

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurableBase.java

@@ -63,7 +63,7 @@ public abstract class ArtifactConfigurableBase extends ProjectStructureElementCo
     return getArtifact().getName();
   }
 
-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
     return getArtifact().getArtifactType().getIcon();
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java

@@ -356,10 +356,6 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
   public void dispose() {
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   private class AddArtifactAction extends DumbAwareAction {
     private final ArtifactType myType;
     private final ArtifactTemplate myArtifactTemplate;

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java

@@ -184,14 +184,6 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
     return "Classpath Details";
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   /**
    * Reload tree
    */
@@ -576,8 +568,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
     /**
      * {@inheritDoc}
      */
-    @Override
-    public Icon getIcon() {
+    private Icon getIcon() {
       return myExplanation.getIcon();
     }
 
@@ -655,15 +646,6 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Icon getIcon() {
-      // Icon is displayed using cell appearance
-      return null;
-    }
-
     /**
      * {@inheritDoc}
      */

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java

@@ -88,7 +88,7 @@ public class FacetConfigurable extends ProjectStructureElementConfigurable<Facet
   }
 
   @Nullable
-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
     return myFacet.getType().getIcon();
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java

@@ -352,10 +352,6 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
     return ProjectBundle.message("project.facets.display.name");
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public String getHelpTopic() {
     final Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(DataManager.getInstance().getDataContext());
     if (myTree.equals(component)) {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetTypeConfigurable.java

@@ -15,11 +15,11 @@
  */
 package com.intellij.openapi.roots.ui.configuration.projectRoot;
 
-import com.intellij.openapi.ui.NamedConfigurable;
-import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.facet.FacetType;
 import com.intellij.facet.impl.ui.facetType.FacetTypeEditor;
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.project.ProjectBundle;
+import com.intellij.openapi.ui.NamedConfigurable;
 
 import javax.swing.*;
 
@@ -54,10 +54,6 @@ public class FacetTypeConfigurable extends NamedConfigurable<FacetType> {
     return myFacetType.getPresentableName();
   }
 
-  public Icon getIcon() {
-    return myFacetType.getIcon();
-  }
-
   public String getHelpTopic() {
     final FacetTypeEditor editor = myFacetStructureConfigurable.getFacetTypeEditor(myFacetType);
     return editor != null ? editor.getHelpTopic() : null;

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FrameworkDetectionConfigurable.java

@@ -63,11 +63,6 @@ public class FrameworkDetectionConfigurable extends NamedConfigurable<DetectionE
     return "Detection";
   }
 
-  @Override
-  public Icon getIcon() {
-    return myConfigurable.getIcon();
-  }
-
   @Override
   public String getHelpTopic() {
     return myConfigurable.getHelpTopic();

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java

@@ -23,9 +23,6 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
 
 public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {
 
@@ -44,11 +41,6 @@ public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {
     return "Global Libraries";
   }
 
-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
   @NotNull
   @NonNls
   public String getId() {
@@ -76,4 +68,4 @@ public class GlobalLibrariesConfigurable extends BaseLibrariesConfigurable {
   protected String getAddText() {
     return ProjectBundle.message("add.new.global.library.text");
   }
-}
+}

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java

@@ -78,7 +78,7 @@ public class JdkConfigurable extends ProjectStructureElementConfigurable<Sdk> im
     return myProjectJdk.getName();
   }
 
-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
     return ((SdkType) myProjectJdk.getSdkType()).getIcon();
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java

@@ -37,7 +37,6 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import javax.swing.tree.TreePath;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -95,11 +94,6 @@ public class JdkListConfigurable extends BaseStructureConfigurable {
     return "SDKs";
   }
 
-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java

@@ -166,7 +166,7 @@ public class LibraryConfigurable extends ProjectStructureElementConfigurable<Lib
     }
   }
 
-  public Icon getIcon() {
+  public Icon getIcon(boolean open) {
     return LibraryPresentationManager.getInstance().getNamedLibraryIcon(myLibrary, myContext);
   }
 

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java

@@ -93,10 +93,6 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurable<Modu
     return myModuleName;
   }
 
-  public Icon getIcon() {
-    return ModuleType.get(myModule).getNodeIcon(false);
-  }
-
   public Icon getIcon(final boolean open) {
     return ModuleType.get(myModule).getNodeIcon(open);
   }

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java

@@ -416,10 +416,6 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
     return ProjectBundle.message("project.roots.display.name");
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java

@@ -23,9 +23,6 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
 
 public class ProjectLibrariesConfigurable extends BaseLibrariesConfigurable {
   public ProjectLibrariesConfigurable(final Project project) {
@@ -43,11 +40,6 @@ public class ProjectLibrariesConfigurable extends BaseLibrariesConfigurable {
     return "Libraries";
   }
 
-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
   @NotNull
   @NonNls
   public String getId() {

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectStructureElementConfigurable.java

@@ -19,6 +19,8 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStr
 import com.intellij.openapi.ui.NamedConfigurable;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
+
 /**
  * @author nik
  */
@@ -33,4 +35,8 @@ public abstract class ProjectStructureElementConfigurable<T> extends NamedConfig
   @Nullable
   public abstract ProjectStructureElement getProjectStructureElement();
 
+  @Nullable
+  public Icon getIcon(boolean open) {
+    return null;
+  }
 }

java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/TextConfigurable.java

@@ -85,10 +85,6 @@ public class TextConfigurable<T> extends NamedConfigurable<T> {
     return myDisplayName;
   }
 
-  public Icon getIcon() {
-    return myOpenedIcon;
-  }
-
   public Icon getIcon(final boolean open) {
     return open ? myOpenedIcon : myClosedIcon;
   }

java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java

@@ -17,7 +17,6 @@ package com.intellij.application.options;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.application.ApplicationBundle;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
@@ -81,11 +80,6 @@ public class CodeStyleGenerationConfigurable implements Configurable {
     return "reference.settingsdialog.IDE.globalcodestyle.codegen";
   }
 
-  public Icon getIcon() {
-    return StdFileTypes.JAVA.getIcon();
-  }
-  
-
 
   /*private JPanel createNamingPanel() {
     OptionGroup optionGroup = new OptionGroup("Naming");

java/java-impl/src/com/intellij/application/options/CodeStyleImportsConfigurable.java

@@ -16,7 +16,6 @@
 package com.intellij.application.options;
 
 import com.intellij.openapi.application.ApplicationBundle;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 
@@ -43,10 +42,6 @@ public class CodeStyleImportsConfigurable extends BaseConfigurable {
     return ApplicationBundle.message("title.imports");
   }
 
-  public Icon getIcon() {
-    return StdFileTypes.JAVA.getIcon();
-  }
-
   public void reset() {
     if (myPanel != null) {
       myPanel.reset();

java/java-impl/src/com/intellij/application/options/JavadocFormatConfigurable.java

@@ -15,12 +15,9 @@
  */
 package com.intellij.application.options;
 
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 
-import javax.swing.*;
-
 public class JavadocFormatConfigurable extends CodeStyleAbstractConfigurable {
   public JavadocFormatConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
     super(settings, cloneSettings, ApplicationBundle.message("title.javadoc"));
@@ -30,11 +27,7 @@ public class JavadocFormatConfigurable extends CodeStyleAbstractConfigurable {
     return new JavaDocFormattingPanel(settings);
   }
 
-  public Icon getIcon() {
-    return StdFileTypes.JAVA.getIcon();
-  }
-
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.globalcodestyle.javadoc";
   }
-}
+}

java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java

@@ -50,11 +50,6 @@ public class JavadocOptionsProvider implements EditorOptionsProvider {
     return JavadocBundle.message("javadoc.generate.message.title");
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return null;

java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java

@@ -146,10 +146,6 @@ public final class JavadocConfigurable implements Configurable {
     return null;
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "project.propJavaDoc";
   }

platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java

@@ -19,8 +19,6 @@ import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.options.SettingsEditorConfigurable;
 
-import javax.swing.*;
-
 public class  RunConfigurationConfigurableAdapter<T extends RunConfiguration> extends SettingsEditorConfigurable<T>{
   public RunConfigurationConfigurableAdapter(SettingsEditor<T> settingsEditor, T configuration) {
     super(settingsEditor, configuration);
@@ -30,10 +28,6 @@ public class  RunConfigurationConfigurableAdapter<T extends RunConfiguration> ex
     return getSettings().getName();
   }
 
-  public Icon getIcon() {
-    return getSettings().getType().getIcon();
-  }
-
   public String getHelpTopic() {
     return null;
   }
@@ -41,4 +35,4 @@ public class  RunConfigurationConfigurableAdapter<T extends RunConfiguration> ex
   public T getConfiguration() {
     return getSettings();
   }
-}
+}

platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java

@@ -32,11 +32,6 @@ import javax.swing.*;
  */
 public abstract class FacetEditorTab implements Configurable {
 
-  @Nullable
-  public Icon getIcon() {
-    return null;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java

@@ -17,7 +17,6 @@
 package com.intellij.application.options;
 
 import com.intellij.application.options.editor.EditorOptionsProvider;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.Configurable;
@@ -46,11 +45,6 @@ public class CodeCompletionOptions extends BaseConfigurable implements Searchabl
     return ApplicationBundle.message("title.code.completion");
   }
 
-  @Override
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableCodeCompletion;
-  }
-
   @Override
   public void reset() {
     myPanel.reset();

platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractConfigurable.java

@@ -44,11 +44,6 @@ public abstract class CodeStyleAbstractConfigurable implements Configurable, Opt
     return myDisplayName;
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public JComponent createComponent() {
     myPanel = createPanel(myCloneSettings);

platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java

@@ -17,7 +17,6 @@
 package com.intellij.application.options;
 
 import com.intellij.application.options.codeStyle.*;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.options.Configurable;
@@ -278,11 +277,6 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
     return "Code Style";
   }
 
-  @Override
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableCodeStyle;
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.globalcodestyle";
@@ -343,11 +337,6 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
       return ensurePanel().getDisplayName();  // fallback for 8.0 API compatibility
     }
 
-    @Override
-    public Icon getIcon() {
-      return null;
-    }
-
     @Override
     public String getHelpTopic() {
       return ensurePanel().getHelpTopic();

platform/lang-impl/src/com/intellij/application/options/GeneralCodeStyleSettingsProvider.java

@@ -17,15 +17,12 @@
 package com.intellij.application.options;
 
 import com.intellij.openapi.application.ApplicationBundle;
-import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
 import com.intellij.psi.codeStyle.DisplayPriority;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  * @author yole
  */
@@ -39,11 +36,6 @@ public class GeneralCodeStyleSettingsProvider extends CodeStyleSettingsProvider
         return new GeneralCodeStylePanel(settings);
       }
 
-      @Override
-      public Icon getIcon() {
-        return FileTypes.PLAIN_TEXT.getIcon();
-      }
-
       @Override
       public String getHelpTopic() {
         return "reference.settingsdialog.IDE.globalcodestyle.general";

platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsProvider.java

@@ -18,7 +18,6 @@ package com.intellij.application.options;
 
 import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
@@ -26,8 +25,6 @@ import com.intellij.psi.codeStyle.DisplayPriority;
 import com.intellij.psi.codeStyle.FileTypeIndentOptionsProvider;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  * @author yole
  */
@@ -41,11 +38,6 @@ public class OtherTabsAndIndentsProvider extends CodeStyleSettingsProvider {
         return new OtherTabsAndIndentsPanel(settings);
       }
 
-      @Override
-      public Icon getIcon() {
-        return FileTypes.PLAIN_TEXT.getIcon();
-      }
-
       @Override
       public String getHelpTopic() {
         return "reference.settingsdialog.IDE.globalcodestyle.general";

platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesConfigurable.java

@@ -18,11 +18,8 @@ package com.intellij.application.options.codeStyle;
 import com.intellij.application.options.CodeStyleAbstractConfigurable;
 import com.intellij.application.options.CodeStyleAbstractPanel;
 import com.intellij.openapi.application.ApplicationBundle;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 
-import javax.swing.*;
-
 public class CodeStyleBlankLinesConfigurable extends CodeStyleAbstractConfigurable {
   public CodeStyleBlankLinesConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
     super(settings, cloneSettings, ApplicationBundle.message("title.blank.lines"));
@@ -33,13 +30,8 @@ public class CodeStyleBlankLinesConfigurable extends CodeStyleAbstractConfigurab
     return new CodeStyleBlankLinesPanel(settings);
   }
 
-  @Override
-  public Icon getIcon() {
-    return StdFileTypes.JAVA.getIcon();
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.globalcodestyle.blanklines";
   }
-}
+}

platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesConfigurable.java

@@ -18,21 +18,13 @@ package com.intellij.application.options.codeStyle;
 import com.intellij.application.options.CodeStyleAbstractConfigurable;
 import com.intellij.application.options.CodeStyleAbstractPanel;
 import com.intellij.openapi.application.ApplicationBundle;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 
-import javax.swing.*;
-
 public class CodeStyleSpacesConfigurable extends CodeStyleAbstractConfigurable {
   public CodeStyleSpacesConfigurable(CodeStyleSettings settings, CodeStyleSettings cloneSettings) {
     super(settings, cloneSettings, ApplicationBundle.message("title.spaces"));
   }
 
-  @Override
-  public Icon getIcon() {
-    return StdFileTypes.JAVA.getIcon();
-  }
-
   @Override
   protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) {
     return new CodeStyleSpacesPanel(settings);
@@ -42,4 +34,4 @@ public class CodeStyleSpacesConfigurable extends CodeStyleAbstractConfigurable {
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.globalcodestyle.spaces";
   }
-}
+}

platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesSettingsProvider.java

@@ -18,7 +18,6 @@ package com.intellij.application.options.codeStyle;
 import com.intellij.application.options.CodeStyleAbstractConfigurable;
 import com.intellij.application.options.CodeStyleAbstractPanel;
 import com.intellij.openapi.application.ApplicationBundle;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
@@ -26,17 +25,11 @@ import com.intellij.psi.codeStyle.DisplayPriority;
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class WrappingAndBracesSettingsProvider extends CodeStyleSettingsProvider {
   @Override
   @NotNull
   public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings) {
     return new CodeStyleAbstractConfigurable(settings, originalSettings, ApplicationBundle.message("wrapping.and.braces")) {
-      @Override
-      public Icon getIcon() {
-        return StdFileTypes.JAVA.getIcon();
-      }
 
       @Override
       protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) {
@@ -64,4 +57,4 @@ public class WrappingAndBracesSettingsProvider extends CodeStyleSettingsProvider
   public DisplayPriority getPriority() {
     return DisplayPriority.COMMON_SETTINGS;
   }
-}
+}

platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java

@@ -21,7 +21,6 @@ import com.intellij.application.options.editor.EditorOptionsProvider;
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
 import com.intellij.execution.impl.ConsoleViewUtil;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.diagnostic.Logger;
@@ -621,11 +620,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
     return ApplicationBundle.message("title.colors.and.fonts");
   }
 
-  @Override
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableColorsAndFonts;
-  }
-
   private void revertChanges(){
     if (isSchemeListModified() || isSomeSchemeModified()) {
       myRevertChangesCompleted = false;
@@ -1210,11 +1204,6 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
       return mySubPanel;
     }
 
-    @Override
-    public Icon getIcon() {
-      return null;
-    }
-
     @Override
     public String getHelpTopic() {
       return null;

platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java

@@ -44,11 +44,6 @@ public class AutoImportOptionsConfigurable extends CompositeConfigurable<AutoImp
     return ApplicationBundle.message("auto.import");
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.editor.autoimport";

platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java

@@ -50,11 +50,6 @@ public class CodeFoldingConfigurable extends CompositeConfigurable<CodeFoldingOp
     return ApplicationBundle.message("group.code.folding");
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.editor.code.folding";

platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java

@@ -172,11 +172,6 @@ public class EditorAppearanceConfigurable extends CompositeConfigurable<UnnamedC
     return ApplicationBundle.message("tab.editor.settings.appearance");
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.editor.appearance";

platform/lang-impl/src/com/intellij/application/options/editor/EditorOptions.java

@@ -16,7 +16,6 @@
 
 package com.intellij.application.options.editor;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.openapi.options.AbstractConfigurableEP;
 import com.intellij.openapi.options.Configurable;
@@ -47,11 +46,6 @@ public class EditorOptions implements SearchableConfigurable.Parent {
     return ApplicationBundle.message("title.editor");
   }
 
-  @Override
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableEditor;
-  }
-
   @Override
   public String getHelpTopic() {
     return ID;

platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.java

@@ -442,11 +442,6 @@ public class EditorOptionsPanel {
       return ApplicationBundle.message("tab.editor.settings.behavior");
     }
 
-    @Override
-    public Icon getIcon() {
-      return null;
-    }
-
     @Override
     public String getHelpTopic() {
       return null;

platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java

@@ -105,11 +105,6 @@ public class EditorSmartKeysConfigurable extends CompositeConfigurable<UnnamedCo
     return "Smart Keys";
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.editor.smartkey";

platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java

@@ -95,11 +95,6 @@ public class EditorTabsConfigurable implements EditorOptionsProvider {
     return "Editor Tabs";
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return "reference.settingsdialog.IDE.editor.tabs";

platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java

@@ -17,7 +17,6 @@
 package com.intellij.codeInsight.intention.impl.config;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.MasterDetails;
 import com.intellij.openapi.options.SearchableConfigurable;
@@ -73,10 +72,6 @@ public class IntentionSettingsConfigurable extends BaseConfigurable implements S
     return DISPLAY_NAME;
   }
 
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableIntentionSettings;
-  }
-
   public void reset() {
     myPanel.reset();
   }

platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java

@@ -17,7 +17,6 @@
 package com.intellij.codeInsight.template.impl;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
@@ -44,10 +43,6 @@ public class LiveTemplatesConfigurable extends BaseConfigurable implements Searc
     return CodeInsightBundle.message("templates.settings.page.title");
   }
 
-  public Icon getIcon() {
-    return AllIcons.General.LiveTemplates;
-  }
-
   public void reset() {
     myPanel.reset();
   }

platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingConfigurable.java

@@ -81,10 +81,6 @@ public class ConsoleFoldingConfigurable implements SearchableConfigurable, Confi
     return "Console Folding";
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.idesettings.console.folding";
   }

platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java

@@ -495,10 +495,6 @@ class RunConfigurable extends BaseConfigurable {
     return myWholePanel;
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public void reset() {
     final RunManagerEx manager = getRunManager();
     final RunManagerConfig config = manager.getConfig();

platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java

@@ -183,10 +183,6 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
     return myDisplayName;
   }
 
-  public Icon getIcon() {
-    return myIcon;
-  }
-
   public String getHelpTopic() {
     return myHelpTopic;
   }

platform/lang-impl/src/com/intellij/execution/impl/TemplateConfigurable.java

@@ -18,8 +18,6 @@ package com.intellij.execution.impl;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.openapi.options.SettingsEditorConfigurable;
 
-import javax.swing.*;
-
 /**
 * @author Dmitry Avdeev
 *         Date: 10/6/11
@@ -36,10 +34,6 @@ class TemplateConfigurable extends SettingsEditorConfigurable<RunnerAndConfigura
     return myTemplate.getConfiguration().getName();
   }
 
-  public Icon getIcon() {
-    return myTemplate.getConfiguration().getType().getIcon();
-  }
-
   public String getHelpTopic() {
     return null;
   }

platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java

@@ -268,11 +268,6 @@ public class DetectionExcludesConfigurable implements Configurable {
     return "Framework Detection Excludes";
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return null;

platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java

@@ -86,10 +86,6 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable, Con
   private static final String CURRENT_TAB = "FileTemplates.CurrentTab";
   private static final String SELECTED_TEMPLATE = "FileTemplates.SelectedTemplate";
 
-  public Icon getIcon() {
-    return ourIcon;
-  }
-
   private void onRemove() {
     myCurrentTab.removeSelected();
     myModified = true;

platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java

@@ -151,10 +151,6 @@ public class FileTemplateConfigurable implements Configurable, Configurable.NoSc
     return IdeBundle.message("title.file.templates");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return null;
   }

platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java

@@ -16,7 +16,6 @@
 
 package com.intellij.ide.todo.configurable;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.todo.TodoConfiguration;
 import com.intellij.ide.todo.TodoFilter;
@@ -385,10 +384,6 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf
     return "preferences.toDoOptions";
   }
 
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableTodo;
-  }
-
   public void reset() {
     // Patterns
     myPatterns.clear();

platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java

@@ -270,10 +270,6 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
     return IdeBundle.message("scopes.display.name");
   }
 
-  public Icon getIcon() {
-    return SCOPES;
-  }
-
   @NotNull
   @NonNls
   public String getHelpTopic() {

platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeConfigurable.java

@@ -83,10 +83,6 @@ public class ScopeConfigurable extends NamedConfigurable<NamedScope> {
     return myScope.getName();
   }
 
-  public Icon getIcon() {
-    return myIcon;
-  }
-
   public NamedScopesHolder getHolder() {
     return getHolder(mySharedCheckbox.isSelected());
   }

platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingConfigurable.java

@@ -38,11 +38,6 @@ public class CustomFoldingConfigurable implements SearchableConfigurable {
     return "Custom Folding"; //TODO<rv> Move to resources
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return null; //TODO<rv>: Define help topic

platform/lang-impl/src/com/intellij/openapi/file/exclude/ui/ExcludedFilesConfigurable.java

@@ -58,11 +58,6 @@ public class ExcludedFilesConfigurable implements SearchableConfigurable {
     return "Excluded Files"; //TODO<rv> Move to resources
   }
 
-  @Override
-  public Icon getIcon() {
-    return null;
-  }
-
   @Override
   public String getHelpTopic() {
     return null;

platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java

@@ -19,7 +19,6 @@ package com.intellij.openapi.fileTypes.impl;
 import com.intellij.CommonBundle;
 import com.intellij.application.options.ExportSchemeAction;
 import com.intellij.application.options.SchemesToImportPopup;
-import com.intellij.icons.AllIcons;
 import com.intellij.ide.highlighter.custom.SyntaxTable;
 import com.intellij.ide.highlighter.custom.impl.ReadFileType;
 import com.intellij.lang.Language;
@@ -97,10 +96,6 @@ public class FileTypeConfigurable extends BaseConfigurable implements Searchable
     myRecognizedFileType.setFileTypes(types);
   }
 
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableFileTypes;
-  }
-
   private static FileType[] getModifiableFileTypes() {
     FileType[] registeredFileTypes = FileTypeManager.getInstance().getRegisteredFileTypes();
     ArrayList<FileType> result = new ArrayList<FileType>();

platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java

@@ -122,10 +122,6 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor {
     return NAME;
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public void disposeUIResources() {
     if (myRootTreeEditor != null) {
       myRootTreeEditor.setContentEntryEditor(null);

platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/PlatformContentEntriesConfigurable.java

@@ -37,10 +37,6 @@ public class PlatformContentEntriesConfigurable implements Configurable {
     return "Project Structure";
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return null;
   }

platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java

@@ -16,7 +16,6 @@
 
 package com.intellij.openapi.vfs.encoding;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
@@ -67,11 +66,6 @@ public class FileEncodingConfigurable implements SearchableConfigurable, Optiona
     return IdeBundle.message("file.encodings.configurable");
   }
 
-  @Nullable
-  public Icon getIcon() {
-    return AllIcons.General.ConfigureEncoding;
-  }
-
   @Nullable
   @NonNls
   public String getHelpTopic() {

platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java

@@ -68,10 +68,6 @@ public class DependencyConfigurable extends BaseConfigurable {
     return AnalysisScopeBundle.message("dependency.configurable.display.name");
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "editing.analyzeDependencies.validation";
   }

platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java

@@ -255,10 +255,6 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
     return DISPLAY_NAME;
   }
 
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableErrorHighlighting;
-  }
-
   public String getHelpTopic() {
     return "preferences.inspections";
   }

platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java

@@ -15,7 +15,6 @@
  */
 package com.intellij.psi.templateLanguages;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.lang.LangBundle;
 import com.intellij.lang.Language;
 import com.intellij.openapi.application.ApplicationNamesInfo;
@@ -29,8 +28,6 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 /**
  * @author peter
  */
@@ -59,12 +56,6 @@ public class TemplateDataLanguageConfigurable extends LanguagePerFileConfigurabl
     return LangBundle.message("template.data.language.configurable");
   }
 
-  @Override
-  @Nullable
-  public Icon getIcon() {
-    return AllIcons.General.ConfigurableFileTypes;
-  }
-
   @Override
   @Nullable
   @NonNls

platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java

@@ -39,10 +39,6 @@ public class ToolConfigurable implements SearchableConfigurable, Configurable.No
     return myPanel;
   }
 
-  public Icon getIcon() {
-    return ourIcon;
-  }
-
   public void apply() throws ConfigurationException {
     try {
       myPanel.apply();

platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java

@@ -43,10 +43,6 @@ public class FileColorsConfigurable implements SearchableConfigurable, Configura
     return "File Colors";
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "reference.settings.ide.settings.file-colors";
   }

platform/platform-api/src/com/intellij/openapi/options/Configurable.java

@@ -20,8 +20,6 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 /**
  * Named component which provides a configuration user interface.
  *
@@ -63,14 +61,6 @@ public interface Configurable extends UnnamedConfigurable {
   @Nls
   String getDisplayName();
 
-  /**
-   * Returns the icon representing the settings component. Components
-   * shown in the IDEA settings dialog have 32x32 icons.
-   *
-   * @return the icon for the component.
-   */
-  @Nullable Icon getIcon();
-
   /**
    * Returns the topic in the help file which is shown when help for the configurable
    * is requested.

platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java

@@ -16,7 +16,6 @@
 package com.intellij.openapi.ui;
 
 import com.intellij.CommonBundle;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.Configurable;
@@ -880,10 +879,6 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom
           return "";
         }
 
-        public Icon getIcon() {
-          return AllIcons.General.ApplicationSettings;
-        }
-
         @Nullable
         @NonNls
         public String getHelpTopic() {

platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java

@@ -111,8 +111,7 @@ public abstract class NamedConfigurable<T> implements Configurable {
   public abstract JComponent createOptionsPanel();
 
   @Nullable
-  public Icon getIcon(boolean open) {
-    return getIcon();
+  public Icon getIcon(boolean expanded) {
+    return null;
   }
-
 }

platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java

@@ -213,14 +213,7 @@ public abstract class NamedItemsListEditor<T> extends MasterDetailsComponent {
             return myNamer.getName(myItem);
         }
 
-        public Icon getIcon() {
-            if (myConfigurable instanceof Iconable) {
-              return ((Iconable)myConfigurable).getIcon(0);
-            }
-            return null;
-        }
-
-        public String getHelpTopic() {
+    public String getHelpTopic() {
             return null;
         }
 

platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java

@@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import javax.swing.event.DocumentListener;
 import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -166,10 +166,6 @@ public class HTTPProxySettingsPanel implements SearchableConfigurable, Configura
     return "HTTP Proxy";
   }
 
-  public Icon getIcon() {
-    return null;
-  }
-
   public String getHelpTopic() {
     return "http.proxy";
   }

platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java

@@ -72,10 +72,6 @@ public class PathMacroConfigurable implements SearchableConfigurable, Configurab
     return myEditor != null && myEditor.isModified();
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   @NotNull
   public String getId() {
     return getHelpTopic();

platform/platform-impl/src/com/intellij/ide/BrowserSettings.java

@@ -45,10 +45,6 @@ public class BrowserSettings implements Configurable, SearchableConfigurable {
     return IdeBundle.message("browsers.settings");
   }
 
-  public Icon getIcon() {
-    return ICON;
-  }
-
   public String getHelpTopic() {
     return "reference.settings.ide.settings.web.browsers";
   }