diff --git a/imports/NeoChat/Dialog/CreateRoomDialog.qml b/imports/NeoChat/Dialog/CreateRoomDialog.qml
index aa9225cfb..b51b9d7cd 100644
--- a/imports/NeoChat/Dialog/CreateRoomDialog.qml
+++ b/imports/NeoChat/Dialog/CreateRoomDialog.qml
@@ -14,9 +14,7 @@ Kirigami.OverlaySheet {
 
     parent: applicationWindow().overlay
 
-    header: Kirigami.Heading {
-        text: i18n("Create a Room")
-    }
+    title: i18n("Create a Room")
 
     contentItem: Kirigami.FormLayout {
         TextField {
diff --git a/imports/NeoChat/Dialog/RoomSettingsDialog.qml b/imports/NeoChat/Dialog/RoomSettingsDialog.qml
index f1540fb2b..16dfc3a02 100644
--- a/imports/NeoChat/Dialog/RoomSettingsDialog.qml
+++ b/imports/NeoChat/Dialog/RoomSettingsDialog.qml
@@ -22,10 +22,7 @@ Kirigami.OverlaySheet {
     parent: applicationWindow().overlay
 
 
-    header: Kirigami.Heading {
-        text: i18nc("%1 is the room name", "Room Settings - %1", room.displayName)
-        elide: Text.ElideRight
-    }
+    title: i18nc("%1 is the room name", "Room Settings - %1", room.displayName)
 
     contentItem: ColumnLayout {
         RowLayout {
diff --git a/imports/NeoChat/Dialog/UserDetailDialog.qml b/imports/NeoChat/Dialog/UserDetailDialog.qml
index c09f1b416..289b8c937 100644
--- a/imports/NeoChat/Dialog/UserDetailDialog.qml
+++ b/imports/NeoChat/Dialog/UserDetailDialog.qml
@@ -27,13 +27,7 @@ Kirigami.OverlaySheet {
     rightPadding: 0
     topPadding: 0
 
-    header: Kirigami.Heading {
-        id: heading
-        text: i18nc("@title:menu Account detail dialog", "Account detail")
-        elide: Text.ElideRight
-        QQC2.ToolTip.visible: truncated && hovered
-        QQC2.ToolTip.text: text
-    }
+    title: i18nc("@title:menu Account detail dialog", "Account detail")
 
     contentItem: ColumnLayout {
         spacing: 0
diff --git a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
index 2277acfa6..efe7538f6 100644
--- a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
+++ b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
@@ -12,9 +12,7 @@ Kirigami.OverlaySheet {
 
     property string sourceText
 
-    header: Kirigami.Heading {
-        text: i18n("Message Source")
-    }
+    title: i18n("Message Source")
 
     TextArea {
         id: sourceTextArea
diff --git a/imports/NeoChat/Page/AccountsPage.qml b/imports/NeoChat/Page/AccountsPage.qml
index 37b28522b..6981cf644 100644
--- a/imports/NeoChat/Page/AccountsPage.qml
+++ b/imports/NeoChat/Page/AccountsPage.qml
@@ -133,9 +133,7 @@ Kirigami.Page {
 
         property var connection
 
-        header: Kirigami.Heading {
-            text: i18n("Edit Account")
-        }
+        title: i18n("Edit Account")
 
         Kirigami.FormLayout {
             RowLayout {
diff --git a/imports/NeoChat/Page/DevicesPage.qml b/imports/NeoChat/Page/DevicesPage.qml
index b7c64a81a..e70061c1e 100644
--- a/imports/NeoChat/Page/DevicesPage.qml
+++ b/imports/NeoChat/Page/DevicesPage.qml
@@ -82,9 +82,7 @@ Kirigami.Page {
 
         property var index
 
-        header: Kirigami.Heading {
-            text: i18n("Remove device")
-        }
+        title: i18n("Remove device")
         Kirigami.FormLayout {
             Controls.TextField {
                 id: passwordField
@@ -107,9 +105,7 @@ Kirigami.Page {
         property int index
         property string name
 
-        header: Kirigami.Heading {
-            text: i18n("Edit device")
-        }
+        title: i18n("Edit device")
         Kirigami.FormLayout {
             Controls.TextField {
                 id: nameField
diff --git a/qml/main.qml b/qml/main.qml
index 68bdc72ee..c85cf3dfb 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -361,9 +361,7 @@ Kirigami.ApplicationWindow {
 
         property string url: ""
 
-        header: Kirigami.Heading {
-            text: i18n("User consent")
-        }
+        title: i18n("User consent")
 
         QQC2.Label {
             id: label
@@ -402,9 +400,7 @@ Kirigami.ApplicationWindow {
             required property var user;
 
             parent: QQC2.ApplicationWindow.overlay
-            header: Kirigami.Heading {
-                text: i18n("Start a chat")
-            }
+            title: i18n("Start a chat")
             contentItem: QQC2.Label {
                 text: i18n("Do you want to start a chat with %1?", user.displayName)
                 wrapMode: Text.WordWrap