diff --git a/doc/images/icons/FancyZones_MDL2.svg b/doc/images/icons/FancyZones_MDL2.svg
deleted file mode 100644
index 5173874aa1..0000000000
--- a/doc/images/icons/FancyZones_MDL2.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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/doc/images/overview/Awake_large.png b/doc/images/overview/Awake_large.png
index 1402f76c5e..6c8381b3e3 100644
Binary files a/doc/images/overview/Awake_large.png and b/doc/images/overview/Awake_large.png differ
diff --git a/doc/images/overview/Awake_small.png b/doc/images/overview/Awake_small.png
index be65d12f1c..3cebee3f32 100644
Binary files a/doc/images/overview/Awake_small.png and b/doc/images/overview/Awake_small.png differ
diff --git a/doc/images/overview/CommandNotFound_large.png b/doc/images/overview/CommandNotFound_large.png
new file mode 100644
index 0000000000..b6cd49ff8c
Binary files /dev/null and b/doc/images/overview/CommandNotFound_large.png differ
diff --git a/doc/images/overview/CommandNotFound_small.png b/doc/images/overview/CommandNotFound_small.png
new file mode 100644
index 0000000000..91fbaad9bb
Binary files /dev/null and b/doc/images/overview/CommandNotFound_small.png differ
diff --git a/doc/images/overview/CropAndLock_large.png b/doc/images/overview/CropAndLock_large.png
new file mode 100644
index 0000000000..fe825e22eb
Binary files /dev/null and b/doc/images/overview/CropAndLock_large.png differ
diff --git a/doc/images/overview/CropAndLock_small.png b/doc/images/overview/CropAndLock_small.png
new file mode 100644
index 0000000000..55bd32ca51
Binary files /dev/null and b/doc/images/overview/CropAndLock_small.png differ
diff --git a/doc/images/overview/EnvironmentVariables_large.png b/doc/images/overview/EnvironmentVariables_large.png
new file mode 100644
index 0000000000..96400df609
Binary files /dev/null and b/doc/images/overview/EnvironmentVariables_large.png differ
diff --git a/doc/images/overview/EnvironmentVariables_small.png b/doc/images/overview/EnvironmentVariables_small.png
new file mode 100644
index 0000000000..226f073acb
Binary files /dev/null and b/doc/images/overview/EnvironmentVariables_small.png differ
diff --git a/doc/images/overview/FileExplorerPreview_large.png b/doc/images/overview/FileExplorerPreview_large.png
new file mode 100644
index 0000000000..1118415bf0
Binary files /dev/null and b/doc/images/overview/FileExplorerPreview_large.png differ
diff --git a/doc/images/overview/FileExplorerPreview_small.png b/doc/images/overview/FileExplorerPreview_small.png
new file mode 100644
index 0000000000..00965ca07f
Binary files /dev/null and b/doc/images/overview/FileExplorerPreview_small.png differ
diff --git a/doc/images/overview/FileLocksmith_large.png b/doc/images/overview/FileLocksmith_large.png
new file mode 100644
index 0000000000..027ec353e8
Binary files /dev/null and b/doc/images/overview/FileLocksmith_large.png differ
diff --git a/doc/images/overview/FileLocksmith_small.png b/doc/images/overview/FileLocksmith_small.png
new file mode 100644
index 0000000000..7c2fcbdd3d
Binary files /dev/null and b/doc/images/overview/FileLocksmith_small.png differ
diff --git a/doc/images/overview/HostFileEditor_large.png b/doc/images/overview/HostFileEditor_large.png
new file mode 100644
index 0000000000..2dc457e5cd
Binary files /dev/null and b/doc/images/overview/HostFileEditor_large.png differ
diff --git a/doc/images/overview/HostFileEditor_small.png b/doc/images/overview/HostFileEditor_small.png
new file mode 100644
index 0000000000..acd004d1a2
Binary files /dev/null and b/doc/images/overview/HostFileEditor_small.png differ
diff --git a/doc/images/overview/ImageResizer_large.png b/doc/images/overview/ImageResizer_large.png
index edf3615e74..5a0ad9b141 100644
Binary files a/doc/images/overview/ImageResizer_large.png and b/doc/images/overview/ImageResizer_large.png differ
diff --git a/doc/images/overview/ImageResizer_small.png b/doc/images/overview/ImageResizer_small.png
index 8f227de84a..3d3f1c8f3c 100644
Binary files a/doc/images/overview/ImageResizer_small.png and b/doc/images/overview/ImageResizer_small.png differ
diff --git a/doc/images/overview/MouseWithoutBorders_large.png b/doc/images/overview/MouseWithoutBorders_large.png
new file mode 100644
index 0000000000..baba639afc
Binary files /dev/null and b/doc/images/overview/MouseWithoutBorders_large.png differ
diff --git a/doc/images/overview/MouseWithoutBorders_small.png b/doc/images/overview/MouseWithoutBorders_small.png
new file mode 100644
index 0000000000..77aed66258
Binary files /dev/null and b/doc/images/overview/MouseWithoutBorders_small.png differ
diff --git a/doc/images/overview/Original/Awake.png b/doc/images/overview/Original/Awake.png
index 9622431f12..584562ca99 100644
Binary files a/doc/images/overview/Original/Awake.png and b/doc/images/overview/Original/Awake.png differ
diff --git a/doc/images/overview/Original/CommandNotFound.png b/doc/images/overview/Original/CommandNotFound.png
new file mode 100644
index 0000000000..eb79bf0a94
Binary files /dev/null and b/doc/images/overview/Original/CommandNotFound.png differ
diff --git a/doc/images/overview/Original/CropAndLock.png b/doc/images/overview/Original/CropAndLock.png
new file mode 100644
index 0000000000..852c4887ac
Binary files /dev/null and b/doc/images/overview/Original/CropAndLock.png differ
diff --git a/doc/images/overview/Original/EnvironmentVariables.png b/doc/images/overview/Original/EnvironmentVariables.png
new file mode 100644
index 0000000000..dda04d4df0
Binary files /dev/null and b/doc/images/overview/Original/EnvironmentVariables.png differ
diff --git a/doc/images/overview/Original/FileExplorerPreview.png b/doc/images/overview/Original/FileExplorerPreview.png
new file mode 100644
index 0000000000..c894bbca4b
Binary files /dev/null and b/doc/images/overview/Original/FileExplorerPreview.png differ
diff --git a/doc/images/overview/Original/FileLocksmith.png b/doc/images/overview/Original/FileLocksmith.png
new file mode 100644
index 0000000000..4fe5b2e0fd
Binary files /dev/null and b/doc/images/overview/Original/FileLocksmith.png differ
diff --git a/doc/images/overview/Original/HostFileEditor.png b/doc/images/overview/Original/HostFileEditor.png
new file mode 100644
index 0000000000..84f0dca81f
Binary files /dev/null and b/doc/images/overview/Original/HostFileEditor.png differ
diff --git a/doc/images/overview/Original/ImageResizer.png b/doc/images/overview/Original/ImageResizer.png
index ce820cf950..52c52fc145 100644
Binary files a/doc/images/overview/Original/ImageResizer.png and b/doc/images/overview/Original/ImageResizer.png differ
diff --git a/doc/images/overview/Original/MouseWithoutBorders.png b/doc/images/overview/Original/MouseWithoutBorders.png
new file mode 100644
index 0000000000..3f5c7dc53c
Binary files /dev/null and b/doc/images/overview/Original/MouseWithoutBorders.png differ
diff --git a/doc/images/overview/Original/PasteAsPlainText.png b/doc/images/overview/Original/PasteAsPlainText.png
new file mode 100644
index 0000000000..68f3c67e31
Binary files /dev/null and b/doc/images/overview/Original/PasteAsPlainText.png differ
diff --git a/doc/images/overview/Original/Peek.png b/doc/images/overview/Original/Peek.png
new file mode 100644
index 0000000000..57b496118d
Binary files /dev/null and b/doc/images/overview/Original/Peek.png differ
diff --git a/doc/images/overview/Original/QuickAccent.png b/doc/images/overview/Original/QuickAccent.png
index 3c4bf6cd0f..d4f9bbf625 100644
Binary files a/doc/images/overview/Original/QuickAccent.png and b/doc/images/overview/Original/QuickAccent.png differ
diff --git a/doc/images/overview/Original/RegistryPreview.png b/doc/images/overview/Original/RegistryPreview.png
new file mode 100644
index 0000000000..325f7f08a8
Binary files /dev/null and b/doc/images/overview/Original/RegistryPreview.png differ
diff --git a/doc/images/overview/PasteAsPlainText_large.png b/doc/images/overview/PasteAsPlainText_large.png
new file mode 100644
index 0000000000..dfc83a2f33
Binary files /dev/null and b/doc/images/overview/PasteAsPlainText_large.png differ
diff --git a/doc/images/overview/PasteAsPlainText_small.png b/doc/images/overview/PasteAsPlainText_small.png
new file mode 100644
index 0000000000..866c49933a
Binary files /dev/null and b/doc/images/overview/PasteAsPlainText_small.png differ
diff --git a/doc/images/overview/Peek_large.png b/doc/images/overview/Peek_large.png
new file mode 100644
index 0000000000..ab0e9abe42
Binary files /dev/null and b/doc/images/overview/Peek_large.png differ
diff --git a/doc/images/overview/Peek_small.png b/doc/images/overview/Peek_small.png
new file mode 100644
index 0000000000..8040bf3b2f
Binary files /dev/null and b/doc/images/overview/Peek_small.png differ
diff --git a/doc/images/overview/QuickAccent_large.png b/doc/images/overview/QuickAccent_large.png
index a398f9d690..491cf80f4f 100644
Binary files a/doc/images/overview/QuickAccent_large.png and b/doc/images/overview/QuickAccent_large.png differ
diff --git a/doc/images/overview/QuickAccent_small.png b/doc/images/overview/QuickAccent_small.png
index 6ae9299ac6..1a1e2ccce7 100644
Binary files a/doc/images/overview/QuickAccent_small.png and b/doc/images/overview/QuickAccent_small.png differ
diff --git a/doc/images/overview/RegistryPreview_large.png b/doc/images/overview/RegistryPreview_large.png
new file mode 100644
index 0000000000..1433e4dd5c
Binary files /dev/null and b/doc/images/overview/RegistryPreview_large.png differ
diff --git a/doc/images/overview/RegistryPreview_small.png b/doc/images/overview/RegistryPreview_small.png
new file mode 100644
index 0000000000..7a75a39009
Binary files /dev/null and b/doc/images/overview/RegistryPreview_small.png differ
diff --git a/installer/PowerToysSetup/Settings.wxs b/installer/PowerToysSetup/Settings.wxs
index a31903d643..8963dabff0 100644
--- a/installer/PowerToysSetup/Settings.wxs
+++ b/installer/PowerToysSetup/Settings.wxs
@@ -14,13 +14,13 @@
   <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\OOBE\?>
 
   <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
-  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\FluentIcons\?>
+  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\?>
 
   <Fragment>
     <DirectoryRef Id="WinUI3AppsAssetsFolder">
       <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
         <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts"/>
-        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="FluentIcons" />
+        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons" />
         <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
           <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
         </Directory>
diff --git a/installer/PowerToysSetup/generateAllFileComponents.ps1 b/installer/PowerToysSetup/generateAllFileComponents.ps1
index f233ac5da6..d9d8b6845d 100644
--- a/installer/PowerToysSetup/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetup/generateAllFileComponents.ps1
@@ -180,7 +180,7 @@ Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListNa
 Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\FluentIcons\"""
+Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"""
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
 Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj
index 057a41460d..4b500715e5 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.PowerToys/Microsoft.PowerToys.Run.Plugin.PowerToys.csproj
@@ -81,39 +81,39 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
 
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsColorPicker.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\ColorPicker.png">
       <Link>Images\ColorPicker.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsFancyZones.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\FancyZones.png">
       <Link>Images\FancyZones.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsCropAndLock.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\CropAndLock.png">
       <Link>Images\CropAndLock.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsHosts.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\Hosts.png">
       <Link>Images\Hosts.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsPowerOcr.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\TextExtractor.png">
       <Link>Images\PowerOcr.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsRegistryPreview.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\RegistryPreview.png">
       <Link>Images\RegistryPreview.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsScreenRuler.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\ScreenRuler.png">
       <Link>Images\ScreenRuler.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsShortcutGuide.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\ShortcutGuide.png">
       <Link>Images\ShortcutGuide.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\FluentIcons\FluentIconsEnvironmentVariables.png">
+    <Content Include="..\..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\EnvironmentVariables.png">
       <Link>Images\EnvironmentVariables.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsSettings.png b/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsSettings.png
deleted file mode 100644
index a67a0589bb..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsSettings.png and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/AlwaysOnTop.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/AlwaysOnTop.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAwake.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Awake.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsAwake.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/Awake.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsColorPicker.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/ColorPicker.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsColorPicker.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/ColorPicker.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsCmdNotFound.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/CommandNotFound.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsCmdNotFound.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/CommandNotFound.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsCropAndLock.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/CropAndLock.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsCropAndLock.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/CropAndLock.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsEnvironmentVariables.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/EnvironmentVariables.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsEnvironmentVariables.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/EnvironmentVariables.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFancyZones.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/FancyZones.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFancyZones.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/FancyZones.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/FileExplorerPreview.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/FileExplorerPreview.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/FileLocksmith.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/FileLocksmith.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFindMyMouse.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/FindMyMouse.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsFindMyMouse.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/FindMyMouse.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsHosts.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Hosts.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsHosts.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/Hosts.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsImageResizer.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/ImageResizer.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsImageResizer.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/ImageResizer.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/KeyboardManager.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/KeyboardManager.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseCrosshairs.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseCrosshairs.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseHighlighter.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseHighlighter.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseHighlighter.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseHighlighter.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseJump.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseJump.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseJump.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseJump.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseUtils.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseUtils.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseWithoutBorders.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseWithoutBorders.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPastePlain.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/PasteAsPlainText.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPastePlain.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/PasteAsPlainText.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPeek.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Peek.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPeek.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/Peek.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerRename.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/PowerRename.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerRename.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/PowerRename.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToys.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/PowerToys.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToys.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/PowerToys.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/PowerToysRun.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/PowerToysRun.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/QuickAccent.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/QuickAccent.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/RegistryPreview.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/RegistryPreview.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/ScreenRuler.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/ScreenRuler.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/ShortcutGuide.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/ShortcutGuide.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/TextExtractor.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/TextExtractor.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/VideoConferenceMute.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Icons/VideoConferenceMute.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/Awake.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Awake.png
index 1402f76c5e..6c8381b3e3 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/Awake.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Awake.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdNotFound.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdNotFound.png
index 4b06c4de36..b6cd49ff8c 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdNotFound.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdNotFound.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CropAndLock.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CropAndLock.png
index d374783648..fe825e22eb 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CropAndLock.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CropAndLock.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/EnvironmentVariables.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/EnvironmentVariables.png
index 97e2ab67e6..96400df609 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/EnvironmentVariables.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/EnvironmentVariables.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileExplorerPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileExplorerPreview.png
new file mode 100644
index 0000000000..1118415bf0
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileExplorerPreview.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileLocksmith.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileLocksmith.png
index 0df62b4b24..027ec353e8 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileLocksmith.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/FileLocksmith.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/HostsFileEditor.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/HostsFileEditor.png
index 91da9da4b5..2dc457e5cd 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/HostsFileEditor.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/HostsFileEditor.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/ImageResizer.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/ImageResizer.png
index edf3615e74..5a0ad9b141 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/ImageResizer.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/ImageResizer.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseUtils.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseUtils.png
index d1e4e520d8..828a720958 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseUtils.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseUtils.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseWithoutBorders.png
index 4261e4e16b..1feaebe507 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseWithoutBorders.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/MouseWithoutBorders.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Awake.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Awake.png
index 2b27459cbb..9e59e7c385 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Awake.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Awake.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CmdNotFound.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CmdNotFound.png
index f40d8ae08c..c0f71d4894 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CmdNotFound.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CmdNotFound.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CropAndLock.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CropAndLock.gif
index 951392aaf7..9ebc1ec519 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CropAndLock.gif and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/CropAndLock.gif differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/EnvironmentVariables.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/EnvironmentVariables.png
index dcfb68d067..f544a733d6 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/EnvironmentVariables.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/EnvironmentVariables.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileExplorer.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileExplorer.png
index e57ecc3585..d7c826a7a4 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileExplorer.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/FileExplorer.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/HostsFileEditor.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/HostsFileEditor.png
index d89e8e422f..6cd27b5a02 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/HostsFileEditor.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/HostsFileEditor.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ImageResizer.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ImageResizer.gif
index e60e5d1d86..52a0fb0629 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ImageResizer.gif and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ImageResizer.gif differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseWithoutBorders.png
index 578f55152e..1e615046bc 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseWithoutBorders.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/MouseWithoutBorders.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHero.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PTHero.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHero.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PTHero.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHeroShort.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PTHeroShort.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEPTHeroShort.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PTHeroShort.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PasteAsPlainText.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PasteAsPlainText.gif
new file mode 100644
index 0000000000..86c6c80c2e
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PasteAsPlainText.gif differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PastePlain.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PastePlain.gif
deleted file mode 100644
index a9f6c089b7..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PastePlain.gif and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.gif
deleted file mode 100644
index 8dd16485f1..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.gif and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.png
new file mode 100644
index 0000000000..7cb528674a
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Peek.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerAccent.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerAccent.gif
deleted file mode 100644
index 3a897e1045..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerAccent.gif and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerRename.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerRename.gif
index b99cd466df..5f66cc841e 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerRename.gif and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerRename.gif differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/QuickAccent.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/QuickAccent.gif
new file mode 100644
index 0000000000..80fa31a0a7
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/QuickAccent.gif differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/RegistryPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/RegistryPreview.png
index 754005de39..24938f17ef 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/RegistryPreview.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/RegistryPreview.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Run.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Run.gif
index 2eb870b1d3..caf0ac67cf 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Run.gif and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/Run.gif differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ShortcutGuide.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/ShortcutGuide.png
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerOCR.gif b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/TextExtractor.gif
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/PowerOCR.gif
rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/TextExtractor.gif
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PasteAsPlainText.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PasteAsPlainText.png
new file mode 100644
index 0000000000..dfc83a2f33
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PasteAsPlainText.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PastePlain.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PastePlain.png
deleted file mode 100644
index cd5860fe7f..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PastePlain.png and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/Peek.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Peek.png
index 5c56e0cdd4..ab0e9abe42 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/Peek.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Peek.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerAccent.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerAccent.png
deleted file mode 100644
index a398f9d690..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerAccent.png and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerPreview.png
deleted file mode 100644
index be7b2ec073..0000000000
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerPreview.png and /dev/null differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/QuickAccent.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/QuickAccent.png
new file mode 100644
index 0000000000..491cf80f4f
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/QuickAccent.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/RegistryPreview.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/RegistryPreview.png
index 4afbf66f06..1433e4dd5c 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Modules/RegistryPreview.png and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/RegistryPreview.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/Run.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Run.png
new file mode 100644
index 0000000000..063e51be4c
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/Run.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerOCR.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/TextExtractor.png
similarity index 100%
rename from src/settings-ui/Settings.UI/Assets/Settings/Modules/PowerOCR.png
rename to src/settings-ui/Settings.UI/Assets/Settings/Modules/TextExtractor.png
diff --git a/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs b/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
index 10cea514f0..a1936dfccf 100644
--- a/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
+++ b/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
@@ -30,10 +30,13 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
         {
             switch (moduleType)
             {
-                case ModuleType.MousePointerCrosshairs: return "ms-appx:///Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png";
-                case ModuleType.MeasureTool: return "ms-appx:///Assets/Settings/FluentIcons/FluentIconsScreenRuler.png";
-                case ModuleType.PowerLauncher: return $"ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png";
-                default: return $"ms-appx:///Assets/Settings/FluentIcons/FluentIcons{moduleType}.png";
+                case ModuleType.PowerOCR: return "ms-appx:///Assets/Settings/Icons/TextExtractor.png";
+                case ModuleType.PastePlain: return "ms-appx:///Assets/Settings/Icons/PasteAsPlainText.png";
+                case ModuleType.PowerAccent: return "ms-appx:///Assets/Settings/Icons/QuickAccent.png";
+                case ModuleType.MousePointerCrosshairs: return "ms-appx:///Assets/Settings/Icons/MouseCrosshairs.png";
+                case ModuleType.MeasureTool: return "ms-appx:///Assets/Settings/Icons/ScreenRuler.png";
+                case ModuleType.PowerLauncher: return $"ms-appx:///Assets/Settings/Icons/PowerToysRun.png";
+                default: return $"ms-appx:///Assets/Settings/Icons/{moduleType}.png";
             }
         }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
index 2bdff9008c..b6456d5eb0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_Overview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
+    <controls:OOBEPageControl x:Uid="Oobe_Overview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PTHero.png">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <StackPanel Orientation="Horizontal" Spacing="8">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
index 7cafdb134f..713a082d86 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml
@@ -9,7 +9,7 @@
 
     <controls:OOBEPageControl
         x:Uid="Oobe_Overview"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHeroShort.png"
+        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PTHeroShort.png"
         HeroImageHeight="120">
 
         <controls:OOBEPageControl.PageContent>
@@ -39,7 +39,7 @@
                             <Image
                                 Width="36"
                                 HorizontalAlignment="Left"
-                                Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsFancyZones.png" />
+                                Source="ms-appx:///Assets/Settings/Icons/FancyZones.png" />
                             <TextBlock
                                 x:Uid="Alternate_OOBE_FancyZones_Title"
                                 Grid.Row="1"
@@ -80,7 +80,7 @@
                             <Image
                                 Width="36"
                                 HorizontalAlignment="Left"
-                                Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png" />
+                                Source="ms-appx:///Assets/Settings/Icons/PowerToysRun.png" />
                             <TextBlock
                                 x:Uid="Alternate_OOBE_Run_Title"
                                 Grid.Row="1"
@@ -121,7 +121,7 @@
                             <Image
                                 Width="36"
                                 HorizontalAlignment="Left"
-                                Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsColorPicker.png" />
+                                Source="ms-appx:///Assets/Settings/Icons/ColorPicker.png" />
                             <TextBlock
                                 x:Uid="Alternate_OOBE_ColorPicker_Title"
                                 Grid.Row="1"
@@ -163,7 +163,7 @@
                             <Image
                                 Width="36"
                                 HorizontalAlignment="Left"
-                                Source="ms-appx:///Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png" />
+                                Source="ms-appx:///Assets/Settings/Icons/AlwaysOnTop.png" />
                             <TextBlock
                                 x:Uid="Alternate_OOBE_AlwaysOnTop_Title"
                                 Grid.Row="1"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
index 908e7267cf..1846181b70 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_PastePlain" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
+    <controls:OOBEPageControl x:Uid="Oobe_PastePlain" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PasteAsPlainText.gif">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
index 2739994ac3..f5340a7899 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_Peek" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
+    <controls:OOBEPageControl x:Uid="Oobe_Peek" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.png">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
index 4ca9f0bda5..9ba7558169 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
@@ -8,7 +8,7 @@
     xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_QuickAccent" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
+    <controls:OOBEPageControl x:Uid="Oobe_QuickAccent" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/QuickAccent.gif">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
index 715c29057e..282753bb24 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
@@ -8,7 +8,7 @@
     xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_TextExtractor" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
+    <controls:OOBEPageControl x:Uid="Oobe_TextExtractor" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/TextExtractor.gif">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
index 8122520df8..53fc661ed4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
@@ -59,103 +59,103 @@
             <NavigationView.MenuItems>
                 <NavigationViewItem
                     x:Uid="Shell_General"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerToys.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToys.png}"
                     Tag="Overview" />
                 <NavigationViewItem
                     x:Uid="Shell_AlwaysOnTop"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}"
                     Tag="AlwaysOnTop" />
                 <NavigationViewItem
                     x:Uid="Shell_Awake"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAwake.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}"
                     Tag="Awake" />
-                <NavigationViewItem
-                    x:Uid="Shell_CmdNotFound"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsCmdNotFound.png}"
-                    Tag="CmdNotFound" />
                 <NavigationViewItem
                     x:Uid="Shell_ColorPicker"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsColorPicker.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}"
                     Tag="ColorPicker" />
+                <NavigationViewItem
+                    x:Uid="Shell_CmdNotFound"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}"
+                    Tag="CmdNotFound" />
                 <NavigationViewItem
                     x:Uid="Shell_CropAndLock"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsCropAndLock.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}"
                     Tag="CropAndLock" />
                 <NavigationViewItem
                     x:Uid="Shell_EnvironmentVariables"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsEnvironmentVariables.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}"
                     Tag="EnvironmentVariables" />
                 <NavigationViewItem
                     x:Uid="Shell_FancyZones"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFancyZones.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}"
                     Tag="FancyZones" />
                 <NavigationViewItem
                     x:Uid="Shell_FileLocksmith"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}"
                     Tag="FileLocksmith" />
                 <NavigationViewItem
                     x:Uid="Shell_PowerPreview"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}"
                     Tag="FileExplorer" />
                 <NavigationViewItem
                     x:Uid="Shell_Hosts"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsHosts.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}"
                     Tag="Hosts" />
                 <NavigationViewItem
                     x:Uid="Shell_ImageResizer"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsImageResizer.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}"
                     Tag="ImageResizer" />
                 <NavigationViewItem
                     x:Uid="Shell_KeyboardManager"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}"
                     Tag="KBM" />
                 <NavigationViewItem
                     x:Uid="Shell_MouseUtilities"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}"
                     Tag="MouseUtils" />
                 <NavigationViewItem
                     x:Uid="Shell_MouseWithoutBorders"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}"
                     Tag="MouseWithoutBorders" />
                 <NavigationViewItem
                     x:Uid="Shell_PastePlain"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPastePlain.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}"
                     Tag="PastePlain" />
                 <NavigationViewItem
                     x:Uid="Shell_Peek"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPeek.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}"
                     Tag="Peek" />
                 <NavigationViewItem
                     x:Uid="Shell_PowerRename"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerRename.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}"
                     Tag="PowerRename" />
                 <NavigationViewItem
                     x:Uid="Shell_PowerLauncher"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}"
                     Tag="Run" />
                 <NavigationViewItem
                     x:Uid="Shell_QuickAccent"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}"
                     Tag="QuickAccent" />
                 <NavigationViewItem
                     x:Uid="Shell_RegistryPreview"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}"
                     Tag="RegistryPreview" />
                 <NavigationViewItem
                     x:Uid="Shell_MeasureTool"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}"
                     Tag="MeasureTool" />
                 <NavigationViewItem
                     x:Uid="Shell_ShortcutGuide"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}"
                     Tag="ShortcutGuide" />
                 <NavigationViewItem
                     x:Uid="Shell_TextExtractor"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerOCR.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}"
                     Tag="TextExtractor" />
                 <NavigationViewItem
                     x:Uid="Shell_VideoConference"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
                     Tag="VideoConference" />
             </NavigationView.MenuItems>
             <NavigationView.FooterMenuItems>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
index f7a7dc0559..7b73486617 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_ShortcutGuide" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
+    <controls:OOBEPageControl x:Uid="Oobe_ShortcutGuide" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ShortcutGuide.png">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
index 32ef215234..aead2cb5eb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
@@ -18,7 +18,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="AlwaysOnTop_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
index 14bdedeb7b..e855cc6c96 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
@@ -25,7 +25,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="Awake_EnableSettingsCard"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAwake.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
index dacdbd82b8..049cfbb0ff 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
@@ -32,7 +32,7 @@
 
                 <tkcontrols:SettingsExpander
                     x:Uid="CmdNotFound_Enable"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsCmdNotFound.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
                     IsExpanded="True">
                     <tkcontrols:SwitchPresenter TargetType="x:Boolean" Value="{x:Bind ViewModel.IsCommandNotFoundModuleInstalled, Mode=OneWay}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
index 41460e30fd..6179f87a08 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -28,7 +28,7 @@
                 Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="ColorPicker_EnableColorPicker"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsColorPicker.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
index c3e0224f2e..1a3ceab533 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
@@ -18,7 +18,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="CropAndLock_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsCropAndLock.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
index cf48739a6c..3dc0b6bfcb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
@@ -14,7 +14,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="EnvironmentVariables_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsEnvironmentVariables.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
index 8a055c444e..8ae51a321b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -15,7 +15,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="FancyZones_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFancyZones.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
index 073615999b..04bdd7976a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
@@ -15,7 +15,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="FileLocksmith_Enable_FileLocksmith"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
index 2d35735e1f..2dcc2cbca4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
@@ -14,7 +14,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="Hosts_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsHosts.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
index e5117806b0..e7d4b55f6f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
@@ -26,7 +26,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}">
                 <tkcontrols:SettingsCard
                     x:Uid="ImageResizer_EnableToggle"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsImageResizer.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
index 1c013f7960..cca54bfa1a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -50,7 +50,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="KeyboardManager_EnableToggle"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Enabled, Mode=TwoWay}" />
                     <tkcontrols:SettingsCard.Description>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
index 6cf448da6c..cc67246a2d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
@@ -15,7 +15,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="MeasureTool_EnableMeasureTool"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
index bd3a614359..10a7ed6ad2 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -24,7 +24,7 @@
                 <controls:SettingsGroup x:Uid="MouseUtils_FindMyMouse">
                     <tkcontrols:SettingsCard
                         x:Uid="MouseUtils_Enable_FindMyMouse"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFindMyMouse.png}"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FindMyMouse.png}"
                         IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
@@ -166,7 +166,7 @@
                 <controls:SettingsGroup x:Uid="MouseUtils_MouseHighlighter">
                     <tkcontrols:SettingsCard
                         x:Uid="MouseUtils_Enable_MouseHighlighter"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseHighlighter.png}"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseHighlighter.png}"
                         IsEnabled="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
@@ -236,7 +236,7 @@
                 <controls:SettingsGroup x:Uid="MouseUtils_MouseJump">
                     <tkcontrols:SettingsCard
                         x:Uid="MouseUtils_Enable_MouseJump"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseJump.png}"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseJump.png}"
                         IsEnabled="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
@@ -332,7 +332,7 @@
                 <controls:SettingsGroup x:Uid="MouseUtils_MousePointerCrosshairs">
                     <tkcontrols:SettingsCard
                         x:Uid="MouseUtils_Enable_MousePointerCrosshairs"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseCrosshairs.png}"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseCrosshairs.png}"
                         IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
index 61f94a75e9..02e51c3918 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
@@ -23,7 +23,7 @@
                 <controls:SettingsGroup x:Uid="MouseWithoutBorders_ActivationSettings">
                     <tkcontrols:SettingsCard
                         x:Uid="MouseWithoutBorders_Toggle_Enable"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png}"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}"
                         IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                         <ToggleSwitch
                             x:Uid="ToggleSwitch"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml
index 61b7a45fdf..1d04a291e3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PastePlainPage.xaml
@@ -10,7 +10,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <controls:SettingsPageControl x:Uid="PastePlain" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PastePlain.png">
+    <controls:SettingsPageControl x:Uid="PastePlain" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PasteAsPlainText.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
@@ -18,7 +18,7 @@
                 Spacing="2">
                 <tkcontrols:SettingsCard
                     x:Uid="PastePlain_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPastePlain.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
index 5559df1bf0..3d70f52131 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
@@ -15,7 +15,7 @@
             <StackPanel Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="Peek_EnablePeek"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPeek.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
index b4c2b631a9..93c429733f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -13,12 +13,12 @@
     <controls:SettingsPageControl
         x:Uid="QuickAccent"
         IsTabStop="False"
-        ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerAccent.png">
+        ModuleImageSource="ms-appx:///Assets/Settings/Modules/QuickAccent.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="QuickAccent_EnableQuickAccent"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
index ad41980691..230e393517 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
@@ -13,13 +13,13 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <controls:SettingsPageControl x:Uid="PowerLauncher" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerLauncher.png">
+    <controls:SettingsPageControl x:Uid="PowerLauncher" ModuleImageSource="ms-appx:///Assets/Settings/Modules/Run.png">
         <controls:SettingsPageControl.ModuleContent>
 
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="PowerLauncher_EnablePowerLauncher"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnablePowerLauncher, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
index fbf8488d66..f73e99cb3f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
@@ -10,7 +10,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <controls:SettingsPageControl x:Uid="TextExtractor" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerOCR.png">
+    <controls:SettingsPageControl x:Uid="TextExtractor" ModuleImageSource="ms-appx:///Assets/Settings/Modules/TextExtractor.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
@@ -18,7 +18,7 @@
                 Spacing="2">
                 <tkcontrols:SettingsCard
                     x:Uid="TextExtractor_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
index 59c185b718..4d33800219 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
@@ -10,7 +10,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <controls:SettingsPageControl x:Uid="FileExplorerPreview" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PowerPreview.png">
+    <controls:SettingsPageControl x:Uid="FileExplorerPreview" ModuleImageSource="ms-appx:///Assets/Settings/Modules/FileExplorerPreview.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <controls:SettingsGroup x:Uid="FileExplorerPreview_PreviewPane">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
index 31a5c8accf..2cd21b6bed 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
@@ -18,7 +18,7 @@
                 Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="PowerRename_Toggle_Enable"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerRename.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
index 73bbb96661..3e3dc209f4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
@@ -15,7 +15,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="RegistryPreview_Enable_RegistryPreview"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsRegistryPreviewEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
index 3fc595eb1f..df87d39218 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
@@ -108,121 +108,121 @@
                 <NavigationViewItem
                     x:Uid="Shell_AlwaysOnTop"
                     helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAlwaysOnTop.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_Awake"
                     helpers:NavHelper.NavigateTo="views:AwakePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsAwake.png}" />
-
-                <NavigationViewItem
-                    x:Uid="Shell_CmdNotFound"
-                    helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsCmdNotFound.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_ColorPicker"
                     helpers:NavHelper.NavigateTo="views:ColorPickerPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsColorPicker.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_CmdNotFound"
+                    helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_CropAndLock"
                     helpers:NavHelper.NavigateTo="views:CropAndLockPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsCropAndLock.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_EnvironmentVariables"
                     helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsEnvironmentVariables.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_FancyZones"
                     helpers:NavHelper.NavigateTo="views:FancyZonesPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFancyZones.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_PowerPreview"
                     helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileExplorerPreview.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_FileLocksmith"
                     helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsFileLocksmith.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_Hosts"
                     helpers:NavHelper.NavigateTo="views:HostsPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsHosts.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_ImageResizer"
                     helpers:NavHelper.NavigateTo="views:ImageResizerPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsImageResizer.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_KeyboardManager"
                     helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsKeyboardManager.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_MouseUtilities"
                     helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseUtils.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_MouseWithoutBorders"
                     helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsMouseWithoutBorders.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_PastePlain"
                     helpers:NavHelper.NavigateTo="views:PastePlainPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPastePlain.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PasteAsPlainText.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_Peek"
                     helpers:NavHelper.NavigateTo="views:PeekPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPeek.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_PowerRename"
                     helpers:NavHelper.NavigateTo="views:PowerRenamePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerRename.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
                 <NavigationViewItem
                     x:Uid="Shell_PowerLauncher"
                     helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerToysRun.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_QuickAccent"
                     helpers:NavHelper.NavigateTo="views:PowerAccentPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerAccent.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_RegistryPreview"
                     helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsRegistryPreview.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_MeasureTool"
                     helpers:NavHelper.NavigateTo="views:MeasureToolPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsScreenRuler.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_ShortcutGuide"
                     helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_TextExtractor"
                     helpers:NavHelper.NavigateTo="views:PowerOcrPage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsPowerOcr.png}" />
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_VideoConference"
                     helpers:NavHelper.NavigateTo="views:VideoConferencePage"
-                    Icon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png}"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
                     IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
             </NavigationView.MenuItems>
             <NavigationView.PaneFooter>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
index 6edfadd509..979c9c7bac 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
@@ -15,7 +15,7 @@
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <tkcontrols:SettingsCard
                     x:Uid="ShortcutGuide_Enable"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsShortcutGuide.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml
index fa1cce3fc3..ad8accb874 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/VideoConference.xaml
@@ -41,7 +41,7 @@
 
                 <tkcontrols:SettingsCard
                     x:Uid="VideoConference_Enable"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/FluentIcons/FluentIconsVideoConferenceMute.png}"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/VideoConferenceMute.png}"
                     IsEnabled="{x:Bind ViewModel.IsElevated, Mode=OneWay}">
                     <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>