diff --git a/src/app/[orgId]/components/Header.tsx b/src/app/[orgId]/components/Header.tsx
index 937ec15c1aa14807b918481bcd3fe0765e55e65a..8fcdda1c90a296c9baf17ef0ad7e7f52d35d8d8c 100644
--- a/src/app/[orgId]/components/Header.tsx
+++ b/src/app/[orgId]/components/Header.tsx
@@ -39,16 +39,16 @@ export default function Header({ email, orgName, name }: HeaderProps) {
                     </Badge>
 
                     <div className="hidden md:block">
-                        <div className="flex items-center gap-4 ml-6">
+                        <div className="flex items-center gap-4 ml-4">
                             <Link
                                 href="/docs"
-                                className="text-stone-400 hover:text-stone-600"
+                                className="text-stone-500 hover:text-stone-600"
                             >
                                 Documentation
                             </Link>
                             <Link
                                 href="/support"
-                                className="text-stone-400 hover:text-stone-600"
+                                className="text-stone-500 hover:text-stone-600"
                             >
                                 Support
                             </Link>
@@ -56,7 +56,7 @@ export default function Header({ email, orgName, name }: HeaderProps) {
                     </div>
                 </div>
 
-                <div className="flex items-center gap-3">
+                <div className="flex items-center gap-4">
                     {/* Make the text truncate on smaller screens */}
                     <span className="text-lg font-medium truncate max-w-[150px] md:max-w-none">
                         {name || email}
diff --git a/src/app/[orgId]/layout.tsx b/src/app/[orgId]/layout.tsx
index 85d023c93d476ed3d46ad7628d17f672d354c079..b2941d09f89e1cf0ec31f4b660429de54a95cca1 100644
--- a/src/app/[orgId]/layout.tsx
+++ b/src/app/[orgId]/layout.tsx
@@ -1,6 +1,6 @@
 import { Metadata } from "next";
 import { TopbarNav } from "./components/TopbarNav";
-import { Cog, LayoutGrid, Tent, Users } from "lucide-react";
+import { Cog, Combine, LayoutGrid, Tent, Users, Waypoints } from "lucide-react";
 import Header from "./components/Header";
 import { verifySession } from "@app/lib/auth/verifySession";
 import { redirect } from "next/navigation";
@@ -14,12 +14,12 @@ const topNavItems = [
     {
         title: "Sites",
         href: "/{orgId}/sites",
-        icon: <Tent />,
+        icon: <Combine />,
     },
     {
         title: "Resources",
         href: "/{orgId}/resources",
-        icon: <LayoutGrid />,
+        icon: <Waypoints />,
     },
     {
         title: "Users",
@@ -50,13 +50,10 @@ export default async function ConfigurationLaytout({
 
     return (
         <>
-            <div className="w-full bg-stone-200 border-b border-stone-300 mb-6 select-none sm:px-0 px-3">
+            <div className="w-full bg-stone-200 border-b border-stone-300 mb-8 select-none sm:px-0 px-3">
                 <div className="container mx-auto flex flex-col content-between gap-4 pt-2">
-                    <Header
-                        email={user.email}
-                        orgName={params.orgId}
-                    />
-                    <TopbarNav items={topNavItems} orgId={params.orgId}/>
+                    <Header email={user.email} orgName={params.orgId} />
+                    <TopbarNav items={topNavItems} orgId={params.orgId} />
                 </div>
             </div>