diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 2788583da..4b6e5cf46 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -35,7 +35,7 @@
                     FontWeight="SemiBold"
                     Foreground="{Binding MessageColor}"
                     Text="{Binding Message}"
-                    Visibility="{Binding MessageVisibility}"/>
+                    Visibility="{Binding MessageVisibility}" />
             </Border>
         </Popup>
         <Grid>
@@ -104,7 +104,7 @@
                         <Border
                             x:Name="ButtonBorder"
                             Padding="5,0,5,0"
-                            Background="{DynamicResource Color12B}"
+                            Background="{DynamicResource ButtonBackgroundColor}"
                             BorderBrush="{DynamicResource ButtonInsideBorder}"
                             BorderThickness="1"
                             CornerRadius="5">
@@ -125,7 +125,7 @@
                                     <Condition Property="IsMouseOver" Value="True" />
                                     <Condition Property="IsChecked" Value="False" />
                                 </MultiTrigger.Conditions>
-                                <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource CustomContextHover}" />
+                                <Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMouseOver}" />
                             </MultiTrigger>
                             <MultiTrigger>
                                 <MultiTrigger.Conditions>
@@ -157,7 +157,7 @@
                                 <Border
                                     Margin="2,5,2,5"
                                     Padding="10,5,10,5"
-                                    Background="{DynamicResource SystemAccentColorLight2Brush}"
+                                    Background="{DynamicResource AccentButtonBackground}"
                                     BorderThickness="1"
                                     CornerRadius="5">
                                     <TextBlock Text="{Binding}" />
diff --git a/Flow.Launcher/Resources/Controls/ExCard.xaml b/Flow.Launcher/Resources/Controls/ExCard.xaml
index cc95866b0..8f0eb3cb4 100644
--- a/Flow.Launcher/Resources/Controls/ExCard.xaml
+++ b/Flow.Launcher/Resources/Controls/ExCard.xaml
@@ -116,7 +116,7 @@
                                                                         <Trigger Property="IsMouseOver" Value="true">
                                                                             <Setter TargetName="circle" Property="Stroke" Value="Transparent" />
                                                                             <Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color05B}" />
-                                                                            <Setter TargetName="ToggleBtn" Property="Background" Value="{DynamicResource CustomContextHover}" />
+                                                                            <Setter TargetName="ToggleBtn" Property="Background" Value="{DynamicResource CustomExpanderHover}" />
                                                                         </Trigger>
                                                                         <Trigger Property="IsPressed" Value="true">
                                                                             <Setter TargetName="circle" Property="Stroke" Value="Transparent" />
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
index 778c77fe5..1fce67917 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
@@ -40,10 +40,10 @@
                             <Border
                                 Margin="2,5,2,5"
                                 Padding="10,5,10,5"
-                                Background="{DynamicResource SystemAccentColorLight2Brush}"
+                                Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
                                 BorderThickness="1"
                                 CornerRadius="5">
-                                <TextBlock Text="{Binding}" />
+                                <TextBlock Foreground="{DynamicResource AccentButtonForegroundPointerOver}" Text="{Binding}" />
                             </Border>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 548a1f3a2..236486c85 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -104,6 +104,11 @@
     <Color x:Key="NumberBoxColor26">#ffffff</Color>
     <Color x:Key="HoverStoreGrid">#272727</Color>
 
+    <!--  Resources for HotkeyControl  -->
+    <SolidColorBrush x:Key="CustomHotkeyHover" Color="#323232" />
+    <!--  Resources for Expander  -->
+    <SolidColorBrush x:Key="CustomExpanderHover" Color="#323232" />
+
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonInsideBorder" Color="#3f3f3f" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 517a5fd5d..3d1f93e3f 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -95,6 +95,13 @@
     <Color x:Key="NumberBoxColor26">#1b1b1b</Color>
     <Color x:Key="HoverStoreGrid">#f6f6f6</Color>
 
+    <!--  Resources for HotkeyControl  -->
+    <SolidColorBrush x:Key="CustomHotkeyHover" Color="#f6f6f6" />
+    <!--  Resources for Expander  -->
+    <SolidColorBrush x:Key="CustomExpanderHover" Color="#f6f6f6" />
+
+
+
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
     <SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 6c4c8c621..192c2e23d 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2721,7 +2721,7 @@
                                 <StackPanel Grid.Row="2">
                                     <cc:ExCard
                                         Title="{DynamicResource basicHotkey}"
-                                        Margin="0,12,0,0"
+                                        Margin="0,14,0,0"
                                         Icon="&#xf0e2;"
                                         Sub="{DynamicResource basicHotkeyToolTip}">
                                         <StackPanel>
@@ -2830,7 +2830,7 @@
 
                                     <cc:ExCard
                                         Title="{DynamicResource autoCompleteHotkey}"
-                                        Margin="0,4,0,0"
+                                        Margin="0,14,0,0"
                                         Icon="&#xe893;"
                                         Sub="{DynamicResource autoCompleteHotkeyToolTip}">
                                         <cc:ExCard.SideContent>