diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index d3204fae..79479272 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -191,9 +191,6 @@
     <Setter Property="MaxWidth" Value="1024"/>
     <Setter Property="MaxHeight" Value="768"/>
   </Style>
-  
-  <Style Selector="Grid.repository_leftpanel">
-  </Style>
 
   <Style Selector="Path">
     <Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/>
@@ -720,7 +717,6 @@
       <Setter Property="Height" Value="24"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="0"/>
-      <Setter Property="CornerRadius" Value="4"/>
 
       <Setter Property="Template">
         <ControlTemplate>
@@ -739,24 +735,24 @@
         </ControlTemplate>
       </Setter>
     </Style>
-  </Style>
 
-  <Style Selector="Grid.repository_leftpanel ListBox.repo_left_content_list ListBoxItem:pointerover /template/ Border#PART_Background">
-    <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}" />
-    <Setter Property="Opacity" Value=".5"/>
-  </Style>
-  <Style Selector="Grid.repository_leftpanel ListBox.repo_left_content_list ListBoxItem:selected /template/ Border#PART_Background">
-    <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}" />
-    <Setter Property="Opacity" Value="1"/>
-  </Style>
-  <Style Selector="Grid.repository_leftpanel:focus-within ListBox.repo_left_content_list ListBoxItem:selected /template/ Border#PART_Background">
-    <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
-    <Setter Property="Opacity" Value=".65"/>
-  </Style>
-  <Style Selector="Grid.repository_leftpanel:focus-within ListBox.repo_left_content_list ListBoxItem:selected:pointerover /template/ Border#PART_Background">
-    <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
-    <Setter Property="Opacity" Value=".8"/>
-  </Style>
+    <Style Selector="^ ListBoxItem:pointerover /template/ Border#PART_Background">
+      <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}" />
+      <Setter Property="Opacity" Value=".5"/>
+    </Style>
+    <Style Selector="^ ListBoxItem:selected /template/ Border#PART_Background">
+      <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}" />
+      <Setter Property="Opacity" Value="1"/>
+    </Style>
+    <Style Selector="^:focus-within ListBoxItem:selected /template/ Border#PART_Background">
+      <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
+      <Setter Property="Opacity" Value=".65"/>
+    </Style>
+    <Style Selector="^:focus-within ListBoxItem:selected:pointerover /template/ Border#PART_Background">
+      <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
+      <Setter Property="Opacity" Value=".8"/>
+    </Style>
+  </Style>  
 
   <Style Selector="ContextMenu">
     <Setter Property="HorizontalOffset" Value="-4"/>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 22ec2d07..7bd24f91 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -17,7 +17,7 @@
     </Grid.ColumnDefinitions>
 
     <!-- Left Panel -->
-    <Grid Grid.Column="0" Classes="repository_leftpanel" RowDefinitions="Auto,*">
+    <Grid Grid.Column="0" RowDefinitions="Auto,*">
       <!-- Page Switcher for Left Contents (Dashboard or CommitSearch) -->
       <Grid Grid.Row="0" Height="24" Margin="0,6" HorizontalAlignment="Center" ColumnDefinitions="48,1,48">
         <Border Grid.Column="0" Grid.ColumnSpan="3"
@@ -251,6 +251,11 @@
                    DoubleTapped="OnDoubleTappedSubmodule"
                    PropertyChanged="OnLeftSidebarDataGridPropertyChanged"
                    IsVisible="{Binding IsSubmoduleGroupExpanded, Mode=OneWay}">
+            <ListBox.Styles>
+              <Style Selector="ListBoxItem">
+                <Setter Property="CornerRadius" Value="4"/>
+              </Style>
+            </ListBox.Styles>
             <ListBox.ItemTemplate>
               <DataTemplate DataType="m:Submodule">
                 <Grid ColumnDefinitions="Auto,*,8">
@@ -301,6 +306,11 @@
                    DoubleTapped="OnDoubleTappedWorktree"
                    PropertyChanged="OnLeftSidebarDataGridPropertyChanged"
                    IsVisible="{Binding IsWorktreeGroupExpanded, Mode=OneWay}">
+            <ListBox.Styles>
+              <Style Selector="ListBoxItem">
+                <Setter Property="CornerRadius" Value="4"/>
+              </Style>
+            </ListBox.Styles>
             <ListBox.ItemTemplate>
               <DataTemplate DataType="m:Worktree">
                 <Grid ColumnDefinitions="Auto,*,22">
diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml
index 4bafa55b..a66f4728 100644
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@@ -7,7 +7,13 @@
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SourceGit.Views.TagsView">  
+             x:Class="SourceGit.Views.TagsView">
+  <UserControl.Styles>
+    <Style Selector="ListBoxItem">
+      <Setter Property="CornerRadius" Value="4"/>
+    </Style>
+  </UserControl.Styles>
+  
   <UserControl.DataTemplates>
     <DataTemplate DataType="vm:TagCollectionAsTree">
       <ListBox Classes="repo_left_content_list"