diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index 145e544b19..e683f89823 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -64,11 +64,7 @@ ScrollView
                 {
                     id: materialList
                     model: toolbox.pluginsInstalledModel
-                    delegate: Loader
-                    {
-                        asynchronous: true
-                        source: "ToolboxInstalledTile.qml"
-                    }
+                    delegate: ToolboxInstalledTile {}
                 }
             }
         }
@@ -105,11 +101,7 @@ ScrollView
                 {
                     id: pluginList
                     model: toolbox.materialsInstalledModel
-                    delegate: Loader
-                    {
-                        asynchronous: true
-                        source: "ToolboxInstalledTile.qml"
-                    }
+                    delegate: ToolboxInstalledTile {}
                 }
             }
         }
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
index 621ecd96ea..eb3a93f274 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
@@ -6,6 +6,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import UM 1.1 as UM
 
+import Cura 1.0 as Cura
+
 Column
 {
     property bool canUpdate: false
@@ -43,44 +45,18 @@ Column
         visible: canUpdate
     }
 
-    Button
+    Cura.SecondaryButton
     {
         id: removeButton
         text: canDowngrade ? catalog.i18nc("@action:button", "Downgrade") : catalog.i18nc("@action:button", "Uninstall")
         visible: !model.is_bundled && model.is_installed
         enabled: !toolbox.isDownloading
-        style: ButtonStyle
-        {
-            background: Rectangle
-            {
-                implicitWidth: UM.Theme.getSize("toolbox_action_button").width
-                implicitHeight: UM.Theme.getSize("toolbox_action_button").height
-                color: "transparent"
-                border
-                {
-                    width: UM.Theme.getSize("default_lining").width
-                    color:
-                    {
-                        if (control.hovered)
-                        {
-                            return UM.Theme.getColor("primary_hover")
-                        }
-                        else
-                        {
-                            return UM.Theme.getColor("lining")
-                        }
-                    }
-                }
-            }
-            label: Label
-            {
-                text: control.text
-                color: UM.Theme.getColor("text")
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-                font: UM.Theme.getFont("default")
-            }
-        }
+
+        width: UM.Theme.getSize("toolbox_action_button").width
+        height: UM.Theme.getSize("toolbox_action_button").height
+
+        fixedWidthMode: true
+
         onClicked: toolbox.checkPackageUsageAndUninstall(model.id)
         Connections
         {
diff --git a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
index 00b0b985f5..0b574e8653 100644
--- a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
@@ -5,7 +5,7 @@ import QtQuick 2.2
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import UM 1.1 as UM
-
+import Cura 1.0 as Cura
 
 Item
 {
@@ -25,9 +25,12 @@ Item
     width: UM.Theme.getSize("toolbox_action_button").width
     height: UM.Theme.getSize("toolbox_action_button").height
 
-    Button
+    Cura.PrimaryButton
     {
         id: button
+        width: UM.Theme.getSize("toolbox_action_button").width
+        height: UM.Theme.getSize("toolbox_action_button").height
+        fixedWidthMode: true
         text:
         {
             if (complete)
@@ -58,92 +61,6 @@ Item
                 readyAction()
             }
         }
-        style: ButtonStyle
-        {
-            background: Rectangle
-            {
-                implicitWidth: UM.Theme.getSize("toolbox_action_button").width
-                implicitHeight: UM.Theme.getSize("toolbox_action_button").height
-                color:
-                {
-                    if (base.complete)
-                    {
-                        return "transparent"
-                    }
-                    else
-                    {
-                        if (control.hovered)
-                        {
-                            return UM.Theme.getColor("primary_hover")
-                        }
-                        else
-                        {
-                            return UM.Theme.getColor("primary")
-                        }
-                    }
-                }
-                border
-                {
-                    width:
-                    {
-                        if (base.complete)
-                        {
-                            UM.Theme.getSize("default_lining").width
-                        }
-                        else
-                        {
-                            return 0
-                        }
-                    }
-                    color:
-                    {
-                        if (control.hovered)
-                        {
-                            return UM.Theme.getColor("primary_hover")
-                        }
-                        else
-                        {
-                            return UM.Theme.getColor("lining")
-                        }
-                    }
-                }
-            }
-            label: Label
-            {
-                text: control.text
-                color:
-                {
-                    if (base.complete)
-                    {
-                        return UM.Theme.getColor("text")
-                    }
-                    else
-                    {
-                        if (control.hovered)
-                        {
-                            return UM.Theme.getColor("button_text_hover")
-                        }
-                        else
-                        {
-                            return UM.Theme.getColor("button_text")
-                        }
-                    }
-                }
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-                font:
-                {
-                    if (base.complete)
-                    {
-                        return UM.Theme.getFont("default")
-                    }
-                    else
-                    {
-                        return UM.Theme.getFont("default_bold")
-                    }
-                }
-            }
-        }
     }
 
     AnimatedImage