diff --git a/src/features/compose/components/compose-form.tsx b/src/features/compose/components/compose-form.tsx
index 3dcdc8c52..9dd2cee37 100644
--- a/src/features/compose/components/compose-form.tsx
+++ b/src/features/compose/components/compose-form.tsx
@@ -61,10 +61,10 @@ interface IComposeForm<ID extends string> {
   clickableAreaRef?: React.RefObject<HTMLDivElement>;
   event?: string;
   group?: string;
-  extra?: React.ReactNode;
+  withAvatar?: boolean;
 }
 
-const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickableAreaRef, event, group, extra }: IComposeForm<ID>) => {
+const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickableAreaRef, event, group, withAvatar }: IComposeForm<ID>) => {
   const history = useHistory();
   const intl = useIntl();
   const dispatch = useAppDispatch();
@@ -301,10 +301,8 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
 
       <QuotedStatusContainer composeId={id} />
 
-      {extra && <div className={clsx({ 'hidden': condensed })}>{extra}</div>}
-
       <div
-        className={clsx('flex flex-wrap items-center justify-between', {
+        className={clsx('ml-[-56px] flex flex-wrap items-center justify-between sm:ml-0', {
           'hidden': condensed,
         })}
       >
diff --git a/src/features/group/group-timeline.tsx b/src/features/group/group-timeline.tsx
index 606f252d8..935f2d4bb 100644
--- a/src/features/group/group-timeline.tsx
+++ b/src/features/group/group-timeline.tsx
@@ -77,6 +77,7 @@ const GroupTimeline: React.FC<IGroupTimeline> = (props) => {
               shouldCondense
               autoFocus={false}
               group={groupId}
+              withAvatar
             />
           </HStack>
         </div>
diff --git a/src/pages/home-page.tsx b/src/pages/home-page.tsx
index 08370963a..175384bcb 100644
--- a/src/pages/home-page.tsx
+++ b/src/pages/home-page.tsx
@@ -73,6 +73,7 @@ const HomePage: React.FC<IHomePage> = ({ children }) => {
                     shouldCondense
                     autoFocus={false}
                     clickableAreaRef={composeBlock}
+                    withAvatar
                   />
                 </div>
               </HStack>