diff --git a/Simple Icon File Maker/Simple Icon File Maker (Package)/Package.appxmanifest b/Simple Icon File Maker/Simple Icon File Maker (Package)/Package.appxmanifest
index d9637f5..c3b035f 100644
--- a/Simple Icon File Maker/Simple Icon File Maker (Package)/Package.appxmanifest	
+++ b/Simple Icon File Maker/Simple Icon File Maker (Package)/Package.appxmanifest	
@@ -10,7 +10,7 @@
   <Identity
     Name="40087JoeFinApps.SimpleIconFileMaker"
     Publisher="CN=153F3B0F-BA3D-4964-8098-71AC78A1DF6A"
-    Version="1.15.0.0" />
+    Version="1.15.1.0" />
 
     
   <Properties>
diff --git a/Simple Icon File Maker/Simple Icon File Maker (Package)/Simple Icon File Maker (Package).wapproj b/Simple Icon File Maker/Simple Icon File Maker (Package)/Simple Icon File Maker (Package).wapproj
index 20445a7..cf76f85 100644
--- a/Simple Icon File Maker/Simple Icon File Maker (Package)/Simple Icon File Maker (Package).wapproj	
+++ b/Simple Icon File Maker/Simple Icon File Maker (Package)/Simple Icon File Maker (Package).wapproj	
@@ -1,134 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-        <VisualStudioVersion>15.0</VisualStudioVersion>
-    </PropertyGroup>
-    <ItemGroup Label="ProjectConfigurations">
-        <ProjectConfiguration Include="Debug|x86">
-            <Configuration>Debug</Configuration>
-            <Platform>x86</Platform>
-        </ProjectConfiguration>
-        <ProjectConfiguration Include="Release|x86">
-            <Configuration>Release</Configuration>
-            <Platform>x86</Platform>
-        </ProjectConfiguration>
-        <ProjectConfiguration Include="Debug|x64">
-            <Configuration>Debug</Configuration>
-            <Platform>x64</Platform>
-        </ProjectConfiguration>
-        <ProjectConfiguration Include="Release|x64">
-            <Configuration>Release</Configuration>
-            <Platform>x64</Platform>
-        </ProjectConfiguration>
-        <ProjectConfiguration Include="Debug|arm64">
-            <Configuration>Debug</Configuration>
-            <Platform>arm64</Platform>
-        </ProjectConfiguration>
-        <ProjectConfiguration Include="Release|arm64">
-            <Configuration>Release</Configuration>
-            <Platform>arm64</Platform>
-        </ProjectConfiguration>
-    </ItemGroup>
-    <PropertyGroup>
-        <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-        <PathToXAMLWinRTImplementations>Simple Icon File Maker\</PathToXAMLWinRTImplementations>
-    </PropertyGroup>
-    <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-    <PropertyGroup>
-        <ProjectGuid>7887a19f-b1cd-4106-a9aa-abaacfe770a9</ProjectGuid>
-        <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-        <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-        <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
-        <AssetTargetFallback>net9.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-        <DefaultLanguage>en-US</DefaultLanguage>
-        <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-        <EntryPointProjectUniqueName>..\Simple Icon File Maker\Simple Icon File Maker.csproj</EntryPointProjectUniqueName>
-        <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-        <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-        <GenerateTestArtifacts>True</GenerateTestArtifacts>
-        <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-        <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-        <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-        <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-        <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-        <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
-        <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
-        <PublishAot>true</PublishAot>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-        <AppxBundle>Always</AppxBundle>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <AppxBundle>Always</AppxBundle>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
-        <AppxBundle>Always</AppxBundle>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
-        <AppxBundle>Always</AppxBundle>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-        <AppxBundle>Always</AppxBundle>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-        <AppxBundle>Always</AppxBundle>
-    </PropertyGroup>
-    <ItemGroup>
-        <AppxManifest Include="Package.appxmanifest">
-            <SubType>Designer</SubType>
-        </AppxManifest>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Images\BadgeLogo.scale-100.png" />
-        <Content Include="Images\BadgeLogo.scale-200.png" />
-        <Content Include="Images\BadgeLogo.scale-400.png" />
-        <Content Include="Images\Image128.png" />
-        <Content Include="Images\LargeTile.scale-100.png" />
-        <Content Include="Images\LargeTile.scale-200.png" />
-        <Content Include="Images\LargeTile.scale-400.png" />
-        <Content Include="Images\SmallTile.scale-100.png" />
-        <Content Include="Images\SmallTile.scale-200.png" />
-        <Content Include="Images\SmallTile.scale-400.png" />
-        <Content Include="Images\SplashScreen.scale-100.png" />
-        <Content Include="Images\SplashScreen.scale-200.png" />
-        <Content Include="Images\SplashScreen.scale-400.png" />
-        <Content Include="Images\Square150x150Logo.scale-100.png" />
-        <Content Include="Images\Square150x150Logo.scale-200.png" />
-        <Content Include="Images\Square150x150Logo.scale-400.png" />
-        <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-        <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-        <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-        <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-        <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-        <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-        <Content Include="Images\Square44x44Logo.scale-100.png" />
-        <Content Include="Images\Square44x44Logo.scale-200.png" />
-        <Content Include="Images\Square44x44Logo.scale-400.png" />
-        <Content Include="Images\Square44x44Logo.targetsize-16.png" />
-        <Content Include="Images\Square44x44Logo.targetsize-256.png" />
-        <Content Include="Images\Square44x44Logo.targetsize-48.png" />
-        <Content Include="Images\StoreLogo.scale-100.png" />
-        <Content Include="Images\StoreLogo.scale-200.png" />
-        <Content Include="Images\StoreLogo.scale-400.png" />
-        <Content Include="Images\Wide310x150Logo.scale-100.png" />
-        <Content Include="Images\Wide310x150Logo.scale-200.png" />
-        <Content Include="Images\Wide310x150Logo.scale-400.png" />
-        <None Include="Package.StoreAssociation.xml" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\Simple Icon File Maker\Simple Icon File Maker.csproj">
-            <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-            <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
-        </ProjectReference>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005">
-            <IncludeAssets>build</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705">
-            <IncludeAssets>build</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="WinUIEx" Version="2.9.0" />
-    </ItemGroup>
-    <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|arm64">
+      <Configuration>Debug</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|arm64">
+      <Configuration>Release</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <PathToXAMLWinRTImplementations>Simple Icon File Maker\</PathToXAMLWinRTImplementations>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>7887a19f-b1cd-4106-a9aa-abaacfe770a9</ProjectGuid>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+    <AssetTargetFallback>net9.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>..\Simple Icon File Maker\Simple Icon File Maker.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>False</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
+    <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
+    <PublishAot>true</PublishAot>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\BadgeLogo.scale-100.png" />
+    <Content Include="Images\BadgeLogo.scale-200.png" />
+    <Content Include="Images\BadgeLogo.scale-400.png" />
+    <Content Include="Images\Image128.png" />
+    <Content Include="Images\LargeTile.scale-100.png" />
+    <Content Include="Images\LargeTile.scale-200.png" />
+    <Content Include="Images\LargeTile.scale-400.png" />
+    <Content Include="Images\SmallTile.scale-100.png" />
+    <Content Include="Images\SmallTile.scale-200.png" />
+    <Content Include="Images\SmallTile.scale-400.png" />
+    <Content Include="Images\SplashScreen.scale-100.png" />
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\SplashScreen.scale-400.png" />
+    <Content Include="Images\Square150x150Logo.scale-100.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.scale-100.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
+    <Content Include="Images\StoreLogo.scale-100.png" />
+    <Content Include="Images\StoreLogo.scale-200.png" />
+    <Content Include="Images\StoreLogo.scale-400.png" />
+    <Content Include="Images\Wide310x150Logo.scale-100.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <Content Include="Images\Wide310x150Logo.scale-400.png" />
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Simple Icon File Maker\Simple Icon File Maker.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="WinUIEx" Version="2.9.0" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
\ No newline at end of file
diff --git a/Simple Icon File Maker/Simple Icon File Maker/Helpers/FilePickerHelper.cs b/Simple Icon File Maker/Simple Icon File Maker/Helpers/FilePickerHelper.cs
index bfe9695..b39c1ca 100644
--- a/Simple Icon File Maker/Simple Icon File Maker/Helpers/FilePickerHelper.cs	
+++ b/Simple Icon File Maker/Simple Icon File Maker/Helpers/FilePickerHelper.cs	
@@ -17,9 +17,11 @@ public static async Task TrySetSuggestedFolderFromSourceImage(FileSavePicker sav
             if (File.Exists(imagePath))
             {
                 StorageFile sourceFile = await StorageFile.GetFileFromPathAsync(imagePath);
-                string name = Path.GetFileNameWithoutExtension(imagePath);
-                await sourceFile.RenameAsync(name);
                 savePicker.SuggestedSaveFile = sourceFile;
+
+                // SuggestedSaveFile overrides SuggestedFileName, so re-set
+                // the name without the source extension to avoid names like "file.png.ico"
+                savePicker.SuggestedFileName = Path.GetFileNameWithoutExtension(imagePath);
             }
         }
         catch
diff --git a/Simple Icon File Maker/Simple Icon File Maker/Simple Icon File Maker.csproj b/Simple Icon File Maker/Simple Icon File Maker/Simple Icon File Maker.csproj
index a4559fd..76c6aa4 100644
--- a/Simple Icon File Maker/Simple Icon File Maker/Simple Icon File Maker.csproj	
+++ b/Simple Icon File Maker/Simple Icon File Maker/Simple Icon File Maker.csproj	
@@ -43,9 +43,9 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
     <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.251219" />
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.4" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260209005" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
     <PackageReference Include="WinUIEx" Version="2.9.0" />