Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file TreatmentTime.qml
- * \author (last) Behrouz NematiPour
- * \date (last) 26-Sep-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 31-Jan-2020
+ * \file    TreatmentTime.qml
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      15-May-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  31-Jan-2020
  *
  */
 
@@ -32,7 +32,8 @@
     property int progressValue  : vTreatmentTime.time_Elapsed
     property int timeTextValue  : vTreatmentTime.time_Remaining
 
-    property bool isRunning     : vHDTreatmentStates.txDialysis_Running
+    property bool isRunning     : vHDTreatmentStates.txDialysis &&
+                               !( vHDTreatmentStates.sbWaitPump || vHDTreatmentStates.sbRunning )
 
     signal clicked()
 
@@ -67,7 +68,7 @@
             text: qsTr("Time Remaining")
 
             font.pixelSize: 26
-            color: "white"
+            color: Colors.textMain
 
             anchors.left: parent.left
             Image { id: _arrowImage
@@ -77,7 +78,7 @@
                 anchors.leftMargin: 10
                 width : Variables.arrowWidth
                 height: Variables.arrowHeight
-                source: "qrc:/images/iArrow"
+                source: "qrc:/images/iArrowRight"
             }
         }
     }