diff --git a/apps/desktop/src/components/chat/body/empty.tsx b/apps/desktop/src/components/chat/body/empty.tsx
index a5080dd17c..e593fda095 100644
--- a/apps/desktop/src/components/chat/body/empty.tsx
+++ b/apps/desktop/src/components/chat/body/empty.tsx
@@ -13,7 +13,7 @@ export function ChatBodyEmpty({
   const openNew = useTabs((state) => state.openNew);
 
   const handleGoToSettings = useCallback(() => {
-    openNew({ type: "settings", state: { tab: "intelligence" } });
+    openNew({ type: "ai", state: { tab: "intelligence" } });
   }, [openNew]);
 
   const handleOpenChatShortcuts = useCallback(() => {
diff --git a/apps/desktop/src/components/main-app-layout.tsx b/apps/desktop/src/components/main-app-layout.tsx
index d60d3de864..cc1a8ee13a 100644
--- a/apps/desktop/src/components/main-app-layout.tsx
+++ b/apps/desktop/src/components/main-app-layout.tsx
@@ -41,19 +41,20 @@ const useNavigationEvents = () => {
       .navigate(webview)
       .listen(({ payload }) => {
         if (payload.path === "/app/settings") {
-          const tab = (payload.search?.tab as string) ?? "general";
-          openNew({
-            type: "settings",
-            state: {
-              tab: tab as
-                | "general"
-                | "calendar"
-                | "notifications"
-                | "transcription"
-                | "intelligence"
-                | "account",
-            },
-          });
+          let tab = (payload.search?.tab as string) ?? "general";
+          if (tab === "notifications" || tab === "account") {
+            tab = "general";
+          }
+          if (tab === "calendar") {
+            openNew({ type: "calendar" });
+          } else if (tab === "transcription" || tab === "intelligence") {
+            openNew({
+              type: "ai",
+              state: { tab: tab as "transcription" | "intelligence" },
+            });
+          } else {
+            openNew({ type: "settings" });
+          }
         } else {
           navigate({ to: payload.path, search: payload.search ?? undefined });
         }
diff --git a/apps/desktop/src/components/main/body/ai.tsx b/apps/desktop/src/components/main/body/ai.tsx
new file mode 100644
index 0000000000..f46ad61d22
--- /dev/null
+++ b/apps/desktop/src/components/main/body/ai.tsx
@@ -0,0 +1,94 @@
+import { AudioLinesIcon, SparklesIcon } from "lucide-react";
+import { useCallback } from "react";
+
+import { Button } from "@hypr/ui/components/ui/button";
+import { cn } from "@hypr/utils";
+
+import { type Tab, useTabs } from "../../../store/zustand/tabs";
+import { LLM } from "../../settings/ai/llm";
+import { STT } from "../../settings/ai/stt";
+import { StandardTabWrapper } from "./index";
+import { type TabItem, TabItemBase } from "./shared";
+
+type AITabKey = "transcription" | "intelligence";
+
+export const TabItemAI: TabItem<Extract<Tab, { type: "ai" }>> = ({
+  tab,
+  tabIndex,
+  handleCloseThis,
+  handleSelectThis,
+  handleCloseOthers,
+  handleCloseAll,
+}) => {
+  return (
+    <TabItemBase
+      icon={<SparklesIcon className="w-4 h-4" />}
+      title={"AI"}
+      selected={tab.active}
+      tabIndex={tabIndex}
+      handleCloseThis={() => handleCloseThis(tab)}
+      handleSelectThis={() => handleSelectThis(tab)}
+      handleCloseOthers={handleCloseOthers}
+      handleCloseAll={handleCloseAll}
+    />
+  );
+};
+
+export function TabContentAI({ tab }: { tab: Extract<Tab, { type: "ai" }> }) {
+  return (
+    <StandardTabWrapper>
+      <AIView tab={tab} />
+    </StandardTabWrapper>
+  );
+}
+
+function AIView({ tab }: { tab: Extract<Tab, { type: "ai" }> }) {
+  const updateAiTabState = useTabs((state) => state.updateAiTabState);
+  const activeTab = tab.state.tab;
+
+  const setActiveTab = useCallback(
+    (newTab: AITabKey) => {
+      updateAiTabState(tab, { tab: newTab });
+    },
+    [updateAiTabState, tab],
+  );
+
+  const headerAction = (
+    <div className="flex gap-1">
+      <Button
+        variant="ghost"
+        size="sm"
+        onClick={() => setActiveTab("transcription")}
+        className={cn([
+          "gap-1.5 h-7 px-2",
+          activeTab === "transcription" && "bg-neutral-200",
+        ])}
+      >
+        <AudioLinesIcon size={14} />
+        <span className="text-xs">Transcription</span>
+      </Button>
+      <Button
+        variant="ghost"
+        size="sm"
+        onClick={() => setActiveTab("intelligence")}
+        className={cn([
+          "gap-1.5 h-7 px-2",
+          activeTab === "intelligence" && "bg-neutral-200",
+        ])}
+      >
+        <SparklesIcon size={14} />
+        <span className="text-xs">Intelligence</span>
+      </Button>
+    </div>
+  );
+
+  return (
+    <div className="flex-1 w-full overflow-y-auto scrollbar-hide p-6">
+      {activeTab === "transcription" ? (
+        <STT headerAction={headerAction} />
+      ) : (
+        <LLM headerAction={headerAction} />
+      )}
+    </div>
+  );
+}
diff --git a/apps/desktop/src/components/main/body/calendar/index.tsx b/apps/desktop/src/components/main/body/calendar/index.tsx
new file mode 100644
index 0000000000..67efa70b89
--- /dev/null
+++ b/apps/desktop/src/components/main/body/calendar/index.tsx
@@ -0,0 +1,38 @@
+import { CalendarDays } from "lucide-react";
+
+import { type Tab } from "../../../../store/zustand/tabs";
+import { SettingsCalendar } from "../../../settings/calendar";
+import { StandardTabWrapper } from "../index";
+import { type TabItem, TabItemBase } from "../shared";
+
+export const TabItemCalendar: TabItem<Extract<Tab, { type: "calendar" }>> = ({
+  tab,
+  tabIndex,
+  handleCloseThis,
+  handleSelectThis,
+  handleCloseOthers,
+  handleCloseAll,
+}) => {
+  return (
+    <TabItemBase
+      icon={<CalendarDays className="w-4 h-4" />}
+      title={"Calendar"}
+      selected={tab.active}
+      tabIndex={tabIndex}
+      handleCloseThis={() => handleCloseThis(tab)}
+      handleSelectThis={() => handleSelectThis(tab)}
+      handleCloseOthers={handleCloseOthers}
+      handleCloseAll={handleCloseAll}
+    />
+  );
+};
+
+export function TabContentCalendar() {
+  return (
+    <StandardTabWrapper>
+      <div className="flex-1 w-full overflow-y-auto scrollbar-hide p-6">
+        <SettingsCalendar />
+      </div>
+    </StandardTabWrapper>
+  );
+}
diff --git a/apps/desktop/src/components/main/body/index.tsx b/apps/desktop/src/components/main/body/index.tsx
index 96e4495a12..2fd930c330 100644
--- a/apps/desktop/src/components/main/body/index.tsx
+++ b/apps/desktop/src/components/main/body/index.tsx
@@ -22,6 +22,8 @@ import {
 import { ChatFloatingButton } from "../../chat";
 import { TrafficLights } from "../../window/traffic-lights";
 import { useNewNote } from "../shared";
+import { TabContentAI, TabItemAI } from "./ai";
+import { TabContentCalendar, TabItemCalendar } from "./calendar";
 import { TabContentChatShortcut, TabItemChatShortcut } from "./chat-shortcuts";
 import { TabContentContact, TabItemContact } from "./contacts";
 import { TabContentEmpty, TabItemEmpty } from "./empty";
@@ -326,6 +328,18 @@ function TabItem({
       />
     );
   }
+  if (tab.type === "calendar") {
+    return (
+      <TabItemCalendar
+        tab={tab}
+        tabIndex={tabIndex}
+        handleCloseThis={handleClose}
+        handleSelectThis={handleSelect}
+        handleCloseOthers={handleCloseOthers}
+        handleCloseAll={handleCloseAll}
+      />
+    );
+  }
   if (tab.type === "extension") {
     return (
       <TabItemExtension
@@ -362,6 +376,18 @@ function TabItem({
       />
     );
   }
+  if (tab.type === "ai") {
+    return (
+      <TabItemAI
+        tab={tab}
+        tabIndex={tabIndex}
+        handleCloseThis={handleClose}
+        handleSelectThis={handleSelect}
+        handleCloseOthers={handleCloseOthers}
+        handleCloseAll={handleCloseAll}
+      />
+    );
+  }
 
   return null;
 }
@@ -394,6 +420,9 @@ function ContentWrapper({ tab }: { tab: Tab }) {
   if (tab.type === "empty") {
     return <TabContentEmpty tab={tab} />;
   }
+  if (tab.type === "calendar") {
+    return <TabContentCalendar />;
+  }
   if (tab.type === "extension") {
     return <TabContentExtension tab={tab} />;
   }
@@ -403,6 +432,9 @@ function ContentWrapper({ tab }: { tab: Tab }) {
   if (tab.type === "settings") {
     return <TabContentSettings tab={tab} />;
   }
+  if (tab.type === "ai") {
+    return <TabContentAI tab={tab} />;
+  }
 
   return null;
 }
diff --git a/apps/desktop/src/components/main/body/sessions/floating/listen.tsx b/apps/desktop/src/components/main/body/sessions/floating/listen.tsx
index 900368bbb5..873bd6e33e 100644
--- a/apps/desktop/src/components/main/body/sessions/floating/listen.tsx
+++ b/apps/desktop/src/components/main/body/sessions/floating/listen.tsx
@@ -125,7 +125,7 @@ function ListenSplitButton({
 
   const handleAction = useCallback(() => {
     onPrimaryClick();
-    openNew({ type: "settings", state: { tab: "transcription" } });
+    openNew({ type: "ai", state: { tab: "transcription" } });
   }, [onPrimaryClick, openNew]);
 
   return (
diff --git a/apps/desktop/src/components/main/body/sessions/note-input/enhanced/config-error.tsx b/apps/desktop/src/components/main/body/sessions/note-input/enhanced/config-error.tsx
index 339fdc5ef3..9d29b043a2 100644
--- a/apps/desktop/src/components/main/body/sessions/note-input/enhanced/config-error.tsx
+++ b/apps/desktop/src/components/main/body/sessions/note-input/enhanced/config-error.tsx
@@ -9,7 +9,7 @@ export function ConfigError({ status }: { status: LLMConnectionStatus }) {
   const openNew = useTabs((state) => state.openNew);
 
   const handleConfigureClick = () => {
-    openNew({ type: "settings", state: { tab: "intelligence" } });
+    openNew({ type: "ai", state: { tab: "intelligence" } });
   };
 
   const message = getMessageForStatus(status);
diff --git a/apps/desktop/src/components/main/body/sessions/outer-header/listen.tsx b/apps/desktop/src/components/main/body/sessions/outer-header/listen.tsx
index 70e6563f95..7a1a77a5c1 100644
--- a/apps/desktop/src/components/main/body/sessions/outer-header/listen.tsx
+++ b/apps/desktop/src/components/main/body/sessions/outer-header/listen.tsx
@@ -174,7 +174,7 @@ function StartButton({ sessionId }: { sessionId: string }) {
   const openNew = useTabs((state) => state.openNew);
 
   const handleConfigureAction = useCallback(() => {
-    openNew({ type: "settings", state: { tab: "transcription" } });
+    openNew({ type: "ai", state: { tab: "transcription" } });
   }, [openNew]);
 
   const button = (
diff --git a/apps/desktop/src/components/main/body/settings.tsx b/apps/desktop/src/components/main/body/settings.tsx
new file mode 100644
index 0000000000..4001b7bb2b
--- /dev/null
+++ b/apps/desktop/src/components/main/body/settings.tsx
@@ -0,0 +1,42 @@
+import { SettingsIcon } from "lucide-react";
+
+import { type Tab } from "../../../store/zustand/tabs";
+import { SettingsGeneral } from "../../settings/general";
+import { StandardTabWrapper } from "./index";
+import { type TabItem, TabItemBase } from "./shared";
+
+export const TabItemSettings: TabItem<Extract<Tab, { type: "settings" }>> = ({
+  tab,
+  tabIndex,
+  handleCloseThis,
+  handleSelectThis,
+  handleCloseOthers,
+  handleCloseAll,
+}) => {
+  return (
+    <TabItemBase
+      icon={<SettingsIcon className="w-4 h-4" />}
+      title={"Settings"}
+      selected={tab.active}
+      tabIndex={tabIndex}
+      handleCloseThis={() => handleCloseThis(tab)}
+      handleSelectThis={() => handleSelectThis(tab)}
+      handleCloseOthers={handleCloseOthers}
+      handleCloseAll={handleCloseAll}
+    />
+  );
+};
+
+export function TabContentSettings({
+  tab: _tab,
+}: {
+  tab: Extract<Tab, { type: "settings" }>;
+}) {
+  return (
+    <StandardTabWrapper>
+      <div className="flex-1 w-full overflow-y-auto scrollbar-hide p-6">
+        <SettingsGeneral />
+      </div>
+    </StandardTabWrapper>
+  );
+}
diff --git a/apps/desktop/src/components/main/body/settings/index.tsx b/apps/desktop/src/components/main/body/settings/index.tsx
deleted file mode 100644
index 908692a571..0000000000
--- a/apps/desktop/src/components/main/body/settings/index.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-import { openUrl } from "@tauri-apps/plugin-opener";
-import {
-  AudioLines,
-  Bell,
-  CalendarDays,
-  type LucideIcon,
-  MessageCircleQuestion,
-  Settings2,
-  SettingsIcon,
-  Sparkles,
-  UserIcon,
-} from "lucide-react";
-import { useCallback } from "react";
-
-import { Button } from "@hypr/ui/components/ui/button";
-import { cn } from "@hypr/utils";
-
-import { type Tab, useTabs } from "../../../../store/zustand/tabs";
-import { SettingsAccount } from "../../../settings/account";
-import { LLM } from "../../../settings/ai/llm";
-import { STT } from "../../../settings/ai/stt";
-import { SettingsCalendar } from "../../../settings/calendar";
-import { SettingsGeneral } from "../../../settings/general";
-import { SettingsNotifications } from "../../../settings/notification";
-import { StandardTabWrapper } from "../index";
-import { type TabItem, TabItemBase } from "../shared";
-
-type SettingsTabKey =
-  | "general"
-  | "calendar"
-  | "notifications"
-  | "transcription"
-  | "intelligence"
-  | "account";
-
-const TAB_CONFIG: Record<
-  SettingsTabKey,
-  {
-    label: string;
-    icon: LucideIcon;
-    group: 1 | 2;
-  }
-> = {
-  general: {
-    label: "General",
-    icon: Settings2,
-    group: 1,
-  },
-  calendar: {
-    label: "Calendar",
-    icon: CalendarDays,
-    group: 1,
-  },
-  notifications: {
-    label: "Notifications",
-    icon: Bell,
-    group: 1,
-  },
-  transcription: {
-    label: "Transcription",
-    icon: AudioLines,
-    group: 1,
-  },
-  intelligence: {
-    label: "Intelligence",
-    icon: Sparkles,
-    group: 1,
-  },
-  account: {
-    label: "Account",
-    icon: UserIcon,
-    group: 2,
-  },
-};
-
-const TAB_KEYS: SettingsTabKey[] = [
-  "general",
-  "calendar",
-  "notifications",
-  "transcription",
-  "intelligence",
-  "account",
-];
-
-export const TabItemSettings: TabItem<Extract<Tab, { type: "settings" }>> = ({
-  tab,
-  tabIndex,
-  handleCloseThis,
-  handleSelectThis,
-  handleCloseOthers,
-  handleCloseAll,
-}) => {
-  return (
-    <TabItemBase
-      icon={<SettingsIcon className="w-4 h-4" />}
-      title={"Settings"}
-      selected={tab.active}
-      tabIndex={tabIndex}
-      handleCloseThis={() => handleCloseThis(tab)}
-      handleSelectThis={() => handleSelectThis(tab)}
-      handleCloseOthers={handleCloseOthers}
-      handleCloseAll={handleCloseAll}
-    />
-  );
-};
-
-export function TabContentSettings({
-  tab,
-}: {
-  tab: Extract<Tab, { type: "settings" }>;
-}) {
-  return (
-    <StandardTabWrapper>
-      <SettingsView tab={tab} />
-    </StandardTabWrapper>
-  );
-}
-
-function SettingsView({ tab }: { tab: Extract<Tab, { type: "settings" }> }) {
-  const updateSettingsTabState = useTabs(
-    (state) => state.updateSettingsTabState,
-  );
-
-  const activeTab = tab.state.tab;
-
-  const setActiveTab = useCallback(
-    (newTab: SettingsTabKey) => {
-      updateSettingsTabState(tab, { tab: newTab });
-    },
-    [updateSettingsTabState, tab],
-  );
-
-  const group1Tabs = TAB_KEYS.filter((t) => TAB_CONFIG[t].group === 1);
-  const group2Tabs = TAB_KEYS.filter((t) => TAB_CONFIG[t].group === 2);
-
-  return (
-    <div className={cn(["flex h-full p-1 gap-1"])}>
-      <aside className="w-52 flex flex-col justify-between overflow-hidden gap-1">
-        <Group
-          tabs={group1Tabs}
-          activeTab={activeTab}
-          setActiveTab={setActiveTab}
-          expandHeight={true}
-        />
-        <Group tabs={["feedback", "developers"]} activeTab={activeTab} />
-        <Group
-          tabs={group2Tabs}
-          activeTab={activeTab}
-          setActiveTab={setActiveTab}
-        />
-      </aside>
-
-      <div className="flex-1 flex flex-col gap-1 h-full w-full overflow-hidden bg-white">
-        <Header activeTab={activeTab} />
-        <div className="flex-1 w-full overflow-y-auto scrollbar-hide p-6 border border-neutral-200 rounded-xl">
-          <SettingsContent activeTab={activeTab} />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function Group({
-  tabs,
-  activeTab,
-  setActiveTab,
-  expandHeight = false,
-}: {
-  tabs: (SettingsTabKey | "feedback" | "developers")[];
-  activeTab: SettingsTabKey;
-  setActiveTab?: (tab: SettingsTabKey) => void;
-  expandHeight?: boolean;
-}) {
-  const handleTabClick = async (
-    tab: SettingsTabKey | "feedback" | "developers",
-  ) => {
-    if (tab === "feedback") {
-      await openUrl("https://github.com/fastrepl/hyprnote/discussions");
-    } else if (tab === "developers") {
-      await openUrl("https://cal.com/team/hyprnote/welcome");
-    } else if (setActiveTab) {
-      setActiveTab(tab);
-    }
-  };
-
-  const getTabInfo = (tab: SettingsTabKey | "feedback" | "developers") => {
-    if (tab === "feedback") {
-      return { label: "Feedback", icon: MessageCircleQuestion };
-    }
-    if (tab === "developers") {
-      return { label: "Talk to developers", icon: Settings2 };
-    }
-    return TAB_CONFIG[tab];
-  };
-
-  return (
-    <div
-      className={cn([
-        "rounded-xl bg-neutral-50 py-1",
-        expandHeight && "flex-1",
-      ])}
-    >
-      {tabs.map((tab) => {
-        const tabInfo = getTabInfo(tab);
-        const Icon = tabInfo.icon;
-        const isActive =
-          tab !== "feedback" && tab !== "developers" && activeTab === tab;
-
-        return (
-          <div key={tab} className="px-1">
-            <Button
-              variant="ghost"
-              className={cn([
-                "w-full justify-start",
-                "font-normal",
-                isActive
-                  ? "bg-neutral-200 hover:bg-neutral-200"
-                  : "hover:bg-neutral-100",
-              ])}
-              onClick={() => handleTabClick(tab)}
-            >
-              <Icon size={16} className="shrink-0" />
-              {tabInfo.label}
-            </Button>
-          </div>
-        );
-      })}
-    </div>
-  );
-}
-
-function Header({ activeTab }: { activeTab: SettingsTabKey }) {
-  return (
-    <header className="h-9 w-full bg-neutral-50 rounded-xl flex items-center justify-center relative">
-      <h1 className="font-semibold capitalize select-none cursor-default">
-        {TAB_CONFIG[activeTab].label}
-      </h1>
-    </header>
-  );
-}
-
-function SettingsContent({ activeTab }: { activeTab: SettingsTabKey }) {
-  switch (activeTab) {
-    case "general":
-      return <SettingsGeneral />;
-    case "calendar":
-      return <SettingsCalendar />;
-    case "transcription":
-      return <STT />;
-    case "intelligence":
-      return <LLM />;
-    case "notifications":
-      return <SettingsNotifications />;
-    case "account":
-      return <SettingsAccount />;
-    default:
-      return null;
-  }
-}
diff --git a/apps/desktop/src/components/main/sidebar/banner/index.tsx b/apps/desktop/src/components/main/sidebar/banner/index.tsx
index 109ea4bf05..9379712d02 100644
--- a/apps/desktop/src/components/main/sidebar/banner/index.tsx
+++ b/apps/desktop/src/components/main/sidebar/banner/index.tsx
@@ -35,20 +35,20 @@ export function BannerArea({
     await auth?.signIn();
   }, [auth]);
 
-  const openSettingsTab = useCallback(
+  const openAiTab = useCallback(
     (tab: "intelligence" | "transcription") => {
-      openNew({ type: "settings", state: { tab } });
+      openNew({ type: "ai", state: { tab } });
     },
     [openNew],
   );
 
   const handleOpenLLMSettings = useCallback(() => {
-    openSettingsTab("intelligence");
-  }, [openSettingsTab]);
+    openAiTab("intelligence");
+  }, [openAiTab]);
 
   const handleOpenSTTSettings = useCallback(() => {
-    openSettingsTab("transcription");
-  }, [openSettingsTab]);
+    openAiTab("transcription");
+  }, [openAiTab]);
 
   const registry = useMemo(
     () =>
diff --git a/apps/desktop/src/components/main/sidebar/profile/auth.tsx b/apps/desktop/src/components/main/sidebar/profile/auth.tsx
index 7bb9dfd7a7..7e4bae30dd 100644
--- a/apps/desktop/src/components/main/sidebar/profile/auth.tsx
+++ b/apps/desktop/src/components/main/sidebar/profile/auth.tsx
@@ -8,8 +8,8 @@ import { useTabs } from "../../../../store/zustand/tabs";
 export function AuthSection({ isAuthenticated }: { isAuthenticated: boolean }) {
   const openNew = useTabs((state) => state.openNew);
 
-  const handleOpenAccount = useCallback(() => {
-    openNew({ type: "settings", state: { tab: "account" } });
+  const handleOpenSettings = useCallback(() => {
+    openNew({ type: "settings" });
   }, [openNew]);
 
   if (isAuthenticated) {
@@ -18,7 +18,7 @@ export function AuthSection({ isAuthenticated }: { isAuthenticated: boolean }) {
 
   return (
     <div className="p-1 pt-2">
-      <Button onClick={handleOpenAccount} variant="default" className="w-full">
+      <Button onClick={handleOpenSettings} variant="default" className="w-full">
         <LogIn size={16} />
         Sign in
       </Button>
diff --git a/apps/desktop/src/components/main/sidebar/profile/index.tsx b/apps/desktop/src/components/main/sidebar/profile/index.tsx
index e97aa06c3b..343b3e5b16 100644
--- a/apps/desktop/src/components/main/sidebar/profile/index.tsx
+++ b/apps/desktop/src/components/main/sidebar/profile/index.tsx
@@ -113,7 +113,7 @@ export function ProfileSection({ onExpandChange }: ProfileSectionProps = {}) {
   }, [openNew, closeMenu]);
 
   const handleClickCalendar = useCallback(() => {
-    openNew({ type: "extension", extensionId: "calendar" });
+    openNew({ type: "calendar" });
     closeMenu();
   }, [openNew, closeMenu]);
 
diff --git a/apps/desktop/src/components/settings/ai/llm/index.tsx b/apps/desktop/src/components/settings/ai/llm/index.tsx
index 7b166c3d82..0b57a226ed 100644
--- a/apps/desktop/src/components/settings/ai/llm/index.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/index.tsx
@@ -2,11 +2,11 @@ import { ConfigureProviders } from "./configure";
 import { HealthCheckForAvailability } from "./health";
 import { SelectProviderAndModel } from "./select";
 
-export function LLM() {
+export function LLM({ headerAction }: { headerAction?: React.ReactNode } = {}) {
   return (
     <div className="space-y-6">
       <HealthCheckForAvailability />
-      <SelectProviderAndModel />
+      <SelectProviderAndModel headerAction={headerAction} />
       <ConfigureProviders />
     </div>
   );
diff --git a/apps/desktop/src/components/settings/ai/llm/select.tsx b/apps/desktop/src/components/settings/ai/llm/select.tsx
index 8da966212f..930d2e60b1 100644
--- a/apps/desktop/src/components/settings/ai/llm/select.tsx
+++ b/apps/desktop/src/components/settings/ai/llm/select.tsx
@@ -29,7 +29,9 @@ import { ModelCombobox } from "../shared/model-combobox";
 import { HealthCheckForConnection } from "./health";
 import { PROVIDERS } from "./shared";
 
-export function SelectProviderAndModel() {
+export function SelectProviderAndModel({
+  headerAction,
+}: { headerAction?: React.ReactNode } = {}) {
   const configuredProviders = useConfiguredMapping();
 
   const { current_llm_model, current_llm_provider } = useConfigValues([
@@ -76,7 +78,10 @@ export function SelectProviderAndModel() {
 
   return (
     <div className="flex flex-col gap-3">
-      <h3 className="text-md font-semibold">Model being used</h3>
+      <div className="flex items-center justify-between">
+        <h3 className="text-md font-semibold">Model being used</h3>
+        {headerAction}
+      </div>
       <div
         className={cn([
           "flex flex-col gap-4",
diff --git a/apps/desktop/src/components/settings/ai/stt/index.tsx b/apps/desktop/src/components/settings/ai/stt/index.tsx
index 837e8e2ac2..c8bca034b5 100644
--- a/apps/desktop/src/components/settings/ai/stt/index.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/index.tsx
@@ -2,11 +2,11 @@ import { ConfigureProviders } from "./configure";
 import { HealthCheckForAvailability } from "./health";
 import { SelectProviderAndModel } from "./select";
 
-export function STT() {
+export function STT({ headerAction }: { headerAction?: React.ReactNode } = {}) {
   return (
     <div className="space-y-6">
       <HealthCheckForAvailability />
-      <SelectProviderAndModel />
+      <SelectProviderAndModel headerAction={headerAction} />
       <ConfigureProviders />
     </div>
   );
diff --git a/apps/desktop/src/components/settings/ai/stt/select.tsx b/apps/desktop/src/components/settings/ai/stt/select.tsx
index c8cdbc1153..8b64f320af 100644
--- a/apps/desktop/src/components/settings/ai/stt/select.tsx
+++ b/apps/desktop/src/components/settings/ai/stt/select.tsx
@@ -25,7 +25,9 @@ import {
   sttModelQueries,
 } from "./shared";
 
-export function SelectProviderAndModel() {
+export function SelectProviderAndModel({
+  headerAction,
+}: { headerAction?: React.ReactNode } = {}) {
   const { current_stt_provider, current_stt_model } = useConfigValues([
     "current_stt_provider",
     "current_stt_model",
@@ -72,7 +74,10 @@ export function SelectProviderAndModel() {
 
   return (
     <div className="flex flex-col gap-3">
-      <h3 className="text-md font-semibold">Model being used</h3>
+      <div className="flex items-center justify-between">
+        <h3 className="text-md font-semibold">Model being used</h3>
+        {headerAction}
+      </div>
       <div
         className={cn([
           "flex flex-col gap-4",
diff --git a/apps/desktop/src/components/settings/account.tsx b/apps/desktop/src/components/settings/general/account.tsx
similarity index 97%
rename from apps/desktop/src/components/settings/account.tsx
rename to apps/desktop/src/components/settings/general/account.tsx
index bfb26f966f..b3ab91f792 100644
--- a/apps/desktop/src/components/settings/account.tsx
+++ b/apps/desktop/src/components/settings/general/account.tsx
@@ -8,13 +8,13 @@ import { createClient } from "@hypr/api-client/client";
 import { Button } from "@hypr/ui/components/ui/button";
 import { Input } from "@hypr/ui/components/ui/input";
 
-import { useAuth } from "../../auth";
-import { useBillingAccess } from "../../billing";
-import { env } from "../../env";
+import { useAuth } from "../../../auth";
+import { useBillingAccess } from "../../../billing";
+import { env } from "../../../env";
 
 const WEB_APP_BASE_URL = env.VITE_APP_URL ?? "http://localhost:3000";
 
-export function SettingsAccount() {
+export function AccountSettings() {
   const auth = useAuth();
   const { isPro } = useBillingAccess();
 
diff --git a/apps/desktop/src/components/settings/general/index.tsx b/apps/desktop/src/components/settings/general/index.tsx
index fc83d7c559..6b3070d453 100644
--- a/apps/desktop/src/components/settings/general/index.tsx
+++ b/apps/desktop/src/components/settings/general/index.tsx
@@ -6,8 +6,10 @@ import type { General, GeneralStorage } from "@hypr/store";
 
 import { useConfigValues } from "../../../config/use-config";
 import * as main from "../../../store/tinybase/main";
+import { AccountSettings } from "./account";
 import { AppSettingsView } from "./app-settings";
 import { MainLanguageView } from "./main-language";
+import { NotificationSettingsView } from "./notification";
 import { Permissions } from "./permissions";
 import { SpokenLanguagesView } from "./spoken-languages";
 
@@ -147,7 +149,17 @@ export function SettingsGeneral() {
         </div>
       </div>
 
+      <div>
+        <h2 className="font-semibold mb-4">Notifications</h2>
+        <NotificationSettingsView />
+      </div>
+
       <Permissions />
+
+      <div>
+        <h2 className="font-semibold mb-4">Account & Billing</h2>
+        <AccountSettings />
+      </div>
     </div>
   );
 }
diff --git a/apps/desktop/src/components/settings/notification.tsx b/apps/desktop/src/components/settings/general/notification.tsx
similarity index 97%
rename from apps/desktop/src/components/settings/notification.tsx
rename to apps/desktop/src/components/settings/general/notification.tsx
index 7f6170ee89..a3f0dbec75 100644
--- a/apps/desktop/src/components/settings/notification.tsx
+++ b/apps/desktop/src/components/settings/general/notification.tsx
@@ -14,10 +14,10 @@ import { Button } from "@hypr/ui/components/ui/button";
 import { Switch } from "@hypr/ui/components/ui/switch";
 import { cn } from "@hypr/utils";
 
-import { useConfigValues } from "../../config/use-config";
-import * as main from "../../store/tinybase/main";
+import { useConfigValues } from "../../../config/use-config";
+import * as main from "../../../store/tinybase/main";
 
-export function SettingsNotifications() {
+export function NotificationSettingsView() {
   const [inputValue, setInputValue] = useState("");
   const [showDropdown, setShowDropdown] = useState(false);
   const [selectedIndex, setSelectedIndex] = useState(0);
@@ -143,7 +143,6 @@ export function SettingsNotifications() {
 
   const installedApps = allInstalledApps?.map((app) => app.name) ?? [];
 
-  // Filter apps based on input, excluding already added and default ignored
   const filteredApps = installedApps.filter((app) => {
     const matchesSearch = app.toLowerCase().includes(inputValue.toLowerCase());
     const notAlreadyAdded = !ignoredPlatforms.includes(app);
@@ -151,7 +150,6 @@ export function SettingsNotifications() {
     return matchesSearch && notAlreadyAdded && notDefaultIgnored;
   });
 
-  // Show custom option if input doesn't match any apps
   const showCustomOption =
     inputValue.trim() &&
     !filteredApps.some((app) => app.toLowerCase() === inputValue.toLowerCase());
@@ -205,7 +203,6 @@ export function SettingsNotifications() {
       !inputValue &&
       ignoredPlatforms.length > 0
     ) {
-      // Remove last chip when backspace is pressed on empty input
       const lastApp = ignoredPlatforms[ignoredPlatforms.length - 1];
       if (!isDefaultIgnored(lastApp)) {
         handleRemoveIgnoredApp(lastApp);
@@ -219,7 +216,6 @@ export function SettingsNotifications() {
     setSelectedIndex(0);
   };
 
-  // Close dropdown when clicking outside
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
       if (
diff --git a/apps/desktop/src/store/zustand/tabs/schema.ts b/apps/desktop/src/store/zustand/tabs/schema.ts
index 00d2f3898b..8e082c1e8b 100644
--- a/apps/desktop/src/store/zustand/tabs/schema.ts
+++ b/apps/desktop/src/store/zustand/tabs/schema.ts
@@ -118,22 +118,19 @@ export const tabSchema = z.discriminatedUnion("type", [
     extensionId: z.string(),
     state: z.record(z.string(), z.unknown()).default({}),
   }),
+  baseTabSchema.extend({
+    type: z.literal("calendar"),
+  }),
   baseTabSchema.extend({
     type: z.literal("settings"),
+  }),
+  baseTabSchema.extend({
+    type: z.literal("ai"),
     state: z
       .object({
-        tab: z
-          .enum([
-            "general",
-            "calendar",
-            "notifications",
-            "transcription",
-            "intelligence",
-            "account",
-          ])
-          .default("general"),
+        tab: z.enum(["transcription", "intelligence"]).default("transcription"),
       })
-      .default({ tab: "general" }),
+      .default({ tab: "transcription" }),
   }),
 ]);
 
@@ -186,16 +183,12 @@ export type TabInput =
   | { type: "folders"; id: string | null }
   | { type: "empty" }
   | { type: "extension"; extensionId: string; state?: Record<string, unknown> }
+  | { type: "calendar" }
+  | { type: "settings" }
   | {
-      type: "settings";
+      type: "ai";
       state?: {
-        tab?:
-          | "general"
-          | "calendar"
-          | "notifications"
-          | "transcription"
-          | "intelligence"
-          | "account";
+        tab?: "transcription" | "intelligence";
       };
     };
 
@@ -216,7 +209,9 @@ export const rowIdfromTab = (tab: Tab): string => {
     case "extensions":
     case "empty":
     case "extension":
+    case "calendar":
     case "settings":
+    case "ai":
       throw new Error("invalid_resource");
     case "folders":
       if (!tab.id) {
@@ -252,8 +247,12 @@ export const uniqueIdfromTab = (tab: Tab): string => {
       return `empty-${tab.slotId}`;
     case "extension":
       return `extension-${tab.extensionId}`;
+    case "calendar":
+      return `calendar`;
     case "settings":
       return `settings`;
+    case "ai":
+      return `ai`;
   }
 };
 
diff --git a/apps/desktop/src/store/zustand/tabs/state.ts b/apps/desktop/src/store/zustand/tabs/state.ts
index fa97726452..e2ab5370cf 100644
--- a/apps/desktop/src/store/zustand/tabs/state.ts
+++ b/apps/desktop/src/store/zustand/tabs/state.ts
@@ -30,9 +30,9 @@ export type StateBasicActions = {
     tab: Tab,
     state: Extract<Tab, { type: "extensions" }>["state"],
   ) => void;
-  updateSettingsTabState: (
+  updateAiTabState: (
     tab: Tab,
-    state: Extract<Tab, { type: "settings" }>["state"],
+    state: Extract<Tab, { type: "ai" }>["state"],
   ) => void;
 };
 
@@ -52,8 +52,7 @@ export const createStateUpdaterSlice = <T extends BasicState & NavigationState>(
     updateTabState(tab, "chat_shortcuts", state, get, set),
   updateExtensionsTabState: (tab, state) =>
     updateTabState(tab, "extensions", state, get, set),
-  updateSettingsTabState: (tab, state) =>
-    updateTabState(tab, "settings", state, get, set),
+  updateAiTabState: (tab, state) => updateTabState(tab, "ai", state, get, set),
 });
 
 const updateTabState = <T extends BasicState & NavigationState>(