diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index c7d8d41d2a..7f3644ee83 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -413,7 +413,7 @@ UM.MainWindow
                 anchors {
                     left: parent.left
                     top: parent.top
-                    topMargin: 74
+                    topMargin: UM.Theme.sizes.default_margin.height + UM.Theme.sizes.button.height
                     //horizontalCenter: parent.horizontalCenter
                     //horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
                     //top: parent.top;
diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index d0aa41d159..aa01182aaa 100644
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -57,11 +57,11 @@ QtObject {
         ButtonStyle {
             background: Item{
                 implicitWidth: UM.Theme.sizes.button.width;
-                implicitHeight: UM.Theme.sizes.button.width;
+                implicitHeight: UM.Theme.sizes.button.height;
                 Rectangle {
                     anchors.left: parent.right
                     anchors.verticalCenter: parent.verticalCenter
-                    color: "white"
+                    color: UM.Theme.colors.button_text
                     width: control.hovered ? openFileLabel.width : 0;
                     height: openFileLabel.height
                     Behavior on width { NumberAnimation { duration: 100; } }
@@ -87,7 +87,7 @@ QtObject {
                     source: control.iconSource;
                     width: UM.Theme.sizes.button_icon.width;
                     height: UM.Theme.sizes.button_icon.height;
-                    sourceSize: UM.Theme.sizes.button_icon;
+                    sourceSize: UM.Theme.sizes.button_icon
                 }
             }
         }
@@ -178,7 +178,7 @@ QtObject {
                     width: UM.Theme.sizes.button_icon.width;
                     height: UM.Theme.sizes.button_icon.height;
 
-                    sourceSize: UM.Theme.sizes.button_icon;
+                    sourceSize: UM.Theme.sizes.button_icon
                 }
             }
         }
@@ -243,7 +243,7 @@ QtObject {
                     width: UM.Theme.sizes.button_icon.width;
                     height: UM.Theme.sizes.button_icon.height;
 
-                    sourceSize: UM.Theme.sizes.button_icon;
+                    sourceSize: UM.Theme.sizes.button_icon
                 }
             }
         }
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 97c475915a..87704dfd19 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -151,11 +151,6 @@
         "default_margin": [1.0, 1.0],
         "default_lining": [0.1, 0.1],
         "logo": [9.5, 2.0],
-        "toolbar_button": [2.0, 2.0],
-        "toolbar_spacing": [1.0, 1.0],
-
-        "loadfile_button": [11.0, 2.4],
-        "loadfile_margin": [0.8, 0.4],
 
         "sidebar": [26.0, 10.0],
         "sidebar_header": [0.0, 3.2],
@@ -179,8 +174,8 @@
         "standard_list_input": [20.0, 25.0],
         "standard_arrow": [0.6, 0.6],
 
-        "button": [3.2, 3.2],
-        "button_icon": [2.5, 2.5],
+        "button": [3.8, 3.8],
+        "button_icon": [2.6, 2.6],
 
         "progressbar": [26.0, 0.8],
         "progressbar_control": [8.0, 0.8],