diff --git a/windows/configuration/settings/page-visibility.md b/windows/configuration/settings/page-visibility.md
index 7423dd6380..2bc3491bd8 100644
--- a/windows/configuration/settings/page-visibility.md
+++ b/windows/configuration/settings/page-visibility.md
@@ -45,7 +45,7 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`:
 
 [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
 
-#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune/CSP**](#tab/intune)
+#### [:::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)]
 
@@ -55,7 +55,7 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`:
 
 [!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)]
 
-#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11)
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
 
 You can configure devices using the [Policy CSP][CSP-1].
 
diff --git a/windows/configuration/shell-launcher/configure.md b/windows/configuration/shell-launcher/configure.md
index da5de3ddb3..eaf9c9d380 100644
--- a/windows/configuration/shell-launcher/configure.md
+++ b/windows/configuration/shell-launcher/configure.md
@@ -233,7 +233,11 @@ Depending on your configuration, you can have a user to automatically sign in to
 
 Here are the options to remove Shell Launcher, select the method that best fits your needs:
 
-#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune)
+
+Unassign or delete the policy that contains the configuration.
+
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
 
 Unassign or delete the policy that contains the configuration.
 
diff --git a/windows/configuration/shell-launcher/quickstart-kiosk.md b/windows/configuration/shell-launcher/quickstart-kiosk.md
index c7e587aafe..a064bca35f 100644
--- a/windows/configuration/shell-launcher/quickstart-kiosk.md
+++ b/windows/configuration/shell-launcher/quickstart-kiosk.md
@@ -24,7 +24,7 @@ The examples can be modified to fit your specific requirements. For example, you
 
 [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
 
-#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune)
 
 > [!TIP]
 > Use the following Graph call to automatically create a custom policy in your Microsoft Intune tenant without assignments nor scope tags.
@@ -35,13 +35,16 @@ The examples can be modified to fit your specific requirements. For example, you
 
 Assign the policy to a group that contains as members the devices that you want to configure.
 
-Alternatively, you can configure devices using a [custom policy][MEM-1] with the [AssignedAccess CSP][WIN-3].
-
-- **Setting:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
-- **Value:**
-
 [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)]
 
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
+
+You can configure devices using the [AssignedAccess CSP][WIN-3].
+
+| Setting |
+|--|
+|- **OMA-URI:** `./Vendor/MSFT/AssignedAccess/ShellLauncher` <br>- **Data type:** string<br>- **Value:** [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)] |
+
 #### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps)
 
 [!INCLUDE [powershell-wmi-bridge-1](../../../includes/configure/powershell-wmi-bridge-1.md)]
diff --git a/windows/configuration/store/index.md b/windows/configuration/store/index.md
index 2fed537573..93d20d428c 100644
--- a/windows/configuration/store/index.md
+++ b/windows/configuration/store/index.md
@@ -17,7 +17,7 @@ You can use configuration service provider (CSP) or group policy (GPO) settings
 
 [!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
 
-#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune/CSP**](#tab/intune)
+#### [:::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)]