diff --git a/platform/icons/src/general/hideDownPart.png b/platform/icons/src/general/hideDownPart.png
index 8f7f397f6edd..90a30c03a4d7 100644
Binary files a/platform/icons/src/general/hideDownPart.png and b/platform/icons/src/general/hideDownPart.png differ
diff --git a/platform/icons/src/general/hideLeftPart.png b/platform/icons/src/general/hideLeftPart.png
index f9710f1d1953..01e916ad7262 100644
Binary files a/platform/icons/src/general/hideLeftPart.png and b/platform/icons/src/general/hideLeftPart.png differ
diff --git a/platform/icons/src/general/hideRightPart.png b/platform/icons/src/general/hideRightPart.png
index d78c30f020b2..8b4ce8ec2df7 100644
Binary files a/platform/icons/src/general/hideRightPart.png and b/platform/icons/src/general/hideRightPart.png differ
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
index 4ce4648448d0..954c47cc958e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
@@ -123,27 +123,27 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable {
 
     eastPanel.add(Box.createHorizontalStrut(3));
 
-    myHideButton = new ActionButton(new HideSideAction() {
-      @Override
-      public void actionPerformed(AnActionEvent e) {
-        sideHidden();
-      }
-    }, new HideAction() {
+    myHideButton = new ActionButton(new HideAction() {
       @Override
       public void actionPerformed(AnActionEvent e) {
         hideToolWindow();
       }
+    }, new HideSideAction() {
+      @Override
+      public void actionPerformed(AnActionEvent e) {
+        sideHidden();
+      }
     },
                                     ourHideLeftSideIcon, null, null
     ) {
       @Override
       protected Icon getActiveIcon() {
-        return getHideIcon(myToolWindow);
+        return getHideToolWindowIcon(myToolWindow);
       }
 
       @Override
       protected Icon getAlternativeIcon() {
-        return getHideToolWindowIcon(myToolWindow);
+        return getHideIcon(myToolWindow);
       }
     };
 
@@ -455,6 +455,11 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable {
     if (shortcutForAction.length() > 0) {
       text += "  " + shortcutForAction;
     }
+
+    if (action instanceof HideAction) {
+      text += String.format(" (Click with %s to Hide Side)", KeymapUtil.getShortcutText(KeyboardShortcut.fromString("pressed ALT")));
+    } 
+     
     return text;
   }