diff --git a/web/chat/chat-thread-list-item-menu.react.js b/web/chat/chat-thread-list-item-menu.react.js
index 22fad99a9..42154a3f0 100644
--- a/web/chat/chat-thread-list-item-menu.react.js
+++ b/web/chat/chat-thread-list-item-menu.react.js
@@ -1,99 +1,94 @@
 // @flow
 
 import classNames from 'classnames';
 import * as React from 'react';
 
 import {
   setThreadUnreadStatusActionTypes,
   setThreadUnreadStatus,
 } from 'lib/actions/activity-actions';
 import type {
   SetThreadUnreadStatusPayload,
   SetThreadUnreadStatusRequest,
 } from 'lib/types/activity-types';
 import type { ThreadInfo } from 'lib/types/thread-types';
 import {
   useServerCall,
   useDispatchActionPromise,
 } from 'lib/utils/action-utils';
 
 import SWMansionIcon from '../SWMansionIcon.react';
 import css from './chat-thread-list.css';
 
 type Props = {
   +threadInfo: ThreadInfo,
   +mostRecentNonLocalMessage: ?string,
   +renderStyle?: 'chat' | 'thread',
 };
 function ChatThreadListItemMenu(props: Props): React.Node {
   const { renderStyle = 'chat' } = props;
   const [menuVisible, setMenuVisible] = React.useState(false);
 
   const toggleMenu = React.useCallback(() => {
     setMenuVisible(!menuVisible);
   }, [menuVisible]);
 
   const hideMenu = React.useCallback(() => {
     setMenuVisible(false);
   }, []);
 
   const { threadInfo, mostRecentNonLocalMessage } = props;
   const dispatchActionPromise = useDispatchActionPromise();
   const boundSetThreadUnreadStatus: (
     request: SetThreadUnreadStatusRequest,
   ) => Promise<SetThreadUnreadStatusPayload> = useServerCall(
     setThreadUnreadStatus,
   );
   const toggleUnreadStatus = React.useCallback(() => {
     const { unread } = threadInfo.currentUser;
     const request = {
       threadID: threadInfo.id,
       unread: !unread,
       latestMessage: mostRecentNonLocalMessage,
     };
     dispatchActionPromise(
       setThreadUnreadStatusActionTypes,
       boundSetThreadUnreadStatus(request),
       undefined,
       {
         threadID: threadInfo.id,
         unread: !unread,
       },
     );
     hideMenu();
   }, [
     threadInfo,
     mostRecentNonLocalMessage,
     dispatchActionPromise,
     hideMenu,
     boundSetThreadUnreadStatus,
   ]);
 
   const toggleUnreadStatusButtonText = `Mark as ${
     threadInfo.currentUser.unread ? 'read' : 'unread'
   }`;
 
   const menuIconSize = renderStyle === 'chat' ? 24 : 16;
+  const btnCls = classNames(css.menuContent, {
+    [css.menuContentVisible]: menuVisible,
+  });
   return (
     <div className={css.menu} onMouseLeave={hideMenu}>
       <button onClick={toggleMenu}>
         <SWMansionIcon icon="menu-vertical" size={menuIconSize} />
       </button>
-      <div
-        className={classNames(css.menuContent, {
-          [css.menuContentVisible]: menuVisible,
-        })}
-      >
-        <ul>
-          <li>
-            <button onClick={toggleUnreadStatus}>
-              {toggleUnreadStatusButtonText}
-            </button>
-          </li>
-        </ul>
+      <div>
+        <button className={btnCls} onClick={toggleUnreadStatus}>
+          {toggleUnreadStatusButtonText}
+        </button>
       </div>
     </div>
   );
 }
 
 export default ChatThreadListItemMenu;
diff --git a/web/chat/chat-thread-list.css b/web/chat/chat-thread-list.css
index 293719439..4379035c5 100644
--- a/web/chat/chat-thread-list.css
+++ b/web/chat/chat-thread-list.css
@@ -1,304 +1,299 @@
 div.thread {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
   padding-top: 4px;
   padding-bottom: 4px;
   padding-right: 10px;
 }
 div.threadListSideBar {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
   padding-bottom: 4px;
   padding-left: 16px;
   padding-right: 10px;
   position: relative;
 }
 div.threadListSideBar > svg {
   position: absolute;
   top: -13px;
   left: 30px;
 }
 div.thread:first-child {
   padding-top: 6px;
 }
 div.activeThread,
 div.thread:hover {
   background: var(--selected-thread-bg);
 }
 div.thread div.title {
   flex: 1;
   font-size: var(--m-font-16);
   font-weight: var(--semi-bold);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   color: var(--thread-color-read);
   line-height: var(--line-height-text);
 }
 a.threadButton {
   flex: 1;
   cursor: pointer;
   overflow: hidden;
   padding-left: 8px;
 }
 .threadButtonSidebar {
   flex: 1;
   cursor: pointer;
   overflow: hidden;
   padding-left: 8px;
 }
 p.breadCrumbs {
   display: flex;
   font-size: var(--xs-font-12);
   font-weight: var(--normal);
   color: var(--breadcrumb-color);
 }
 p.breadCrumbs.unread {
   color: var(--breadcrumb-color-unread);
 }
 span.breadCrumb {
   display: flex;
   align-items: center;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 
 div.colorContainer {
   display: flex;
 }
 
 div.spacer,
 div.colorSplotch {
   height: 40px;
   width: 40px;
   border-radius: 1.68px;
 }
 div.lastActivity {
   font-size: var(--xxs-font-10);
   color: var(--fg);
   line-height: 1.5;
   font-weight: var(--semi-bold);
   white-space: nowrap;
 }
 
 div.lastMessage {
   font-size: 16px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   flex: 1;
 }
 div.threadRow > .lastMessage {
   color: var(--thread-last-message-color-read);
   font-size: var(--s-font-14);
 }
 div.thread.activeThread a {
   color: red;
 }
 div.unread {
   color: var(--fg);
   font-weight: var(--semi-bold);
 }
 div.lastMessage.black {
   color: var(--fg);
 }
 div.dark {
   color: var(--thread-color-read);
 }
 .light {
   color: var(--thread-from-color-read);
 }
 div.dotContainer {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 16px;
 }
 div.unreadDot {
   height: 4px;
   width: 4px;
   background: var(--fg);
   border-radius: 15px;
   align-self: center;
 }
 div.italic {
   font-style: italic;
 }
 div.sidebarTitle {
   flex: 1;
   font-size: 15px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   color: var(--thread-color-read);
   align-self: flex-start;
 }
 div.sidebarLastActivity {
   white-space: nowrap;
   font-size: var(--xxs-font-10);
   line-height: var(--line-height-text);
   font-weight: var(--semi-bold);
 }
 svg.sidebarIcon {
   color: var(--thread-color-read);
   padding: 0 6px;
   font-size: 20px;
 }
 div.sidebar .menu > button svg {
   font-size: 16px;
   color: var(--thread-color-read);
 }
 div.sidebar .menu {
   opacity: 0;
 }
 div.sidebar:hover .menu {
   display: flex;
   align-self: flex-end;
   opacity: 1;
 }
 .menu {
   position: relative;
   display: flex;
   justify-content: flex-end;
 }
 .menu > button {
   background-color: transparent;
   color: var(--thread-color-read);
   border: none;
   cursor: pointer;
   display: flex;
   align-items: center;
 }
 
 .menu > button:focus {
   outline: none;
 }
 
 .menuContent {
   display: none;
   position: absolute;
   top: calc(100% + 1px);
   right: 0;
   z-index: 1;
   width: max-content;
   overflow: hidden;
   background-color: #eeeeee;
   border-radius: 5px;
   box-shadow: 1px 1px 5px 2px #00000022;
 }
 .menuContentVisible {
   display: block;
 }
-.menuContent ul {
-  list-style: none;
-}
-.menuContent li:not(:last-child) {
-  border-bottom: 1px solid #dddddd;
-}
-.menuContent button {
+
+button.menuContent {
   border: none;
   cursor: pointer;
   padding: 10px;
   font-size: 16px;
 }
-.menuContent button:hover {
+button.menuContent:hover {
   background-color: #dddddd;
 }
 
 ul.list {
   margin: 5px 3px 10px 0px;
   overflow: auto;
 }
 
 div.search {
   display: flex;
   background-color: #dddddd;
   border-radius: 5px;
   padding: 3px 5px;
   align-items: center;
 }
 svg.searchVector {
   fill: #aaaaaa;
   height: 22px;
   width: 22px;
   padding: 0 3px;
   margin-left: 8px;
 }
 div.search > input {
   color: black;
   padding: 0;
   border: none;
   background-color: #dddddd;
   font-weight: 600;
   font-size: 15px;
   flex-grow: 1;
   margin-left: 3px;
 }
 div.search > input:focus {
   outline: none;
 }
 svg.clearQuery {
   font-size: 15px;
   padding-bottom: 1px;
   padding-right: 2px;
   color: #aaaaaa;
 }
 svg.clearQuery:hover {
   font-size: 15px;
   padding-bottom: 1px;
   padding-right: 2px;
   color: white;
 }
 
 div.spacer {
   height: 6px;
 }
 
 div.emptyItem {
   padding: 10px;
   font-size: 16px;
   text-align: center;
   white-space: pre-wrap;
   color: var(--fg);
 }
 
 div.threadListContainer {
   display: flex;
   flex-direction: column;
 }
 
 div.searchContainer {
   background-color: var(--text-input-bg);
   display: flex;
   align-items: center;
   margin: 1rem;
 }
 
 input.searchInput {
   background-color: var(--text-input-bg);
   font-size: var(--s-font-14);
   padding: 1rem;
   flex: 1;
   border: none;
   color: var(--text-input-color);
   outline: none;
 }
 
 input.searchInput::placeholder {
   color: var(--text-input-placeholder);
 }
 
 button.clearSearch {
   color: var(--text-input-color);
   transition: ease-in-out 0.15s;
   border: none;
   padding: 0 1rem;
   font-size: var(--m-font-16);
   background: none;
 }
 
 button.clearSearchDisabled {
   opacity: 0;
 }