diff --git a/webapp/channels/src/components/drafts/draft_actions/__snapshots__/action.test.tsx.snap b/webapp/channels/src/components/drafts/draft_actions/__snapshots__/action.test.tsx.snap
index a6f03bd5d07..66b8ce6821f 100644
--- a/webapp/channels/src/components/drafts/draft_actions/__snapshots__/action.test.tsx.snap
+++ b/webapp/channels/src/components/drafts/draft_actions/__snapshots__/action.test.tsx.snap
@@ -4,27 +4,10 @@ exports[`components/drafts/draft_actions/action should match snapshot 1`] = `
 <div
   className="DraftAction"
 >
-  <OverlayTrigger
-    className="hidden-xs"
-    defaultOverlayShown={false}
-    delayShow={400}
-    overlay={
-      <Tooltip
-        bsClass="tooltip"
-        className="hidden-xs"
-        id="tooltip_"
-        placement="right"
-      >
-        
-      </Tooltip>
-    }
+  <WithTooltip
+    id="drafts_action_tooltip_"
     placement="top"
-    trigger={
-      Array [
-        "hover",
-        "focus",
-      ]
-    }
+    title=""
   >
     <button
       className="DraftAction__button"
@@ -35,6 +18,6 @@ exports[`components/drafts/draft_actions/action should match snapshot 1`] = `
         className="icon "
       />
     </button>
-  </OverlayTrigger>
+  </WithTooltip>
 </div>
 `;
diff --git a/webapp/channels/src/components/drafts/draft_actions/action.tsx b/webapp/channels/src/components/drafts/draft_actions/action.tsx
index a8b32d90c0d..9c966f4da5c 100644
--- a/webapp/channels/src/components/drafts/draft_actions/action.tsx
+++ b/webapp/channels/src/components/drafts/draft_actions/action.tsx
@@ -3,37 +3,25 @@
 
 import classNames from 'classnames';
 import React from 'react';
-import {Tooltip} from 'react-bootstrap';
-
-import OverlayTrigger from 'components/overlay_trigger';
-
-import Constants from 'utils/constants';
 
 import './action.scss';
+import WithTooltip from 'components/with_tooltip';
 
 type Props = {
     icon: string;
     id: string;
     name: string;
     onClick: (e: React.MouseEvent<HTMLButtonElement>) => void;
-    tooltipText: React.ReactNode;
+    tooltipText: React.ReactElement | string;
 };
 
 function Action({name, icon, onClick, id, tooltipText}: Props) {
     return (
         <div className='DraftAction'>
-            <OverlayTrigger
-                className='hidden-xs'
-                delayShow={Constants.OVERLAY_TIME_DELAY}
+            <WithTooltip
+                id={`drafts_action_tooltip_${id}`}
                 placement='top'
-                overlay={
-                    <Tooltip
-                        id={`tooltip_${id}`}
-                        className='hidden-xs'
-                    >
-                        {tooltipText}
-                    </Tooltip>
-                }
+                title={tooltipText}
             >
                 <button
                     className={classNames(
@@ -45,7 +33,7 @@ function Action({name, icon, onClick, id, tooltipText}: Props) {
                 >
                     <i className={`icon ${icon}`}/>
                 </button>
-            </OverlayTrigger>
+            </WithTooltip>
         </div>
     );
 }