diff --git a/src/qml/ImageEditorPage.qml b/src/qml/ImageEditorPage.qml
index 25493c8a5..af8b623df 100644
--- a/src/qml/ImageEditorPage.qml
+++ b/src/qml/ImageEditorPage.qml
@@ -7,7 +7,6 @@ import QtQuick.Layouts
 import QtCore as Core
 
 import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kquickimageeditor as KQuickImageEditor
 
 Kirigami.Page {
@@ -168,10 +167,11 @@ Kirigami.Page {
         }
     }
 
-    footer: KirigamiComponents.Banner {
+    footer: Kirigami.InlineMessage {
         id: msg
         type: Kirigami.MessageType.Error
         showCloseButton: true
         visible: false
+        position: Kirigami.InlineMessage.Position.Header
     }
 }
diff --git a/src/qml/RoomPage.qml b/src/qml/RoomPage.qml
index 4529697ff..8a7f4b955 100644
--- a/src/qml/RoomPage.qml
+++ b/src/qml/RoomPage.qml
@@ -7,7 +7,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import QtQuick.Window
 
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
@@ -99,11 +98,12 @@ Kirigami.Page {
         }
     }
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
 
         showCloseButton: true
         visible: false
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     Loader {
diff --git a/src/qml/UnlockSSSSDialog.qml b/src/qml/UnlockSSSSDialog.qml
index b9be89acc..19b5949fe 100644
--- a/src/qml/UnlockSSSSDialog.qml
+++ b/src/qml/UnlockSSSSDialog.qml
@@ -7,7 +7,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 
@@ -20,11 +19,12 @@ FormCard.FormCardPage {
     leftPadding: 0
     rightPadding: 0
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
         showCloseButton: true
         visible: false
         type: Kirigami.MessageType.Error
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     property SSSSHandler ssssHandler: SSSSHandler {
diff --git a/src/settings/ExportKeysDialog.qml b/src/settings/ExportKeysDialog.qml
index 4c9f442e5..3f3252385 100644
--- a/src/settings/ExportKeysDialog.qml
+++ b/src/settings/ExportKeysDialog.qml
@@ -8,7 +8,6 @@ import QtQuick.Dialogs
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 
@@ -19,11 +18,12 @@ FormCard.FormCardPage {
 
     required property NeoChatConnection connection
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
         showCloseButton: true
         visible: false
         type: Kirigami.MessageType.Error
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     FormCard.FormCard {
diff --git a/src/settings/ImportKeysDialog.qml b/src/settings/ImportKeysDialog.qml
index 9d08fdf94..e66f3d592 100644
--- a/src/settings/ImportKeysDialog.qml
+++ b/src/settings/ImportKeysDialog.qml
@@ -8,7 +8,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 
@@ -21,11 +20,12 @@ FormCard.FormCardPage {
 
     title: i18nc("@title", "Import Keys")
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
         showCloseButton: true
         visible: false
         type: Kirigami.MessageType.Error
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     FormCard.FormCard {
diff --git a/src/settings/NeoChatSecurityPage.qml b/src/settings/NeoChatSecurityPage.qml
index dc756166e..6d3390335 100644
--- a/src/settings/NeoChatSecurityPage.qml
+++ b/src/settings/NeoChatSecurityPage.qml
@@ -7,7 +7,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 
@@ -18,11 +17,12 @@ FormCard.FormCardPage {
 
     title: i18nc("@title", "Security & Safety")
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
         showCloseButton: true
         visible: false
         type: Kirigami.MessageType.Error
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     FormCard.FormCard {