diff --git a/packages/features/accounts/src/components/account-selector.tsx b/packages/features/accounts/src/components/account-selector.tsx
index 95c3776a6..acf096d81 100644
--- a/packages/features/accounts/src/components/account-selector.tsx
+++ b/packages/features/accounts/src/components/account-selector.tsx
@@ -86,7 +86,7 @@ export function AccountSelector({
     pictureUrl ? (
       <UserAvatar pictureUrl={pictureUrl} />
     ) : (
-      <PersonIcon className="h-5 min-h-5 w-5 min-w-5" />
+      <PersonIcon className="h-5 w-5" />
     );
 
   return (
diff --git a/packages/ui/src/makerkit/image-uploader.tsx b/packages/ui/src/makerkit/image-uploader.tsx
index dc25d6fac..3e619fadc 100644
--- a/packages/ui/src/makerkit/image-uploader.tsx
+++ b/packages/ui/src/makerkit/image-uploader.tsx
@@ -72,7 +72,12 @@ export function ImageUploader(
   return (
     <div className={'flex items-center space-x-4'}>
       <label className={'animate-in fade-in zoom-in-50 relative h-20 w-20'}>
-        <Image fill className={'h-20 w-20 rounded-full'} src={image} alt={''} />
+        <Image
+          fill
+          className={'h-20 w-20 rounded-full object-cover'}
+          src={image}
+          alt={''}
+        />
 
         <Input />
       </label>
diff --git a/packages/ui/src/shadcn/avatar.tsx b/packages/ui/src/shadcn/avatar.tsx
index 9be32d1e0..9a3192afd 100644
--- a/packages/ui/src/shadcn/avatar.tsx
+++ b/packages/ui/src/shadcn/avatar.tsx
@@ -23,7 +23,7 @@ const AvatarImage: React.FC<
   React.ComponentPropsWithRef<typeof AvatarPrimitive.Image>
 > = ({ className, ...props }) => (
   <AvatarPrimitive.Image
-    className={cn('aspect-square h-full w-full', className)}
+    className={cn('aspect-square h-full w-full object-cover', className)}
     {...props}
   />
 );