[FileLocksmith]Add icons (#21553)

* Adding icon to project

* Adding icon to Settings

* Reference the right file

* Fix icon on Windows 10

* Add new Icon files to the installer

* Fix installer.

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj

@@ -20,7 +20,7 @@
     <WindowsPackageType>None</WindowsPackageType>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <ApplicationIcon>Assets/Icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -28,6 +28,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="Assets\Icon.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Assets\AppList.scale-100.png" />
+    <None Remove="Assets\AppList.scale-125.png" />
+    <None Remove="Assets\AppList.scale-150.png" />
+    <None Remove="Assets\AppList.scale-200.png" />
+    <None Remove="Assets\AppList.scale-400.png" />
     <None Remove="Views\MainPage.xaml" />
   </ItemGroup>
 
@@ -65,9 +74,6 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="icon.ico" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />

src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml

@@ -32,7 +32,7 @@
                 Margin="16,8,8,8"
                 VerticalAlignment="Top"
                 Orientation="Horizontal">
-                <TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Text="&#xEA3F;" />
+                <Image Source="Assets/AppList.png" />
                 <TextBlock
                     x:Uid="AppTitleText"
                     Margin="12,0,0,0"

src/modules/FileLocksmith/FileLocksmithUI/MainWindow.xaml.cs

@@ -38,7 +38,7 @@ namespace FileLocksmithUI
                 // Set window icon
                 WindowId windowId = Win32Interop.GetWindowIdFromWindow(hWnd);
                 AppWindow appWindow = AppWindow.GetFromWindowId(windowId);
-                appWindow.SetIcon("icon.ico");
+                appWindow.SetIcon("Assets/Icon.ico");
             }
         }
 

src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml

@@ -21,7 +21,7 @@
 
                 <controls:Setting x:Uid="FileLocksmith_Enable_FileLocksmith" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
                     <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToys.png" ShowAsMonochrome="False" />
+                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileLocksmith.png" ShowAsMonochrome="False" />
                     </controls:Setting.Icon>
                     <controls:Setting.ActionContent>
                         <ToggleSwitch IsOn="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=TwoWay}" HorizontalAlignment="Right"/>