diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
index 5326edd615a..45ee8e65724 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
@@ -80,8 +80,8 @@ T.AbstractButton {
             when: myButton.hovered && myButton.pressed
             PropertyChanges {
                 target: buttonBackground
-                color: StudioTheme.Values.themeControlBackgroundPressed
-                border.color: StudioTheme.Values.themeInteraction
+                color: StudioTheme.Values.themeControlBackgroundInteraction
+                border.color: StudioTheme.Values.themeControlOutlineInteraction
             }
         },
         State {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml
index 569b168697c..94e83a905c2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml
@@ -145,7 +145,7 @@ Rectangle {
                             target: backgroundCard
                             color:StudioTheme.Values.themeInteraction
                             border.width: StudioTheme.Values.border
-                            border.color: StudioTheme.Values.themeControlBackgroundPressed
+                            border.color: StudioTheme.Values.themeControlOutlineInteraction
                         }
                     }
                 ]
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
index cc0b93660a7..7929d2a0538 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
@@ -52,7 +52,7 @@ Row {
             if (enumString === "")
                 enumString = root.backendValue.value
 
-            root.origin = enumString
+            root.origin = enumString === undefined ? "Center" : enumString
         }
     }
 
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginSelector.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginSelector.qml
index e5f8cd8372e..e42aff045b4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginSelector.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginSelector.qml
@@ -48,7 +48,7 @@ Rectangle {
     states: [
         State {
             name: "default"
-            when: !mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== value
+            when: !mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== root.value
             PropertyChanges {
                 target: root
                 color: StudioTheme.Values.themeTextColorDisabled // TODO
@@ -56,7 +56,7 @@ Rectangle {
         },
         State {
             name: "hover"
-            when: mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== value
+            when: mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== root.value
             PropertyChanges {
                 target: root
                 color: StudioTheme.Values.themeControlBackgroundInteraction // TODO
@@ -64,7 +64,7 @@ Rectangle {
         },
         State {
             name: "press"
-            when: mouseArea.containsPress && myControl.origin !== enumValue
+            when: mouseArea.containsPress && myControl.origin !== root.value
             PropertyChanges {
                 target: root
                 color: StudioTheme.Values.themeControlBackgroundInteraction // TODO
@@ -73,7 +73,7 @@ Rectangle {
         },
         State {
             name: "active"
-            when: myControl.origin === value
+            when: myControl.origin === root.value
             PropertyChanges {
                 target: root
                 color: StudioTheme.Values.themeInteraction
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
index b0ffe3fe6cb..cd22b7e7f26 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
@@ -46,18 +46,18 @@ Item {
     implicitHeight: spinBox.height
 
     onFocusChanged: {
-        restoreCursor();
-        transaction.end();
+        restoreCursor()
+        transaction.end()
     }
 
     Component.onCompleted: {
-        spinBox.enabled = !isBlocked(backendValue.name);
+        spinBox.enabled = backendValue === undefined ? false : !isBlocked(backendValue.name)
     }
 
     Connections {
         target: modelNodeBackend
         function onSelectionChanged() {
-            spinBox.enabled = !isBlocked(backendValue.name);
+            spinBox.enabled = backendValue === undefined ? false : !isBlocked(backendValue.name)
         }
     }
 
@@ -65,25 +65,25 @@ Item {
         id: spinBox
 
         onDragStarted: {
-            hideCursor();
-            transaction.start();
+            hideCursor()
+            transaction.start()
         }
 
         onDragEnded: {
-            restoreCursor();
-            transaction.end();
+            restoreCursor()
+            transaction.end()
         }
 
-        onDragging: holdCursorInPlace();
+        onDragging: holdCursorInPlace()
 
         onRealValueModified: {
             if (transaction.active())
-                commitValue();
+                commitValue()
         }
 
         function commitValue() {
             if (spinBox.backendValue.value !== spinBox.realValue)
-                spinBox.backendValue.value = spinBox.realValue;
+                spinBox.backendValue.value = spinBox.realValue
         }
 
         property variant backendValue