diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
index c1970fba10c1..e4926dd648a9 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
@@ -87,6 +87,7 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple
   private static final @NonNls String INPLACE_HISTORY = "JTextField.Search.InplaceHistory";
   private static final @NonNls String ON_CLEAR = "JTextField.Search.CancelAction";
   private static final @NonNls String SEARCH_ICON = "JTextField.Search.Icon";
+  private static final @NonNls String SEARCH_ICON_TOOLTIP = "JTextField.Search.IconTooltip";
   private static final @NonNls String HISTORY_POPUP_ENABLED = "History.Popup.Enabled";
 
   private static final @NonNls String SEARCH_VARIANT_VALUE = "search";
@@ -784,6 +785,10 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple
 
     @Override
     public String getTooltip() {
+      Object customTooltip = getComponent().getClientProperty(SEARCH_ICON_TOOLTIP);
+      if (customTooltip instanceof @NlsContexts.Tooltip String tooltip) {
+        return tooltip;
+      }
       String prefix = null;
       if (ClientProperty.get(getComponent(), INPLACE_HISTORY) != null) {
         prefix = IdeBundle.message("tooltip.recent.search");
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt
index 50fcf531e21f..1b68a7712781 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt
@@ -12,7 +12,6 @@ import com.intellij.ide.actions.ContextHelpAction
 import com.intellij.ide.actions.ToggleToolbarAction
 import com.intellij.ide.actions.ToolWindowMoveAction
 import com.intellij.ide.actions.ToolwindowFusEventFields
-import com.intellij.ide.actions.speedSearch.SpeedSearchAction
 import com.intellij.ide.impl.ContentManagerWatcher
 import com.intellij.ide.ui.UISettings
 import com.intellij.ide.util.PropertiesComponent
@@ -870,7 +869,6 @@ private val LOG = logger<ToolWindowManagerImpl>()
         group.addSeparator()
       }
       group.addAction(ActionManager.getInstance().getAction("MoveToolWindowTabToEditorAction"))
-      group.add(ActionManager.getInstance().getAction(SpeedSearchAction.ID))
       group.addSeparator()
       contentManager.valueIfInitialized?.let {
         group.add(TabbedContentAction.CloseAllAction(it))