Index: sources/gui/qml/compounds/LabelUnitContainer.qml
===================================================================
diff -u -rb395fdadb1ad460eba7e45eaca94c100a5d0c804 -r33f808e5b8d9134231fc0d016bfb16605c2de812
--- sources/gui/qml/compounds/LabelUnitContainer.qml	(.../LabelUnitContainer.qml)	(revision b395fdadb1ad460eba7e45eaca94c100a5d0c804)
+++ sources/gui/qml/compounds/LabelUnitContainer.qml	(.../LabelUnitContainer.qml)	(revision 33f808e5b8d9134231fc0d016bfb16605c2de812)
@@ -47,21 +47,21 @@
         anchors {
             verticalCenter  : parent.verticalCenter
             left            : parent.left
-            leftMargin      : Variables.defaultMargin
+            leftMargin      : Variables.minVGap + Variables.defaultMargin
         }
         spacing : 10
 
         Text { id: _title
             anchors.verticalCenter  : _titleRow.verticalCenter
             color                   : Colors.offWhite
-            font.pixelSize          : 28
+            font.pixelSize          : Fonts.fontPixelDefaultButton
         }
 
         Text { id: _unit
             anchors.bottom  : _title.bottom
             text            : ("(%1)").arg(_root.unitText)
             color           : Colors.offWhite
-            font.pixelSize  : 22
+            font.pixelSize  : 18
             font.weight     : Font.Thin
             visible         : _root.showUnit
         }
Index: sources/gui/qml/pages/settings/SettingsROInput.qml
===================================================================
diff -u -r01a8c935f7d90ce3b168970765c0f20ea0c1a273 -r33f808e5b8d9134231fc0d016bfb16605c2de812
--- sources/gui/qml/pages/settings/SettingsROInput.qml	(.../SettingsROInput.qml)	(revision 01a8c935f7d90ce3b168970765c0f20ea0c1a273)
+++ sources/gui/qml/pages/settings/SettingsROInput.qml	(.../SettingsROInput.qml)	(revision 33f808e5b8d9134231fc0d016bfb16605c2de812)
@@ -19,6 +19,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 
 /*!
  * \brief   SettingsROInput is the screen
@@ -29,26 +30,23 @@
 
     confirmVisible  : false
 
-    contentItem: Item { id: _settingsRoInputItem
+    contentItem: Item {
 
-        Text { id           : _settingsRoInputLabel
-            text            : qsTr("Pure Water Mode")
-            width           : 300
-            height          : _settingsRoInputSwitch.height
-            color           : Colors.white
-            font.pixelSize  : Fonts.fontPixelButton
-            verticalAlignment       : Text.AlignVCenter
-            horizontalAlignment     : Text.AlignLeft
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
+        LabelUnitContainer { id: _settingsRoInputItem
+            anchors.horizontalCenter        : parent.horizontalCenter
+            width                           : Variables.adjustmentLabelUnitContainerWidth
+            height                          : Variables.adjustmentLabelUnitContainerHeight
+            showUnit                        : false
+            text                            : qsTr("Pure Water Mode")
+            contentArea.anchors.leftMargin  : width * 0.75
 
-        BaseSwitch { id: _settingsRoInputSwitch
-            checked : vDuetRoWaterDG.status
+            contentItem: BaseSwitch { id: _settingsRoInputSwitch
+                checked             : vDuetRoWaterDG.status
 
-            onClicked: {
-                vDuetRoWaterDG.doAdjustment ( _settingsRoInputSwitch.checked )
+                onClicked: {
+                    vDuetRoWaterDG.doAdjustment ( _settingsRoInputSwitch.checked )
+                }
             }
-
         }
     }
 
Index: sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml
===================================================================
diff -u -r01a8c935f7d90ce3b168970765c0f20ea0c1a273 -r33f808e5b8d9134231fc0d016bfb16605c2de812
--- sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml	(.../SettingsRootSSHAccess.qml)	(revision 01a8c935f7d90ce3b168970765c0f20ea0c1a273)
+++ sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml	(.../SettingsRootSSHAccess.qml)	(revision 33f808e5b8d9134231fc0d016bfb16605c2de812)
@@ -20,6 +20,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 
 /*!
  * \brief   SettingsRootSSHAccess is the screen
@@ -35,40 +36,31 @@
     contentItem: Column {
         spacing : 20
 
-        Row { id: _settingsRootSSHAccess_SSHDRow
-            anchors.horizontalCenter: parent.horizontalCenter
+        LabelUnitContainer { id: _settingsRootSSHAccess_SSHDRow
+            anchors.horizontalCenter        : parent.horizontalCenter
+            width                           : Variables.adjustmentLabelUnitContainerWidth
+            height                          : Variables.adjustmentLabelUnitContainerHeight
+            showUnit                        : false
+            text                            : qsTr("Enable SSH Login")
+            contentArea.anchors.leftMargin  : width * 0.75
 
-            Text                            { id: _settingsRootSSHAccess_SSHDLabel
-                text                            : qsTr("Enable SSH Login")
-                width                           : 300
-                height                          : _settingsRootSSHAccess_SSHDSwitch.height
-                color                           : Colors.white
-                font.pixelSize                  : Fonts.fontPixelButton
-                verticalAlignment               : Text.AlignVCenter
-                horizontalAlignment             : Text.AlignLeft
-            }
+            contentItem:  BaseSwitch { id: _settingsRootSSHAccess_SSHDSwitch
 
-            BaseSwitch { id: _settingsRootSSHAccess_SSHDSwitch
                 onClicked: {
                     vDevice.rootSSHAccess = toCheckState()
                 }
             }
         }
 
-        Row { id: _settingsRootSSHAccess_RootRow
-            anchors.horizontalCenter: parent.horizontalCenter
+        LabelUnitContainer { id: _settingsRootSSHAccess_RootRow
+            anchors.horizontalCenter        : parent.horizontalCenter
+            width                           : Variables.adjustmentLabelUnitContainerWidth
+            height                          : Variables.adjustmentLabelUnitContainerHeight
+            showUnit                        : false
+            text                            : qsTr("Enable Root Login")
+            contentArea.anchors.leftMargin  : width * 0.75
 
-            Text                            { id: _settingsRootSSHAccess_RootLabel
-                text                            : qsTr("Enable Root Login")
-                width                           : 300
-                height                          : _settingsRootSSHAccess_RootSwitch.height
-                color                           : Colors.white
-                font.pixelSize                  : Fonts.fontPixelButton
-                verticalAlignment               : Text.AlignVCenter
-                horizontalAlignment             : Text.AlignLeft
-            }
-
-            BaseSwitch { id: _settingsRootSSHAccess_RootSwitch
+            contentItem: BaseSwitch { id: _settingsRootSSHAccess_RootSwitch
                 active              : _settingsRootSSHAccess_SSHDSwitch.checked
                 enabled             : _settingsRootSSHAccess_RootSwitch.active