diff --git a/.gitignore b/.gitignore
index 49ceb2158..cf1f0223a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 dist/
 # generated types
 .astro/
+# package lock file used for production
+package-lock.json
 
 # dependencies
 node_modules/
diff --git a/astro.config.mjs b/astro.config.mjs
index 3b574f95e..8a3fb7769 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -9,8 +9,49 @@ export default defineConfig({
   integrations: [
     starlight({
       title: "AstroNvim",
+      favicon: "/astronvim.svg",
+      head: [
+        {
+          tag: "link",
+          attrs: {
+            rel: "icon",
+            href: "https://astronvim.com/logo/astronvim.svg",
+            size: "image/svg+xml",
+          },
+        },
+        {
+          tag: "link",
+          attrs: {
+            rel: "icon",
+            href: "https://astronvim.com/logo/favicon.ico",
+            size: "any",
+          },
+        },
+        {
+          tag: "link",
+          attrs: {
+            rel: "apple-touch-icon",
+            href: "https://astronvim.com/logo/apple-touch-icon.png",
+          },
+        },
+        {
+          tag: "link",
+          attrs: {
+            rel: "manifest",
+            href: "/manifest.webmanifest",
+          },
+        },
+        {
+          tag: "script",
+          attrs: {
+            src: "https://plausible.mehalter.com/js/script.js",
+            defer: true,
+            "data-domain": "docs.astronvim.com",
+          },
+        },
+      ],
       logo: {
-        src: "./src/assets/logo/astronvim.svg",
+        src: "./src/assets/astronvim.svg",
       },
       customCss: [
         // Path to your Tailwind base styles:
diff --git a/src/assets/logo/astronvim.svg b/public/astronvim.svg
similarity index 100%
rename from src/assets/logo/astronvim.svg
rename to public/astronvim.svg
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 9c112aa3c..000000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/manifest.webmanifest b/public/manifest.webmanifest
new file mode 100644
index 000000000..f7c08fd66
--- /dev/null
+++ b/public/manifest.webmanifest
@@ -0,0 +1,14 @@
+{
+  "icons": [
+    {
+      "src": "https://astronvim.com/logo/android-chrome-192x192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "https://astronvim.com/logo/android-chrome-512x512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ]
+}
diff --git a/src/assets/astronvim.svg b/src/assets/astronvim.svg
new file mode 100644
index 000000000..a0e0de018
--- /dev/null
+++ b/src/assets/astronvim.svg
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="264.30209"
+   height="240.11871"
+   viewBox="0 0 264.30209 240.11872"
+   fill="none"
+   version="1.1"
+   id="svg954"
+   sodipodi:docname="astronvim.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview956"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="86.974134"
+     inkscape:cy="116.67262"
+     inkscape:window-width="1862"
+     inkscape:window-height="1022"
+     inkscape:window-x="24"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3"
+     showguides="false" />
+  <defs
+     id="defs952">
+    <linearGradient
+       id="paint0_linear_3_17"
+       x1="310.992"
+       y1="258.83499"
+       x2="273.04401"
+       y2="-91.588097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-3)">
+      <stop
+         stop-color="#9AC1A2"
+         id="stop932" />
+      <stop
+         offset="1"
+         stop-color="#9AC1A2"
+         stop-opacity="0.44"
+         id="stop934" />
+    </linearGradient>
+    <linearGradient
+       id="paint1_linear_3_17"
+       x1="71.091202"
+       y1="10.4229"
+       x2="207.298"
+       y2="359.69199"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-3)">
+      <stop
+         offset="0.212623"
+         stop-color="#3FCFFD"
+         id="stop937" />
+      <stop
+         offset="0.753514"
+         stop-color="#3FCFFD"
+         stop-opacity="0.34"
+         id="stop939" />
+    </linearGradient>
+    <linearGradient
+       id="paint2_linear_3_17"
+       x1="202.65601"
+       y1="118.821"
+       x2="1.9477"
+       y2="68.295898"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-3)">
+      <stop
+         offset="0.0832317"
+         stop-color="#86CB95"
+         id="stop942" />
+      <stop
+         offset="1"
+         stop-color="#86CB95"
+         stop-opacity="0.53"
+         id="stop944" />
+    </linearGradient>
+    <linearGradient
+       id="paint3_linear_3_17"
+       x1="192"
+       y1="270"
+       x2="269"
+       y2="-67"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-3)">
+      <stop
+         stop-color="#B1DEBB"
+         id="stop947" />
+      <stop
+         offset="1"
+         stop-color="#B1DEBB"
+         stop-opacity="0.6"
+         id="stop949" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="N Left"
+     transform="translate(0,-5.9396821)"
+     style="display:inline">
+    <path
+       d="M 173.36719,246 110.176,98.4445 148,246 Z"
+       fill="url(#paint0_linear_3_17)"
+       id="path914"
+       style="fill:url(#paint0_linear_3_17)"
+       sodipodi:nodetypes="cccc" />
+    <path
+       d="M 70.5855,6 20.7107,175.581 0,246 H 70.5855 L 77.62,219.782 95.4596,153.292 110.176,98.4445 Z"
+       fill="url(#paint2_linear_3_17)"
+       id="path920"
+       style="fill:url(#paint2_linear_3_17)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="A Left"
+     style="display:inline">
+    <path
+       d="M 134.97852,6 0,246 70.5855,6 Z"
+       fill="#66d3f4"
+       fill-opacity="0.89"
+       id="path924"
+       sodipodi:nodetypes="cccc"
+       transform="translate(0,-5.9396821)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="A Cross"
+     style="display:inline">
+    <path
+       d="M 210.39858,180.00686 0,246 22.629842,169.06495 185.5474,122.66694 259.82483,101.52137 Z"
+       fill="#69dafd"
+       fill-opacity="0.82"
+       id="path928"
+       sodipodi:nodetypes="cccccc"
+       transform="translate(0,-5.9396821)"
+       style="display:inline;fill:#69dafd;fill-opacity:0.94902" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="A Right"
+     style="display:inline">
+    <path
+       id="path916"
+       style="opacity:1;fill:url(#paint1_linear_3_17)"
+       d="M 70.585938,6 110.17578,98.445312 129.33984,143.18945 151.45898,194.8418 173.36719,246 H 239 L 208.47852,175.58008 186.99023,126 134.97852,6 Z"
+       transform="translate(0,-5.9396821)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="N Right"
+     style="display:inline"
+     transform="translate(0,-5.9396821)">
+    <path
+       d="M 207.52004,5.9573993 148,246 209.06414,246.0584 264.30208,5.9396821 Z"
+       fill="url(#paint3_linear_3_17)"
+       id="path930"
+       sodipodi:nodetypes="ccccc"
+       style="fill:url(#paint3_linear_3_17)" />
+  </g>
+</svg>
diff --git a/src/assets/logo/android-chrome-192x192.png b/src/assets/logo/android-chrome-192x192.png
deleted file mode 100644
index 86cbb41f4..000000000
Binary files a/src/assets/logo/android-chrome-192x192.png and /dev/null differ
diff --git a/src/assets/logo/android-chrome-512x512.png b/src/assets/logo/android-chrome-512x512.png
deleted file mode 100644
index 24ef037d7..000000000
Binary files a/src/assets/logo/android-chrome-512x512.png and /dev/null differ
diff --git a/src/assets/logo/apple-touch-icon.png b/src/assets/logo/apple-touch-icon.png
deleted file mode 100644
index 2572b0411..000000000
Binary files a/src/assets/logo/apple-touch-icon.png and /dev/null differ
diff --git a/src/assets/logo/astronvim.png b/src/assets/logo/astronvim.png
deleted file mode 100644
index d77bde821..000000000
Binary files a/src/assets/logo/astronvim.png and /dev/null differ
diff --git a/src/assets/logo/astronvim_cool.png b/src/assets/logo/astronvim_cool.png
deleted file mode 100644
index dae46d99d..000000000
Binary files a/src/assets/logo/astronvim_cool.png and /dev/null differ
diff --git a/src/assets/logo/astronvim_square.png b/src/assets/logo/astronvim_square.png
deleted file mode 100644
index 1e24d532b..000000000
Binary files a/src/assets/logo/astronvim_square.png and /dev/null differ
diff --git a/src/assets/logo/banner.fig b/src/assets/logo/banner.fig
deleted file mode 100644
index ec9602c30..000000000
Binary files a/src/assets/logo/banner.fig and /dev/null differ
diff --git a/src/assets/logo/banner.png b/src/assets/logo/banner.png
deleted file mode 100644
index f942f096b..000000000
Binary files a/src/assets/logo/banner.png and /dev/null differ
diff --git a/src/assets/logo/favicon-16x16.png b/src/assets/logo/favicon-16x16.png
deleted file mode 100644
index 3cf8a8f75..000000000
Binary files a/src/assets/logo/favicon-16x16.png and /dev/null differ
diff --git a/src/assets/logo/favicon-32x32.png b/src/assets/logo/favicon-32x32.png
deleted file mode 100644
index c4dff8366..000000000
Binary files a/src/assets/logo/favicon-32x32.png and /dev/null differ