diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index 08007b1c..5e0e3da2 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -14,7 +14,7 @@ import styles from './NavBar.module.css';
 export function NavBar() {
   const { formatMessage, labels } = useMessages();
   const { pathname, router } = useNavigation();
-  const { renderTeamUrl } = useTeamUrl();
+  const { teamId, renderTeamUrl } = useTeamUrl();
 
   const cloudMode = !!process.env.cloudMode;
 
@@ -34,25 +34,38 @@ export function NavBar() {
       label: formatMessage(labels.settings),
       url: renderTeamUrl('/settings'),
       children: [
+        ...(teamId
+          ? [
+              {
+                label: formatMessage(labels.team),
+                url: renderTeamUrl('/settings/team'),
+              },
+            ]
+          : []),
         {
           label: formatMessage(labels.websites),
-          url: '/settings/websites',
-        },
-        {
-          label: formatMessage(labels.teams),
-          url: '/settings/teams',
-        },
-        {
-          label: formatMessage(labels.users),
-          url: '/settings/users',
-        },
-        {
-          label: formatMessage(labels.profile),
-          url: '/profile',
+          url: renderTeamUrl('/settings/websites'),
         },
+        ...(!teamId
+          ? [
+              {
+                label: formatMessage(labels.teams),
+                url: renderTeamUrl('/settings/teams'),
+              },
+              {
+                label: formatMessage(labels.users),
+                url: '/settings/users',
+              },
+            ]
+          : [
+              {
+                label: formatMessage(labels.members),
+                url: renderTeamUrl('/settings/members'),
+              },
+            ]),
       ],
     },
-    cloudMode && {
+    {
       label: formatMessage(labels.profile),
       url: '/profile',
     },
@@ -94,6 +107,7 @@ export function NavBar() {
         <ProfileButton />
       </div>
       <div className={styles.mobile}>
+        <TeamsButton onChange={handleTeamChange} showText={false} />
         <HamburgerButton menuItems={menuItems} />
       </div>
     </div>
diff --git a/src/components/input/TeamsButton.tsx b/src/components/input/TeamsButton.tsx
index e3b5a3a8..1f6270b4 100644
--- a/src/components/input/TeamsButton.tsx
+++ b/src/components/input/TeamsButton.tsx
@@ -7,9 +7,11 @@ import styles from './TeamsButton.module.css';
 
 export function TeamsButton({
   className,
+  showText = true,
   onChange,
 }: {
   className?: string;
+  showText?: boolean;
   onChange?: (value: string) => void;
 }) {
   const { user } = useLogin();
@@ -31,7 +33,7 @@ export function TeamsButton({
     <PopupTrigger>
       <Button className={classNames(styles.button, className)} variant="quiet">
         <Icon>{teamId ? <Icons.Users /> : <Icons.User />}</Icon>
-        <Text>{teamId ? team?.name : user.username}</Text>
+        {showText && <Text>{teamId ? team?.name : user.username}</Text>}
         <Icon>
           <Icons.ChevronDown />
         </Icon>