diff --git a/Moonlight.Client/UI/Partials/AppHeader.razor b/Moonlight.Client/UI/Partials/AppHeader.razor
index 86635cd0..8dd26721 100644
--- a/Moonlight.Client/UI/Partials/AppHeader.razor
+++ b/Moonlight.Client/UI/Partials/AppHeader.razor
@@ -25,7 +25,7 @@
             <div class="relative">
                 <button @onclick="ToggleProfileNav" @onfocusout="ProfileNav_OnFocusOut" type="button" class="-m-1.5 flex items-center p-1.5" id="user-menu-button" aria-expanded="false" aria-haspopup="true">
                     <span class="sr-only">Open user menu</span>
-                    <img class="h-8 w-8 rounded-full" src="https://masuowo.xyz/assets/images/avatar.png" alt="">
+                    <img class="h-8 w-8 rounded-full" src="/img/pfp_placeholder.png" alt="">
                     <span class="hidden lg:flex lg:items-center">
                         <span class="ml-4 text-sm font-semibold leading-6 text-gray-100" aria-hidden="true">
                             @("@" + Username)
diff --git a/Moonlight.Client/UI/Partials/AppSidebar.razor b/Moonlight.Client/UI/Partials/AppSidebar.razor
index f3300302..143f6a8f 100644
--- a/Moonlight.Client/UI/Partials/AppSidebar.razor
+++ b/Moonlight.Client/UI/Partials/AppSidebar.razor
@@ -9,12 +9,16 @@
     var url = new Uri(Navigation.Uri);
 }
 
-<div class="relative z-50 lg:hidden transition-opacity ease-linear duration-300 @(Layout.ShowMobileNavigation ? "opacity-100" : "opacity-0 pointer-events-none")" role="dialog" aria-modal="true">
+<div
+    class="relative z-50 lg:hidden transition-opacity ease-linear duration-300 @(Layout.ShowMobileNavigation ? "opacity-100" : "opacity-0 pointer-events-none")"
+    role="dialog" aria-modal="true">
     <div class="fixed inset-0 bg-gray-900/80"></div>
 
     <div class="fixed inset-0 flex">
-        <div class="relative mr-16 flex w-full max-w-xs flex-1 transition ease-in-out duration-300 transform @(Layout.ShowMobileNavigation ? "translate-x-0" : "-translate-x-full")">
-            <div class="absolute left-full top-0 flex w-16 justify-center pt-5 ease-in-out duration-300 @(Layout.ShowMobileNavigation ? "opacity-100" : "opacity-0")">
+        <div
+            class="relative mr-16 flex w-full max-w-xs flex-1 transition ease-in-out duration-300 transform @(Layout.ShowMobileNavigation ? "translate-x-0" : "-translate-x-full")">
+            <div
+                class="absolute left-full top-0 flex w-16 justify-center pt-5 ease-in-out duration-300 @(Layout.ShowMobileNavigation ? "opacity-100" : "opacity-0")">
                 <button @onclick="Layout.ToggleMobileNavigation" type="button" class="-m-2.5 p-2.5">
                     <span class="sr-only">Close sidebar</span>
                     <i class="icon-x text-lg"></i>
@@ -23,10 +27,9 @@
 
             <div class="flex grow flex-col gap-y-5 overflow-y-auto bg-gray-900 px-6 pb-4 ring-1 ring-white/10">
                 <div class="flex h-16 shrink-0 items-center">
-                    <img class="h-8 w-auto" src="/logo.svg"
-                         alt="Your Company">
+                    <img class="h-8 w-auto" src="/svg/logo.svg" alt="Logo">
                 </div>
-                
+
                 <nav class="flex flex-1 flex-col">
                     <ul role="list" class="flex flex-1 flex-col gap-y-7">
                         @foreach (var group in Items)
@@ -70,7 +73,7 @@
                         }
                     </ul>
                 </nav>
-                
+
             </div>
         </div>
     </div>
@@ -79,8 +82,7 @@
 <div class="hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:w-72 lg:flex-col">
     <div class="flex grow flex-col gap-y-5 overflow-y-auto bg-gray-800/60 px-6 pb-4">
         <div class="flex h-16 shrink-0 items-center">
-            <img class="h-8 w-auto" src="/svg/logo.svg"
-                 alt="Your Company">
+            <img class="h-10 w-auto" src="/svg/logo.svg" alt="Logo">
         </div>
         <nav class="flex flex-1 flex-col">
             <ul role="list" class="flex flex-1 flex-col gap-y-7">
diff --git a/Moonlight.Client/wwwroot/icon-192.png b/Moonlight.Client/wwwroot/img/icon-192.png
similarity index 100%
rename from Moonlight.Client/wwwroot/icon-192.png
rename to Moonlight.Client/wwwroot/img/icon-192.png
diff --git a/Moonlight.Client/wwwroot/icon-512.png b/Moonlight.Client/wwwroot/img/icon-512.png
similarity index 100%
rename from Moonlight.Client/wwwroot/icon-512.png
rename to Moonlight.Client/wwwroot/img/icon-512.png
diff --git a/Moonlight.Client/wwwroot/img/pfp_placeholder.png b/Moonlight.Client/wwwroot/img/pfp_placeholder.png
new file mode 100644
index 00000000..1108ddbb
Binary files /dev/null and b/Moonlight.Client/wwwroot/img/pfp_placeholder.png differ
diff --git a/Moonlight.Client/wwwroot/logolong.webp b/Moonlight.Client/wwwroot/logolong.webp
deleted file mode 100644
index e5e7926e..00000000
Binary files a/Moonlight.Client/wwwroot/logolong.webp and /dev/null differ
diff --git a/Moonlight.Client/wwwroot/manifest.webmanifest b/Moonlight.Client/wwwroot/manifest.webmanifest
index f3d69b34..78a86a9e 100644
--- a/Moonlight.Client/wwwroot/manifest.webmanifest
+++ b/Moonlight.Client/wwwroot/manifest.webmanifest
@@ -9,12 +9,12 @@
   "prefer_related_applications": false,
   "icons": [
     {
-      "src": "icon-512.png",
+      "src": "img/icon-512.png",
       "type": "image/png",
       "sizes": "512x512"
     },
     {
-      "src": "icon-192.png",
+      "src": "img/icon-192.png",
       "type": "image/png",
       "sizes": "192x192"
     }
diff --git a/Moonlight.Client/wwwroot/logo.svg b/Moonlight.Client/wwwroot/svg/logo.svg
similarity index 100%
rename from Moonlight.Client/wwwroot/logo.svg
rename to Moonlight.Client/wwwroot/svg/logo.svg