Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml
===================================================================
diff -u -r3345651cca9723989785801ee25001dc3e4f28a1 -rfd25d67f37410037f22be9c6e958b100e3790de9
--- sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml	(.../PostTreatmentRinseback.qml)	(revision 3345651cca9723989785801ee25001dc3e4f28a1)
+++ sources/gui/qml/pages/postTreatment/PostTreatmentRinseback.qml	(.../PostTreatmentRinseback.qml)	(revision fd25d67f37410037f22be9c6e958b100e3790de9)
@@ -47,138 +47,104 @@
         font.pixelSize: Fonts.fontPixelTitle
     }
 
-    Image { id: _imageEnd
+    ImageText { id: _imageEnd
         anchors {
             right       : _root.right
             top         : _root.top
             rightMargin : 45
             topMargin   : 45
         }
-
-        width   : Variables.rinsebackIconDiameterDefault
-        height  : Variables.rinsebackIconDiameterDefault
-        source  : "qrc:/images/iRedCrossWCircle"
-        Text { id: _labelEnd
-            anchors {
-                top: parent.bottom
-                topMargin: 15
-                horizontalCenter: parent.horizontalCenter
-            }
-            color: "white"
-            text: qsTr("End")
-            font.pixelSize: 26
-        }
+        diameter        : Variables.rinsebackIconDiameterDefault
+        source          : "qrc:/images/iRedCrossWCircle"
+        text            : qsTr("End")
+        fontSize        : Fonts.fontPixelRinsebackAdjustmentButton
+        onClicked       : endClicked()
     }
 
     ProgressCircle { id: _circle
         diameter: 335
         anchors {
             horizontalCenter: parent.horizontalCenter
             top             : parent.top
-            topMargin       : 175
+            topMargin       : 170
         }
 
         minimum : 0
-        maximum : 100
-        value   : 25
+        maximum : vTreatmentRinseback.target
+        value   : vTreatmentRinseback.current
 
         Text { id: _textVolume
             anchors.centerIn: parent
             color: "white"
-            text: 300 + " "+ qsTr(Variables.unitTextFluid)
+            text: vTreatmentRinseback.target.toFixed(0) + " " + qsTr(Variables.unitTextFluid)
             font.pixelSize: 76
             font.weight: Font.ExtraLight
 
         }
 
-        Text { id: _labelState
+        Text { id: _labelRate
             anchors {
                 top: parent.bottom
                 topMargin: 20
                 horizontalCenter: parent.horizontalCenter
             }
             color: "white"
-            text: qsTr("Resume")
+            text: vTreatmentRinseback.rate.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate)
             font.pixelSize: 23
         }
     }
 
     Row { id: _buttonRow
         spacing: 175
         anchors {
-            horizontalCenter: parent.horizontalCenter
-            bottom          : parent.bottom
-            bottomMargin    : 45 + 45 // + the texts height
+            horizontalCenter: _root.horizontalCenter
+            bottom          : _root.bottom
+            bottomMargin    : Variables.notificationHeight + 55 // + the texts height
         }
 
-        Image { id: _imageDecelerate
-            anchors.verticalCenter: parent.verticalCenter
-
-            width : Variables.rinsebackIconDiameterDefault
-            height: Variables.rinsebackIconDiameterDefault
-            source: "qrc:/images/iDecelerate"
+        ImageText { id: _imageDecelerate
+            visible         : vHDTreatmentStates.rbRun || vHDTreatmentStates.rbPaused
+            enabled         : vHDTreatmentStates.rbRun
+            anchors.bottom  : _buttonRow.bottom
+            diameter        : Variables.rinsebackIconDiameterDefault
+            source          : "qrc:/images/iDecelerate"
+            text            : qsTr("Decelerate")
+            fontSize        : Fonts.fontPixelRinsebackAdjustmentButton
+            onClicked       : deccelerateClicked()
         }
 
-        Image { id: _imageResume
-            anchors.verticalCenter: parent.verticalCenter
-
-            visible: false
-            width : Variables.rinsebackIconDiameterResumePause
-            height: Variables.rinsebackIconDiameterResumePause
-            source: "qrc:/images/iResume"
+        ImageText { id: _imageResume
+            visible         : vHDTreatmentStates.rbPaused
+            anchors.bottom  : _buttonRow.bottom
+            diameter        : Variables.rinsebackIconDiameterResumePause
+            source          : "qrc:/images/iResume"
+            text            : qsTr("Resume")
+            fontSize        : Fonts.fontPixelRinsebackAdjustmentButton
+            onClicked       : resumeClicked()
         }
 
-        Image { id: _imagePause
-            anchors.verticalCenter: parent.verticalCenter
-
-            width : Variables.rinsebackIconDiameterResumePause
-            height: Variables.rinsebackIconDiameterResumePause
-            source: "qrc:/images/iPauseLightBlue"
+        ImageText { id: _imagePause
+            visible         : vHDTreatmentStates.rbRun // not sure if it's possible || vHDTreatmentStates.rbRun_Additional
+            anchors.bottom  : _buttonRow.bottom
+            diameter        : Variables.rinsebackIconDiameterResumePause
+            source          : "qrc:/images/iPauseLightBlue"
+            text            : qsTr("Pause")
+            fontSize        : Fonts.fontPixelRinsebackAdjustmentButton
+            onClicked       : pauseClicked()
         }
 
-        Image { id: _imageAccelerate
-            anchors.verticalCenter: parent.verticalCenter
-
-            width : Variables.rinsebackIconDiameterDefault
-            height: Variables.rinsebackIconDiameterDefault
-            source: "qrc:/images/iAccelerate"
+        ImageText { id: _imageAccelerate
+            visible         : vHDTreatmentStates.rbRun || vHDTreatmentStates.rbPaused
+            enabled         : vHDTreatmentStates.rbRun
+            anchors.bottom  : _buttonRow.bottom
+            diameter        : Variables.rinsebackIconDiameterDefault
+            source          : "qrc:/images/iAccelerate"
+            text            : qsTr("Accelerate")
+            fontSize        : Fonts.fontPixelRinsebackAdjustmentButton
+            onClicked       : accelerateClicked()
         }
     }
 
-    // A  separate row for text created because in design texts are aligned in a line but images are in different size.
-    Row { id: _labelRow
-        spacing: 175
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            bottom          : parent.bottom
-            bottomMargin    : 45
-        }
-        Text { id: _labelDecelerate
-            color: "white"
-            text: qsTr("Decelerate")
-            font.pixelSize: 26
-        }
-        Text { id: _labelResume
-            visible: false
-            color: "white"
-            text: qsTr("Resume")
-            font.pixelSize: 26
-        }
-        Text { id: _labelPause
-            color: "white"
-            text: qsTr("Pause")
-            font.pixelSize: 26
-        }
-        Text { id: _labelAccelerate
-            color: "white"
-            text: qsTr("Accelerate")
-            font.pixelSize: 26
-        }
-
-    }
-
-
-
     NotificationBar { id: _notification
         iconVisible: false
     }