diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 18ebe9ed5..2c6600d95 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "Navigation minimieren",
     "s_show_menu": "Menü anzeigen",
     "s_hide_menu": "Menü ausblenden",
+    "s_more_info": null,
     "q_rename_target": "{label} umbenennen?",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 32560a65a..11ee76d50 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "Collapse navigation",
     "s_show_menu": "Show menu",
     "s_hide_menu": "Hide menu",
+    "s_more_info": "More info",
     "q_rename_target": "Rename {label}?",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 4c5755805..63eeab071 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "Réduire la navigation",
     "s_show_menu": "Afficher le menu",
     "s_hide_menu": "Cacher le menu",
+    "s_more_info": null,
     "q_rename_target": "Renommer {label}\u00a0?",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 5da6c2fbe..73b32f80a 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "ナビゲーションを閉じる",
     "s_show_menu": "メニューを表示する",
     "s_hide_menu": "メニューを隠す",
+    "s_more_info": null,
     "q_rename_target": "{label}の名前を変更しますか？",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index f042ae8cd..ec7bd1ecf 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "Zwiń nawigację",
     "s_show_menu": "Pokaż menu",
     "s_hide_menu": "Ukryj menu",
+    "s_more_info": null,
     "q_rename_target": "Zmienić nazwę {label}?",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index 0b28f7ba7..2a0bf77ce 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "Zbaliť navigáciu",
     "s_show_menu": "Zobraziť ponuku",
     "s_hide_menu": "Skryť ponuku",
+    "s_more_info": null,
     "q_rename_target": "Premenovať {label}?",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/l10n/app_vi.arb b/lib/l10n/app_vi.arb
index 103d7d2fc..4f1595088 100644
--- a/lib/l10n/app_vi.arb
+++ b/lib/l10n/app_vi.arb
@@ -52,6 +52,7 @@
     "s_collapse_navigation": "Thu gọn điều hướng",
     "s_show_menu": "Hiển thị thực đơn",
     "s_hide_menu": "Ẩn thực đơn",
+    "s_more_info": null,
     "q_rename_target": "Đổi tên {label}?",
     "@q_rename_target": {
         "placeholders": {
diff --git a/lib/piv/views/generate_key_dialog.dart b/lib/piv/views/generate_key_dialog.dart
index d7059447e..8dc00dbae 100644
--- a/lib/piv/views/generate_key_dialog.dart
+++ b/lib/piv/views/generate_key_dialog.dart
@@ -268,8 +268,8 @@ class _GenerateKeyDialogState extends ConsumerState<GenerateKeyDialog> {
                                       },
                               ),
                             InfoPopupButton(
-                              size: 28,
-                              iconSize: 18,
+                              size: 30,
+                              iconSize: 20,
                               showDialog: constraints.maxWidth < maxWidth,
                               infoText: RichText(
                                 text: TextSpan(
diff --git a/lib/widgets/info_popup_button.dart b/lib/widgets/info_popup_button.dart
index 5b2333700..f0711ea6c 100644
--- a/lib/widgets/info_popup_button.dart
+++ b/lib/widgets/info_popup_button.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:material_symbols_icons/symbols.dart';
 
 import '../app/message.dart';
 import 'responsive_dialog.dart';
@@ -27,32 +29,22 @@ class InfoPopupButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
     if (!showDialog) {
       return PopupMenuButton(
+        tooltip: l10n.s_more_info,
         constraints: BoxConstraints(maxWidth: 250, maxHeight: 400),
         key: _menuKey,
         popUpAnimationStyle: AnimationStyle(duration: Duration.zero),
         menuPadding: EdgeInsets.zero,
-        padding: EdgeInsets.zero,
-        child: Material(
-          child: SizedBox(
-            height: size,
-            width: size,
-            child: IconButton(
-              constraints: size != null
-                  ? BoxConstraints(maxHeight: size!, maxWidth: size!)
-                  : null,
-              onPressed: () {
-                dynamic state = _menuKey.currentState;
-                state.showButtonMenu();
-              },
-              icon: Icon(
-                Icons.info,
-                size: iconSize,
-                color: Theme.of(context).colorScheme.primary,
-              ),
-              padding: EdgeInsets.zero,
-            ),
+        borderRadius: BorderRadius.circular(25),
+        child: SizedBox(
+          height: size,
+          width: size,
+          child: Icon(
+            Symbols.info,
+            size: iconSize,
+            color: Theme.of(context).colorScheme.primary,
           ),
         ),
         itemBuilder: (context) {
@@ -66,9 +58,7 @@ class InfoPopupButton extends StatelessWidget {
         height: size,
         width: size,
         child: IconButton(
-          constraints: size != null
-              ? BoxConstraints(maxHeight: size!, maxWidth: size!)
-              : null,
+          tooltip: l10n.s_more_info,
           onPressed: () {
             // Show info content in dialog on smaller screens and mobile
             showBlurDialog(
@@ -80,7 +70,7 @@ class InfoPopupButton extends StatelessWidget {
             );
           },
           icon: Icon(
-            Icons.info,
+            Symbols.info,
             size: iconSize,
             color: Theme.of(context).colorScheme.primary,
           ),