diff --git a/ModernKeePass/Assets/Logo.scale-100.png b/ModernKeePass/Assets/Logo.scale-100.png
index 843d3b4..35e3d15 100644
Binary files a/ModernKeePass/Assets/Logo.scale-100.png and b/ModernKeePass/Assets/Logo.scale-100.png differ
diff --git a/ModernKeePass/Assets/Logo.scale-140.png b/ModernKeePass/Assets/Logo.scale-140.png
index 8f34a47..cc4eac3 100644
Binary files a/ModernKeePass/Assets/Logo.scale-140.png and b/ModernKeePass/Assets/Logo.scale-140.png differ
diff --git a/ModernKeePass/Assets/Logo.scale-180.png b/ModernKeePass/Assets/Logo.scale-180.png
index 9518de2..11941e1 100644
Binary files a/ModernKeePass/Assets/Logo.scale-180.png and b/ModernKeePass/Assets/Logo.scale-180.png differ
diff --git a/ModernKeePass/Assets/Logo.scale-80.png b/ModernKeePass/Assets/Logo.scale-80.png
index 03bd4d6..633d42a 100644
Binary files a/ModernKeePass/Assets/Logo.scale-80.png and b/ModernKeePass/Assets/Logo.scale-80.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-100.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-100.png
index 56107a6..b8e7c31 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-100.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-100.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-140.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-140.png
index a6098c5..15db30d 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-140.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-140.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-180.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-180.png
index 8307fca..cd2a9a5 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-180.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-180.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-80.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-80.png
index aa2428e..bea8813 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-80.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-80.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-16.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-16.png
index a59ea0a..31f63de 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-16.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-16.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-256.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-256.png
index 31b1ecd..6af0ff3 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-256.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-256.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-32.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-32.png
index ae6f17a..7423c3a 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-32.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-32.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-48.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-48.png
index 0c4e673..4840feb 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-48.png and b/ModernKeePass/Assets/ModernKeePass-SmallLogo.targetsize-48.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-100.png b/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-100.png
index 195255f..2e01e39 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-100.png and b/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-100.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-140.png b/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-140.png
index d01b68b..65c5a7e 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-140.png and b/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-140.png differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-180.png b/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-180.png
index 09d407f..1f8189f 100644
Binary files a/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-180.png and b/ModernKeePass/Assets/ModernKeePass-SplashScreen.scale-180.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-100.png b/ModernKeePass/Assets/SmallLogo.scale-100.png
new file mode 100644
index 0000000..b8e7c31
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.scale-100.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-140.png b/ModernKeePass/Assets/SmallLogo.scale-140.png
new file mode 100644
index 0000000..15db30d
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.scale-140.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-180.png b/ModernKeePass/Assets/SmallLogo.scale-180.png
new file mode 100644
index 0000000..cd2a9a5
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.scale-180.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-80.png b/ModernKeePass/Assets/SmallLogo.scale-80.png
new file mode 100644
index 0000000..bea8813
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.scale-80.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.targetsize-16.png b/ModernKeePass/Assets/SmallLogo.targetsize-16.png
new file mode 100644
index 0000000..31f63de
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.targetsize-16.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.targetsize-256.png b/ModernKeePass/Assets/SmallLogo.targetsize-256.png
new file mode 100644
index 0000000..6af0ff3
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.targetsize-256.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.targetsize-32.png b/ModernKeePass/Assets/SmallLogo.targetsize-32.png
new file mode 100644
index 0000000..7423c3a
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.targetsize-32.png differ
diff --git a/ModernKeePass/Assets/SmallLogo.targetsize-48.png b/ModernKeePass/Assets/SmallLogo.targetsize-48.png
new file mode 100644
index 0000000..4840feb
Binary files /dev/null and b/ModernKeePass/Assets/SmallLogo.targetsize-48.png differ
diff --git a/ModernKeePass/Assets/SplashScreen.scale-100.png b/ModernKeePass/Assets/SplashScreen.scale-100.png
new file mode 100644
index 0000000..2e01e39
Binary files /dev/null and b/ModernKeePass/Assets/SplashScreen.scale-100.png differ
diff --git a/ModernKeePass/Assets/SplashScreen.scale-140.png b/ModernKeePass/Assets/SplashScreen.scale-140.png
new file mode 100644
index 0000000..65c5a7e
Binary files /dev/null and b/ModernKeePass/Assets/SplashScreen.scale-140.png differ
diff --git a/ModernKeePass/Assets/SplashScreen.scale-180.png b/ModernKeePass/Assets/SplashScreen.scale-180.png
new file mode 100644
index 0000000..1f8189f
Binary files /dev/null and b/ModernKeePass/Assets/SplashScreen.scale-180.png differ
diff --git a/ModernKeePass/Assets/Square310x310Logo.scale-100.png b/ModernKeePass/Assets/Square310x310Logo.scale-100.png
index 61f1a29..fddfbb5 100644
Binary files a/ModernKeePass/Assets/Square310x310Logo.scale-100.png and b/ModernKeePass/Assets/Square310x310Logo.scale-100.png differ
diff --git a/ModernKeePass/Assets/Square310x310Logo.scale-140.png b/ModernKeePass/Assets/Square310x310Logo.scale-140.png
index 8eda78f..e6ab965 100644
Binary files a/ModernKeePass/Assets/Square310x310Logo.scale-140.png and b/ModernKeePass/Assets/Square310x310Logo.scale-140.png differ
diff --git a/ModernKeePass/Assets/Square310x310Logo.scale-180.png b/ModernKeePass/Assets/Square310x310Logo.scale-180.png
index f17e8b5..355ca30 100644
Binary files a/ModernKeePass/Assets/Square310x310Logo.scale-180.png and b/ModernKeePass/Assets/Square310x310Logo.scale-180.png differ
diff --git a/ModernKeePass/Assets/Square310x310Logo.scale-80.png b/ModernKeePass/Assets/Square310x310Logo.scale-80.png
index 91e1a3d..060cb30 100644
Binary files a/ModernKeePass/Assets/Square310x310Logo.scale-80.png and b/ModernKeePass/Assets/Square310x310Logo.scale-80.png differ
diff --git a/ModernKeePass/Assets/Square70x70Logo.scale-100.png b/ModernKeePass/Assets/Square70x70Logo.scale-100.png
index 8b4c82d..e412aab 100644
Binary files a/ModernKeePass/Assets/Square70x70Logo.scale-100.png and b/ModernKeePass/Assets/Square70x70Logo.scale-100.png differ
diff --git a/ModernKeePass/Assets/Square70x70Logo.scale-140.png b/ModernKeePass/Assets/Square70x70Logo.scale-140.png
index 2b3fdbf..569866f 100644
Binary files a/ModernKeePass/Assets/Square70x70Logo.scale-140.png and b/ModernKeePass/Assets/Square70x70Logo.scale-140.png differ
diff --git a/ModernKeePass/Assets/Square70x70Logo.scale-180.png b/ModernKeePass/Assets/Square70x70Logo.scale-180.png
index e551842..6b98169 100644
Binary files a/ModernKeePass/Assets/Square70x70Logo.scale-180.png and b/ModernKeePass/Assets/Square70x70Logo.scale-180.png differ
diff --git a/ModernKeePass/Assets/Square70x70Logo.scale-80.png b/ModernKeePass/Assets/Square70x70Logo.scale-80.png
index 4d1c242..368c0d3 100644
Binary files a/ModernKeePass/Assets/Square70x70Logo.scale-80.png and b/ModernKeePass/Assets/Square70x70Logo.scale-80.png differ
diff --git a/ModernKeePass/Assets/Store/StoreLogo.scale-100.png b/ModernKeePass/Assets/Store/StoreLogo.scale-100.png
deleted file mode 100644
index 093d443..0000000
Binary files a/ModernKeePass/Assets/Store/StoreLogo.scale-100.png and /dev/null differ
diff --git a/ModernKeePass/Assets/Store/StoreLogo.scale-140.png b/ModernKeePass/Assets/Store/StoreLogo.scale-140.png
deleted file mode 100644
index c1d38d6..0000000
Binary files a/ModernKeePass/Assets/Store/StoreLogo.scale-140.png and /dev/null differ
diff --git a/ModernKeePass/Assets/Store/StoreLogo.scale-180.png b/ModernKeePass/Assets/Store/StoreLogo.scale-180.png
deleted file mode 100644
index 6799f8f..0000000
Binary files a/ModernKeePass/Assets/Store/StoreLogo.scale-180.png and /dev/null differ
diff --git a/ModernKeePass/Assets/StoreLogo.scale-100.png b/ModernKeePass/Assets/StoreLogo.scale-100.png
new file mode 100644
index 0000000..c98cd27
Binary files /dev/null and b/ModernKeePass/Assets/StoreLogo.scale-100.png differ
diff --git a/ModernKeePass/Assets/StoreLogo.scale-140.png b/ModernKeePass/Assets/StoreLogo.scale-140.png
new file mode 100644
index 0000000..d7ff32b
Binary files /dev/null and b/ModernKeePass/Assets/StoreLogo.scale-140.png differ
diff --git a/ModernKeePass/Assets/StoreLogo.scale-180.png b/ModernKeePass/Assets/StoreLogo.scale-180.png
new file mode 100644
index 0000000..494d56a
Binary files /dev/null and b/ModernKeePass/Assets/StoreLogo.scale-180.png differ
diff --git a/ModernKeePass/Assets/Wide310x150Logo.scale-100.png b/ModernKeePass/Assets/Wide310x150Logo.scale-100.png
index 0c3846e..1adfb1f 100644
Binary files a/ModernKeePass/Assets/Wide310x150Logo.scale-100.png and b/ModernKeePass/Assets/Wide310x150Logo.scale-100.png differ
diff --git a/ModernKeePass/Assets/Wide310x150Logo.scale-140.png b/ModernKeePass/Assets/Wide310x150Logo.scale-140.png
index 32ab917..8cd5f18 100644
Binary files a/ModernKeePass/Assets/Wide310x150Logo.scale-140.png and b/ModernKeePass/Assets/Wide310x150Logo.scale-140.png differ
diff --git a/ModernKeePass/Assets/Wide310x150Logo.scale-180.png b/ModernKeePass/Assets/Wide310x150Logo.scale-180.png
index c4411b1..bec913a 100644
Binary files a/ModernKeePass/Assets/Wide310x150Logo.scale-180.png and b/ModernKeePass/Assets/Wide310x150Logo.scale-180.png differ
diff --git a/ModernKeePass/Assets/Wide310x150Logo.scale-80.png b/ModernKeePass/Assets/Wide310x150Logo.scale-80.png
index d4f849d..abdbb97 100644
Binary files a/ModernKeePass/Assets/Wide310x150Logo.scale-80.png and b/ModernKeePass/Assets/Wide310x150Logo.scale-80.png differ
diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index 0606ffc..3fdc9e4 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -341,9 +341,9 @@
     <Content Include="Assets\Square70x70Logo.scale-140.png" />
     <Content Include="Assets\Square70x70Logo.scale-180.png" />
     <Content Include="Assets\Square70x70Logo.scale-80.png" />
-    <Content Include="Assets\Store\StoreLogo.scale-100.png" />
-    <Content Include="Assets\Store\StoreLogo.scale-140.png" />
-    <Content Include="Assets\Store\StoreLogo.scale-180.png" />
+    <Content Include="Assets\StoreLogo.scale-100.png" />
+    <Content Include="Assets\StoreLogo.scale-140.png" />
+    <Content Include="Assets\StoreLogo.scale-180.png" />
     <Content Include="Assets\Wide310x150Logo.scale-100.png" />
     <Content Include="Assets\Wide310x150Logo.scale-140.png" />
     <Content Include="Assets\Wide310x150Logo.scale-180.png" />
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index a06040f..46fa421 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -4,7 +4,7 @@
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
-    <Logo>assets\Store\StoreLogo.png</Logo>
+    <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Prerequisites>
     <OSMinVersion>6.3.0</OSMinVersion>
@@ -15,10 +15,10 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ModernKeePass.App">
-      <m2:VisualElements DisplayName="ModernKeePass" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\ModernKeePass-SmallLogo.png" Description="A port of the KeePass application for the Windows store. You can create, open and edit KeePass 2.x password databases in a modern fashion." ForegroundText="light" BackgroundColor="#9400bd" ToastCapable="true">
+      <m2:VisualElements DisplayName="ModernKeePass" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\ModernKeePass-SmallLogo.png" Description="A port of the KeePass application for the Windows store. You can create, open and edit KeePass 2.x password databases in a modern fashion." ForegroundText="light" BackgroundColor="#7755c4" ToastCapable="true">
         <m2:DefaultTile Square310x310Logo="Assets\Square310x310Logo.png" Wide310x150Logo="Assets\Wide310x150Logo.png" Square70x70Logo="Assets\Square70x70Logo.png">
         </m2:DefaultTile>
-        <m2:SplashScreen Image="Assets\ModernKeePass-SplashScreen.png" />
+        <m2:SplashScreen Image="Assets\ModernKeePass-SplashScreen.png" BackgroundColor="#7755c4" />
       </m2:VisualElements>
       <Extensions>
         <Extension Category="windows.fileOpenPicker">
diff --git a/ModernKeePass/ViewModels/CompositeKeyVm.cs b/ModernKeePass/ViewModels/CompositeKeyVm.cs
index 43faf53..70ec127 100644
--- a/ModernKeePass/ViewModels/CompositeKeyVm.cs
+++ b/ModernKeePass/ViewModels/CompositeKeyVm.cs
@@ -134,7 +134,7 @@ namespace ModernKeePass.ViewModels
         {
             var compositeKey = new CompositeKey();
             if (HasPassword) compositeKey.AddUserKey(new KcpPassword(Password));
-            if (HasKeyFile) compositeKey.AddUserKey(new KcpKeyFile(IOConnectionInfo.FromFile(KeyFile)));
+            if (HasKeyFile && KeyFile != null) compositeKey.AddUserKey(new KcpKeyFile(IOConnectionInfo.FromFile(KeyFile)));
             return compositeKey;
         }
     }