Index: sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml
===================================================================
diff -u -r88563177f10f20ced98750b2e40036201728131d -r8a5dbf556a66524fbe4b60ac1573182a0bd27617
--- sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml	(.../EndTreatmentEndStack.qml)	(revision 88563177f10f20ced98750b2e40036201728131d)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml	(.../EndTreatmentEndStack.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
@@ -20,7 +20,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/pages/endtreatment/end"
+
 /*!
  * \brief   the post treatment end stack screen
  */
@@ -29,20 +29,38 @@
 
     stackView.initialItem   : null
 
-    // Treatment Complete
-    EndTreatmentEnd                 { id: _endTreatmentEnd
-        onRinsebackClicked          : vTreatmentAdjustmentEnd.doEnd                 () //87.0
+    property int stackStepIndex : 0
+
+    signal rinsebackClicked()
+
+    EndTreatmentBase       { id : _endTreatmentEnd
+        title.text              : qsTr("Treatment Complete")
+        instructionBased        : true
+        footer {
+            childrenWidth       : 300
+            children: TouchRect {
+                text.text       : qsTr("START RINSEBACK")
+                isDefault       : true
+                onClicked       : rinsebackClicked()
+            }
+        }
     }
-    EndTreatmentEndPaused           { id: _endTreatmentEndPaused            }
 
-    Connections { target: vHDTreatmentStates
+    EndTreatmentBase       { id : _endTreatmentEndPaused
+        title.text              : qsTr("Treatment Complete Paused")
+        instructionBased        : true
+    }
+
+    Connections            { target : vHDTreatmentStates
         onTeWaitRinsebackChanged    : { page( _endTreatmentEnd         , vteWaitRinseback   )}
         onTePausedChanged           : { page( _endTreatmentEndPaused   , vtePaused          )}
     }
 
-    Connections { target: vTreatmentAdjustmentEnd
-        onAdjustmentTriggered: {
+    Connections            { target : vTreatmentAdjustmentEnd
+        onAdjustmentTriggered       : {
             _endTreatmentEnd.reasonText = vTreatmentAdjustmentEnd.text();
         }
     }
+
+    onRinsebackClicked : vTreatmentAdjustmentEnd.doEnd                 () //87.0
 }