diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
index a9fcb39b28..6682281a31 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
@@ -2,9 +2,7 @@
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
+import QtQuick.Controls 2.3
 import UM 1.1 as UM
 
 Column
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
index 5ea24d17ba..c9bb74afea 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
@@ -7,6 +7,7 @@ import UM 1.1 as UM
 
 ScrollView
 {
+    id: base
     clip: true
     width: parent.width
     height: parent.height
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index 46ed549b7e..1079331185 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -15,31 +15,26 @@ ScrollView
 
     Column
     {
+        width: page.width
         spacing: UM.Theme.getSize("default_margin").height
+        padding: UM.Theme.getSize("wide_margin").width
         visible: toolbox.pluginsInstalledModel.items.length > 0
-        height: childrenRect.height + 4 * UM.Theme.getSize("default_margin").height
-
-        anchors
-        {
-            right: parent.right
-            left: parent.left
-            margins: UM.Theme.getSize("default_margin").width
-            top: parent.top
-        }
+        height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height
 
         Label
         {
-            width: page.width
+            width: parent.width - 2 * parent.padding
             text: catalog.i18nc("@title:tab", "Plugins")
             color: UM.Theme.getColor("text_medium")
             font: UM.Theme.getFont("large")
             renderType: Text.NativeRendering
         }
+
         Rectangle
         {
             id: installedPlugins
             color: "transparent"
-            width: parent.width
+            width: parent.width - 2 * parent.padding
             height: childrenRect.height + UM.Theme.getSize("default_margin").width
             border.color: UM.Theme.getColor("lining")
             border.width: UM.Theme.getSize("default_lining").width
@@ -60,8 +55,10 @@ ScrollView
                 }
             }
         }
+
         Label
         {
+            width: parent.width - 2 * parent.padding
             text: catalog.i18nc("@title:tab", "Materials")
             color: UM.Theme.getColor("text_medium")
             font: UM.Theme.getFont("medium")
@@ -72,7 +69,7 @@ ScrollView
         {
             id: installedMaterials
             color: "transparent"
-            width: parent.width
+            width: parent.width - 2 * parent.padding
             height: childrenRect.height + UM.Theme.getSize("default_margin").width
             border.color: UM.Theme.getColor("lining")
             border.width: UM.Theme.getSize("default_lining").width