diff --git a/app/qml/main.qml b/app/qml/main.qml
index 61013c799cf5a7d5d08d336139f44e9b924183ca..1fd39f426033728966d880893c390b25cf635f89 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -130,7 +130,7 @@ ApplicationWindow {
         property alias progressText: progressText.text
         content: ColumnLayout {
             anchors.fill: parent
-            spacing: 8
+            spacing: 4
             ProgressBar {
                 id: progressBar
                 minimumValue: 0
diff --git a/app/qml/ui/Dialog.qml b/app/qml/ui/Dialog.qml
index ef94e20764935ccd0ba4896c0c0e81b5d3382637..b5360fe51ec6c8e11fa3a528d355ebf73af74bb0 100644
--- a/app/qml/ui/Dialog.qml
+++ b/app/qml/ui/Dialog.qml
@@ -2,13 +2,13 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 1.0
 
-RowLayout {
+ColumnLayout {
     id: dialog
 
     visible: false
     anchors.fill: parent
     anchors.margins: 12
-    spacing: 8
+    spacing: 12
 
     property alias icon: icon.source
     property alias primaryText: primaryText.text
@@ -26,66 +26,70 @@ RowLayout {
         dialog.visible = false;
     }
 
-    Image {
-        id: icon
-        source: ""
-        visible: source.toString() ? true : false
-        Layout.preferredWidth: 32
-        Layout.preferredHeight: 32
+    RowLayout {
+        Layout.fillWidth: true
+        spacing: 12
+        Image {
+            id: icon
+            source: ""
+            visible: source.toString() ? true : false
+            Layout.preferredWidth: 32
+            Layout.preferredHeight: 32
+        }
+        ColumnLayout {
+            Layout.fillWidth: true
+            spacing: 4
+            Label {
+                id: primaryText
+                text: ""
+                visible: text ? true : false
+                Layout.fillWidth: true
+                wrapMode: Text.WrapAnywhere
+                font.bold: true
+            }
+            Label {
+                id: informativeText
+                text: ""
+                visible: text ? true : false
+                Layout.fillWidth: true
+                wrapMode: Text.WrapAnywhere
+            }
+        }
     }
 
-    ColumnLayout {
+    Label {
+        id: detailedText
+        text: ""
+        visible: text ? true : false
         Layout.fillWidth: true
-        spacing: parent.spacing
-        Label {
-            id: primaryText
-            text: ""
-            visible: text ? true : false
+        wrapMode: Text.WrapAnywhere
+        color: "#444444"
+    }
+
+    Item {
+        id: content
+        Layout.fillWidth: true
+    }
+
+    Item {
+        Layout.fillHeight: true
+    }
+
+    RowLayout {
+        Layout.fillWidth: true
+        spacing: 4
+        Item {
             Layout.fillWidth: true
-            wrapMode: Text.WrapAnywhere
-            font.bold: true
         }
-        Label {
-            id: informativeText
+        Button {
+            id: acceptButton
             text: ""
             visible: text ? true : false
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAnywhere
         }
-        Item {
-            Layout.fillHeight: true
-        }
-        Label {
-            id: detailedText
+        Button {
+            id: rejectButton
             text: ""
             visible: text ? true : false
-            Layout.fillWidth: true
-            wrapMode: Text.WrapAnywhere
-            color: "#444444"
-        }
-        Item {
-            id: content
-            Layout.fillWidth: true
-        }
-        Item {
-            Layout.fillHeight: true
-        }
-        RowLayout {
-            Layout.fillWidth: true
-            spacing: parent.spacing
-            Item {
-                Layout.fillWidth: true
-            }
-            Button {
-                id: acceptButton
-                text: ""
-                visible: text ? true : false
-            }
-            Button {
-                id: rejectButton
-                text: ""
-                visible: text ? true : false
-            }
         }
     }
 }