diff --git a/gradesa/src/app/layout.js b/gradesa/src/app/layout.js
index 7bf98af..239de1f 100644
--- a/gradesa/src/app/layout.js
+++ b/gradesa/src/app/layout.js
@@ -5,6 +5,7 @@ import Navbar from "@/components/ui/navbar/navigation";
 import Sidebar from "@/components/ui/sidebar/sidebar";
 import { UserProvider } from "@/context/user.context";
 import { GlossaryProvider } from "@/context/glossary.context";
+import { withBasePath } from "@/shared/utils/basePath";
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -20,9 +21,9 @@ export const metadata = {
   title: "Gradesa",
   description: "Gradesa — deutsch lernen",
   icons: {
-    icon: "/favicon.ico",
-    shortcut: "/favicon.ico",
-    apple: "/favicon.ico",
+    icon: withBasePath("/favicon.ico"),
+    shortcut: withBasePath("/favicon.ico"),
+    apple: withBasePath("/favicon.ico"),
   },
 };
 
diff --git a/gradesa/src/components/ui/navbar/navigation.js b/gradesa/src/components/ui/navbar/navigation.js
index 8a3a3ab..5181b6d 100644
--- a/gradesa/src/components/ui/navbar/navigation.js
+++ b/gradesa/src/components/ui/navbar/navigation.js
@@ -5,6 +5,8 @@ import "./navbar.css";
 import { useUser } from "@/context/user.context";
 import { Column } from "../layout/container";
 import { useRouter } from "next/navigation";
+import { withBasePath } from "@/shared/utils/basePath";
+
 
 function Navbar() {
   const { auth, logout } = useUser();
@@ -17,7 +19,7 @@ function Navbar() {
           <div className="logo">
             <Link href="/">
               <Image
-                src="/logo_placeholder2.png"
+                src={withBasePath("/logo_placeholder2.png")}
                 width={50}
                 height={50}
                 alt="Logo placeholder"