diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java
index 84341f3e049c..f95025b448f9 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java
@@ -427,7 +427,7 @@ public class ProcessedModulesTable extends JPanel {
       }
       component.setEnabled(ProcessedModulesTable.this.isEnabled());
       if (component instanceof JLabel) {
-        final Icon icon = module != null ? ModuleType.get(module).getNodeIcon(false) : null;
+        final Icon icon = module != null ? ModuleType.get(module).getIcon() : null;
         JLabel label = (JLabel)component;
         label.setIcon(icon);
         label.setDisabledIcon(icon);
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java b/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java
index da8f5bb839e4..ec2579a648da 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java
@@ -330,7 +330,7 @@ public class TargetOptionsComponent extends JPanel {
       finally {
         final Module module = (Module)value;
         setText(module.getName());
-        setIcon(ModuleType.get(module).getNodeIcon(false));
+        setIcon(ModuleType.get(module).getIcon());
       }
     }
   }
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
index a0bd4cc96dcd..02d9e4228eec 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.packaging.impl.artifacts;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.project.Project;
@@ -28,6 +27,7 @@ import com.intellij.packaging.elements.PackagingElementResolvingContext;
 import com.intellij.packaging.impl.elements.ManifestFileUtil;
 import com.intellij.ui.ComboboxSpeedSearch;
 import com.intellij.ui.DocumentAdapter;
+import com.intellij.ui.ListCellRendererWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -166,7 +166,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper {
     @Override
     public void customize(JList list, Module value, int index, boolean selected, boolean hasFocus) {
       if (value != null) {
-        setIcon(ModuleType.get(value).getNodeIcon(false));
+        setIcon(ModuleType.get(value).getIcon());
         setText(value.getName());
       }
       else {
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java
index fcc4ae76d9ac..af59bc05b3cd 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java
@@ -71,7 +71,7 @@ public class ModuleElementPresentation extends TreeNodePresentation {
       presentationData.setIcon(PlatformIcons.TEST_SOURCE_FOLDER);
     }
     else if (module != null) {
-      presentationData.setIcon(ModuleType.get(module).getNodeIcon(false));
+      presentationData.setIcon(ModuleType.get(module).getIcon());
     }
     String moduleName;
     if (module != null) {
diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java
index 28fccad3e6fc..24a93afade62 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java
@@ -17,7 +17,6 @@ package com.intellij.execution.ui;
 
 import com.intellij.execution.configurations.JavaRunConfigurationModule;
 import com.intellij.execution.configurations.ModuleBasedConfiguration;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.ModuleType;
@@ -25,6 +24,7 @@ import com.intellij.openapi.module.ModuleTypeManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiClass;
 import com.intellij.ui.ComboboxSpeedSearch;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.SortedComboBoxModel;
 import org.jetbrains.annotations.Nullable;
 
@@ -72,7 +72,7 @@ public class ConfigurationModuleSelector {
       public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) {
         if (value instanceof Module) {
           final Module module = (Module)value;
-          setIcon(ModuleType.get(module).getNodeIcon(true));
+          setIcon(ModuleType.get(module).getIcon());
           setText(module.getName());
         }
         else if (value == null) {
diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
index 389e9a2b8f72..71278492234d 100644
--- a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
+++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
@@ -184,7 +184,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
   @Nullable
   protected Icon getElementIcon(Object element) {
     if (element instanceof ModuleDescriptor) {
-      return ((ModuleDescriptor)element).getModuleType().getNodeIcon(false);
+      return ((ModuleDescriptor)element).getModuleType().getIcon();
     }
     if (element instanceof LibraryDescriptor) {
       return PlatformIcons.LIBRARY_ICON;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java
index 4cf01ee118f9..58ba508f16ca 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java
@@ -81,7 +81,7 @@ public class OrderEntryAppearanceServiceImpl extends OrderEntryAppearanceService
       return new SimpleTextCellAppearance(presentableName, icon, SimpleTextAttributes.SYNTHETIC_ATTRIBUTES);
     }
     else if (orderEntry instanceof ModuleOrderEntry) {
-      final Icon icon = ModuleType.get(((ModuleOrderEntry)orderEntry).getModule()).getNodeIcon(false);
+      final Icon icon = ModuleType.get(((ModuleOrderEntry)orderEntry).getModule()).getIcon();
       return SimpleTextCellAppearance.regular(orderEntry.getPresentableName(), icon);
     }
     else {
@@ -169,7 +169,7 @@ public class OrderEntryAppearanceServiceImpl extends OrderEntryAppearanceService
   @NotNull
   @Override
   public CellAppearanceEx forModule(@NotNull final Module module) {
-    return SimpleTextCellAppearance.regular(module.getName(), ModuleType.get(module).getNodeIcon(false));
+    return SimpleTextCellAppearance.regular(module.getName(), ModuleType.get(module).getIcon());
   }
 
   @NotNull
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java
index a4e7b57b4154..5455ac35a279 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java
@@ -123,7 +123,7 @@ public class ModuleSourceItemGroup extends PackagingSourceItem {
     @Override
     public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes,
                        SimpleTextAttributes commentAttributes) {
-      presentationData.setIcon(ModuleType.get(myModule).getNodeIcon(false));
+      presentationData.setIcon(ModuleType.get(myModule).getIcon());
       presentationData.addText(myModule.getName(), mainAttributes);
     }
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java
index e320de1d8265..6714201f2d97 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java
@@ -37,7 +37,7 @@ class AddModuleDependencyAction extends AddItemPopupAction<Module> {
                                    int actionIndex,
                                    StructureConfigurableContext context) {
     super(classpathPanel, actionIndex, ProjectBundle.message("classpath.add.module.dependency.action"),
-          StdModuleTypes.JAVA.getNodeIcon(false));
+          StdModuleTypes.JAVA.getIcon());
     myContext = context;
     myClasspathPanel = classpathPanel;
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java
index 14dcc3a5a289..6d8edb49dff8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java
@@ -608,7 +608,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
           return new CellAppearanceEx() {
             @Override
             public void customize(@NotNull SimpleColoredComponent component) {
-              component.setIcon(ModuleType.get(myModule).getNodeIcon(false));
+              component.setIcon(ModuleType.get(myModule).getIcon());
               component.append("<This Module>", SimpleTextAttributes.SYNTHETIC_ATTRIBUTES);
             }
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
index 188019f425fe..6d9eccf8345d 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
@@ -94,7 +94,7 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurable<Modu
   }
 
   public Icon getIcon(final boolean open) {
-    return ModuleType.get(myModule).getNodeIcon(open);
+    return ModuleType.get(myModule).getIcon();
   }
 
   public Module getModule() {
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/UsageInModuleClasspath.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/UsageInModuleClasspath.java
index 24feb76b81fb..db3f94366ac4 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/UsageInModuleClasspath.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/UsageInModuleClasspath.java
@@ -65,7 +65,7 @@ public class UsageInModuleClasspath extends ProjectStructureElementUsage {
 
   @Override
   public Icon getIcon() {
-    return ModuleType.get(myModule).getNodeIcon(false);
+    return ModuleType.get(myModule).getIcon();
   }
 
   @Override
diff --git a/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java b/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java
index 847330ac8a70..c567f2636dbc 100644
--- a/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java
+++ b/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java
@@ -302,7 +302,7 @@ public abstract class ChooseLibrariesDialogBase extends DialogWrapper {
     protected ModuleDescriptor(final Project project, final NodeDescriptor parentDescriptor, final Module element) {
       super(project, parentDescriptor, element);
       final PresentationData templatePresentation = getTemplatePresentation();
-      templatePresentation.setIcon(ModuleType.get(element).getNodeIcon(false));
+      templatePresentation.setIcon(ModuleType.get(element).getIcon());
       templatePresentation.addText(notEmpty(element.getName()), SimpleTextAttributes.REGULAR_ATTRIBUTES);
     }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java b/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java
index a13f2aec34dc..a5b1a2fc7f36 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java
@@ -56,7 +56,7 @@ public class JavaDirectoryIconProvider extends IconProvider implements DumbAware
       else if (isContentRoot) {
         Module module = ProjectRootManager.getInstance(project).getFileIndex().getModuleForFile(vFile);
         if (module != null) {
-          symbolIcon = ModuleType.get(module).getNodeIcon(false);
+          symbolIcon = ModuleType.get(module).getIcon();
         }
         else {
           symbolIcon = PlatformIcons.CONTENT_ROOT_ICON_CLOSED;
diff --git a/java/openapi/src/com/intellij/ide/IconUtilEx.java b/java/openapi/src/com/intellij/ide/IconUtilEx.java
index 42a47fbb93b7..566b1a3276d1 100644
--- a/java/openapi/src/com/intellij/ide/IconUtilEx.java
+++ b/java/openapi/src/com/intellij/ide/IconUtilEx.java
@@ -33,7 +33,7 @@ public class IconUtilEx {
       return ((PsiElement)object).getIcon(flags);
     }
     if (object instanceof Module) {
-      return ModuleType.get((Module)object).getNodeIcon(false);
+      return ModuleType.get((Module)object).getIcon();
     }
     if (object instanceof VirtualFile) {
       VirtualFile file = (VirtualFile)object;
diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
index 4f6b6579fc28..060d38e94fc3 100644
--- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
+++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
@@ -39,7 +39,13 @@ public abstract class ModuleType<T extends ModuleBuilder> {
   public abstract String getName();
   public abstract String getDescription();
   public abstract Icon getBigIcon();
-  public abstract Icon getNodeIcon(boolean isOpened);
+
+  public Icon getIcon() {
+    return getNodeIcon(false);
+  }
+
+  public abstract Icon getNodeIcon(@Deprecated boolean isOpened);
+
 
   public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, T moduleBuilder, ModulesProvider modulesProvider) {
     return ModuleWizardStep.EMPTY_ARRAY;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java
index b10fae880d2c..3da41bef2fd9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java
@@ -49,7 +49,7 @@ public class ElementLocationUtil {
 
       if (module != null) {
         label.setText(module.getName());
-        label.setIcon(ModuleType.get(module).getNodeIcon(false));
+        label.setIcon(ModuleType.get(module).getIcon());
       }
       else {
         final List<OrderEntry> entries = fileIndex.getOrderEntriesForFile(vfile);
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java
index 89ab7b9e7ab4..30c24bc886d9 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java
@@ -58,7 +58,7 @@ public class RefModuleImpl extends RefEntityImpl implements RefModule {
   }
 
   public Icon getIcon(final boolean expanded) {
-    return ModuleType.get(getModule()).getNodeIcon(expanded);
+    return ModuleType.get(getModule()).getIcon();
   }
 
   @Nullable
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java
index 76337fdc628e..e237ce54f04e 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java
@@ -17,7 +17,7 @@ public class InspectionModuleNode extends InspectionTreeNode{
   }
 
   public Icon getIcon(boolean expanded) {
-    return myModule.isDisposed() ? null : ModuleType.get(myModule).getNodeIcon(expanded);
+    return myModule.isDisposed() ? null : ModuleType.get(myModule).getIcon();
   }
 
   public String getName(){
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java
index f9930c9f0c67..7e55e66a6eac 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java
@@ -65,7 +65,7 @@ public class NavBarPresentation {
   public static Icon getIcon(final Object object, final boolean open) {
     if (!NavBarModel.isValid(object)) return null;
     if (object instanceof Project) return AllIcons.Nodes.Project;
-    if (object instanceof Module) return ModuleType.get(((Module)object)).getNodeIcon(false);
+    if (object instanceof Module) return ModuleType.get(((Module)object)).getIcon();
     try {
       if (object instanceof PsiElement) {
         Icon icon = ApplicationManager.getApplication().runReadAction(new Computable<Icon>() {
@@ -88,7 +88,7 @@ public class NavBarPresentation {
       return ((SdkType) sdkType).getIcon();
     }
     if (object instanceof LibraryOrderEntry) return AllIcons.Nodes.PpLibFolder;
-    if (object instanceof ModuleOrderEntry) return ModuleType.get(((ModuleOrderEntry)object).getModule()).getNodeIcon(false);
+    if (object instanceof ModuleOrderEntry) return ModuleType.get(((ModuleOrderEntry)object).getModule()).getIcon();
     return null;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java
index 376ccde44920..a6517f8c28a6 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java
@@ -49,7 +49,7 @@ public abstract class AbstractModuleNode extends ProjectViewNode<Module> impleme
       presentation.addText(getValue().getName(), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
     }
 
-    presentation.setIcon(ModuleType.get(getValue()).getNodeIcon(false));
+    presentation.setIcon(ModuleType.get(getValue()).getIcon());
   }
 
   protected boolean showModuleNameInBold() {
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java b/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java
index 4531deceb73d..e40246dba36f 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java
@@ -97,7 +97,7 @@ public class ModuleToDoNode extends BaseToDoNode<Module> implements HighlightedR
     EditorColorsScheme colorsScheme = UsageTreeColorsScheme.getInstance().getScheme();
     myHighlightedRegions.add(
       new HighlightedRegion(nameEndOffset, newName.length(), colorsScheme.getAttributes(UsageTreeColors.NUMBER_OF_USAGES)));
-    presentation.setIcon(ModuleType.get(getValue()).getNodeIcon(false));
+    presentation.setIcon(ModuleType.get(getValue()).getIcon());
     presentation.setPresentableText(newName);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java
index ddfd2e3500e7..fe830a84c252 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java
@@ -239,7 +239,7 @@ public class DirectoryChooserModuleTreeView implements DirectoryChooserView {
       else if (value instanceof Module) {
         final Module module = (Module)value;
         append(module.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
-        setIcon(ModuleType.get(module).getNodeIcon(false));
+        setIcon(ModuleType.get(module).getIcon());
       } else if (value instanceof ModuleGroup) {
         append(value.toString(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
         setIcon(PlatformIcons.CLOSED_MODULE_GROUP_ICON);
diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java
index 29128cf7f197..32fb869cc4bf 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java
@@ -103,7 +103,7 @@ public class PsiElementModuleRenderer extends DefaultListCellRenderer{
       setIcon(AllIcons.Nodes.TestSourceFolder);
     }
     else {
-      setIcon(ModuleType.get(module).getNodeIcon(false));
+      setIcon(ModuleType.get(module).getIcon());
     }
   }
 
diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
index eaa5579045ed..333a54159d22 100644
--- a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
+++ b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
@@ -533,7 +533,7 @@ public class ModulesDependenciesPanel extends JPanel implements ModuleRootListen
       }
       MyUserObject node = (MyUserObject)userObject;
       Module module = node.getModule();
-      setIcon(ModuleType.get(module).getNodeIcon(expanded));
+      setIcon(ModuleType.get(module).getIcon());
       if (node.isInCycle()){
         append(module.getName(), SimpleTextAttributes.ERROR_ATTRIBUTES);
       } else {
diff --git a/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java
index e4faf77fbca5..f85cf18568f1 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java
@@ -49,11 +49,11 @@ public class UnknownModuleType extends ModuleType {
   }
 
   public Icon getNodeIcon(boolean isOpened) {
-    return myModuleType.getNodeIcon(isOpened);
+    return myModuleType.getIcon();
   }
 
   public ModuleWizardStep[] createWizardSteps(final WizardContext wizardContext, final ModuleBuilder moduleBuilder, final ModulesProvider modulesProvider) {
     return myModuleType.createWizardSteps(wizardContext, moduleBuilder, modulesProvider);
   }
 
-}
\ No newline at end of file
+}
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java
index 279fa8c76a0c..9b550aaa76b8 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java
@@ -22,10 +22,10 @@
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.ide.util.ChooseElementsDialog;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.project.Project;
-import com.intellij.ide.util.ChooseElementsDialog;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -51,10 +51,10 @@ public class ChooseModulesDialog extends ChooseElementsDialog<Module> {
   }
 
   protected Icon getItemIcon(final Module item) {
-    return ModuleType.get(item).getNodeIcon(false);
+    return ModuleType.get(item).getIcon();
   }
 
   protected String getItemText(final Module item) {
     return item.getName();
   }
-}
\ No newline at end of file
+}
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java
index ef7ebb67b5eb..cb515391a501 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java
@@ -15,13 +15,13 @@
  */
 package com.intellij.openapi.roots.ui.configuration;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.ui.ComboboxSpeedSearch;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.SortedComboBoxModel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -57,7 +57,7 @@ public class ModulesCombobox extends ComboBox {
       public void customize(JList list, Module value, int index, boolean selected, boolean hasFocus) {
         if (value != null) {
           setText(value.getName());
-          setIcon(ModuleType.get(value).getNodeIcon(false));
+          setIcon(ModuleType.get(value).getIcon());
         }
         else {
           setText("[none]");
diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java b/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java
index 32f9cedbc1df..118b137cf6df 100644
--- a/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java
+++ b/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java
@@ -18,10 +18,10 @@ package com.intellij.openapi.vcs.changes.ui;
 
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
+import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.FilePathImpl;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.ui.SimpleTextAttributes;
 
 /**
@@ -39,9 +39,9 @@ public class ChangesBrowserModuleNode extends ChangesBrowserNode<Module> {
     renderer.append(module.isDisposed() ? "" : module.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
     appendCount(renderer);
     if (module.isDisposed()) {
-      renderer.setIcon(ModuleType.EMPTY.getNodeIcon(expanded));
+      renderer.setIcon(ModuleType.EMPTY.getIcon());
     } else {
-      renderer.setIcon(ModuleType.get(module).getNodeIcon(expanded));
+      renderer.setIcon(ModuleType.get(module).getIcon());
     }
   }
 
@@ -70,4 +70,4 @@ public class ChangesBrowserModuleNode extends ChangesBrowserNode<Module> {
     }
     return result;
   }
-}
\ No newline at end of file
+}
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java
index ef0071ccce18..8439ca689e2b 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java
@@ -60,7 +60,7 @@ public class ModuleNode extends PackageDependenciesNode implements NavigatableWi
   }
 
   public Icon getIcon() {
-    return myModule == null || myModule.isDisposed() ? super.getIcon() : ModuleType.get(myModule).getNodeIcon(false);
+    return myModule == null || myModule.isDisposed() ? super.getIcon() : ModuleType.get(myModule).getIcon();
   }
 
   public String toString() {
diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java b/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java
index bd2e3b86e9fe..9f57a62f0421 100644
--- a/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java
+++ b/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java
@@ -147,7 +147,7 @@ public class ModuleGroupingRule implements UsageGroupingRule {
 
     @Override
     public Icon getIcon(boolean isOpen) {
-      return myModule.isDisposed() ? null : ModuleType.get(myModule).getNodeIcon(isOpen);
+      return myModule.isDisposed() ? null : ModuleType.get(myModule).getIcon();
     }
 
     @Override
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java
index 399868e11adc..7a67aab48f39 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java
@@ -16,12 +16,12 @@
 
 package org.jetbrains.android.exportSignedPackage;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.ide.wizard.CommitStepException;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.ui.CollectionComboBoxModel;
+import com.intellij.ui.ListCellRendererWrapper;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.util.AndroidBundle;
 
@@ -63,7 +63,7 @@ class ChooseModuleStep extends ExportSignedPackageWizardStep {
       public void customize(JList list, AndroidFacet value, int index, boolean selected, boolean hasFocus) {
         final Module module = value.getModule();
         setText(module.getName());
-        setIcon(ModuleType.get(module).getNodeIcon(false));
+        setIcon(ModuleType.get(module).getIcon());
       }
     });
     myModuleCombo.addActionListener(new ActionListener() {
diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java
index fb49e257046d..aa4692c5aff5 100644
--- a/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java
+++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java
@@ -15,11 +15,11 @@
  */
 package org.jetbrains.android.newProject;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.ListCellRendererWrapper;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.annotations.NotNull;
 
@@ -38,7 +38,7 @@ public class AndroidModulesComboBox extends JComboBox {
         if (value instanceof Module) {
           final Module module = (Module)value;
           setText(module.getName());
-          setIcon(ModuleType.get(module).getNodeIcon(false));
+          setIcon(ModuleType.get(module).getIcon());
         }
         else {
           setText("<html><font color='red'>[none]</font></html>");
diff --git a/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java b/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java
index b46129f684f4..05a65b042c35 100644
--- a/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java
+++ b/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java
@@ -32,6 +32,6 @@ public class ModuleListCellRendererWrapper extends ListCellRendererWrapper<Modul
   @Override
   public void customize(JList list, Module module, int index, boolean selected, boolean hasFocus) {
     setText(module.getName());
-    setIcon(ModuleType.get(module).getNodeIcon(false));
+    setIcon(ModuleType.get(module).getIcon());
   }
 }
diff --git a/plugins/devkit/src/util/ChooseModulesDialog.java b/plugins/devkit/src/util/ChooseModulesDialog.java
index 5f7271f3e0e6..28eabdb7d0a2 100644
--- a/plugins/devkit/src/util/ChooseModulesDialog.java
+++ b/plugins/devkit/src/util/ChooseModulesDialog.java
@@ -178,7 +178,7 @@ public class ChooseModulesDialog extends DialogWrapper {
       myCellRenderer = new ColoredListCellRenderer() {
         protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
           final Module module = ((Module)value);
-          setIcon(ModuleType.get(module).getNodeIcon(false));
+          setIcon(ModuleType.get(module).getIcon());
           append(module.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
 
           final XmlFile pluginXml = PluginModuleType.getPluginXml(module);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java
index 45090d6d3816..208de7bbcfbc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java
@@ -15,9 +15,9 @@
  */
 package org.jetbrains.plugins.groovy.mvc.util;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
+import com.intellij.ui.ListCellRendererWrapper;
 
 import javax.swing.*;
 
@@ -32,7 +32,7 @@ public class ModuleCellRenderer extends ListCellRendererWrapper<Module> {
   @Override
   public void customize(JList list, Module module, int index, boolean selected, boolean hasFocus) {
     if (module != null) {
-      setIcon(ModuleType.get(module).getNodeIcon(false));
+      setIcon(ModuleType.get(module).getIcon());
       setText(module.getName());
     }
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
index 85d3680d1c64..55a68e7bc69d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
@@ -17,7 +17,6 @@
 package org.jetbrains.plugins.groovy.runner;
 
 import com.intellij.execution.configuration.EnvironmentVariablesComponent;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.BrowseFilesListener;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.module.Module;
@@ -26,10 +25,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.roots.ui.configuration.ModulesAlphaComparator;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.ComboboxSpeedSearch;
-import com.intellij.ui.FieldPanel;
-import com.intellij.ui.PanelWithAnchor;
-import com.intellij.ui.RawCommandLineEditor;
+import com.intellij.ui.*;
 import com.intellij.ui.components.JBLabel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.GroovyFileType;
@@ -127,7 +123,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor<GroovyScriptRun
       @Override
       public void customize(JList list, Module module, int index, boolean selected, boolean hasFocus) {
         if (module != null) {
-          setIcon(ModuleType.get(module).getNodeIcon(false));
+          setIcon(ModuleType.get(module).getIcon());
           setText(module.getName());
         }
       }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
index 762a6b5f822b..b3e2aa336d64 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
@@ -16,7 +16,6 @@
 package org.intellij.lang.xpath.xslt.run;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -281,7 +280,7 @@ class XsltRunSettingsEditor extends SettingsEditor<XsltRunConfiguration> {
                 return module.getName();
               }
             }));
-            setIcon(ModuleType.get(module).getNodeIcon(true));
+            setIcon(ModuleType.get(module).getIcon());
           }
           else if (value instanceof String) {
             setText((String)value);
diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java
index c80b0a0cfdb1..554f54daf5c2 100644
--- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java
+++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java
@@ -15,7 +15,6 @@
  */
 package org.intellij.plugins.xpathView.search;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.scopeChooser.ScopeChooserCombo;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
@@ -28,6 +27,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.ui.ComboboxWithBrowseButton;
 import com.intellij.ui.DocumentAdapter;
+import com.intellij.ui.ListCellRendererWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -96,7 +96,7 @@ public class ScopePanel extends JPanel implements Disposable{
           @Override
           public void customize(JList list, Module m, int index, boolean selected, boolean hasFocus) {
             if (m != null) {
-              setIcon(ModuleType.get(m).getNodeIcon(true));
+              setIcon(ModuleType.get(m).getIcon());
               setText(m.getName());
             }
           }
diff --git a/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java b/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java
index ec42d5b611b6..f71505f31ef0 100644
--- a/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java
+++ b/xml/impl/src/com/intellij/xml/config/ConfigFilesTreeBuilder.java
@@ -134,7 +134,7 @@ public class ConfigFilesTreeBuilder {
     final Object object = ((DefaultMutableTreeNode)value).getUserObject();
     if (object instanceof Module) {
       final Module module = (Module)object;
-      final Icon icon = ModuleType.get(module).getNodeIcon(expanded);
+      final Icon icon = ModuleType.get(module).getIcon();
       renderer.setIcon(icon);
       final String moduleName = module.getName();
       renderer.append(moduleName, SimpleTextAttributes.REGULAR_ATTRIBUTES);