diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env
index 660760f68..5a23ceb3e 100644
--- a/.github/workflows/versions.env
+++ b/.github/workflows/versions.env
@@ -1,2 +1,2 @@
-FLUTTER_VERSION=3.32.8
+FLUTTER_VERSION=3.35.2
 JAVA_VERSION=17
diff --git a/lib/pages/chat_access_settings/chat_access_settings_page.dart b/lib/pages/chat_access_settings/chat_access_settings_page.dart
index a316b809e..5f679cffb 100644
--- a/lib/pages/chat_access_settings/chat_access_settings_page.dart
+++ b/lib/pages/chat_access_settings/chat_access_settings_page.dart
@@ -45,19 +45,27 @@ class ChatAccessSettingsPageView extends StatelessWidget {
                     ),
                   ),
                 ),
-                for (final historyVisibility in HistoryVisibility.values)
-                  RadioListTile<HistoryVisibility>.adaptive(
-                    title: Text(
-                      historyVisibility
-                          .getLocalizedString(MatrixLocals(L10n.of(context))),
-                    ),
-                    value: historyVisibility,
-                    groupValue: room.historyVisibility,
-                    onChanged: controller.historyVisibilityLoading ||
-                            !room.canChangeHistoryVisibility
-                        ? null
-                        : controller.setHistoryVisibility,
+                RadioGroup<HistoryVisibility>(
+                  groupValue: room.historyVisibility,
+                  onChanged: controller.historyVisibilityLoading ||
+                          !room.canChangeHistoryVisibility
+                      ? (_) {}
+                      : controller.setHistoryVisibility,
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      for (final historyVisibility in HistoryVisibility.values)
+                        RadioListTile<HistoryVisibility>.adaptive(
+                          title: Text(
+                            historyVisibility.getLocalizedString(
+                              MatrixLocals(L10n.of(context)),
+                            ),
+                          ),
+                          value: historyVisibility,
+                        ),
+                    ],
                   ),
+                ),
                 Divider(color: theme.dividerColor),
                 ListTile(
                   title: Text(
@@ -68,19 +76,25 @@ class ChatAccessSettingsPageView extends StatelessWidget {
                     ),
                   ),
                 ),
-                for (final joinRule in controller.availableJoinRules)
-                  if (joinRule != JoinRules.private)
-                    RadioListTile<JoinRules>.adaptive(
-                      title: Text(
-                        joinRule.localizedString(L10n.of(context)),
-                      ),
-                      value: joinRule,
-                      groupValue: room.joinRules,
-                      onChanged: controller.joinRulesLoading ||
-                              !room.canChangeJoinRules
-                          ? null
-                          : controller.setJoinRule,
-                    ),
+                RadioGroup(
+                  groupValue: room.joinRules,
+                  onChanged: controller.setJoinRule,
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      for (final joinRule in controller.availableJoinRules)
+                        if (joinRule != JoinRules.private)
+                          RadioListTile<JoinRules>.adaptive(
+                            enabled: !controller.joinRulesLoading &&
+                                room.canChangeJoinRules,
+                            title: Text(
+                              joinRule.localizedString(L10n.of(context)),
+                            ),
+                            value: joinRule,
+                          ),
+                    ],
+                  ),
+                ),
                 Divider(color: theme.dividerColor),
                 if ({JoinRules.public, JoinRules.knock}
                     .contains(room.joinRules)) ...[
@@ -93,20 +107,26 @@ class ChatAccessSettingsPageView extends StatelessWidget {
                       ),
                     ),
                   ),
-                  for (final guestAccess in GuestAccess.values)
-                    RadioListTile<GuestAccess>.adaptive(
-                      title: Text(
-                        guestAccess.getLocalizedString(
-                          MatrixLocals(L10n.of(context)),
-                        ),
-                      ),
-                      value: guestAccess,
-                      groupValue: room.guestAccess,
-                      onChanged: controller.guestAccessLoading ||
-                              !room.canChangeGuestAccess
-                          ? null
-                          : controller.setGuestAccess,
+                  RadioGroup(
+                    groupValue: room.guestAccess,
+                    onChanged: controller.setGuestAccess,
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        for (final guestAccess in GuestAccess.values)
+                          RadioListTile<GuestAccess>.adaptive(
+                            enabled: !controller.guestAccessLoading &&
+                                room.canChangeGuestAccess,
+                            title: Text(
+                              guestAccess.getLocalizedString(
+                                MatrixLocals(L10n.of(context)),
+                              ),
+                            ),
+                            value: guestAccess,
+                          ),
+                      ],
                     ),
+                  ),
                   Divider(color: theme.dividerColor),
                   ListTile(
                     title: Text(
diff --git a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
index 87dd999ce..f6adffd58 100644
--- a/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
+++ b/lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
@@ -110,7 +110,7 @@ class ChatEncryptionSettingsView extends StatelessWidget {
                         itemBuilder: (BuildContext context, int i) =>
                             SwitchListTile(
                           value: !deviceKeys[i].blocked,
-                          activeColor: deviceKeys[i].verified
+                          activeThumbColor: deviceKeys[i].verified
                               ? Colors.green
                               : Colors.orange,
                           onChanged: (_) =>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f21b452d0..3fe4d1e9e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -53,7 +53,7 @@ platforms:
 parts:
   flutter-git:
     source: https://github.com/flutter/flutter.git
-    source-tag: 3.32.4
+    source-tag: 3.35.2
     source-depth: 1
     plugin: nil
     override-build: |