Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r72550dbbd6db8eab40aad38956b32f99416600c8 -rb069b0422c4a2ce4e41acfa873deb38c11b429ba
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 72550dbbd6db8eab40aad38956b32f99416600c8)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision b069b0422c4a2ce4e41acfa873deb38c11b429ba)
@@ -104,7 +104,7 @@
     }
     property var itemsText  : [
         qsTr("Device Information"               ), // Device Information
-        qsTr("Volume And Brightness"            ), // VolumeBrightness
+        qsTr("Display and Volume"               ), // VolumeBrightness
         qsTr("Wi-Fi"                            ), // WiFi
         qsTr("Device Cleaning"                  ), // DGCleaning
         qsTr("DG Scheduling"                    ), // DGScheduling
@@ -161,18 +161,13 @@
         //TODO  on graceful shutdown, the applicaiton quit shall be used for any applicaiton termination
         //      and needs to be distinguished between the QUIT or SHUTDOWN touch,
         //      to know whether to run the lockdown scropt or just quit the app.
-        confirmVisible  : serviceMode           || _GuiView.updateMode
-        confirmText.text: _GuiView.manufactMode || _GuiView.updateMode  ? qsTr("COMPLETE") : qsTr("SHUTDOWN")
-        onConfirmClicked: {
-            if ( _GuiView.manufactSetup || _GuiView.updateSetup ) {
-                _GuiView.doQuitApplication()
-            }
-            else {
-                _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
-            }
-        }
+        confirmVisible  : _GuiView.manufactMode || _GuiView.updateMode
+        confirmText.text:  qsTr("COMPLETE")
         itemsText       : _root.itemsText
         itemsVisible    : _root.itemsVisible
+
+        onConfirmClicked: _GuiView.doQuitApplication()
+
         onItemClicked   : {
             _root.currentItem = vIndex
             vDevice.status = ""