1 files changed, 16 insertions, 13 deletions
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 97ea6c57..ac027d75 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -49,6 +49,7 @@ T.SpinBox {
                              background ? background.implicitHeight : 0,
                              up.indicator ? up.indicator.implicitHeight : 0,
                              down.indicator ? down.indicator.implicitHeight : 0)
+    baselineOffset: contentItem.y + contentItem.baselineOffset
 
     // TextControlThemePadding + 2 (border)
     topPadding: 5
@@ -73,7 +74,7 @@ T.SpinBox {
         font: control.font
         color: !enabled ? control.Universal.chromeDisabledLowColor :
                 activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor
-        selectionColor: control.Universal.accentColor
+        selectionColor: control.Universal.accent
         selectedTextColor: control.Universal.chromeWhiteColor
         horizontalAlignment: Qt.AlignHCenter
         verticalAlignment: TextInput.AlignVCenter
@@ -86,16 +87,17 @@ T.SpinBox {
 
     //! [up.indicator]
     up.indicator: Item {
-        implicitWidth: 26
-        height: parent.height
+        implicitWidth: 28
+        height: parent.height + 4
+        y: -2
         x: control.mirrored ? 0 : parent.width - width
 
         Rectangle {
-            x: 2; y: 2
+            x: 2; y: 4
             width: parent.width - 4
-            height: parent.height - 4
+            height: parent.height - 8
             color: !control.up.pressed ? "transparent" :
-                   control.activeFocus ? control.Universal.accentColor
+                   control.activeFocus ? control.Universal.accent
                                        : control.Universal.chromeDisabledLowColor
         }
 
@@ -110,16 +112,17 @@ T.SpinBox {
 
     //! [down.indicator]
     down.indicator: Item {
-        implicitWidth: 26
-        height: parent.height
+        implicitWidth: 28
+        height: parent.height + 4
+        y: -2
         x: control.mirrored ? parent.width - width : 0
 
         Rectangle {
-            x: 2; y: 2
+            x: 2; y: 4
             width: parent.width - 4
-            height: parent.height - 4
+            height: parent.height - 8
             color: !control.down.pressed ? "transparent" :
-                     control.activeFocus ? control.Universal.accentColor
+                     control.activeFocus ? control.Universal.accent
                                          : control.Universal.chromeDisabledLowColor
         }
 
@@ -134,12 +137,12 @@ T.SpinBox {
 
     //! [background]
     background: Rectangle {
-        implicitWidth: 60 + 26 // TextControlThemeMinWidth - 4 (border)
+        implicitWidth: 60 + 28 // TextControlThemeMinWidth - 4 (border)
         implicitHeight: 28 // TextControlThemeMinHeight - 4 (border)
 
         border.width: 2 // TextControlBorderThemeThickness
         border.color: !control.enabled ? control.Universal.baseLowColor :
-                       control.activeFocus ? control.Universal.accentColor : control.Universal.chromeDisabledLowColor
+                       control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor
         color: control.enabled ? control.Universal.altHighColor : control.Universal.baseLowColor
     }
     //! [background]