diff --git a/src/widgets/filterwidget.ui b/src/widgets/filterwidget.ui
index 77156816..f3626375 100644
--- a/src/widgets/filterwidget.ui
+++ b/src/widgets/filterwidget.ui
@@ -1,133 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FilterWidget</class>
  <widget class="QWidget" name="FilterWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLineEdit" name="filterEdit">
        <property name="placeholderText">
         <string>Filter...</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="extensionButton">
        <property name="text">
         <string/>
        </property>
        <property name="icon">
         <iconset theme="arrow-down-double"/>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QWidget" name="extension" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <property name="leftMargin">
        <number>0</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QComboBox" name="sortTypeCombo"/>
       </item>
       <item>
        <widget class="QToolButton" name="ascendingButton">
+        <property name="toolTip">
+         <string>Sort in ascending order</string>
+        </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset theme="arrow-up"/>
         </property>
         <property name="checkable">
          <bool>true</bool>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
         <attribute name="buttonGroup">
          <string notr="true">sortOrderGroup</string>
         </attribute>
        </widget>
       </item>
       <item>
        <widget class="QToolButton" name="descendingButton">
+        <property name="toolTip">
+         <string>Sort in descending order</string>
+        </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset theme="arrow-down"/>
         </property>
         <property name="checkable">
          <bool>true</bool>
         </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
         <attribute name="buttonGroup">
          <string notr="true">sortOrderGroup</string>
         </attribute>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
    <sender>extensionButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>extension</receiver>
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>381</x>
      <y>82</y>
     </hint>
     <hint type="destinationlabel">
      <x>375</x>
      <y>165</y>
     </hint>
    </hints>
   </connection>
  </connections>
  <buttongroups>
   <buttongroup name="sortOrderGroup"/>
  </buttongroups>
 </ui>
diff --git a/tests/units/widgets/filterwidgettest.cpp b/tests/units/widgets/filterwidgettest.cpp
index b198c307..baefec35 100644
--- a/tests/units/widgets/filterwidgettest.cpp
+++ b/tests/units/widgets/filterwidgettest.cpp
@@ -1,181 +1,184 @@
 /* This file is part of Zanshin
 
    Copyright 2014 Kevin Ottens <ervin@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of
    the License or (at your option) version 3 or any later version
    accepted by the membership of KDE e.V. (or its successor approved
    by the membership of KDE e.V.), which shall act as a proxy
    defined in Section 14 of version 3 of the license.
 
    This program 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 General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.
 */
 
 #include <testlib/qtest_gui_zanshin.h>
 
-#include <QAbstractButton>
 #include <QComboBox>
 #include <QLineEdit>
+#include <QToolButton>
 
 #include "widgets/filterwidget.h"
 
 #include "presentation/artifactfilterproxymodel.h"
 
 class FilterWidgetTest : public QObject
 {
     Q_OBJECT
 private slots:
     void shouldHaveDefaultState()
     {
         Widgets::FilterWidget filter;
 
         QVERIFY(filter.proxyModel());
         QVERIFY(!filter.proxyModel()->sourceModel());
         QCOMPARE(filter.proxyModel()->filterRegExp(), QRegExp());
         QCOMPARE(filter.proxyModel()->sortOrder(), Qt::AscendingOrder);
         QCOMPARE(filter.proxyModel()->sortType(), Presentation::ArtifactFilterProxyModel::TitleSort);
 
         QLineEdit *filterEdit = filter.findChild<QLineEdit*>(QStringLiteral("filterEdit"));
         QVERIFY(filterEdit);
         QVERIFY(filterEdit->isVisibleTo(&filter));
         QVERIFY(filterEdit->text().isEmpty());
         QCOMPARE(filterEdit->placeholderText(), tr("Filter..."));
 
-        QAbstractButton *extensionButton = filter.findChild<QAbstractButton*>(QStringLiteral("extensionButton"));
+        auto extensionButton = filter.findChild<QToolButton*>(QStringLiteral("extensionButton"));
         QVERIFY(extensionButton);
         QVERIFY(extensionButton->isVisibleTo(&filter));
         QVERIFY(!extensionButton->isChecked());
         QCOMPARE(extensionButton->icon(), QIcon::fromTheme(QStringLiteral("arrow-down-double")));
+        QVERIFY(extensionButton->autoRaise());
 
         QComboBox *sortTypeCombo = filter.findChild<QComboBox*>(QStringLiteral("sortTypeCombo"));
         QVERIFY(sortTypeCombo);
         QVERIFY(!sortTypeCombo->isVisibleTo(&filter));
         QCOMPARE(sortTypeCombo->currentIndex(), 0);
 
-        QAbstractButton *ascendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("ascendingButton"));
+        auto ascendingButton = filter.findChild<QToolButton*>(QStringLiteral("ascendingButton"));
         QVERIFY(ascendingButton);
         QVERIFY(!ascendingButton->isVisibleTo(&filter));
         QVERIFY(ascendingButton->isChecked());
         QCOMPARE(ascendingButton->icon(), QIcon::fromTheme(QStringLiteral("arrow-up")));
+        QVERIFY(ascendingButton->autoRaise());
 
-        QAbstractButton *descendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("descendingButton"));
+        auto descendingButton = filter.findChild<QToolButton*>(QStringLiteral("descendingButton"));
         QVERIFY(descendingButton);
         QVERIFY(!descendingButton->isVisibleTo(&filter));
         QVERIFY(!descendingButton->isChecked());
         QCOMPARE(descendingButton->icon(), QIcon::fromTheme(QStringLiteral("arrow-down")));
+        QVERIFY(descendingButton->autoRaise());
     }
 
     void shouldChangeAppliedFilter()
     {
         // GIVEN
         Widgets::FilterWidget filter;
 
         QLineEdit *filterEdit = filter.findChild<QLineEdit*>(QStringLiteral("filterEdit"));
         QVERIFY(filterEdit);
 
         // WHEN
         QTest::keyClicks(filterEdit, QStringLiteral("find me"));
 
         // THEN
         QCOMPARE(filter.proxyModel()->filterRegExp().pattern(), QStringLiteral("find me"));
     }
 
     void shouldShowExtension()
     {
         // GIVEN
         Widgets::FilterWidget filter;
 
         QAbstractButton *extensionButton = filter.findChild<QAbstractButton*>(QStringLiteral("extensionButton"));
         QVERIFY(extensionButton);
 
         QComboBox *sortTypeCombo = filter.findChild<QComboBox*>(QStringLiteral("sortTypeCombo"));
         QVERIFY(sortTypeCombo);
 
         QAbstractButton *ascendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("ascendingButton"));
         QVERIFY(ascendingButton);
 
         QAbstractButton *descendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("descendingButton"));
         QVERIFY(descendingButton);
 
         // WHEN
         extensionButton->click();
 
         // THEN
         QVERIFY(extensionButton->isChecked());
         QVERIFY(sortTypeCombo->isVisibleTo(&filter));
         QVERIFY(descendingButton->isVisibleTo(&filter));
         QVERIFY(descendingButton->isVisibleTo(&filter));
 
         // WHEN
         extensionButton->click();
 
         // THEN
         QVERIFY(!extensionButton->isChecked());
         QVERIFY(!sortTypeCombo->isVisibleTo(&filter));
         QVERIFY(!descendingButton->isVisibleTo(&filter));
         QVERIFY(!descendingButton->isVisibleTo(&filter));
     }
 
     void shouldChangeSortType()
     {
         // GIVEN
         Widgets::FilterWidget filter;
 
         QComboBox *sortTypeCombo = filter.findChild<QComboBox*>(QStringLiteral("sortTypeCombo"));
         QVERIFY(sortTypeCombo);
 
         // WHEN
         sortTypeCombo->setCurrentIndex(1);
 
         // THEN
         QCOMPARE(filter.proxyModel()->sortType(), Presentation::ArtifactFilterProxyModel::DateSort);
 
         // WHEN
         sortTypeCombo->setCurrentIndex(0);
 
         // THEN
         QCOMPARE(filter.proxyModel()->sortType(), Presentation::ArtifactFilterProxyModel::TitleSort);
     }
 
     void shouldChangeSortOrder()
     {
         // GIVEN
         Widgets::FilterWidget filter;
 
         QAbstractButton *ascendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("ascendingButton"));
         QVERIFY(ascendingButton);
 
         QAbstractButton *descendingButton = filter.findChild<QAbstractButton*>(QStringLiteral("descendingButton"));
         QVERIFY(descendingButton);
 
         // WHEN
         descendingButton->click();
 
         // THEN
         QVERIFY(!ascendingButton->isChecked());
         QVERIFY(descendingButton->isChecked());
         QCOMPARE(filter.proxyModel()->sortOrder(), Qt::DescendingOrder);
 
         // WHEN
         ascendingButton->click();
 
         // THEN
         QVERIFY(ascendingButton->isChecked());
         QVERIFY(!descendingButton->isChecked());
         QCOMPARE(filter.proxyModel()->sortOrder(), Qt::AscendingOrder);
     }
 };
 
 ZANSHIN_TEST_MAIN(FilterWidgetTest)
 
 #include "filterwidgettest.moc"