diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 2045286..8c5de2f 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -540,6 +540,8 @@ namespace C4IT_CustomerPanel
                 Application.Current.Resources.MergedDictionaries.Insert(1, themes[1]);
             }
 
+            UpdateNavigationHoverResource();
+
             ComputerInfoCtrl.SetAppearence();
 
             if (TryFindResource("navForeground") is SolidColorBrush navForeground)
@@ -557,6 +559,14 @@ namespace C4IT_CustomerPanel
             }
         }
 
+        private void UpdateNavigationHoverResource()
+        {
+            if (Application.Current?.Resources == null)
+                return;
+
+            Application.Current.Resources["navigationHoverColor"] = GetNavigationHoverBrush();
+        }
+
         private void ApplyWindowDraggableState()
         {
             bool draggable = ConfigSettings?.GetConfig()?._isDraggable ?? true;
diff --git a/UserControls/Announcements.xaml b/UserControls/Announcements.xaml
index 0f7419a..c3a0cbd 100644
--- a/UserControls/Announcements.xaml
+++ b/UserControls/Announcements.xaml
@@ -11,26 +11,24 @@
         <Style x:Key="ReadAllButtonChromeStyle"
                TargetType="{x:Type Border}">
             <Setter Property="Width"
-                    Value="30" />
+                    Value="28" />
             <Setter Property="Height"
-                    Value="30" />
+                    Value="28" />
             <Setter Property="CornerRadius"
-                    Value="8" />
+                    Value="7" />
             <Setter Property="Background"
                     Value="Transparent" />
             <Setter Property="BorderBrush"
                     Value="Transparent" />
             <Setter Property="BorderThickness"
-                    Value="1" />
+                    Value="0" />
             <Setter Property="Cursor"
                     Value="Hand" />
             <Style.Triggers>
                 <Trigger Property="IsMouseOver"
                          Value="True">
                     <Setter Property="Background"
-                            Value="{DynamicResource headerControlHoverBackgroundColor}" />
-                    <Setter Property="BorderBrush"
-                            Value="{DynamicResource cardBorderColor}" />
+                            Value="{DynamicResource navigationHoverColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -98,8 +96,8 @@
                 </Border>
             </StackPanel>
             <Border Style="{StaticResource ReadAllButtonChromeStyle}"
-                    Canvas.Left="334"
-                    Canvas.Top="11"
+                    Canvas.Left="335"
+                    Canvas.Top="12"
                     Visibility="{Binding Visibility, ElementName=buttonReadAllAnnouncements}"
                     ToolTip="{x:Static resx:Resources.removeMarkups}"
                     PreviewMouseDown="ReadAll_PreviewMouseDown">
diff --git a/UserControls/Incidents.xaml b/UserControls/Incidents.xaml
index 7bc451f..a2744e1 100644
--- a/UserControls/Incidents.xaml
+++ b/UserControls/Incidents.xaml
@@ -51,26 +51,24 @@
         <Style x:Key="ReadAllButtonChromeStyle"
                TargetType="{x:Type Border}">
             <Setter Property="Width"
-                    Value="30" />
+                    Value="28" />
             <Setter Property="Height"
-                    Value="30" />
+                    Value="28" />
             <Setter Property="CornerRadius"
-                    Value="8" />
+                    Value="7" />
             <Setter Property="Background"
                     Value="Transparent" />
             <Setter Property="BorderBrush"
                     Value="Transparent" />
             <Setter Property="BorderThickness"
-                    Value="1" />
+                    Value="0" />
             <Setter Property="Cursor"
                     Value="Hand" />
             <Style.Triggers>
                 <Trigger Property="IsMouseOver"
                          Value="True">
                     <Setter Property="Background"
-                            Value="{DynamicResource headerControlHoverBackgroundColor}" />
-                    <Setter Property="BorderBrush"
-                            Value="{DynamicResource cardBorderColor}" />
+                            Value="{DynamicResource navigationHoverColor}" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -148,8 +146,8 @@
                     Click="OnCreateNewTicketClicked"
                     Margin="0" />
             <Border Style="{StaticResource ReadAllButtonChromeStyle}"
-                    Canvas.Left="334"
-                    Canvas.Top="11"
+                    Canvas.Left="335"
+                    Canvas.Top="12"
                     Visibility="{Binding Visibility, ElementName=buttonReadAllTickets}"
                     ToolTip="{x:Static resx:Resources.removeMarkups}"
                     PreviewMouseDown="ReadAll_PreviewMouseDown">
diff --git a/themes/ThemeDarkNav.xaml b/themes/ThemeDarkNav.xaml
index f70a8f3..071f6eb 100644
--- a/themes/ThemeDarkNav.xaml
+++ b/themes/ThemeDarkNav.xaml
@@ -33,6 +33,7 @@
     <SolidColorBrush x:Key="cardBackgroundColor" Color="#172742"></SolidColorBrush>
     <SolidColorBrush x:Key="cardBorderColor" Color="#2A3F5F"></SolidColorBrush>
     <SolidColorBrush x:Key="navigationRailColor" Color="#0F172A"></SolidColorBrush>
+    <SolidColorBrush x:Key="navigationHoverColor" Color="#223651"></SolidColorBrush>
     <SolidColorBrush x:Key="navigationRailBorderColor" Color="#2A3F5F"></SolidColorBrush>
     <SolidColorBrush x:Key="inputBackgroundColor" Color="#0F1E37"></SolidColorBrush>
     <SolidColorBrush x:Key="inputBorderColor" Color="#2A4469"></SolidColorBrush>
diff --git a/themes/ThemeLightNav.xaml b/themes/ThemeLightNav.xaml
index 40c7858..04c563e 100644
--- a/themes/ThemeLightNav.xaml
+++ b/themes/ThemeLightNav.xaml
@@ -33,6 +33,7 @@
     <SolidColorBrush x:Key="cardBackgroundColor" Color="#FFFFFFFF"></SolidColorBrush>
     <SolidColorBrush x:Key="cardBorderColor" Color="#D7E0EE"></SolidColorBrush>
     <SolidColorBrush x:Key="navigationRailColor" Color="#EDF3FB"></SolidColorBrush>
+    <SolidColorBrush x:Key="navigationHoverColor" Color="#DCE8F7"></SolidColorBrush>
     <SolidColorBrush x:Key="navigationRailBorderColor" Color="#C6D6EA"></SolidColorBrush>
     <SolidColorBrush x:Key="inputBackgroundColor" Color="#F7FAFD"></SolidColorBrush>
     <SolidColorBrush x:Key="inputBorderColor" Color="#CBD9EC"></SolidColorBrush>