3 files changed, 16 insertions, 23 deletions
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
index e0ae0d9c54..9ec3a550da 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Imagine/MessageDialog.qml
@@ -54,7 +54,7 @@ MessageDialogImpl {
         leftPadding: 16
         rightPadding: 16
         topPadding: 12
-        height: control.title.length > 0 ? implicitHeight : 0
+        visible: control.title.length > 0
 
         background: NinePatchImage {
             width: parent.width
@@ -97,28 +97,26 @@ MessageDialogImpl {
 
         RowLayout {
             id: rowLayout
+            spacing: 12
+
+            Layout.leftMargin: 16
+            Layout.rightMargin: 16
+            Layout.bottomMargin: 16
 
             Button {
                 id: detailedTextButton
                 objectName: "detailedTextButton"
                 text: control.showDetailedText ? qsTr("Hide Details...") : qsTr("Show Details...")
-
-                Layout.leftMargin: 16
             }
 
             DialogButtonBox {
                 id: buttonBox
                 objectName: "buttonBox"
                 spacing: 12
-                horizontalPadding: 0
-                verticalPadding: 20
+                padding: 0
 
                 Layout.fillWidth: true
-                Layout.leftMargin: detailedTextButton.visible ? 12 : 16
-                Layout.rightMargin: 16
             }
-
-            Layout.bottomMargin: 16
         }
 
         TextArea {
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
index 241919bf42..ac63d281d1 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/+Universal/MessageDialog.qml
@@ -79,16 +79,14 @@ MessageDialogImpl {
 
         RowLayout {
             id: rowLayout
+            spacing: 12
 
-            Layout.topMargin: 20
-            Layout.bottomMargin: 20
+            Layout.margins: 20
 
             Button {
                 id: detailedTextButton
                 objectName: "detailedTextButton"
                 text: control.showDetailedText ? qsTr("Hide Details...") : qsTr("Show Details...")
-
-                Layout.leftMargin: 20
             }
 
             DialogButtonBox {
@@ -96,14 +94,10 @@ MessageDialogImpl {
                 objectName: "buttonBox"
                 spacing: 12
                 horizontalPadding: 0
-                verticalPadding: 20
-
                 topPadding: 0
                 bottomPadding: 0
 
                 Layout.fillWidth: true
-                Layout.leftMargin: detailedTextButton.visible ? 12 : 20
-                Layout.rightMargin: 20
             }
         }
 
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml b/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
index e9123eaf79..5dc7ee7873 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qml/MessageDialog.qml
@@ -81,25 +81,26 @@ MessageDialogImpl {
 
         RowLayout {
             id: rowLayout
+            spacing: 12
+
+            Layout.leftMargin: 20
+            Layout.rightMargin: 20
+            Layout.bottomMargin: 20
 
             Button {
                 id: detailedTextButton
                 objectName: "detailedTextButton"
                 text: control.showDetailedText ? qsTr("Hide Details...") : qsTr("Show Details...")
-
-                Layout.leftMargin: 20
+                padding: 0
             }
 
             DialogButtonBox {
                 id: buttonBox
                 objectName: "buttonBox"
                 spacing: 12
-                horizontalPadding: 0
-                verticalPadding: 20
+                padding: 0
 
                 Layout.fillWidth: true
-                Layout.leftMargin: detailedTextButton.visible ? 12 : 20
-                Layout.rightMargin: 20
             }
         }