diff --git a/MainWindow.xaml b/MainWindow.xaml
index 1383a0c..20c0ead 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -199,6 +199,17 @@
                     Value="{DynamicResource activeButtonColor}" />
             <Setter Property="BorderBrush"
                     Value="{DynamicResource activeButtonColor}" />
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver"
+                         Value="True">
+                    <Setter Property="Background"
+                            Value="{DynamicResource primaryActionHoverColor}" />
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource primaryActionHoverColor}" />
+                    <Setter Property="Foreground"
+                            Value="{DynamicResource buttonTextColor}" />
+                </Trigger>
+            </Style.Triggers>
         </Style>
         <Style TargetType="Button"
                x:Key="FlatButtonStyle2">
diff --git a/libs/configHelper.cs b/libs/configHelper.cs
index ee1ca73..aa028d2 100644
--- a/libs/configHelper.cs
+++ b/libs/configHelper.cs
@@ -1036,10 +1036,14 @@ namespace C4IT_CustomerPanel.libs
                 ApplyBackgroundDerivedResources(backgroundColor);
 
                 // Active/Inactive button colors must come directly from config (WebAPI), not be overridden by derived background shades.
-                System.Windows.Application.Current.Resources["activeButtonColor"] = new SolidColorBrush(
-                    hasConfiguredActiveColor ? configuredActiveButtonColor : ConverterHelper.ColorConvertFromString(Properties.Resources.activeButtonColor));
+                Color activeButtonColor = hasConfiguredActiveColor
+                    ? configuredActiveButtonColor
+                    : ConverterHelper.ColorConvertFromString(Properties.Resources.activeButtonColor);
+                System.Windows.Application.Current.Resources["activeButtonColor"] = new SolidColorBrush(activeButtonColor);
                 System.Windows.Application.Current.Resources["inactiveButtonColor"] = new SolidColorBrush(
                     hasConfiguredInactiveColor ? configuredInactiveButtonColor : ConverterHelper.ColorConvertFromString(Properties.Resources.inactiveButtonColor));
+                System.Windows.Application.Current.Resources["primaryActionHoverColor"] = new SolidColorBrush(
+                    GetButtonHoverColor(activeButtonColor, 1.15));
 
                 ApplyHeaderDerivedResources(headerColor);
 
@@ -1056,6 +1060,8 @@ namespace C4IT_CustomerPanel.libs
                 ApplyBackgroundDerivedResources(fallbackBackground);
                 System.Windows.Application.Current.Resources["activeButtonColor"] = new SolidColorBrush(fallbackActive);
                 System.Windows.Application.Current.Resources["inactiveButtonColor"] = new SolidColorBrush(fallbackInactive);
+                System.Windows.Application.Current.Resources["primaryActionHoverColor"] = new SolidColorBrush(
+                    GetButtonHoverColor(fallbackActive, 1.15));
                 ApplyHeaderDerivedResources(fallbackHeader);
             }
 
diff --git a/themes/ThemeDarkNav.xaml b/themes/ThemeDarkNav.xaml
index 6cae965..f70a8f3 100644
--- a/themes/ThemeDarkNav.xaml
+++ b/themes/ThemeDarkNav.xaml
@@ -42,4 +42,5 @@
     <SolidColorBrush x:Key="itemHoverBorderColor" Color="#38BDF8"></SolidColorBrush>
     <SolidColorBrush x:Key="inactiveButtonColor" Color="#1E3552"></SolidColorBrush>
     <SolidColorBrush x:Key="activeButtonColor" Color="#38BDF8"></SolidColorBrush>
+    <SolidColorBrush x:Key="primaryActionHoverColor" Color="#4CC7FC"></SolidColorBrush>
 </ResourceDictionary>
diff --git a/themes/ThemeLightNav.xaml b/themes/ThemeLightNav.xaml
index 699d97f..40c7858 100644
--- a/themes/ThemeLightNav.xaml
+++ b/themes/ThemeLightNav.xaml
@@ -42,4 +42,5 @@
     <SolidColorBrush x:Key="itemHoverBorderColor" Color="#1090E0"></SolidColorBrush>
     <SolidColorBrush x:Key="inactiveButtonColor" Color="#E3EBF6"></SolidColorBrush>
     <SolidColorBrush x:Key="activeButtonColor" Color="#1090E0"></SolidColorBrush>
+    <SolidColorBrush x:Key="primaryActionHoverColor" Color="#0F83CC"></SolidColorBrush>
 </ResourceDictionary>