diff --git a/src/components/Abbr.astro b/src/components/Abbr.astro
index dc44ae6ac..307b88089 100644
--- a/src/components/Abbr.astro
+++ b/src/components/Abbr.astro
@@ -1,4 +1,6 @@
 ---
+import BuildTooltip from "./atlas/BuildTooltip";
+
 let content = "";
 const regex = /(^.*?(?=\())\(([^\)]+)\)/;
 
@@ -11,4 +13,7 @@ const body = match[1].trim()
 const title = match[2]
 ---
 
-<abbr title={title}>{body}</abbr>
+<BuildTooltip client:only="react">
+  <Fragment set:html={body} name="children" />
+  <Fragment set:html={title} slot="content" />
+</BuildTooltip>
diff --git a/src/content/docs/en/kitchen-sink/typography.mdx b/src/content/docs/en/kitchen-sink/typography.mdx
index a56621e53..03dfea6dd 100644
--- a/src/content/docs/en/kitchen-sink/typography.mdx
+++ b/src/content/docs/en/kitchen-sink/typography.mdx
@@ -104,7 +104,7 @@ Select <MenuSelection>File --> My Profile --> Billing</MenuSelection>
 
 ## Abbreviations
 
-Abbreviations can be written using the `<Abbr>` component. This component transforms content written as `${Abbreviation} (${expanded version})` into native HTML [`<abbr>` tags](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/abbr).
+Abbreviations can be written using the `<Abbr>` component. This component transforms content written as `${Abbreviation} (${expanded version})` into an [Atlas `Tooltip` component](https://atlas.adeven.com/docs/components/Tooltip).
 
 ```mdx
 <Abbr>RTBF (Right to be forgotten)</Abbr>