diff --git a/app/soapbox/features/notifications/components/notification.tsx b/app/soapbox/features/notifications/components/notification.tsx
index 1bc8b1760..4bb67a322 100644
--- a/app/soapbox/features/notifications/components/notification.tsx
+++ b/app/soapbox/features/notifications/components/notification.tsx
@@ -8,9 +8,9 @@ import { reblog, favourite, unreblog, unfavourite } from 'soapbox/actions/intera
 import { openModal } from 'soapbox/actions/modals';
 import { getSettings } from 'soapbox/actions/settings';
 import { hideStatus, revealStatus } from 'soapbox/actions/statuses';
-import Account from 'soapbox/components/account';
 import Icon from 'soapbox/components/icon';
 import { HStack, Text, Emoji } from 'soapbox/components/ui';
+import AccountContainer from 'soapbox/containers/account-container';
 import StatusContainer from 'soapbox/containers/status-container';
 import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks';
 import { makeGetNotification } from 'soapbox/selectors';
@@ -287,16 +287,16 @@ const Notification: React.FC<INotificaton> = (props) => {
       case 'follow':
       case 'user_approved':
         return account && typeof account === 'object' ? (
-          <Account
-            account={account}
+          <AccountContainer
+            id={account.id}
             hidden={hidden}
             avatarSize={48}
           />
         ) : null;
       case 'follow_request':
         return account && typeof account === 'object' ? (
-          <Account
-            account={account}
+          <AccountContainer
+            id={account.id}
             hidden={hidden}
             avatarSize={48}
             actionType='follow_request'
@@ -304,8 +304,8 @@ const Notification: React.FC<INotificaton> = (props) => {
         ) : null;
       case 'move':
         return account && typeof account === 'object' && notification.target && typeof notification.target === 'object' ? (
-          <Account
-            account={notification.target}
+          <AccountContainer
+            id={notification.target.id}
             hidden={hidden}
             avatarSize={48}
           />
diff --git a/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
index 8af9d35cd..62cf2e914 100644
--- a/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
+++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
@@ -36,6 +36,7 @@ const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) =>
               account={account}
               timestamp={status.created_at}
               futureTimestamp
+              hideActions
             />
           </HStack>
         </div>