2 files changed, 5 insertions, 3 deletions
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index 9b55d26d..b9d34b46 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -83,7 +83,7 @@ Style {
     padding {
         top: 4
         left: 4
-        right:  control.menu !== null ? Math.round(TextSingleton.implicitHeight * 0.5) : 4
+        right: 4 + (control.menu !== null ? Math.round(TextSingleton.implicitHeight * 0.5) : 0)
         bottom: 4
     }
 
@@ -121,7 +121,7 @@ Style {
             source: "images/arrow-down.png"
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
-            anchors.rightMargin: padding.right
+            anchors.rightMargin: 4
             opacity: control.enabled ? 0.6 : 0.5
         }
     }
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index 6fbdaede..e89e862a 100644
--- a/src/controls/Styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 import QtQuick 2.2
 import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.1
 import QtQuick.Window 2.1
 import QtQuick.Controls.Private 1.0
 
@@ -168,7 +169,7 @@ Style {
             sourceComponent: background
             anchors.fill: parent
         }
-        Row {
+        RowLayout {
             id: row
             anchors.fill: parent
 
@@ -185,6 +186,7 @@ Style {
             }
             Loader {
                 id: labelLoader
+                Layout.fillWidth: true
                 sourceComponent: label
                 anchors.verticalCenter: parent.verticalCenter
             }