diff --git a/discover/qml/ApplicationPage.qml b/discover/qml/ApplicationPage.qml
--- a/discover/qml/ApplicationPage.qml
+++ b/discover/qml/ApplicationPage.qml
@@ -87,15 +87,12 @@
     }
 
     header: QQC2.ToolBar {
-        anchors {
-            right: parent.right
-            left: parent.left
-        }
+        height: Kirigami.Units.gridUnit * 2.3
 
         contentItem: RowLayout {
             spacing: Kirigami.Units.smallSpacing
 
-            ToolButton {
+            Button {
                 Layout.leftMargin: Kirigami.Units.smallSpacing
                 iconName: "draw-arrow-back"
                 tooltip: i18n("Back")
@@ -105,17 +102,6 @@
             Item {
                 Layout.fillWidth: true
             }
-            Kirigami.Heading {
-                level: 3
-                Layout.maximumWidth: parent.width/2
-                text: appInfo.application.name
-                maximumLineCount: 1
-                elide: Text.ElideRight
-                horizontalAlignment: Text.AlignHCenter
-            }
-            Item {
-                Layout.fillWidth: true
-            }
 
             Binding {
                 target: appInfo.actions
diff --git a/discover/qml/ApplicationsListPage.qml b/discover/qml/ApplicationsListPage.qml
--- a/discover/qml/ApplicationsListPage.qml
+++ b/discover/qml/ApplicationsListPage.qml
@@ -25,7 +25,7 @@
 import "navigation.js" as Navigation
 import org.kde.discover.app 1.0
 import org.kde.discover 2.0
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
 
 DiscoverPage {
     id: page
@@ -42,12 +42,9 @@
     property alias isBusy: appsModel.isBusy
     property alias allBackends: appsModel.allBackends
     property alias count: apps.count
-    property alias listHeader: apps.header
-    property Component listHeaderExtra
     property bool compact: page.width < 500 || !applicationWindow().wideScreen
 
     property bool canNavigate: true
-    readonly property alias subcategories: appsModel.subcategories
     title: category ? category.name : ""
 
     onSearchChanged: {
@@ -60,6 +57,27 @@
         appsModel.invalidateFilter()
         refreshing = false
     }
+
+    header: QQC2.ToolBar {
+        bottomPadding: Kirigami.Units.largeSpacing
+        height: Kirigami.Units.gridUnit * 2.3
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        contentItem: RowLayout {
+            spacing: Kirigami.Units.smallSpacing
+
+            // Category name
+            Kirigami.Heading {
+                level: 1
+                text: title
+                maximumLineCount: 1
+                elide: Text.ElideRight
+                horizontalAlignment: Text.AlignHCenter
+                Layout.fillWidth: true
+            }
+        }
+    }
+
     ListView {
         id: apps
         section.delegate: QQC2.Label {
@@ -69,13 +87,6 @@
             }
         }
 
-        headerPositioning: ListView.OverlayHeader
-        header: CategoryDisplay {
-            id: header
-            category: appsModel.filteredCategory
-            search: appsModel.search
-            extra: page.listHeaderExtra
-        }
         model: ResourcesProxyModel {
             id: appsModel
             sortRole: ResourcesProxyModel.RatingCountRole
diff --git a/discover/qml/InstalledPage.qml b/discover/qml/InstalledPage.qml
--- a/discover/qml/InstalledPage.qml
+++ b/discover/qml/InstalledPage.qml
@@ -1,9 +1,9 @@
 import QtQuick 2.1
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.1 as QQC2
 import QtQuick.Layouts 1.1
 import org.kde.discover 2.0
 import org.kde.discover.app 1.0
-import org.kde.kirigami 2.1 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
 
 ApplicationsListPage {
     id: page
@@ -16,14 +16,18 @@
     compact: true
     canNavigate: false
 
-    listHeader: null
-    header: ToolBar {
-        Kirigami.Heading {
-            anchors {
-                right: parent.right
-                rightMargin: Kirigami.Units.largeSpacing
+    header: QQC2.ToolBar {
+        height: Kirigami.Units.gridUnit * 2.3
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        contentItem: RowLayout {
+            Kirigami.Heading {
+                text: page.title
+                maximumLineCount: 1
+                elide: Text.ElideRight
+                horizontalAlignment: Text.AlignHCenter
+                Layout.fillWidth: true
             }
-            text: page.title
         }
     }
 }
diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml
--- a/discover/qml/SourcesPage.qml
+++ b/discover/qml/SourcesPage.qml
@@ -22,19 +22,10 @@
     }
 
     header: QQC2.ToolBar {
+        height: Kirigami.Units.gridUnit * 2.3
         Kirigami.Theme.inherit: false
         Kirigami.Theme.colorSet: Kirigami.Theme.Window
-        anchors {
-            right: parent.right
-            left: parent.left
-        }
-
         contentItem: RowLayout {
-            anchors {
-                topMargin: Kirigami.Units.smallSpacing
-                bottomMargin: Kirigami.Units.smallSpacing
-            }
-
             Item {
                 Layout.fillWidth: true
             }
diff --git a/discover/qml/UpdatesPage.qml b/discover/qml/UpdatesPage.qml
--- a/discover/qml/UpdatesPage.qml
+++ b/discover/qml/UpdatesPage.qml
@@ -7,7 +7,7 @@
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kcoreaddons 1.0
 import "navigation.js" as Navigation
-import org.kde.kirigami 2.1 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
 
 DiscoverPage
 {
@@ -62,6 +62,9 @@
 
     header: QQC2.ToolBar {
         visible: (updateModel.totalUpdatesCount > 0 && resourcesUpdatesModel.isProgressing) || updateModel.hasUpdates
+        height: Kirigami.Units.gridUnit * 2.3
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
 
         RowLayout {
             anchors.fill: parent
@@ -146,7 +149,7 @@
         spacing: Kirigami.Units.smallSpacing
 
         delegate: Kirigami.AbstractListItem {
-            backgroundColor: Kirigami.Theme.viewBackgroundColor
+            backgroundColor: Kirigami.Theme.backgroundColor
             x: Kirigami.Units.gridUnit
             width: ListView.view.width - Kirigami.Units.gridUnit * 2
             highlighted: ListView.isCurrentItem