diff --git a/doc/images/icons/FancyZones_MDL2.svg b/doc/images/icons/FancyZones_MDL2.svg
new file mode 100644
index 0000000000..5173874aa1
--- /dev/null
+++ b/doc/images/icons/FancyZones_MDL2.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" viewBox="0 0 48 48">
+  <g>
+    <path d="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index 2add0e20bf..ea44240466 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -62,10 +62,10 @@
                     IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                     AutomationProperties.LabeledBy="{Binding ElementName=FancyZones_LaunchEditorButtonControl}">
                 <StackPanel Orientation="Horizontal">
-                    <Viewbox Height="12" Width="12">
-                        <PathIcon Data="M 44.99970245361328 44.99970245361328 L 44.99970245361328 28.49970054626465 L 28.49970054626465 28.49970054626465 L 28.49970054626465 44.99970245361328 L 44.99970245361328 44.99970245361328 M 19.50000190734863 44.99970245361328 L 19.50000190734863 3.000001192092896 L 3.000001192092896 3.000001192092896 L 3.000001192092896 44.99970245361328 L 19.50000190734863 44.99970245361328 M 44.99970245361328 19.50000190734863 L 44.99970245361328 3.000001192092896 L 28.49970054626465 3.000001192092896 L 28.49970054626465 19.50000190734863 L 44.99970245361328 19.50000190734863 M 47.99970245361328 47.99970245361328 L 25.49970054626465 47.99970245361328 L 25.49970054626465 25.49970054626465 L 47.99970245361328 25.49970054626465 L 47.99970245361328 47.99970245361328 Z M 22.50000190734863 47.99970245361328 L 1.226806602971919e-06 47.99970245361328 L 1.226806602971919e-06 1.226806602971919e-06 L 22.50000190734863 1.226806602971919e-06 L 22.50000190734863 47.99970245361328 Z M 47.99970245361328 22.50000190734863 L 25.49970054626465 22.50000190734863 L 25.49970054626465 1.226806602971919e-06 L 47.99970245361328 1.226806602971919e-06 L 47.99970245361328 22.50000190734863 Z"/>
+                    <Viewbox Height="14" Width="14" Margin="-1,1,0,0">
+                        <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
                     </Viewbox>
-                    <TextBlock Margin="12,0,0,0"
+                    <TextBlock Margin="8,0,0,0"
                                Name="FancyZones_LaunchEditorButtonControl"
                                x:Uid="FancyZones_LaunchEditorButtonControl"/>
                 </StackPanel>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
index a9bc4f6842..a5b950c92f 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -41,10 +41,9 @@
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
                 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
-                        <PathIcon Data="M 44.99970245361328 44.99970245361328 L 44.99970245361328 28.49970054626465 L 28.49970054626465 28.49970054626465 L 28.49970054626465 44.99970245361328 L 44.99970245361328 44.99970245361328 M 19.50000190734863 44.99970245361328 L 19.50000190734863 3.000001192092896 L 3.000001192092896 3.000001192092896 L 3.000001192092896 44.99970245361328 L 19.50000190734863 44.99970245361328 M 44.99970245361328 19.50000190734863 L 44.99970245361328 3.000001192092896 L 28.49970054626465 3.000001192092896 L 28.49970054626465 19.50000190734863 L 44.99970245361328 19.50000190734863 M 47.99970245361328 47.99970245361328 L 25.49970054626465 47.99970245361328 L 25.49970054626465 25.49970054626465 L 47.99970245361328 25.49970054626465 L 47.99970245361328 47.99970245361328 Z M 22.50000190734863 47.99970245361328 L 1.226806602971919e-06 47.99970245361328 L 1.226806602971919e-06 1.226806602971919e-06 L 22.50000190734863 1.226806602971919e-06 L 22.50000190734863 47.99970245361328 Z M 47.99970245361328 22.50000190734863 L 25.49970054626465 22.50000190734863 L 25.49970054626465 1.226806602971919e-06 L 47.99970245361328 1.226806602971919e-06 L 47.99970245361328 22.50000190734863 Z"></PathIcon>
+                        <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
@@ -54,35 +53,30 @@
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_ImageResizer" helpers:NavHelper.NavigateTo="views:ImageResizerPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <PathIcon Data="M0 768h1408v1152H0V768zm128 1024h870l-582-581-288 288v293zm1152 0v-102l-224-223-101 101 223 224h102zM128 896v421l288-287 448 447 192-191 224 224V896H128zm832 256q-26 0-45-19t-19-45q0-26 19-45t45-19q26 0 45 19t19 45q0 26-19 45t-45 19zm960-512V347l-339 338-90-90 338-339h-293V128h512v512h-128zm-768-512h256v128h-256V128zm-128 128H768V128h256v128zm-384 0H384V128h256v128zm-384 0H0V128h256v128zM128 640H0V384h128v256zm1920 128v256h-128V768h128zm-128 384h128v256h-128v-256zm0 384h128v256h-128v-256zm-384 256h256v128h-256v-128z"></PathIcon>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_KeyboardManager" helpers:NavHelper.NavigateTo="views:KeyboardManagerPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE765;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE8AC;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE773;"/>
                     </winui:NavigationViewItem.Icon>
                 </winui:NavigationViewItem>
 
-                <!-- TO DO: Update icon -->
                 <winui:NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage" AutomationProperties.HeadingLevel="Level1">
                     <winui:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEDA7;"/>
@@ -94,7 +88,6 @@
                 DefaultHeader="{x:Bind ViewModel.Selected.Content, Mode=OneWay}">
                     <behaviors:NavigationViewHeaderBehavior.DefaultHeaderTemplate>
                         <DataTemplate>
-                            <!-- TODO: Style clean up-->
                             <Grid Margin="0, -2, 0, 6">
                                 <TextBlock
                                 Text="{Binding}"