diff --git a/src/app/[orgId]/settings/components/Header.tsx b/src/app/[orgId]/settings/components/Header.tsx
index 5a047214..ae595d92 100644
--- a/src/app/[orgId]/settings/components/Header.tsx
+++ b/src/app/[orgId]/settings/components/Header.tsx
@@ -175,7 +175,7 @@ export default function Header({ email, orgName, name, orgs }: HeaderProps) {
                                 <CommandEmpty>
                                     No organization found.
                                 </CommandEmpty>
-                                <CommandGroup>
+                                <CommandGroup className="[50px]">
                                     <CommandList>
                                         {orgs.map((org) => (
                                             <CommandItem
diff --git a/src/app/[orgId]/settings/components/TopbarNav.tsx b/src/app/[orgId]/settings/components/TopbarNav.tsx
index 2213bbc6..2aaa9d1b 100644
--- a/src/app/[orgId]/settings/components/TopbarNav.tsx
+++ b/src/app/[orgId]/settings/components/TopbarNav.tsx
@@ -54,7 +54,6 @@ export function TopbarNav({
                             <div className="hidden md:block">{item.icon}</div>
                         )}
                         <span className="relative z-10">{item.title}</span>
-                        <span className="absolute inset-x-0 bottom-0 border-b-2 border-transparent group-hover:border-primary"></span>
                     </div>
                 </Link>
             ))}
diff --git a/src/app/[orgId]/settings/resources/[resourceId]/layout.tsx b/src/app/[orgId]/settings/resources/[resourceId]/layout.tsx
index 39c97d1f..cdc9b208 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/layout.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/layout.tsx
@@ -85,17 +85,17 @@ export default async function ResourceLayout(props: ResourceLayoutProps) {
         {
             title: "General",
             href: `/{orgId}/settings/resources/{resourceId}/general`,
-            icon: <Settings className="w-4 h-4" />,
+            // icon: <Settings className="w-4 h-4" />,
         },
         {
             title: "Connectivity",
             href: `/{orgId}/settings/resources/{resourceId}/connectivity`,
-            icon: <Cloud className="w-4 h-4" />,
+            // icon: <Cloud className="w-4 h-4" />,
         },
         {
             title: "Authentication",
             href: `/{orgId}/settings/resources/{resourceId}/authentication`,
-            icon: <Shield className="w-4 h-4" />,
+            // icon: <Shield className="w-4 h-4" />,
         },
     ];
 
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 4a5b3994..a5ff4f6e 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,6 +1,6 @@
 import type { Metadata } from "next";
 import "./globals.css";
-import { IBM_Plex_Sans, Work_Sans } from "next/font/google";
+import { Figtree, IBM_Plex_Sans, Inter, Work_Sans } from "next/font/google";
 import { Toaster } from "@/components/ui/toaster";
 import { ThemeProvider } from "@app/providers/ThemeProvider";
 
@@ -11,9 +11,10 @@ export const metadata: Metadata = {
 
 // const font = Inter({ subsets: ["latin"] });
 // const font = Noto_Sans_Mono({ subsets: ["latin"] });
-const font = Work_Sans({ subsets: ["latin"] });
+// const font = Work_Sans({ subsets: ["latin"] });
 // const font = Space_Grotesk({subsets: ["latin"]})
 // const font = IBM_Plex_Sans({subsets: ["latin"], weight: "400"})
+const font = Figtree({ subsets: ["latin"] });
 
 export default async function RootLayout({
     children,