diff --git a/lib/app/views/app_page.dart b/lib/app/views/app_page.dart
index 1e003c09..3e94e5eb 100755
--- a/lib/app/views/app_page.dart
+++ b/lib/app/views/app_page.dart
@@ -202,7 +202,8 @@ class AppPage extends StatelessWidget {
           Align(
             alignment: centered ? Alignment.center : Alignment.centerLeft,
             child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16),
+              padding: const EdgeInsets.only(
+                  top: 16, bottom: 0, left: 16, right: 16),
               child: Wrap(
                 spacing: 8,
                 runSpacing: 4,
@@ -212,7 +213,8 @@ class AppPage extends StatelessWidget {
           ),
         if (footnote != null)
           Padding(
-            padding: const EdgeInsets.all(16),
+            padding:
+                const EdgeInsets.only(bottom: 16, top: 33, left: 16, right: 16),
             child: Opacity(
               opacity: 0.6,
               child: Text(
diff --git a/lib/fido/views/passkeys_screen.dart b/lib/fido/views/passkeys_screen.dart
index dc719939..3741cdd7 100644
--- a/lib/fido/views/passkeys_screen.dart
+++ b/lib/fido/views/passkeys_screen.dart
@@ -110,7 +110,7 @@ class _FidoLockedPage extends ConsumerWidget {
                 },
                 avatar: const Icon(Icons.fingerprint_outlined),
               ),
-            if (!isBio && alwaysUv)
+            if (!isBio && alwaysUv && !expanded)
               ActionChip(
                 label: Text(l10n.s_set_pin),
                 onPressed: () async {