Index: sources/gui/qml/pages/settings/SettingsBase.qml
===================================================================
diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r3b323bd6a1a03429c2321a889049de1c3b11302f
--- sources/gui/qml/pages/settings/SettingsBase.qml	(.../SettingsBase.qml)	(revision 7077e38c74db9cccb5496ffefcf8936c0916de76)
+++ sources/gui/qml/pages/settings/SettingsBase.qml	(.../SettingsBase.qml)	(revision 3b323bd6a1a03429c2321a889049de1c3b11302f)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2024 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    SettingsBase.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      14-Apr-2021
+ * \date    (last)      13-Mar-2024
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  14-Apr-2021
+ * \date    (original)  16-Apr-2021
  *
  */
 
@@ -27,22 +27,29 @@
 ScreenItem { id: _root
     objectName: "_SettingsBase"
 
-    property var firstFocusInput    : undefined
+    property int    labelWidth          : 200
+    property int    entryWidth          : 100
+
+    property var    firstFocusInput     : undefined
     readonly
-    property int topMarginTitle     : 100
-    property int topMarginContent   : 200
+    property int    topMarginTitle      : 100
+    property int    topMarginContent    : 200
 
-    property int   itemIndex        : 0
-    property alias title            : _titleText.text
+    property int    bottomMarginContent : Variables.settingsContentBottomMargin
+    property int    sidesMarginContent  : Variables.settingsContentSidesMargin
 
-    property alias notificationText : _information.text
+    property int    itemIndex           : 0
+    property alias  title               : _titleText.text
 
-    property alias     backVisible  : _backButton   .visible
-    property alias     backEnabled  : _backButton   .enabled
-    property alias  confirmVisible  : _confirmButton.visible
-    property alias  confirmEnabled  : _confirmButton.enabled
-    property alias confirmText      : _confirmButton.text
+    property alias  notificationText    : _information.text
+    property int    notificationMargin  : Variables.notificationHeight + Variables.minVGap
 
+    property alias     backVisible      : _backButton   .visible
+    property alias     backEnabled      : _backButton   .enabled
+    property alias  confirmVisible      : _confirmButton.visible
+    property alias  confirmEnabled      : _confirmButton.enabled
+    property alias  confirmText         : _confirmButton.text
+
     signal    backClicked()
     signal confirmClicked()
 
@@ -71,11 +78,6 @@
         objectName: "_confirmButton"
         visible: true
         enabled: true
-        anchors {
-            left    : undefined
-            top     : parent.top
-            right   : parent.right
-        }
         onClicked: {
             _root.confirmClicked()
             _keyboard.setVisible(false)
@@ -101,7 +103,7 @@
         textColor   : Colors.white
         imageSource : ""
         text        : ""
-        anchors.bottomMargin: Variables.mainMenuHeight + Variables.minVGap
+        anchors.bottomMargin: _root.notificationMargin
     }
 
     onVisibleChanged: {