diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 122eef918..42d83dc9e 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -74,7 +74,7 @@ abstract class FluffyThemes {
       ),
       inputDecorationTheme: InputDecorationTheme(
         border: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(AppConfig.borderRadius),
+          borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
         ),
         contentPadding: const EdgeInsets.all(12),
       ),
diff --git a/lib/pages/invitation_selection/invitation_selection_view.dart b/lib/pages/invitation_selection/invitation_selection_view.dart
index 4db33841f..562713d80 100644
--- a/lib/pages/invitation_selection/invitation_selection_view.dart
+++ b/lib/pages/invitation_selection/invitation_selection_view.dart
@@ -191,10 +191,9 @@ class _InviteContactListTile extends StatelessWidget {
         overflow: TextOverflow.ellipsis,
         style: TextStyle(color: theme.colorScheme.secondary),
       ),
-      trailing: TextButton.icon(
+      trailing: TextButton(
         onPressed: isMember ? null : onTap,
-        label: Text(isMember ? l10n.participant : l10n.invite),
-        icon: Icon(isMember ? Icons.check : Icons.add),
+        child: Text(isMember ? l10n.participant : l10n.invite),
       ),
     );
   }
diff --git a/lib/widgets/adaptive_dialogs/adaptive_dialog_action.dart b/lib/widgets/adaptive_dialogs/adaptive_dialog_action.dart
index 09e8d6ac6..6fbc9a0cd 100644
--- a/lib/widgets/adaptive_dialogs/adaptive_dialog_action.dart
+++ b/lib/widgets/adaptive_dialogs/adaptive_dialog_action.dart
@@ -108,7 +108,9 @@ class AdaptiveDialogInkWell extends StatelessWidget {
       );
     }
     return Material(
-      color: theme.colorScheme.surfaceBright,
+      color: onTap == null
+          ? theme.colorScheme.surfaceContainer
+          : theme.colorScheme.surfaceBright,
       borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
       child: InkWell(
         borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
diff --git a/lib/widgets/adaptive_dialogs/public_room_dialog.dart b/lib/widgets/adaptive_dialogs/public_room_dialog.dart
index 975507564..bafa58643 100644
--- a/lib/widgets/adaptive_dialogs/public_room_dialog.dart
+++ b/lib/widgets/adaptive_dialogs/public_room_dialog.dart
@@ -185,6 +185,7 @@ class PublicRoomDialog extends StatelessWidget {
                                           style: theme.textTheme.bodyMedium
                                               ?.copyWith(fontSize: 10),
                                         ),
+                                        maxLines: 1,
                                         textAlign: TextAlign.center,
                                       ),
                                     ),
diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart
index 1a0f2556d..63cd0897d 100644
--- a/lib/widgets/permission_slider_dialog.dart
+++ b/lib/widgets/permission_slider_dialog.dart
@@ -20,7 +20,7 @@ Future<int?> showPermissionChooser(
         child: Column(
           mainAxisSize: .min,
           crossAxisAlignment: .stretch,
-          spacing: 12.0,
+          spacing: 16.0,
           children: [
             Text(L10n.of(context).setPowerLevelDescription),
             ValueListenableBuilder(
diff --git a/lib/widgets/qr_code_viewer.dart b/lib/widgets/qr_code_viewer.dart
index ac87d9942..83c44e741 100644
--- a/lib/widgets/qr_code_viewer.dart
+++ b/lib/widgets/qr_code_viewer.dart
@@ -91,7 +91,11 @@ class QrCodeViewer extends StatelessWidget {
           margin: const EdgeInsets.all(32.0),
           padding: const EdgeInsets.all(32.0),
           decoration: BoxDecoration(
-            color: theme.colorScheme.primaryContainer,
+            border: Border.all(
+              color: theme.colorScheme.onPrimaryContainer,
+              width: 4,
+            ),
+            color: theme.colorScheme.surfaceBright,
             borderRadius: BorderRadius.circular(AppConfig.borderRadius),
           ),
           child: Column(