diff --git a/webapp/channels/src/components/profile_popover/profile_popover.scss b/webapp/channels/src/components/profile_popover/profile_popover.scss
index 49707bc2a2..12658e491e 100644
--- a/webapp/channels/src/components/profile_popover/profile_popover.scss
+++ b/webapp/channels/src/components/profile_popover/profile_popover.scss
@@ -223,5 +223,12 @@
                 row-gap: 4px;
             }
         }
+
+        button#startCallButton {
+            &.icon-btn-disabled {
+                cursor: not-allowed;
+                opacity: 0.65;
+            }
+        }
     }
 }
diff --git a/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx b/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx
index c7f055ba05..e06b8b913f 100644
--- a/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx
+++ b/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/index.tsx
@@ -6,21 +6,18 @@ import React, {useCallback, useEffect, useState} from 'react';
 import {useIntl} from 'react-intl';
 import {useSelector} from 'react-redux';
 
-import {PhoneInTalkIcon} from '@mattermost/compass-icons/components';
-
 import {Client4} from 'mattermost-redux/client';
 import {getChannelByName} from 'mattermost-redux/selectors/entities/channels';
 
 import {isCallsEnabled as getIsCallsEnabled, getSessionsInCalls} from 'selectors/calls';
 
-import OverlayTrigger from 'components/overlay_trigger';
 import ProfilePopoverCallButton from 'components/profile_popover/profile_popover_calls_button';
-import Tooltip from 'components/tooltip';
+import WithTooltip from 'components/with_tooltip';
 
-import Constants from 'utils/constants';
 import {getDirectChannelName} from 'utils/utils';
 
 import type {GlobalState} from 'types/store';
+
 type Props = {
     userId: string;
     currentUserId: string;
@@ -98,29 +95,26 @@ const CallButton = ({
         id: 'webapp.mattermost.feature.start_call',
         defaultMessage: 'Start Call',
     });
-    const iconButtonClassname = classNames('style--none btn btn-icon btn-sm', {'icon-btn-disabled': disabled});
+    const iconButtonClassName = classNames('btn btn-icon btn-sm style--none', {'icon-btn-disabled': disabled});
     const callButton = (
-        <OverlayTrigger
-            delayShow={Constants.OVERLAY_TIME_DELAY}
+        <WithTooltip
+            id='startCallTooltip'
+            title={startCallMessage}
             placement='top'
-            overlay={
-                <Tooltip id='startCallTooltip'>
-                    {startCallMessage}
-                </Tooltip>
-            }
         >
             <button
                 id='startCallButton'
                 type='button'
                 aria-disabled={disabled}
-                className={iconButtonClassname}
+                className={iconButtonClassName}
+                aria-label={startCallMessage}
             >
-                <PhoneInTalkIcon
-                    size={18}
-                    aria-label={startCallMessage}
+                <span
+                    className='icon icon-phone'
+                    aria-hidden='true'
                 />
             </button>
-        </OverlayTrigger>
+        </WithTooltip>
     );
 
     if (disabled) {
diff --git a/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/profile_popover_call_button_wrapper.scss b/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/profile_popover_call_button_wrapper.scss
deleted file mode 100644
index 3cb92957d6..0000000000
--- a/webapp/channels/src/components/profile_popover/profile_popover_call_button_wrapper/profile_popover_call_button_wrapper.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-button#startCallButton {
-    &.btn-disabled-styled {
-        cursor: not-allowed;
-        opacity: 0.65;
-    }
-}