diff --git a/platform/icons/src/general/toolWindowProject.png b/platform/icons/src/general/toolWindowProject.png
index 737ce651b468..29ac4e382631 100644
Binary files a/platform/icons/src/general/toolWindowProject.png and b/platform/icons/src/general/toolWindowProject.png differ
diff --git a/platform/icons/src/javaee/webToolWindow.png b/platform/icons/src/javaee/webToolWindow.png
new file mode 100644
index 000000000000..680b6f3e35f8
Binary files /dev/null and b/platform/icons/src/javaee/webToolWindow.png differ
diff --git a/plugins/gradle/resources/icons/toolWindowGradle.png b/plugins/gradle/resources/icons/toolWindowGradle.png
new file mode 100644
index 000000000000..2c40a20ef890
Binary files /dev/null and b/plugins/gradle/resources/icons/toolWindowGradle.png differ
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 46b953b6956c..e3590b928323 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -67,7 +67,7 @@
     <projectService serviceImplementation="org.jetbrains.plugins.gradle.config.GradleSettings"/>
     <projectService serviceImplementation="org.jetbrains.plugins.gradle.config.GradleProjectState"/>
 
-    <toolWindow id="JetGradle" anchor="right" icon="/icons/gradle.png"
+    <toolWindow id="JetGradle" anchor="right" icon="/icons/toolWindowGradle.png"
                 factoryClass="org.jetbrains.plugins.gradle.ui.GradleToolWindowFactory"/>
   </extensions>
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
index 468acc4b1d2c..89e29b0c1f09 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
@@ -25,10 +25,7 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
@@ -43,7 +40,6 @@ import org.jetbrains.idea.maven.project.*;
 import org.jetbrains.idea.maven.server.NativeMavenProjectHolder;
 import org.jetbrains.idea.maven.tasks.MavenShortcutsManager;
 import org.jetbrains.idea.maven.tasks.MavenTasksManager;
-import org.jetbrains.idea.maven.utils.MavenIcons;
 import org.jetbrains.idea.maven.utils.MavenLog;
 import org.jetbrains.idea.maven.utils.MavenSimpleProjectComponent;
 import org.jetbrains.idea.maven.utils.MavenUtil;
@@ -216,7 +212,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen
 
     final ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(myProject);
     myToolWindow = manager.registerToolWindow(TOOL_WINDOW_ID, panel, ToolWindowAnchor.RIGHT, myProject, true);
-    myToolWindow.setIcon(MavenIcons.MAVEN_ICON);
+    myToolWindow.setIcon(IconLoader.getIcon("/images/toolWindowMaven.png"));
 
     final ToolWindowManagerAdapter listener = new ToolWindowManagerAdapter() {
       boolean wasVisible = false;
diff --git a/plugins/maven/src/main/resources/images/toolWindowMaven.png b/plugins/maven/src/main/resources/images/toolWindowMaven.png
new file mode 100644
index 000000000000..11e2b716e178
Binary files /dev/null and b/plugins/maven/src/main/resources/images/toolWindowMaven.png differ