diff --git a/webenginepart/src/ui/searchbar.cpp b/webenginepart/src/ui/searchbar.cpp
index 7f74d40e0..14fe89bed 100644
--- a/webenginepart/src/ui/searchbar.cpp
+++ b/webenginepart/src/ui/searchbar.cpp
@@ -1,186 +1,190 @@
 /*
  * This file is part of the KDE project.
  *
  * Copyright (C) 2008 Laurent Montel <montel@kde.org>
  * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
  * Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
  * Copyright (C) 2009 Dawit Alemayehu <adawit @ kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "searchbar.h"
 
 #include <KLineEdit>
 #include <KColorScheme>
 #include <QIcon>
 #include <KLocalizedString>
 
 #include <QResizeEvent>
 
 
 SearchBar::SearchBar(QWidget *parent)
     :QWidget(parent)
 {
 
     // Get the widget that currently has the focus so we can properly
     // restore it when the filter bar is closed.
     QWidget* widgetWindow = (parent ? parent->window() : nullptr);
     m_focusWidget = (widgetWindow ? widgetWindow->focusWidget() : nullptr);
 
     // Initialize the user interface...
     m_ui.setupUi(this);
-    m_ui.optionsButton->addAction(m_ui.actionMatchCase);
-    m_ui.optionsButton->addAction(m_ui.actionHighlightMatch);
-    m_ui.optionsButton->addAction(m_ui.actionSearchAutomatically);
+    m_optionsMenu = new QMenu();
+    m_optionsMenu->addAction(m_ui.actionMatchCase);
+    m_optionsMenu->addAction(m_ui.actionHighlightMatch);
+    m_optionsMenu->addAction(m_ui.actionSearchAutomatically);
+    m_ui.optionsButton->setMenu(m_optionsMenu);
+    m_ui.searchComboBox->lineEdit()->setPlaceholderText(i18n("Find..."));
+    m_ui.searchComboBox->lineEdit()->setClearButtonEnabled(true);
 
     setFocusProxy(m_ui.searchComboBox);
     
     connect(m_ui.nextButton, SIGNAL(clicked()),
             this, SLOT(findNext()));
     connect(m_ui.previousButton, SIGNAL(clicked()),
             this, SLOT(findPrevious()));
     connect(m_ui.searchComboBox, SIGNAL(returnPressed()),
             this, SLOT(findNext()));
     connect(m_ui.searchComboBox, SIGNAL(editTextChanged(QString)),
             this, SLOT(textChanged(QString)));
 
     // Start off hidden by default...
     setVisible(false);
 }
 
 SearchBar::~SearchBar()
 {
     // NOTE: For some reason, if we do not clear the focus from the line edit
     // widget before we delete this object, it seems to cause a crash!!
     m_ui.searchComboBox->clearFocus();
 }
 
 void SearchBar::clear()
 {
     m_ui.searchComboBox->clear();
 }
 
 void SearchBar::setVisible (bool visible)
 {
     if (visible) {
         m_ui.searchComboBox->setFocus(Qt::ActiveWindowFocusReason);
         m_ui.searchComboBox->lineEdit()->selectAll();
     } else {
         m_ui.searchComboBox->setPalette(QPalette());
         emit searchTextChanged(QString());
     }
 
     QWidget::setVisible(visible);
 }
 
 QString SearchBar::searchText() const
 {
     return m_ui.searchComboBox->currentText();
 }
 
 bool SearchBar::caseSensitive() const
 {
     return m_ui.actionMatchCase->isChecked();
 }
 
 bool SearchBar::highlightMatches() const
 {
     return m_ui.actionHighlightMatch->isChecked();
 }
 
 void SearchBar::setSearchText(const QString& text)
 {
     show();
     m_ui.searchComboBox->setEditText(text);
 }
 
 void SearchBar::setFoundMatch(bool match)
 {
     //kDebug() << match;
     if (m_ui.searchComboBox->currentText().isEmpty()) {
         m_ui.searchComboBox->setPalette(QPalette());
         return;
     }
 
     KColorScheme::BackgroundRole role = (match ? KColorScheme::PositiveBackground : KColorScheme::NegativeBackground);
     QPalette newPal(m_ui.searchComboBox->palette());
     KColorScheme::adjustBackground(newPal, role);
     m_ui.searchComboBox->setPalette(newPal);
 }
 
 void SearchBar::findNext()
 {
     if (!isVisible())
         return;
 
     const QString text (m_ui.searchComboBox->currentText());
     if (m_ui.searchComboBox->findText(text) == -1) {
         m_ui.searchComboBox->addItem(text);
     }
 
     emit searchTextChanged(text);
 }
 
 void SearchBar::findPrevious()
 {
     if (!isVisible())
         return;
 
     const QString text (m_ui.searchComboBox->currentText());
     if (m_ui.searchComboBox->findText(text) == -1) {
         m_ui.searchComboBox->addItem(text);
     }
 
     emit searchTextChanged(m_ui.searchComboBox->currentText(), true);
 }
 
 void SearchBar::textChanged(const QString &text)
 {
     if (text.isEmpty()) {
         m_ui.searchComboBox->setPalette(QPalette());
         m_ui.nextButton->setEnabled(false);
         m_ui.previousButton->setEnabled(false);
     } else {
         m_ui.nextButton->setEnabled(true);
         m_ui.previousButton->setEnabled(true);
     }
 
     if (m_ui.actionSearchAutomatically->isChecked()) {
         emit searchTextChanged(m_ui.searchComboBox->currentText());
     }
 }
 
 bool SearchBar::event(QEvent* e)
 {
     // Close the bar when Escape is pressed. Note we cannot
     // assign Escape as a shortcut key because it would cause
     // a conflict with the Stop button.
     if (e->type() == QEvent::ShortcutOverride) {
         QKeyEvent* kev = static_cast<QKeyEvent*>(e);
         if (kev->key() == Qt::Key_Escape) {
             e->accept();
             close();
             if (m_focusWidget) {
                 m_focusWidget->setFocus();
                 m_focusWidget = nullptr;
             }
             return true;
         }
     }
     return QWidget::event(e);
 }
diff --git a/webenginepart/src/ui/searchbar.h b/webenginepart/src/ui/searchbar.h
index 4dc9e4ec3..cc6ea5474 100644
--- a/webenginepart/src/ui/searchbar.h
+++ b/webenginepart/src/ui/searchbar.h
@@ -1,68 +1,70 @@
 /*
  * This file is part of the KDE project.
  *
  * Copyright (C) 2008 Laurent Montel <montel@kde.org>
  * Copyright 2008 Benjamin C. Meyer <ben@meyerhome.net>
  * Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
  * Copyright (C) 2009 Dawit Alemayehu <adawit @ kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SEARCHBAR_P_H
 #define SEARCHBAR_P_H
 
 #include <QWidget>
+#include <QMenu>
 
 #include "ui_searchbar.h"
 
 class QEvent;
 
 /**
  * This is the widget that shows up when the search is initiated.
  */
 class SearchBar : public QWidget
 {
     Q_OBJECT
 
 public:
     SearchBar(QWidget *parent = nullptr);
     ~SearchBar() override;
 
     QString searchText() const;
     bool caseSensitive() const;
     bool highlightMatches() const;
     void setFoundMatch(bool match);
     void setSearchText(const QString&);
 
     bool event(QEvent* e) override;
 
 public Q_SLOTS:
     void setVisible(bool visible) override;
     void clear();
     void findNext();
     void findPrevious();
     void textChanged(const QString&);
 
 Q_SIGNALS:
     void searchTextChanged(const QString& text, bool backward = false);
 
 private:
     Ui::SearchBar m_ui;
     QPointer<QWidget> m_focusWidget;
+    QMenu *m_optionsMenu;
 };
 
 #endif // SEARCHBAR_P_H
diff --git a/webenginepart/src/ui/searchbar.ui b/webenginepart/src/ui/searchbar.ui
index 7379fcf54..ef194b991 100644
--- a/webenginepart/src/ui/searchbar.ui
+++ b/webenginepart/src/ui/searchbar.ui
@@ -1,183 +1,173 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SearchBar</class>
  <widget class="QWidget" name="SearchBar">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>564</width>
     <height>34</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <widget class="QToolButton" name="closeButton">
      <property name="toolTip">
       <string>Close the search bar</string>
      </property>
      <property name="icon">
       <iconset theme="dialog-close"/>
      </property>
      <property name="autoRaise">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QLabel" name="searchInfo">
-     <property name="text">
-      <string comment="label for input line to find text">&amp;Find:</string>
-     </property>
-     <property name="buddy">
-      <cstring>searchComboBox</cstring>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="KHistoryComboBox" name="searchComboBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>10</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QToolButton" name="nextButton">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Find the next match for the current search phrase</string>
      </property>
      <property name="text">
       <string>&amp;Next</string>
      </property>
      <property name="icon">
       <iconset theme="go-down-search"/>
      </property>
      <property name="toolButtonStyle">
       <enum>Qt::ToolButtonTextBesideIcon</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QToolButton" name="previousButton">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Find the previous match for the current search phrase</string>
      </property>
      <property name="text">
       <string>&amp;Previous</string>
      </property>
      <property name="icon">
       <iconset theme="go-up-search"/>
      </property>
      <property name="toolButtonStyle">
       <enum>Qt::ToolButtonTextBesideIcon</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QToolButton" name="optionsButton">
+    <widget class="QPushButton" name="optionsButton">
      <property name="toolTip">
       <string>Find the previous match for the current search phrase</string>
      </property>
      <property name="text">
       <string>&amp;Options</string>
      </property>
-     <property name="popupMode">
-      <enum>QToolButton::InstantPopup</enum>
+     <property name="icon">
+      <iconset theme="settings-configure" />
      </property>
     </widget>
    </item>
    <item>
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
   <action name="actionMatchCase">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>&amp;Match Case</string>
    </property>
   </action>
   <action name="actionSearchAutomatically">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>&amp;Search As You Type</string>
    </property>
   </action>
   <action name="actionHighlightMatch">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>&amp;Highlight All Matches</string>
    </property>
    <property name="toolTip">
     <string>Highlight Matches</string>
    </property>
   </action>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KHistoryComboBox</class>
    <extends>KComboBox</extends>
    <header>khistorycombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>closeButton</sender>
    <signal>clicked()</signal>
    <receiver>SearchBar</receiver>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>16</x>
      <y>16</y>
     </hint>
     <hint type="destinationlabel">
      <x>290</x>
      <y>16</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>