diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 4d38904e05..21d8d48168 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -249,6 +249,7 @@ class SearchBar(QFrame):  # {{{
         x = parent.highlight_only_button = QToolButton(self)
         x.setAutoRaise(True)
         x.setText(_('Highlight'))
+        x.setCursor(Qt.PointingHandCursor)
         x.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
         x.setIcon(QIcon(I('arrow-down.png')))
         l.addWidget(x)
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 3cf8bf6544..f244677eb2 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -492,10 +492,13 @@ class SearchBoxMixin(object):  # {{{
         self.focus_to_library()
 
     def set_highlight_only_button_icon(self):
+        b = self.highlight_only_button
         if config['highlight_search_matches']:
-            self.highlight_only_button.setIcon(QIcon(I('highlight_only_on.png')))
+            b.setIcon(QIcon(I('highlight_only_on.png')))
+            b.setText(_('Filter'))
         else:
-            self.highlight_only_button.setIcon(QIcon(I('highlight_only_off.png')))
+            b.setIcon(QIcon(I('highlight_only_off.png')))
+            b.setText(_('Highlight'))
         self.highlight_only_button.setVisible(gprefs['show_highlight_toggle_button'])
         self.library_view.model().set_highlight_only(config['highlight_search_matches'])