Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r9327fae7b109203ca698d361b113a81d139a0cf9 -r8a5dbf556a66524fbe4b60ac1573182a0bd27617
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 9327fae7b109203ca698d361b113a81d139a0cf9)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
@@ -36,8 +36,15 @@
         _flickable.interactive = isInteractive
     }
 
+    ScrollBar {
+        flickable   : _flickable
+        anchors.fill: _flickable
+        anchors.rightMargin : Variables.minVGap
+    }
+
     Flickable { id: _flickable
         objectName: "TreatmentCreateFlickable"
+        clip: true
         anchors {
             top             : _root.title.bottom
             topMargin       : Variables.minVGap
@@ -48,20 +55,8 @@
         width: parent.width
         contentWidth: parent.width
         contentHeight: _column.implicitHeight
-        clip: true
         flickDeceleration: Variables.createTreatmentFlickableDeceleration
 
-        ScrollBar.vertical: ScrollBar { id: _scrollBar
-            anchors.right: _flickable.right
-            anchors.rightMargin: 3
-            contentItem: Rectangle {
-                color: Colors.backgroundRangeRect
-                implicitWidth: 6
-                radius: width / 2
-                width: 3
-            }
-        }
-
         Column { id: _column
             spacing: Variables.treatmentSpacing
             anchors.horizontalCenter: parent.horizontalCenter
@@ -263,7 +258,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 Text { id: _arterialLabel
                     visible : true
-                    color   : "white"
+                    color   : Colors.textMain
                     text: qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")"
                     font.pixelSize  : Fonts.fontPixelFluidText
                     anchors.left    : _arterialPressureLimits.left
@@ -329,7 +324,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 Text { id: _venousLabel
                     visible : true
-                    color   : "white"
+                    color   : Colors.textMain
                     text: qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")"
                     font.pixelSize  : Fonts.fontPixelFluidText
                     anchors.left    : _venousPressureLimits.left