diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Tooltip.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Tooltip.axaml
index 37eab73..c0cbbfb 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Tooltip.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="ToolTipBackground" ResourceKey="SemiColorTertiaryPressed" />
+    <SolidColorBrush x:Key="ToolTipBackground" Color="{StaticResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="Black" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
index b466843..c84c117 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
@@ -71,7 +71,7 @@
     <StaticResource x:Key="ButtonSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerPressed" />
     <!--  end Solid  -->
 
-    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="{StaticResource SemiGrey5Color}" />
-    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="{StaticResource SemiGrey6Color}" />
-    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="{StaticResource SemiGrey7Color}" />
+    <StaticResource x:Key="ButtonInputInnerForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonInputInnerPointeroverForeground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonInputInnerPressedForeground" ResourceKey="SemiColorTertiaryPressed" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml
index d214bd6..720f4cc 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/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="{DynamicResource SemiGrey7Color}" />
+    <SolidColorBrush x:Key="ToolTipBackground" Color="{StaticResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="White" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file