diff --git a/src/calibre/gui2/dialogs/tag_categories.ui b/src/calibre/gui2/dialogs/tag_categories.ui
index cf30cb8e5d..e06a0503c7 100644
--- a/src/calibre/gui2/dialogs/tag_categories.ui
+++ b/src/calibre/gui2/dialogs/tag_categories.ui
@@ -133,7 +133,7 @@
      <item>
       <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>Category &amp;filter: </string>
+        <string>&amp;Category filter: </string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -171,7 +171,7 @@
        <item>
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>A&amp;vailable items</string>
+          <string>&amp;Available items</string>
          </property>
          <property name="buddy">
           <cstring>available_items_box</cstring>
@@ -263,7 +263,7 @@
        <item>
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>A&amp;pplied items</string>
+          <string>Applied &amp;items</string>
          </property>
          <property name="buddy">
           <cstring>applied_items_box</cstring>
@@ -322,7 +322,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
+         <normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py
index 374de6f955..88f3ce0da4 100644
--- a/src/calibre/gui2/dialogs/tag_editor.py
+++ b/src/calibre/gui2/dialogs/tag_editor.py
@@ -70,9 +70,6 @@ class TagEditor(QDialog, Ui_TagEditor):
         self.add_tag_button.clicked.connect(self.add_tag)
         self.delete_button.clicked.connect(lambda: self.delete_tags())
         self.add_tag_input.returnPressed[()].connect(self.add_tag)
-        # add the handlers for the filter input clear buttons
-        for x in ('available', 'applied'):
-            getattr(self, '%s_filter_input_clear_btn' % x).clicked.connect(getattr(self, '%s_filter_input' % x).clear)
         # add the handlers for the filter input fields
         self.available_filter_input.textChanged.connect(self.filter_tags)
         self.applied_filter_input.textChanged.connect(partial(self.filter_tags, which='applied_tags'))
diff --git a/src/calibre/gui2/dialogs/tag_editor.ui b/src/calibre/gui2/dialogs/tag_editor.ui
index 932b363e99..512162ca35 100644
--- a/src/calibre/gui2/dialogs/tag_editor.ui
+++ b/src/calibre/gui2/dialogs/tag_editor.ui
@@ -97,19 +97,8 @@
          <property name="placeholderText">
           <string>Filter the available tags</string>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QToolButton" name="available_filter_input_clear_btn">
-         <property name="toolTip">
-          <string>Clear the available tags filter input field</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="icon">
-          <iconset resource="../../../../resources/images.qrc">
-           <normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -173,19 +162,8 @@
          <property name="placeholderText">
           <string>Filter the applied tags</string>
          </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QToolButton" name="applied_filter_input_clear_btn">
-         <property name="toolTip">
-          <string>Clear the applied tags filter input field</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="icon">
-          <iconset resource="../../../../resources/images.qrc">
-           <normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
+         <property name="clearButtonEnabled">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -222,7 +200,7 @@
          </property>
          <property name="icon">
           <iconset resource="../../../../resources/images.qrc">
-           <normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
+           <normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
          </property>
         </widget>
        </item>