Index: sources/gui/qml/PowerItem.qml
===================================================================
diff -u -r213b9fed4fc569eb85a0647bde9869a3c82c0db3 -r16028b057650dab9f5a2f27eaba5c9618c29dd9a
--- sources/gui/qml/PowerItem.qml	(.../PowerItem.qml)	(revision 213b9fed4fc569eb85a0647bde9869a3c82c0db3)
+++ sources/gui/qml/PowerItem.qml	(.../PowerItem.qml)	(revision 16028b057650dab9f5a2f27eaba5c9618c29dd9a)
@@ -56,7 +56,6 @@
         onAccepted: {
             if ( ! vConfirm.isReject ) {
                 vConfirm.doConfirm( true  )
-                shutdownWait()
             }
         }
 
@@ -89,13 +88,19 @@
                     )
     }
 
-    function shutdownWait() {
-        _autoHideInfo.showDialog (
-                    qsTr("System is shutting down"),
-                    5000 // if any error happens and shutdown is not successful then after 5 seconds dialog hides.
-                    )
+    // ---- Connections
+    Connections { target: _GuiView
+        function onDidActionReceive( vAction, vData ) {
+            switch(vAction) {
+            case GuiActions.ID_ShuttingDown:
+                _autoHideInfo.showDialog (
+                            qsTr("System is shutting down"),
+                            5000 // if any error happens and shutdown is not successful then after 5 seconds dialog hides.
+                            )
+                break;
+            }
+        }
     }
-
     Connections { target: vConfirm
         function onIsRejectChanged              ( vValue ) {
             _powerOffDialog.footerUpdate()
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rd95ed86d997208024ec79422e350a86a2c52fd85 -r16028b057650dab9f5a2f27eaba5c9618c29dd9a
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision d95ed86d997208024ec79422e350a86a2c52fd85)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 16028b057650dab9f5a2f27eaba5c9618c29dd9a)
@@ -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 = ""