diff --git a/README.md b/README.md
index 903c2186..bb5c378e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 
 ### Desktop demos
 
-![Desktop overview](screenshots/quick_DesktopDemo.webm)
-![Docked mode](screenshots/quick_DesktopDemo_docked.webm)
-![Tiling](screenshots/quick_DesktopDemo_tiling.webm)
+<video src="screenshots/quick_DesktopDemo.webm" controls width="600" alt="Desktop overview"></video>
+<video src="screenshots/quick_DesktopDemo_docked.webm" controls width="600" alt="Docked mode"></video>
+<video src="screenshots/quick_DesktopDemo_tiling.webm" controls width="600" alt="Tiling"></video>
 
 Shift is a fork of [plasma-mobile](https://invent.kde.org/plasma/plasma-mobile).
 The upstream phone UI is untouched; convergence adds a layer on top.
diff --git a/containments/homescreens/folio/qml/CategoryPanel.qml b/containments/homescreens/folio/qml/CategoryPanel.qml
index c90f517f..29d05097 100644
--- a/containments/homescreens/folio/qml/CategoryPanel.qml
+++ b/containments/homescreens/folio/qml/CategoryPanel.qml
@@ -191,6 +191,7 @@ Rectangle {
 
                         Accessible.role: Accessible.Button
                         Accessible.name: tile.catName
+                        Accessible.onPressAction: root.categorySelected(tile.catId)
 
                         Rectangle {
                             anchors.fill: parent
diff --git a/containments/homescreens/folio/qml/FavouritesBar.qml b/containments/homescreens/folio/qml/FavouritesBar.qml
index 652d43de..08294918 100644
--- a/containments/homescreens/folio/qml/FavouritesBar.qml
+++ b/containments/homescreens/folio/qml/FavouritesBar.qml
@@ -916,7 +916,7 @@ MouseArea {
                 Repeater {
                     model: {
                         var ids = taskDelegate.model.WinIdList
-                        return ids ? ids.length : 1
+                        return Math.max(1, ids ? ids.length : 0)
                     }
 
                     Rectangle {
diff --git a/containments/taskpanel/qml/NavigationPanelComponent.qml b/containments/taskpanel/qml/NavigationPanelComponent.qml
index 250ff76c..f9898bfe 100644
--- a/containments/taskpanel/qml/NavigationPanelComponent.qml
+++ b/containments/taskpanel/qml/NavigationPanelComponent.qml
@@ -37,11 +37,6 @@ MobileShell.NavigationPanel {
     foregroundColorGroup: forcedComplementary ? Kirigami.Theme.Complementary : Kirigami.Theme.Window
     shadow: forcedComplementary
 
-    // Convergence mode: expose running-app task strip
-    convergenceMode: ShellSettings.Settings.convergenceModeEnabled
-    taskModel: tasksModel
-    virtualDesktopInfo: virtualDesktopInfo
-
     MobileShellState.PanelSettingsDBusClient {
         id: panelSettings
         screenName: Screen.name