diff --git a/platform/icons/src/general/autohideOffPressed.png b/platform/icons/src/general/autohideOffPressed.png
new file mode 100644
index 000000000000..a29d6ad6d663
Binary files /dev/null and b/platform/icons/src/general/autohideOffPressed.png differ
diff --git a/platform/icons/src/general/autohideOffPressed@2x.png b/platform/icons/src/general/autohideOffPressed@2x.png
new file mode 100644
index 000000000000..d300e20602f8
Binary files /dev/null and b/platform/icons/src/general/autohideOffPressed@2x.png differ
diff --git a/platform/icons/src/general/autohideOffPressed@2x_dark.png b/platform/icons/src/general/autohideOffPressed@2x_dark.png
new file mode 100644
index 000000000000..de4c6f48d2cd
Binary files /dev/null and b/platform/icons/src/general/autohideOffPressed@2x_dark.png differ
diff --git a/platform/icons/src/general/autohideOffPressed_dark.png b/platform/icons/src/general/autohideOffPressed_dark.png
new file mode 100644
index 000000000000..eb33ca170332
Binary files /dev/null and b/platform/icons/src/general/autohideOffPressed_dark.png differ
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
index 5add69ca8d76..b937ab865dc6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowType;
 import com.intellij.openapi.wm.WindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowEx;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
@@ -105,6 +106,8 @@ public abstract class DockablePopupManager<T extends JComponent & Disposable> {
 
     final Rectangle rectangle = WindowManager.getInstance().getIdeFrame(myProject).suggestChildFrameBounds();
     myToolWindow.setDefaultState(ToolWindowAnchor.RIGHT, ToolWindowType.FLOATING, rectangle);
+    
+    ((ToolWindowEx)myToolWindow).setTitleActions(createRestorePopupAction());
 
     final ContentManager contentManager = myToolWindow.getContentManager();
     final ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
@@ -152,12 +155,12 @@ public abstract class DockablePopupManager<T extends JComponent & Disposable> {
         restartAutoUpdate(state);
       }
     };
-    return new AnAction[]{toggleAutoUpdateAction, createRestorePopupAction()};
+    return new AnAction[]{toggleAutoUpdateAction};
   }
 
   @NotNull
   protected AnAction createRestorePopupAction() {
-    return new AnAction("Restore Popup", getRestorePopupDescription(), AllIcons.Actions.Cancel) {
+    return new AnAction("Restore Popup", getRestorePopupDescription(), AllIcons.General.AutohideOffPressed) {
       @Override
       public void actionPerformed(AnActionEvent e) {
         restorePopupBehavior();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
index f45bad48d7e5..b66fef3777eb 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
@@ -107,6 +107,8 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
   
   private ActionCallback myLastAction;
   private DocumentationComponent myTestDocumentationComponent;
+  
+  private AnAction myRestorePopupAction;
 
   @Override
   protected String getToolwindowId() {
@@ -136,10 +138,8 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
   @NotNull
   @Override
   protected AnAction createRestorePopupAction() {
-    AnAction restorePopupAction = super.createRestorePopupAction();
-    ShortcutSet quickDocShortcut = ActionManager.getInstance().getAction(IdeActions.ACTION_QUICK_JAVADOC).getShortcutSet();
-    restorePopupAction.registerCustomShortcutSet(quickDocShortcut, null);
-    return restorePopupAction;
+    myRestorePopupAction = super.createRestorePopupAction();
+    return myRestorePopupAction;
   }
 
   @Override
@@ -157,6 +157,12 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
 
     if (myToolWindow != null) {
       myToolWindow.getComponent().putClientProperty(ChooseByNameBase.TEMPORARILY_FOCUSABLE_COMPONENT_KEY, Boolean.TRUE);
+      
+      if (myRestorePopupAction != null) {
+        ShortcutSet quickDocShortcut = ActionManager.getInstance().getAction(IdeActions.ACTION_QUICK_JAVADOC).getShortcutSet();
+        myRestorePopupAction.registerCustomShortcutSet(quickDocShortcut, myToolWindow.getComponent());
+        myRestorePopupAction = null;
+      }
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index d3ba5823b815..5b205b28711e 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -266,7 +266,8 @@ public class AbstractPopup implements JBPopup {
 
       if (pinCallback != null) {
         myCaption.setButtonComponent(new InplaceButton(
-          new IconButton("Pin", AllIcons.General.AutohideOff, AllIcons.General.AutohideOff, AllIcons.General.AutohideOffInactive),
+          new IconButton("Open as Tool Window", 
+                         AllIcons.General.AutohideOff, AllIcons.General.AutohideOff, AllIcons.General.AutohideOffInactive),
           new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent e) {
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index e4206f28a18c..9c516d44b1a0 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -379,6 +379,7 @@ public class AllIcons {
     public static final Icon ArrowDown = IconLoader.getIcon("/general/arrowDown.png"); // 7x6
     public static final Icon AutohideOff = IconLoader.getIcon("/general/autohideOff.png"); // 14x14
     public static final Icon AutohideOffInactive = IconLoader.getIcon("/general/autohideOffInactive.png"); // 14x14
+    public static final Icon AutohideOffPressed = IconLoader.getIcon("/general/autohideOffPressed.png"); // 22x20
     public static final Icon AutoscrollFromSource = IconLoader.getIcon("/general/autoscrollFromSource.png"); // 16x16
     public static final Icon AutoscrollToSource = IconLoader.getIcon("/general/autoscrollToSource.png"); // 16x16
     public static final Icon Balloon = IconLoader.getIcon("/general/balloon.png"); // 16x16