diff --git a/app/components/Card.tsx b/app/components/Card.tsx
index e5a8c15..05673ac 100644
--- a/app/components/Card.tsx
+++ b/app/components/Card.tsx
@@ -12,7 +12,7 @@ function Card({ variant = 'raised', ...props }: Props) {
 		<div
 			{...props}
 			className={cn(
-				'w-full max-w-md overflow-hidden rounded-3xl p-5',
+				'w-full max-w-md rounded-3xl p-5',
 				variant === 'flat'
 					? 'bg-transparent shadow-none'
 					: 'bg-headplane-50/50 dark:bg-headplane-950/50 shadow-sm',
diff --git a/app/components/Chip.tsx b/app/components/Chip.tsx
index 1aae704..591f6c2 100644
--- a/app/components/Chip.tsx
+++ b/app/components/Chip.tsx
@@ -1,21 +1,32 @@
+import React from 'react';
 import cn from '~/utils/cn';
 
 export interface ChipProps {
 	text: string;
 	className?: string;
+	leftIcon?: React.ReactNode;
+	rightIcon?: React.ReactNode;
 }
 
-export default function Chip({ text, className }: ChipProps) {
+export default function Chip({
+	text,
+	className,
+	leftIcon,
+	rightIcon,
+}: ChipProps) {
 	return (
 		<span
 			className={cn(
 				'text-xs px-2 py-0.5 rounded-full',
 				'text-headplane-700 dark:text-headplane-100',
 				'bg-headplane-100 dark:bg-headplane-700',
+				leftIcon || rightIcon ? 'inline-flex items-center gap-x-1' : '',
 				className,
 			)}
 		>
+			{leftIcon}
 			{text}
+			{rightIcon}
 		</span>
 	);
 }
diff --git a/app/components/Dialog.tsx b/app/components/Dialog.tsx
index 3ad7b8c..7a2074f 100644
--- a/app/components/Dialog.tsx
+++ b/app/components/Dialog.tsx
@@ -156,7 +156,7 @@ function DModal(props: DModalProps) {
 				{...underlayProps}
 				aria-hidden="true"
 				className={cn(
-					'fixed inset-0 h-screen w-screen z-50',
+					'fixed inset-0 h-screen w-screen z-20',
 					'flex items-center justify-center',
 					'bg-headplane-900/15 dark:bg-headplane-900/30',
 					'entering:animate-in exiting:animate-out',
@@ -167,7 +167,7 @@ function DModal(props: DModalProps) {
 			<div
 				{...modalProps}
 				className={cn(
-					'fixed inset-0 h-screen w-screen z-50',
+					'fixed inset-0 h-screen w-screen z-20',
 					'flex items-center justify-center',
 				)}
 			>
diff --git a/app/components/Footer.tsx b/app/components/Footer.tsx
index 86c3299..2b516ce 100644
--- a/app/components/Footer.tsx
+++ b/app/components/Footer.tsx
@@ -1,5 +1,4 @@
 import Link from '~/components/Link';
-import Tooltip from '~/components/Tooltip';
 import cn from '~/utils/cn';
 
 declare global {
diff --git a/app/components/Popover.tsx b/app/components/Popover.tsx
index 9e7ee40..351a2ee 100644
--- a/app/components/Popover.tsx
+++ b/app/components/Popover.tsx
@@ -34,7 +34,7 @@ export default function Popover(props: PopoverProps) {
 				{...popoverProps}
 				ref={ref}
 				className={cn(
-					'z-10 shadow-sm rounded-xl overflow-hidden',
+					'z-10 shadow-sm rounded-xl',
 					'bg-white dark:bg-headplane-900',
 					'border border-headplane-200 dark:border-headplane-800',
 					className,
diff --git a/app/components/Tooltip.tsx b/app/components/Tooltip.tsx
index 2fc202b..bf39193 100644
--- a/app/components/Tooltip.tsx
+++ b/app/components/Tooltip.tsx
@@ -1,37 +1,80 @@
-import type { ReactNode } from 'react';
+import React, { cloneElement, useRef } from 'react';
 import {
-	Button as AriaButton,
-	Tooltip as AriaTooltip,
-	TooltipTrigger,
-} from 'react-aria-components';
+	AriaTooltipProps,
+	mergeProps,
+	useTooltip,
+	useTooltipTrigger,
+} from 'react-aria';
+import { TooltipTriggerState, useTooltipTriggerState } from 'react-stately';
 import cn from '~/utils/cn';
 
-interface Props {
-	children: ReactNode;
-	className?: string;
+export interface TooltipProps extends AriaTooltipProps {
+	children: [React.ReactElement, React.ReactElement<TooltipBodyProps>];
 }
 
-function Tooltip({ children }: Props) {
-	return <TooltipTrigger delay={0}>{children}</TooltipTrigger>;
-}
+function Tooltip(props: TooltipProps) {
+	const state = useTooltipTriggerState({
+		...props,
+		delay: 0,
+		closeDelay: 0,
+	});
 
-function Button(props: Parameters<typeof AriaButton>[0]) {
-	return <AriaButton {...props} />;
-}
+	const ref = useRef<HTMLButtonElement | null>(null);
+	const { triggerProps, tooltipProps } = useTooltipTrigger(
+		{
+			...props,
+			delay: 0,
+			closeDelay: 0,
+		},
+		state,
+		ref,
+	);
 
-function Body({ children, className }: Props) {
+	const [component, body] = props.children;
 	return (
-		<AriaTooltip
-			className={cn(
-				'text-sm max-w-xs p-2 rounded-lg mb-2',
-				'bg-white dark:bg-ui-900 drop-shadow-sm',
-				'border border-gray-200 dark:border-zinc-700',
-				className,
-			)}
-		>
-			{children}
-		</AriaTooltip>
+		<span className="relative">
+			<button
+				ref={ref}
+				{...triggerProps}
+				className="flex items-center justify-center"
+			>
+				{component}
+			</button>
+			{state.isOpen &&
+				cloneElement(body, {
+					...tooltipProps,
+					state,
+				})}
+		</span>
 	);
 }
 
-export default Object.assign(Tooltip, { Button, Body });
+interface TooltipBodyProps extends AriaTooltipProps {
+	children: React.ReactNode;
+	state?: TooltipTriggerState;
+	className?: string;
+}
+
+function Body({ state, className, ...props }: TooltipBodyProps) {
+	const { tooltipProps } = useTooltip(props, state);
+	return (
+		<span
+			{...mergeProps(props, tooltipProps)}
+			className={cn(
+				'absolute z-50 p-3 top-full mt-1',
+				'outline-none rounded-3xl text-sm w-48',
+				'bg-white dark:bg-headplane-950',
+				'text-black dark:text-white',
+				'shadow-lg dark:shadow-md rounded-xl',
+				'border border-headplane-100 dark:border-headplane-800',
+				className,
+			)}
+		>
+			{props.children}
+		</span>
+	);
+}
+
+export default Object.assign(Tooltip, {
+	Body,
+});
diff --git a/app/routes/dns/dialogs/nameserver.tsx b/app/routes/dns/dialogs/nameserver.tsx
index c12dcdd..ff2e198 100644
--- a/app/routes/dns/dialogs/nameserver.tsx
+++ b/app/routes/dns/dialogs/nameserver.tsx
@@ -1,6 +1,7 @@
 import { RepoForkedIcon } from '@primer/octicons-react';
 import { useState } from 'react';
 import { useSubmit } from 'react-router';
+import Chip from '~/components/Chip';
 
 import Dialog from '~/components/Dialog';
 import Input from '~/components/Input';
@@ -82,16 +83,11 @@ export default function AddNameserver({ nameservers }: Props) {
 								Restrict to domain
 							</Dialog.Text>
 							<Tooltip>
-								<Tooltip.Button
-									className={cn(
-										'text-xs rounded-md px-1.5 py-0.5',
-										'bg-ui-200 dark:bg-ui-800',
-										'text-ui-600 dark:text-ui-300',
-									)}
-								>
-									<RepoForkedIcon className="w-4 h-4 mr-0.5" />
-									Split DNS
-								</Tooltip.Button>
+								<Chip
+									text="Split DNS"
+									leftIcon={<RepoForkedIcon className="w-4 h-4 mr-0.5" />}
+									className={cn('inline-flex items-center')}
+								/>
 								<Tooltip.Body>
 									Only clients that support split DNS (Tailscale v1.8 or later
 									for most platforms) will use this nameserver. Older clients
diff --git a/app/routes/machines/machine.tsx b/app/routes/machines/machine.tsx
index a01f707..d927e77 100644
--- a/app/routes/machines/machine.tsx
+++ b/app/routes/machines/machine.tsx
@@ -150,9 +150,7 @@ export default function Page() {
 					<span className="text-sm text-ui-600 dark:text-ui-300 flex items-center gap-x-1">
 						Managed by
 						<Tooltip>
-							<Tooltip.Button>
-								<InfoIcon className="w-3.5 h-3.5" />
-							</Tooltip.Button>
+							<InfoIcon className="w-3.5 h-3.5" />
 							<Tooltip.Body>
 								By default, a machine’s permissions match its creator’s.
 							</Tooltip.Body>
@@ -209,9 +207,7 @@ export default function Page() {
 					<span className="text-ui-600 dark:text-ui-300 flex items-center gap-x-1">
 						Approved
 						<Tooltip>
-							<Tooltip.Button>
-								<InfoIcon className="w-3.5 h-3.5" />
-							</Tooltip.Button>
+							<InfoIcon className="w-3.5 h-3.5" />
 							<Tooltip.Body>
 								Traffic to these routes are being routed through this machine.
 							</Tooltip.Body>
@@ -242,9 +238,7 @@ export default function Page() {
 					<span className="text-ui-600 dark:text-ui-300 flex items-center gap-x-1">
 						Awaiting Approval
 						<Tooltip>
-							<Tooltip.Button>
-								<InfoIcon className="w-3.5 h-3.5" />
-							</Tooltip.Button>
+							<InfoIcon className="w-3.5 h-3.5" />
 							<Tooltip.Body>
 								This machine is advertising these routes, but they must be
 								approved before traffic will be routed to them.
@@ -276,9 +270,7 @@ export default function Page() {
 					<span className="text-ui-600 dark:text-ui-300 flex items-center gap-x-1">
 						Exit Node
 						<Tooltip>
-							<Tooltip.Button>
-								<InfoIcon className="w-3.5 h-3.5" />
-							</Tooltip.Button>
+							<InfoIcon className="w-3.5 h-3.5" />
 							<Tooltip.Body>
 								Whether this machine can act as an exit node for your tailnet.
 							</Tooltip.Body>
diff --git a/app/routes/machines/overview.tsx b/app/routes/machines/overview.tsx
index 063d26c..3c799d5 100644
--- a/app/routes/machines/overview.tsx
+++ b/app/routes/machines/overview.tsx
@@ -1,5 +1,4 @@
 import { InfoIcon } from '@primer/octicons-react';
-import { Button, Tooltip, TooltipTrigger } from 'react-aria-components';
 import type { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
 import { useLoaderData } from 'react-router';
 
@@ -15,6 +14,7 @@ import { getSession } from '~/utils/sessions.server';
 import { useLiveData } from '~/utils/useLiveData';
 import { initAgentSocket, queryAgent } from '~/utils/ws-agent';
 
+import Tooltip from '~/components/Tooltip';
 import { menuAction } from './action';
 import MachineRow from './components/machine';
 import NewMachine from './dialogs/new';
@@ -81,31 +81,23 @@ export default function Page() {
 			</div>
 			<table className="table-auto w-full rounded-lg">
 				<thead className="text-gray-500 dark:text-gray-400">
-					<tr className="text-left uppercase text-xs font-bold px-0.5">
+					<tr className="text-left px-0.5">
 						<th className="pb-2">Name</th>
 						<th className="pb-2 w-1/4">
 							<div className="flex items-center gap-x-1">
-								Addresses
+								<p className="uppercase text-xs font-bold">Addresses</p>
 								{data.magic ? (
-									<TooltipTrigger delay={0}>
-										<Button>
-											<InfoIcon className="w-4 h-4" />
-										</Button>
-										<Tooltip
-											className={cn(
-												'text-sm max-w-xs p-2 rounded-lg mb-2',
-												'bg-white dark:bg-zinc-800',
-												'border border-gray-200 dark:border-zinc-700',
-											)}
-										>
+									<Tooltip>
+										<InfoIcon className="w-4 h-4" />
+										<Tooltip.Body className="font-normal">
 											Since MagicDNS is enabled, you can access devices based on
 											their name and also at{' '}
 											<Code>
 												[name].
 												{data.magic}
 											</Code>
-										</Tooltip>
-									</TooltipTrigger>
+										</Tooltip.Body>
+									</Tooltip>
 								) : undefined}
 							</div>
 						</th>