2 files changed, 23 insertions, 3 deletions
diff --git a/components/InlineButton.qml b/components/InlineButton.qml
index cdbcd2ef..7bd1f7d2 100644
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -42,6 +42,7 @@ Item {
     property string textColor: "#FFFFFF"
     property int fontSize: 12 * scaleRatio
     property alias text: inlineText.text
+    property alias buttonColor: rect.color
     signal clicked()
 
     function doClick() {
@@ -55,7 +56,7 @@ Item {
         color: MoneroComponents.Style.buttonBackgroundColorDisabled
         border.color: "black"
         height: 28 * scaleRatio
-        width: inlineText.width + 22 * scaleRatio
+        width: inlineText.text ? (inlineText.width + 22) * scaleRatio : inlineButton.icon ? (inlineImage.width + 16) * scaleRatio : rect.height
         radius: 4
 
         anchors.top: parent.top
@@ -71,6 +72,13 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
         }
 
+        Image {
+            id: inlineImage
+            visible: inlineButton.icon !== ""
+            anchors.centerIn: parent
+            source: inlineButton.icon
+        }
+
         MouseArea {
             id: buttonArea
             cursorShape: rect.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
@@ -78,12 +86,12 @@ Item {
             anchors.fill: parent
             onClicked: doClick()
             onEntered: {
-                rect.color = "#707070";
+                rect.color = buttonColor ? buttonColor : "#707070";
                 rect.opacity = 0.8;
             }
             onExited: {
                 rect.opacity = 1.0;
-                rect.color = "#808080";
+                rect.color = buttonColor ? buttonColor : "#808080";
             }
         }
     }
diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml
index 17b50b2e..73033c7e 100644
--- a/components/LineEditMulti.qml
+++ b/components/LineEditMulti.qml
@@ -83,6 +83,9 @@ ColumnLayout {
     property alias addressValidation: input.addressValidation
     property string backgroundColor: "" // mock
 
+    property alias inlineButton: inlineButtonId
+    property bool inlineButtonVisible: false
+
     signal labelButtonClicked();
     signal inputLabelLinkActivated();
     signal editingFinished();
@@ -183,5 +186,14 @@ ColumnLayout {
             anchors.fill: parent
             visible: !item.borderDisabled
         }
+
+        MoneroComponents.InlineButton {
+            id: inlineButtonId
+            visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
+            anchors.right: parent.right
+            anchors.rightMargin: 8 * scaleRatio
+            anchors.top: parent.top
+            anchors.topMargin: 4 * scaleRatio
+        }
     }
 }