diff --git a/CPAP-Exporter.UI/CPAP-Exporter.UI.csproj b/CPAP-Exporter.UI/CPAP-Exporter.UI.csproj
index e73b6b7..ae189de 100644
--- a/CPAP-Exporter.UI/CPAP-Exporter.UI.csproj
+++ b/CPAP-Exporter.UI/CPAP-Exporter.UI.csproj
@@ -25,6 +25,9 @@
     <None Remove="Images\HelpTableOfContents.png" />
     <None Remove="Images\KeyVertical.png" />
     <None Remove="Images\mask.png" />
+    <None Remove="Images\Menu.Icon.Dark.png" />
+    <None Remove="Images\Menu.Icon.Light.png" />
+    <None Remove="Images\Menu.Icon.Selected.png" />
     <None Remove="Images\MonthCalendar.png" />
     <None Remove="Images\Navigation.ExportSettings.Dark.png" />
     <None Remove="Images\Navigation.ExportSettings.Light.png" />
@@ -54,6 +57,9 @@
     <None Remove="Images\SavedFiles.Background.Light.png" />
     <None Remove="Images\SavedFiles.EventsFilePanel.Background.png" />
     <None Remove="Images\SavedFiles.RawFilePanel.Background.png" />
+    <None Remove="Images\Settings.Icon.Dark.png" />
+    <None Remove="Images\Settings.Icon.Light.png" />
+    <None Remove="Images\Settings.Icon.Selected.png" />
     <None Remove="Images\TraceTransferInto.png" />
   </ItemGroup>
 
@@ -77,6 +83,9 @@
     <Resource Include="Images\HelpTableOfContents.png" />
     <Resource Include="Images\KeyVertical.png" />
     <Resource Include="Images\mask.png" />
+    <Resource Include="Images\Menu.Icon.Dark.png" />
+    <Resource Include="Images\Menu.Icon.Light.png" />
+    <Resource Include="Images\Menu.Icon.Selected.png" />
     <Resource Include="Images\Navigation.ExportSettings.Normal.png" />
     <Resource Include="Images\Navigation.ExportSettings.Selected.png" />
     <Resource Include="Images\Navigation.OpenFiles.Normal.png" />
@@ -96,6 +105,9 @@
     <Resource Include="Images\SavedFiles.Background.Light.png" />
     <Resource Include="Images\SavedFiles.EventsFilePanel.Background.png" />
     <Resource Include="Images\SavedFiles.RawFilePanel.Background.png" />
+    <Resource Include="Images\Settings.Icon.Dark.png" />
+    <Resource Include="Images\Settings.Icon.Light.png" />
+    <Resource Include="Images\Settings.Icon.Selected.png" />
     <Resource Include="Images\TraceTransferInto.png" />
   </ItemGroup>
 
diff --git a/CPAP-Exporter.UI/Images/Menu.Icon.Dark.png b/CPAP-Exporter.UI/Images/Menu.Icon.Dark.png
new file mode 100644
index 0000000..5960a56
Binary files /dev/null and b/CPAP-Exporter.UI/Images/Menu.Icon.Dark.png differ
diff --git a/CPAP-Exporter.UI/Images/Menu.Icon.Light.png b/CPAP-Exporter.UI/Images/Menu.Icon.Light.png
new file mode 100644
index 0000000..ab3a51f
Binary files /dev/null and b/CPAP-Exporter.UI/Images/Menu.Icon.Light.png differ
diff --git a/CPAP-Exporter.UI/Images/Menu.Icon.Selected.png b/CPAP-Exporter.UI/Images/Menu.Icon.Selected.png
new file mode 100644
index 0000000..ef905ea
Binary files /dev/null and b/CPAP-Exporter.UI/Images/Menu.Icon.Selected.png differ
diff --git a/CPAP-Exporter.UI/Images/Settings.Icon.Dark.png b/CPAP-Exporter.UI/Images/Settings.Icon.Dark.png
new file mode 100644
index 0000000..e45cf78
Binary files /dev/null and b/CPAP-Exporter.UI/Images/Settings.Icon.Dark.png differ
diff --git a/CPAP-Exporter.UI/Images/Settings.Icon.Light.png b/CPAP-Exporter.UI/Images/Settings.Icon.Light.png
new file mode 100644
index 0000000..70df889
Binary files /dev/null and b/CPAP-Exporter.UI/Images/Settings.Icon.Light.png differ
diff --git a/CPAP-Exporter.UI/Images/Settings.Icon.Selected.png b/CPAP-Exporter.UI/Images/Settings.Icon.Selected.png
new file mode 100644
index 0000000..5bafad0
Binary files /dev/null and b/CPAP-Exporter.UI/Images/Settings.Icon.Selected.png differ
diff --git a/CPAP-Exporter.UI/Infrastructure/BaseClasses/PageViewModel.cs b/CPAP-Exporter.UI/Infrastructure/BaseClasses/PageViewModel.cs
index 533ec0c..80b9c40 100644
--- a/CPAP-Exporter.UI/Infrastructure/BaseClasses/PageViewModel.cs
+++ b/CPAP-Exporter.UI/Infrastructure/BaseClasses/PageViewModel.cs
@@ -10,6 +10,7 @@ public class PageViewModel : ViewModel, IValidatable
         private IValidatable validationProvider;
         private object statusContent;
         private DateTime becameVisible;
+        private double reservedNotificationHeight;
 
         #endregion
 
@@ -88,6 +89,12 @@ public DateTime BecameVisible
             set => this.SetPropertyValue(ref this.becameVisible, value, nameof(this.BecameVisible));
         }
 
+        public double ReservedNotificationHeight
+        {
+            get => this.reservedNotificationHeight;
+            set => this.SetPropertyValue(ref this.reservedNotificationHeight, value, nameof(this.ReservedNotificationHeight));
+        }
+
         public object StatusContent
         {
             get => this.statusContent;
@@ -103,6 +110,11 @@ public virtual bool Validate()
             return true;
         }
 
+        public virtual void BecomeVisible()
+        {
+            this.BecameVisible = DateTime.Now;
+        }
+
         #region Events
 
         /// <summary>
diff --git a/CPAP-Exporter.UI/Infrastructure/UserSettings.cs b/CPAP-Exporter.UI/Infrastructure/UserSettings.cs
index bb9fb3d..4da3226 100644
--- a/CPAP-Exporter.UI/Infrastructure/UserSettings.cs
+++ b/CPAP-Exporter.UI/Infrastructure/UserSettings.cs
@@ -46,6 +46,7 @@ public UserSettings() {
 
         public bool IsFlowReductionDescriptionExpanded { get; set; }
 
+        public bool IsNavigationDrawerExpanded { get; set; }
 
         /// <summary>
         /// Gets the fully qualified name of the settings file.
diff --git a/CPAP-Exporter.UI/Resources.Designer.cs b/CPAP-Exporter.UI/Resources.Designer.cs
index 2345dc3..533698f 100644
--- a/CPAP-Exporter.UI/Resources.Designer.cs
+++ b/CPAP-Exporter.UI/Resources.Designer.cs
@@ -384,6 +384,24 @@ public static string MV {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Expand or close the navigation drawer.
+        /// </summary>
+        public static string Nav_ExpandDrawer_TT {
+            get {
+                return ResourceManager.GetString("Nav_ExpandDrawer_TT", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Export.
+        /// </summary>
+        public static string Nav_Export {
+            get {
+                return ResourceManager.GetString("Nav_Export", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Write your data to disc.
         /// </summary>
@@ -393,6 +411,15 @@ public static string Nav_Export_TT {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Export Settings.
+        /// </summary>
+        public static string Nav_ExportSettings_TT {
+            get {
+                return ResourceManager.GetString("Nav_ExportSettings_TT", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Help.
         /// </summary>
@@ -402,6 +429,15 @@ public static string Nav_Help_TT {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open PAP.
+        /// </summary>
+        public static string Nav_Open {
+            get {
+                return ResourceManager.GetString("Nav_Open", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Select PAP files to open and export.
         /// </summary>
@@ -411,6 +447,15 @@ public static string Nav_Open_TT {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Select Nights.
+        /// </summary>
+        public static string Nav_SelectDays {
+            get {
+                return ResourceManager.GetString("Nav_SelectDays", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Choose which night(s) to export.
         /// </summary>
@@ -420,6 +465,15 @@ public static string Nav_SelectDays_TT {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Select Signals.
+        /// </summary>
+        public static string Nav_SelectSignals {
+            get {
+                return ResourceManager.GetString("Nav_SelectSignals", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Select which signals to export.
         /// </summary>
diff --git a/CPAP-Exporter.UI/Resources.resx b/CPAP-Exporter.UI/Resources.resx
index 16a00ea..f6ca901 100644
--- a/CPAP-Exporter.UI/Resources.resx
+++ b/CPAP-Exporter.UI/Resources.resx
@@ -339,4 +339,22 @@
   <data name="SourceFolder" xml:space="preserve">
     <value>Source Folder</value>
   </data>
+  <data name="Nav_Open" xml:space="preserve">
+    <value>Open PAP</value>
+  </data>
+  <data name="Nav_Export" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Nav_SelectDays" xml:space="preserve">
+    <value>Select Nights</value>
+  </data>
+  <data name="Nav_SelectSignals" xml:space="preserve">
+    <value>Select Signals</value>
+  </data>
+  <data name="Nav_ExpandDrawer_TT" xml:space="preserve">
+    <value>Expand or close the navigation drawer</value>
+  </data>
+  <data name="Nav_ExportSettings_TT" xml:space="preserve">
+    <value>Export Settings</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CPAP-Exporter.UI/Styles.xaml b/CPAP-Exporter.UI/Styles.xaml
index e9246a4..42dac0d 100644
--- a/CPAP-Exporter.UI/Styles.xaml
+++ b/CPAP-Exporter.UI/Styles.xaml
@@ -156,6 +156,19 @@
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Margin" Value="8" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+
+    <Style x:Key="NavigationButtonText" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Nunito Sans" />
+        <Setter Property="Foreground" Value="{DynamicResource Text.Foreground}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Visibility" Value="{Binding ShowNavigationButtonLabels, Converter={StaticResource BoolToVisibilityConverter}}" />
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="{DynamicResource Text.Disabled.Foreground}" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style x:Key="NavigationButtonStyle" TargetType="Button">
diff --git a/CPAP-Exporter.UI/Themes/Dark.xaml b/CPAP-Exporter.UI/Themes/Dark.xaml
index 65c4901..06c48ed 100644
--- a/CPAP-Exporter.UI/Themes/Dark.xaml
+++ b/CPAP-Exporter.UI/Themes/Dark.xaml
@@ -2,7 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <SolidColorBrush x:Key="Window.Background" Color="Black" />
+    
     <SolidColorBrush x:Key="Text.Foreground" Color="#E0E0E0" />
+    <SolidColorBrush x:Key="Text.Disabled.Foreground" Color="#A6A6A6" />
+
     <SolidColorBrush x:Key="PageDescription.Foreground" Color="#3FA7A7" />
 
     <LinearGradientBrush x:Key="PageTitle.Foreground" StartPoint="0,0" EndPoint="1,1">
@@ -14,7 +17,7 @@
 
     <SolidColorBrush x:Key="Navigation.Drawer.Background" Color="#111111" />
     <SolidColorBrush x:Key="Navigation.SelectedIndicator.Foreground" Color="Green" />
-    <SolidColorBrush x:Key="Navigation.MouseOver.Background" Color="LightGreen" />
+    <SolidColorBrush x:Key="Navigation.MouseOver.Background" Color="DarkGreen" />
     <SolidColorBrush x:Key="Navigation.MouseOver.Shadow" Color="LawnGreen" />
 
     <SolidColorBrush x:Key="Legibility.Background" Color="#AA1E1E2F" />
@@ -60,4 +63,8 @@
     <SolidColorBrush x:Key="OpenFiles.OpenButton.Pressed.Border" Color="DodgerBlue" />
 
     <ImageBrush x:Key="SavedFiles.Background" ImageSource="/Images/SavedFiles.Background.Dark.png" Stretch="Fill" />
+    <BitmapImage x:Key="Settings.Icon" UriSource="pack://application:,,,/Images/Settings.Icon.Dark.png" />
+    <BitmapImage x:Key="Settings.Icon.Selected" UriSource="pack://application:,,,/Images/Settings.Icon.Selected.png" />
+    <BitmapImage x:Key="Menu.Icon" UriSource="pack://application:,,,/Images/Menu.Icon.Dark.png" />
+    <BitmapImage x:Key="Menu.Icon.Selected" UriSource="pack://application:,,,/Images/Menu.Icon.Selected.png" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CPAP-Exporter.UI/Themes/Light.xaml b/CPAP-Exporter.UI/Themes/Light.xaml
index 4f54e1e..259d1a9 100644
--- a/CPAP-Exporter.UI/Themes/Light.xaml
+++ b/CPAP-Exporter.UI/Themes/Light.xaml
@@ -2,7 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <SolidColorBrush x:Key="Window.Background" Color="#F5F7FA" />
+    
     <SolidColorBrush x:Key="Text.Foreground" Color="#1F1F1F" />
+    <SolidColorBrush x:Key="Text.Disabled.Foreground" Color="#A6A6A6" />
+
     <SolidColorBrush x:Key="PageTitle.Foreground" Color="#007C91" />
     <SolidColorBrush x:Key="PageDescription.Foreground" Color="#3FA7A7" />
 
@@ -54,4 +57,8 @@
     <SolidColorBrush x:Key="OpenFiles.OpenButton.Pressed.Border" Color="DodgerBlue" />
 
     <ImageBrush x:Key="SavedFiles.Background" ImageSource="/Images/SavedFiles.Background.Light.png" Stretch="Fill" />
+    <BitmapImage x:Key="Settings.Icon" UriSource="pack://application:,,,/Images/Settings.Icon.Light.png" />
+    <BitmapImage x:Key="Settings.Icon.Selected" UriSource="pack://application:,,,/Images/Settings.Icon.Selected.png" />
+    <BitmapImage x:Key="Menu.Icon" UriSource="pack://application:,,,/Images/Menu.Icon.Light.png" />
+    <BitmapImage x:Key="Menu.Icon.Selected" UriSource="pack://application:,,,/Images/Menu.Icon.Selected.png" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CPAP-Exporter.UI/ViewModels/NavigationViewModel.cs b/CPAP-Exporter.UI/ViewModels/NavigationViewModel.cs
index 4fd4993..89769a5 100644
--- a/CPAP-Exporter.UI/ViewModels/NavigationViewModel.cs
+++ b/CPAP-Exporter.UI/ViewModels/NavigationViewModel.cs
@@ -1,6 +1,8 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
+using System.Linq;
 using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace CascadePass.CPAPExporter
 {
@@ -12,7 +14,10 @@ public class NavigationViewModel : ViewModel
         private FrameworkElement currentView;
         private NavigationStep currentPage;
         private ExportParameters exportParameters;
-        private DelegateCommand openFilesCommand, selectNightsCommand, selectSignalsCommand, showExportSettingsCommand, exportCommand, viewReleaseNotes;
+        private DelegateCommand
+            openFilesCommand, selectNightsCommand, selectSignalsCommand, showExportSettingsCommand, exportCommand, viewReleaseNotes,
+            toggleNavigationDrawerExpansionCommand, settingsCommand
+        ;
 
         #endregion
 
@@ -24,6 +29,9 @@ public class NavigationViewModel : ViewModel
         public NavigationViewModel()
         {
             this.ExportParameters = new();
+
+            // Use configured value to start
+            this.ShowNavigationButtonLabels = this.ExportParameters.UserPreferences.IsNavigationDrawerExpanded;
         }
 
         #endregion
@@ -59,6 +67,11 @@ public FrameworkElement CurrentView
                     {
                         this.Subscribe(value.DataContext as ViewModel);
                     }
+
+                    if (value?.DataContext is PageViewModel newPage)
+                    {
+                        newPage.BecomeVisible();
+                    }
                 }
             }
         }
@@ -89,8 +102,9 @@ public NavigationStep CurrentStep
                         nameof(this.OpenButtonImageUri),
                         nameof(this.SelectNightButtonImageUri),
                         nameof(this.SelectSignalsButtonImageUri),
-                        nameof(this.SettingsButtonImageUri),
+                        nameof(this.ExportSettingsButtonImageUri),
                         nameof(this.ExportButtonImageUri),
+                        nameof(this.SettingsIcon),
                     ]
                 );
             }
@@ -110,12 +124,31 @@ public ExportParameters ExportParameters
             set => this.SetPropertyValue(ref this.exportParameters, value, nameof(this.ExportParameters));
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the navigation tray is open.
+        /// </summary>
         public bool ShowNavigationButtonLabels
         {
             get => this.showNavButtonLabels;
-            set => this.SetPropertyValue(ref this.showNavButtonLabels, value, nameof(this.ShowNavigationButtonLabels));
+            set
+            {
+                var changed = this.SetPropertyValue(ref this.showNavButtonLabels, value, [
+                    nameof(this.ShowNavigationButtonLabels),
+                    nameof(this.MenuIcon),
+                    nameof(this.NavigationTrayWidth),
+                    nameof(this.SettingsIcon),
+                    ]
+                );
+
+                if (changed)
+                {
+                    this.ExportParameters.UserPreferences.IsNavigationDrawerExpanded = value;
+                }
+            }
         }
 
+        public double NavigationTrayWidth => this.ShowNavigationButtonLabels ? 160 : 64;
+
         #region Button Styles
 
         public Style OpenButtonStyle => this.GetButtonStyle(NavigationStep.OpenFiles);
@@ -132,15 +165,19 @@ public bool ShowNavigationButtonLabels
 
         #region Button Icons
 
-        public string OpenButtonImageUri => this.currentPage == NavigationStep.OpenFiles ? "/Images/Navigation.OpenFiles.Selected.png" : "/Images/Navigation.OpenFiles.Normal.png";
+        public string OpenButtonImageUri => this.IsStepAllowed(NavigationStep.OpenFiles) ? "/Images/Navigation.OpenFiles.Selected.png" : "/Images/Navigation.OpenFiles.Normal.png";
+
+        public string SelectNightButtonImageUri => this.IsStepAllowed(NavigationStep.SelectDays) ? "/Images/Navigation.SelectNights.Selected.png" : "/Images/Navigation.SelectNights.Normal.png";
 
-        public string SelectNightButtonImageUri => this.currentPage == NavigationStep.SelectDays ? "/Images/Navigation.SelectNights.Selected.png" : "/Images/Navigation.SelectNights.Normal.png";
+        public string SelectSignalsButtonImageUri => this.IsStepAllowed(NavigationStep.SelectSignals) ? "/Images/Navigation.SelectSignals.Selected.png" : "/Images/Navigation.SelectSignals.Normal.png";
 
-        public string SelectSignalsButtonImageUri => this.currentPage == NavigationStep.SelectSignals ? "/Images/Navigation.SelectSignals.Selected.png" : "/Images/Navigation.SelectSignals.Normal.png";
+        public string ExportSettingsButtonImageUri => this.IsStepAllowed(NavigationStep.Settings) ? "/Images/Navigation.ExportSettings.Selected.png" : "/Images/Navigation.ExportSettings.Normal.png";
 
-        public string SettingsButtonImageUri => this.currentPage == NavigationStep.Settings ? "/Images/Navigation.ExportSettings.Selected.png" : "/Images/Navigation.ExportSettings.Normal.png";
+        public string ExportButtonImageUri => this.IsStepAllowed(NavigationStep.Export) ? "/Images/Navigation.Save.Selected.png" : "/Images/Navigation.Save.Normal.png";
 
-        public string ExportButtonImageUri => this.currentPage == NavigationStep.Export ? "/Images/Navigation.Save.Selected.png" : "/Images/Navigation.Save.Normal.png";
+        public BitmapImage MenuIcon => this.ShowNavigationButtonLabels ? Application.Current?.FindResource("Menu.Icon.Selected") as BitmapImage : Application.Current?.FindResource("Menu.Icon") as BitmapImage;
+
+        public BitmapImage SettingsIcon => this.CurrentStep == NavigationStep.Settings ? Application.Current?.FindResource("Settings.Icon.Selected") as BitmapImage : Application.Current?.FindResource("Settings.Icon") as BitmapImage;
 
         #endregion
 
@@ -158,6 +195,8 @@ public bool ShowNavigationButtonLabels
 
         public DelegateCommand ShowReleaseNotesCommand => this.viewReleaseNotes ??= new DelegateCommand(this.ShowReleaseNotes);
 
+        public DelegateCommand ToggleNavDrawerExpansionCommand => this.toggleNavigationDrawerExpansionCommand ??= new DelegateCommand(this.ToggleNavigationDrawerExpansion);
+
         #endregion
 
         #endregion
@@ -280,6 +319,11 @@ public void ShowReleaseNotes()
             }
         }
 
+        public void ToggleNavigationDrawerExpansion()
+        {
+            this.ShowNavigationButtonLabels = !this.ShowNavigationButtonLabels;
+        }
+
         #region Helper methods
 
         private Style GetButtonStyle(NavigationStep step) => (Style)Application.Current.FindResource(this.GetButtonStyleName(step));
@@ -300,6 +344,33 @@ public string GetButtonStyleName(NavigationStep step)
             return "NavigationButtonStyle";
         }
 
+        public bool IsStepAllowed(NavigationStep step)
+        {
+            if (this.currentPage == step)
+            {
+                return true;
+            }
+
+            int validationOffset = ApplicationComponentProvider.PageViewModelProvider.GetViewModel(this.currentView)?.IsValid ?? false ? 1 : 0;
+            if (this.AchievedStep + validationOffset < step)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        internal void UpdateButtonImages()
+        {
+            this.OnPropertyChanged(nameof(this.OpenButtonImageUri));
+            this.OnPropertyChanged(nameof(this.SelectNightButtonImageUri));
+            this.OnPropertyChanged(nameof(this.SelectSignalsButtonImageUri));
+            this.OnPropertyChanged(nameof(this.ExportSettingsButtonImageUri));
+            this.OnPropertyChanged(nameof(this.ExportButtonImageUri));
+            this.OnPropertyChanged(nameof(this.MenuIcon));
+            this.OnPropertyChanged(nameof(this.SettingsIcon));
+        }
+
         public void Subscribe(ViewModel viewModel)
         {
             viewModel.PropertyChanged += this.ViewModel_PropertyChanged;
diff --git a/CPAP-Exporter.UI/Views/NavigationBar.xaml b/CPAP-Exporter.UI/Views/NavigationBar.xaml
index c7ff44e..8bdccf0 100644
--- a/CPAP-Exporter.UI/Views/NavigationBar.xaml
+++ b/CPAP-Exporter.UI/Views/NavigationBar.xaml
@@ -12,55 +12,79 @@
         <local:NavigationViewModel />
     </UserControl.DataContext>
 
-    <StackPanel>
-        <Button
-            Style="{Binding OpenButtonStyle}"
-            Command="{Binding OpenFilesCommand}"
-            ToolTip="{x:Static local:Resources.Nav_Open_TT}">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="{Binding OpenButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
-                <TextBlock Text="{x:Static local:Resources.Nav_Open_TT}" Visibility="{Binding ShowNavigationButtonLabels, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </StackPanel>
-        </Button>
+    <Border x:Name="DrawerPanel" Width="{Binding NavigationTrayWidth}" Margin="0" Padding="0">
+        <DockPanel LastChildFill="True">
+            <Button
+                DockPanel.Dock="Bottom"
+                Style="{DynamicResource NavigationButtonStyle}"
+                Command="{Binding ShowExportSettingsCommand}"
+                ToolTip="{x:Static local:Resources.Nav_ExpandDrawer_TT}">
+                <StackPanel Orientation="Horizontal" Width="{Binding NavigationTrayWidth}">
+                    <Image Source="{Binding SettingsIcon}" Style="{StaticResource NavigationButtonImage}" />
+                    <TextBlock Text="{x:Static local:Resources.Nav_Settings_TT}" Style="{StaticResource NavigationButtonText}" />
+                </StackPanel>
+            </Button>
 
-        <Button
-            Style="{Binding SelectNightButtonStyle}"
-            Command="{Binding SelectNightsCommand}"
-            ToolTip="{x:Static local:Resources.Nav_SelectDays_TT}">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="{Binding SelectNightButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
-                <TextBlock Text="{x:Static local:Resources.Nav_SelectDays_TT}" Visibility="{Binding ShowNavigationButtonLabels, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </StackPanel>
-        </Button>
+            <StackPanel Margin="0">
+                <Button
+                    Style="{DynamicResource NavigationButtonStyle}"
+                    Command="{Binding ToggleNavDrawerExpansionCommand}"
+                    ToolTip="{x:Static local:Resources.Nav_ExpandDrawer_TT}">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="{Binding MenuIcon}" Style="{StaticResource NavigationButtonImage}" />
+                    </StackPanel>
+                </Button>
 
-        <Button
-            Style="{Binding SelectSignalsButtonStyle}"
-            Command="{Binding SelectSignalsCommand}"
-            ToolTip="{x:Static local:Resources.Nav_SelectSignals_TT}">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="{Binding SelectSignalsButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
-                <TextBlock Text="{x:Static local:Resources.Nav_SelectSignals_TT}" Visibility="{Binding ShowNavigationButtonLabels, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </StackPanel>
-        </Button>
+                <Button
+                    Style="{Binding OpenButtonStyle}"
+                    Command="{Binding OpenFilesCommand}"
+                    ToolTip="{x:Static local:Resources.Nav_Open_TT}">
+                    <StackPanel Orientation="Horizontal" Width="{Binding NavigationTrayWidth}">
+                        <Image Source="{Binding OpenButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
+                        <TextBlock Text="{x:Static local:Resources.Nav_Open}" Style="{StaticResource NavigationButtonText}" />
+                    </StackPanel>
+                </Button>
 
-        <Button
-            Style="{Binding SettingsButtonStyle}"
-            Command="{Binding ShowExportSettingsCommand}"
-            ToolTip="{x:Static local:Resources.Nav_Settings_TT}">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="{Binding SettingsButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
-                <TextBlock Text="{x:Static local:Resources.Nav_Settings_TT}" Visibility="{Binding ShowNavigationButtonLabels, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </StackPanel>
-        </Button>
+                <Button
+                    Style="{Binding SelectNightButtonStyle}"
+                    Command="{Binding SelectNightsCommand}"
+                    ToolTip="{x:Static local:Resources.Nav_SelectDays_TT}">
+                    <StackPanel Orientation="Horizontal" Width="{Binding NavigationTrayWidth}">
+                        <Image Source="{Binding SelectNightButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
+                        <TextBlock Text="{x:Static local:Resources.Nav_SelectDays}" Style="{StaticResource NavigationButtonText}" />
+                    </StackPanel>
+                </Button>
+
+                <Button
+                    Style="{Binding SelectSignalsButtonStyle}"
+                    Command="{Binding SelectSignalsCommand}"
+                    ToolTip="{x:Static local:Resources.Nav_SelectSignals_TT}">
+                    <StackPanel Orientation="Horizontal" Width="{Binding NavigationTrayWidth}">
+                        <Image Source="{Binding SelectSignalsButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
+                        <TextBlock Text="{x:Static local:Resources.Nav_SelectSignals}" Style="{StaticResource NavigationButtonText}" />
+                    </StackPanel>
+                </Button>
+
+                <Button
+                    Style="{Binding SettingsButtonStyle}"
+                    Command="{Binding ShowExportSettingsCommand}"
+                    ToolTip="{x:Static local:Resources.Nav_Settings_TT}">
+                    <StackPanel Orientation="Horizontal" Width="{Binding NavigationTrayWidth}">
+                        <Image Source="{Binding ExportSettingsButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
+                        <TextBlock Text="{x:Static local:Resources.Nav_ExportSettings_TT}" Style="{StaticResource NavigationButtonText}" />
+                    </StackPanel>
+                </Button>
 
-        <Button
-            Style="{Binding ExportButtonStyle}"
-            Command="{Binding ExportCommand}"
-            ToolTip="{x:Static local:Resources.Nav_Export_TT}">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="{Binding ExportButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
-                <TextBlock Text="{x:Static local:Resources.Nav_Export_TT}" Visibility="{Binding ShowNavigationButtonLabels, Converter={StaticResource BoolToVisibilityConverter}}" />
+                <Button
+                    Style="{Binding ExportButtonStyle}"
+                    Command="{Binding ExportCommand}"
+                    ToolTip="{x:Static local:Resources.Nav_Export_TT}">
+                    <StackPanel Orientation="Horizontal" Width="{Binding NavigationTrayWidth}">
+                        <Image Source="{Binding ExportButtonImageUri}" Style="{StaticResource NavigationButtonImage}" />
+                        <TextBlock Text="{x:Static local:Resources.Nav_Export}" Style="{StaticResource NavigationButtonText}" />
+                    </StackPanel>
+                </Button>
             </StackPanel>
-        </Button>
-    </StackPanel>
+        </DockPanel>
+    </Border>
 </UserControl>
diff --git a/CPAP-Exporter.UI/Views/NavigationBar.xaml.cs b/CPAP-Exporter.UI/Views/NavigationBar.xaml.cs
index 8276146..55a8840 100644
--- a/CPAP-Exporter.UI/Views/NavigationBar.xaml.cs
+++ b/CPAP-Exporter.UI/Views/NavigationBar.xaml.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 
 namespace CascadePass.CPAPExporter
 {
@@ -20,7 +21,29 @@ public NavigationBar()
 
         private void Observable_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            NavigationBar.UpdateButtonStyles(this);
+            if (e.PropertyName == "ShowNavigationButtonLabels")
+            {
+                this.AnimateDrawer();
+            }
+
+            //No longer needed?
+            //NavigationBar.UpdateButtonStyles(this);
+        }
+
+        private void AnimateDrawer()
+        {
+            if (this.DataContext is not NavigationViewModel navigationViewModel)
+            {
+                return;
+            }
+
+            double targetWidth = navigationViewModel.NavigationTrayWidth;
+
+            DrawerPanel.BeginAnimation(Border.WidthProperty, new DoubleAnimation
+            {
+                To = targetWidth,
+                Duration = TimeSpan.FromMilliseconds(300)
+            });
         }
 
         private static void UpdateButtonStyles(DependencyObject parent)