diff --git a/web/components/Notifications.tsx b/web/components/Notifications.tsx
index 04992d4..76b2de0 100644
--- a/web/components/Notifications.tsx
+++ b/web/components/Notifications.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo } from 'react'
-import { Button, Chip, PopUp, PopUpContext, PopUpOpener, PopUpRoot, Tooltip, useLocalStorage, Visibility } from '@helpwave/hightide'
+import { Button, Chip, IconButton, PopUp, PopUpContext, PopUpOpener, PopUpRoot, useStorage, Visibility } from '@helpwave/hightide'
 import { Bell } from 'lucide-react'
 import { useOverviewData } from '@/data'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
@@ -26,12 +26,12 @@ export const Notifications = () => {
   const {
     value: readNotificationsRaw,
     setValue: setReadNotificationsRaw
-  } = useLocalStorage<string[]>('read-notifications', [])
+  } = useStorage<string[]>({ key: 'read-notifications', defaultValue: [] })
 
   const {
     value: dismissedNotificationsRaw,
     setValue: setDismissedNotificationsRaw
-  } = useLocalStorage<string[]>('dismissed-notifications', [])
+  } = useStorage<string[]>({ key: 'dismissed-notifications', defaultValue: [] })
 
   const readNotifications = useMemo(() => {
     return new Set(readNotificationsRaw || [])
@@ -131,29 +131,23 @@ export const Notifications = () => {
 
   return (
     <PopUpRoot>
-      <PopUpContext.Consumer>
-        {({ isOpen }) => (
-          <Tooltip tooltip={translation('notifications')} disabled={isOpen}>
-            <PopUpOpener>
-              {({ props }) => (
-                <Button
-                  {...props}
-                  coloringStyle="text"
-                  layout="icon"
-                  color="neutral"
-                >
-                  <Bell className="size-5" />
-                  {unreadCount > 0 && (
-                    <span className="absolute -top-0.5 -right-0.5 flex-row-0 min-w-4.5 h-4.5 items-center justify-center rounded-full bg-primary text-on-primary text-xs font-bold leading-none">
-                      {unreadCount > 9 ? '9+' : unreadCount}
-                    </span>
-                  )}
-                </Button>
-              )}
-            </PopUpOpener>
-          </Tooltip>
+      <PopUpOpener>
+        {({ props }) => (
+          <IconButton
+            {...props}
+            tooltip={translation('notifications')}
+            coloringStyle="text"
+            color="neutral"
+          >
+            <Bell className="size-5" />
+            {unreadCount > 0 && (
+              <span className="absolute -top-0.5 -right-0.5 flex-row-0 min-w-4.5 h-4.5 items-center justify-center rounded-full bg-primary text-on-primary text-xs font-bold leading-none">
+                {unreadCount > 9 ? '9+' : unreadCount}
+              </span>
+            )}
+          </IconButton>
         )}
-      </PopUpContext.Consumer>
+      </PopUpOpener>
       <PopUp
         options={{
           horizontalAlignment: 'center'
diff --git a/web/components/layout/Page.tsx b/web/components/layout/Page.tsx
index 1bb4d9b..59fba36 100644
--- a/web/components/layout/Page.tsx
+++ b/web/components/layout/Page.tsx
@@ -11,9 +11,10 @@ import {
   ExpandableContent,
   ExpandableHeader,
   ExpandableRoot,
+  IconButton,
   MarkdownInterpreter,
   Tooltip,
-  useLocalStorage
+  useStorage
 } from '@helpwave/hightide'
 import { AvatarStatusComponent } from '@/components/AvatarStatusComponent'
 import { getConfig } from '@/utils/config'
@@ -49,7 +50,7 @@ export const StagingDisclaimerDialog = () => {
   const {
     value: lastTimeStagingDisclaimerDismissed,
     setValue: setLastTimeStagingDisclaimerDismissed
-  } = useLocalStorage('staging-disclaimer-dismissed-time', 0)
+  } = useStorage({ key: 'staging-disclaimer-dismissed-time', defaultValue: 0 })
 
   const dismissStagingDisclaimer = () => {
     setLastTimeStagingDisclaimerDismissed(new Date().getTime())
@@ -102,17 +103,17 @@ export const SurveyModal = () => {
   const {
     value: onboardingSurveyCompleted,
     setValue: setOnboardingSurveyCompleted
-  } = useLocalStorage('onboarding-survey-completed', 0)
+  } = useStorage({ key: 'onboarding-survey-completed', defaultValue: 0 })
 
   const {
     value: weeklySurveyLastCompleted,
     setValue: setWeeklySurveyLastCompleted
-  } = useLocalStorage('weekly-survey-last-completed', 0)
+  } = useStorage({ key: 'weekly-survey-last-completed', defaultValue: 0 })
 
   const {
     value: surveyLastDismissed,
     setValue: setSurveyLastDismissed
-  } = useLocalStorage('survey-last-dismissed', 0)
+  } = useStorage({ key: 'survey-last-dismissed', defaultValue: 0 })
 
   useEffect(() => {
     if (!config.onboardingSurveyUrl && !config.weeklySurveyUrl) {
@@ -333,33 +334,38 @@ export const Header = ({ onMenuClick, isMenuOpen, ...props }: HeaderProps) => {
         )}
       >
         <div className="flex-col-0 lg:pl-0">
-          <Button
-            layout="icon"
+          <IconButton
+            tooltip={translation('menu')}
             color="neutral"
             coloringStyle="text"
             onClick={onMenuClick}
             className="lg:hidden"
           >
             {isMenuOpen ? <X className="size-6" /> : <MenuIcon className="size-6" />}
-          </Button>
+          </IconButton>
         </div>
         <div className="flex-row-2 justify-end items-center gap-x-2">
           <RootLocationSelector className="hidden sm:flex" />
-          <Tooltip tooltip={translation('feedback')}>
-            <Button coloringStyle="text" layout="icon" color="neutral" onClick={() => setIsFeedbackOpen(true)}>
-              <MessageSquare />
-            </Button>
-          </Tooltip>
-          <Tooltip tooltip={translation('settings')}>
-            <Button coloringStyle="text" layout="icon" color="neutral" onClick={() => router.push('/settings')}>
-              <SettingsIcon />
-            </Button>
-          </Tooltip>
+          <IconButton
+            tooltip={translation('feedback')}
+            coloringStyle="text" color="neutral"
+            onClick={() => setIsFeedbackOpen(true)}
+          >
+            <MessageSquare />
+          </IconButton>
+          <IconButton
+            tooltip={translation('settings')}
+            coloringStyle="text" color="neutral"
+            onClick={() => router.push('/settings')}
+          >
+            <SettingsIcon />
+          </IconButton>
           <Tooltip tooltip={user?.isOnline ? 'Online' : 'Offline'}>
             <Button
               onClick={() => setIsUserInfoOpen(!!user?.id)}
               coloringStyle="text"
               color="neutral"
+              className="min-w-auto"
             >
               <span className="hidden sm:inline typography-title-sm">{user?.name}</span>
               <AvatarStatusComponent
@@ -444,15 +450,15 @@ export const Sidebar = ({ isOpen, onClose, ...props }: SidebarProps) => {
               <TasksLogo />
               <span className="typography-title-md whitespace-nowrap">{'helpwave tasks'}</span>
             </Link>
-            <Button
-              layout="icon"
+            <IconButton
+              tooltip={translation('close')}
               color="neutral"
               coloringStyle="text"
               onClick={onClose}
               className="lg:hidden"
             >
               <X className="size-6" />
-            </Button>
+            </IconButton>
           </div>
           <SidebarLink href="/" onClick={onClose}>
             <Grid2X2PlusIcon className="-rotate-90 size-5" />
diff --git a/web/components/locations/LocationSelectionDialog.tsx b/web/components/locations/LocationSelectionDialog.tsx
index bc18629..ec00d56 100644
--- a/web/components/locations/LocationSelectionDialog.tsx
+++ b/web/components/locations/LocationSelectionDialog.tsx
@@ -5,7 +5,8 @@ import {
   Checkbox,
   Button,
   SearchBar,
-  useLocalStorage
+  useStorage,
+  IconButton
 } from '@helpwave/hightide'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import type { LocationNodeType } from '@/api/gql/generated'
@@ -148,14 +149,15 @@ const LocationTreeItem = ({
   return (
     <div className="flex flex-col mb-3">
       <Expandable
-        label={labelContent}
-        clickOnlyOnHeader={true}
+        trigger={labelContent}
         isExpanded={isExpanded}
-        onChange={(isOpen) => {
+        onExpandedChange={(isOpen) => {
           onExpandToggle(node.id, isOpen)
         }}
         className="!shadow-none !bg-transparent !rounded-none w-full"
-        headerClassName="px-2 hover:bg-surface-hover rounded-lg transition-colors !text-text-primary hover:!text-text-primary flex-row-reverse justify-end cursor-pointer"
+        triggerProps={{
+          className: 'px-2 hover:bg-surface-hover rounded-lg transition-colors !text-text-primary hover:!text-text-primary flex-row-reverse justify-end cursor-pointer'
+        }}
         contentExpandedClassName="!max-h-none !h-auto !min-h-0 !overflow-visible !flex !flex-col px-1 data-[expanded]:py-2 border-l-2 border-divider ml-5 pl-2 pr-0 mt-1"
       >
         <div className="flex flex-col gap-1">
@@ -194,12 +196,12 @@ export const LocationSelectionDialog = ({
   const {
     value: storedExpandedIds,
     setValue: setStoredExpandedIds
-  } = useLocalStorage<string[]>(storageKey, [])
+  } = useStorage<string[]>({ key: storageKey, defaultValue: [] })
 
   const {
     value: storedTreeSignature,
     setValue: setStoredTreeSignature
-  } = useLocalStorage<string>(signatureKey, '')
+  } = useStorage<string>({ key: signatureKey, defaultValue: '' })
 
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set(initialSelectedIds))
   const [expandedIds, setExpandedIds] = useState<Set<string>>(new Set())
@@ -481,22 +483,22 @@ export const LocationSelectionDialog = ({
           </div>
 
           <div className="flex gap-1 border-l border-divider pl-2 ml-1">
-            <Button layout="icon" size="sm" onClick={handleExpandAll} title={translation('expandAll')}>
+            <IconButton size="sm" onClick={handleExpandAll} tooltip={translation('expandAll')}>
               <ChevronsDown className="size-4" />
-            </Button>
-            <Button layout="icon" size="sm" onClick={handleCollapseAll} title={translation('collapseAll')}>
+            </IconButton>
+            <IconButton size="sm" onClick={handleCollapseAll} tooltip={translation('collapseAll')}>
               <ChevronsUp className="size-4" />
-            </Button>
+            </IconButton>
           </div>
 
           {multiSelect && useCase !== 'root' && (
             <div className="flex gap-1 border-l border-divider pl-2">
-              <Button layout="icon" size="sm" onClick={handleSelectAll} title={translation('selectAll')}>
+              <IconButton size="sm" onClick={handleSelectAll} tooltip={translation('selectAll')}>
                 <CheckSquare className="size-4" />
-              </Button>
-              <Button layout="icon" size="sm" onClick={handleDeselectAll} title={translation('deselectAll')}>
+              </IconButton>
+              <IconButton size="sm" onClick={handleDeselectAll} tooltip={translation('deselectAll')}>
                 <Square className="size-4" />
-              </Button>
+              </IconButton>
             </div>
           )}
         </div>
diff --git a/web/components/patients/PatientDataEditor.tsx b/web/components/patients/PatientDataEditor.tsx
index c13119d..b6d5351 100644
--- a/web/components/patients/PatientDataEditor.tsx
+++ b/web/components/patients/PatientDataEditor.tsx
@@ -1,6 +1,6 @@
 import { useState, useMemo, useEffect } from 'react'
 import type { FormFieldDataHandling } from '@helpwave/hightide'
-import { FormProvider, Input, DateTimeInput, Select, SelectOption, Textarea, Checkbox, Button, ConfirmDialog, LoadingContainer, useCreateForm, FormField, Visibility, useFormObserverKey } from '@helpwave/hightide'
+import { FormProvider, Input, DateTimeInput, Select, SelectOption, Textarea, Checkbox, Button, ConfirmDialog, LoadingContainer, useCreateForm, FormField, Visibility, useFormObserverKey, IconButton } from '@helpwave/hightide'
 import { CenteredLoadingLogo } from '@/components/CenteredLoadingLogo'
 import { useTasksTranslation } from '@/i18n/useTasksTranslation'
 import type { CreatePatientInput, LocationNodeType, UpdatePatientInput, GetPatientQuery } from '@/api/gql/generated'
@@ -275,13 +275,13 @@ export const PatientDataEditor = ({
   return (
     <>
       {isRefreshing && (
-        <div className="flex items-center gap-2 py-2 px-3 rounded-md bg-neutral-100 dark:bg-neutral-800 mb-4">
+        <div className="flex items-center gap-2 py-2 px-3 rounded-md bg-surface-neutral mb-4">
           <LoadingContainer className="size-5 shrink-0" />
-          <span className="text-sm text-neutral-600 dark:text-neutral-400">{translation('refreshing')}</span>
+          <span className="text-sm text-on-surface">{translation('refreshing')}</span>
         </div>
       )}
       <FormProvider state={form}>
-        <form onSubmit={event => {event.preventDefault(); form.submit() }} className="flex-col-4">
+        <form onSubmit={event => {event.preventDefault(); form.submit() }} className="flex-col-6 pb-16 overflow-y-auto px-2 pt-4">
           <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
             <FormField<PatientFormValues, 'firstname'>
               name="firstname"
@@ -377,7 +377,9 @@ export const PatientDataEditor = ({
                   <Checkbox
                     {...focusableElementProps} {...interactionStates}
                     value={value === PatientState.Wait}
-                    onValueChange={(value) => onValueChange(value ? PatientState.Wait : PatientState.Admitted)}
+                    onValueChange={(value) => {
+                      onValueChange(value ? PatientState.Wait : PatientState.Admitted)}
+                    }
                     onEditComplete={(value) => onEditComplete(value ? PatientState.Wait : PatientState.Admitted)}
                   />
                   <span>{translation('waitingForPatient')}</span>
@@ -446,25 +448,23 @@ export const PatientDataEditor = ({
                     className="flex-grow cursor-pointer"
                     onClick={() => setIsClinicDialogOpen(true)}
                   />
-                  <Button
+                  <IconButton
                     onClick={() => setIsClinicDialogOpen(true)}
-                    layout="icon"
-                    title={translation('selectClinic')}
+                    tooltip={translation('selectClinic')}
                   >
                     <Building2 className="size-4" />
-                  </Button>
+                  </IconButton>
                   {value && !isEditMode && (
-                    <Button
+                    <IconButton
                       onClick={() => {
                         onValueChange(null)
                         onEditComplete(null)
                       }}
-                      layout="icon"
+                      tooltip={translation('clear')}
                       color="neutral"
-                      title={translation('clear')}
                     >
                       <XIcon className="size-5" />
-                    </Button>
+                    </IconButton>
                   )}
                 </div>
               </div>
@@ -486,25 +486,23 @@ export const PatientDataEditor = ({
                     className="flex-grow cursor-pointer"
                     onClick={() => setIsPositionDialogOpen(true)}
                   />
-                  <Button
+                  <IconButton
                     onClick={() => setIsPositionDialogOpen(true)}
-                    layout="icon"
-                    title={translation('selectPosition')}
+                    tooltip={translation('selectPosition')}
                   >
                     <Locate className="size-4" />
-                  </Button>
+                  </IconButton>
                   {value && (
-                    <Button
+                    <IconButton
                       onClick={() => {
                         onValueChange(null)
                         onEditComplete(null)
                       }}
-                      layout="icon"
+                      tooltip={translation('clear')}
                       color="neutral"
-                      title={translation('clear')}
                     >
                       <XIcon className="size-5" />
-                    </Button>
+                    </IconButton>
                   )}
                 </div>
               </div>
@@ -528,25 +526,24 @@ export const PatientDataEditor = ({
                     className="flex-grow cursor-pointer"
                     onClick={() => setIsTeamsDialogOpen(true)}
                   />
-                  <Button
+                  <IconButton
                     onClick={() => setIsTeamsDialogOpen(true)}
-                    layout="icon"
-                    title={translation('selectTeams')}
+                    tooltip={translation('selectTeams')}
                   >
                     <Users className="size-4" />
-                  </Button>
+                  </IconButton>
                   {value && value.length > 0 && (
-                    <Button
+                    <IconButton
                       onClick={() => {
                         onValueChange([])
                         onEditComplete([])
                       }}
-                      layout="icon"
+                      tooltip={translation('clear')}
                       color="neutral"
                       title={translation('clear')}
                     >
                       <XIcon className="size-5" />
-                    </Button>
+                    </IconButton>
                   )}
                 </div>
               </div>
diff --git a/web/components/patients/PatientDetailView.tsx b/web/components/patients/PatientDetailView.tsx
index b78f4b6..97292ca 100644
--- a/web/components/patients/PatientDetailView.tsx
+++ b/web/components/patients/PatientDetailView.tsx
@@ -160,7 +160,7 @@ export const PatientDetailView = ({
               {taskStats.totalTasks > 0 && (
                 <Tooltip
                   tooltip={`${translation('openTasks')}: ${taskStats.openTasks}\n${translation('closedTasks')}: ${taskStats.closedTasks}`}
-                  position="top"
+                  alignment="top"
                   tooltipClassName="whitespace-pre-line"
                 >
                   <div className="w-12">
@@ -182,18 +182,18 @@ export const PatientDetailView = ({
       )}
       <TabSwitcher>
         <TabList />
-        {isEditMode && patientId && (
-          <TabPanel label={translation('tasks')} className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+        <TabPanel label={translation('tasks')} className="flex-col-0 px-1 pt-4 overflow-y-auto" disabled={!(isEditMode && patientId)}>
+          {patientId && (
             <PatientTasksView
               patientId={patientId}
               patientData={patientData ? { patient: patientData } : undefined}
               onSuccess={onSuccess}
             />
-          </TabPanel>
-        )}
+          )}
+        </TabPanel>
 
-        {isEditMode && hasAvailableProperties && patientId && (
-          <TabPanel label={translation('properties')} className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+        <TabPanel label={translation('properties')} className="flex-col-0 px-2 pt-4 overflow-y-auto" disabled={!(isEditMode && hasAvailableProperties && patientId)}>
+          {patientId && (
             <PropertyList
               subjectId={patientId}
               subjectType="patient"
@@ -201,10 +201,10 @@ export const PatientDetailView = ({
               propertyValues={patientData?.properties}
               onPropertyValueChange={handlePropertyValueChange}
             />
-          </TabPanel>
-        )}
+          )}
+        </TabPanel>
 
-        <TabPanel label={translation('patientData')} className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+        <TabPanel label={translation('patientData')} className="flex-col-0">
           <PatientDataEditor
             id={patientId || null}
             initialCreateData={initialCreateData}
@@ -213,11 +213,11 @@ export const PatientDetailView = ({
           />
         </TabPanel>
 
-        {isEditMode && patientId && (
-          <TabPanel label="Audit Log" className="flex-col-0 px-1 pt-4 pb-16 overflow-y-auto">
+        <TabPanel label="Audit Log" className="flex-col-0 px-2 pt-4 overflow-y-auto" disabled={!(isEditMode && patientId)}>
+          {patientId && (
             <AuditLogTimeline caseId={patientId} enabled={true} />
-          </TabPanel>
-        )}
+          )}
+        </TabPanel>
       </TabSwitcher>
     </div>
   )
diff --git a/web/components/tables/PatientList.tsx b/web/components/tables/PatientList.tsx
index 4635a28..53bd725 100644
--- a/web/components/tables/PatientList.tsx
+++ b/web/components/tables/PatientList.tsx
@@ -1,5 +1,5 @@
 import { useMemo, useState, forwardRef, useImperativeHandle, useEffect, useCallback } from 'react'
-import { Chip, FillerCell, Button, HelpwaveLogo, LoadingContainer, SearchBar, ProgressIndicator, Tooltip, Drawer, TableProvider, TableDisplay, TableColumnSwitcher } from '@helpwave/hightide'
+import { Chip, FillerCell, HelpwaveLogo, LoadingContainer, SearchBar, ProgressIndicator, Tooltip, Drawer, TableProvider, TableDisplay, TableColumnSwitcher, IconButton } from '@helpwave/hightide'
 import { PlusIcon } from 'lucide-react'
 import { Sex, PatientState, type GetPatientsQuery, type TaskType, PropertyEntity, type FullTextSearchInput, type LocationType } from '@/api/gql/generated'
 import { usePropertyDefinitions, usePatientsPaginated, useRefreshingEntityIds } from '@/data'
@@ -189,7 +189,7 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
       minSize: 120,
       size: 144,
       maxSize: 180,
-      filterFn: 'tags',
+      filterFn: 'singleTag',
       meta: {
         filterData: {
           tags: allPatientStates.map(state => ({ label: translation('patientState', { state: state as string }), tag: state })),
@@ -229,7 +229,7 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
       minSize: 160,
       size: 160,
       maxSize: 200,
-      filterFn: 'tags',
+      filterFn: 'singleTag',
       meta: {
         filterData: {
           tags: [
@@ -301,7 +301,7 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
         return (
           <Tooltip
             tooltip={tooltipText}
-            position="top"
+            alignment="top"
             tooltipClassName="whitespace-pre-line"
           >
             <div className="w-full max-w-[80px]">
@@ -362,17 +362,16 @@ export const PatientList = forwardRef<PatientListRef, PatientListProps>(({ initi
             <TableColumnSwitcher />
           </div>
           <div className="flex flex-col sm:flex-row items-center gap-4 w-full sm:w-auto sm:ml-auto">
-            <Tooltip tooltip={translation('addPatient')} position="top">
-              <Button
-                onClick={() => {
-                  setSelectedPatient(undefined)
-                  setIsPanelOpen(true)
-                }}
-                layout="icon"
-              >
-                <PlusIcon />
-              </Button>
-            </Tooltip>
+            <IconButton
+              tooltip={translation('addPatient')}
+              onClick={() => {
+                setSelectedPatient(undefined)
+                setIsPanelOpen(true)
+              }}
+              color="primary"
+            >
+              <PlusIcon />
+            </IconButton>
           </div>
         </div>
         <div className="relative">
diff --git a/web/components/tables/TaskList.tsx b/web/components/tables/TaskList.tsx
index 7b111b5..c1c0f8a 100644
--- a/web/components/tables/TaskList.tsx
+++ b/web/components/tables/TaskList.tsx
@@ -1,6 +1,6 @@
 import { useMemo, useState, forwardRef, useImperativeHandle, useEffect, useRef, useCallback } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
-import { Button, Checkbox, ConfirmDialog, FillerCell, HelpwaveLogo, LoadingContainer, SearchBar, Select, SelectOption, TableColumnSwitcher, TableDisplay, TableProvider, Tooltip } from '@helpwave/hightide'
+import { Button, Checkbox, ConfirmDialog, FillerCell, HelpwaveLogo, IconButton, LoadingContainer, SearchBar, Select, SelectOption, TableColumnSwitcher, TableDisplay, TableProvider } from '@helpwave/hightide'
 import { PlusIcon, UserCheck, Users } from 'lucide-react'
 import type { TaskPriority, GetTasksQuery } from '@/api/gql/generated'
 import { PropertyEntity } from '@/api/gql/generated'
@@ -551,11 +551,11 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
               value={searchQuery}
               onChange={(e) => setSearchQuery(e.target.value)}
               onSearch={() => null}
-              containerProps={{ className: 'max-w-80 h-10' }}
+              containerProps={{ className: 'max-w-80' }}
             />
             <TableColumnSwitcher />
           </div>
-          <div className="flex flex-wrap items-center justify-end gap-4 w-full sm:w-auto sm:ml-auto lg:pr-4">
+          <div className="flex flex-wrap items-center justify-end gap-4 w-full sm:w-auto sm:ml-auto">
             <Select
               value={doneFilterValue}
               onValueChange={(v: string) => setDoneFilter(v === 'all' ? 'all' : v === 'done')}
@@ -576,15 +576,14 @@ export const TaskList = forwardRef<TaskListRef, TaskListProps>(({ tasks: initial
                 {translation('shiftHandover') || 'Shift Handover'}
               </Button>
             )}
-            <Tooltip tooltip={translation('addTask')} position="top">
-              <Button
-                onClick={() => setTaskDialogState({ isOpen: true })}
-                disabled={!hasPatients}
-                layout="icon"
-              >
-                <PlusIcon/>
-              </Button>
-            </Tooltip>
+            <IconButton
+              tooltip={translation('addTask')}
+              color="primary"
+              onClick={() => setTaskDialogState({ isOpen: true })}
+              disabled={!hasPatients}
+            >
+              <PlusIcon/>
+            </IconButton>
           </div>
         </div>
         <div className="flex-col-3 items-center relative">
diff --git a/web/hooks/useTasksContext.tsx b/web/hooks/useTasksContext.tsx
index b06e1cf..ad5ede4 100644
--- a/web/hooks/useTasksContext.tsx
+++ b/web/hooks/useTasksContext.tsx
@@ -5,7 +5,7 @@ import { HelpwaveLogo } from '@helpwave/hightide'
 import { useGlobalData, useLocations } from '@/data'
 import { useQueryClient } from '@tanstack/react-query'
 import { useAuth } from './useAuth'
-import { useLocalStorage } from '@helpwave/hightide'
+import { useStorage } from '@helpwave/hightide'
 import { useConnectionStatus } from './useConnectionStatus'
 
 function filterLocationsByRootSubtree(
@@ -119,7 +119,7 @@ export const TasksContextProvider = ({ children }: PropsWithChildren) => {
   const {
     value: storedSelectedRootLocationIds,
     setValue: setStoredSelectedRootLocationIds
-  } = useLocalStorage<string[]>('selected-root-location-ids', [])
+  } = useStorage<string[]>({ key: 'selected-root-location-ids', defaultValue: [] })
   const [state, setState] = useState<TasksContextState>({
     sidebar: {
       isShowingTeams: false,
diff --git a/web/i18n/translations.ts b/web/i18n/translations.ts
index 58e5064..30f22e5 100644
--- a/web/i18n/translations.ts
+++ b/web/i18n/translations.ts
@@ -98,6 +98,7 @@ export type TasksTranslationEntries = {
   'male': string,
   'markPatientDead': string,
   'markPatientDeadConfirmation': string,
+  'menu': string,
   'myFavorites': string,
   'myOpenTasks': string,
   'myTasks': string,
@@ -324,6 +325,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'male': `Männlich`,
     'markPatientDead': `Patient als verstorben markieren`,
     'markPatientDeadConfirmation': `Sind Sie sicher, dass Sie diesen Patienten als verstorben markieren möchten?`,
+    'menu': `Menü`,
     'myFavorites': `Meine Favoriten`,
     'myOpenTasks': `Meine offenen Aufgaben`,
     'myTasks': `Meine Aufgaben`,
@@ -612,6 +614,7 @@ export const tasksTranslation: Translation<TasksTranslationLocales, Partial<Task
     'male': `Male`,
     'markPatientDead': `Mark Patient Dead`,
     'markPatientDeadConfirmation': `Are you sure you want to mark this patient as dead?`,
+    'menu': `Menu`,
     'myFavorites': `My Favorites`,
     'myOpenTasks': `My Open Tasks`,
     'myTasks': `My tasks`,
diff --git a/web/locales/de-DE.arb b/web/locales/de-DE.arb
index 2e336a1..2134ec5 100644
--- a/web/locales/de-DE.arb
+++ b/web/locales/de-DE.arb
@@ -113,6 +113,7 @@
   "login": "Login",
   "logout": "Abmelden",
   "male": "Männlich",
+  "menu": "Menü",
   "myFavorites": "Meine Favoriten",
   "myOpenTasks": "Meine offenen Aufgaben",
   "myTasks": "Meine Aufgaben",
diff --git a/web/locales/en-US.arb b/web/locales/en-US.arb
index cba3ce4..e943e52 100644
--- a/web/locales/en-US.arb
+++ b/web/locales/en-US.arb
@@ -113,6 +113,7 @@
   "login": "Login",
   "logout": "Logout",
   "male": "Male",
+  "menu": "Menu",
   "myFavorites": "My Favorites",
   "myOpenTasks": "My Open Tasks",
   "myTasks": "My tasks",
diff --git a/web/package-lock.json b/web/package-lock.json
index ce76650..496e46a 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -12,7 +12,7 @@
         "@dnd-kit/core": "6.3.1",
         "@dnd-kit/modifiers": "9.0.0",
         "@dnd-kit/sortable": "7.0.2",
-        "@helpwave/hightide": "0.6.15",
+        "@helpwave/hightide": "0.8.1",
         "@helpwave/internationalization": "0.4.0",
         "@tailwindcss/postcss": "4.1.3",
         "@tanstack/react-query": "5.90.16",
@@ -22,10 +22,10 @@
         "clsx": "2.1.1",
         "dotenv": "17.2.3",
         "formidable": "3.5.4",
-        "graphql-ws": "^6.0.6",
+        "graphql-ws": "6.0.6",
         "lucide-react": "0.468.0",
-        "next": "16.0.10",
-        "next-runtime-env": "3.3.0",
+        "next": "16.1.6",
+        "next-runtime-env": "2.0.1",
         "oidc-client-ts": "3.4.1",
         "postcss": "8.5.3",
         "react": "19.2.3",
@@ -163,7 +163,6 @@
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -955,7 +954,6 @@
       "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
       "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@dnd-kit/accessibility": "^3.1.1",
         "@dnd-kit/utilities": "^3.2.2",
@@ -2444,9 +2442,9 @@
       }
     },
     "node_modules/@helpwave/hightide": {
-      "version": "0.6.15",
-      "resolved": "https://registry.npmjs.org/@helpwave/hightide/-/hightide-0.6.15.tgz",
-      "integrity": "sha512-kZ3c+OgUeqYx7Il3FfSlsrINSrFeoUWrMVcBwakF3B2kBaP643eQaRPHtkwQd/H7dlftnmYLnsRsMrfydk4Cyg==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@helpwave/hightide/-/hightide-0.8.1.tgz",
+      "integrity": "sha512-hggMPUzGo6duekEHSd4vWsj2okcyGGszZhGzBNeS7KTe6nHcgs8YpW8J5IUwualZoO2C625gMv7zBogAV/qQxA==",
       "license": "MPL-2.0",
       "dependencies": {
         "@helpwave/internationalization": "0.4.0",
@@ -3396,9 +3394,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.0.10.tgz",
-      "integrity": "sha512-8tuaQkyDVgeONQ1MeT9Mkk8pQmZapMKFh5B+OrFUlG3rVmYTXcXlBetBgTurKXGaIZvkoqRT9JL5K3phXcgang==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.6.tgz",
+      "integrity": "sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
@@ -3412,9 +3410,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.0.10.tgz",
-      "integrity": "sha512-4XgdKtdVsaflErz+B5XeG0T5PeXKDdruDf3CRpnhN+8UebNa5N2H58+3GDgpn/9GBurrQ1uWW768FfscwYkJRg==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz",
+      "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==",
       "cpu": [
         "arm64"
       ],
@@ -3428,9 +3426,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.0.10.tgz",
-      "integrity": "sha512-spbEObMvRKkQ3CkYVOME+ocPDFo5UqHb8EMTS78/0mQ+O1nqE8toHJVioZo4TvebATxgA8XMTHHrScPrn68OGw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz",
+      "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==",
       "cpu": [
         "x64"
       ],
@@ -3444,9 +3442,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.0.10.tgz",
-      "integrity": "sha512-uQtWE3X0iGB8apTIskOMi2w/MKONrPOUCi5yLO+v3O8Mb5c7K4Q5KD1jvTpTF5gJKa3VH/ijKjKUq9O9UhwOYw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz",
+      "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==",
       "cpu": [
         "arm64"
       ],
@@ -3460,9 +3458,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.0.10.tgz",
-      "integrity": "sha512-llA+hiDTrYvyWI21Z0L1GiXwjQaanPVQQwru5peOgtooeJ8qx3tlqRV2P7uH2pKQaUfHxI/WVarvI5oYgGxaTw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz",
+      "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==",
       "cpu": [
         "arm64"
       ],
@@ -3476,9 +3474,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.0.10.tgz",
-      "integrity": "sha512-AK2q5H0+a9nsXbeZ3FZdMtbtu9jxW4R/NgzZ6+lrTm3d6Zb7jYrWcgjcpM1k8uuqlSy4xIyPR2YiuUr+wXsavA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.6.tgz",
+      "integrity": "sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==",
       "cpu": [
         "x64"
       ],
@@ -3492,9 +3490,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.0.10.tgz",
-      "integrity": "sha512-1TDG9PDKivNw5550S111gsO4RGennLVl9cipPhtkXIFVwo31YZ73nEbLjNC8qG3SgTz/QZyYyaFYMeY4BKZR/g==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.6.tgz",
+      "integrity": "sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==",
       "cpu": [
         "x64"
       ],
@@ -3508,9 +3506,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.0.10.tgz",
-      "integrity": "sha512-aEZIS4Hh32xdJQbHz121pyuVZniSNoqDVx1yIr2hy+ZwJGipeqnMZBJHyMxv2tiuAXGx6/xpTcQJ6btIiBjgmg==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz",
+      "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==",
       "cpu": [
         "arm64"
       ],
@@ -3523,26 +3521,10 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.33.tgz",
-      "integrity": "sha512-pc9LpGNKhJ0dXQhZ5QMmYxtARwwmWLpeocFmVG5Z0DzWq5Uf0izcI8tLc+qOpqxO1PWqZ5A7J1blrUIKrIFc7Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.0.10.tgz",
-      "integrity": "sha512-E+njfCoFLb01RAFEnGZn6ERoOqhK1Gl3Lfz1Kjnj0Ulfu7oJbuMyvBKNj/bw8XZnenHDASlygTjZICQW+rYW1Q==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.6.tgz",
+      "integrity": "sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==",
       "cpu": [
         "x64"
       ],
@@ -3915,7 +3897,6 @@
       "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "playwright": "1.57.0"
       },
@@ -3953,12 +3934,6 @@
         "eslint": ">=8.40.0"
       }
     },
-    "node_modules/@swc/counter": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
-      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
-      "license": "Apache-2.0"
-    },
     "node_modules/@swc/helpers": {
       "version": "0.5.15",
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
@@ -4732,7 +4707,6 @@
       "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.16.tgz",
       "integrity": "sha512-bpMGOmV4OPmif7TNMteU/Ehf/hoC0Kf98PDc0F4BZkFrEapRMEqI/V6YS0lyzwSV6PQpY1y4xxArUIfBW5LVxQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@tanstack/query-core": "5.90.16"
       },
@@ -4851,7 +4825,6 @@
       "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -4922,7 +4895,6 @@
       "integrity": "sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.48.1",
         "@typescript-eslint/types": "8.48.1",
@@ -5232,7 +5204,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5606,7 +5577,6 @@
       "version": "2.9.19",
       "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
       "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
-      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.js"
@@ -5654,7 +5624,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -5679,17 +5648,6 @@
         "node-int64": "^0.4.0"
       }
     },
-    "node_modules/busboy": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
-      "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
-      "dependencies": {
-        "streamsearch": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=10.16.0"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -6678,7 +6636,6 @@
       "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -7491,7 +7448,6 @@
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
       "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -7768,7 +7724,6 @@
       "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-6.0.6.tgz",
       "integrity": "sha512-zgfER9s+ftkGKUZgc0xbx8T7/HMO4AV5/YuYiFc+AtgcO5T0v8AxYYNQ+ltzuzDZgNkYJaFspm5MMYLjQzrkmw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=20"
       },
@@ -9411,13 +9366,14 @@
       "license": "MIT"
     },
     "node_modules/next": {
-      "version": "16.0.10",
-      "resolved": "https://registry.npmjs.org/next/-/next-16.0.10.tgz",
-      "integrity": "sha512-RtWh5PUgI+vxlV3HdR+IfWA1UUHu0+Ram/JBO4vWB54cVPentCD0e+lxyAYEsDTqGGMg7qpjhKh6dc6aW7W/sA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
+      "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
       "license": "MIT",
       "dependencies": {
-        "@next/env": "16.0.10",
+        "@next/env": "16.1.6",
         "@swc/helpers": "0.5.15",
+        "baseline-browser-mapping": "^2.8.3",
         "caniuse-lite": "^1.0.30001579",
         "postcss": "8.4.31",
         "styled-jsx": "5.1.6"
@@ -9429,14 +9385,14 @@
         "node": ">=20.9.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "16.0.10",
-        "@next/swc-darwin-x64": "16.0.10",
-        "@next/swc-linux-arm64-gnu": "16.0.10",
-        "@next/swc-linux-arm64-musl": "16.0.10",
-        "@next/swc-linux-x64-gnu": "16.0.10",
-        "@next/swc-linux-x64-musl": "16.0.10",
-        "@next/swc-win32-arm64-msvc": "16.0.10",
-        "@next/swc-win32-x64-msvc": "16.0.10",
+        "@next/swc-darwin-arm64": "16.1.6",
+        "@next/swc-darwin-x64": "16.1.6",
+        "@next/swc-linux-arm64-gnu": "16.1.6",
+        "@next/swc-linux-arm64-musl": "16.1.6",
+        "@next/swc-linux-x64-gnu": "16.1.6",
+        "@next/swc-linux-x64-musl": "16.1.6",
+        "@next/swc-win32-arm64-msvc": "16.1.6",
+        "@next/swc-win32-x64-msvc": "16.1.6",
         "sharp": "^0.34.4"
       },
       "peerDependencies": {
@@ -9463,247 +9419,22 @@
       }
     },
     "node_modules/next-runtime-env": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/next-runtime-env/-/next-runtime-env-3.3.0.tgz",
-      "integrity": "sha512-JgKVnog9mNbjbjH9csVpMnz2tB2cT5sLF+7O47i6Ze/s/GoiKdV7dHhJHk1gwXpo6h5qPj5PTzryldtSjvrHuQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/next-runtime-env/-/next-runtime-env-2.0.1.tgz",
+      "integrity": "sha512-ItEmjn9dC3JXP+0v2GihVffVgdwDHh9ezHi+D20pzPXICUe9qf8MQOgX3Jhj5GtGdQ3ILhWDv3uQ2VDfKOCiVA==",
       "license": "MIT",
       "dependencies": {
-        "next": "^14",
         "react": "^18"
       },
       "peerDependencies": {
-        "next": "^14",
         "react": "^18"
       }
     },
-    "node_modules/next-runtime-env/node_modules/@next/env": {
-      "version": "14.2.35",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.35.tgz",
-      "integrity": "sha512-DuhvCtj4t9Gwrx80dmz2F4t/zKQ4ktN8WrMwOuVzkJfBilwAwGr6v16M5eI8yCuZ63H9TTuEU09Iu2HqkzFPVQ==",
-      "license": "MIT"
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.33.tgz",
-      "integrity": "sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.33.tgz",
-      "integrity": "sha512-8HGBeAE5rX3jzKvF593XTTFg3gxeU4f+UWnswa6JPhzaR6+zblO5+fjltJWIZc4aUalqTclvN2QtTC37LxvZAA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.33.tgz",
-      "integrity": "sha512-JXMBka6lNNmqbkvcTtaX8Gu5by9547bukHQvPoLe9VRBx1gHwzf5tdt4AaezW85HAB3pikcvyqBToRTDA4DeLw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.33.tgz",
-      "integrity": "sha512-Bm+QulsAItD/x6Ih8wGIMfRJy4G73tu1HJsrccPW6AfqdZd0Sfm5Imhgkgq2+kly065rYMnCOxTBvmvFY1BKfg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.33.tgz",
-      "integrity": "sha512-FnFn+ZBgsVMbGDsTqo8zsnRzydvsGV8vfiWwUo1LD8FTmPTdV+otGSWKc4LJec0oSexFnCYVO4hX8P8qQKaSlg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.33.tgz",
-      "integrity": "sha512-345tsIWMzoXaQndUTDv1qypDRiebFxGYx9pYkhwY4hBRaOLt8UGfiWKr9FSSHs25dFIf8ZqIFaPdy5MljdoawA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.33.tgz",
-      "integrity": "sha512-nscpt0G6UCTkrT2ppnJnFsYbPDQwmum4GNXYTeoTIdsmMydSKFz9Iny2jpaRupTb+Wl298+Rh82WKzt9LCcqSQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.33",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.33.tgz",
-      "integrity": "sha512-nOjfZMy8B94MdisuzZo9/57xuFVLHJaDj5e/xrduJp9CV2/HrfxTRH2fbyLe+K9QT41WBLUd4iXX3R7jBp0EUg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/@swc/helpers": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz",
-      "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@swc/counter": "^0.1.3",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/next": {
-      "version": "14.2.35",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.35.tgz",
-      "integrity": "sha512-KhYd2Hjt/O1/1aZVX3dCwGXM1QmOV4eNM2UTacK5gipDdPN/oHHK/4oVGy7X8GMfPMsUTUEmGlsy0EY1YGAkig==",
-      "license": "MIT",
-      "dependencies": {
-        "@next/env": "14.2.35",
-        "@swc/helpers": "0.5.5",
-        "busboy": "1.6.0",
-        "caniuse-lite": "^1.0.30001579",
-        "graceful-fs": "^4.2.11",
-        "postcss": "8.4.31",
-        "styled-jsx": "5.1.1"
-      },
-      "bin": {
-        "next": "dist/bin/next"
-      },
-      "engines": {
-        "node": ">=18.17.0"
-      },
-      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.2.33",
-        "@next/swc-darwin-x64": "14.2.33",
-        "@next/swc-linux-arm64-gnu": "14.2.33",
-        "@next/swc-linux-arm64-musl": "14.2.33",
-        "@next/swc-linux-x64-gnu": "14.2.33",
-        "@next/swc-linux-x64-musl": "14.2.33",
-        "@next/swc-win32-arm64-msvc": "14.2.33",
-        "@next/swc-win32-ia32-msvc": "14.2.33",
-        "@next/swc-win32-x64-msvc": "14.2.33"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.1.0",
-        "@playwright/test": "^1.41.2",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "sass": "^1.3.0"
-      },
-      "peerDependenciesMeta": {
-        "@opentelemetry/api": {
-          "optional": true
-        },
-        "@playwright/test": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/next-runtime-env/node_modules/react": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -9711,52 +9442,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/next-runtime-env/node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
-      },
-      "peerDependencies": {
-        "react": "^18.3.1"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/next-runtime-env/node_modules/styled-jsx": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz",
-      "integrity": "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==",
-      "license": "MIT",
-      "dependencies": {
-        "client-only": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/next/node_modules/postcss": {
       "version": "8.4.31",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
@@ -10343,7 +10028,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -10428,7 +10112,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
       "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10438,7 +10121,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
       "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -11081,14 +10763,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/streamsearch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
-      "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/string-env-interpolation": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz",
@@ -11530,7 +11204,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
       "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11941,7 +11614,6 @@
       "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/web/package.json b/web/package.json
index d415f2d..c8812e1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,7 @@
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/modifiers": "9.0.0",
     "@dnd-kit/sortable": "7.0.2",
-    "@helpwave/hightide": "0.6.15",
+    "@helpwave/hightide": "0.8.1",
     "@helpwave/internationalization": "0.4.0",
     "@tailwindcss/postcss": "4.1.3",
     "@tanstack/react-query": "5.90.16",
@@ -27,10 +27,10 @@
     "clsx": "2.1.1",
     "dotenv": "17.2.3",
     "formidable": "3.5.4",
-    "graphql-ws": "^6.0.6",
+    "graphql-ws": "6.0.6",
     "lucide-react": "0.468.0",
-    "next": "16.0.10",
-    "next-runtime-env": "3.3.0",
+    "next": "16.1.6",
+    "next-runtime-env": "2.0.1",
     "oidc-client-ts": "3.4.1",
     "postcss": "8.5.3",
     "react": "19.2.3",
@@ -57,4 +57,4 @@
     "graphql": "16.12.0",
     "graphql-request": "7.3.5"
   }
-}
+}
\ No newline at end of file
diff --git a/web/pages/settings/index.tsx b/web/pages/settings/index.tsx
index ee0cbf2..258f4d2 100644
--- a/web/pages/settings/index.tsx
+++ b/web/pages/settings/index.tsx
@@ -12,7 +12,7 @@ import {
   ThemeUtil,
   useLocale,
   useTheme,
-  useLocalStorage
+  useStorage
 } from '@helpwave/hightide'
 import type { HightideTranslationLocales, ThemeType } from '@helpwave/hightide'
 import { useTasksContext } from '@/hooks/useTasksContext'
@@ -65,11 +65,11 @@ const SettingsPage: NextPage = () => {
 
   const {
     setValue: setOnboardingSurveyCompleted
-  } = useLocalStorage('onboarding-survey-completed', 0)
+  } = useStorage({ key: 'onboarding-survey-completed', defaultValue: 0 })
 
   const {
     setValue: setWeeklySurveyLastCompleted
-  } = useLocalStorage('weekly-survey-last-completed', 0)
+  } = useStorage({ key: 'weekly-survey-last-completed', defaultValue: 0 })
 
   const handleClearCache = async () => {
     queryClient.clear()