diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx
index 583b7f397..b0c8a8fdb 100644
--- a/src/components/Tooltip/Tooltip.tsx
+++ b/src/components/Tooltip/Tooltip.tsx
@@ -12,8 +12,8 @@ const Tooltip = React.forwardRef<HTMLDivElement, TooltipProps>(
       placement = 'right',
       isInverted = false,
       isInteractive = false,
-      delayIn = 100,
-      delayOut = 100,
+      delayIn = 500,
+      delayOut = 500,
     },
     ref
   ) => {
diff --git a/src/components/storyUtils/TooltipShowcase/TooltipShowcase.tsx b/src/components/storyUtils/TooltipShowcase/TooltipShowcase.tsx
index fbec8c53a..64410ea4f 100644
--- a/src/components/storyUtils/TooltipShowcase/TooltipShowcase.tsx
+++ b/src/components/storyUtils/TooltipShowcase/TooltipShowcase.tsx
@@ -35,13 +35,13 @@ const TooltipShowcase = ({
             }}
           >
             <div>This container is custom content</div>
-            <Button>Hello there mate</Button>
+            <Button type={isInverted ? 'primary' : 'inverted'}>Hello there mate</Button>
           </div>
         }
         isInteractive
         isInverted={isInverted}
       >
-        <Button>{buttonText}</Button>
+        <Button type={isInverted ? 'inverted' : 'primary'}>{buttonText}</Button>
       </Tooltip>
     </div>
   );
diff --git a/src/theme/tokens/components/variables/tooltip.ts b/src/theme/tokens/components/variables/tooltip.ts
index dead6b8f2..9aba8c015 100644
--- a/src/theme/tokens/components/variables/tooltip.ts
+++ b/src/theme/tokens/components/variables/tooltip.ts
@@ -39,14 +39,14 @@ const tooltip = {
   },
   borderColor: {
     default: {
-      value: '{sem.colors.borderColor.decorative.muted}',
+      value: '{sem.colors.borderColor.decorative.transparent}',
       type: 'color',
-      description: 'Sets borderColor for tooltip',
+      description: 'Sets borderColor for tooltip (default variant)',
     },
     inverted: {
-      value: '{sem.colors.borderColor.decorative.transparent}',
+      value: '{sem.colors.borderColor.decorative.muted}',
       type: 'color',
-      description: 'Sets borderColor for tooltip',
+      description: 'Sets borderColor for tooltip (inverted variant)',
     },
   },
   boxShadow: {