diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 58192f0acd..d23b0b9458 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -1,10 +1,8 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2022 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Controls.Styles 1.1
-import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.1
 
 import UM 1.1 as UM
 
@@ -13,39 +11,38 @@ import ".."
 Button {
     id: base;
 
-    style: ButtonStyle {
-        background: Item { }
-        label: Row
+    background: Item { }
+
+    contentItem: Row
+    {
+        spacing: UM.Theme.getSize("default_lining").width
+
+        UM.RecolorImage
         {
-            spacing: UM.Theme.getSize("default_lining").width
-
-            UM.RecolorImage
-            {
-                anchors.verticalCenter: parent.verticalCenter
-                height: (label.height / 2) | 0
-                width: height
-                source: control.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
-                color: control.hovered ? palette.highlight : palette.buttonText
-            }
-            UM.RecolorImage
-            {
-                anchors.verticalCenter: parent.verticalCenter
-                height: label.height
-                width: height
-                source: control.iconSource
-                color: control.hovered ? palette.highlight : palette.buttonText
-            }
-            Label
-            {
-                id: label
-                anchors.verticalCenter: parent.verticalCenter
-                text: control.text
-                color: control.hovered ? palette.highlight : palette.buttonText
-                font.bold: true
-            }
-
-            SystemPalette { id: palette }
+            anchors.verticalCenter: parent.verticalCenter
+            height: (label.height / 2) | 0
+            width: height
+            source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
+            color: base.hovered ? palette.highlight : palette.buttonText
         }
+        UM.RecolorImage
+        {
+            anchors.verticalCenter: parent.verticalCenter
+            height: label.height
+            width: height
+            source: UM.Theme.getIcon(definition.icon)
+            color: base.hovered ? palette.highlight : palette.buttonText
+        }
+        Label
+        {
+            id: label
+            anchors.verticalCenter: parent.verticalCenter
+            text: base.text
+            color: base.hovered ? palette.highlight : palette.buttonText
+            font.bold: true
+        }
+
+        SystemPalette { id: palette }
     }
 
     signal showTooltip(string text);
@@ -53,7 +50,6 @@ Button {
     signal contextMenuRequested()
 
     text: definition.label
-    iconSource: UM.Theme.getIcon(definition.icon)
 
     checkable: true
     checked: definition.expanded