diff --git a/electrum/gui/qml/components/SwapDialog.qml b/electrum/gui/qml/components/SwapDialog.qml
index e46642df2..45a9a754c 100644
--- a/electrum/gui/qml/components/SwapDialog.qml
+++ b/electrum/gui/qml/components/SwapDialog.qml
@@ -22,147 +22,145 @@ ElDialog {
         color: "#aa000000"
     }
 
-    GridLayout {
-        id: layout
+    padding: 0
+
+    ColumnLayout {
         width: parent.width
         height: parent.height
-        columns: 2
-
-        Rectangle {
-            height: 1
-            Layout.fillWidth: true
-            Layout.columnSpan: 2
-            color: Material.accentColor
-        }
+        spacing: 0
 
-        Label {
-            text: qsTr('You send')
-            color: Material.accentColor
-        }
+        GridLayout {
+            id: layout
+            columns: 2
+            Layout.preferredWidth: parent.width
+            Layout.leftMargin: constants.paddingLarge
+            Layout.rightMargin: constants.paddingLarge
 
-        RowLayout {
-            Label {
-                id: tosend
-                text: Config.formatSats(swaphelper.tosend)
-                font.family: FixedFont
-                visible: swaphelper.valid
-            }
             Label {
-                text: Config.baseUnit
+                text: qsTr('You send')
                 color: Material.accentColor
-                visible: swaphelper.valid
             }
-            Label {
-                text: swaphelper.isReverse ? qsTr('(offchain)') : qsTr('(onchain)')
-                visible: swaphelper.valid
-            }
-        }
 
-        Label {
-            text: qsTr('You receive')
-            color: Material.accentColor
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-            Label {
-                id: toreceive
-                text: Config.formatSats(swaphelper.toreceive)
-                font.family: FixedFont
-                visible: swaphelper.valid
+            RowLayout {
+                Label {
+                    id: tosend
+                    text: Config.formatSats(swaphelper.tosend)
+                    font.family: FixedFont
+                    visible: swaphelper.valid
+                }
+                Label {
+                    text: Config.baseUnit
+                    color: Material.accentColor
+                    visible: swaphelper.valid
+                }
+                Label {
+                    text: swaphelper.isReverse ? qsTr('(offchain)') : qsTr('(onchain)')
+                    visible: swaphelper.valid
+                }
             }
+
             Label {
-                text: Config.baseUnit
+                text: qsTr('You receive')
                 color: Material.accentColor
-                visible: swaphelper.valid
             }
-            Label {
-                text: swaphelper.isReverse ? qsTr('(onchain)') : qsTr('(offchain)')
-                visible: swaphelper.valid
-            }
-        }
 
-        Label {
-            text: qsTr('Server fee')
-            color: Material.accentColor
-        }
-
-        RowLayout {
-            Label {
-                text: swaphelper.serverfeeperc
-            }
-            Label {
-                text: Config.formatSats(swaphelper.serverfee)
-                font.family: FixedFont
+            RowLayout {
+                Layout.fillWidth: true
+                Label {
+                    id: toreceive
+                    text: Config.formatSats(swaphelper.toreceive)
+                    font.family: FixedFont
+                    visible: swaphelper.valid
+                }
+                Label {
+                    text: Config.baseUnit
+                    color: Material.accentColor
+                    visible: swaphelper.valid
+                }
+                Label {
+                    text: swaphelper.isReverse ? qsTr('(onchain)') : qsTr('(offchain)')
+                    visible: swaphelper.valid
+                }
             }
+
             Label {
-                text: Config.baseUnit
+                text: qsTr('Server fee')
                 color: Material.accentColor
             }
-        }
 
-        Label {
-            text: qsTr('Mining fee')
-            color: Material.accentColor
-        }
-
-        RowLayout {
-            Label {
-                text: Config.formatSats(swaphelper.miningfee)
-                font.family: FixedFont
+            RowLayout {
+                Label {
+                    text: swaphelper.serverfeeperc
+                }
+                Label {
+                    text: Config.formatSats(swaphelper.serverfee)
+                    font.family: FixedFont
+                }
+                Label {
+                    text: Config.baseUnit
+                    color: Material.accentColor
+                }
             }
+
             Label {
-                text: Config.baseUnit
+                text: qsTr('Mining fee')
                 color: Material.accentColor
             }
-        }
 
-        Slider {
-            id: swapslider
-            Layout.columnSpan: 2
-            Layout.preferredWidth: 2/3 * layout.width
-            Layout.alignment: Qt.AlignHCenter
+            RowLayout {
+                Label {
+                    text: Config.formatSats(swaphelper.miningfee)
+                    font.family: FixedFont
+                }
+                Label {
+                    text: Config.baseUnit
+                    color: Material.accentColor
+                }
+            }
 
-            from: swaphelper.rangeMin
-            to: swaphelper.rangeMax
+            Slider {
+                id: swapslider
+                Layout.columnSpan: 2
+                Layout.preferredWidth: 2/3 * layout.width
+                Layout.alignment: Qt.AlignHCenter
 
-            onValueChanged: {
-                if (activeFocus)
-                    swaphelper.sliderPos = value
-            }
-            Component.onCompleted: {
-                value = swaphelper.sliderPos
-            }
-            Connections {
-                target: swaphelper
-                function onSliderPosChanged() {
-                    swapslider.value = swaphelper.sliderPos
+                from: swaphelper.rangeMin
+                to: swaphelper.rangeMax
+
+                onValueChanged: {
+                    if (activeFocus)
+                        swaphelper.sliderPos = value
+                }
+                Component.onCompleted: {
+                    value = swaphelper.sliderPos
+                }
+                Connections {
+                    target: swaphelper
+                    function onSliderPosChanged() {
+                        swapslider.value = swaphelper.sliderPos
+                    }
                 }
             }
-        }
 
-        InfoTextArea {
-            Layout.columnSpan: 2
-            visible: swaphelper.userinfo != ''
-            text: swaphelper.userinfo
+            InfoTextArea {
+                Layout.columnSpan: 2
+                Layout.preferredWidth: swapslider.width
+                Layout.alignment: Qt.AlignHCenter
+                visible: swaphelper.userinfo != ''
+                text: swaphelper.userinfo
+            }
         }
 
-        Rectangle {
-            height: 1
-            Layout.fillWidth: true
-            Layout.columnSpan: 2
-            color: Material.accentColor
-        }
+        Item { Layout.fillHeight: true; Layout.preferredWidth: 1 }
 
-        Button {
-            Layout.alignment: Qt.AlignHCenter
+        FlatButton {
             Layout.columnSpan: 2
-            text: qsTr('Ok')
+            Layout.fillWidth: true
+            text: qsTr('Swap')
+            icon.source: '../../icons/status_waiting.png'
             enabled: swaphelper.valid
             onClicked: swaphelper.executeSwap()
         }
-
-        Item { Layout.fillHeight: true; Layout.preferredWidth: 1; Layout.columnSpan: 2 }
     }
 
     SwapHelper {