Index: sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml
===================================================================
diff -u -rf4bdf1e57221c8395580fc169d239d49d670ce1b -rc0c63c4b149dafea2b02e4cd31f223e392ff7818
--- sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml	(.../PostTreatmentRinsebackComplete.qml)	(revision f4bdf1e57221c8395580fc169d239d49d670ce1b)
+++ sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml	(.../PostTreatmentRinsebackComplete.qml)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
@@ -28,16 +28,18 @@
     objectName: "_PostTreatmentRinsebackComplete"
 
     property alias  reasonText  : _notification.text
-
     signal additionalClicked    ()
+    signal treatmentBackClicked ()
     signal confirmClicked       ()
     signal treatmentEndClicked  ()
 
     QtObject { id: _private
-        property int sectionSpace : 30
-        property int sectionWidth : _root.width  * 2/3 - sectionSpace * 1.5
-        property int sectionHeight: _root.width  * 1/3 - sectionSpace * 1.5
+        property int    sectionSpace        : 30
+        property int    sectionWidth        : _root.width  * 2/3 - sectionSpace * 1.5
+        property int    sectionHeight       : _root.width  * 1/3 - sectionSpace * 1.5
+        property bool   treatmentIncomplete : vTreatmentTime.time_Total > 0
     }
+
     Text { id: _title
         anchors {
             top: parent.top
@@ -49,6 +51,22 @@
         font.pixelSize: Fonts.fontPixelTitle
     }
 
+    TouchRect { id : _touchAdditional
+        width   : 155
+        height  : 50
+        text    {
+            text: qsTr("ADDITIONAL")
+            font.bold   : true
+            font.pixelSize: Fonts.fontPixelConfirm
+        }
+        anchors {
+            verticalCenter  : _title.verticalCenter
+            right           : parent.right
+            rightMargin     : 30
+        }
+        onClicked   : additionalClicked()
+    }
+
     TimeText { id: timeout
         visible         : vTreatmentRinseback.timeoutTotal
         anchors {
@@ -130,24 +148,25 @@
         }
 
         TouchRect { id : _backTreatmentTouchRect
-            visible         : true
-            text.text       : qsTr("ADDITIONAL")
+            visible         : _private.treatmentIncomplete
+            text.text       : qsTr("BACK TO TREATMENT")
             width           : _buttonGroup.buttonsWidth
-            onClicked       : additionalClicked()
+            onClicked       : treatmentBackClicked()
         }
 
         TouchRect { id : _beginRinsebackTouchRect
-            visible         : true
+            visible         : _private.treatmentIncomplete
             text.text       : qsTr("CONFIRM")
             width           : _buttonGroup.buttonsWidth
             color           : borderColor
             onClicked       : confirmClicked()
         }
 
         TouchRect { id : _endTreatmentTouchRect
-            visible         : vTreatmentTime.time_Total > 0
+            visible         : true // after the rinseback complete user can always end the treatment, regardless of incomplete or compeleted treatment
             text.text       : qsTr("END TREATMENT")
             width           : _buttonGroup.buttonsWidth
+            color           : _private.treatmentIncomplete ? backgroundColor : borderColor
             onClicked       : treatmentEndClicked()
         }
     }
@@ -159,8 +178,7 @@
     onVisibleChanged: {
         _notification.text = ""
         if (visible) {
-            _mainMenu     .hidden = true
-            _treatmentMenu.hidden = true
+            _mainMenu.hidden = true
         }
     }
 }