diff --git a/electrum/gui/qml/components/controls/InfoTextArea.qml b/electrum/gui/qml/components/controls/InfoTextArea.qml
index eb64c5aa9..9acbc90c2 100644
--- a/electrum/gui/qml/components/controls/InfoTextArea.qml
+++ b/electrum/gui/qml/components/controls/InfoTextArea.qml
@@ -15,7 +15,6 @@ TextHighlightPane {
     property int iconStyle: InfoTextArea.IconStyle.Info
     property alias textFormat: infotext.textFormat
 
-    // borderColor: constants.colorWarning
     borderColor: iconStyle == InfoTextArea.IconStyle.Info
         ? constants.colorInfo
         : iconStyle == InfoTextArea.IconStyle.Warn
@@ -38,12 +37,11 @@ TextHighlightPane {
             Layout.preferredWidth: constants.iconSizeMedium
             Layout.preferredHeight: constants.iconSizeMedium
         }
-        Label {
 
+        Label {
             id: infotext
             Layout.fillWidth: true
             width: parent.width
-            text: invoice.userinfo
             wrapMode: Text.Wrap
         }
     }
diff --git a/electrum/gui/qml/components/controls/TextHighlightPane.qml b/electrum/gui/qml/components/controls/TextHighlightPane.qml
index 9b5349879..a2d92f685 100644
--- a/electrum/gui/qml/components/controls/TextHighlightPane.qml
+++ b/electrum/gui/qml/components/controls/TextHighlightPane.qml
@@ -7,7 +7,7 @@ Pane {
     padding: constants.paddingSmall
 
     property color backgroundColor: Qt.lighter(Material.background, 1.15)
-    property color borderColor: null
+    property color borderColor: 'transparent'
 
     background: Rectangle {
         color: backgroundColor
diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
index 380086160..dd90b0918 100644
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@@ -66,6 +66,7 @@ ApplicationWindow
                 }
 
                 Image {
+                    visible: Daemon.currentWallet
                     source: '../../icons/wallet.png'
                     Layout.preferredWidth: constants.iconSizeSmall
                     Layout.preferredHeight: constants.iconSizeSmall