Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r171387aefe2f3d21245ff32fc9b9656c79bfa406
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 171387aefe2f3d21245ff32fc9b9656c79bfa406)
@@ -38,10 +38,7 @@
     readonly property bool isRejected       : vTreatmentAdjustmentHeparin.adjustment_Accepted
     readonly property bool isTxRunning      : vTDTreatmentStates.txDialysis
 
-    readonly property color heparinColor    : _root.deliveryOff ?   Colors.transparent      :
-                                              isDispensing      ?   Colors.statusActive     :
-                                              isPaused          ?   Colors.statusPaused     :
-                                              isCompleted       ?   Colors.statusComplete   : Colors.transparent
+
     readonly property bool   deliveryOff    : vTreatmentCreate.heparinDispensingRate === 0
     readonly property string buttonText     : isDispensing  ? qsTr("Pause")   :
                                               isPaused      ? qsTr("Resume")  : qsTr("Pause")
@@ -50,17 +47,24 @@
                                               isPaused      ? qsTr("Pause")     :
                                               isCompleted   ? qsTr("Complete")  :  qsTr("Active")
 
-    readonly property var titles        : [  qsTr("Heparin Type"),                                              qsTr("Dispensing Rate"),                qsTr("Bolus Volume"),                   qsTr("Stop Time")                   ]
-    readonly property var units         : [ Variables.unitHeparinType,                                          Variables.unitTextDispensingRate,       Variables.unitTextDispensingRate,       Variables.unitTextDuration          ]
-    readonly property var values        : [ vTreatmentRanges.heparinTypeOptions[vTreatmentCreate.heparinType],  vTreatmentCreate.heparinDispensingRate, vTreatmentCreate.heparinBolusVolume,    vTreatmentCreate.heparinStopTime    ]
+    readonly property var titles        : [  qsTr("Heparin Type"),                                              qsTr("Dispensing Rate"),                qsTr("Bolus Volume"),                   qsTr("Stop Time")                       ]
+    readonly property var units         : [ Variables.unitHeparinType,                                          Variables.unitTextDispensingRate,       Variables.unitTextDispensingRate,       Variables.unitTextDuration              ]
+    readonly property var values        : [ vTreatmentRanges.heparinTypeOptions[vTreatmentCreate.heparinType],  vTreatmentCreate.heparinDispensingRate, vTreatmentCreate.heparinBolusVolume,    vTreatmentCreate.heparinDeliveryDuration]
 
     readonly property real cumulative       : vTreatmentHeparin.cumulative
     readonly property real target           : vTreatmentHeparin.target
     readonly property string timeRemaining  : vTreatmentHeparin.timeRemaining
 
     signal idleTimeout()
 
-    onHeparinColorChanged   : vListModel.setHeaderbarStatusColor(HeaderBar.Heparin, heparinColor.toString())
+    function statusColor ( vHeaderBar = false ) {
+        return  deliveryOff     ?   Colors.transparent      :
+                isDispensing    ?   Colors.statusActive     :
+                isPaused        ?   Colors.statusPaused     :
+                isCompleted     ?   vHeaderBar  ?   Colors.statusComplete       :
+                                                    Colors.statusTextComplete   :
+                                    Colors.transparent
+    }
 
     enum HeparinPrescription{
         HeparinType,
@@ -99,6 +103,12 @@
         }
     }
 
+    Connections { target:   vTDTreatmentStates
+        function onHeparinChanged                   ( vValue ) {
+            vListModel.setHeaderbarHeparinStatusColor(_root.statusColor(true).toString())
+        }
+    }
+
     IdleTimer {id: _idleTimer
         anchors.fill        : parent
 
@@ -210,7 +220,7 @@
                     width   : 100
                     height  : 30
                     radius  : height
-                    color   : _root.heparinColor
+                    color   : statusColor()
                     Text { id: _statusText
                         anchors.centerIn: parent
                         text            : _root.statusText