diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 021278608c..a791fc5ba8 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -689,6 +689,9 @@
         <?foreach File in Logo.scale-200.png;SplashScreen.png;StoreLogo.scale-100.png?>
           <File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\$(var.File)" />
         <?endforeach?>
+        <?foreach File in ColorPicker.png;FancyZones.png;ImageResizer.png;KBM.png;PowerLauncher.png;PowerPreview.png;PowerRename.png;PT.png;ShortcutGuide.png?>
+          <File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules\$(var.File)" />
+        <?endforeach?>
         <File Id="SettingsV2_StoreLogo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\StoreLogo.png" />
         <File Id="Square150x150Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square150x150Logo.scale-200.png" />
         <File Id="Square44x44Logo_targetsize_24_altform_unplated" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ColorPicker.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ColorPicker.png
new file mode 100644
index 0000000000..2e0b272b68
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ColorPicker.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/FancyZones.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/FancyZones.png
new file mode 100644
index 0000000000..432e22f8c9
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/FancyZones.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ImageResizer.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ImageResizer.png
new file mode 100644
index 0000000000..16cfca6e7e
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ImageResizer.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/KBM.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/KBM.png
new file mode 100644
index 0000000000..ce63e4e654
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/KBM.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PT.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PT.png
new file mode 100644
index 0000000000..182edbf798
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PT.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerLauncher.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerLauncher.png
new file mode 100644
index 0000000000..32b4709d33
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerLauncher.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerPreview.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerPreview.png
new file mode 100644
index 0000000000..b70a19c186
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerPreview.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerRename.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerRename.png
new file mode 100644
index 0000000000..daabd4321f
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerRename.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ShortcutGuide.png b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ShortcutGuide.png
new file mode 100644
index 0000000000..d44e861627
Binary files /dev/null and b/src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ShortcutGuide.png differ
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index 4b66fae735..1130b9b8af 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -158,6 +158,15 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Logo.scale-200.png" />
+    <Content Include="Assets\Modules\ColorPicker.png" />
+    <Content Include="Assets\Modules\FancyZones.png" />
+    <Content Include="Assets\Modules\ImageResizer.png" />
+    <Content Include="Assets\Modules\KBM.png" />
+    <Content Include="Assets\Modules\PowerLauncher.png" />
+    <Content Include="Assets\Modules\PowerPreview.png" />
+    <Content Include="Assets\Modules\PowerRename.png" />
+    <Content Include="Assets\Modules\PT.png" />
+    <Content Include="Assets\Modules\ShortcutGuide.png" />
     <Content Include="Assets\SplashScreen.png" />
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.scale-200.png" />
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
index f7b0543a99..283b998acb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
@@ -108,7 +108,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysColorPickerSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/ColorPicker.png" />
             </Border>
             <StackPanel x:Name="LinksPanel"
                         RelativePanel.Below="AboutImage"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index f309a1657a..c9e9d019f6 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -303,13 +303,13 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysFancyZoneSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/FancyZones.png" />
             </Border>
 
             <StackPanel x:Name="LinksPanel"
                         RelativePanel.Below="AboutImage"
                         Orientation="Vertical" >
-                <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones" Margin="0,-3,0,0">
+                <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones">
                     <TextBlock x:Uid="Module_overview" />
                 </HyperlinkButton>
                 <HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
index 67a8f8be98..e869e108f2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
@@ -155,7 +155,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysPTSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/PT.png" />
             </Border>
             <StackPanel x:Name="LinksPanel"
                         RelativePanel.Below="AboutImage"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 4678ce5402..ae242e8e1c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -316,7 +316,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysImageResizerSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/ImageResizer.png" />
             </Border>
             
             <StackPanel x:Name="LinksPanel"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index d30af8107e..b9403a55e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -338,7 +338,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysKBMSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/KBM.png" />
             </Border>
 
             <StackPanel x:Name="LinksPanel"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
index 70709bf7af..741bdd55cb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -178,7 +178,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysPowerLauncherSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/PowerLauncher.png" />
             </Border>
             
             <StackPanel x:Name="LinksPanel"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
index af96a83ee7..cc2c0ec9c2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
@@ -82,7 +82,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysPowerPreviewSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/PowerPreview.png" />
             </Border>
 
             <StackPanel x:Name="LinksPanel"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
index 22dbe3f235..1c7bc1c64e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
@@ -121,7 +121,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysPowerRenameSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/PowerRename.png" />
             </Border>
 
             <StackPanel x:Name="LinksPanel"
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
index ed59cdbe6a..613fa737bf 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -130,7 +130,7 @@
                     HorizontalAlignment="Left"
                     Margin="{StaticResource SmallTopBottomMargin}"
                     RelativePanel.Below="DescriptionPanel">
-                <Image Source="https://aka.ms/powerToysShortcutGuideSettingImage" />
+                <Image Source="ms-appx:///Assets/Modules/ShortcutGuide.png" />
             </Border>
 
             <StackPanel x:Name="LinksPanel"