diff --git a/electrum/gui/qml/components/Addresses.qml b/electrum/gui/qml/components/Addresses.qml
index 65ef50417..99ec08d5d 100644
--- a/electrum/gui/qml/components/Addresses.qml
+++ b/electrum/gui/qml/components/Addresses.qml
@@ -36,17 +36,14 @@ Pane {
                     width: ListView.view.width
                     height: delegateLayout.height
                     highlighted: ListView.isCurrentItem
+
+                    font.pixelSize: constants.fontSizeMedium // set default font size for child controls
+
                     onClicked: ListView.view.currentIndex == index
                         ? ListView.view.currentIndex = -1
                         : ListView.view.currentIndex = index
 
                     states: [
-                        State {
-                            name: 'normal'; when: !highlighted
-                            PropertyChanges { target: drawer; visible: false }
-                            PropertyChanges { target: labelLabel; maximumLineCount: 2 }
-
-                        },
                         State {
                             name: 'highlighted'; when: highlighted
                             PropertyChanges { target: drawer; visible: true }
@@ -54,7 +51,6 @@ Pane {
                         }
                     ]
 
-
                     ColumnLayout {
                         id: delegateLayout
 //                         x: constants.paddingSmall
@@ -71,19 +67,18 @@ Pane {
                             columns: 2
                             Label {
                                 id: indexLabel
-                                font.pixelSize: constants.fontSizeMedium
                                 font.bold: true
                                 text: '#' + ('00'+model.iaddr).slice(-2)
                                 Layout.fillWidth: true
                             }
                             Label {
-                                font.pixelSize: constants.fontSizeMedium
                                 font.family: FixedFont
                                 text: model.address
                                 Layout.fillWidth: true
                             }
 
                             Rectangle {
+                                id: useIndicator
                                 Layout.preferredWidth: constants.iconSizeMedium
                                 Layout.preferredHeight: constants.iconSizeMedium
                                 color: model.held
@@ -107,21 +102,17 @@ Pane {
                                     Layout.fillWidth: true
                                 }
                                 Label {
-                                    font.pixelSize: constants.fontSizeMedium
                                     font.family: FixedFont
                                     text: Config.formatSats(model.balance, false)
                                 }
                                 Label {
-                                    font.pixelSize: constants.fontSizeMedium
                                     color: Material.accentColor
                                     text: Config.baseUnit + ','
                                 }
                                 Label {
-                                    font.pixelSize: constants.fontSizeMedium
                                     text: model.numtx
                                 }
                                 Label {
-                                    font.pixelSize: constants.fontSizeMedium
                                     color: Material.accentColor
                                     text: qsTr('tx')
                                 }
@@ -130,6 +121,7 @@ Pane {
 
                         RowLayout {
                             id: drawer
+                            visible: false
                             Layout.fillWidth: true
                             Layout.preferredHeight: 50
 
diff --git a/electrum/gui/qml/components/OpenWallet.qml b/electrum/gui/qml/components/OpenWallet.qml
index 55b510cae..ea59d3030 100644
--- a/electrum/gui/qml/components/OpenWallet.qml
+++ b/electrum/gui/qml/components/OpenWallet.qml
@@ -97,7 +97,7 @@ Pane {
         }
         onReadyChanged: {
             if (ready) {
-                Daemon.load_wallet(Daemon.path, password.text)
+                Daemon.load_wallet(openwalletdialog.path, password.text)
                 app.stack.pop(null)
             }
         }
diff --git a/electrum/gui/qml/components/Receive.qml b/electrum/gui/qml/components/Receive.qml
index ecf50dfbc..eafec5ed3 100644
--- a/electrum/gui/qml/components/Receive.qml
+++ b/electrum/gui/qml/components/Receive.qml
@@ -193,6 +193,8 @@ Pane {
 
                     onClicked: console.log('Request ' + index + ' clicked')
 
+                    font.pixelSize: constants.fontSizeSmall // set default font size for child controls
+
                     GridLayout {
                         id: item
 
@@ -227,31 +229,25 @@ Pane {
 
                         Label {
                             text: qsTr('Amount: ')
-                            font.pixelSize: constants.fontSizeSmall
                         }
                         Label {
                             id: amount
                             text: Config.formatSats(model.amount, true)
                             font.family: FixedFont
-                            font.pixelSize: constants.fontSizeSmall
                         }
 
                         Label {
                             text: qsTr('Timestamp: ')
-                            font.pixelSize: constants.fontSizeSmall
                         }
                         Label {
                             text: model.timestamp
-                            font.pixelSize: constants.fontSizeSmall
                         }
 
                         Label {
                             text: qsTr('Status: ')
-                            font.pixelSize: constants.fontSizeSmall
                         }
                         Label {
                             text: model.status
-                            font.pixelSize: constants.fontSizeSmall
                         }
                         Rectangle {
                             Layout.columnSpan: 5
diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
index 4ec96db83..d3fb48f74 100644
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@@ -78,12 +78,20 @@ ApplicationWindow
                 }
             }
 
+            Image {
+                Layout.preferredWidth: constants.iconSizeSmall
+                Layout.preferredHeight: constants.iconSizeSmall
+                visible: Daemon.currentWallet.isWatchOnly
+                source: '../../icons/eye1.png'
+                scale: 1.5
+            }
+
             Image {
                 Layout.preferredWidth: constants.iconSizeSmall
                 Layout.preferredHeight: constants.iconSizeSmall
                 source: Network.status == 'connecting' || Network.status == 'disconnected'
-                    ? '../../icons/status_disconnected.png' :
-                        Daemon.currentWallet.isUptodate
+                    ? '../../icons/status_disconnected.png'
+                    : Daemon.currentWallet.isUptodate
                         ? '../../icons/status_connected.png'
                         : '../../icons/status_lagging.png'
             }
@@ -97,8 +105,8 @@ ApplicationWindow
 
             ToolButton {
                 id: menuButton
-                visible: stack.currentItem.menu !== undefined && stack.currentItem.menu.count > 0
-                text: qsTr("⋮")
+                enabled: stack.currentItem.menu !== undefined && stack.currentItem.menu.count > 0
+                text: enabled ? qsTr("≡") : ''
                 onClicked: {
                     stack.currentItem.menu.open()
                     // position the menu to the right