Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
===================================================================
diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -rbd476995001c165188e4c86010bf8b0505d2ca35
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(.../TreatmentAdjustmentBase.qml)	(revision bd476995001c165188e4c86010bf8b0505d2ca35)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file TreatmentAdjustmentBase.qml
- * \author (last) Peter Lucia
- * \date (last) 25-Jun-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 22-Mar-2020
+ * \file    TreatmentAdjustmentBase.qml
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Jun-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  22-Mar-2020
  *
  */
 
@@ -44,18 +44,14 @@
         notificationText = ""
     }
 
-    notification.iconVisible: false
-
     header:
     Rectangle { id : _headerRect
         ConfirmButton { id : _confirmButton
             visible: _root.confirmVisible
-            anchors.left: parent.left
             onClicked : confirmClicked()
         }
         BackButton { id : _backButton
             visible: _root.backVisible
-            anchors.left: parent.left
             onClicked : backClicked()
         }
 
@@ -73,8 +69,11 @@
 
         CloseButton { id : _closeButton
             visible: _root.closeVisible
-            anchors.right: parent.right
-            onClicked : closeClicked()
+            anchors.left: parent.left
+            onClicked : {
+                closeClicked()
+                close()
+            }
         }
     }