Index: sources/gui/qml/components/CloseButton.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r89f5f4202db6669435cbed004a2cf3850602d29e
--- sources/gui/qml/components/CloseButton.qml	(.../CloseButton.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/components/CloseButton.qml	(.../CloseButton.qml)	(revision 89f5f4202db6669435cbed004a2cf3850602d29e)
@@ -29,7 +29,7 @@
 
     anchors {
         top     : parent.top
-        left    : parent.left
+        right   : parent.right
         margins : 35
     }
     Image { id  : _image
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
===================================================================
diff -u -rf8e37a0cbb537edceebee7a7c5f2676f497d1e26 -r89f5f4202db6669435cbed004a2cf3850602d29e
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision f8e37a0cbb537edceebee7a7c5f2676f497d1e26)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision 89f5f4202db6669435cbed004a2cf3850602d29e)
@@ -46,20 +46,25 @@
         notificationText = ""
     }
 
-    header:
-    Rectangle { id : _headerRect
+    header: Item { id : _headerRect
+        implicitHeight: 120
+        // TODO: remove ConfirmButton later once it is moved out into screens that inherit this
         ConfirmButton { id : _confirmButton
             visible: _root.confirmVisible
             onClicked : confirmClicked()
         }
+
         BackButton { id : _backButton
             visible: _root.backVisible
             onClicked : backClicked()
         }
 
         TitleText { id : _titleText
             text: titleText
-            font.pixelSize: Fonts.fontPixelButton
+            font {
+                pixelSize: Fonts.fontPixelTitle
+                weight: Font.Medium
+            }
             color: Colors.textMain
             height: Variables.mainMenuHeight
             anchors {
@@ -71,7 +76,6 @@
 
         CloseButton { id : _closeButton
             visible: _root.closeVisible
-            anchors.left: parent.left
             onClicked : {
                 closeClicked()
                 close()