diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml
index a288426e0c..bfb23930c6 100644
--- a/resources/qml/Account/AccountDetails.qml
+++ b/resources/qml/Account/AccountDetails.qml
@@ -13,8 +13,8 @@ Column
     property var loggedIn: false
     property var profileImage: ""
 
-    padding: 2 * UM.Theme.getSize("default_margin").height
-    spacing: 2 * UM.Theme.getSize("default_margin").height
+    padding: UM.Theme.getSize("wide_margin").height
+    spacing: UM.Theme.getSize("wide_margin").height
 
     AvatarImage
     {
diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index 0b4076c04a..89f6cf9f25 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -139,8 +139,8 @@ Item
             sourceSize.width: width
             sourceSize.height: height
             visible: source != ""
-            width: height
-            height: Math.round(0.2 * base.height)
+            width: UM.Theme.getSize("standard_arrow").width
+            height: UM.Theme.getSize("standard_arrow").height
             color: UM.Theme.getColor("text")
         }
 
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index a2856e1fe5..0524a6de9e 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -93,7 +93,7 @@ Item
 
             background: Item {}
 
-            onClicked: togglePopup() // Will hide the popup item
+            onClicked: toggleContent() // Will hide the popup item
         }
     }
 
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index f742d0bef3..49b4f87267 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -134,7 +134,7 @@ Cura.ExpandableComponent
                 text: catalog.i18nc("@button", "Add printer")
                 onClicked:
                 {
-                    togglePopup()
+                    toggleContent()
                     Cura.Actions.addMachine.trigger()
                 }
             }
@@ -146,7 +146,7 @@ Cura.ExpandableComponent
                 text: catalog.i18nc("@button", "Manage printers")
                 onClicked:
                 {
-                    togglePopup()
+                    toggleContent()
                     Cura.Actions.configureMachines.trigger()
                 }
             }
diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml
index 369e75cede..b88af35f82 100644
--- a/resources/qml/PrinterSelector/MachineSelectorButton.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml
@@ -83,7 +83,7 @@ Button
 
     onClicked:
     {
-        togglePopup()
+        toggleContent()
         Cura.MachineManager.setActiveMachine(model.id)
     }
 
diff --git a/resources/qml/ViewsSelector.qml b/resources/qml/ViewsSelector.qml
index 97de60689b..71a29e4949 100644
--- a/resources/qml/ViewsSelector.qml
+++ b/resources/qml/ViewsSelector.qml
@@ -120,7 +120,7 @@ Cura.ExpandableComponent
 
                 onClicked:
                 {
-                    viewSelector.togglePopup()
+                    toggleContent()
                     UM.Controller.setActiveView(id)
                 }
             }