diff --git a/semcore/base-components/src/components/hint/style/hint.shadow.css b/semcore/base-components/src/components/hint/style/hint.shadow.css
index 42e1b824a8..f455893090 100644
--- a/semcore/base-components/src/components/hint/style/hint.shadow.css
+++ b/semcore/base-components/src/components/hint/style/hint.shadow.css
@@ -8,10 +8,10 @@ SHintPopper {
   opacity: 0;
   pointer-events: none;
 
-  background: var(--intergalactic-tooltip-invert, oklch(0.23 0.01 140)); /* TODO: --intergalactic-tooltip-bg-invert or consider adding hint category */
-  border: 1px solid var(--intergalactic-border-tooltip-invert, oklch(0.995 0.008 145.9 / 0.369)); /* TODO: --intergalactic-tooltip-border-invert or consider adding hint category */
-  color: var(--intergalactic-text-primary-invert, oklch(0.999 0.001 180 / 0.949));
-  padding: var(--intergalactic-spacing-1x, 4px) var(--intergalactic-spacing-2x, 8px);
+  background: var(--intergalactic-tooltip-bg-invert, oklch(0.23 0.01 140));
+  border: 1px solid var(--intergalactic-tooltip-border-invert, oklch(0.995 0.008 145.9 / 0.369));
+  color: var(--intergalactic-tooltip-text-invert, oklch(0.999 0.001 180 / 0.949));
+  padding: var(--intergalactic-spacing-content-padding-xsmall, 4px) var(--intergalactic-spacing-content-padding-small, 8px);
   border-radius: var(--intergalactic-rounded-small, 4px);
   font-size: var(--intergalactic-fs-100, 12px);
   line-height: var(--intergalactic-lh-100, 133%);
diff --git a/semcore/tooltip/src/style/tooltip.shadow.css b/semcore/tooltip/src/style/tooltip.shadow.css
index 6a2e50be7c..3c3d597b18 100644
--- a/semcore/tooltip/src/style/tooltip.shadow.css
+++ b/semcore/tooltip/src/style/tooltip.shadow.css
@@ -1,9 +1,9 @@
 STooltip {
   position: relative;
-  padding: var(--intergalactic-spacing-3x, 12px);
+  padding: var(--intergalactic-spacing-content-padding-medium, 12px);
   border-radius: var(--intergalactic-popper-rounded, 6px);
   box-sizing: border-box;
-  color: var(--intergalactic-text-primary, oklch(0.1 0.03 137 / 0.899)); /* TODO: --intergalactic-tooltip-text */
+  color: var(--intergalactic-tooltip-text, oklch(0.1 0.03 137 / 0.899));
   font-size: var(--intergalactic-fs-200, 14px);
   line-height: var(--intergalactic-lh-200, 142%);
   word-wrap: break-word;
@@ -15,18 +15,18 @@ STooltip {
 
 /* stylelint-disable-next-line no-duplicate-selectors */
 STooltip {
-  background-color: var(--intergalactic-tooltip-default, oklch(1 0 0)); /* TODO: --intergalactic-tooltip-bg-default */
+  background-color: var(--intergalactic-tooltip-bg-default, oklch(1 0 0));
   border: 1px solid var(--intergalactic-border-secondary, oklch(0.176 0.033 175.7 / 0.07));
 }
 
 STooltip[theme='invert'] {
-  color: var(--intergalactic-text-primary-invert, oklch(0.999 0.001 180 / 0.949)); /* TODO: --intergalactic-tooltip-text-invert */
-  background-color: var(--intergalactic-tooltip-invert, oklch(0.23 0.01 140)); /* TODO: --intergalactic-tooltip-bg-invert */
-  border: 1px solid var(--intergalactic-border-tooltip-invert, oklch(0.995 0.008 145.9 / 0.369)); /* TODO: --intergalactic-tooltip-border-invert */
+  color: var(--intergalactic-tooltip-text-invert, oklch(0.999 0.001 180 / 0.949));
+  background-color: var(--intergalactic-tooltip-bg-invert, oklch(0.23 0.01 140));
+  border: 1px solid var(--intergalactic-tooltip-border-invert, oklch(0.995 0.008 145.9 / 0.369));
 }
 
 STooltip[theme='warning'] {
-  background-color: var(--intergalactic-tooltip-warning, oklch(0.958 0.029 5.7)); /* TODO: --intergalactic-tooltip-bg-warning */
+  background-color: var(--intergalactic-tooltip-bg-warning, oklch(0.958 0.029 5.7));
   border: 1px solid var(--intergalactic-border-critical-active, oklch(0.7 0.21 23));
 }
 
@@ -47,15 +47,15 @@ SArrow {
 
   /* stylelint-disable-next-line no-duplicate-selectors */
   &:before {
-    border-color: var(--intergalactic-tooltip-default, oklch(1 0 0)); /* TODO: --intergalactic-tooltip-bg-default */
+    border-color: var(--intergalactic-tooltip-bg-default, oklch(1 0 0));
   }
 }
 
 SArrow[theme='invert'] {
-  border-color: var(--intergalactic-border-tooltip-invert, oklch(0.995 0.008 145.9 / 0.369)); /* TODO: --intergalactic-tooltip-border-invert */
+  border-color: var(--intergalactic-tooltip-border-invert, oklch(0.995 0.008 145.9 / 0.369));
 
   &::before {
-    border-color: var(--intergalactic-tooltip-invert, oklch(0.23 0.01 140)); /* TODO: --intergalactic-tooltip-bg-invert */
+    border-color: var(--intergalactic-tooltip-border-invert, oklch(0.995 0.008 145.9 / 0.369));
   }
 }
 
@@ -63,7 +63,7 @@ SArrow[theme='warning'] {
   border-color: var(--intergalactic-border-critical-active, oklch(0.7 0.21 23));
 
   &::before {
-    border-color: var(--intergalactic-tooltip-warning, oklch(0.958 0.029 5.7)); /* TODO: --intergalactic-tooltip-bg-warning */
+    border-color: var(--intergalactic-tooltip-bg-warning, oklch(0.958 0.029 5.7));
   }
 }
 
diff --git a/website/docs/style/design-tokens/design-tokens.json b/website/docs/style/design-tokens/design-tokens.json
index f8ddafa1d4..32494f3c99 100644
--- a/website/docs/style/design-tokens/design-tokens.json
+++ b/website/docs/style/design-tokens/design-tokens.json
@@ -2854,7 +2854,6 @@
       "tab-panel",
       "textarea",
       "time-picker",
-      "tooltip",
       "typography"
     ]
   },
@@ -2864,14 +2863,12 @@
     "description": "Inverted version of the primary text.",
     "components": [
       "badge",
-      "base-components",
       "date-picker",
       "dot",
       "feature-highlight",
       "feature-popover",
       "notice-bubble",
       "tag",
-      "tooltip",
       "wizard"
     ]
   },
@@ -2921,37 +2918,52 @@
     "name": "--intergalactic-tooltip-bg-default",
     "value": "oklch(1 0 0)",
     "description": "Default Tooltip background.",
-    "components": []
+    "components": [
+      "tooltip"
+    ]
   },
   {
     "name": "--intergalactic-tooltip-bg-invert",
     "value": "oklch(0.23 0.01 140)",
     "description": "Inverted version of the default Tooltip background.",
-    "components": []
+    "components": [
+      "base-components",
+      "tooltip"
+    ]
   },
   {
     "name": "--intergalactic-tooltip-bg-warning",
     "value": "oklch(0.958 0.029 5.7)",
     "description": "Warning Tooltip background.",
-    "components": []
+    "components": [
+      "tooltip"
+    ]
   },
   {
     "name": "--intergalactic-tooltip-border-invert",
     "value": "oklch(0.995 0.008 145.9 / 0.369)",
     "description": "Border of the Tooltip with dark theme.",
-    "components": []
+    "components": [
+      "base-components",
+      "tooltip"
+    ]
   },
   {
     "name": "--intergalactic-tooltip-text",
     "value": "oklch(0.1 0.03 137 / 0.899)",
     "description": "Text color of the default Tooltip.",
-    "components": []
+    "components": [
+      "tooltip"
+    ]
   },
   {
     "name": "--intergalactic-tooltip-text-invert",
     "value": "oklch(0.999 0.001 180 / 0.949)",
     "description": "Text color of the inverted Tooltip.",
-    "components": []
+    "components": [
+      "base-components",
+      "tooltip"
+    ]
   },
   {
     "name": "--intergalactic-wizard-bg",
@@ -3154,13 +3166,16 @@
     "name": "--intergalactic-spacing-content-padding-xsmall",
     "value": "4px",
     "description": "Extra small padding for content inside controls and surfaces.",
-    "components": []
+    "components": [
+      "base-components"
+    ]
   },
   {
     "name": "--intergalactic-spacing-content-padding-small",
     "value": "8px",
     "description": "Small padding for content inside controls and surfaces.",
     "components": [
+      "base-components"
       "modal"
     ]
   },
@@ -3172,6 +3187,8 @@
       "button",
       "card",
       "input",
+      "time-picker",
+      "tooltip"
       "modal",
       "time-picker"
     ]