diff --git a/src/khoj/interface/web/assets/icons/favicon-128x128.png b/src/interface/web/public/assets/icons/khoj_lantern_128x128.png
similarity index 100%
rename from src/khoj/interface/web/assets/icons/favicon-128x128.png
rename to src/interface/web/public/assets/icons/khoj_lantern_128x128.png
diff --git a/src/khoj/interface/web/assets/icons/favicon-256x256.png b/src/interface/web/public/assets/icons/khoj_lantern_256x256.png
similarity index 100%
rename from src/khoj/interface/web/assets/icons/favicon-256x256.png
rename to src/interface/web/public/assets/icons/khoj_lantern_256x256.png
diff --git a/src/khoj/interface/web/assets/samples/desktop-browse-draw-sample.png b/src/interface/web/public/assets/samples/desktop-browse-draw-sample.png
similarity index 100%
rename from src/khoj/interface/web/assets/samples/desktop-browse-draw-sample.png
rename to src/interface/web/public/assets/samples/desktop-browse-draw-sample.png
diff --git a/src/khoj/interface/web/assets/samples/desktop-plain-chat-sample.png b/src/interface/web/public/assets/samples/desktop-plain-chat-sample.png
similarity index 100%
rename from src/khoj/interface/web/assets/samples/desktop-plain-chat-sample.png
rename to src/interface/web/public/assets/samples/desktop-plain-chat-sample.png
diff --git a/src/khoj/interface/web/assets/samples/desktop-remember-plan-sample.png b/src/interface/web/public/assets/samples/desktop-remember-plan-sample.png
similarity index 100%
rename from src/khoj/interface/web/assets/samples/desktop-remember-plan-sample.png
rename to src/interface/web/public/assets/samples/desktop-remember-plan-sample.png
diff --git a/src/khoj/interface/web/assets/samples/phone-browse-draw-sample.png b/src/interface/web/public/assets/samples/phone-browse-draw-sample.png
similarity index 100%
rename from src/khoj/interface/web/assets/samples/phone-browse-draw-sample.png
rename to src/interface/web/public/assets/samples/phone-browse-draw-sample.png
diff --git a/src/khoj/interface/web/assets/samples/phone-plain-chat-sample.png b/src/interface/web/public/assets/samples/phone-plain-chat-sample.png
similarity index 100%
rename from src/khoj/interface/web/assets/samples/phone-plain-chat-sample.png
rename to src/interface/web/public/assets/samples/phone-plain-chat-sample.png
diff --git a/src/khoj/interface/web/assets/samples/phone-remember-plan-sample.png b/src/interface/web/public/assets/samples/phone-remember-plan-sample.png
similarity index 100%
rename from src/khoj/interface/web/assets/samples/phone-remember-plan-sample.png
rename to src/interface/web/public/assets/samples/phone-remember-plan-sample.png
diff --git a/src/interface/web/public/khoj.webmanifest b/src/interface/web/public/khoj.webmanifest
new file mode 100644
index 00000000..e0ed3744
--- /dev/null
+++ b/src/interface/web/public/khoj.webmanifest
@@ -0,0 +1,51 @@
+{
+    "name": "Khoj",
+    "short_name": "Khoj",
+    "display": "standalone",
+    "start_url": "/",
+    "description": "The open, personal AI for your digital brain. You can ask Khoj to draft a message, paint your imagination, find information on the internet and even answer questions from your documents.",
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "icons": [
+        {
+            "src": "/static/assets/icons/khoj_lantern_128x128.png",
+            "sizes": "128x128",
+            "type": "image/png"
+        },
+        {
+            "src": "/static/assets/icons/khoj_lantern_256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "screenshots": [
+        {
+            "src": "/static/assets/samples/phone-remember-plan-sample.png",
+            "sizes": "419x900",
+            "type": "image/png",
+            "form_factor": "narrow",
+            "label": "Remember and Plan"
+        },
+        {
+            "src": "/static/assets/samples/phone-browse-draw-sample.png",
+            "sizes": "419x900",
+            "type": "image/png",
+            "form_factor": "narrow",
+            "label": "Browse and Draw"
+        },
+        {
+            "src": "/static/assets/samples/desktop-remember-plan-sample.png",
+            "sizes": "1260x742",
+            "type": "image/png",
+            "form_factor": "wide",
+            "label": "Remember and Plan"
+        },
+        {
+            "src": "/static/assets/samples/desktop-browse-draw-sample.png",
+            "sizes": "1260x742",
+            "type": "image/png",
+            "form_factor": "wide",
+            "label": "Browse and Draw"
+        }
+    ]
+}
diff --git a/src/khoj/interface/web/base_config.html b/src/khoj/interface/web/base_config.html
index 2e2475ff..932108cd 100644
--- a/src/khoj/interface/web/base_config.html
+++ b/src/khoj/interface/web/base_config.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
-        <link rel="icon" type="image/png" sizes="128x128" href="/static/assets/icons/favicon-128x128.png?v={{ khoj_version }}">
+        <link rel="icon" type="image/png" sizes="128x128" href="https://assets.khoj.dev/khoj_lantern_128x128.png?v={{ khoj_version }}">
         <title>Khoj</title>
         <meta http-equiv="Content-Security-Policy"
               content="default-src 'self' https://assets.khoj.dev;
diff --git a/src/khoj/interface/web/khoj.webmanifest b/src/khoj/interface/web/khoj.webmanifest
deleted file mode 100644
index c63e922b..00000000
--- a/src/khoj/interface/web/khoj.webmanifest
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "name": "Khoj",
-    "short_name": "Khoj",
-    "display": "standalone",
-    "start_url": "/",
-    "description": "The open, personal AI for your digital brain. You can ask Khoj to draft a message, paint your imagination, find information on the internet and even answer questions from your documents.",
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "icons": [
-        {
-            "src": "/static/assets/icons/favicon-128x128.png",
-            "sizes": "128x128",
-            "type": "image/png"
-        },
-        {
-            "src": "/static/assets/icons/favicon-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        }
-    ],
-    "screenshots": [
-        {
-         "src": "/static/assets/samples/phone-remember-plan-sample.png",
-          "sizes": "419x900",
-          "type": "image/png",
-          "form_factor": "narrow",
-          "label": "Remember and Plan"
-        },
-        {
-         "src": "/static/assets/samples/phone-browse-draw-sample.png",
-          "sizes": "419x900",
-          "type": "image/png",
-          "form_factor": "narrow",
-          "label": "Browse and Draw"
-        },
-        {
-         "src": "/static/assets/samples/desktop-remember-plan-sample.png",
-          "sizes": "1260x742",
-          "type": "image/png",
-          "form_factor": "wide",
-          "label": "Remember and Plan"
-        },
-        {
-         "src": "/static/assets/samples/desktop-browse-draw-sample.png",
-          "sizes": "1260x742",
-          "type": "image/png",
-          "form_factor": "wide",
-          "label": "Browse and Draw"
-        }
-    ]
-}
diff --git a/src/khoj/interface/web/login.html b/src/khoj/interface/web/login.html
index 39c3911b..d9f9a83e 100644
--- a/src/khoj/interface/web/login.html
+++ b/src/khoj/interface/web/login.html
@@ -4,7 +4,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
         <title>Khoj - Login</title>
 
-        <link rel="icon" type="image/png" sizes="128x128" href="/static/assets/icons/favicon-128x128.png">
+        <link rel="icon" type="image/png" sizes="128x128" href="https://assets.khoj.dev/khoj_lantern_128x128.png">
         <link rel="manifest" href="/static/khoj.webmanifest">
         <link rel="stylesheet" href="/static/assets/khoj.css">
         <meta property="og:image" content="https://assets.khoj.dev/khoj_hero.png">
@@ -14,7 +14,7 @@
         <div class="khoj-header"></div>
             <!-- Login Modal -->
             <div id="login-modal">
-                <img class="khoj-logo" src="/static/assets/icons/favicon-128x128.png" alt="Khoj"></img>
+                <img class="khoj-logo" src="https://assets.khoj.dev/khoj_lantern_128x128.png" alt="Khoj"></img>
                 <div class="login-modal-title">Login to Khoj</div>
                 <!-- Sign in with Magic Link -->
                 <div class="khoj-magic-link">