diff --git a/lib/fido/views/pin_dialog.dart b/lib/fido/views/pin_dialog.dart
index 5e540ec5b..d196f8a2f 100755
--- a/lib/fido/views/pin_dialog.dart
+++ b/lib/fido/views/pin_dialog.dart
@@ -191,7 +191,7 @@ class _FidoPinDialogState extends ConsumerState<FidoPinDialog> {
                         minPinLength, maxPinLength, 2, '123456')
                     : l10n.p_new_fido2_pin_requirements(
                         minPinLength, maxPinLength),
-                helperMaxLines: 5,
+                helperMaxLines: 7,
                 errorText: _newIsWrong ? _newPinError : null,
                 errorMaxLines: 3,
                 icon: const Icon(Symbols.pin),
diff --git a/lib/fido/views/pin_entry_form.dart b/lib/fido/views/pin_entry_form.dart
index 2e7acdea8..b541a48ef 100644
--- a/lib/fido/views/pin_entry_form.dart
+++ b/lib/fido/views/pin_entry_form.dart
@@ -133,7 +133,7 @@ class _PinEntryFormState extends ConsumerState<PinEntryForm> {
                     : '', // Prevents dialog resizing
                 errorText: _pinIsWrong || authBlocked ? _getErrorText() : null,
                 errorMaxLines: 3,
-                prefixIcon: const Icon(Symbols.pin),
+                icon: const Icon(Symbols.pin),
                 suffixIcon: IconButton(
                   icon: Icon(
                       _isObscure ? Symbols.visibility : Symbols.visibility_off),
diff --git a/lib/oath/views/rename_account_dialog.dart b/lib/oath/views/rename_account_dialog.dart
index c9c868376..4c78825e4 100755
--- a/lib/oath/views/rename_account_dialog.dart
+++ b/lib/oath/views/rename_account_dialog.dart
@@ -182,9 +182,6 @@ class _RenameAccountDialogState extends ConsumerState<RenameAccountDialog> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(l10n.q_rename_target(widget.issuer != null
-                ? '${widget.issuer} (${widget.name})'
-                : widget.name)),
             Text(l10n.p_rename_will_change_account_displayed),
             AppTextField(
               controller: _issuerController,
@@ -197,7 +194,7 @@ class _RenameAccountDialogState extends ConsumerState<RenameAccountDialog> {
                 border: const OutlineInputBorder(),
                 labelText: l10n.s_issuer_optional,
                 helperText: '', // Prevents dialog resizing when disabled
-                prefixIcon: const Icon(Symbols.business),
+                icon: const Icon(Symbols.business),
               ),
               textInputAction: TextInputAction.next,
               focusNode: _issuerFocus,
@@ -221,7 +218,7 @@ class _RenameAccountDialogState extends ConsumerState<RenameAccountDialog> {
                     : !isUnique
                         ? l10n.l_name_already_exists
                         : null,
-                prefixIcon: const Icon(Symbols.people_alt),
+                icon: const Icon(Symbols.people_alt),
               ),
               textInputAction: TextInputAction.done,
               focusNode: _nameFocus,
diff --git a/lib/oath/views/unlock_form.dart b/lib/oath/views/unlock_form.dart
index 4d11a59c8..9cdc9f8cf 100755
--- a/lib/oath/views/unlock_form.dart
+++ b/lib/oath/views/unlock_form.dart
@@ -110,7 +110,7 @@ class _UnlockFormState extends ConsumerState<UnlockForm> {
                     labelText: l10n.s_password,
                     errorText: _passwordIsWrong ? l10n.s_wrong_password : null,
                     helperText: '', // Prevents resizing when errorText shown
-                    prefixIcon: const Icon(Symbols.password),
+                    icon: const Icon(Symbols.password),
                     suffixIcon: IconButton(
                       icon: Icon(_isObscure
                           ? Symbols.visibility
@@ -132,48 +132,52 @@ class _UnlockFormState extends ConsumerState<UnlockForm> {
                 ).init(),
               ),
               const SizedBox(height: 3.0),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Wrap(
-                    alignment: WrapAlignment.spaceBetween,
-                    crossAxisAlignment: WrapCrossAlignment.center,
-                    spacing: 4.0,
-                    runSpacing: 8.0,
-                    children: [
-                      keystoreFailed
-                          ? Wrap(
-                              crossAxisAlignment: WrapCrossAlignment.center,
-                              spacing: 4.0,
-                              runSpacing: 8.0,
-                              children: [
-                                Icon(Symbols.warning_amber,
-                                    color:
-                                        Theme.of(context).colorScheme.tertiary),
-                                Text(l10n.l_keystore_unavailable)
-                              ],
-                            )
-                          : FilterChip(
-                              label: Text(l10n.s_remember_password),
-                              selected: _remember,
-                              onSelected: (value) {
-                                setState(() {
-                                  _remember = value;
-                                });
-                              },
-                            ),
-                      FilledButton.icon(
-                        key: keys.unlockButton,
-                        label: Text(l10n.s_unlock),
-                        icon: const Icon(Symbols.lock_open),
-                        onPressed: _passwordController.text.isNotEmpty &&
-                                !_passwordIsWrong
-                            ? _submit
-                            : null,
-                      ),
-                    ],
-                  ),
-                ],
+              Padding(
+                padding: const EdgeInsets.only(left: 40),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Wrap(
+                      alignment: WrapAlignment.spaceBetween,
+                      crossAxisAlignment: WrapCrossAlignment.center,
+                      spacing: 4.0,
+                      runSpacing: 8.0,
+                      children: [
+                        keystoreFailed
+                            ? Wrap(
+                                crossAxisAlignment: WrapCrossAlignment.center,
+                                spacing: 4.0,
+                                runSpacing: 8.0,
+                                children: [
+                                  Icon(Symbols.warning_amber,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .tertiary),
+                                  Text(l10n.l_keystore_unavailable)
+                                ],
+                              )
+                            : FilterChip(
+                                label: Text(l10n.s_remember_password),
+                                selected: _remember,
+                                onSelected: (value) {
+                                  setState(() {
+                                    _remember = value;
+                                  });
+                                },
+                              ),
+                        FilledButton.icon(
+                          key: keys.unlockButton,
+                          label: Text(l10n.s_unlock),
+                          icon: const Icon(Symbols.lock_open),
+                          onPressed: _passwordController.text.isNotEmpty &&
+                                  !_passwordIsWrong
+                              ? _submit
+                              : null,
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
               ),
             ],
           ),
diff --git a/lib/piv/views/manage_pin_puk_dialog.dart b/lib/piv/views/manage_pin_puk_dialog.dart
index 36c4696c1..b4ec89acc 100644
--- a/lib/piv/views/manage_pin_puk_dialog.dart
+++ b/lib/piv/views/manage_pin_puk_dialog.dart
@@ -272,6 +272,7 @@ class _ManagePinPukDialogState extends ConsumerState<ManagePinPukDialog> {
                             ? l10n.s_puk
                             : l10n.s_pin,
                         newMinPinLen),
+                helperMaxLines: 5,
                 labelText: widget.target == ManageTarget.puk
                     ? l10n.s_new_puk
                     : l10n.s_new_pin,