diff --git a/lib/pages/bootstrap_dialog.dart b/lib/pages/bootstrap_dialog.dart
index 7ed5ab91..4454d717 100644
--- a/lib/pages/bootstrap_dialog.dart
+++ b/lib/pages/bootstrap_dialog.dart
@@ -92,8 +92,8 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
         _recoveryKeyStored == false) {
       final key = bootstrap.newSsssKey.recoveryKey;
       titleText = L10n.of(context).securityKey;
-      return AlertDialog(
-        title: AppBar(
+      return Scaffold(
+        appBar: AppBar(
           centerTitle: true,
           leading: IconButton(
             icon: Icon(Icons.close),
@@ -101,7 +101,7 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
           ),
           title: Text(L10n.of(context).securityKey),
         ),
-        content: Center(
+        body: Center(
           child: ConstrainedBox(
             constraints:
                 BoxConstraints(maxWidth: FluffyThemes.columnWidth * 1.5),
diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart
index 239cec33..2429af98 100644
--- a/lib/pages/views/chat_view.dart
+++ b/lib/pages/views/chat_view.dart
@@ -281,7 +281,7 @@ class ChatView extends StatelessWidget {
                                     ? controller.timeline.isRequestingHistory
                                         ? Center(
                                             child: CircularProgressIndicator
-                                                .adaptive(),
+                                                .adaptive(strokeWidth: 2),
                                           )
                                         : controller.canLoadMore
                                             ? Center(
diff --git a/lib/pages/views/settings_account_view.dart b/lib/pages/views/settings_account_view.dart
index 882d2f1c..179cfd1c 100644
--- a/lib/pages/views/settings_account_view.dart
+++ b/lib/pages/views/settings_account_view.dart
@@ -22,11 +22,13 @@ class SettingsAccountView extends StatelessWidget {
         child: Column(
           children: [
             ListTile(
-              leading: CircleAvatar(
-                foregroundColor: Theme.of(context).primaryColor,
-                backgroundColor: Theme.of(context).secondaryHeaderColor,
-                child: Icon(Icons.account_box_outlined),
-              ),
+              trailing: Icon(Icons.add_box_outlined),
+              title: Text(L10n.of(context).addAccount),
+              subtitle: Text(L10n.of(context).enableMultiAccounts),
+              onTap: controller.addAccountAction,
+            ),
+            Divider(height: 1),
+            ListTile(
               title: Text(L10n.of(context).yourUserId),
               subtitle: Text(Matrix.of(context).client.userID),
               trailing: Icon(Icons.copy_outlined),
@@ -35,14 +37,6 @@ class SettingsAccountView extends StatelessWidget {
                 context,
               ),
             ),
-            Divider(height: 1),
-            ListTile(
-              trailing: Icon(Icons.add_box_outlined),
-              title: Text(L10n.of(context).addAccount),
-              subtitle: Text(L10n.of(context).enableMultiAccounts),
-              onTap: controller.addAccountAction,
-            ),
-            Divider(height: 1),
             ListTile(
               trailing: Icon(Icons.edit_outlined),
               title: Text(L10n.of(context).editDisplayname),