diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 31d1f6df2..8f83e7e97 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -679,7 +679,7 @@
             "to_slot": {}
         }
     },
-    "p_password_protected_file": "The selected file is password protected. Enter the password to proceed.",
+    "p_password_protected_file": "The selected file is password protected.",
     "p_import_items_desc": "The following item(s) will be imported into PIV slot {slot}.",
     "@p_import_items_desc": {
         "placeholders": {
diff --git a/lib/piv/views/import_file_dialog.dart b/lib/piv/views/import_file_dialog.dart
index afb4ad5df..95ccd3fc8 100644
--- a/lib/piv/views/import_file_dialog.dart
+++ b/lib/piv/views/import_file_dialog.dart
@@ -144,7 +144,7 @@ class _ImportFileDialogState extends ConsumerState<ImportFileDialog> {
                   labelText: l10n.s_password,
                   errorText: _passwordIsWrong ? l10n.s_wrong_password : null,
                   errorMaxLines: 3,
-                  prefixIcon: const Icon(Symbols.password),
+                  icon: const Icon(Symbols.password),
                   suffixIcon: IconButton(
                       icon: Icon(_isObscure
                           ? Symbols.visibility
@@ -264,11 +264,16 @@ class _ImportFileDialogState extends ConsumerState<ImportFileDialog> {
                   ),
                 ],
                 if (keyType != null) ...[
-                  Text(
-                    l10n.s_private_key,
-                    style: textTheme.bodyLarge,
-                    softWrap: true,
-                    textAlign: TextAlign.center,
+                  Row(
+                    children: [
+                      const Icon(Symbols.key),
+                      const SizedBox(width: 8),
+                      Text(
+                        l10n.s_private_key,
+                        style: textTheme.bodyLarge,
+                        softWrap: true,
+                      ),
+                    ],
                   ),
                   Row(
                     mainAxisSize: MainAxisSize.min,
@@ -294,11 +299,17 @@ class _ImportFileDialogState extends ConsumerState<ImportFileDialog> {
                     ),
                 ],
                 if (certInfo != null) ...[
-                  Text(
-                    l10n.s_certificate,
-                    style: textTheme.bodyLarge,
-                    softWrap: true,
-                    textAlign: TextAlign.center,
+                  Row(
+                    children: [
+                      const Icon(Symbols.id_card),
+                      const SizedBox(width: 8.0),
+                      Text(
+                        l10n.s_certificate,
+                        style: textTheme.bodyLarge,
+                        softWrap: true,
+                        textAlign: TextAlign.center,
+                      ),
+                    ],
                   ),
                   SizedBox(
                     height:
@@ -307,9 +318,15 @@ class _ImportFileDialogState extends ConsumerState<ImportFileDialog> {
                   ),
                 ],
                 if (keyType != null && !unsupportedKey && widget.showMatch) ...[
-                  Text(
-                    l10n.s_options,
-                    style: textTheme.bodyLarge,
+                  Row(
+                    children: [
+                      const Icon(Symbols.tune),
+                      const SizedBox(width: 8.0),
+                      Text(
+                        l10n.s_options,
+                        style: textTheme.bodyLarge,
+                      ),
+                    ],
                   ),
                   Text(l10n.p_key_options_bio_desc),
                   FilterChip(