Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
===================================================================
diff -u -r1f0edd1d94a57e9e870411a1c1689d3408df75db -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(.../EndTreatmentRinseback.qml)	(revision 1f0edd1d94a57e9e870411a1c1689d3408df75db)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(.../EndTreatmentRinseback.qml)	(revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -30,11 +30,10 @@
 EndTreatmentBase { id: _root
     objectName      : "_EndTreatmentRinseback"
 
-    headerTitle     : qsTr("Rinseback")
+    headerTitle     : qsTr("Blood Return")
 
     signal pauseClicked  ()
     signal resumeClicked ()
-    signal endClicked    ()
 
     signal accelerateClicked  ()
     signal deccelerateClicked ()
@@ -53,7 +52,6 @@
             anchors.horizontalCenter    : parent.horizontalCenter
             thickness                   : 35
             circleShadowColor           : Colors.mainTreatmentLighterBlue
-            circleFillColor             : Colors.mainTreatmentDarkerBlue
             runAnimation                : vTDTreatmentStates.rbPaused
             minimum                     : 0
             maximum                     : vTreatmentRinseback.target
@@ -67,7 +65,7 @@
                     pixelSize   : 76
                     weight      : Font.Light
                 }
-                color           : Colors.textMain
+                color           : vTDTreatmentStates.rbPaused ? Colors.ufVolumeGoalText : Colors.offWhite
                 text            : vTreatmentRinseback.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid)
             }
 
@@ -79,7 +77,7 @@
                     horizontalCenter: parent.horizontalCenter
                 }
                 textPixelSize   : 30
-                textWeight      : Font.Normal
+                textWeight      : Font.DemiBold
                 secondsVisible  : false
                 seconds         : vTreatmentRinseback.timeoutCountDown * 60
                 visible         : vTreatmentRinseback.timeoutTotal
@@ -98,7 +96,7 @@
                 imageDiameter   : 25
                 imageTopMargin  : 4
                 imageSource     : "qrc:/images/iPauseOrange"
-                text            : "Rinseback Paused"
+                text            : qsTr("Rinseback Paused")
                 textColor       : Colors.mainTreatmentOrange
                 textfontSize    : 22
                 textfontWeight  : Font.Medium
@@ -113,10 +111,10 @@
             TreatmentSection { id: _treatmentFlowRate
                 objectName              : "_treatmentFlowRate"
                 anchors.verticalCenter  : parent.verticalCenter
-                width                   : _flowRateItem.childrenRect.width + (Variables.defaultMargin * 2) // margin x2 for look and feel
+                width                   : parent.width / 3
                 height                  : _treatmentPressures.height
                 header {
-                    title               : qsTr("Rinseback Flow Rate")
+                    title               : qsTr("Blood Flow Rate")
                     showEdit            : false
                 }
                 contentItem             : Item { id: _flowRateItem
@@ -214,26 +212,12 @@
                         }
                         spacing: Variables.defaultMargin * 2
 
-                        TouchRect { id: _endButton
-                            objectName  : "_endButton"
-                            width       : Variables.defaultButtonWidth
-                            height      : Variables.defaultButtonHeight
-                            text {
-                                text        : qsTr("End Rinseback")
-                                font.weight : Font.Medium
-                            }
-                            isDefault   : true
-                            enabled     : true
-
-                            onClicked   : { _root.endClicked() }
-                        }
-
                         TouchRect { id: _pauseResumeButton
                             objectName: "_pauseResumeButton"
                             width       : Variables.defaultButtonWidth
                             height      : Variables.defaultButtonHeight
                             text {
-                                text        : vTDTreatmentStates.rbPaused ? qsTr("Resume Rinseback") : qsTr("Pause Rinseback")
+                                text        : vTDTreatmentStates.rbPaused ? qsTr("Resume") : qsTr("Pause")
                                 font.weight : Font.Medium
                             }
                             isDefault   : true