diff --git a/windows/configuration/images/icons/notification.svg b/windows/configuration/images/icons/notification.svg
new file mode 100644
index 0000000000..0da0f9814d
--- /dev/null
+++ b/windows/configuration/images/icons/notification.svg
@@ -0,0 +1,3 @@
+
diff --git a/windows/configuration/images/icons/taskbar.svg b/windows/configuration/images/icons/taskbar.svg
new file mode 100644
index 0000000000..1a5a54d980
--- /dev/null
+++ b/windows/configuration/images/icons/taskbar.svg
@@ -0,0 +1,3 @@
+
diff --git a/windows/configuration/start/policy-settings.md b/windows/configuration/start/policy-settings.md
index f978ff31a8..9dd5437ffc 100644
--- a/windows/configuration/start/policy-settings.md
+++ b/windows/configuration/start/policy-settings.md
@@ -81,7 +81,7 @@ Select one of the tabs to see the list of available settings:
|[Prevent users from customizing their Start](#prevent-users-from-customizing-their-start)|❌|✅|
|[Prevent users from uninstalling applications from Start](#prevent-users-from-uninstalling-applications-from-start)|❌|✅|
|[Remove common program groups](#remove-common-program-groups)|❌|✅|
-|[Show "Run as different user" command](#show-run-as-different-user-command)|❌|✅|
+|[Show **Run as different user** command](#show-run-as-different-user-command)|❌|✅|
::: zone-end
[!INCLUDE [clear-history-of-recently-opened-documents-on-exit](includes/clear-history-of-recently-opened-documents-on-exit.md)]
@@ -116,7 +116,6 @@ Select one of the tabs to see the list of available settings:
[!INCLUDE [remove-common-program-groups](includes/remove-common-program-groups.md)]
[!INCLUDE [show-run-as-different-user-command](includes/show-run-as-different-user-command.md)]
-
#### [:::image type="icon" source="../images/icons/allapps.svg"::: **All apps**](#tab/allapps)
|Policy name| CSP | GPO |
diff --git a/windows/configuration/taskbar/policy-settings.md b/windows/configuration/taskbar/policy-settings.md
index 8b67bc30b6..219360ba00 100644
--- a/windows/configuration/taskbar/policy-settings.md
+++ b/windows/configuration/taskbar/policy-settings.md
@@ -34,35 +34,66 @@ The settings are categorized and presented in alphabetical order to facilitate n
-[!INCLUDE [file](includes/configures-the-chat-icon-on-the-taskbar-m.md)]
-[!INCLUDE [file](includes/disable-editing-quick-settings.md)]
-[!INCLUDE [file](includes/do-not-allow-pinning-items-in-jump-lists-u.md)]
-[!INCLUDE [file](includes/do-not-allow-pinning-programs-to-the-taskbar-u.md)]
-[!INCLUDE [file](includes/do-not-allow-pinning-store-app-to-the-taskbar-u.md)]
-[!INCLUDE [file](includes/do-not-allow-taskbars-on-more-than-one-display-u.md)]
-[!INCLUDE [file](includes/do-not-display-or-track-items-in-jump-lists-from-remote-locations-u.md)]
-[!INCLUDE [file](includes/example-localized.md)]
-[!INCLUDE [file](includes/hide-the-notification-area-u.md)]
-[!INCLUDE [file](includes/hide-the-taskview-button-um.md)]
-[!INCLUDE [file](includes/lock-all-taskbar-settings-u.md)]
-[!INCLUDE [file](includes/lock-the-taskbar-u.md)]
-[!INCLUDE [file](includes/prevent-changes-to-taskbar-and-start-menu-settings-um.md)]
-[!INCLUDE [file](includes/prevent-grouping-of-taskbar-items-u.md)]
-[!INCLUDE [file](includes/prevent-users-from-adding-or-removing-toolbars-u.md)]
-[!INCLUDE [file](includes/prevent-users-from-moving-taskbar-to-another-screen-dock-location-u.md)]
-[!INCLUDE [file](includes/prevent-users-from-rearranging-toolbars-u.md)]
-[!INCLUDE [file](includes/prevent-users-from-resizing-the-taskbar-u.md)]
-[!INCLUDE [file](includes/remove-access-to-the-context-menus-for-the-taskbar-um.md)]
-[!INCLUDE [file](includes/remove-clock-from-the-system-notification-area-u.md)]
-[!INCLUDE [file](includes/remove-notifications-and-action-center-u.md)]
-[!INCLUDE [file](includes/remove-pinned-programs-from-the-taskbar-um.md)]
-[!INCLUDE [file](includes/remove-quick-settings-u.md)]
-[!INCLUDE [file](includes/remove-the-battery-meter-u.md)]
-[!INCLUDE [file](includes/remove-the-meet-now-icon-u.md)]
-[!INCLUDE [file](includes/remove-the-networking-icon-u.md)]
-[!INCLUDE [file](includes/remove-the-people-bar-from-the-taskbar-u.md)]
-[!INCLUDE [file](includes/remove-the-volume-control-icon-u.md)]
-[!INCLUDE [file](includes/show-additional-calendar-u.md)]
-[!INCLUDE [file](includes/simplify-quick-settings-layout-m.md)]
-[!INCLUDE [file](includes/turn-off-automatic-promotion-of-notification-icons-to-the-taskbar-u.md)]
-[!INCLUDE [file](includes/turn-off-notification-area-cleanup-u.md)]
\ No newline at end of file
+|Setting Name|CSP|GPO|
+|-|-|-|
+|[Configures the Chat icon on the taskbar](#configures-the-chat-icon-on-the-taskbar)||✅|
+|[Do not allow pinning items in Jump Lists](#do-not-allow-pinning-items-in-jump-lists)||✅|
+|[Do not allow pinning programs to the Taskbar](#do-not-allow-pinning-programs-to-the-taskbar)||✅|
+|[Do not allow pinning Store app to the Taskbar](#do-not-allow-pinning-store-app-to-the-taskbar)||✅|
+|[Do not allow taskbars on more than one display](#do-not-allow-taskbars-on-more-than-one-display)||✅|
+|[Do not display or track items in Jump Lists from remote locations](#do-not-display-or-track-items-in-jump-lists-from-remote-locations)||✅|
+|[Hide the notification area](#hide-the-notification-area)||✅|
+|[Hide the TaskView button](#hide-the-taskview-button)||✅|
+|[Lock all taskbar settings](#lock-all-taskbar-settings)||✅|
+|[Lock the Taskbar](#lock-the-taskbar)||✅|
+|[Prevent changes to Taskbar and Start Menu Settings](#prevent-changes-to-taskbar-and-start-menu-settings)||✅|
+|[Prevent grouping of taskbar items](#prevent-grouping-of-taskbar-items)||✅|
+|[Prevent users from adding or removing toolbars](#prevent-users-from-adding-or-removing-toolbars)||✅|
+|[Prevent users from moving taskbar to another screen dock location](#prevent-users-from-moving-taskbar-to-another-screen-dock-location)||✅|
+|[Prevent users from rearranging toolbars](#prevent-users-from-rearranging-toolbars)||✅|
+|[Prevent users from resizing the taskbar](#prevent-users-from-resizing-the-taskbar)||✅|
+|[Remove access to the context menus for the taskbar](#remove-access-to-the-context-menus-for-the-taskbar)||✅|
+|[Remove Clock from the system notification area](#remove-clock-from-the-system-notification-area)||✅|
+|[Remove Notifications and Action Center](#remove-notifications-and-action-center)||✅|
+|[Remove pinned programs from the Taskbar](#remove-pinned-programs-from-the-taskbar)||✅|
+|[Remove Quick Settings](#remove-quick-settings)||✅|
+|[Remove the battery meter](#remove-the-battery-meter)||✅|
+|[Remove the Meet Now icon](#remove-the-meet-now-icon)||✅|
+|[Remove the networking icon](#remove-the-networking-icon)||✅|
+|[Remove the People Bar from the taskbar](#remove-the-people-bar-from-the-taskbar)||✅|
+|[Remove the volume control icon](#remove-the-volume-control-icon)||✅|
+|[Show additional calendar](#show-additional-calendar)||✅|
+|[Simplify Quick Settings Layout](#simplify-quick-settings-layout)||✅|
+|[Turn off automatic promotion of notification icons to the taskbar](#turn-off-automatic-promotion-of-notification-icons-to-the-taskbar)||✅|
+|[Turn off notification area cleanup](#turn-off-notification-area-cleanup)||✅|
+
+[!INCLUDE [configures-the-chat-icon-on-the-taskbar-m](includes/configures-the-chat-icon-on-the-taskbar-m.md)]
+[!INCLUDE [do-not-allow-pinning-items-in-jump-lists-u](includes/do-not-allow-pinning-items-in-jump-lists-u.md)]
+[!INCLUDE [do-not-allow-pinning-programs-to-the-taskbar-u](includes/do-not-allow-pinning-programs-to-the-taskbar-u.md)]
+[!INCLUDE [do-not-allow-pinning-store-app-to-the-taskbar-u](includes/do-not-allow-pinning-store-app-to-the-taskbar-u.md)]
+[!INCLUDE [do-not-allow-taskbars-on-more-than-one-display-u](includes/do-not-allow-taskbars-on-more-than-one-display-u.md)]
+[!INCLUDE [do-not-display-or-track-items-in-jump-lists-from-remote-locations-u](includes/do-not-display-or-track-items-in-jump-lists-from-remote-locations-u.md)]
+[!INCLUDE [hide-the-notification-area-u](includes/hide-the-notification-area-u.md)]
+[!INCLUDE [hide-the-taskview-button-um](includes/hide-the-taskview-button-um.md)]
+[!INCLUDE [lock-all-taskbar-settings-u](includes/lock-all-taskbar-settings-u.md)]
+[!INCLUDE [lock-the-taskbar-u](includes/lock-the-taskbar-u.md)]
+[!INCLUDE [prevent-changes-to-taskbar-and-start-menu-settings-um](includes/prevent-changes-to-taskbar-and-start-menu-settings-um.md)]
+[!INCLUDE [prevent-grouping-of-taskbar-items-u](includes/prevent-grouping-of-taskbar-items-u.md)]
+[!INCLUDE [prevent-users-from-adding-or-removing-toolbars-u](includes/prevent-users-from-adding-or-removing-toolbars-u.md)]
+[!INCLUDE [prevent-users-from-moving-taskbar-to-another-screen-dock-location-u](includes/prevent-users-from-moving-taskbar-to-another-screen-dock-location-u.md)]
+[!INCLUDE [prevent-users-from-rearranging-toolbars-u](includes/prevent-users-from-rearranging-toolbars-u.md)]
+[!INCLUDE [prevent-users-from-resizing-the-taskbar-u](includes/prevent-users-from-resizing-the-taskbar-u.md)]
+[!INCLUDE [remove-access-to-the-context-menus-for-the-taskbar-um](includes/remove-access-to-the-context-menus-for-the-taskbar-um.md)]
+[!INCLUDE [remove-clock-from-the-system-notification-area-u](includes/remove-clock-from-the-system-notification-area-u.md)]
+[!INCLUDE [remove-notifications-and-action-center-u](includes/remove-notifications-and-action-center-u.md)]
+[!INCLUDE [remove-pinned-programs-from-the-taskbar-um](includes/remove-pinned-programs-from-the-taskbar-um.md)]
+[!INCLUDE [remove-quick-settings-u](includes/remove-quick-settings-u.md)]
+[!INCLUDE [remove-the-battery-meter-u](includes/remove-the-battery-meter-u.md)]
+[!INCLUDE [remove-the-meet-now-icon-u](includes/remove-the-meet-now-icon-u.md)]
+[!INCLUDE [remove-the-networking-icon-u](includes/remove-the-networking-icon-u.md)]
+[!INCLUDE [remove-the-people-bar-from-the-taskbar-u](includes/remove-the-people-bar-from-the-taskbar-u.md)]
+[!INCLUDE [remove-the-volume-control-icon-u](includes/remove-the-volume-control-icon-u.md)]
+[!INCLUDE [show-additional-calendar-u](includes/show-additional-calendar-u.md)]
+[!INCLUDE [simplify-quick-settings-layout-m](includes/simplify-quick-settings-layout-m.md)]
+[!INCLUDE [turn-off-automatic-promotion-of-notification-icons-to-the-taskbar-u](includes/turn-off-automatic-promotion-of-notification-icons-to-the-taskbar-u.md)]
+[!INCLUDE [turn-off-notification-area-cleanup-u](includes/turn-off-notification-area-cleanup-u.md)]