diff --git a/src/qml/Settings/GeneralSettingsPage.qml b/src/qml/Settings/GeneralSettingsPage.qml
index 3256b7126..99fab3fb9 100644
--- a/src/qml/Settings/GeneralSettingsPage.qml
+++ b/src/qml/Settings/GeneralSettingsPage.qml
@@ -6,231 +6,199 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 
 import org.kde.neochat 1.0
 
-Kirigami.ScrollablePage {
+FormCard.FormCardPage {
     title: i18nc("@title:window", "General")
-    topPadding: 0
-    leftPadding: 0
-    rightPadding: 0
-    ColumnLayout {
-        spacing: 0
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
-            title: i18n("General settings")
+
+    FormCard.FormHeader {
+        title: i18n("General settings")
+        visible: Qt.platform.os !== "android"
+    }
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
+            id: closeDelegate
+            text: i18n("Show in System Tray")
+            checked: Config.systemTray
+            visible: Controller.supportSystemTray
+            enabled: !Config.isSystemTrayImmutable
+            onToggled: {
+                Config.systemTray = checked
+                Config.save()
+            }
+        }
+
+        FormCard.FormDelegateSeparator { above: closeDelegate; below: minimizeDelegate }
+
+        FormCard.FormCheckDelegate {
+            id: minimizeDelegate
+            text: i18n("Minimize to system tray on startup")
+            checked: Config.minimizeToSystemTrayOnStartup
+            visible: Controller.supportSystemTray && !Kirigami.Settings.isMobile
+            enabled: Config.systemTray && !Config.isMinimizeToSystemTrayOnStartupImmutable
+            onToggled: {
+                Config.minimizeToSystemTrayOnStartup = checked
+                Config.save()
+            }
+        }
+
+        FormCard.FormDelegateSeparator { above: minimizeDelegate; below: automaticallyDelegate }
+
+        FormCard.FormCheckDelegate {
+            id: automaticallyDelegate
+            text: i18n("Automatically hide/unhide the room information when resizing the window")
+            checked: Config.autoRoomInfoDrawer
+            enabled: !Config.isAutoRoomInfoDrawerImmutable
             visible: Qt.platform.os !== "android"
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-
-                MobileForm.FormCheckDelegate {
-                    id: closeDelegate
-                    text: i18n("Show in System Tray")
-                    checked: Config.systemTray
-                    visible: Controller.supportSystemTray
-                    enabled: !Config.isSystemTrayImmutable
-                    onToggled: {
-                        Config.systemTray = checked
-                        Config.save()
-                    }
-                }
-
-                MobileForm.FormDelegateSeparator { above: closeDelegate; below: minimizeDelegate }
-
-                MobileForm.FormCheckDelegate {
-                    id: minimizeDelegate
-                    text: i18n("Minimize to system tray on startup")
-                    checked: Config.minimizeToSystemTrayOnStartup
-                    visible: Controller.supportSystemTray && !Kirigami.Settings.isMobile
-                    enabled: Config.systemTray && !Config.isMinimizeToSystemTrayOnStartupImmutable
-                    onToggled: {
-                        Config.minimizeToSystemTrayOnStartup = checked
-                        Config.save()
-                    }
-                }
-
-                MobileForm.FormDelegateSeparator { above: minimizeDelegate; below: automaticallyDelegate }
-
-                MobileForm.FormCheckDelegate {
-                    id: automaticallyDelegate
-                    text: i18n("Automatically hide/unhide the room information when resizing the window")
-                    checked: Config.autoRoomInfoDrawer
-                    enabled: !Config.isAutoRoomInfoDrawerImmutable
-                    visible: Qt.platform.os !== "android"
-                    onToggled: {
-                        Config.autoRoomInfoDrawer = checked
-                        Config.save()
-                    }
-                }
+            onToggled: {
+                Config.autoRoomInfoDrawer = checked
+                Config.save()
             }
         }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
-            title: i18n("Timeline Events")
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-
-                MobileForm.FormCheckDelegate {
-                    id: showDeletedMessages
-                    text: i18n("Show deleted messages")
-                    checked: Config.showDeletedMessages
-                    enabled: !Config.isShowDeletedMessagesImmutable
-                    onToggled: {
-                        Config.showDeletedMessages = checked
-                        Config.save()
-                    }
-                }
-
-                MobileForm.FormDelegateSeparator { above: showDeletedMessages; below: showStateEvents }
-
-                MobileForm.FormCheckDelegate {
-                    id: showStateEvents
-                    text: i18n("Show state events")
-                    checked: Config.showStateEvent
-                    enabled: !Config.isShowStateEventImmutable
-                    onToggled: {
-                        Config.showStateEvent = checked
-                        Config.save()
-                    }
-                }
-
-                MobileForm.FormDelegateSeparator {
-                    visible: Config.showStateEvent
-                    above: showStateEvents
-                    below: showLeaveJoinEventDelegate }
-
-                MobileForm.FormCheckDelegate {
-                    id: showLeaveJoinEventDelegate
-                    visible: Config.showStateEvent
-                    text: i18n("Show leave and join events")
-                    checked: Config.showLeaveJoinEvent
-                    enabled: !Config.isShowLeaveJoinEventImmutable
-                    onToggled: {
-                        Config.showLeaveJoinEvent = checked
-                        Config.save()
-                    }
-                }
-
-                MobileForm.FormDelegateSeparator {
-                    visible: Config.showStateEvent
-                    above: showLeaveJoinEventDelegate
-                    below: showNameDelegate
-                }
-
-                MobileForm.FormCheckDelegate {
-                    id: showNameDelegate
-                    visible: Config.showStateEvent
-                    text: i18n("Show name change events")
-                    checked: Config.showRename
-                    enabled: !Config.isShowRenameImmutable
-                    onToggled: {
-                        Config.showRename = checked
-                        Config.save()
-                    }
-                }
-
-                MobileForm.FormDelegateSeparator {
-                    visible: Config.showStateEvent
-                    above: showNameDelegate
-                    below: showAvatarChangeDelegate
-                }
-
-                MobileForm.FormCheckDelegate {
-                    id: showAvatarChangeDelegate
-                    visible: Config.showStateEvent
-                    text: i18n("Show avatar update events")
-                    checked: Config.showAvatarUpdate
-                    enabled: !Config.isShowAvatarUpdateImmutable
-                    onToggled: {
-                        Config.showAvatarUpdate = checked
-                        Config.save()
-                    }
-                }
+    }
+    FormCard.FormHeader {
+        title: i18n("Timeline Events")
+    }
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
+            id: showDeletedMessages
+            text: i18n("Show deleted messages")
+            checked: Config.showDeletedMessages
+            enabled: !Config.isShowDeletedMessagesImmutable
+            onToggled: {
+                Config.showDeletedMessages = checked
+                Config.save()
             }
         }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
-            title: i18n("Rooms and private chats")
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormRadioDelegate {
-                    text: i18n("Separated")
-                    checked: !Config.mergeRoomList
-                    enabled: !Config.isMergeRoomListImmutable
-                    onToggled: {
-                        Config.mergeRoomList = false
-                        Config.save()
-                    }
-                }
-                MobileForm.FormRadioDelegate {
-                    text: i18n("Intermixed")
-                    checked: Config.mergeRoomList
-                    enabled: !Config.isMergeRoomListImmutable
-                    onToggled: {
-                        Config.mergeRoomList = true
-                        Config.save()
-                    }
-                }
+
+        FormCard.FormDelegateSeparator { above: showDeletedMessages; below: showStateEvents }
+
+        FormCard.FormCheckDelegate {
+            id: showStateEvents
+            text: i18n("Show state events")
+            checked: Config.showStateEvent
+            enabled: !Config.isShowStateEventImmutable
+            onToggled: {
+                Config.showStateEvent = checked
+                Config.save()
             }
         }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
-            title: i18nc("Chat Editor", "Editor")
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCheckDelegate {
-                    id: quickEditCheckbox
-                    text: i18n("Use s/text/replacement syntax to edit your last message")
-                    checked: Config.allowQuickEdit
-                    enabled: !Config.isAllowQuickEditImmutable
-                    onToggled: {
-                        Config.allowQuickEdit = checked
-                        Config.save()
-                    }
-                }
-                MobileForm.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate }
-                MobileForm.FormCheckDelegate {
-                    id: typingNotificationsDelegate
-                    text: i18n("Send typing notifications")
-                    checked: Config.typingNotifications
-                    enabled: !Config.isTypingNotificationsImmutable
-                    onToggled: {
-                        Config.typingNotifications = checked
-                        Config.save()
-                    }
-                }
+
+        FormCard.FormDelegateSeparator {
+            visible: Config.showStateEvent
+            above: showStateEvents
+            below: showLeaveJoinEventDelegate }
+
+        FormCard.FormCheckDelegate {
+            id: showLeaveJoinEventDelegate
+            visible: Config.showStateEvent
+            text: i18n("Show leave and join events")
+            checked: Config.showLeaveJoinEvent
+            enabled: !Config.isShowLeaveJoinEventImmutable
+            onToggled: {
+                Config.showLeaveJoinEvent = checked
+                Config.save()
             }
         }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
-            title: i18n("Developer Settings")
+
+        FormCard.FormDelegateSeparator {
+            visible: Config.showStateEvent
+            above: showLeaveJoinEventDelegate
+            below: showNameDelegate
         }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCheckDelegate {
-                    text: i18n("Enable developer tools")
-                    checked: Config.developerTools
-                    enabled: !Config.isDeveloperToolsImmutable
-                    onToggled: {
-                        Config.developerTools = checked
-                        Config.save()
-                    }
-                }
+
+        FormCard.FormCheckDelegate {
+            id: showNameDelegate
+            visible: Config.showStateEvent
+            text: i18n("Show name change events")
+            checked: Config.showRename
+            enabled: !Config.isShowRenameImmutable
+            onToggled: {
+                Config.showRename = checked
+                Config.save()
+            }
+        }
+
+        FormCard.FormDelegateSeparator {
+            visible: Config.showStateEvent
+            above: showNameDelegate
+            below: showAvatarChangeDelegate
+        }
+
+        FormCard.FormCheckDelegate {
+            id: showAvatarChangeDelegate
+            visible: Config.showStateEvent
+            text: i18n("Show avatar update events")
+            checked: Config.showAvatarUpdate
+            enabled: !Config.isShowAvatarUpdateImmutable
+            onToggled: {
+                Config.showAvatarUpdate = checked
+                Config.save()
+            }
+        }
+    }
+    FormCard.FormHeader {
+        title: i18n("Rooms and private chats")
+    }
+    FormCard.FormCard {
+        FormCard.FormRadioDelegate {
+            text: i18n("Separated")
+            checked: !Config.mergeRoomList
+            enabled: !Config.isMergeRoomListImmutable
+            onToggled: {
+                Config.mergeRoomList = false
+                Config.save()
+            }
+        }
+        FormCard.FormRadioDelegate {
+            text: i18n("Intermixed")
+            checked: Config.mergeRoomList
+            enabled: !Config.isMergeRoomListImmutable
+            onToggled: {
+                Config.mergeRoomList = true
+                Config.save()
+            }
+        }
+    }
+    FormCard.FormHeader {
+        title: i18nc("Chat Editor", "Editor")
+    }
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
+            id: quickEditCheckbox
+            text: i18n("Use s/text/replacement syntax to edit your last message")
+            checked: Config.allowQuickEdit
+            enabled: !Config.isAllowQuickEditImmutable
+            onToggled: {
+                Config.allowQuickEdit = checked
+                Config.save()
+            }
+        }
+        FormCard.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate }
+        FormCard.FormCheckDelegate {
+            id: typingNotificationsDelegate
+            text: i18n("Send typing notifications")
+            checked: Config.typingNotifications
+            enabled: !Config.isTypingNotificationsImmutable
+            onToggled: {
+                Config.typingNotifications = checked
+                Config.save()
+            }
+        }
+    }
+    FormCard.FormHeader {
+        title: i18n("Developer Settings")
+    }
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
+            text: i18n("Enable developer tools")
+            checked: Config.developerTools
+            enabled: !Config.isDeveloperToolsImmutable
+            onToggled: {
+                Config.developerTools = checked
+                Config.save()
             }
         }
     }