diff --git a/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml b/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
index 5b9f30b..ec8ebf8 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ToolTipBackground" Color="#C6CACD" />
-    <SolidColorBrush x:Key="ToolTipForeground" Color="Black" />
-    <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ToolTipBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToolTipForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ToolTipBorderBrush" Color="{StaticResource WindowTextColor}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
index f35c245..137de36 100644
--- a/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Tooltip.axaml
@@ -2,5 +2,5 @@
     <CornerRadius x:Key="ToolTipCornerRadius">6</CornerRadius>
     <Thickness x:Key="ToolTipPadding">12 8</Thickness>
     <x:Double x:Key="ToolTipMaxWidth">320</x:Double>
-    <Thickness x:Key="ToolTipBorderThickness">0</Thickness>
+    <Thickness x:Key="ToolTipBorderThickness">1</Thickness>
 </ResourceDictionary>
\ No newline at end of file