Overhaul icon management

was expecting this to be really difficult but then i just winged it and it worked waht the fuck

Bloxstrap/Bloxstrap.csproj

@@ -13,18 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Resources\Icon2009-png.png" />
+    <Resource Include="Bloxstrap.ico" />
-    <None Remove="Resources\Icon2011-png.png" />
-    <None Remove="Resources\Icon2017-png.png" />
-    <None Remove="Resources\Icon2019-png.png" />
-    <None Remove="Resources\Icon2022-png.png" />
-    <None Remove="Resources\IconBloxstrap-png.png" />
-    <None Remove="Resources\IconEarly2015-png.png" />
-    <None Remove="Resources\IconLate2015-png.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="Bloxstrap.ico" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,15 +30,4 @@
     <PackageReference Include="WPF-UI" Version="2.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Resource Include="Resources\Icon2009-png.png" />
-    <Resource Include="Resources\Icon2011-png.png" />
-    <Resource Include="Resources\Icon2017-png.png" />
-    <Resource Include="Resources\Icon2019-png.png" />
-    <Resource Include="Resources\Icon2022-png.png" />
-    <Resource Include="Resources\IconBloxstrap-png.png" />
-    <Resource Include="Resources\IconEarly2015-png.png" />
-    <Resource Include="Resources\IconLate2015-png.png" />
-  </ItemGroup>
-
 </Project>

Bloxstrap/Dialogs/LegacyDialog2011.cs

@@ -37,7 +37,6 @@ namespace Bloxstrap.Dialogs
         {
             InitializeComponent();
 
-            // have to convert icon -> bitmap since winforms scaling is poop
             this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetIcon().ToBitmap();
 
             ScaleWindow();

Bloxstrap/Dialogs/ProgressDialog.cs

@@ -46,7 +46,7 @@ namespace Bloxstrap.Dialogs
                 this.BackColor = Color.FromArgb(25, 27, 29);
             }
 
-            this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetBitmap();
+            this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetIconWithSize(new Size(128, 128)).ToBitmap();
 
             SetupDialog();
         }

Bloxstrap/Enums/BootstrapperIcon.cs

@@ -1,5 +1,7 @@
-using System;
+using System.Drawing;
-using System.Drawing;
+using System.IO;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace Bloxstrap.Enums
 {
@@ -17,71 +19,33 @@ namespace Bloxstrap.Enums
 
     public static class BootstrapperIconEx
     {
-        public static string GetPackUri(this BootstrapperIcon icon)
+        // small note on handling icon sizes
-        {
+        // i'm using multisize icon packs here with sizes 16, 24, 32, 48, 64 and 128
-            return $"pack://application:,,,/Resources/{Enum.GetName(icon)}-png.png";
+        // use this for generating multisize packs: https://www.aconvert.com/icon/
-        }
 
         public static Icon GetIcon(this BootstrapperIcon icon)
         {
-            switch (icon)
+            return icon switch
             {
-                case BootstrapperIcon.Icon2009:
+                BootstrapperIcon.IconBloxstrap => Properties.Resources.IconBloxstrap,
-                    return Properties.Resources.Icon2009_ico;
+                BootstrapperIcon.Icon2009 => Properties.Resources.Icon2009,
-
+                BootstrapperIcon.Icon2011 => Properties.Resources.Icon2011,
-                case BootstrapperIcon.Icon2011:
+                BootstrapperIcon.IconEarly2015 => Properties.Resources.IconEarly2015,
-                    return Properties.Resources.Icon2011_ico;
+                BootstrapperIcon.IconLate2015 => Properties.Resources.IconLate2015,
-
+                BootstrapperIcon.Icon2017 => Properties.Resources.Icon2017,
-                case BootstrapperIcon.IconEarly2015:
+                BootstrapperIcon.Icon2019 => Properties.Resources.Icon2019,
-                    return Properties.Resources.IconEarly2015_ico;
+                BootstrapperIcon.Icon2022 => Properties.Resources.Icon2022,
-
+                _ => Properties.Resources.IconBloxstrap
-                case BootstrapperIcon.IconLate2015:
+            };
-                    return Properties.Resources.IconLate2015_ico;
-
-                case BootstrapperIcon.Icon2017:
-                    return Properties.Resources.Icon2017_ico;
-
-                case BootstrapperIcon.Icon2019:
-                    return Properties.Resources.Icon2019_ico;
-
-                case BootstrapperIcon.Icon2022: 
-                    return Properties.Resources.Icon2022_ico;
-
-                case BootstrapperIcon.IconBloxstrap:
-                default:
-                    return Properties.Resources.IconBloxstrap_ico;
-            }
         }
 
-        public static Bitmap GetBitmap(this BootstrapperIcon icon)
+        public static Icon GetIconWithSize(this BootstrapperIcon icon, Size size) => new(icon.GetIcon(), size);
+
+        public static ImageSource GetImageSource(this BootstrapperIcon icon)
         {
-            switch (icon)
+            using MemoryStream stream = new();
-            {
+            icon.GetIcon().Save(stream);
-                case BootstrapperIcon.Icon2009:
+            return BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
-                    return Properties.Resources.Icon2009_png;
-
-                case BootstrapperIcon.Icon2011:
-                    return Properties.Resources.Icon2011_png;
-
-                case BootstrapperIcon.IconEarly2015:
-                    return Properties.Resources.IconEarly2015_png;
-
-                case BootstrapperIcon.IconLate2015:
-                    return Properties.Resources.IconLate2015_png;
-
-                case BootstrapperIcon.Icon2017:
-                    return Properties.Resources.Icon2017_png;
-
-                case BootstrapperIcon.Icon2019:
-                    return Properties.Resources.Icon2019_png;
-
-                case BootstrapperIcon.Icon2022:
-                    return Properties.Resources.Icon2022_png;
-
-                case BootstrapperIcon.IconBloxstrap:
-                default:
-                    return Properties.Resources.IconBloxstrap_png;
-            }
         }
     }
 }

Bloxstrap/Properties/Resources.Designer.cs

@@ -103,161 +103,97 @@ namespace Bloxstrap.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon Icon2009_ico {
+        internal static System.Drawing.Icon IconBloxstrap
-            get {
+        {
-                object obj = ResourceManager.GetObject("Icon2009_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("IconBloxstrap", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Icon2009_png {
-            get {
-                object obj = ResourceManager.GetObject("Icon2009_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon Icon2011_ico {
+        internal static System.Drawing.Icon Icon2009
-            get {
+        {
-                object obj = ResourceManager.GetObject("Icon2011_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("Icon2009", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Icon2011_png {
-            get {
-                object obj = ResourceManager.GetObject("Icon2011_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon Icon2017_ico {
+        internal static System.Drawing.Icon Icon2011
-            get {
+        {
-                object obj = ResourceManager.GetObject("Icon2017_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("Icon2011", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Icon2017_png {
-            get {
-                object obj = ResourceManager.GetObject("Icon2017_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon Icon2019_ico {
+        internal static System.Drawing.Icon IconEarly2015
-            get {
+        {
-                object obj = ResourceManager.GetObject("Icon2019_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("IconEarly2015", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Icon2019_png {
-            get {
-                object obj = ResourceManager.GetObject("Icon2019_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon Icon2022_ico {
+        internal static System.Drawing.Icon IconLate2015
-            get {
+        {
-                object obj = ResourceManager.GetObject("Icon2022_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("IconLate2015", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Icon2022_png {
-            get {
-                object obj = ResourceManager.GetObject("Icon2022_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon IconBloxstrap_ico {
+        internal static System.Drawing.Icon Icon2017
-            get {
+        {
-                object obj = ResourceManager.GetObject("IconBloxstrap_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("Icon2017", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap IconBloxstrap_png {
-            get {
-                object obj = ResourceManager.GetObject("IconBloxstrap_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon IconEarly2015_ico {
+        internal static System.Drawing.Icon Icon2019
-            get {
+        {
-                object obj = ResourceManager.GetObject("IconEarly2015_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("Icon2019", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
 
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap IconEarly2015_png {
-            get {
-                object obj = ResourceManager.GetObject("IconEarly2015_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon IconLate2015_ico {
+        internal static System.Drawing.Icon Icon2022
-            get {
+        {
-                object obj = ResourceManager.GetObject("IconLate2015_ico", resourceCulture);
+            get
+            {
+                object obj = ResourceManager.GetObject("Icon2022", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap IconLate2015_png {
-            get {
-                object obj = ResourceManager.GetObject("IconLate2015_png", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }

Bloxstrap/Properties/Resources.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="CancelButton" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CancelButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -130,52 +130,28 @@
   <data name="DarkCancelButtonHover" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DarkCancelButtonHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2009_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Icon2009" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2009-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icon2009.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2009_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Icon2011" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2009-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icon2011.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2011_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Icon2017" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2011-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icon2017.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2011_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Icon2019" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2011-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icon2019.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2017_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Icon2022" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2017-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icon2022.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2017_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="IconBloxstrap" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2017-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\IconBloxstrap.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2019_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="IconEarly2015" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2019-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\IconEarly2015.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Icon2019_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="IconLate2015" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2019-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\IconLate2015.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Icon2022_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2022-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Icon2022_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Icon2022-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="IconBloxstrap_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconBloxstrap-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="IconBloxstrap_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconBloxstrap-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="IconEarly2015_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconEarly2015-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="IconEarly2015_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconEarly2015-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="IconLate2015_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconLate2015-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="IconLate2015_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconLate2015-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

Bloxstrap/ViewModels/BootstrapperViewModel.cs

@@ -91,8 +91,8 @@ namespace Bloxstrap.ViewModels
             { "2022", BootstrapperIcon.Icon2022 },
             { "2019", BootstrapperIcon.Icon2019 },
             { "2017", BootstrapperIcon.Icon2017 },
-            { "2016", BootstrapperIcon.IconLate2015 },
+            { "Late 2015", BootstrapperIcon.IconLate2015 },
-            { "2015", BootstrapperIcon.IconEarly2015 },
+            { "Early 2015", BootstrapperIcon.IconEarly2015 },
             { "2011", BootstrapperIcon.Icon2011 },
             { "2009", BootstrapperIcon.Icon2009 },
         };

Bloxstrap/ViewModels/FluentDialogViewModel.cs

@@ -4,8 +4,9 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.Input;
 using Bloxstrap.Dialogs;
 using Bloxstrap.Enums;
@@ -20,7 +21,7 @@ namespace Bloxstrap.ViewModels
 
         public ICommand CancelInstallCommand => new RelayCommand(CancelInstall);
 
-        public string Icon { get; set; } = App.Settings.Prop.BootstrapperIcon.GetPackUri();
+        public ImageSource Icon { get; set; } = App.Settings.Prop.BootstrapperIcon.GetImageSource();
         public string Message { get; set; } = "Please wait...";
         public bool ProgressIndeterminate { get; set; } = true;
         public int ProgressValue { get; set; } = 0;

Bloxstrap/Views/MainWindow.xaml

@@ -27,7 +27,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <ui:TitleBar x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="True" Title="Bloxstrap Menu" Icon="pack://application:,,,/Resources/IconBloxstrap-png.png" />
+        <ui:TitleBar x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="True" Title="Bloxstrap Menu" Icon="pack://application:,,,/Bloxstrap.ico" />
 
         <Grid x:Name="RootGrid" Grid.Row="1" Margin="13,0,0,0" Visibility="Visible">
             <Grid.RowDefinitions>

README.md

@@ -1,4 +1,4 @@
-# <img src="https://github.com/pizzaboxer/bloxstrap/raw/main/Bloxstrap/Resources/IconBloxstrap-png.png" width="48"/> Bloxstrap
+# <img src="https://github.com/pizzaboxer/bloxstrap/raw/main/Images/Bloxstrap.png" width="48"/> Bloxstrap
 ![License](https://img.shields.io/github/license/pizzaboxer/bloxstrap) 
 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pizzaboxer/bloxstrap/ci.yml?branch=main)
 ![Downloads](https://img.shields.io/github/downloads/pizzaboxer/bloxstrap/total)