diff --git a/app/home/(user)/_components/home-menu-navigation.tsx b/app/home/(user)/_components/home-menu-navigation.tsx
index 6ac1742..e8776a1 100644
--- a/app/home/(user)/_components/home-menu-navigation.tsx
+++ b/app/home/(user)/_components/home-menu-navigation.tsx
@@ -28,7 +28,7 @@ export function HomeMenuNavigation(props: { workspace: UserWorkspace }) {
       />
 
       <div className="flex items-center justify-end gap-3">
-        <Button className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' variant={'ghost'}>
+        <Button className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' variant='ghost'>
           <span className='flex items-center text-nowrap'>€ 231,89</span>
         </Button>
         <Button variant="ghost" className='relative px-4 py-2 h-10 border-1 mr-0 cursor-pointer' >
diff --git a/packages/features/accounts/src/components/account-selector.tsx b/packages/features/accounts/src/components/account-selector.tsx
index ab7965f..f9cee97 100644
--- a/packages/features/accounts/src/components/account-selector.tsx
+++ b/packages/features/accounts/src/components/account-selector.tsx
@@ -124,7 +124,7 @@ export function AccountSelector({
               condition={selected}
               fallback={
                 <span
-                  className={cn('flex max-w-full items-center w-4 h-4', {
+                  className={cn('flex max-w-full items-center size-4', {
                     'justify-center gap-x-0': collapsed,
                     'gap-x-4': !collapsed,
                   })}
@@ -148,7 +148,7 @@ export function AccountSelector({
                     'gap-x-4': !collapsed,
                   })}
                 >
-                  <Avatar className={'rounded-md h-6 w-6'}>
+                  <Avatar className={'rounded-md size-6'}>
                     <AvatarImage src={account.image ?? undefined} />
 
                     <AvatarFallback
@@ -297,7 +297,7 @@ export function AccountSelector({
 
 function UserAvatar(props: { pictureUrl?: string }) {
   return (
-    <Avatar className={'rounded-md h-6 w-6'}>
+    <Avatar className={'rounded-md size-6'}>
       <AvatarImage src={props.pictureUrl} />
     </Avatar>
   );
diff --git a/packages/features/notifications/src/components/notifications-popover.tsx b/packages/features/notifications/src/components/notifications-popover.tsx
index 2069bbb..96030fc 100644
--- a/packages/features/notifications/src/components/notifications-popover.tsx
+++ b/packages/features/notifications/src/components/notifications-popover.tsx
@@ -121,8 +121,8 @@ export function NotificationsPopover(params: {
   return (
     <Popover modal open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
-        <Button className={'relative px-4 py-2 h-10 border-1 mr-0'} variant={'ghost'}>
-          <Bell className={'h-4 w-4'} />
+        <Button className={'relative px-4 py-2 h-10 border-1 mr-0'} variant="ghost">
+          <Bell className={'size-4'} />
 
           <span
             className={cn(
diff --git a/packages/ui/src/makerkit/profile-avatar.tsx b/packages/ui/src/makerkit/profile-avatar.tsx
index c8b3cb8..aa12d98 100644
--- a/packages/ui/src/makerkit/profile-avatar.tsx
+++ b/packages/ui/src/makerkit/profile-avatar.tsx
@@ -18,7 +18,7 @@ type ProfileAvatarProps = (SessionProps | TextProps) & {
 export function ProfileAvatar(props: ProfileAvatarProps) {
   const avatarClassName = cn(
     props.className,
-    'mx-auto h-6 w-6 group-focus:ring-2',
+    'mx-auto size-6 group-focus:ring-2',
   );
 
   if ('text' in props) {