diff --git a/ModernKeePass/App.xaml b/ModernKeePass/App.xaml
index a76d7f1..aca89cf 100644
--- a/ModernKeePass/App.xaml
+++ b/ModernKeePass/App.xaml
@@ -13,5 +13,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
-
 </Application>
diff --git a/ModernKeePass/Assets/Logo.scale-100.png b/ModernKeePass/Assets/Logo.scale-100.png
index b2d236a..843d3b4 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 fda03c8..8f34a47 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 699efaa..9518de2 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 0bf3f74..03bd4d6 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-Logo.scale-100.png b/ModernKeePass/Assets/ModernKeePass-Logo.scale-100.png
deleted file mode 100644
index b2d236a..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-Logo.scale-100.png and /dev/null differ
diff --git a/ModernKeePass/Assets/ModernKeePass-Logo.scale-140.png b/ModernKeePass/Assets/ModernKeePass-Logo.scale-140.png
deleted file mode 100644
index fda03c8..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-Logo.scale-140.png and /dev/null differ
diff --git a/ModernKeePass/Assets/ModernKeePass-Logo.scale-180.png b/ModernKeePass/Assets/ModernKeePass-Logo.scale-180.png
deleted file mode 100644
index 699efaa..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-Logo.scale-180.png and /dev/null differ
diff --git a/ModernKeePass/Assets/ModernKeePass-Logo.scale-80.png b/ModernKeePass/Assets/ModernKeePass-Logo.scale-80.png
deleted file mode 100644
index 0bf3f74..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-Logo.scale-80.png and /dev/null differ
diff --git a/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-100.png b/ModernKeePass/Assets/ModernKeePass-SmallLogo.scale-100.png
index e4c6dcb..56107a6 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 fe3c0d9..a6098c5 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 e7ba298..8307fca 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 4d35768..aa2428e 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
new file mode 100644
index 0000000..a59ea0a
Binary files /dev/null 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
new file mode 100644
index 0000000..31b1ecd
Binary files /dev/null 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
new file mode 100644
index 0000000..ae6f17a
Binary files /dev/null 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
new file mode 100644
index 0000000..0c4e673
Binary files /dev/null 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 ce86b43..195255f 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 6e64ef5..d01b68b 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 0d79d1b..09d407f 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/ModernKeePass-StoreLogo.scale-100.png b/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-100.png
deleted file mode 100644
index 629e61c..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-100.png and /dev/null differ
diff --git a/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-140.png b/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-140.png
deleted file mode 100644
index 95e7388..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-140.png and /dev/null differ
diff --git a/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-180.png b/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-180.png
deleted file mode 100644
index 5f50543..0000000
Binary files a/ModernKeePass/Assets/ModernKeePass-StoreLogo.scale-180.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-100.png b/ModernKeePass/Assets/SmallLogo.scale-100.png
deleted file mode 100644
index e4c6dcb..0000000
Binary files a/ModernKeePass/Assets/SmallLogo.scale-100.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-140.png b/ModernKeePass/Assets/SmallLogo.scale-140.png
deleted file mode 100644
index fe3c0d9..0000000
Binary files a/ModernKeePass/Assets/SmallLogo.scale-140.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-180.png b/ModernKeePass/Assets/SmallLogo.scale-180.png
deleted file mode 100644
index e7ba298..0000000
Binary files a/ModernKeePass/Assets/SmallLogo.scale-180.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SmallLogo.scale-80.png b/ModernKeePass/Assets/SmallLogo.scale-80.png
deleted file mode 100644
index 4d35768..0000000
Binary files a/ModernKeePass/Assets/SmallLogo.scale-80.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SplashScreen.scale-100.png b/ModernKeePass/Assets/SplashScreen.scale-100.png
deleted file mode 100644
index ce86b43..0000000
Binary files a/ModernKeePass/Assets/SplashScreen.scale-100.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SplashScreen.scale-140.png b/ModernKeePass/Assets/SplashScreen.scale-140.png
deleted file mode 100644
index 6e64ef5..0000000
Binary files a/ModernKeePass/Assets/SplashScreen.scale-140.png and /dev/null differ
diff --git a/ModernKeePass/Assets/SplashScreen.scale-180.png b/ModernKeePass/Assets/SplashScreen.scale-180.png
deleted file mode 100644
index 0d79d1b..0000000
Binary files a/ModernKeePass/Assets/SplashScreen.scale-180.png and /dev/null differ
diff --git a/ModernKeePass/Assets/Square310x310Logo.scale-100.png b/ModernKeePass/Assets/Square310x310Logo.scale-100.png
index 3149641..61f1a29 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 d17eaf4..8eda78f 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 3963738..f17e8b5 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 3846f3c..91e1a3d 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 95e7388..8b4c82d 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 ac12055..2b3fdbf 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 072d24a..e551842 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 65b5df3..4d1c242 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
new file mode 100644
index 0000000..093d443
Binary files /dev/null and b/ModernKeePass/Assets/Store/StoreLogo.scale-100.png differ
diff --git a/ModernKeePass/Assets/Store/StoreLogo.scale-140.png b/ModernKeePass/Assets/Store/StoreLogo.scale-140.png
new file mode 100644
index 0000000..c1d38d6
Binary files /dev/null and b/ModernKeePass/Assets/Store/StoreLogo.scale-140.png differ
diff --git a/ModernKeePass/Assets/Store/StoreLogo.scale-180.png b/ModernKeePass/Assets/Store/StoreLogo.scale-180.png
new file mode 100644
index 0000000..6799f8f
Binary files /dev/null and b/ModernKeePass/Assets/Store/StoreLogo.scale-180.png differ
diff --git a/ModernKeePass/Assets/StoreLogo.scale-100.png b/ModernKeePass/Assets/StoreLogo.scale-100.png
deleted file mode 100644
index 629e61c..0000000
Binary files a/ModernKeePass/Assets/StoreLogo.scale-100.png and /dev/null differ
diff --git a/ModernKeePass/Assets/StoreLogo.scale-140.png b/ModernKeePass/Assets/StoreLogo.scale-140.png
deleted file mode 100644
index 95e7388..0000000
Binary files a/ModernKeePass/Assets/StoreLogo.scale-140.png and /dev/null differ
diff --git a/ModernKeePass/Assets/StoreLogo.scale-180.png b/ModernKeePass/Assets/StoreLogo.scale-180.png
deleted file mode 100644
index 5f50543..0000000
Binary files a/ModernKeePass/Assets/StoreLogo.scale-180.png and /dev/null differ
diff --git a/ModernKeePass/Assets/Wide310x150Logo.scale-100.png b/ModernKeePass/Assets/Wide310x150Logo.scale-100.png
index 2e52dad..0c3846e 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 f1395e4..32ab917 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 3c0cd7a..c4411b1 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 78ef98f..d4f849d 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 23c593a..5970461 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -316,32 +316,26 @@
       <Name>BehaviorsXamlSDKManaged</Name>
     </SDKReference>
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
+    <Content Include="Assets\BadgeLogo.scale-100.png" />
+    <Content Include="Assets\BadgeLogo.scale-140.png" />
+    <Content Include="Assets\BadgeLogo.scale-180.png" />
     <Content Include="Assets\Logo.scale-100.png" />
     <Content Include="Assets\Logo.scale-140.png" />
     <Content Include="Assets\Logo.scale-180.png" />
     <Content Include="Assets\Logo.scale-80.png" />
-    <Content Include="Assets\ModernKeePass-Logo.scale-100.png" />
-    <Content Include="Assets\ModernKeePass-Logo.scale-140.png" />
-    <Content Include="Assets\ModernKeePass-Logo.scale-180.png" />
-    <Content Include="Assets\ModernKeePass-Logo.scale-80.png" />
     <Content Include="Assets\ModernKeePass-SmallLogo.scale-100.png" />
     <Content Include="Assets\ModernKeePass-SmallLogo.scale-140.png" />
     <Content Include="Assets\ModernKeePass-SmallLogo.scale-180.png" />
     <Content Include="Assets\ModernKeePass-SmallLogo.scale-80.png" />
+    <Content Include="Assets\ModernKeePass-SmallLogo.targetsize-16.png" />
+    <Content Include="Assets\ModernKeePass-SmallLogo.targetsize-256.png" />
+    <Content Include="Assets\ModernKeePass-SmallLogo.targetsize-32.png" />
+    <Content Include="Assets\ModernKeePass-SmallLogo.targetsize-48.png" />
     <Content Include="Assets\ModernKeePass-SplashScreen.scale-100.png" />
     <Content Include="Assets\ModernKeePass-SplashScreen.scale-140.png" />
     <Content Include="Assets\ModernKeePass-SplashScreen.scale-180.png" />
-    <Content Include="Assets\ModernKeePass-StoreLogo.scale-100.png" />
-    <Content Include="Assets\ModernKeePass-StoreLogo.scale-140.png" />
-    <Content Include="Assets\ModernKeePass-StoreLogo.scale-180.png" />
-    <Content Include="Assets\SmallLogo.scale-100.png" />
-    <Content Include="Assets\SmallLogo.scale-140.png" />
-    <Content Include="Assets\SmallLogo.scale-180.png" />
-    <Content Include="Assets\SmallLogo.scale-80.png" />
-    <Content Include="Assets\SplashScreen.scale-100.png" />
-    <Content Include="Assets\SplashScreen.scale-140.png" />
-    <Content Include="Assets\SplashScreen.scale-180.png" />
     <Content Include="Assets\Square310x310Logo.scale-100.png" />
     <Content Include="Assets\Square310x310Logo.scale-140.png" />
     <Content Include="Assets\Square310x310Logo.scale-180.png" />
@@ -350,9 +344,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\StoreLogo.scale-100.png" />
-    <Content Include="Assets\StoreLogo.scale-140.png" />
-    <Content Include="Assets\StoreLogo.scale-180.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\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 efd1dbd..66534a2 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -4,7 +4,7 @@
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
-    <Logo>Assets\ModernKeePass-StoreLogo.png</Logo>
+    <Logo>assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Prerequisites>
     <OSMinVersion>6.3.0</OSMinVersion>
@@ -15,9 +15,8 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ModernKeePass.App">
-      <m2:VisualElements DisplayName="ModernKeePass" Square150x150Logo="Assets\ModernKeePass-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="#464646" ToastCapable="true">
-        <m2:DefaultTile Square310x310Logo="Assets\Square310x310Logo.png" Wide310x150Logo="Assets\Wide310x150Logo.png" Square70x70Logo="Assets\Square70x70Logo.png">
-        </m2:DefaultTile>
+      <m2:VisualElements DisplayName="ModernKeePass" Square150x150Logo="Assets\ModernKeePass-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:DefaultTile Square310x310Logo="Assets\Square310x310Logo.png" Wide310x150Logo="Assets\Wide310x150Logo.png" Square70x70Logo="Assets\Square70x70Logo.png"></m2:DefaultTile>
         <m2:SplashScreen Image="Assets\ModernKeePass-SplashScreen.png" />
       </m2:VisualElements>
       <Extensions>