Index: SDDs/WaterSample.png
===================================================================
diff -u -rdfdd08b0283fe7563c15bed670803bfe7dfaf3e9 -reab35af615619934a2a20b8a27f62d1dcc873af4
Binary files differ
Index: sources/gui/qml/components/NotificationBarSmall.qml
===================================================================
diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -reab35af615619934a2a20b8a27f62d1dcc873af4
--- sources/gui/qml/components/NotificationBarSmall.qml	(.../NotificationBarSmall.qml)	(revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
+++ sources/gui/qml/components/NotificationBarSmall.qml	(.../NotificationBarSmall.qml)	(revision eab35af615619934a2a20b8a27f62d1dcc873af4)
@@ -39,7 +39,6 @@
     property alias  textfontSize    : _text.font.pixelSize
     property alias  textfontWeight  : _text.font.weight
     property alias  rowAnchors      : _row.anchors
-    property int contentWidth       : _row.implicitWidth
 
     property int    level           : 0
 
Index: sources/gui/qml/dialogs/watersample/WaterSamplePage.qml
===================================================================
diff -u -r6500e0b383e7fd0bb5a2c4e8fe95a2ea5832845e -reab35af615619934a2a20b8a27f62d1dcc873af4
--- sources/gui/qml/dialogs/watersample/WaterSamplePage.qml	(.../WaterSamplePage.qml)	(revision 6500e0b383e7fd0bb5a2c4e8fe95a2ea5832845e)
+++ sources/gui/qml/dialogs/watersample/WaterSamplePage.qml	(.../WaterSamplePage.qml)	(revision eab35af615619934a2a20b8a27f62d1dcc873af4)
@@ -71,31 +71,30 @@
             font.weight     : Font.Medium
         }
 
-        Item { id: _infoItem
+        NotificationBarSmall { id: _infoNotificationBar
             anchors {
+                bottom      : undefined
+                right       : undefined
                 left        : _title.left
                 top         : _title.bottom
                 topMargin   : Variables.defaultMargin * 2
             }
-            height  : Variables.contentHeight
-            width   : _infoNotificationBar.contentWidth
-
-            NotificationBarSmall { id: _infoNotificationBar
-                color                   : "transparent"
-                imageSource             : "qrc:/images/iHelp"
-                imageVisible            : true
-                text                    : qsTr("Test the carbon filters per your clinic's instructions")
-                textColor               : "#595959"
-                imageDiameter           : 25
-                imageTopMargin          : 3
-            }
+            width           : parent.width / 3
+            height          : Variables.contentHeight
+            color           : "transparent"
+            imageSource     : "qrc:/images/iHelp"
+            imageVisible    : true
+            text            : qsTr("Test the carbon filters per your clinic's instructions")
+            textColor       : "#595959"
+            imageDiameter   : 25
+            imageTopMargin  : 3
         }
 
         Item { id: _instructionContainer
             anchors {
                 right   : _content.right
                 left    : _title.left
-                top     : _infoItem.bottom
+                top     : _infoNotificationBar.bottom
                 bottom  : _content.bottom
             }
 
Index: sources/view/dd/data/VDDValvesStatesData.cpp
===================================================================
diff -u -r9760eecfc557430078d5ef4ec6f9bc2ec423bfc1 -reab35af615619934a2a20b8a27f62d1dcc873af4
--- sources/view/dd/data/VDDValvesStatesData.cpp	(.../VDDValvesStatesData.cpp)	(revision 9760eecfc557430078d5ef4ec6f9bc2ec423bfc1)
+++ sources/view/dd/data/VDDValvesStatesData.cpp	(.../VDDValvesStatesData.cpp)	(revision eab35af615619934a2a20b8a27f62d1dcc873af4)
@@ -48,11 +48,11 @@
     balancingChamberValve7       ( vData.mValvesStatus.at( GuiDDValves::D26_VALV        ));
     balancingChamberValve8       ( vData.mValvesStatus.at( GuiDDValves::D22_VALV        ));
 
-    spareValve0                  ( vData.mValvesStatus.at( GuiDDValves::D79_PMP_VALV    )); // Start of spare valve group
+    spareValve0                  ( vData.mValvesStatus.at( GuiDDValves::D88_79_VALV    )); // Start of spare valve group
     spareValve1                  ( vData.mValvesStatus.at( GuiDDValves::D83_VALV        ));
     spareValve2                  ( vData.mValvesStatus.at( GuiDDValves::D91_VALV        ));
-    spareValve3                  ( vData.mValvesStatus.at( GuiDDValves::SPARE3_VALV     ));
-    spareValve4                  ( vData.mValvesStatus.at( GuiDDValves::SPARE4_VALV     ));
+    spareValve3                  ( vData.mValvesStatus.at( GuiDDValves::D104_VALV     ));
+    spareValve4                  ( vData.mValvesStatus.at( GuiDDValves::D95_VALV     ));
     spareValve5                  ( vData.mValvesStatus.at( GuiDDValves::SPARE5_VALV     ));
     spareValve6                  ( vData.mValvesStatus.at( GuiDDValves::D100_VALV       ));
     spareValve7                  ( vData.mValvesStatus.at( GuiDDValves::SPARE7_VALV     ));