diff --git a/src/components/ui/DateDivider.tsx b/src/components/ui/DateDivider.tsx
index 14f41d7f..c192cb60 100644
--- a/src/components/ui/DateDivider.tsx
+++ b/src/components/ui/DateDivider.tsx
@@ -12,9 +12,10 @@ const Base = styled.div<{ unread?: boolean }>`
 
     time {
         margin-top: -2px;
-        font-size: 0.6875rem;
-        line-height: 0.6875rem;
-        padding: 2px 5px 2px 0;
+        font-size: .6875rem;
+        line-height: .6875rem;
+        padding: 2px 0 2px 0;
+        padding-inline-end: 5px;
         color: var(--tertiary-foreground);
         background: var(--primary-background);
     }
diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx
index 96467728..b3e3de60 100644
--- a/src/lib/ContextMenus.tsx
+++ b/src/lib/ContextMenus.tsx
@@ -10,7 +10,7 @@ import {
     LeftArrowAlt,
     Trash,
 } from "@styled-icons/boxicons-regular";
-import { Cog } from "@styled-icons/boxicons-solid";
+import { Cog, UserVoice } from "@styled-icons/boxicons-solid";
 import { useHistory } from "react-router-dom";
 import {
     Attachment,
@@ -924,24 +924,23 @@ function ContextMenus(props: Props) {
                             <Text id={`app.status.invisible`} />
                         </MenuItem>
                         <LineDivider />
-                        <div className="header">
-                            <div className="main">
                                 <MenuItem
                                     data={{ action: "set_status" }}
                                     disabled={!isOnline}>
+                                    <UserVoice size={18} />
                                     <Text
                                         id={`app.context_menu.custom_status`}
                                     />
-                                </MenuItem>
-                            </div>
-                            {client.user!.status?.text && (
+                                    {client.user!.status?.text && (
                                 <IconButton>
                                     <MenuItem data={{ action: "clear_status" }}>
                                         <Trash size={18} />
                                     </MenuItem>
                                 </IconButton>
                             )}
-                        </div>
+                                </MenuItem>
+                                
+                            
                     </>
                 )}
             </ContextMenuWithData>