diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index f5621a61d582..cda702de0084 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -60,8 +60,6 @@ limitations under the License.
     font-weight: 500;
     max-width: 300px;
     word-break: break-word;
-    margin-left: 6px;
-    margin-right: 6px;
 
     background-color: #21262C; // Same on both themes
     color: $accent-fg-color;
@@ -81,6 +79,11 @@ limitations under the License.
     }
 }
 
+.mx_Tooltip_Natural, .mx_Tooltip_Left, .mx_Tooltip_Right {
+    margin-left: 6px;
+    margin-right: 6px;
+}
+
 // These tooltips use an older style with a chevron
 .mx_Field_tooltip {
     background-color: $menu-bg-color;
diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx
index 625a25236575..634a6b799d2b 100644
--- a/src/components/structures/SpaceHierarchy.tsx
+++ b/src/components/structures/SpaceHierarchy.tsx
@@ -65,6 +65,7 @@ import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { JoinRoomReadyPayload } from "../../dispatcher/payloads/JoinRoomReadyPayload";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../KeyBindingsManager";
+import { Alignment } from "../views/elements/Tooltip";
 
 interface IProps {
     space: Room;
@@ -584,7 +585,7 @@ const ManageButtons = ({ hierarchy, selected, setSelected, setError }: IManageBu
         Button = AccessibleTooltipButton;
         props = {
             tooltip: _t("Select a room below first"),
-            yOffset: -40,
+            alignment: Alignment.Top,
         };
     }
 
diff --git a/src/components/views/beta/BetaCard.tsx b/src/components/views/beta/BetaCard.tsx
index 1d625fc8431e..9bffd42c3061 100644
--- a/src/components/views/beta/BetaCard.tsx
+++ b/src/components/views/beta/BetaCard.tsx
@@ -50,7 +50,6 @@ export const BetaPill = ({ onClick }: { onClick?: () => void }) => {
                 </div>
             </div>}
             onClick={onClick}
-            yOffset={-10}
         >
             { _t("Beta") }
         </AccessibleTooltipButton>;
diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx
index d3f38fa9d190..8895206efa0d 100644
--- a/src/components/views/dialogs/ForwardDialog.tsx
+++ b/src/components/views/dialogs/ForwardDialog.tsx
@@ -132,7 +132,6 @@ const Entry: React.FC<IEntryProps> = ({ room, type, content, matrixClient: cli,
             className="mx_ForwardList_roomButton"
             onClick={jumpToRoom}
             title={_t("Open link")}
-            yOffset={-20}
             alignment={Alignment.Top}
         >
             <DecoratedRoomAvatar room={room} avatarSize={32} />
@@ -147,7 +146,6 @@ const Entry: React.FC<IEntryProps> = ({ room, type, content, matrixClient: cli,
             onClick={send}
             disabled={disabled}
             title={title}
-            yOffset={-20}
             alignment={Alignment.Top}
         >
             <div className="mx_ForwardList_sendLabel">{ _t("Send") }</div>
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index be3bbcfdb9d1..46e3af0af688 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -27,7 +27,6 @@ interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     label?: React.ReactNode;
     tooltipClassName?: string;
     forceHide?: boolean;
-    yOffset?: number;
     alignment?: Alignment;
     onHideTooltip?(ev: SyntheticEvent): void;
 }
@@ -69,13 +68,12 @@ export default class AccessibleTooltipButton extends React.PureComponent<IProps,
 
     render() {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { title, tooltip, children, tooltipClassName, forceHide, yOffset, alignment, onHideTooltip,
+        const { title, tooltip, children, tooltipClassName, forceHide, alignment, onHideTooltip,
             ...props } = this.props;
 
         const tip = this.state.hover && <Tooltip
             tooltipClassName={tooltipClassName}
             label={tooltip || title}
-            yOffset={yOffset}
             alignment={alignment}
         />;
         return (
diff --git a/src/components/views/elements/FacePile.tsx b/src/components/views/elements/FacePile.tsx
index bb39cc795758..661c9245a8ca 100644
--- a/src/components/views/elements/FacePile.tsx
+++ b/src/components/views/elements/FacePile.tsx
@@ -91,7 +91,7 @@ const FacePile: FC<IProps> = ({ room, onlyKnownUsers = true, numShown = DEFAULT_
     }
 
     return <div {...props} className="mx_FacePile">
-        <TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip} tooltipProps={{ yOffset: 32 }}>
+        <TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip}>
             { members.length > numShown ? <span className="mx_FacePile_face mx_FacePile_more" /> : null }
             { shownMembers.map(m =>
                 <MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" />) }
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 610135ef99f2..5a07d9733ed7 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -241,11 +241,9 @@ class Pill extends React.Component {
         });
 
         if (this.state.pillType) {
-            const { yOffset } = this.props;
-
             let tip;
             if (this.state.hover && resource) {
-                tip = <Tooltip label={resource} yOffset={yOffset} />;
+                tip = <Tooltip label={resource} />;
             }
 
             return <MatrixClientContext.Provider value={this._matrixClient}>
diff --git a/src/components/views/elements/Tooltip.tsx b/src/components/views/elements/Tooltip.tsx
index 47b81c7a2ec8..231e8c1bccf5 100644
--- a/src/components/views/elements/Tooltip.tsx
+++ b/src/components/views/elements/Tooltip.tsx
@@ -24,15 +24,13 @@ import classNames from 'classnames';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import UIStore from "../../../stores/UIStore";
 
-const MIN_TOOLTIP_HEIGHT = 25;
-
 export enum Alignment {
-    Natural, // Pick left or right
-    Left,
-    Right,
-    Top, // Centered
-    Bottom, // Centered
-    InnerBottom, // Inside the target, at the bottom
+    Natural = 'Natural', // Pick left or right
+    Left = 'Left',
+    Right = 'Right',
+    Top = 'Top', // Centered
+    Bottom = 'Bottom', // Centered
+    InnerBottom = 'InnerBottom', // Inside the target, at the bottom
 }
 
 export interface ITooltipProps {
@@ -47,7 +45,6 @@ export interface ITooltipProps {
         // the react element to put into the tooltip
         label: React.ReactNode;
         alignment?: Alignment; // defaults to Natural
-        yOffset?: number;
         // id describing tooltip
         // used to associate tooltip with target for a11y
         id?: string;
@@ -66,7 +63,6 @@ export default class Tooltip extends React.Component<ITooltipProps> {
 
     public static readonly defaultProps = {
         visible: true,
-        yOffset: 0,
         alignment: Alignment.Natural,
     };
 
@@ -102,55 +98,52 @@ export default class Tooltip extends React.Component<ITooltipProps> {
     // positioned, also taking into account any window zoom
     private updatePosition(style: CSSProperties) {
         const parentBox = this.parent.getBoundingClientRect();
-        let offset = 0;
-        if (parentBox.height > MIN_TOOLTIP_HEIGHT) {
-            offset = Math.floor((parentBox.height - MIN_TOOLTIP_HEIGHT) / 2);
-        } else {
-            // The tooltip is larger than the parent height: figure out what offset
-            // we need so that we're still centered.
-            offset = Math.floor(parentBox.height - MIN_TOOLTIP_HEIGHT);
-        }
+        const height = UIStore.instance.windowHeight;
         const width = UIStore.instance.windowWidth;
         const parentWidth = (
             this.props.maxParentWidth
                 ? Math.min(parentBox.width, this.props.maxParentWidth)
                 : parentBox.width
         );
-        const baseTop = (parentBox.top - 2 + this.props.yOffset) + window.pageYOffset;
-        const top = baseTop + offset;
         const right = width - parentBox.left - window.pageXOffset;
-        const left = parentBox.right + window.pageXOffset;
         const horizontalCenter = (
             parentBox.left - window.pageXOffset + (parentWidth / 2)
         );
+        const leftRightTop = parentBox.top + (parentBox.height / 2);
+
         switch (this.props.alignment) {
             case Alignment.Natural:
                 if (parentBox.right > width / 2) {
                     style.right = right;
-                    style.top = top;
+                    style.top = leftRightTop;
+                    style.transform = "translateY(-50%)";
                     break;
                 }
                 // fall through to Right
             case Alignment.Right:
-                style.left = left;
-                style.top = top;
+                style.left = parentBox.right + window.pageXOffset;
+                style.top = leftRightTop;
+                style.transform = "translateY(-50%)";
                 break;
             case Alignment.Left:
                 style.right = right;
-                style.top = top;
+                style.top = leftRightTop;
+                style.transform = "translateY(-50%)";
                 break;
             case Alignment.Top:
-                style.top = baseTop - 16;
+                style.bottom = height - parentBox.top + 2;
                 style.left = horizontalCenter;
+                style.transform = "translateX(-50%)";
                 break;
             case Alignment.Bottom:
-                style.top = baseTop + parentBox.height;
+                style.top = parentBox.top + parentBox.height + 2;
                 style.left = horizontalCenter;
+                style.transform = "translateX(-50%)";
                 break;
             case Alignment.InnerBottom:
-                style.top = baseTop + parentBox.height - 50;
+                style.top = parentBox.top + parentBox.height - 50;
                 style.left = horizontalCenter;
-                style.transform = "translate(-50%)";
+                style.transform = "translateX(-50%)";
         }
 
         return style;
@@ -167,10 +160,15 @@ export default class Tooltip extends React.Component<ITooltipProps> {
         // if it is not meant to be visible on first mount.
         style.display = this.props.visible ? "block" : "none";
 
-        const tooltipClasses = classNames("mx_Tooltip", this.props.tooltipClassName, {
-            "mx_Tooltip_visible": this.props.visible,
-            "mx_Tooltip_invisible": !this.props.visible,
-        });
+        const tooltipClasses = classNames(
+            "mx_Tooltip",
+            `mx_Tooltip_${this.props.alignment}`,
+            this.props.tooltipClassName, 
+            {
+                "mx_Tooltip_visible": this.props.visible,
+                "mx_Tooltip_invisible": !this.props.visible,
+            },
+        );
 
         const tooltip = (
             <div className={tooltipClasses} style={style}>
diff --git a/src/components/views/elements/TooltipTarget.tsx b/src/components/views/elements/TooltipTarget.tsx
index 5d30bf253960..1f6339a072ef 100644
--- a/src/components/views/elements/TooltipTarget.tsx
+++ b/src/components/views/elements/TooltipTarget.tsx
@@ -34,7 +34,6 @@ const TooltipTarget: React.FC<IProps> = ({
     id,
     label,
     alignment,
-    yOffset,
     tooltipClassName,
     maxParentWidth,
     ...rest
@@ -51,7 +50,6 @@ const TooltipTarget: React.FC<IProps> = ({
         className={className}
         tooltipClassName={tooltipClassName}
         label={label}
-        yOffset={yOffset}
         alignment={alignment}
         visible={isVisible}
         maxParentWidth={maxParentWidth}
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCard.tsx
index 65654f37ea24..bc804b1f32b2 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCard.tsx
@@ -166,7 +166,6 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
             title={openTitle}
             forceHide={!(isPinned || isMaximised)}
             disabled={isPinned || isMaximised}
-            yOffset={-48}
         >
             <WidgetAvatar app={app} />
             <span>{ name }</span>
@@ -178,7 +177,6 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
             isExpanded={menuDisplayed}
             onClick={openMenu}
             title={_t("Options")}
-            yOffset={-24}
         /> }
 
         <AccessibleTooltipButton
@@ -186,13 +184,11 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
             onClick={togglePin}
             title={pinTitle}
             disabled={cannotPin}
-            yOffset={-24}
         />
         <AccessibleTooltipButton
             className="mx_RoomSummaryCard_app_maximiseToggle"
             onClick={toggleMaximised}
             title={maximiseTitle}
-            yOffset={-24}
         />
 
         { contextMenu }
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index b73ec31e2931..69d1e37431d4 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -1736,9 +1736,7 @@ class SentReceipt extends React.PureComponent<ISentReceiptProps, ISentReceiptSta
             } else if (isFailed) {
                 label = _t("Failed to send");
             }
-            // The yOffset is somewhat arbitrary - it just brings the tooltip down to be more associated
-            // with the read receipt.
-            tooltip = <Tooltip className="mx_EventTile_readAvatars_receiptTooltip" label={label} yOffset={3} />;
+            tooltip = <Tooltip className="mx_EventTile_readAvatars_receiptTooltip" label={label} />;
         }
 
         return (
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index 6bd41fcf9319..73182693652b 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -423,7 +423,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
             recordingTooltip = <Tooltip
                 label={_t("%(seconds)ss left", { seconds: secondsLeft })}
                 alignment={Alignment.Top}
-                yOffset={-50}
             />;
         }
 
diff --git a/src/components/views/voip/CallView/CallViewButtons.tsx b/src/components/views/voip/CallView/CallViewButtons.tsx
index 1d373694b399..6008b4d1a365 100644
--- a/src/components/views/voip/CallView/CallViewButtons.tsx
+++ b/src/components/views/voip/CallView/CallViewButtons.tsx
@@ -35,8 +35,6 @@ import { _t } from "../../../../languageHandler";
 // height to get the max height of the video
 const CONTEXT_MENU_VPADDING = 8; // How far the context menu sits above the button (px)
 
-const TOOLTIP_Y_OFFSET = -24;
-
 const CONTROLS_HIDE_DELAY = 2000;
 
 interface IButtonProps {
@@ -59,7 +57,6 @@ const CallViewToggleButton: React.FC<IButtonProps> = ({ state: isOn, className,
             onClick={onClick}
             title={isOn ? onLabel : offLabel}
             alignment={Alignment.Top}
-            yOffset={TOOLTIP_Y_OFFSET}
         />
     );
 };
@@ -219,7 +216,6 @@ export default class CallViewButtons extends React.Component<IProps, IState> {
                     isExpanded={this.state.showDialpad}
                     title={_t("Dialpad")}
                     alignment={Alignment.Top}
-                    yOffset={TOOLTIP_Y_OFFSET}
                 /> }
                 <CallViewToggleButton
                     state={!this.props.buttonsState.micMuted}
@@ -256,14 +252,12 @@ export default class CallViewButtons extends React.Component<IProps, IState> {
                     isExpanded={this.state.showMoreMenu}
                     title={_t("More")}
                     alignment={Alignment.Top}
-                    yOffset={TOOLTIP_Y_OFFSET}
                 /> }
                 <AccessibleTooltipButton
                     className="mx_CallViewButtons_button mx_CallViewButtons_button_hangup"
                     onClick={this.props.handlers.onHangupClick}
                     title={_t("Hangup")}
                     alignment={Alignment.Top}
-                    yOffset={TOOLTIP_Y_OFFSET}
                 />
             </div>
         );
diff --git a/test/components/views/elements/TooltipTarget-test.tsx b/test/components/views/elements/TooltipTarget-test.tsx
index cdb550a6d004..68d927857ac2 100644
--- a/test/components/views/elements/TooltipTarget-test.tsx
+++ b/test/components/views/elements/TooltipTarget-test.tsx
@@ -16,7 +16,6 @@ describe('<TooltipTarget />', () => {
         "className": 'test className',
         "tooltipClassName": 'test tooltipClassName',
         "label": 'test label',
-        "yOffset": 1,
         "alignment": Alignment.Left,
         "id": 'test id',
         'data-test-id': 'test',
diff --git a/test/components/views/elements/__snapshots__/TooltipTarget-test.tsx.snap b/test/components/views/elements/__snapshots__/TooltipTarget-test.tsx.snap
index d0d01f538075..c2b80ab95d06 100644
--- a/test/components/views/elements/__snapshots__/TooltipTarget-test.tsx.snap
+++ b/test/components/views/elements/__snapshots__/TooltipTarget-test.tsx.snap
@@ -2,8 +2,8 @@
 
 exports[`<TooltipTarget /> displays tooltip on mouseover 1`] = `
 <div
-  class="mx_Tooltip test tooltipClassName mx_Tooltip_visible"
-  style="right: 1024px; top: -26px; display: block;"
+  class="mx_Tooltip mx_Tooltip_Left test tooltipClassName mx_Tooltip_visible"
+  style="right: 1024px; top: 0px; transform: translateY(-50%); display: block;"
 >
   <div
     class="mx_Tooltip_chevron"