diff --git a/app/soapbox/components/account.tsx b/app/soapbox/components/account.tsx
index 83c469450..ab9c7af68 100644
--- a/app/soapbox/components/account.tsx
+++ b/app/soapbox/components/account.tsx
@@ -5,7 +5,7 @@ import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
 import VerificationBadge from 'soapbox/components/verification_badge';
 import ActionButton from 'soapbox/features/ui/components/action_button';
 import { useAppSelector, useOnScreen } from 'soapbox/hooks';
-import { getAcct } from 'soapbox/utils/accounts';
+import { getAcct, getDomain } from 'soapbox/utils/accounts';
 import { displayFqn } from 'soapbox/utils/state';
 
 import RelativeTimestamp from './relative_timestamp';
@@ -128,6 +128,9 @@ const Account = ({
 
   const LinkEl: any = showProfileHoverCard ? Link : 'div';
 
+  const favicon = account.pleroma.get('favicon');
+  const domain = getDomain(account);
+
   return (
     <div data-testid='account' className='flex-shrink-0 group block w-full' ref={overflowRef}>
       <HStack alignItems={actionAlignment} justifyContent='between'>
@@ -171,6 +174,12 @@ const Account = ({
             <HStack alignItems='center' space={1} style={style}>
               <Text theme='muted' size='sm' truncate>@{username}</Text>
 
+              {favicon && (
+                <Link to={`/timeline/${domain}`} className='w-4 h-4'>
+                  <img src={favicon} alt='' title={domain} className='w-full max-h-full' />
+                </Link>
+              )}
+
               {(timestamp) ? (
                 <>
                   <Text tag='span' theme='muted' size='sm'>&middot;</Text>
diff --git a/app/soapbox/components/status_list.js b/app/soapbox/components/status_list.js
index 251aedae4..327820f6f 100644
--- a/app/soapbox/components/status_list.js
+++ b/app/soapbox/components/status_list.js
@@ -134,19 +134,15 @@ export default class StatusList extends ImmutablePureComponent {
     const idempotencyKey = statusId.replace(/^末pending-/, '');
 
     return (
-      <div className='material-status' key={statusId}>
-        <div className='material-status__status focusable'>
-          <PendingStatus
-            key={statusId}
-            idempotencyKey={idempotencyKey}
-            onMoveUp={this.handleMoveUp}
-            onMoveDown={this.handleMoveDown}
-            contextType={timelineId}
-            group={group}
-            withGroupAdmin={withGroupAdmin}
-          />
-        </div>
-      </div>
+      <PendingStatus
+        key={statusId}
+        idempotencyKey={idempotencyKey}
+        onMoveUp={this.handleMoveUp}
+        onMoveDown={this.handleMoveDown}
+        contextType={timelineId}
+        group={group}
+        withGroupAdmin={withGroupAdmin}
+      />
     );
   }
 
diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx
index 0095f0822..739fe4ad0 100644
--- a/app/soapbox/features/status/components/detailed-status.tsx
+++ b/app/soapbox/features/status/components/detailed-status.tsx
@@ -3,11 +3,9 @@ import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage, injectIntl, WrappedComponentProps as IntlProps } from 'react-intl';
 import { FormattedDate } from 'react-intl';
-import { Link } from 'react-router-dom';
 
 import Icon from 'soapbox/components/icon';
 import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container';
-import { getDomain } from 'soapbox/utils/accounts';
 
 import MediaGallery from '../../../components/media_gallery';
 import StatusContent from '../../../components/status_content';
@@ -110,9 +108,6 @@ class DetailedStatus extends ImmutablePureComponent<IDetailedStatus, IDetailedSt
 
     const outerStyle: React.CSSProperties = { boxSizing: 'border-box' };
     const { compact } = this.props;
-    const favicon = account.getIn(['pleroma', 'favicon']);
-    const domain = getDomain(account);
-
 
     let media = null;
     let statusTypeIcon = null;
@@ -244,14 +239,6 @@ class DetailedStatus extends ImmutablePureComponent<IDetailedStatus, IDetailedSt
             <StatusInteractionBar status={status} />
 
             <div className='detailed-status__timestamp'>
-              {typeof favicon === 'string' && (
-                <div className='status__favicon'>
-                  <Link to={`/timeline/${domain}`}>
-                    <img src={favicon} alt='' title={domain} />
-                  </Link>
-                </div>
-              )}
-
               {statusTypeIcon}
 
               <a href={status.url} target='_blank' rel='noopener' className='hover:underline'>
diff --git a/app/soapbox/features/ui/components/pending_status.js b/app/soapbox/features/ui/components/pending_status.js
index 05ec179af..e8da15a73 100644
--- a/app/soapbox/features/ui/components/pending_status.js
+++ b/app/soapbox/features/ui/components/pending_status.js
@@ -3,17 +3,14 @@ import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
-import { Link, NavLink } from 'react-router-dom';
 
-import Avatar from 'soapbox/components/avatar';
-import DisplayName from 'soapbox/components/display_name';
-import RelativeTimestamp from 'soapbox/components/relative_timestamp';
 import StatusContent from 'soapbox/components/status_content';
 import StatusReplyMentions from 'soapbox/components/status_reply_mentions';
+import { HStack } from 'soapbox/components/ui';
+import AccountContainer from 'soapbox/containers/account_container';
 import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card';
 import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder_media_gallery';
 import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container';
-import { getDomain } from 'soapbox/utils/accounts';
 
 import { buildStatus } from '../util/pending_status_builder';
 
@@ -56,50 +53,36 @@ class PendingStatus extends ImmutablePureComponent {
     if (!status) return null;
     if (!status.get('account')) return null;
 
-    const favicon = status.getIn(['account', 'pleroma', 'favicon']);
-    const domain = getDomain(status.get('account'));
-
     return (
-      <div className={classNames('pending-status', className)}>
-        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id') })} tabIndex={this.props.muted ? null : 0}>
-          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
-            <div className='status__expand' role='presentation' />
-            <div className='status__info'>
-              <span className='status__relative-time'>
-                <RelativeTimestamp timestamp={status.get('created_at')} />
-              </span>
-
-              {favicon &&
-                <div className='status__favicon'>
-                  <Link to={`/timeline/${domain}`}>
-                    <img src={favicon} alt='' title={domain} />
-                  </Link>
-                </div>}
-
-              <div className='status__profile'>
-                <div className='status__avatar'>
-                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])}>
-                    <Avatar account={status.get('account')} size={48} />
-                  </NavLink>
-                </div>
-                <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name'>
-                  <DisplayName account={status.get('account')} />
-                </NavLink>
-              </div>
+      <div className={classNames('opacity-50', className)}>
+        <div className={classNames('status', { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
+          <div className={classNames('status__wrapper', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id') })} tabIndex={this.props.muted ? null : 0}>
+            <div className='mb-4'>
+              <HStack justifyContent='between' alignItems='start'>
+                <AccountContainer
+                  key={String(status.getIn(['account', 'id']))}
+                  id={String(status.getIn(['account', 'id']))}
+                  timestamp={status.created_at}
+                  timestampUrl={status.get('created_at')}
+                  hideActions
+                />
+              </HStack>
             </div>
 
-            <StatusReplyMentions status={status} />
+            <div className='status__content-wrapper'>
+              <StatusReplyMentions status={status} />
 
-            <StatusContent
-              status={status}
-              expanded
-              collapsable
-            />
+              <StatusContent
+                status={status}
+                expanded
+                collapsable
+              />
 
-            {this.renderMedia()}
-            {status.get('poll') && <PollPreview poll={status.get('poll')} />}
+              {this.renderMedia()}
+              {status.get('poll') && <PollPreview poll={status.get('poll')} />}
 
-            {status.get('quote') && <QuotedStatus statusId={status.get('quote')} />}
+              {status.get('quote') && <QuotedStatus statusId={status.get('quote')} />}
+            </div>
 
             {/* TODO */}
             {/* <PlaceholderActionBar /> */}
diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss
index a7906dc8b..1b14592a8 100644
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@@ -71,8 +71,7 @@
     }
   }
 
-  .svg-icon,
-  .status__favicon {
+  .svg-icon {
     margin-right: 5px;
   }
 }
diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss
index 5edbe2e52..6a914daa9 100644
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@@ -656,7 +656,3 @@ a.status-card {
     bottom: 0;
   }
 }
-
-.pending-status {
-  opacity: 0.5;
-}