diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 7df5ecc..a5ce871 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -7,7 +7,7 @@ on:
       - 'feature/**'
 
 env:
-  version: '10.7.${{ github.run_number }}'
+  version: '10.8.${{ github.run_number }}'
   dotnetVersion: '8'
   repoUrl: ${{ github.server_url }}/${{ github.repository }}
   vsixPath: src/CodeNav/bin/Release/net472/CodeNav.vsix
diff --git a/README.md b/README.md
index c26f582..1e9c389 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-<img src="https://raw.githubusercontent.com/sboulema/CodeNav/main/art/Logo_90x90.png" />
+<img src="https://raw.githubusercontent.com/sboulema/CodeNav/main/art/Logo_90x90.png" />
 
 # CodeNav 
 Visual Studio extension to show the code structure of your current document
 
 [![Sponsor](https://img.shields.io/badge/-Sponsor-fafbfc?logo=GitHub%20Sponsors)](https://github.com/sponsors/sboulema)
 
-## Features
+# ✨ Features
 - Quickly see all the important methods and properties in your document
 - Never get lost during a refactoring of a super long document
 - Clicking on an item in the list will take you to that location in the document
@@ -23,27 +23,28 @@ Visual Studio extension to show the code structure of your current document
 - Bookmarks
 - Synced collapsing/expanding outline regions
 - Option to hide the tool window for unsupported files and files without code items
+- Compact mode with less spacing optimizing screen real estate
 
 
-## Supported Visual Studio versions
+# 💻 Supported Visual Studio versions
 
 - Visual Studio 2022 (Untested)
 - Visual Studio 2026
 
-## Language support
+# 🔤 Language support
 - C#
 
-## Installing
-[Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=SamirBoulema.CodeNav2026) [![Visual Studio Marketplace](https://img.shields.io/vscode-marketplace/v/SamirBoulema.CodeNav2026.svg?style=flat)](https://marketplace.visualstudio.com/items?itemName=SamirBoulema.CodeNav2026)
+# ⬇️ Installing
+[Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=SamirBoulema.CodeNav2026)
 
 [GitHub Releases](https://github.com/sboulema/CodeNav/releases)
 
 [Open VSIX Gallery](https://www.vsixgallery.com/extension/CodeNav.dcdbcca4-3a88-432f-ba04-eb4a4cb64437)
 
-## Usage
+# 🤲 Usage
 The CodeNav tool window can be opened via the entry in the `Extensions` menu.
 
-## Screenshots
+# 🖼️ Screenshots
 ![Preview](https://raw.githubusercontent.com/sboulema/CodeNav/main/art/Screenshot-light.png) ![Preview-Dark](https://raw.githubusercontent.com/sboulema/CodeNav/main/art/Screenshot-dark.png)
 
 #### Filter window
@@ -55,5 +56,8 @@ The CodeNav tool window can be opened via the entry in the `Extensions` menu.
 #### Bookmarks
 ![Bookmarks](https://raw.githubusercontent.com/sboulema/CodeNav/main/art/Bookmarks.png)
 
-## Documentation
+#### Compact mode
+![Compact](https://raw.githubusercontent.com/sboulema/CodeNav/main/art/Compact.png)
+
+# 📄 Documentation
 Looking for more info? Read the full [Documentation](https://github.com/sboulema/CodeNav/blob/main/docs/index.md) with links, guides, troubleshooting, and tips. 
\ No newline at end of file
diff --git a/art/Compact.png b/art/Compact.png
new file mode 100644
index 0000000..3e53f8d
Binary files /dev/null and b/art/Compact.png differ
diff --git a/art/Screenshot-light.png b/art/Screenshot-light.png
index 5f73d41..918e7b8 100644
Binary files a/art/Screenshot-light.png and b/art/Screenshot-light.png differ
diff --git a/art/Settings.png b/art/Settings.png
index 45b34f2..267e5cb 100644
Binary files a/art/Settings.png and b/art/Settings.png differ
diff --git a/docs/settings.md b/docs/settings.md
index c922d87..10079f6 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -18,6 +18,10 @@ Enable or disable highlighting the item in CodeNav based on caret position
 
 Enable or disable showing the CodeNav tool window for unsupported files and files without code items
 
+**Use compact mode with less spacing**
+
+Enable or disable showing items in a condensed form with less vertical spacing optimizing screen real estate
+
 **Update CodeNav while typing**
 
 Enable of disable updating the list of code items in CodeNav while typing in the text editor
diff --git a/src/CodeNav.OutOfProc/CodeNav.OutOfProc.csproj b/src/CodeNav.OutOfProc/CodeNav.OutOfProc.csproj
index 85a6bdc..952d906 100644
--- a/src/CodeNav.OutOfProc/CodeNav.OutOfProc.csproj
+++ b/src/CodeNav.OutOfProc/CodeNav.OutOfProc.csproj
@@ -38,6 +38,7 @@
     <None Remove="ToolWindows\Templates\HighlightNameStyle.xaml" />
     <None Remove="ToolWindows\Templates\ItemContextMenu.xaml" />
     <None Remove="ToolWindows\Templates\ToolbarStyles.xaml" />
+    <None Remove="ViewModels\CodeItem.cs~RF32119e8.TMP" />
 	  <EmbeddedResource Include="Dialogs\FilterDialog\FilterDialogControl.xaml" />
 	  <EmbeddedResource Include="Dialogs\SettingsDialog\SettingsDialogControl.xaml" />
 	  <EmbeddedResource Include="ToolWindows\CodeNavToolWindowControl.xaml" />
diff --git a/src/CodeNav.OutOfProc/Dialogs/FilterDialog/FilterDialogControl.xaml b/src/CodeNav.OutOfProc/Dialogs/FilterDialog/FilterDialogControl.xaml
index de711ec..67da4e9 100644
--- a/src/CodeNav.OutOfProc/Dialogs/FilterDialog/FilterDialogControl.xaml
+++ b/src/CodeNav.OutOfProc/Dialogs/FilterDialog/FilterDialogControl.xaml
@@ -16,8 +16,8 @@
         <Style TargetType="GridViewColumnHeader">
             <Setter Property="Background" Value="{DynamicResource {x:Static styles:VsBrushes.GridHeadingBackgroundKey}}"/>
             <Setter Property="Foreground" Value="{DynamicResource {x:Static styles:VsBrushes.GridHeadingTextKey}}"/>
-            <Setter Property="Margin" Value="-4,-2,0,0"/>
-            <Setter Property="Padding" Value="4,2,0,0"/>
+            <Setter Property="Margin" Value="-4 -2 0 0"/>
+            <Setter Property="Padding" Value="4 2 0 0"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="FontWeight" Value="Bold"/>
         </Style>
@@ -25,7 +25,7 @@
         <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Static styles:VsResourceKeys.ThemedDialogComboBoxStyleKey}}"/>
         <Style TargetType="TextBox" BasedOn="{StaticResource {x:Static styles:VsResourceKeys.ThemedDialogTextBoxStyleKey}}"/>
         <Style TargetType="TextBlock">
-            <Setter Property="Margin" Value="0,0,0,8" />
+            <Setter Property="Margin" Value="0 0 0 8" />
         </Style>
         <Style TargetType="CheckBox">
             <Setter Property="HorizontalAlignment" Value="Center" />
@@ -48,9 +48,9 @@
                             <DataTemplate>
                                 <Border 
                                     BorderBrush="{DynamicResource {x:Static styles:VsBrushes.StartPageTextSubHeadingSelectedKey}}"
-                                    BorderThickness="0,0,1,0"
-                                    Margin="-6,-3,-6,-3">
-                                    <StackPanel Margin="6,2,6,2" VerticalAlignment="Center">
+                                    BorderThickness="0 0 1 0"
+                                    Margin="-6 -3 -6 -3">
+                                    <StackPanel Margin="6 2 6 2" VerticalAlignment="Center">
                                         <ComboBox SelectedItem="{Binding Kind, Mode=TwoWay}" ItemsSource="{Binding KindArray}" />
                                     </StackPanel>
                                 </Border>
@@ -71,9 +71,9 @@
                             <DataTemplate>
                                 <Border 
                                     BorderBrush="{DynamicResource {x:Static styles:VsBrushes.StartPageTextSubHeadingSelectedKey}}"
-                                    BorderThickness="0,0,1,0"
-                                    Margin="-6,-3,-6,-3">
-                                    <StackPanel Margin="6,2,6,2" VerticalAlignment="Center">
+                                    BorderThickness="0 0 1 0"
+                                    Margin="-6 -3 -6 -3">
+                                    <StackPanel Margin="6 2 6 2" VerticalAlignment="Center">
                                         <CheckBox
                                             IsThreeState="True"
                                             IsChecked="{Binding IsEmpty}"
@@ -127,11 +127,11 @@
             </ListView.View>
         </ListView>
 
-        <StackPanel Grid.Row="1" Margin="0,5,0,0" Orientation="Horizontal">
+        <StackPanel Grid.Row="1" Margin="0 5 0 0" Orientation="Horizontal">
             <Button
                 Command="{Binding Path=AddFilterCommand}"
                 ToolTip="Add filter"
-                Margin="0,0,4,0">
+                Margin="0 0 4 0">
                 <Button.Content>
                     <vs:Image Source="KnownMonikers.NewFilter" Width="16" Height="16" />
                 </Button.Content>
@@ -140,7 +140,7 @@
             <Button
                 Command="{Binding Path=DeleteFilterCommand}"
                 ToolTip="Delete filter"
-                Margin="0,0,4,0">
+                Margin="0 0 4 0">
                 <Button.Content>
                     <vs:Image Source="KnownMonikers.DeleteFilter" Width="16" Height="16" />
                 </Button.Content>
@@ -149,7 +149,7 @@
             <Button
                 Command="{Binding Path=MoveFilterUpCommand}"
                 ToolTip="Move up"
-                Margin="0,0,4,0">
+                Margin="0 0 4 0">
                 <Button.Content>
                     <vs:Image Source="KnownMonikers.MoveUp" Width="16" Height="16" />
                 </Button.Content>
@@ -167,7 +167,7 @@
         <GroupBox
             Grid.Row="2"
             Header="Filter help"
-            Margin="0,5"
+            Margin="0 5"
             Padding="5">
             <StackPanel>
                 <TextBlock>
diff --git a/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogControl.xaml b/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogControl.xaml
index 354ff44..0201876 100644
--- a/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogControl.xaml
+++ b/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogControl.xaml
@@ -7,10 +7,10 @@
     <DataTemplate.Resources>
         <Style TargetType="TextBox" BasedOn="{StaticResource {x:Static styles:VsResourceKeys.ThemedDialogTextBoxStyleKey}}" />
         <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Static styles:VsResourceKeys.ThemedDialogCheckBoxStyleKey}}">
-            <Setter Property="Margin" Value="0,5" />
+            <Setter Property="Margin" Value="0 5" />
         </Style>
         <Style TargetType="Label" BasedOn="{StaticResource {x:Static styles:VsResourceKeys.ThemedDialogLabelStyleKey}}">
-            <Setter Property="Margin" Value="-5,0,0,0" />
+            <Setter Property="Margin" Value="-5 0 0 0" />
         </Style>
     </DataTemplate.Resources>
 
@@ -35,6 +35,10 @@
                 <CheckBox IsChecked="{Binding ShowToolWindowForUnsupportedFiles, Mode=TwoWay}">
                     Show the tool window for unsupported files and files without code items
                 </CheckBox>
+
+                <CheckBox IsChecked="{Binding UseCompactMode, Mode=TwoWay}">
+                    Use compact mode with less spacing
+                </CheckBox>
             </StackPanel>
         </GroupBox>
 
diff --git a/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogData.cs b/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogData.cs
index 925a4ef..2c30e7f 100644
--- a/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogData.cs
+++ b/src/CodeNav.OutOfProc/Dialogs/SettingsDialog/SettingsDialogData.cs
@@ -46,4 +46,10 @@ public class SettingsDialogData
     /// </summary>
     [DataMember]
     public bool ShowToolWindowForUnsupportedFiles { get; set; } = true;
+
+    /// <summary>
+    /// Setting if CodeNav should use a compact mode with less vertical margins
+    /// </summary>
+    [DataMember]
+    public bool UseCompactMode { get; set; }
 }
diff --git a/src/CodeNav.OutOfProc/Models/GlobalSettings.cs b/src/CodeNav.OutOfProc/Models/GlobalSettings.cs
index 462cd0f..33ee6cc 100644
--- a/src/CodeNav.OutOfProc/Models/GlobalSettings.cs
+++ b/src/CodeNav.OutOfProc/Models/GlobalSettings.cs
@@ -1,5 +1,4 @@
 using CodeNav.OutOfProc.Constants;
-using System.Runtime.Serialization;
 
 namespace CodeNav.OutOfProc.Models;
 
@@ -36,11 +35,15 @@ public class GlobalSettings
     public bool EnableCrashAnalytics { get; set; }
 
     /// <summary>
-    /// Setting if CodeNav should be shown or hidden for unsupported files and files without code items
+    /// Settings dialog - Setting if CodeNav should be shown or hidden for unsupported files and files without code items
     /// </summary>
-    [DataMember]
     public bool ShowToolWindowForUnsupportedFiles { get; set; } = true;
 
+    /// <summary>
+    /// Settings dialog - Setting if CodeNav should use a compact mode with less vertical margins
+    /// </summary>
+    public bool UseCompactMode { get; set; }
+
     /// <summary>
     /// Main toolbar - Setting to store the selected sort order for code items
     /// </summary>
diff --git a/src/CodeNav.OutOfProc/Services/CodeDocumentService.cs b/src/CodeNav.OutOfProc/Services/CodeDocumentService.cs
index 43957d5..39d19e3 100644
--- a/src/CodeNav.OutOfProc/Services/CodeDocumentService.cs
+++ b/src/CodeNav.OutOfProc/Services/CodeDocumentService.cs
@@ -171,6 +171,7 @@ public async Task LoadGlobalSettings(bool readFromDisk = false)
                 UpdateWhileTyping = GlobalSettings.UpdateWhileTyping,
                 EnableCrashAnalytics = GlobalSettings.EnableCrashAnalytics,
                 ShowToolWindowForUnsupportedFiles = GlobalSettings.ShowToolWindowForUnsupportedFiles,
+                UseCompactMode = GlobalSettings.UseCompactMode,
             };
 
             var filterRules = GlobalSettings
diff --git a/src/CodeNav.OutOfProc/ToolWindows/CodeNavToolWindowControl.xaml b/src/CodeNav.OutOfProc/ToolWindows/CodeNavToolWindowControl.xaml
index bfe85c2..ca37b77 100644
--- a/src/CodeNav.OutOfProc/ToolWindows/CodeNavToolWindowControl.xaml
+++ b/src/CodeNav.OutOfProc/ToolWindows/CodeNavToolWindowControl.xaml
@@ -20,7 +20,7 @@
             </Grid.RowDefinitions>
 
             <!-- Main Toolbar -->
-            <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+            <StackPanel Orientation="Horizontal" Margin="0 0 0 4">
                 <Button
                     Command="{Binding Path=RefreshCommand}"
                     ToolTip="Refresh"
@@ -30,7 +30,7 @@
                     </Button.Content>
                 </Button>
 
-                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Margin="2,0" />
+                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Margin="2 0" />
 
                 <RadioButton
                     Command="{Binding Path=SortByNameCommand}"
@@ -62,7 +62,7 @@
                     </RadioButton.Content>
                 </RadioButton>
 
-                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Margin="2,0" />
+                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Margin="2 0" />
 
                 <Button
                     Command="{Binding Path=ExpandAllCommand}"
@@ -82,7 +82,7 @@
                     </Button.Content>
                 </Button>
 
-                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Margin="2,0" />
+                <Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" Margin="2 0" />
 
                 <Button
                     Command="{Binding Path=SettingsCommand}"
@@ -111,8 +111,8 @@
                         Text="Search CodeNav"
                         VerticalAlignment="Center"
                         HorizontalAlignment="Left"
-                        Margin="4,0,0,0"
-                        Padding="0,0,10,0"
+                        Margin="4 0 0 0"
+                        Padding="0 0 10 0"
                         Foreground="DarkGray">
                         <TextBlock.Style>
                             <Style TargetType="{x:Type TextBlock}">
@@ -166,7 +166,7 @@
             <!-- Code items -->
             <Border Grid.Row="2"
                 BorderBrush="{DynamicResource {x:Static styles:VsBrushes.ComboBoxBorderKey}}"
-                Margin="0,4,0,0">
+                Margin="0 4 0 0">
                 <ScrollViewer x:Name="CodeItemsScrollViewer" VerticalScrollBarVisibility="Auto">
                     <ItemsControl
                         ItemsSource="{Binding CodeItems}"
@@ -195,7 +195,7 @@
                     <Style TargetType="{x:Type Border}">
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=CodeItemsScrollViewer, Path=ComputedVerticalScrollBarVisibility}" Value="Visible">
-                                <Setter Property="BorderThickness" Value="0,1,1,1" />
+                                <Setter Property="BorderThickness" Value="0 1 1 1" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
diff --git a/src/CodeNav.OutOfProc/ToolWindows/Templates/CodeItemStyles.xaml b/src/CodeNav.OutOfProc/ToolWindows/Templates/CodeItemStyles.xaml
index 4e2daf9..22b230e 100644
--- a/src/CodeNav.OutOfProc/ToolWindows/Templates/CodeItemStyles.xaml
+++ b/src/CodeNav.OutOfProc/ToolWindows/Templates/CodeItemStyles.xaml
@@ -37,7 +37,8 @@
         <Setter Property="ContentTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <Button ToolTip="{Binding Tooltip}"
+                    <Button x:Name="CodeItemButton"
+                            ToolTip="{Binding Tooltip}"
                             Visibility="{Binding Visibility}"
                             ContextMenu="{DynamicResource ItemContextMenu}"
                             Opacity="{Binding Opacity}"
@@ -47,7 +48,7 @@
                             BorderThickness="0" 
                             HorizontalContentAlignment="Stretch"
                             HorizontalAlignment="Stretch"
-                            Margin="-3,-3,-3,0"
+                            Margin="-3 -3 -3 0"
                             Padding="3">
                         <Button.InputBindings>
                             <MouseBinding Gesture="LeftClick" Command="{Binding ClickItemCommand}" />
@@ -61,7 +62,7 @@
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
 
-                            <Grid Margin="0,0,3,0" Width="16" Height="16">
+                            <Grid Margin="0 0 3 0" Width="16" Height="16">
                                 <vs:Image Source="{Binding Moniker}" />
                                 <vs:Image Source="{Binding OverlayMoniker}" Width="8" Height="8" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
                             </Grid>
@@ -78,7 +79,7 @@
                             <vs:Image 
                                 Grid.Column="2"
                                 Source="KnownMonikers.History"
-                                Margin="3,0,0,0"
+                                Margin="3 0 0 0"
                                 Width="10"
                                 Height="10"
                                 HorizontalAlignment="Center"
@@ -90,7 +91,7 @@
                             <vs:Image 
                                 Grid.Column="3"
                                 Source="KnownMonikers.Bookmark"
-                                Margin="3,0,0,0"
+                                Margin="3 0 0 0"
                                 Width="10"
                                 Height="10"
                                 HorizontalAlignment="Center"
@@ -98,6 +99,12 @@
                                 Visibility="{Binding BookmarkVisibility}" />
                         </Grid>
                     </Button>
+                    <DataTemplate.Triggers>
+                        <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                            <Setter Property="Padding" TargetName="CodeItemButton" Value="3 0" />
+                            <Setter Property="Margin" TargetName="CodeItemButton" Value="-3 0" />
+                        </DataTrigger>
+                    </DataTemplate.Triggers>
                 </DataTemplate>
             </Setter.Value>
         </Setter>
@@ -116,9 +123,15 @@
                                     HorizontalAlignment="Stretch">
                                     <Expander.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <vs:Image Source="{Binding Moniker}" Width="16" Height="16" Margin="0,0,3,0" />
+                                            <vs:Image
+                                                Source="{Binding Moniker}"
+                                                Width="16"
+                                                Height="16"
+                                                Margin="0,0,3,0"
+                                                VerticalAlignment="Center" />
                                             <TextBlock
-                                                FontSize="{Binding FontSize}">
+                                                FontSize="{Binding FontSize}"
+                                                VerticalAlignment="Center">
                                                     <Run Text="{Binding Name}" 
                                                          Style="{DynamicResource HighlightNameStyle}"/>
                                                     <Run Text="{Binding Parameters}" 
@@ -126,7 +139,8 @@
                                             </TextBlock>
                                         </StackPanel>
                                     </Expander.Header>
-                                    <ItemsControl 
+                                    <ItemsControl
+                                        x:Name="MembersItemsControl"
                                         ItemsSource="{Binding Members}"
                                         Margin="3"
                                         VirtualizingPanel.IsVirtualizing="True"
@@ -146,9 +160,23 @@
                                         <ItemsControl.ItemContainerStyle>
                                             <Style>
                                                 <Setter Property="FrameworkElement.Visibility" Value="{Binding Visibility}"/>
-                                                <Setter Property="FrameworkElement.Margin" Value="0,0,0,3"/>
+                                                <Setter Property="FrameworkElement.Margin" Value="0 0 0 3"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                                        <Setter Property="FrameworkElement.Margin" Value="0 0 0 1"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
                                             </Style>
                                         </ItemsControl.ItemContainerStyle>
+                                        <ItemsControl.Style>
+                                            <Style>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                                        <Setter Property="FrameworkElement.Margin" Value="3 0" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ItemsControl.Style>
                                     </ItemsControl>
                                 </Expander>
 
@@ -173,11 +201,21 @@
                                     <ItemsControl.ItemContainerStyle>
                                         <Style>
                                             <Setter Property="FrameworkElement.Visibility" Value="{Binding Visibility}"/>
-                                            <Setter Property="FrameworkElement.Margin" Value="0,0,0,3"/>
+                                            <Setter Property="FrameworkElement.Margin" Value="0 0 0 3"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                                    <Setter Property="FrameworkElement.Margin" Value="0 0 0 1"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
                                         </Style>
                                     </ItemsControl.ItemContainerStyle>
                                 </ItemsControl>
                             </StackPanel>
+                            <DataTemplate.Triggers>
+                                <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                    <Setter Property="Margin" TargetName="MembersItemsControl" Value="3 0" />
+                                </DataTrigger>
+                            </DataTemplate.Triggers>
                         </DataTemplate>
                     </Setter.Value>
                 </Setter>
@@ -194,9 +232,15 @@
                                     HorizontalAlignment="Stretch">
                                     <Expander.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <vs:Image Source="{Binding Moniker}" Width="16" Height="16" Margin="0,0,3,0" />
+                                            <vs:Image
+                                                Source="{Binding Moniker}"
+                                                Width="16"
+                                                Height="16"
+                                                Margin="0 0 3 0"
+                                                VerticalAlignment="Center" />
                                             <TextBlock
-                                                FontSize="{Binding FontSize}">
+                                                FontSize="{Binding FontSize}"
+                                                VerticalAlignment="Center">
                                                 <Run Text="{Binding Name}" 
                                                     Style="{DynamicResource HighlightNameStyle}" />
                                                 <Run Text="{Binding Parameters}" 
@@ -204,7 +248,8 @@
                                             </TextBlock>
                                         </StackPanel>
                                     </Expander.Header>
-                                    <ItemsControl 
+                                    <ItemsControl
+                                        x:Name="MembersItemsControl"
                                         ItemsSource="{Binding Members}"
                                         Margin="3"
                                         VirtualizingPanel.IsVirtualizing="True"
@@ -224,12 +269,31 @@
                                         <ItemsControl.ItemContainerStyle>
                                             <Style>
                                                 <Setter Property="FrameworkElement.Visibility" Value="{Binding Visibility}"/>
-                                                <Setter Property="FrameworkElement.Margin" Value="0,0,0,3"/>
+                                                <Setter Property="FrameworkElement.Margin" Value="0 0 0 3"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                                        <Setter Property="FrameworkElement.Margin" Value="0 0 0 1"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
                                             </Style>
                                         </ItemsControl.ItemContainerStyle>
+                                        <ItemsControl.Style>
+                                            <Style>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                                        <Setter Property="FrameworkElement.Margin" Value="3 0" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ItemsControl.Style>
                                     </ItemsControl>
                                 </Expander>
                             </StackPanel>
+                            <DataTemplate.Triggers>
+                                <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                    <Setter Property="Margin" TargetName="MembersItemsControl" Value="3 0" />
+                                </DataTrigger>
+                            </DataTemplate.Triggers>
                         </DataTemplate>
                     </Setter.Value>
                 </Setter>
@@ -245,13 +309,20 @@
                                 HorizontalAlignment="Stretch">
                                 <Expander.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <vs:Image Source="{Binding Moniker}" Width="16" Height="16" Margin="0,0,3,0" />
+                                        <vs:Image
+                                            Source="{Binding Moniker}"
+                                            Width="16"
+                                            Height="16"
+                                            Margin="0 0 3 0"
+                                            VerticalAlignment="Center" />
                                         <TextBlock
                                             Text="{Binding Name}"
-                                            FontSize="{Binding FontSize}" />
+                                            FontSize="{Binding FontSize}"
+                                            VerticalAlignment="Center" />
                                     </StackPanel>
                                 </Expander.Header>
-                                <ItemsControl 
+                                <ItemsControl
+                                    x:Name="MembersItemsControl"
                                     ItemsSource="{Binding Members}"
                                     Margin="3"
                                     VirtualizingPanel.IsVirtualizing="True"
@@ -271,11 +342,21 @@
                                     <ItemsControl.ItemContainerStyle>
                                         <Style>
                                             <Setter Property="FrameworkElement.Visibility" Value="{Binding Visibility}"/>
-                                            <Setter Property="FrameworkElement.Margin" Value="0,0,0,3"/>
+                                            <Setter Property="FrameworkElement.Margin" Value="0 0 0 3"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                                    <Setter Property="FrameworkElement.Margin" Value="0 0 0 1"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
                                         </Style>
                                     </ItemsControl.ItemContainerStyle>
                                 </ItemsControl>
                             </Expander>
+                            <DataTemplate.Triggers>
+                                <DataTrigger Binding="{Binding UseCompactMode}" Value="True">
+                                    <Setter Property="Margin" TargetName="MembersItemsControl" Value="3 0" />
+                                </DataTrigger>
+                            </DataTemplate.Triggers>
                         </DataTemplate>
                     </Setter.Value>
                 </Setter>
diff --git a/src/CodeNav.OutOfProc/ToolWindows/Templates/ExpanderStyles.xaml b/src/CodeNav.OutOfProc/ToolWindows/Templates/ExpanderStyles.xaml
index a7308ca..e166c5c 100644
--- a/src/CodeNav.OutOfProc/ToolWindows/Templates/ExpanderStyles.xaml
+++ b/src/CodeNav.OutOfProc/ToolWindows/Templates/ExpanderStyles.xaml
@@ -74,7 +74,7 @@
                         </Border.BorderBrush>
 
                         <StackPanel Orientation="Vertical">
-                            <Grid Background="Transparent" SnapsToDevicePixels="False" Margin="0,0,4,0">
+                            <Grid Background="Transparent" SnapsToDevicePixels="False" Margin="0 0 4 0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="17"/>
@@ -83,7 +83,8 @@
                                 <Border x:Name="ExpanderHeaderBorder"
                                     BorderThickness="0"
                                     BorderBrush="{StaticResource ExpanderHeaderGradientBrush}">
-                                    <Button Command="{Binding Path=ClickItemCommand}" 
+                                    <Button x:Name="ExpanderHeaderButton" 
+                                        Command="{Binding Path=ClickItemCommand}" 
                                         ContentTemplate="{TemplateBinding HeaderTemplate}"
                                         ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                                         Content="{TemplateBinding Header}"
@@ -101,7 +102,7 @@
                                         FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}"
                                         DockPanel.Dock="Top"
                                         BorderThickness="0"
-                                        Padding="3,3"
+                                        Padding="3"
                                         ContextMenu="{DynamicResource ItemContextMenu}"
                                         ToolTip="{Binding Tooltip}">
                                         <Button.InputBindings>
@@ -136,7 +137,7 @@
                                 <Condition Binding="{Binding Path=DataContext.HasMembersVisibility, RelativeSource={RelativeSource Self}}" Value="Visible"/>
                             </MultiDataTrigger.Conditions>
                             <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
-                            <Setter Property="BorderThickness" TargetName="ExpanderHeaderBorder" Value="0,0,0,1" />
+                            <Setter Property="BorderThickness" TargetName="ExpanderHeaderBorder" Value="0 0 0 1" />
                         </MultiDataTrigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
@@ -156,6 +157,9 @@
                         <DataTrigger Binding="{Binding Path=DataContext.IsItalic, RelativeSource={RelativeSource Self}}" Value="True">
                             <Setter Property="FontStyle" Value="Italic" />
                         </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=DataContext.UseCompactMode, RelativeSource={RelativeSource Self}}" Value="True">
+                            <Setter Property="Padding" TargetName="ExpanderHeaderButton" Value="3 0" />
+                        </DataTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/CodeNav.OutOfProc/ViewModels/CodeDocumentViewModel.cs b/src/CodeNav.OutOfProc/ViewModels/CodeDocumentViewModel.cs
index a017dc6..9af55be 100644
--- a/src/CodeNav.OutOfProc/ViewModels/CodeDocumentViewModel.cs
+++ b/src/CodeNav.OutOfProc/ViewModels/CodeDocumentViewModel.cs
@@ -242,6 +242,7 @@ private async Task Settings(object? commandParameter, IClientContext clientConte
         CodeDocumentService.GlobalSettings.UpdateWhileTyping = CodeDocumentService.SettingsDialogData.UpdateWhileTyping;
         CodeDocumentService.GlobalSettings.EnableCrashAnalytics = CodeDocumentService.SettingsDialogData.EnableCrashAnalytics;
         CodeDocumentService.GlobalSettings.ShowToolWindowForUnsupportedFiles = CodeDocumentService.SettingsDialogData.ShowToolWindowForUnsupportedFiles;
+        CodeDocumentService.GlobalSettings.UseCompactMode = CodeDocumentService.SettingsDialogData.UseCompactMode;
 
         await SettingsHelper.SaveGlobalSettings(CodeDocumentService);
 
diff --git a/src/CodeNav.OutOfProc/ViewModels/CodeItem.cs b/src/CodeNav.OutOfProc/ViewModels/CodeItem.cs
index 5f47839..c928cc9 100644
--- a/src/CodeNav.OutOfProc/ViewModels/CodeItem.cs
+++ b/src/CodeNav.OutOfProc/ViewModels/CodeItem.cs
@@ -236,6 +236,15 @@ public double FontSize
         set => SetProperty(ref _fontSize, value);
     }
 
+    /// <summary>
+    /// If the code item should use less vertical space based on the settings
+    /// </summary>
+    [DataMember]
+    public bool UseCompactMode
+    {
+        get => CodeDocumentViewModel?.CodeDocumentService?.GlobalSettings?.UseCompactMode == true;
+    }
+
     #region Commands
     [DataMember]
     public AsyncCommand ClickItemCommand { get; }