diff --git a/assets/icons/Gallery.ico b/assets/icons/Gallery.ico
deleted file mode 100644
index e4ab5f51..00000000
Binary files a/assets/icons/Gallery.ico and /dev/null differ
diff --git a/assets/icons/Gallery_1024.png b/assets/icons/Gallery_1024.png
deleted file mode 100644
index f259a45e..00000000
Binary files a/assets/icons/Gallery_1024.png and /dev/null differ
diff --git a/assets/icons/Gallery_256.png b/assets/icons/Gallery_256.png
deleted file mode 100644
index adc2633c..00000000
Binary files a/assets/icons/Gallery_256.png and /dev/null differ
diff --git a/assets/icons/Gallery_cool.png b/assets/icons/Gallery_cool.png
deleted file mode 100644
index 54c70822..00000000
Binary files a/assets/icons/Gallery_cool.png and /dev/null differ
diff --git a/assets/icons/WpfLibrary.ico b/assets/icons/WpfLibrary.ico
new file mode 100644
index 00000000..7e45c066
Binary files /dev/null and b/assets/icons/WpfLibrary.ico differ
diff --git a/assets/icons/WpfLibrary_256w.png b/assets/icons/WpfLibrary_256w.png
new file mode 100644
index 00000000..6255b52f
Binary files /dev/null and b/assets/icons/WpfLibrary_256w.png differ
diff --git a/assets/misc/FluentSystemIcons-Filled.json b/assets/others/FluentSystemIcons-Filled.json
similarity index 100%
rename from assets/misc/FluentSystemIcons-Filled.json
rename to assets/others/FluentSystemIcons-Filled.json
diff --git a/assets/misc/FluentSystemIcons-Regular.json b/assets/others/FluentSystemIcons-Regular.json
similarity index 100%
rename from assets/misc/FluentSystemIcons-Regular.json
rename to assets/others/FluentSystemIcons-Regular.json
diff --git a/assets/misc/Segoe Fluent Icons.txt b/assets/others/Segoe Fluent Icons.txt
similarity index 100%
rename from assets/misc/Segoe Fluent Icons.txt
rename to assets/others/Segoe Fluent Icons.txt
diff --git a/assets/misc/iNKORE.Pulic.snk b/assets/others/iNKORE.Pulic.snk
similarity index 100%
rename from assets/misc/iNKORE.Pulic.snk
rename to assets/others/iNKORE.Pulic.snk
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
index 950aa2f7..da6a1ebf 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
+++ b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
@@ -10,9 +10,9 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-		<ApplicationIcon>..\..\assets\images\iNKORE.ico</ApplicationIcon>
+		<ApplicationIcon>..\..\assets\icons\WpfLibrary.ico</ApplicationIcon>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>..\..\assets\misc\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\assets\others\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
 		<RootNamespace>iNKORE.UI.WPF.Modern</RootNamespace>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);CS1591;1701;1702;CA1416;CS1573</NoWarn>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml
index ce36450d..5e1fa5fb 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml
@@ -7,13 +7,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     x:Name="Window"
-    Title="iNKORE.UI.WPF.Modern Sample App"
+    Title="iNKORE.UI.WPF.Modern | Gallery"
     Width="1026"
     Height="802"
     ui:ThemeManager.IsThemeAware="True"
     ui:TitleBar.ExtendViewIntoTitleBar="True"
     ui:WindowHelper.SystemBackdropType="Mica"
     ui:WindowHelper.UseModernWindowStyle="True"
+    ui:TitleBar.Height="36"
     mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
@@ -32,7 +33,8 @@
             Grid.Column="1"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
-            Source="/Assets/Gallery_256.png" />
+            RenderOptions.BitmapScalingMode="HighQuality"
+            Source="/iNKORE.UI.WPF.Modern.Gallery;component/Assets/WpfLibrary_256w.png"/>
         <ui:ProgressRing
             Name="splashProgressRing"
             Grid.Row="2"
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs b/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs
index e7ecc75d..5adfbd78 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs
@@ -18,6 +18,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Interop;
+using System.Threading;
 
 namespace iNKORE.UI.WPF.Modern.Gallery
 {
@@ -39,9 +40,17 @@ private async void InitialzeApp()
             ThemeHelper.Initialize();
             await ControlInfoDataSource.Instance.GetGroupsAsync();
             SubscribeToResourcesChanged();
-            NavigationRootPage NavigationRootPage = new NavigationRootPage();
-            Content = NavigationRootPage;
-            MicaHelper.Apply(this, BackdropType.Mica, true);
+
+            new Thread(() =>
+            {
+                Thread.Sleep(2000);
+                DispatcherHelper.RunOnMainThread(() =>
+                {
+                    NavigationRootPage NavigationRootPage = new NavigationRootPage();
+                    Content = NavigationRootPage;
+                    MicaHelper.Apply(this, BackdropType.Mica, true);
+                });
+            }).Start();
         }
 
         protected override void OnSourceInitialized(EventArgs e)
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Navigation/NavigationRootPage.xaml.cs b/source/iNKORE.UI.WPF.Modern.Gallery/Navigation/NavigationRootPage.xaml.cs
index 721f9da2..6b025013 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Navigation/NavigationRootPage.xaml.cs
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Navigation/NavigationRootPage.xaml.cs
@@ -120,7 +120,14 @@ public static string GetAppTitleFromSystem
                 }
                 else
                 {
-                    return System.Reflection.Assembly.GetExecutingAssembly().GetName().Name.ToString();
+                    if (Application.Current.MainWindow != null)
+                    {
+                        return Application.Current.MainWindow.Title;
+                    }
+                    else
+                    {
+                        return System.Reflection.Assembly.GetExecutingAssembly().GetName().Name.ToString();
+                    }
                 }
             }
         }
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Properties/AssemblyInfo.cs b/source/iNKORE.UI.WPF.Modern.Gallery/Properties/AssemblyInfo.cs
index f60efc01..07f1bd23 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Properties/AssemblyInfo.cs
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System.Reflection;
+using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
@@ -8,3 +9,17 @@
                                               //(used if a resource is not found in the page,
                                               // app, or any theme specific resource dictionaries)
 )]
+
+[assembly: AssemblyDescription("Modern (Fluent 2) styles and controls for your WPF applications")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("iNKORE Studios")]
+[assembly: AssemblyProduct("iNKORE.UI.WPF.Modern Gallery")]
+[assembly: AssemblyCopyright("Copyright © iNKORE! Studios 2024")]
+[assembly: AssemblyTrademark("iNKORE!")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("0.9.28.0")]
+[assembly: AssemblyFileVersion("0.9.28.0")]
+
+[assembly: AssemblyTitle("iNKORE.UI.WPF.Modern Gallery")]
+
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj b/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj
index ec5c4e04..dae2af45 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj
@@ -4,7 +4,9 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>..\..\assets\icons\Gallery.ico</ApplicationIcon>
+	  <ApplicationIcon>..\..\assets\icons\WpfLibrary.ico</ApplicationIcon>
+	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+
   </PropertyGroup>
     
   <PropertyGroup>
@@ -155,8 +157,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="..\..\assets\icons\Gallery_256.png" Link="Assets\Gallery_256.png" />
-    <Content Include="..\..\assets\icons\Gallery.ico" Link="Assets\Gallery.ico" />
+    <Resource Include="..\..\assets\icons\WpfLibrary_256w.png" Link="Assets\WpfLibrary_256w.png" />
     <Content Include="Assets\AppIcon.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
index 8bcf8d56..2cc8d222 100644
--- a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
+++ b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
@@ -7,9 +7,9 @@
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<NoWarn>1701;1702;1573;1591;CA1416</NoWarn>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<ApplicationIcon>..\..\assets\images\iNKORE.ico</ApplicationIcon>
+		<ApplicationIcon>..\..\assets\icons\WpfLibrary.ico</ApplicationIcon>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>..\..\assets\misc\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\assets\others\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);CS1591;1701;1702;CA1416</NoWarn>