Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
===================================================================
diff -u -ree27c59d21daf9ad067d3cb5327fadd7c73b9838 -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision ee27c59d21daf9ad067d3cb5327fadd7c73b9838)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2)
@@ -27,54 +27,73 @@
  *          For all adjustment screens in treatment
  */
 ModalDialog { id: _root
-    contentItem.objectName  : "TreatmentAdjustmentBase"  //SquishQt testability
+    contentItem.objectName: "TreatmentAdjustmentBase"  //SquishQt testability
 
     property string titleText: ""
 
     property bool   closeVisible: true
-    property bool confirmVisible: true
+    property bool confirmVisible: false
     property bool    backVisible: false
     property alias   information: _information
-    property bool   confirmEnabled: true
 
     signal   closeClicked()
     signal confirmClicked()
     signal    backClicked()
 
-    y: Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight
+    width   : Variables.adjustmentDialogWidth
+    height  : Variables.adjustmentDialogHeight
+    y       : Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight
 
     onVisibleChanged: {
         notificationText = ""
     }
 
-    header:
-    Rectangle { id : _headerRect
+    header: Item { id : _headerRect
+        implicitHeight: Variables.adjustmentHeaderHeight
+        // TODO: remove ConfirmButton later once it is moved out into screens that inherit this
         ConfirmButton { id : _confirmButton
+            anchors {
+                right           : parent.right
+                verticalCenter  : _backButton.verticalCenter
+                margins         : Variables.adjustmentButtonMargin
+            }
             visible: _root.confirmVisible
-            enabled: _root.confirmEnabled
-
             onClicked : confirmClicked()
         }
+
         BackButton { id : _backButton
+            anchors {
+                top     : parent.top
+                left    : parent.left
+                margins : Variables.adjustmentButtonMargin
+            }
             visible: _root.backVisible
             onClicked : backClicked()
         }
 
         TitleText { id : _titleText
             text: titleText
-            font.pixelSize: Fonts.fontPixelButton
-            color: Colors.textMain
-            height: Variables.mainMenuHeight
+            font {
+                pixelSize   : Fonts.fontPixelTitle
+                weight      : Font.Medium
+            }
+            color   : Colors.textMain
+            width   : contentWidth
+            height  : contentHeight
             anchors {
-                top: parent.top
-                horizontalCenter: parent.horizontalCenter
-                margins: 35
+                bottom              : parent.bottom
+                horizontalCenter    : parent.horizontalCenter
+                margins             : Variables.defaultMargin
             }
         }
 
         CloseButton { id : _closeButton
+            anchors {
+                right           : parent.right
+                verticalCenter  : _backButton.verticalCenter
+                margins         : Variables.adjustmentButtonMargin
+            }
             visible: _root.closeVisible
-            anchors.left: parent.left
             onClicked : {
                 closeClicked()
                 close()