Index: sources/gui/qml/pages/treatment/TreatmentStart.qml
===================================================================
diff -u -re4a6f98d9a3eefb5226f85d62dfe103867189a4c -r153409973471214f29d5fad170a8b4ec0f4c4f2e
--- sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision e4a6f98d9a3eefb5226f85d62dfe103867189a4c)
+++ sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision 153409973471214f29d5fad170a8b4ec0f4c4f2e)
@@ -108,23 +108,18 @@
         }
     }
     Line                        { x: rightLinesX; y: row1LineY; length: lineLength }
-    TreatmentSaline             { id: _SalineTouchArea
-        x       : rightColumnX
-        y       : row2Y
+    TreatmentSaline             { id: _salineTouchArea
+        x           : rightColumnX
+        y           : row2Y
         width       : areaWidth
         height      : areaHeightRow2
     }
     Line                        { x: rightLinesX; y: row2LineY; length: lineLength; }
-    TreatmentFluid              { id: _heparinTouchArea
-        // TODO : Another component should be inherited from this for Heparin
-        buttonText: qsTr("PAUSE DELIVERY")
-
-        x       : rightColumnX
-        y       : row3Y
+    TreatmentHeparin            { id: _heparinTouchArea
+        x           : rightColumnX
+        y           : row3Y
         width       : areaWidth
         height      : areaHeightRow3
-        title   : qsTr("HEPARIN")
-        cumulativeVisible: false
     }
 
     // ---------- Center