Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -r88563177f10f20ced98750b2e40036201728131d -r8a5dbf556a66524fbe4b60ac1573182a0bd27617
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision 88563177f10f20ced98750b2e40036201728131d)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
@@ -20,25 +20,75 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/pages/endtreatment/recirculate"
+
 /*!
  * \brief   the end treatment recirculate stack screen
  */
 StackItem { id: _root
     objectName: "_EndTreatmentRecirculateStack"
 
-    stackView.initialItem   : null
+    stackView.initialItem           : null
 
+    property int stackStepIndex     : 0
+
+    signal reconnectClicked         ()
+    signal reconnectConfirmClicked  ()
+    signal recirculateBackClicked   ()
+    signal treatmentEndClicked      ()
+
     // Recirculate
-    EndTreatmentRecirculate         { id: _endTreatmentRecirculate
-        onReconnectClicked          : vTreatmentAdjustmentRecirculate.doReconnect   () //84.0
-        onTreatmentEndClicked       : vTreatmentAdjustmentRecirculate.doTreatmentEnd() //84.3
+    EndTreatmentBase           { id : _endTreatmentRecirculate
+        title.text                  : qsTr("Recirculate")
+        instructionBased            : true
+        hasTimeout                  : vTreatmentRecirculate .timeoutTotal
+        timeoutValue                : vTreatmentRecirculate .timeoutCountDown * 60
+
+        footer {
+            width                   : parent.width
+            height                  : Variables.touchRectHeight
+        }
+
+        FooterStatic {
+            childrenWidth           : 300
+            anchors.fill            : parent.footer
+            children                : [
+                Item      { },
+                TouchRect {
+                    text.text       : qsTr("RECONNECT")
+                    isDefault       : true
+                    onClicked       : reconnectClicked()
+                },
+                TouchRect {
+                    visible         : vTreatmentTime        .time_IsLeft
+                    text.text       : qsTr("END TREATMENT")
+                    onClicked       : treatmentEndClicked()
+                }
+            ]
+        }
     }
-    EndTreatmentReconnect           { id: _endTreatmentReconnect
-        onConfirmClicked            : vTreatmentAdjustmentRecirculate.doConfirm     () //84.1
-        onRecirculateBackClicked    : vTreatmentAdjustmentRecirculate.doResume      () //84.2
+
+    EndTreatmentBase           { id : _endTreatmentReconnect
+        title.text                  : qsTr("Reconnect")
+        instructionBased            : true
+        header.confirmVisible       : vTreatmentTime        .time_IsLeft
+        hasTimeout                  : vTreatmentRecirculate .timeoutTotal
+        timeoutValue                : vTreatmentRecirculate .timeoutCountDown * 60
+        onConfirmClicked            : recirculateConfirmClicked()
+        footer {
+            childrenWidth           : 300
+            children : TouchRect {
+                visible             : vTreatmentTime        .time_IsLeft
+                text.text           : qsTr("BACK TO RECIRCULATE")
+                onClicked           : recirculateBackClicked()
+            }
+        }
     }
 
+    onReconnectClicked          : vTreatmentAdjustmentRecirculate.doReconnect   () //84.0
+    onReconnectConfirmClicked   : vTreatmentAdjustmentRecirculate.doConfirm     () //84.1
+    onRecirculateBackClicked    : vTreatmentAdjustmentRecirculate.doResume      () //84.2
+    onTreatmentEndClicked       : vTreatmentAdjustmentRecirculate.doTreatmentEnd() //84.3
+
     Connections { target: vHDTreatmentStates
         onRcStartedChanged      : { page( _endTreatmentRecirculate      , vrcStarted    )}
         onRcStoppedChanged      : { page( _endTreatmentReconnect        , vrcStopped    )}