diff --git a/plugins/CuraDrive/src/qml/images/loading.gif b/plugins/CuraDrive/src/qml/images/loading.gif
deleted file mode 100644
index 791dcaa0c9..0000000000
Binary files a/plugins/CuraDrive/src/qml/images/loading.gif and /dev/null differ
diff --git a/plugins/Toolbox/resources/images/loading.gif b/plugins/Toolbox/resources/images/loading.gif
deleted file mode 100644
index 43cc1ed6d7..0000000000
Binary files a/plugins/Toolbox/resources/images/loading.gif and /dev/null differ
diff --git a/plugins/Toolbox/resources/images/loading.svg b/plugins/Toolbox/resources/images/loading.svg
deleted file mode 100644
index 1ceb4a8d7f..0000000000
--- a/plugins/Toolbox/resources/images/loading.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="200px" height="200px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="lds-rolling" style="animation-play-state: running; animation-delay: 0s; background-image: none; background-position: initial initial; background-repeat: initial initial;"><circle cx="50" cy="50" fill="none" ng-attr-stroke="{{config.color}}" ng-attr-stroke-width="{{config.width}}" ng-attr-r="{{config.radius}}" ng-attr-stroke-dasharray="{{config.dasharray}}" stroke="#0CA9E3" stroke-width="13" r="43" stroke-dasharray="202.63272615654165 69.54424205218055" style="animation-play-state: running; animation-delay: 0s;"><animateTransform attributeName="transform" type="rotate" calcMode="linear" values="0 50 50;360 50 50" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite" style="animation-play-state: running; animation-delay: 0s;"></animateTransform></circle></svg>
\ No newline at end of file
diff --git a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
index 933e3a5900..4d4ae92e73 100644
--- a/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
@@ -62,17 +62,6 @@ Item
                 readyAction()
             }
         }
-    }
-
-    AnimatedImage
-    {
-        id: loader
-        visible: active
-        source: visible ? "../images/loading.gif" : ""
-        width: UM.Theme.getSize("toolbox_loader").width
-        height: UM.Theme.getSize("toolbox_loader").height
-        anchors.right: button.left
-        anchors.rightMargin: UM.Theme.getSize("default_margin").width
-        anchors.verticalCenter: button.verticalCenter
+        busy: active
     }
 }
diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index fabdcebc64..6406e83efe 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -130,5 +130,15 @@ Button
         height: parent.height
 
         visible: false
+
+        RotationAnimator
+        {
+            target: busyIndicator.contentItem
+            running: busyIndicator.visible && busyIndicator.running
+            from: 0
+            to: 360
+            loops: Animation.Infinite
+            duration: 2500
+        }
     }
 }
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml
index 846e343028..e6706421bb 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedTroubleshootingGuides.qml
@@ -13,7 +13,7 @@ Item
 {
     id: tipsCell
     anchors.top: adhesionCheckBox.visible ? adhesionCheckBox.bottom : (enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom)
-    anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height * 2)
+    anchors.topMargin: Math.round(UM.Theme.getSize("default_margin").height * 2)
     anchors.left: parent.left
     width: parent.width
     height: tipsText.contentHeight * tipsText.lineCount
@@ -22,9 +22,9 @@ Item
     {
         id: tipsText
         anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
+        anchors.leftMargin: UM.Theme.getSize("default_margin").width
         anchors.right: parent.right
-        anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
+        anchors.rightMargin: UM.Theme.getSize("default_margin").width
         anchors.top: parent.top
         wrapMode: Text.WordWrap
         text: catalog.i18nc("@label", "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>").arg("https://ultimaker.com/en/troubleshooting")