Index: sources/gui/qml/pages/settings/SettingsFactoryReset.qml
===================================================================
diff -u -r945614a28df94075bfccdfde7c876e4f53ed3410 -r46231564422493a69e3120459adefe1320eba255
--- sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(.../SettingsFactoryReset.qml)	(revision 945614a28df94075bfccdfde7c876e4f53ed3410)
+++ sources/gui/qml/pages/settings/SettingsFactoryReset.qml	(.../SettingsFactoryReset.qml)	(revision 46231564422493a69e3120459adefe1320eba255)
@@ -26,25 +26,15 @@
  *          which asks for confirmation of performing a factory reset and doing it if confirmed
  */
 UserConfirmation{ id: _root
-    title               : qsTr("Factory Reset")
-    message             : vDevice.factoryResetEnabled ? qsTr("Do you want to perform a factory reset?")
-                                                      : qsTr("Resetting...")
+    message             : vDevice.factoryResetEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase())
+                                                      : qsTr("Please wait ...")
     itemIndex           : SettingsStack.FactoryReset
     notificationText    : vDevice.status
 
-    confirmVisible      :  true
+    confirmVisible      : true
     confirmEnabled      : vDevice.factoryResetEnabled
     onConfirmClicked    : vDevice.factoryReset = "" // Need to set to something (ie: emtpy string) to trigger CPP code
 
     backVisible         : true
     backEnabled         : vDevice.factoryResetEnabled
-    onBackClicked       : _root.notificationText = ""
-
-    Connections{ target:vDevice
-        function onAcceptedChanged() {
-            if(_root.visible) { // indicate reset screen is shown
-                _root.notificationText = vDevice.status
-            }
-        }
-    }
 }