diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 745ca95..e2f6c67 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -67,7 +67,7 @@ jobs:
         env:
           NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${{ secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL }}
           NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
-          NEXT_PUBLIC_BASE_PATH: /lewisburg-coffee
+          BASE_PATH: /lewisburg-coffee
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
diff --git a/next.config.js b/next.config.js
index b9640e2..2a8f2d3 100644
--- a/next.config.js
+++ b/next.config.js
@@ -7,7 +7,7 @@ import "./src/env.js";
 /** @type {import("next").NextConfig} */
 const config = {
     output: "export",
-    basePath: process.env.NEXT_PUBLIC_BASE_PATH || undefined,
+    basePath: process.env.BASE_PATH || undefined,
     images: {
         unoptimized: true,
     },
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
new file mode 100644
index 0000000..e69b0e7
Binary files /dev/null and b/src/app/favicon.ico differ
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 228fd31..f28d2a5 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -10,7 +10,7 @@ import { env } from "~/env";
 export const metadata: Metadata = {
   title: "Lewisburg Coffee Map",
   description: "Interactive map of coffee shops in Lewisburg, PA",
-  icons: [{ rel: "icon", url: "/favicon.ico" }],
+  // icons are automatically handled by file conventions in src/app/
 };
 
 export const viewport: Viewport = {
diff --git a/src/app/manifest.ts b/src/app/manifest.ts
index 2923aa6..ea24af0 100644
--- a/src/app/manifest.ts
+++ b/src/app/manifest.ts
@@ -3,24 +3,20 @@ import { type MetadataRoute } from 'next';
 export const dynamic = 'force-static';
 
 export default function manifest(): MetadataRoute.Manifest {
+    const basePath = process.env.BASE_PATH ?? '';
     return {
         name: 'Lewisburg Coffee Map',
         short_name: 'Coffee Map',
         description: 'Find the best coffee in Lewisburg, PA',
-        start_url: '/',
+        start_url: `${basePath}/`,
         display: 'standalone',
         background_color: '#ffffff',
         theme_color: '#8B4513',
         icons: [
             {
-                src: '/favicon.ico',
+                src: `${basePath}/favicon.ico`,
                 sizes: 'any',
                 type: 'image/x-icon',
-            },
-            {
-                src: '/icon.svg',
-                sizes: 'any',
-                type: 'image/svg+xml',
             }
         ],
     };