Index: sources/gui/qml/pages/settings/SettingsBase.qml
===================================================================
diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -rf433eeefae34530e7cc3dc4e5576e43729b236f2
--- sources/gui/qml/pages/settings/SettingsBase.qml	(.../SettingsBase.qml)	(revision f0c8b8720a2e314268445a4a20fe701292026f6f)
+++ sources/gui/qml/pages/settings/SettingsBase.qml	(.../SettingsBase.qml)	(revision f433eeefae34530e7cc3dc4e5576e43729b236f2)
@@ -27,17 +27,14 @@
 ScreenItem { id: _root
     objectName: "_SettingsBase"
 
+    property Item contentItem           : null
+    property alias contentArea          : _contentArea
+
     property int    labelWidth          : 200
     property int    entryWidth          : 100
 
     property var    firstFocusInput     : undefined
-    readonly
-    property int    topMarginTitle      : 100
-    property int    topMarginContent    : 200
 
-    property int    bottomMarginContent : Variables.settingsContentBottomMargin
-    property int    sidesMarginContent  : Variables.settingsContentSidesMargin
-
     property int    itemIndex           : 0
     property alias  title               : _titleText.text
 
@@ -70,6 +67,7 @@
         }
         onClicked: {
             _root.backClicked()
+            _headerBar.titleText = settingsTitle
             pop()
         }
     }
@@ -87,23 +85,40 @@
     Text { id: _titleText
         anchors {
             top             : _root.top
-            topMargin       : topMarginTitle
+            topMargin       : Variables.defaultMargin * 3       // add margins to match design
             horizontalCenter: parent.horizontalCenter
         }
         horizontalAlignment : Text.AlignHCenter
-        text            : itemsText[itemIndex]
-        color           : Colors.textMain
-        font.pixelSize  : Fonts.fontPixelTitle
+        color               : Colors.textMain
+        font.pixelSize      : Fonts.fontPixelTitle
     }
 
+    ContentArea { id : _contentArea
+        anchors {
+            fill        :  _root
+            topMargin   : Variables.defaultMargin * 6   // add margins for content in each settings page to match design
+            leftMargin  : Variables.defaultMargin * 2
+            rightMargin : Variables.defaultMargin * 2
+            bottomMargin: Variables.settingsContentBottomMargin
+        }
+
+        contentItem: _root.contentItem
+    }
+
     // this meant to be used specifically as current state notification mostly for the message respose back reasons.
     NotificationBarSmall { id: _information
         visible     : text
         color       : Colors.transparent
         textColor   : Colors.white
         imageSource : ""
         text        : ""
-        anchors.bottomMargin: _root.notificationMargin
+        anchors {
+            bottom          : undefined
+            bottomMargin    : _root.notificationMargin
+            verticalCenter  : _backButton.verticalCenter
+            left            : _backButton.right
+            right           : _confirmButton.left
+        }
     }
 
     onVisibleChanged: {