Index: sources/gui/qml/compounds/LabelUnitContainer.qml
===================================================================
diff -u -r135c320c850b09365c04e03d95195412c12fba72 -r7c550f70136f2f33520661a2e97fe99021cc681d
--- sources/gui/qml/compounds/LabelUnitContainer.qml	(.../LabelUnitContainer.qml)	(revision 135c320c850b09365c04e03d95195412c12fba72)
+++ sources/gui/qml/compounds/LabelUnitContainer.qml	(.../LabelUnitContainer.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
@@ -26,10 +26,8 @@
     property alias contentArea      : _contentArea
 
     property alias text             : _title.text
-    property alias textPixelSize    : _title.font.pixelSize
     property string unitText        : ""
     property bool valid             : true
-    property bool showUnit          : true
     property bool showEdit          : false
 
     height  : cellHeight
@@ -60,11 +58,11 @@
 
         Text { id: _unit
             anchors.baseline: _title.baseline
-            text            : _root.unitText.length > 0 ? ("(%1)").arg(_root.unitText) : ""
+            text            : ("(%1)").arg(_root.unitText)
             color           : Colors.offWhite
             font.pixelSize  : 22
             font.weight     : Font.Thin
-            visible         : _root.showUnit
+            visible         : _root.unitText.length > 0
         }
 
         IconButton { id  : _editButton
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rbe918124565d9f0add371e25782804f19e0cba17 -r7c550f70136f2f33520661a2e97fe99021cc681d
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision be918124565d9f0add371e25782804f19e0cba17)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
@@ -216,7 +216,6 @@
                 LabelUnitContainer { id: _patientID
                     anchors.verticalCenter          : parent.verticalCenter
                     text                            : qsTr("Patient ID")
-                    showUnit                        : false
                     height                          : cellHeight - Variables.defaultMargin
                     contentArea.anchors.leftMargin  : 120
 
@@ -426,7 +425,6 @@
 
             LabelUnitContainer { id: _acidConcentrate
                 text            : qsTr("Acid Concentrate")
-                showUnit        : false
                 showEdit        : _root.editingEnabled
                 onEditClicked   : _acidConcentrateAdjustment.open()
                 valid           : ! vTreatmentCreate.acidConcentrateRejectReason
@@ -455,7 +453,6 @@
 
             LabelUnitContainer { id: _bicarbonateConcentrate
                 text        : qsTr("Bicarbonate Concentrate")
-                showUnit    : false
                 valid       : ! vTreatmentCreate.bicarbonateConcentrateRejectReason
 
                 contentItem : BaseComboBox { id: _bicarbonateConcentrateComboBox
@@ -478,7 +475,6 @@
 
             LabelUnitContainer { id: _dialyzerType
                 text        : qsTr("Dialyzer Type")
-                showUnit    : false
                 valid       : ! vTreatmentCreate.dialyzerTypeRejectReason
 
                 contentItem : BaseComboBox { id: _dialyzerTypeComboBox
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
===================================================================
diff -u -r135c320c850b09365c04e03d95195412c12fba72 -r7c550f70136f2f33520661a2e97fe99021cc681d
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision 135c320c850b09365c04e03d95195412c12fba72)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
@@ -46,11 +46,6 @@
     y       : Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight
     radius  : Variables.adjustmentDialogRadius
 
-    notification {
-        height : Variables.adjustmentNotificationHeight
-        radius : _root.radius
-    }
-
     onVisibleChanged: {
         notificationText = ""
     }
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
===================================================================
diff -u -r135c320c850b09365c04e03d95195412c12fba72 -r7c550f70136f2f33520661a2e97fe99021cc681d
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 135c320c850b09365c04e03d95195412c12fba72)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml	(.../TreatmentAdjustmentUltrafiltrationConfirm.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
@@ -41,7 +41,6 @@
 
         implicitWidth       : 416
         implicitHeight      : 78
-        textPixelSize       : Fonts.fontPixelButton
         contentItem: Text { id: _value
             font {
                 pixelSize   : Fonts.fontPixelUltrafiltrationAdjustmentMetrics
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
===================================================================
diff -u -r135c320c850b09365c04e03d95195412c12fba72 -r7c550f70136f2f33520661a2e97fe99021cc681d
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(.../TreatmentAdjustmentUltrafiltrationEdit.qml)	(revision 135c320c850b09365c04e03d95195412c12fba72)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(.../TreatmentAdjustmentUltrafiltrationEdit.qml)	(revision 7c550f70136f2f33520661a2e97fe99021cc681d)
@@ -141,10 +141,9 @@
             LabelUnitContainer { id: _volumeGoalContainer
                 objectName          : "_volumeGoalContainer"
                 width               : parent.width
-                height              : Variables.defaultButtonHeight
+                height              : _ufMetrics.height
                 text                : qsTr("UF Volume Goal")
                 unitText            : Variables.unitVolume
-                textPixelSize       : Fonts.fontPixelButton
                 contentItem : ValueAdjuster { id: _volumeGoalAdjuster
                     objectName      : "_volumeGoalAdjuster"
                     textColor       : Colors.ufVolumeGoalText