diff --git a/webapp/channels/src/components/threading/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap b/webapp/channels/src/components/threading/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap
index 5831e6c4b7..a27b12e5a6 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap
+++ b/webapp/channels/src/components/threading/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap
@@ -45,14 +45,15 @@ exports[`components/threading/global_threads/thread_item should report total num
       threadId="1y8hpek81byspd4enyk9mp1ncw"
       unreadTimestamp={1611786714912}
     >
-      <SimpleTooltip
-        content={
+      <WithTooltip
+        id="threadActionMenu"
+        placement="top"
+        title={
           <Memo(MemoizedFormattedMessage)
             defaultMessage="Actions"
             id="threading.threadItem.menu"
           />
         }
-        id="threadActionMenu"
       >
         <Memo(Button)
           className="Button___icon"
@@ -62,7 +63,7 @@ exports[`components/threading/global_threads/thread_item should report total num
             size={18}
           />
         </Memo(Button)>
-      </SimpleTooltip>
+      </WithTooltip>
     </Memo(ThreadMenu)>
   </div>
   <div
@@ -169,14 +170,15 @@ exports[`components/threading/global_threads/thread_item should report unread me
       threadId="1y8hpek81byspd4enyk9mp1ncw"
       unreadTimestamp={1611786714912}
     >
-      <SimpleTooltip
-        content={
+      <WithTooltip
+        id="threadActionMenu"
+        placement="top"
+        title={
           <Memo(MemoizedFormattedMessage)
             defaultMessage="Actions"
             id="threading.threadItem.menu"
           />
         }
-        id="threadActionMenu"
       >
         <Memo(Button)
           className="Button___icon"
@@ -186,7 +188,7 @@ exports[`components/threading/global_threads/thread_item should report unread me
             size={18}
           />
         </Memo(Button)>
-      </SimpleTooltip>
+      </WithTooltip>
     </Memo(ThreadMenu)>
   </div>
   <div
@@ -291,14 +293,15 @@ exports[`components/threading/global_threads/thread_item should report unread me
       threadId="1y8hpek81byspd4enyk9mp1ncw"
       unreadTimestamp={1611786714912}
     >
-      <SimpleTooltip
-        content={
+      <WithTooltip
+        id="threadActionMenu"
+        placement="top"
+        title={
           <Memo(MemoizedFormattedMessage)
             defaultMessage="Actions"
             id="threading.threadItem.menu"
           />
         }
-        id="threadActionMenu"
       >
         <Memo(Button)
           className="Button___icon"
@@ -308,7 +311,7 @@ exports[`components/threading/global_threads/thread_item should report unread me
             size={18}
           />
         </Memo(Button)>
-      </SimpleTooltip>
+      </WithTooltip>
     </Memo(ThreadMenu)>
   </div>
   <div
diff --git a/webapp/channels/src/components/threading/global_threads/thread_item/thread_item.tsx b/webapp/channels/src/components/threading/global_threads/thread_item/thread_item.tsx
index 4b1fa88bfa..d39f8ef537 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_item/thread_item.tsx
+++ b/webapp/channels/src/components/threading/global_threads/thread_item/thread_item.tsx
@@ -28,9 +28,9 @@ import PriorityBadge from 'components/post_priority/post_priority_badge';
 import Button from 'components/threading/common/button';
 import Timestamp from 'components/timestamp';
 import CRTListTutorialTip from 'components/tours/crt_tour/crt_list_tutorial_tip';
-import SimpleTooltip from 'components/widgets/simple_tooltip';
 import Tag from 'components/widgets/tag/tag';
 import Avatars from 'components/widgets/users/avatars';
+import WithTooltip from 'components/with_tooltip';
 
 import {CrtTutorialSteps, Preferences} from 'utils/constants';
 import * as Utils from 'utils/utils';
@@ -225,9 +225,10 @@ function ThreadItem({
                     hasUnreads={Boolean(newReplies)}
                     unreadTimestamp={unreadTimestamp}
                 >
-                    <SimpleTooltip
+                    <WithTooltip
                         id='threadActionMenu'
-                        content={(
+                        placement='top'
+                        title={(
                             <FormattedMessage
                                 id='threading.threadItem.menu'
                                 defaultMessage='Actions'
@@ -240,7 +241,7 @@ function ThreadItem({
                         >
                             <DotsVerticalIcon size={18}/>
                         </Button>
-                    </SimpleTooltip>
+                    </WithTooltip>
                 </ThreadMenu>
             </div>
             <div