Index: sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
===================================================================
diff -u -r583d1953c783940c93f22c37b23daadb1ff3a09c -rbefa8e7e7667c4aa5193022bd80e9f52c2374ad0
--- sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 583d1953c783940c93f22c37b23daadb1ff3a09c)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision befa8e7e7667c4aa5193022bd80e9f52c2374ad0)
@@ -39,14 +39,17 @@
 
     QtObject { id: _private
         readonly property string textHeparin        : qsTr("HEPARIN DELIVERY")
+        readonly property string textOff            : qsTr("OFF")
         readonly property string textPause          : qsTr("PAUSE DELIVERY")
         readonly property string textResume         : qsTr("RESUME DELIVERY")
+        readonly property string textComplete       : qsTr("COMPLETE")
         readonly property string textVolumeTarget   : "(" + valueTarget + unit + ")"
-        readonly property string mesgBolus          : qsTr("Heparin Bolus Active")
         readonly property string mesgCompleted      : qsTr("Maximum Cumulative Heparin Volume Delivered")
-        readonly property string mesgEmpty          : qsTr("Heparin Syringe Empty")
-        readonly property string mesgOff            : qsTr("Heparin Delivery Off")
-        readonly property string mesgStopped        : qsTr("Heparin Delivery Stopped")
+        readonly property string mesgBolus          : qsTr("Bolus Active")
+        readonly property string mesgEmpty          : qsTr("Syringe Empty")
+        readonly property string mesgOff            : qsTr("") // it is redundant since the button text is now display OFF
+        readonly property string mesgStopped        : qsTr("Delivery Stopped")
+        readonly property string mesgDispensing     : qsTr("Delivery Active")
         readonly property string mesgRejectReason   : vTreatmentAdjustmentHeparin.adjustment_ReasonText
     }
 
@@ -63,8 +66,8 @@
     buttonText      : ! isTxRunning   ? _private.textHeparin  :
                         isDispensing  ? _private.textPause    :
                         isPaused      ? _private.textResume   :
-                        isCompleted   ? _private.textHeparin  :             // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick)
-                     // isCompleted   ? _private.textResume   :
+                        isCompleted   ? _private.textComplete :         // decided to not to enable user to resume the heparin while completed (1/Apr/2021 - I,Sean,Nick)
+                        isOff         ? _private.textOff      :
                                         _private.textHeparin
     unit            : Variables.unitTextSaline
 
@@ -85,6 +88,7 @@
                   isStopped     ? _private.mesgStopped      :
                   isCompleted   ? _private.mesgCompleted    :
                   isEmpty       ? _private.mesgEmpty        :
+                  isDispensing  ? _private.mesgDispencing   :
                                   _private.mesgRejectReason
     }
 }