diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml
index d15d98eed7..f70dab03d8 100644
--- a/plugins/Toolbox/resources/qml/Toolbox.qml
+++ b/plugins/Toolbox/resources/qml/Toolbox.qml
@@ -48,32 +48,32 @@ Window
             ToolboxLoadingPage
             {
                 id: viewLoading
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
+                visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "loading"
             }
             ToolboxErrorPage
             {
                 id: viewErrored
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
+                visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "errored"
             }
             ToolboxDownloadsPage
             {
                 id: viewDownloads
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "overview"
+                visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "overview"
             }
             ToolboxDetailPage
             {
                 id: viewDetail
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "detail"
+                visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "detail"
             }
             ToolboxAuthorPage
             {
                 id: viewAuthor
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "author"
+                visible: toolbox.viewCategory !== "installed" && toolbox.viewPage === "author"
             }
             ToolboxInstalledPage
             {
                 id: installedPluginList
-                visible: toolbox.viewCategory == "installed"
+                visible: toolbox.viewCategory === "installed"
             }
         }
 
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
index 4e44ea7d0b..22c6b6045f 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
@@ -1,9 +1,8 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.10
+import QtQuick.Controls 2.3
 import UM 1.1 as UM
 
 Item
@@ -11,10 +10,9 @@ Item
     id: detailList
     ScrollView
     {
-        frameVisible: false
+        clip: true
         anchors.fill: detailList
-        style: UM.Theme.styles.scrollview
-        flickableItem.flickableDirection: Flickable.VerticalFlick
+
         Column
         {
             anchors
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
index 1fb6175308..5badc6b66d 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
@@ -1,9 +1,9 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // 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.Controls 2.3
+
 import UM 1.1 as UM
 
 Item
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
index 3e0dda4f4a..5ea24d17ba 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
@@ -1,25 +1,20 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.10
+import QtQuick.Controls 2.3
 import UM 1.1 as UM
 
 ScrollView
 {
-    frameVisible: false
+    clip: true
     width: parent.width
     height: parent.height
-    style: UM.Theme.styles.scrollview
-
-    flickableItem.flickableDirection: Flickable.VerticalFlick
 
     Column
     {
         width: base.width
         spacing: UM.Theme.getSize("default_margin").height
-        height: childrenRect.height
 
         ToolboxDownloadsShowcase
         {
@@ -31,14 +26,14 @@ ScrollView
         {
             id: allPlugins
             width: parent.width
-            heading: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Community Contributions") : catalog.i18nc("@label", "Community Plugins")
-            model: toolbox.viewCategory == "material" ? toolbox.materialsAvailableModel : toolbox.pluginsAvailableModel
+            heading: toolbox.viewCategory === "material" ? catalog.i18nc("@label", "Community Contributions") : catalog.i18nc("@label", "Community Plugins")
+            model: toolbox.viewCategory === "material" ? toolbox.materialsAvailableModel : toolbox.pluginsAvailableModel
         }
 
         ToolboxDownloadsGrid
         {
             id: genericMaterials
-            visible: toolbox.viewCategory == "material"
+            visible: toolbox.viewCategory === "material"
             width: parent.width
             heading: catalog.i18nc("@label", "Generic Materials")
             model: toolbox.materialsGenericModel
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index 0c43c67679..46ed549b7e 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -1,22 +1,17 @@
-// Copyright (c) 2018 Ultimaker B.V.
+// Copyright (c) 2019 Ultimaker B.V.
 // Toolbox is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
-import QtQuick.Dialogs 1.1
-import QtQuick.Window 2.2
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls 2.3
 
 import UM 1.1 as UM
 
 ScrollView
 {
     id: page
-    frameVisible: false
+    clip: true
     width: parent.width
     height: parent.height
-    style: UM.Theme.styles.scrollview
-    flickableItem.flickableDirection: Flickable.VerticalFlick
 
     Column
     {