diff --git a/packages/pl-fe/src/features/account/components/header.tsx b/packages/pl-fe/src/features/account/components/header.tsx
index 6f5d2af4a..150e1ed70 100644
--- a/packages/pl-fe/src/features/account/components/header.tsx
+++ b/packages/pl-fe/src/features/account/components/header.tsx
@@ -10,6 +10,7 @@ import { biteAccount, blockAccount, pinAccount, removeFromFollowers, unblockAcco
 import { mentionCompose, directCompose } from 'pl-fe/actions/compose';
 import { initReport, ReportableEntities } from 'pl-fe/actions/reports';
 import { useFollow } from 'pl-fe/api/hooks/accounts/use-follow';
+import Account from 'pl-fe/components/account';
 import AltIndicator from 'pl-fe/components/alt-indicator';
 import Badge from 'pl-fe/components/badge';
 import DropdownMenu, { Menu } from 'pl-fe/components/dropdown-menu';
@@ -39,7 +40,7 @@ import { isDefaultHeader } from 'pl-fe/utils/accounts';
 import copy from 'pl-fe/utils/copy';
 
 import type { PlfeResponse } from 'pl-fe/api';
-import type { Account } from 'pl-fe/normalizers/account';
+import type { Account as AccountEntity } from 'pl-fe/normalizers/account';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -122,7 +123,7 @@ const MovedNote: React.FC<IMovedNote> = ({ from, to }) => (
 );
 
 interface IHeader {
-  account?: Account;
+  account?: AccountEntity;
 }
 
 const Header: React.FC<IHeader> = ({ account }) => {
@@ -711,7 +712,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
   return (
     <div className='-mx-4 -mt-4 sm:-mx-6 sm:-mt-6'>
       {(account.moved && typeof account.moved === 'object') && (
-        <MovedNote from={account} to={account.moved as Account} />
+        <MovedNote from={account} to={account.moved as AccountEntity} />
       )}
 
       <div>
diff --git a/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx
index 9c7f0021e..18c215f25 100644
--- a/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/group-media-panel.tsx
@@ -5,7 +5,7 @@ import Spinner from 'pl-fe/components/ui/spinner';
 import Text from 'pl-fe/components/ui/text';
 import Widget from 'pl-fe/components/ui/widget';
 import { type AccountGalleryAttachment, useGroupGallery } from 'pl-fe/hooks/use-account-gallery';
-import MediaItem from 'pl-fe/pages/accounts/account-gallery';
+import { MediaItem } from 'pl-fe/pages/accounts/account-gallery';
 import { useModalsStore } from 'pl-fe/stores/modals';
 
 import type { Group } from 'pl-fe/normalizers/group';
diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx
index 05db76537..772e4a02d 100644
--- a/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/profile-media-panel.tsx
@@ -5,7 +5,7 @@ import Spinner from 'pl-fe/components/ui/spinner';
 import Text from 'pl-fe/components/ui/text';
 import Widget from 'pl-fe/components/ui/widget';
 import { type AccountGalleryAttachment, useAccountGallery } from 'pl-fe/hooks/use-account-gallery';
-import MediaItem from 'pl-fe/pages/accounts/account-gallery';
+import { MediaItem } from 'pl-fe/pages/accounts/account-gallery';
 import { useModalsStore } from 'pl-fe/stores/modals';
 
 import type { Account } from 'pl-fe/normalizers/account';
diff --git a/packages/pl-fe/src/pages/groups/group-gallery.tsx b/packages/pl-fe/src/pages/groups/group-gallery.tsx
index a52e13ba8..ec20c7928 100644
--- a/packages/pl-fe/src/pages/groups/group-gallery.tsx
+++ b/packages/pl-fe/src/pages/groups/group-gallery.tsx
@@ -7,7 +7,7 @@ import MissingIndicator from 'pl-fe/components/missing-indicator';
 import Column from 'pl-fe/components/ui/column';
 import Spinner from 'pl-fe/components/ui/spinner';
 import { type AccountGalleryAttachment, useGroupGallery } from 'pl-fe/hooks/use-account-gallery';
-import MediaItem from 'pl-fe/pages/accounts/account-gallery';
+import { MediaItem } from 'pl-fe/pages/accounts/account-gallery';
 import { useModalsStore } from 'pl-fe/stores/modals';
 
 interface IGroupGallery {
diff --git a/packages/pl-fe/src/pages/notifications/notifications.tsx b/packages/pl-fe/src/pages/notifications/notifications.tsx
index 63fb23576..2bffd338b 100644
--- a/packages/pl-fe/src/pages/notifications/notifications.tsx
+++ b/packages/pl-fe/src/pages/notifications/notifications.tsx
@@ -25,7 +25,6 @@ import { useAppSelector } from 'pl-fe/hooks/use-app-selector';
 import { useFeatures } from 'pl-fe/hooks/use-features';
 import { useSettings } from 'pl-fe/hooks/use-settings';
 
-
 import type { Item } from 'pl-fe/components/ui/tabs';
 import type { RootState } from 'pl-fe/store';
 import type { VirtuosoHandle } from 'react-virtuoso';