diff --git a/src/app/(main)/admin/users/UserAddForm.tsx b/src/app/(main)/admin/users/UserAddForm.tsx
index f6881a109..fe7828c60 100644
--- a/src/app/(main)/admin/users/UserAddForm.tsx
+++ b/src/app/(main)/admin/users/UserAddForm.tsx
@@ -13,11 +13,11 @@ import { useMessages, useUpdateQuery } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
 
 export function UserAddForm({ onSave, onClose }) {
-  const { mutate, error, isPending } = useUpdateQuery(`/users`);
+  const { mutateAsync, error, isPending } = useUpdateQuery(`/users`);
   const { formatMessage, labels, getErrorMessage } = useMessages();
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave(data);
         onClose();
diff --git a/src/app/(main)/admin/users/UserDeleteForm.tsx b/src/app/(main)/admin/users/UserDeleteForm.tsx
index f316dafef..8f6fd502b 100644
--- a/src/app/(main)/admin/users/UserDeleteForm.tsx
+++ b/src/app/(main)/admin/users/UserDeleteForm.tsx
@@ -13,11 +13,11 @@ export function UserDeleteForm({
   onClose?: () => void;
 }) {
   const { messages, labels, formatMessage } = useMessages();
-  const { mutate } = useDeleteQuery(`/users/${userId}`);
+  const { mutateAsync } = useDeleteQuery(`/users/${userId}`);
   const { touch } = useModified();
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('users');
         touch(`users:${userId}`);
diff --git a/src/app/(main)/admin/users/[userId]/UserEditForm.tsx b/src/app/(main)/admin/users/[userId]/UserEditForm.tsx
index 9a8d34cc2..ac7875db0 100644
--- a/src/app/(main)/admin/users/[userId]/UserEditForm.tsx
+++ b/src/app/(main)/admin/users/[userId]/UserEditForm.tsx
@@ -16,10 +16,10 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () =
   const user = useUser();
   const { user: login } = useLoginQuery();
 
-  const { mutate, error, toast, touch } = useUpdateQuery(`/users/${userId}`);
+  const { mutateAsync, error, toast, touch } = useUpdateQuery(`/users/${userId}`);
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch(`user:${user.id}`);
diff --git a/src/app/(main)/boards/BoardAddForm.tsx b/src/app/(main)/boards/BoardAddForm.tsx
index fae3c70aa..e04670822 100644
--- a/src/app/(main)/boards/BoardAddForm.tsx
+++ b/src/app/(main)/boards/BoardAddForm.tsx
@@ -13,10 +13,10 @@ export function BoardAddForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/websites', { teamId });
+  const { mutateAsync, error, isPending } = useUpdateQuery('/websites', { teamId });
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();
diff --git a/src/app/(main)/links/LinkDeleteButton.tsx b/src/app/(main)/links/LinkDeleteButton.tsx
index cfecb4259..05a3217f7 100644
--- a/src/app/(main)/links/LinkDeleteButton.tsx
+++ b/src/app/(main)/links/LinkDeleteButton.tsx
@@ -16,10 +16,10 @@ export function LinkDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(`/links/${linkId}`);
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/links/${linkId}`);
 
-  const handleConfirm = (close: () => void) => {
-    mutate(null, {
+  const handleConfirm = async (close: () => void) => {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('links');
         onSave?.();
diff --git a/src/app/(main)/links/LinkEditForm.tsx b/src/app/(main)/links/LinkEditForm.tsx
index ab1b0e40d..36a114552 100644
--- a/src/app/(main)/links/LinkEditForm.tsx
+++ b/src/app/(main)/links/LinkEditForm.tsx
@@ -33,7 +33,7 @@ export function LinkEditForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     linkId ? `/links/${linkId}` : '/links',
     {
       id: linkId,
@@ -46,7 +46,7 @@ export function LinkEditForm({
   const [slug, setSlug] = useState(generateId());
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('links');
@@ -139,9 +139,7 @@ export function LinkEditForm({
                   {formatMessage(labels.cancel)}
                 </Button>
               )}
-              <FormSubmitButton isDisabled={false} isLoading={isPending}>
-                {formatMessage(labels.save)}
-              </FormSubmitButton>
+              <FormSubmitButton>{formatMessage(labels.save)}</FormSubmitButton>
             </Row>
           </>
         );
diff --git a/src/app/(main)/pixels/PixelDeleteButton.tsx b/src/app/(main)/pixels/PixelDeleteButton.tsx
index 0a81ab802..c90261e55 100644
--- a/src/app/(main)/pixels/PixelDeleteButton.tsx
+++ b/src/app/(main)/pixels/PixelDeleteButton.tsx
@@ -14,11 +14,11 @@ export function PixelDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, isPending, error } = useDeleteQuery(`/pixels/${pixelId}`);
+  const { mutateAsync, isPending, error } = useDeleteQuery(`/pixels/${pixelId}`);
   const { touch } = useModified();
 
-  const handleConfirm = (close: () => void) => {
-    mutate(null, {
+  const handleConfirm = async (close: () => void) => {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('pixels');
         onSave?.();
diff --git a/src/app/(main)/pixels/PixelEditButton.tsx b/src/app/(main)/pixels/PixelEditButton.tsx
index a1310d448..12977b815 100644
--- a/src/app/(main)/pixels/PixelEditButton.tsx
+++ b/src/app/(main)/pixels/PixelEditButton.tsx
@@ -9,7 +9,7 @@ export function PixelEditButton({ pixelId }: { pixelId: string }) {
 
   return (
     <ActionButton title={formatMessage(labels.edit)} icon={<Edit />}>
-      <Dialog title={formatMessage(labels.pixel)} style={{ width: 800, minHeight: 300 }}>
+      <Dialog title={formatMessage(labels.pixel)} style={{ width: 600, minHeight: 300 }}>
         {({ close }) => {
           return <PixelEditForm pixelId={pixelId} onClose={close} />;
         }}
diff --git a/src/app/(main)/pixels/PixelEditForm.tsx b/src/app/(main)/pixels/PixelEditForm.tsx
index b85d363bb..a3a4f0c80 100644
--- a/src/app/(main)/pixels/PixelEditForm.tsx
+++ b/src/app/(main)/pixels/PixelEditForm.tsx
@@ -32,7 +32,7 @@ export function PixelEditForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     pixelId ? `/pixels/${pixelId}` : '/pixels',
     {
       id: pixelId,
@@ -45,7 +45,7 @@ export function PixelEditForm({
   const [slug, setSlug] = useState(generateId());
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('pixels');
@@ -106,10 +106,7 @@ export function PixelEditForm({
                   allowCopy
                   style={{ width: '100%' }}
                 />
-                <Button
-                  variant="quiet"
-                  onPress={() => setValue('slug', handleSlug(), { shouldDirty: true })}
-                >
+                <Button onPress={() => setValue('slug', handleSlug(), { shouldDirty: true })}>
                   <Icon>
                     <RefreshCw />
                   </Icon>
diff --git a/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx b/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx
index aba7c71c7..991d807d5 100644
--- a/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx
+++ b/src/app/(main)/pixels/[pixelId]/PixelHeader.tsx
@@ -1,7 +1,7 @@
 import { usePixel, useMessages, useSlug } from '@/components/hooks';
 import { PageHeader } from '@/components/common/PageHeader';
 import { Icon, Text } from '@umami/react-zen';
-import { ExternalLink, Pixel } from '@/components/icons';
+import { ExternalLink, Grid2x2 } from '@/components/icons';
 import { LinkButton } from '@/components/common/LinkButton';
 
 export function PixelHeader() {
@@ -10,7 +10,7 @@ export function PixelHeader() {
   const pixel = usePixel();
 
   return (
-    <PageHeader title={pixel.name} description={pixel.url} icon={<Pixel />}>
+    <PageHeader title={pixel.name} description={pixel.slug} icon={<Grid2x2 />}>
       <LinkButton href={getSlugUrl(pixel.slug)} target="_blank">
         <Icon>
           <ExternalLink />
diff --git a/src/app/(main)/pixels/[pixelId]/page.tsx b/src/app/(main)/pixels/[pixelId]/page.tsx
index 1cb72c1d6..04800cae6 100644
--- a/src/app/(main)/pixels/[pixelId]/page.tsx
+++ b/src/app/(main)/pixels/[pixelId]/page.tsx
@@ -1,8 +1,8 @@
 import { PixelPage } from './PixelPage';
 import { Metadata } from 'next';
 
-export default async function ({ params }: { params: Promise<{ pixelId: string }> }) {
-  const { pixelId } = await params;
+export default function ({ params }: { params: { pixelId: string } }) {
+  const { pixelId } = params;
 
   return <PixelPage pixelId={pixelId} />;
 }
diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsx
index ec70f2a71..31d6cfedd 100644
--- a/src/app/(main)/settings/SettingsLayout.tsx
+++ b/src/app/(main)/settings/SettingsLayout.tsx
@@ -4,7 +4,7 @@ import { Grid, Column } from '@umami/react-zen';
 import { useMessages, useNavigation } from '@/components/hooks';
 import { PageBody } from '@/components/common/PageBody';
 import { SideMenu } from '@/components/common/SideMenu';
-import { UserCircle, Users, Knobs } from '@/components/icons';
+import { UserCircle, Users, Settings2 } from '@/components/icons';
 
 export function SettingsLayout({ children }: { children: ReactNode }) {
   const { formatMessage, labels } = useMessages();
@@ -18,7 +18,7 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
           id: 'preferences',
           label: formatMessage(labels.preferences),
           path: renderUrl('/settings/preferences'),
-          icon: <Knobs />,
+          icon: <Settings2 />,
         },
       ],
     },
diff --git a/src/app/(main)/settings/profile/PasswordEditForm.tsx b/src/app/(main)/settings/profile/PasswordEditForm.tsx
index f0df01df8..2c27a2d51 100644
--- a/src/app/(main)/settings/profile/PasswordEditForm.tsx
+++ b/src/app/(main)/settings/profile/PasswordEditForm.tsx
@@ -10,10 +10,10 @@ import { useMessages, useUpdateQuery } from '@/components/hooks';
 
 export function PasswordEditForm({ onSave, onClose }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/me/password');
+  const { mutateAsync, error, isPending } = useUpdateQuery('/me/password');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave();
         onClose();
diff --git a/src/app/(main)/teams/TeamAddForm.tsx b/src/app/(main)/teams/TeamAddForm.tsx
index 68ff79786..87a6a4fd6 100644
--- a/src/app/(main)/teams/TeamAddForm.tsx
+++ b/src/app/(main)/teams/TeamAddForm.tsx
@@ -10,10 +10,10 @@ import {
 
 export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/teams');
+  const { mutateAsync, error, isPending } = useUpdateQuery('/teams');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();
diff --git a/src/app/(main)/teams/TeamJoinForm.tsx b/src/app/(main)/teams/TeamJoinForm.tsx
index f69099ed4..0c896747e 100644
--- a/src/app/(main)/teams/TeamJoinForm.tsx
+++ b/src/app/(main)/teams/TeamJoinForm.tsx
@@ -10,10 +10,10 @@ import { useMessages, useUpdateQuery } from '@/components/hooks';
 
 export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch } = useUpdateQuery('/teams/join');
+  const { mutateAsync, error, touch } = useUpdateQuery('/teams/join');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         touch('teams:members');
         onSave?.();
@@ -33,9 +33,7 @@ export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose:
       </FormField>
       <FormButtons>
         <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>
-        <FormSubmitButton variant="primary" isLoading={isPending} isDisabled={isPending}>
-          {formatMessage(labels.join)}
-        </FormSubmitButton>
+        <FormSubmitButton variant="primary">{formatMessage(labels.join)}</FormSubmitButton>
       </FormButtons>
     </Form>
   );
diff --git a/src/app/(main)/teams/TeamLeaveForm.tsx b/src/app/(main)/teams/TeamLeaveForm.tsx
index 2c7a41d20..c8063365b 100644
--- a/src/app/(main)/teams/TeamLeaveForm.tsx
+++ b/src/app/(main)/teams/TeamLeaveForm.tsx
@@ -15,11 +15,11 @@ export function TeamLeaveForm({
   onClose: () => void;
 }) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
+  const { mutateAsync, error, isPending } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
   const { touch } = useModified();
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('teams:members');
         onSave();
diff --git a/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx b/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx
index 3634af568..cf1ce6188 100644
--- a/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamDeleteForm.tsx
@@ -13,10 +13,10 @@ export function TeamDeleteForm({
   onClose?: () => void;
 }) {
   const { labels, formatMessage, getErrorMessage } = useMessages();
-  const { mutate, error, isPending, touch } = useDeleteQuery(`/teams/${teamId}`);
+  const { mutateAsync, error, isPending, touch } = useDeleteQuery(`/teams/${teamId}`);
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('teams');
         onSave?.();
diff --git a/src/app/(main)/teams/[teamId]/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/TeamEditForm.tsx
index 2b6690ff2..debea5d4d 100644
--- a/src/app/(main)/teams/[teamId]/TeamEditForm.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamEditForm.tsx
@@ -25,10 +25,10 @@ export function TeamEditForm({
   const team = useTeam();
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
 
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(`/teams/${teamId}`);
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(`/teams/${teamId}`);
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('teams');
diff --git a/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx b/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx
index e64a9b274..76f0800f1 100644
--- a/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamMemberEditForm.tsx
@@ -23,11 +23,11 @@ export function TeamMemberEditForm({
   onSave?: () => void;
   onClose?: () => void;
 }) {
-  const { mutate, error, isPending } = useUpdateQuery(`/teams/${teamId}/users/${userId}`);
+  const { mutateAsync, error, isPending } = useUpdateQuery(`/teams/${teamId}/users/${userId}`);
   const { formatMessage, labels, getErrorMessage } = useMessages();
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave();
         onClose();
diff --git a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx
index 66d540b00..22c871a30 100644
--- a/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamMemberRemoveButton.tsx
@@ -18,11 +18,11 @@ export function TeamMemberRemoveButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
+  const { mutateAsync, isPending, error } = useDeleteQuery(`/teams/${teamId}/users/${userId}`);
   const { touch } = useModified();
 
-  const handleConfirm = (close: () => void) => {
-    mutate(null, {
+  const handleConfirm = async (close: () => void) => {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('teams:members');
         onSave?.();
diff --git a/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx b/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx
index 34e8184e9..c3a68c57f 100644
--- a/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx
+++ b/src/app/(main)/teams/[teamId]/TeamWebsiteRemoveButton.tsx
@@ -1,13 +1,13 @@
 import { useDeleteQuery, useMessages } from '@/components/hooks';
 import { Icon, LoadingButton, Text } from '@umami/react-zen';
-import { Close } from '@/components/icons';
+import { X } from '@/components/icons';
 
 export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending } = useDeleteQuery(`/teams/${teamId}/websites/${websiteId}`);
+  const { mutateAsync } = useDeleteQuery(`/teams/${teamId}/websites/${websiteId}`);
 
   const handleRemoveTeamMember = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: () => {
         onSave();
       },
@@ -15,9 +15,9 @@ export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
   };
 
   return (
-    <LoadingButton variant="quiet" onClick={() => handleRemoveTeamMember()} isLoading={isPending}>
+    <LoadingButton variant="quiet" onClick={() => handleRemoveTeamMember()}>
       <Icon>
-        <Close />
+        <X />
       </Icon>
       <Text>{formatMessage(labels.remove)}</Text>
     </LoadingButton>
diff --git a/src/app/(main)/websites/WebsiteAddForm.tsx b/src/app/(main)/websites/WebsiteAddForm.tsx
index e2be25633..b8ff7b459 100644
--- a/src/app/(main)/websites/WebsiteAddForm.tsx
+++ b/src/app/(main)/websites/WebsiteAddForm.tsx
@@ -13,10 +13,10 @@ export function WebsiteAddForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels, messages } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery('/websites', { teamId });
+  const { mutateAsync, error, isPending } = useUpdateQuery('/websites', { teamId });
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
index 01940beb0..30976bff7 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
@@ -33,12 +33,10 @@ export function FunnelEditForm({
 }) {
   const { formatMessage, labels } = useMessages();
   const { data } = useReportQuery(id);
-  const { mutate, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
+  const { mutateAsync, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
 
   const handleSubmit = async ({ name, ...parameters }) => {
-    //
-
-    mutate(
+    await mutateAsync(
       { ...data, id, name, type: 'funnel', websiteId, parameters },
       {
         onSuccess: async () => {
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx
index 2264ccf89..394cdec90 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalEditForm.tsx
@@ -27,10 +27,10 @@ export function GoalEditForm({
 }) {
   const { formatMessage, labels } = useMessages();
   const { data } = useReportQuery(id);
-  const { mutate, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
+  const { mutateAsync, error, isPending, touch } = useUpdateQuery(`/reports${id ? `/${id}` : ''}`);
 
   const handleSubmit = async (formData: Record<string, any>) => {
-    mutate(
+    await mutateAsync(
       { ...formData, type: 'goal', websiteId },
       {
         onSuccess: async () => {
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index 239d51332..a9a5edc60 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -8,7 +8,7 @@ import {
   Search,
   Type,
   SquareSlash,
-  SquareArrowRight,
+  Share2,
   Megaphone,
   Earth,
   Globe,
@@ -20,7 +20,7 @@ import {
   Monitor,
   Cpu,
   LightningSvg,
-  LucideCaseSensitive,
+  Network,
   Tag,
 } from '@/components/icons';
 
@@ -80,7 +80,7 @@ export function WebsiteExpandedView({
           id: 'referrer',
           label: formatMessage(labels.referrer),
           path: updateParams({ view: 'referrer' }),
-          icon: <SquareArrowRight />,
+          icon: <Share2 />,
         },
         {
           id: 'channel',
@@ -167,7 +167,7 @@ export function WebsiteExpandedView({
           id: 'hostname',
           label: formatMessage(labels.hostname),
           path: updateParams({ view: 'hostname' }),
-          icon: <LucideCaseSensitive />,
+          icon: <Network />,
         },
         {
           id: 'tag',
@@ -181,7 +181,7 @@ export function WebsiteExpandedView({
 
   return (
     <Grid columns="auto 1fr" gap="6" height="100%" overflow="hidden">
-      <Column gap="6" border="right" paddingRight="3">
+      <Column gap="6" border="right" paddingRight="3" overflowY="auto">
         <SideMenu items={items} selectedKey={view} muteItems={false} />
       </Column>
       <Column overflow="hidden">
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx
index 45a148b07..5af275119 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteNav.tsx
@@ -10,7 +10,7 @@ import {
   MagnetSvg,
   Tag,
   MoneySvg,
-  Network,
+  NetworkSvg,
   ChartPie,
   UserPlus,
   CompareSvg,
@@ -137,7 +137,7 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {
         {
           id: 'attribution',
           label: formatMessage(labels.attribution),
-          icon: <Network />,
+          icon: <NetworkSvg />,
           path: renderPath('/attribution'),
         },
       ],
diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx
index 9e56a875f..239193b0d 100644
--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx
@@ -17,12 +17,12 @@ export function CohortDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(
     `/websites/${websiteId}/segments/${cohortId}`,
   );
 
-  const handleConfirm = (close: () => void) => {
-    mutate(null, {
+  const handleConfirm = async (close: () => void) => {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('cohorts');
         onSave?.();
diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
index c02d85c9a..3b228e835 100644
--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
@@ -33,7 +33,7 @@ export function CohortEditForm({
   const { data } = useWebsiteCohortQuery(websiteId, cohortId);
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
 
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     `/websites/${websiteId}/segments${cohortId ? `/${cohortId}` : ''}`,
     {
       type: 'cohort',
@@ -41,7 +41,7 @@ export function CohortEditForm({
   );
 
   const handleSubmit = async (formData: any) => {
-    mutate(formData, {
+    await mutateAsync(formData, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('cohorts');
diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx
index f212187b8..a588d11a3 100644
--- a/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentDeleteButton.tsx
@@ -17,12 +17,12 @@ export function SegmentDeleteButton({
   onSave?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(
     `/websites/${websiteId}/segments/${segmentId}`,
   );
 
-  const handleConfirm = (close: () => void) => {
-    mutate(null, {
+  const handleConfirm = async (close: () => void) => {
+    await mutateAsync(null, {
       onSuccess: () => {
         touch('segments');
         onSave?.();
diff --git a/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx b/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx
index 32b7ee931..26b973529 100644
--- a/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/segments/SegmentEditForm.tsx
@@ -30,7 +30,7 @@ export function SegmentEditForm({
   const { data } = useWebsiteSegmentQuery(websiteId, segmentId);
   const { formatMessage, labels, getErrorMessage } = useMessages();
 
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(
+  const { mutateAsync, error, isPending, touch, toast } = useUpdateQuery(
     `/websites/${websiteId}/segments${segmentId ? `/${segmentId}` : ''}`,
     {
       type: 'segment',
@@ -38,7 +38,7 @@ export function SegmentEditForm({
   );
 
   const handleSubmit = async (formData: any) => {
-    mutate(formData, {
+    await mutateAsync(formData, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('segments');
diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx
index a123813d0..780aab74e 100644
--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm.tsx
@@ -13,10 +13,10 @@ export function WebsiteDeleteForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}`);
+  const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/websites/${websiteId}`);
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch('websites');
         touch(`websites:${websiteId}`);
diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx
index e79ec922b..50598199a 100644
--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteEditForm.tsx
@@ -5,10 +5,10 @@ import { DOMAIN_REGEX } from '@/lib/constants';
 export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {
   const website = useWebsite();
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, touch, toast, isPending } = useUpdateQuery(`/websites/${websiteId}`);
+  const { mutateAsync, error, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch(`website:${website.id}`);
@@ -45,12 +45,7 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa
         <TextField />
       </FormField>
       <FormButtons>
-        <FormSubmitButton
-          data-test="button-submit"
-          variant="primary"
-          isLoading={isPending}
-          isDisabled={isPending}
-        >
+        <FormSubmitButton data-test="button-submit" variant="primary">
           {formatMessage(labels.save)}
         </FormSubmitButton>
       </FormButtons>
diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx
index 3c990ded9..43583c3e2 100644
--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteResetForm.tsx
@@ -13,10 +13,10 @@ export function WebsiteResetForm({
   onClose?: () => void;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { mutate, isPending, error } = useUpdateQuery(`/websites/${websiteId}/reset`);
+  const { mutateAsync, isPending, error } = useUpdateQuery(`/websites/${websiteId}/reset`);
 
   const handleConfirm = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         onSave?.();
         onClose?.();
diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx
index f828d9e11..dc2fe6892 100644
--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteShareForm.tsx
@@ -25,7 +25,7 @@ export interface WebsiteShareFormProps {
 export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: WebsiteShareFormProps) {
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
   const [id, setId] = useState(shareId);
-  const { mutate, error, isPending, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
+  const { mutateAsync, error, touch, toast } = useUpdateQuery(`/websites/${websiteId}`);
 
   const url = `${window?.location.origin || ''}${process.env.basePath || ''}/share/${id}`;
 
@@ -37,11 +37,11 @@ export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: Websit
     setId(id ? null : generateId());
   };
 
-  const handleSave = () => {
+  const handleSave = async () => {
     const data = {
       shareId: id,
     };
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch(`website:${websiteId}`);
@@ -69,9 +69,7 @@ export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: Websit
           </Row>
           <Row alignItems="center" gap>
             {onClose && <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>}
-            <FormSubmitButton isDisabled={false} isLoading={isPending}>
-              {formatMessage(labels.save)}
-            </FormSubmitButton>
+            <FormSubmitButton isDisabled={false}>{formatMessage(labels.save)}</FormSubmitButton>
           </Row>
         </FormButtons>
       </Column>
diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
index f7461a445..9752a48e5 100644
--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
@@ -32,7 +32,7 @@ export function WebsiteTransferForm({
   const website = useWebsite();
   const [teamId, setTeamId] = useState<string>(null);
   const { formatMessage, labels, messages, getErrorMessage } = useMessages();
-  const { mutate, error, isPending } = useUpdateQuery(`/websites/${websiteId}/transfer`);
+  const { mutateAsync, error, isPending } = useUpdateQuery(`/websites/${websiteId}/transfer`);
   const { data: teams, isLoading } = useUserTeamsQuery(user.id);
   const isTeamWebsite = !!website?.teamId;
 
@@ -45,7 +45,7 @@ export function WebsiteTransferForm({
     ) || [];
 
   const handleSubmit = async () => {
-    mutate(
+    await mutateAsync(
       {
         userId: website.teamId ? user.id : undefined,
         teamId: website.userId ? teamId : undefined,
diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx
index 3dcbadef7..90ac981ab 100644
--- a/src/app/login/LoginForm.tsx
+++ b/src/app/login/LoginForm.tsx
@@ -18,10 +18,10 @@ import { LogoSvg } from '@/components/icons';
 export function LoginForm() {
   const { formatMessage, labels, getErrorMessage } = useMessages();
   const router = useRouter();
-  const { mutate, error, isPending } = useUpdateQuery('/auth/login');
+  const { mutateAsync, error } = useUpdateQuery('/auth/login');
 
   const handleSubmit = async (data: any) => {
-    mutate(data, {
+    await mutateAsync(data, {
       onSuccess: async ({ token, user }) => {
         setClientAuthToken(token);
         setUser(user);
@@ -55,13 +55,7 @@ export function LoginForm() {
           <PasswordField />
         </FormField>
         <FormButtons>
-          <FormSubmitButton
-            data-test="button-submit"
-            variant="primary"
-            isLoading={isPending}
-            isDisabled={isPending}
-            style={{ flex: 1 }}
-          >
+          <FormSubmitButton data-test="button-submit" variant="primary" style={{ flex: 1 }}>
             {formatMessage(labels.login)}
           </FormSubmitButton>
         </FormButtons>
diff --git a/src/components/input/ReportEditButton.tsx b/src/components/input/ReportEditButton.tsx
index 38fa17dd3..8f0c7a3cc 100644
--- a/src/components/input/ReportEditButton.tsx
+++ b/src/components/input/ReportEditButton.tsx
@@ -31,7 +31,7 @@ export function ReportEditButton({
   const { formatMessage, labels, messages } = useMessages();
   const [showEdit, setShowEdit] = useState(false);
   const [showDelete, setShowDelete] = useState(false);
-  const { mutate, touch } = useDeleteQuery(`/reports/${id}`);
+  const { mutateAsync, touch } = useDeleteQuery(`/reports/${id}`);
 
   const handleAction = (id: any) => {
     if (id === 'edit') {
@@ -47,7 +47,7 @@ export function ReportEditButton({
   };
 
   const handleDelete = async () => {
-    mutate(null, {
+    await mutateAsync(null, {
       onSuccess: async () => {
         touch(`reports:${type}`);
         setShowDelete(false);
diff --git a/src/components/input/SegmentFilters.tsx b/src/components/input/SegmentFilters.tsx
index 63d64795f..6324d7c4c 100644
--- a/src/components/input/SegmentFilters.tsx
+++ b/src/components/input/SegmentFilters.tsx
@@ -1,6 +1,7 @@
 import { List, ListItem } from '@umami/react-zen';
 import { useWebsiteSegmentsQuery } from '@/components/hooks';
 import { LoadingPanel } from '@/components/common/LoadingPanel';
+import { Empty } from '@/components/common/Empty';
 
 export interface SegmentFiltersProps {
   websiteId: string;
@@ -23,6 +24,7 @@ export function SegmentFilters({
 
   return (
     <LoadingPanel data={data} isLoading={isLoading} isFetching={isFetching} overflowY="auto">
+      {data?.data?.length === 0 && <Empty />}
       <List selectionMode="single" value={[segmentId]} onChange={id => handleChange(id[0])}>
         {data?.data?.map(item => {
           return (
diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsx
index 68fd2cdc3..275fab07f 100644
--- a/src/components/input/SettingsButton.tsx
+++ b/src/components/input/SettingsButton.tsx
@@ -10,23 +10,27 @@ import {
   MenuSection,
 } from '@umami/react-zen';
 import { useMessages, useLoginQuery, useNavigation, useConfig } from '@/components/hooks';
-import { LogOut, LockKeyhole, Settings, UserCircle } from '@/components/icons';
+import { LogOut, LockKeyhole, Settings, UserCircle, LifeBuoy, BookText } from '@/components/icons';
+import { DOCS_URL } from '@/lib/constants';
 
 export function SettingsButton() {
   const { formatMessage, labels } = useMessages();
   const { user } = useLoginQuery();
-  const { router, renderUrl } = useNavigation();
+  const { router } = useNavigation();
   const { cloudMode } = useConfig();
 
   const handleAction = (id: Key) => {
-    if (id === 'settings') {
-      if (cloudMode) {
-        window.location.href = `/settings`;
-        return;
-      }
-    }
+    const url = id.toString();
 
-    router.push(renderUrl(`/${id}`));
+    if (cloudMode) {
+      if (url === '/docs') {
+        window.open(DOCS_URL, '_blank');
+      } else {
+        window.location.href = url;
+      }
+    } else {
+      router.push(url);
+    }
   };
 
   return (
@@ -40,12 +44,26 @@ export function SettingsButton() {
         <Menu autoFocus="last" onAction={handleAction}>
           <MenuSection title={user.username}>
             <MenuSeparator />
-            <MenuItem id="settings" icon={<Settings />} label={formatMessage(labels.settings)} />
+            <MenuItem id="/settings" icon={<Settings />} label={formatMessage(labels.settings)} />
             {!cloudMode && user.isAdmin && (
-              <MenuItem id="admin" icon={<LockKeyhole />} label={formatMessage(labels.admin)} />
+              <MenuItem id="/admin" icon={<LockKeyhole />} label={formatMessage(labels.admin)} />
+            )}
+            {cloudMode && (
+              <>
+                <MenuItem
+                  id="/docs"
+                  icon={<BookText />}
+                  label={formatMessage(labels.documentation)}
+                />
+                <MenuItem
+                  id="/settings/support"
+                  icon={<LifeBuoy />}
+                  label={formatMessage(labels.support)}
+                />
+              </>
             )}
             <MenuSeparator />
-            <MenuItem id="logout" icon={<LogOut />} label={formatMessage(labels.logout)} />
+            <MenuItem id="/logout" icon={<LogOut />} label={formatMessage(labels.logout)} />
           </MenuSection>
         </Menu>
       </Popover>
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 1abe98f28..c40a3b05f 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -360,6 +360,8 @@ export const labels = defineMessages({
   environment: { id: 'label.environment', defaultMessage: 'Environment' },
   criteria: { id: 'label.criteria', defaultMessage: 'Criteria' },
   share: { id: 'label.share', defaultMessage: 'Share' },
+  support: { id: 'label.support', defaultMessage: 'Support' },
+  documentation: { id: 'label.documentation', defaultMessage: 'Documentation' },
 });
 
 export const messages = defineMessages({
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 136f85115..c6c63c709 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -8,6 +8,7 @@ export const DASHBOARD_CONFIG = 'umami.dashboard';
 export const VERSION_CHECK = 'umami.version-check';
 export const SHARE_TOKEN_HEADER = 'x-umami-share-token';
 export const HOMEPAGE_URL = 'https://umami.is';
+export const DOCS_URL = 'https://umami.is/docs';
 export const REPO_URL = 'https://github.com/umami-software/umami';
 export const UPDATES_URL = 'https://api.umami.is/v1/updates';
 export const TELEMETRY_PIXEL = 'https://i.umami.is/a.png';