diff --git a/code/lib/components/src/tooltip/Tooltip.tsx b/code/lib/components/src/tooltip/Tooltip.tsx
index 9aeb3ce676a..2836700b6e6 100644
--- a/code/lib/components/src/tooltip/Tooltip.tsx
+++ b/code/lib/components/src/tooltip/Tooltip.tsx
@@ -56,7 +56,7 @@ const Arrow = styled.div<ArrowProps>(
       placement,
       theme.color[color] || color || theme.base === 'light'
         ? lighten(theme.background.app)
-        : darken(theme.background.app),
+        : theme.background.app,
       'transparent'
     ),
     borderBottomColor: match(
@@ -64,7 +64,7 @@ const Arrow = styled.div<ArrowProps>(
       placement,
       theme.color[color] || color || theme.base === 'light'
         ? lighten(theme.background.app)
-        : darken(theme.background.app),
+        : theme.background.app,
       'transparent'
     ),
     borderLeftColor: match(
@@ -72,7 +72,7 @@ const Arrow = styled.div<ArrowProps>(
       placement,
       theme.color[color] || color || theme.base === 'light'
         ? lighten(theme.background.app)
-        : darken(theme.background.app),
+        : theme.background.app,
       'transparent'
     ),
     borderRightColor: match(
@@ -80,7 +80,7 @@ const Arrow = styled.div<ArrowProps>(
       placement,
       theme.color[color] || color || theme.base === 'light'
         ? lighten(theme.background.app)
-        : darken(theme.background.app),
+        : theme.background.app,
       'transparent'
     ),
   })
diff --git a/code/lib/components/src/tooltip/TooltipMessage.tsx b/code/lib/components/src/tooltip/TooltipMessage.tsx
index a1aff343efc..8f8697df9b9 100644
--- a/code/lib/components/src/tooltip/TooltipMessage.tsx
+++ b/code/lib/components/src/tooltip/TooltipMessage.tsx
@@ -20,7 +20,7 @@ const Links = styled.div(({ theme }) => ({
 }));
 
 const Message = styled.div(({ theme }) => ({
-  color: theme.textColor,
+  color: theme.color.defaultText,
   lineHeight: '18px',
 }));
 
diff --git a/code/lib/components/src/tooltip/TooltipNote.tsx b/code/lib/components/src/tooltip/TooltipNote.tsx
index 9ff2b681f70..b66cc024064 100644
--- a/code/lib/components/src/tooltip/TooltipNote.tsx
+++ b/code/lib/components/src/tooltip/TooltipNote.tsx
@@ -12,7 +12,7 @@ const Note = styled.div(({ theme }) => ({
   whiteSpace: 'nowrap',
   pointerEvents: 'none',
   zIndex: -1,
-  background: theme.base === 'light' ? 'rgba(60, 60, 60, 0.9)' : 'rgba(20, 20, 20, 0.85)',
+  background: theme.base === 'light' ? 'rgba(60, 60, 60, 0.9)' : 'rgba(0, 0, 0, 0.95)',
   margin: 6,
 }));