diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
index 57227d1e40d4..e4422331e055 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.ui.components.JBList;
-import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -72,7 +71,7 @@ public class ClassesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
       return new PathCellRenderer() {
         @Override
         protected Icon getItemIcon(Object value) {
-          return isJrtRoot(value) ? PlatformIcons.JAR_ICON : super.getItemIcon(value);
+          return isJrtRoot(value) ? AllIcons.Nodes.JavaModuleRoot : super.getItemIcon(value);
         }
       };
     }
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 e4989828d363..784da4e17cdd 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaDirectoryIconProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import com.intellij.openapi.roots.SourceFolder;
 import com.intellij.openapi.roots.ui.configuration.SourceRootPresentation;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem;
 import com.intellij.openapi.vfs.newvfs.ArchiveFileSystem;
 import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiDirectory;
@@ -61,6 +62,9 @@ public class JavaDirectoryIconProvider extends IconProvider implements DumbAware
       else if ((sourceFolder = ProjectRootsUtil.getModuleSourceRoot(vFile, project)) != null) {
         symbolIcon = SourceRootPresentation.getSourceRootIcon(sourceFolder);
       }
+      else if (JrtFileSystem.isModuleRoot(vFile)) {
+        symbolIcon = AllIcons.Nodes.JavaModuleRoot;
+      }
       else if (JavaDirectoryService.getInstance().getPackage(psiDirectory) != null) {
         symbolIcon = PlatformIcons.PACKAGE_ICON;
       }
@@ -76,4 +80,4 @@ public class JavaDirectoryIconProvider extends IconProvider implements DumbAware
 
     return null;
   }
-}
+}
\ No newline at end of file
diff --git a/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java b/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java
index c6a92794e332..2b1adee12615 100644
--- a/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java
+++ b/java/java-psi-impl/src/com/intellij/psi/presentation/java/JavaModulePresentationProvider.java
@@ -43,7 +43,7 @@ public class JavaModulePresentationProvider implements ItemPresentationProvider<
       @Nullable
       @Override
       public Icon getIcon(boolean unused) {
-        return AllIcons.FileTypes.Java;
+        return AllIcons.Nodes.JavaModule;
       }
     };
   }
diff --git a/platform/icons/src/nodes/javaModule.png b/platform/icons/src/nodes/javaModule.png
new file mode 100644
index 000000000000..8e4a624d7e71
Binary files /dev/null and b/platform/icons/src/nodes/javaModule.png differ
diff --git a/platform/icons/src/nodes/javaModule@2x.png b/platform/icons/src/nodes/javaModule@2x.png
new file mode 100644
index 000000000000..1a7a44424278
Binary files /dev/null and b/platform/icons/src/nodes/javaModule@2x.png differ
diff --git a/platform/icons/src/nodes/javaModuleRoot.png b/platform/icons/src/nodes/javaModuleRoot.png
new file mode 100644
index 000000000000..ed677bf3ce4d
Binary files /dev/null and b/platform/icons/src/nodes/javaModuleRoot.png differ
diff --git a/platform/icons/src/nodes/javaModuleRoot@2x.png b/platform/icons/src/nodes/javaModuleRoot@2x.png
new file mode 100644
index 000000000000..7e739fe7eb2f
Binary files /dev/null and b/platform/icons/src/nodes/javaModuleRoot@2x.png differ
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 250d32e54424..41392c167ef0 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -872,6 +872,8 @@ public class AllIcons {
     public static final Icon J2eeParameter = IconLoader.getIcon("/nodes/j2eeParameter.png"); // 16x16
     public static final Icon JarDirectory = IconLoader.getIcon("/nodes/jarDirectory.png"); // 16x16
     public static final Icon JavaDocFolder = IconLoader.getIcon("/nodes/javaDocFolder.png"); // 16x16
+    public static final Icon JavaModule = IconLoader.getIcon("/nodes/javaModule.png"); // 16x16
+    public static final Icon JavaModuleRoot = IconLoader.getIcon("/nodes/javaModuleRoot.png"); // 16x16
     
     public static class Jsf {
       public static final Icon Component = IconLoader.getIcon("/nodes/jsf/component.png"); // 16x16