Index: resources/images/chevron-left.png
===================================================================
diff -u -rb7928a4d8056d00c11bf36b29ade9afb0840134a -rf813d68fd04134b788273466fbf754b8996b4ac2
Binary files differ
Index: resources/images/chevron-right.png
===================================================================
diff -u -rb7928a4d8056d00c11bf36b29ade9afb0840134a -rf813d68fd04134b788273466fbf754b8996b4ac2
Binary files differ
Index: sources/gui/qml/components/SliderCreateTreatment.qml
===================================================================
diff -u -rb7928a4d8056d00c11bf36b29ade9afb0840134a -rf813d68fd04134b788273466fbf754b8996b4ac2
--- sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision b7928a4d8056d00c11bf36b29ade9afb0840134a)
+++ sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision f813d68fd04134b788273466fbf754b8996b4ac2)
@@ -131,11 +131,13 @@
         visible : true
         anchors.verticalCenter  : _slider.verticalCenter
         anchors.left            : _slider.right
-        onIncrementValue: {
+        anchors.leftMargin      : Variables.sliderAdjustButtonLeftMargin
+
+        onIncrementValue        : {
             setActiveValid()
             _slider.incrementValue(true)
         }
-        onDecrementValue: {
+        onDecrementValue        : {
             setActiveValid()
             _slider.decrementValue(true)
         }
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rb7928a4d8056d00c11bf36b29ade9afb0840134a -rf813d68fd04134b788273466fbf754b8996b4ac2
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision b7928a4d8056d00c11bf36b29ade9afb0840134a)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision f813d68fd04134b788273466fbf754b8996b4ac2)
@@ -170,8 +170,9 @@
     readonly property int sliderAdjustButtonBorderWidth         : 2
     readonly property int sliderAdjustButtonSpacing             : 20
     readonly property int sliderAdjustButtonDiameter            : 50
+    readonly property int sliderAdjustButtonLeftMargin          : 30
 
-    readonly property int circleButtonDefaultDiameter            : 45
+    readonly property int circleButtonDefaultDiameter           : 45
 
 
     // ---------- < PRS > Related Section ----------
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r930128c05f11253bddce102380f4512dbb454aae -rf813d68fd04134b788273466fbf754b8996b4ac2
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 930128c05f11253bddce102380f4512dbb454aae)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision f813d68fd04134b788273466fbf754b8996b4ac2)
@@ -173,6 +173,7 @@
                 onReleased  : vTreatmentCreate.heparinDispensingRate = value
                 adjustable  : _heparinDispensingRateSwitch.checked
                 inActiveZero: true
+                showAdjustButtons: _heparinDispensingRateSwitch.checked
 
                 //            ToDo: create a component for Switch,
                 //            This is a full implementation of a Switch
@@ -243,6 +244,7 @@
                 onReleased  : vTreatmentCreate.heparinBolusVolume = value
                 adjustable  : _heparinBolusVolumeSwitch.checked
                 inActiveZero: true
+                showAdjustButtons: _heparinBolusVolumeSwitch.checked
 
                 //            ToDo: create a component for this,
                 //            This is a full implementation of a CheckBox
@@ -310,7 +312,7 @@
                 onPressed   : vTreatmentCreate.heparinStopTime = value
                 onReleased  : vTreatmentCreate.heparinStopTime = value
                 enabled     : false // this switch dipends on the heparin dispencing
-
+                showAdjustButtons: _heparinDispensingRateSwitch.checked
             }
 
             SliderCreateTreatment { id: _salineBolus