diff --git a/electrum/gui/qml/components/AddressDetails.qml b/electrum/gui/qml/components/AddressDetails.qml
index 34bbc348e..d07d3781d 100644
--- a/electrum/gui/qml/components/AddressDetails.qml
+++ b/electrum/gui/qml/components/AddressDetails.qml
@@ -143,7 +143,7 @@ Pane {
                     }
                     ToolButton {
                         visible: labelContent.editmode
-                        icon.source: '../../icons/delete.png'
+                        icon.source: '../../icons/closebutton.png'
                         icon.color: 'transparent'
                         onClicked: labelContent.editmode = false
                     }
diff --git a/electrum/gui/qml/components/LightningPaymentDetails.qml b/electrum/gui/qml/components/LightningPaymentDetails.qml
index 63e423707..03ed8d31c 100644
--- a/electrum/gui/qml/components/LightningPaymentDetails.qml
+++ b/electrum/gui/qml/components/LightningPaymentDetails.qml
@@ -136,7 +136,7 @@ Pane {
                     }
                     ToolButton {
                         visible: labelContent.editmode
-                        icon.source: '../../icons/delete.png'
+                        icon.source: '../../icons/closebutton.png'
                         icon.color: 'transparent'
                         onClicked: labelContent.editmode = false
                     }
diff --git a/electrum/gui/qml/components/Pin.qml b/electrum/gui/qml/components/Pin.qml
index 492135180..9c1948af6 100644
--- a/electrum/gui/qml/components/Pin.qml
+++ b/electrum/gui/qml/components/Pin.qml
@@ -10,6 +10,8 @@ import "controls"
 Dialog {
     id: root
 
+    title: qsTr('PIN')
+
     width: parent.width * 2/3
     height: parent.height * 1/3
 
@@ -58,6 +60,39 @@ Dialog {
         }
     }
 
+    header: GridLayout {
+        columns: 2
+        rowSpacing: 0
+
+        Image {
+            source: "../../icons/lock.png"
+            Layout.preferredWidth: constants.iconSizeXLarge
+            Layout.preferredHeight: constants.iconSizeXLarge
+            Layout.leftMargin: constants.paddingMedium
+            Layout.topMargin: constants.paddingMedium
+            Layout.bottomMargin: constants.paddingMedium
+        }
+
+        Label {
+            text: title
+            elide: Label.ElideRight
+            Layout.fillWidth: true
+            topPadding: constants.paddingXLarge
+            bottomPadding: constants.paddingXLarge
+            font.bold: true
+            font.pixelSize: constants.fontSizeMedium
+        }
+
+        Rectangle {
+            Layout.columnSpan: 2
+            Layout.fillWidth: true
+            Layout.leftMargin: constants.paddingXXSmall
+            Layout.rightMargin: constants.paddingXXSmall
+            height: 1
+            color: Qt.rgba(0,0,0,0.5)
+        }
+    }
+
     ColumnLayout {
         width: parent.width
         height: parent.height
diff --git a/electrum/gui/qml/components/TxDetails.qml b/electrum/gui/qml/components/TxDetails.qml
index d9788a7ec..540bf35ac 100644
--- a/electrum/gui/qml/components/TxDetails.qml
+++ b/electrum/gui/qml/components/TxDetails.qml
@@ -168,7 +168,7 @@ Pane {
                     }
                     ToolButton {
                         visible: labelContent.editmode
-                        icon.source: '../../icons/delete.png'
+                        icon.source: '../../icons/closebutton.png'
                         icon.color: 'transparent'
                         onClicked: labelContent.editmode = false
                     }