Index: sources/gui/qml/pages/settings/SettingsHome.qml
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rc43d24c50f4344348d36d8ae9273797f4557356a
--- sources/gui/qml/pages/settings/SettingsHome.qml	(.../SettingsHome.qml)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/gui/qml/pages/settings/SettingsHome.qml	(.../SettingsHome.qml)	(revision c43d24c50f4344348d36d8ae9273797f4557356a)
@@ -37,12 +37,22 @@
 
     signal itemClicked(int vIndex)
 
-    TouchGrid { id: _settingItems
-        anchors.centerIn: _root
-        onItemClicked   : _root.itemClicked(vIndex)
-        rowCount        : _root.rowCount
-        colCount        : _root.colCount
-        itemWidth       : 325
+    contentArea.anchors.topMargin: serviceMode ? Variables.defaultMargin * 2 : 0
+
+    contentItem: TouchGrid { id: _settingItems
+        onItemClicked       : _root.itemClicked(vIndex)
+        rowCount            : _root.rowCount
+        colCount            : _root.colCount
+        itemWidth           : _root.delegateWidth
+        itemHeight          : _root.delegateHeight
+        lineThickness       : 0
+        arrowWidth          : Variables.iconButtonSize
+        arrowHeight         : Variables.iconButtonSize
+        arrowRightMargin    : Variables.defaultMargin
+        delegateColor       :  Colors.panelBackgroundColor
+        delegateBorderWidth : 1
+        delegateBorderColor : Colors.panelBorderColor
+        itemsHasIndent      : Array(itemsText.length).fill(true) // sets all to true
     }
 
     // The Main menu need to hide in case we have any alarm, if not the menu is covered by keyboard but the alram does not.