diff --git a/windows/configuration/quick-machine-recovery/images/quick-machine-recovery-settings.png b/windows/configuration/quick-machine-recovery/images/quick-machine-recovery-settings.png
index dac1200e44..c2a6a63962 100644
Binary files a/windows/configuration/quick-machine-recovery/images/quick-machine-recovery-settings.png and b/windows/configuration/quick-machine-recovery/images/quick-machine-recovery-settings.png differ
diff --git a/windows/configuration/quick-machine-recovery/index.md b/windows/configuration/quick-machine-recovery/index.md
index c0ff34dcdd..2c48ecb2eb 100644
--- a/windows/configuration/quick-machine-recovery/index.md
+++ b/windows/configuration/quick-machine-recovery/index.md
@@ -92,6 +92,72 @@ The configuration options consist of:
[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
+# [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune**](#tab/intune)
+
+[!INCLUDE [intune-settings-catalog-1](../../../includes/configure/intune-settings-catalog-1.md)]
+
+| Category | Setting name |
+|--|--|
+| **Remote Remediation** | Enable Cloud Remediation |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Set Time To Reboot |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Set Retry Interval |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network SSID |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network Password |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network Password Encryption Type |
+| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network Password Encryption Store |
+
+[!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)]
+
+# [:::image type="icon" source="../images/icons/csp.svg" border="false"::: **CSP**](#tab/csp)
+
+You can configure devices with the [RemoteRemediation CSP][CSP-1].
+
+### Cloud remediation configuration
+
+Enable or disable cloud remediation using the following settings:
+
+| Setting |
+|--|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/EnableCloudRemediation`
- **Data type:** Boolean
- **Value:** `True`
- **Description**: When set to `True`, cloud remediation is enabled. |
+
+### Auto remediation configuration
+
+Configure the following settings to customize the auto remediation experience:
+
+| Setting |
+|--|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/AutoRemediationSettings/EnableAutoRemediation`
- **Data type:** Boolean
- **Value:** `True`
- **Description**: When set to `True`, auto remediation is enabled. |
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/AutoRemediationSettings/SetTimeToReboot`
- **Data type:** Integer
- **Value:** 1-4320 (default = 180)
- **Description**: Configure the time to reboot (in minutes) during auto remediation. The maximum time to reboot possible is 72 hours.|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/AutoRemediationSettings/SetRetryInterval`
- **Data type:** Integer
- **Value:** 1-4320 (default = 30)
- **Description**: Configure the retry interval (in minutes) during auto remediation. The retry interval shouldn't be higher than the time to reboot.|
+
+### Wi-Fi network connection configuration
+
+To configure the Wi-Fi network connection used during recovery, use the following settings:
+
+|Setting|
+|--|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkSSID`
- **Data type:** string
- **Value:** Wi-Fi network Service Set Identifier (SSID)|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkPassword`
- **Data type:** string
- **Value:** Wi-Fi network password|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkPasswordEncryptionType`
- **Data type:** Integer
- **Value:** `0` = The password isn't encrypted; `1` = The password is encrypted with the MDM certificate, `2` = The password is encrypted with custom certificate. When this value is used, you must also specify the custom store name in the `NetworkPasswordEncryptionStore` node.|
+|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkPasswordEncryptionStore`
- **Data type:** string
- **Value:** When a value of `2` is contained in `NetworkPasswordEncryptionType`, specify the store name where the certificate for decrypting the Network Password is stored.|
+
+# [:::image type="icon" source="../images/icons/settings-app.svg"::: **Settings**](#tab/settings)
+
+Here are the steps to configure quick mahcine recovery from Settings:
+
+1. Open Settings and go to System > Recovery**, or use the following shortcut:
+
+ > [!div class="nextstepaction"]
+ >
+ > [Recovery](ms-settings:recovery)
+
+1. Select **Quick machine recovery**
+1. To enable quick machine recovery, turn the **Quick machine recovery** toggle to **On**
+1. Configure the retry intervals and time-outs as needed
+
+ :::image type="content" source="images/quick-machine-recovery-settings.png" border="false" lightbox="images/quick-machine-recovery-settings.png" alt-text="Screenshot of the Setting app - Recovery - Quick machine recovery - showing the quick machine recovery options.":::
+
# [:::image type="icon" source="../images/icons/cmd.svg"::: **Command prompt**](#tab/cmd)
To configure quick machine recovery using the command line, you must create an XML file with the desired settings and then use the `reagentc.exe` command to apply those settings.
@@ -133,60 +199,6 @@ To remove the configured recovery settings, run the following command from an el
reagentc.exe /clearrecoverysettings
```
-# [:::image type="icon" source="../images/icons/csp.svg" border="false"::: **CSP**](#tab/csp)
-
-You can configure devices with the [RemoteRemediation CSP][CSP-1].
-
-### Cloud remediation configuration
-
-Enable or disable cloud remediation using the following settings:
-
-| Setting |
-|--|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/EnableCloudRemediation`
- **Data type:** Boolean
- **Value:** `True`
- **Description**: When set to `True`, cloud remediation is enabled. |
-
-### Auto remediation configuration
-
-Configure the following settings to customize the auto remediation experience:
-
-| Setting |
-|--|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/AutoRemediationSettings/EnableAutoRemediation`
- **Data type:** Boolean
- **Value:** `True`
- **Description**: When set to `True`, auto remediation is enabled. |
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/AutoRemediationSettings/SetTimeToReboot`
- **Data type:** Integer
- **Value:** 1-4320 (default = 180)
- **Description**: Configure the time to reboot (in minutes) during auto remediation. The maximum time to reboot possible is 72 hours.|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/AutoRemediationSettings/SetRetryInterval`
- **Data type:** Integer
- **Value:** 1-4320 (default = 30)
- **Description**: Configure the retry interval (in minutes) during auto remediation. The retry interval shouldn't be higher than the time to reboot.|
-
-### Wi-Fi network connection configuration
-
-To configure the Wi-Fi network connection used during recovery, use the following settings:
-
-|Setting|
-|--|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkSSID`
- **Data type:** string
- **Value:** Wi-Fi network Service Set Identifier (SSID)|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkPassword`
- **Data type:** string
- **Value:** Wi-Fi network password|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkPasswordEncryptionType`
- **Data type:** Integer
- **Value:** `0` = The password isn't encrypted; `1` = The password is encrypted with the MDM certificate, `2` = The password is encrypted with custom certificate. When this value is used, you must also specify the custom store name in the `NetworkPasswordEncryptionStore` node.|
-|- **OMA-URI:** `./Device/Vendor/MSFT/RemoteRemediation/CloudRemediationSettings/NetworkSettings/NetworkCredentials/NetworkPasswordEncryptionStore`
- **Data type:** string
- **Value:** When a value of `2` is contained in `NetworkPasswordEncryptionType`, specify the store name where the certificate for decrypting the Network Password is stored.|
-
-# [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune**](#tab/intune)
-
-[!INCLUDE [intune-settings-catalog-1](../../../includes/configure/intune-settings-catalog-1.md)]
-
-| Category | Setting name |
-|--|--|
-| **Remote Remediation** | Enable Cloud Remediation |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Set Time To Reboot |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Set Retry Interval |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network SSID |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network Password |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network Password Encryption Type |
-| **Remote Remediation** | Enable Cloud Remediation > Enable Auto Remediation > Network Password Encryption Store |
-
-[!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)]
-
-# [:::image type="icon" source="../images/icons/settings-app.svg"::: **Settings**](#tab/settings)
-
- :::image type="content" source="images/quick-machine-recovery-settings.png" border="false" lightbox="images/quick-machine-recovery-settings.png" alt-text="Screenshot of the Setting app - Recovery - Quick machine recovery - showing the quick machine recovery options.":::
-
---
### Verify Recovery Settings