diff --git a/electrum/gui/qml/components/History.qml b/electrum/gui/qml/components/History.qml
index f8c6d0f8f..e47345666 100644
--- a/electrum/gui/qml/components/History.qml
+++ b/electrum/gui/qml/components/History.qml
@@ -59,7 +59,7 @@ Pane {
                 text: listview.sectionLabels[section]
                 Layout.alignment: Qt.AlignHCenter
                 Layout.topMargin: constants.paddingLarge
-                font.pixelSize: constants.fontSizeLarge
+                font.pixelSize: constants.fontSizeMedium
                 color: Material.accentColor
             }
         }
@@ -76,8 +76,7 @@ Pane {
                 DelegateModelGroup { name: 'older'; includeByDefault: false }
             ]
 
-            delegate: HistoryItemDelegate {
-            }
+            delegate: HistoryItemDelegate { }
         }
 
         ScrollIndicator.vertical: ScrollIndicator { }
diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml
index bcef5a0c2..941349d01 100644
--- a/electrum/gui/qml/components/InvoiceDialog.qml
+++ b/electrum/gui/qml/components/InvoiceDialog.qml
@@ -50,26 +50,14 @@ ElDialog {
 
                 columns: 2
 
-                TextHighlightPane {
+                InfoTextArea {
                     Layout.columnSpan: 2
                     Layout.fillWidth: true
-
+                    Layout.topMargin: constants.paddingLarge
+                    Layout.bottomMargin: constants.paddingLarge
                     visible: invoice.userinfo
-                    borderColor: constants.colorWarning
-                    padding: constants.paddingXLarge
-
-                    RowLayout {
-                        Image {
-                            source: '../../icons/warning.png'
-                            Layout.preferredWidth: constants.iconSizeMedium
-                            Layout.preferredHeight: constants.iconSizeMedium
-                        }
-                        Label {
-                            width: parent.width
-                            text: invoice.userinfo
-                            wrapMode: Text.Wrap
-                        }
-                    }
+                    text: invoice.userinfo
+                    iconStyle: InfoTextArea.IconStyle.Warn
                 }
 
                 Label {