diff --git a/src/gui/Dialogs/ExportKeys.qml b/src/gui/Dialogs/ExportKeys.qml
index 784825ff..a8fbeb99 100644
--- a/src/gui/Dialogs/ExportKeys.qml
+++ b/src/gui/Dialogs/ExportKeys.qml
@@ -39,6 +39,7 @@ HFileDialogOpener {
         id: exportPasswordPopup
         summary.text: qsTr("Passphrase to protect this file:")
         validateButton.text: qsTr("Export")
+        validateButton.icon.name: "export-keys"
 
         onAcceptedPasswordChanged: exportKeys(file, acceptedPassword)
 
diff --git a/src/gui/Dialogs/ImportKeys.qml b/src/gui/Dialogs/ImportKeys.qml
index 42c2a46d..0d008866 100644
--- a/src/gui/Dialogs/ImportKeys.qml
+++ b/src/gui/Dialogs/ImportKeys.qml
@@ -26,6 +26,7 @@ HFileDialogOpener {
             qsTr("This might take a while...") :
             qsTr("Passphrase used to protect this file:")
         validateButton.text: qsTr("Import")
+        validateButton.icon.name: "import-keys"
 
         onClosed: if (importFuture) importFuture.cancel()
 
diff --git a/src/gui/Popups/PasswordPopup.qml b/src/gui/Popups/PasswordPopup.qml
index a4237a20..d896a910 100644
--- a/src/gui/Popups/PasswordPopup.qml
+++ b/src/gui/Popups/PasswordPopup.qml
@@ -16,6 +16,7 @@ HFlickableColumnPopup {
     property bool okClicked: false
 
     readonly property alias summary: summary
+    readonly property alias details: details
     readonly property alias validateButton: validateButton
 
     signal cancelled()
@@ -53,7 +54,7 @@ HFlickableColumnPopup {
     page.footer: ButtonLayout {
         ApplyButton {
             id: validateButton
-            text: qsTr("Validate")
+            text: qsTr("Confirm")
             enabled: Boolean(passwordField.text)
             onClicked: validate()
         }
@@ -79,6 +80,8 @@ HFlickableColumnPopup {
 
     SummaryLabel { id: summary }
 
+    DetailsLabel { id: details }
+
     HRowLayout {
         spacing: theme.spacing