Implement expandable menu view (#95)

Daybreak/Configuration/ProjectConfiguration.cs

@@ -29,110 +29,108 @@ using Daybreak.Services.Updater.PostUpdate.Actions;
 using Daybreak.Services.Graph;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Daybreak.Configuration
+namespace Daybreak.Configuration;
+
+public static class ProjectConfiguration
 {
-    public static class ProjectConfiguration
+    public static void RegisterResolvers(IServiceManager serviceManager)
     {
-        public static void RegisterResolvers(IServiceManager serviceManager)
+        serviceManager.ThrowIfNull();
+
+        serviceManager.RegisterOptionsManager<ApplicationConfigurationOptionsManager>();
+        serviceManager.RegisterResolver(new LoggerResolver());
+        serviceManager
+            .RegisterHttpClient<ApplicationUpdater>()
+                .WithMessageHandler(sp =>
+                {
+                    var logger = sp.GetService<ILogger<ApplicationUpdater>>();
+                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                })
+                .Build()
+            .RegisterHttpClient<BloogumClient>()
+                .WithMessageHandler(sp =>
+                {
+                    var logger = sp.GetService<ILogger<BloogumClient>>();
+                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                })
+                .Build()
+            .RegisterHttpClient<GraphClient>()
+                .WithMessageHandler(sp =>
+                {
+                    var logger = sp.GetService<ILogger<GraphClient>>();
+                    return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
+                })
+                .Build();
+    }
+
+    public static void RegisterServices(IServiceCollection services)
+    {
+        services.ThrowIfNull();
+
+        services.AddSingleton<ILogsManager, JsonLogsManager>();
+        services.AddSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
+        services.AddSingleton<ILoggerFactory, LoggerFactory>(sp =>
         {
-            serviceManager.ThrowIfNull();
+            var factory = new LoggerFactory();
+            factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
+            return factory;
+        });
+        services.AddSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
+            sp.GetService<ILogsManager>(),
+            sp.GetService<IDebugLogsWriter>()));
 
-            serviceManager.RegisterOptionsManager<ApplicationConfigurationOptionsManager>();
-            serviceManager.RegisterResolver(new LoggerResolver());
-            serviceManager
-                .RegisterHttpClient<ApplicationUpdater>()
-                    .WithMessageHandler(sp =>
-                    {
-                        var logger = sp.GetService<ILogger<ApplicationUpdater>>();
-                        return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
-                    })
-                    .Build()
-                .RegisterHttpClient<BloogumClient>()
-                    .WithMessageHandler(sp =>
-                    {
-                        var logger = sp.GetService<ILogger<BloogumClient>>();
-                        return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
-                    })
-                    .Build()
-                .RegisterHttpClient<GraphClient>()
-                    .WithMessageHandler(sp =>
-                    {
-                        var logger = sp.GetService<ILogger<GraphClient>>();
-                        return new LoggingHttpMessageHandler(logger) { InnerHandler = new HttpClientHandler() };
-                    })
-                    .Build();
-        }
+        services.AddScoped((sp) => new ScopeMetadata(new CorrelationVector()));
+        services.AddSingleton<ViewManager>();
+        services.AddSingleton<IViewManager, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
+        services.AddSingleton<IViewProducer, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
+        services.AddSingleton<PostUpdateActionManager>();
+        services.AddSingleton<IPostUpdateActionManager>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IPostUpdateActionProducer>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IPostUpdateActionProvider>(sp => sp.GetRequiredService<PostUpdateActionManager>());
+        services.AddSingleton<IConfigurationManager, ConfigurationManager>();
+        services.AddSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
+        services.AddSingleton<IMutexHandler, MutexHandler>();
+        services.AddSingleton<IShortcutManager, ShortcutManager>();
+        services.AddSingleton<IIconBrowser, IconBrowser>();
+        services.AddSingleton<IIconDownloader, IconDownloader>();
+        services.AddScoped<ICredentialManager, CredentialManager>();
+        services.AddScoped<IApplicationLauncher, ApplicationLauncher>();
+        services.AddScoped<IScreenshotProvider, ScreenshotProvider>();
+        services.AddScoped<IBloogumClient, BloogumClient>();
+        services.AddScoped<IApplicationUpdater, ApplicationUpdater>();
+        services.AddScoped<IBuildTemplateManager, BuildTemplateManager>();
+        services.AddScoped<IIconCache, IconCache>();
+        services.AddScoped<IPrivilegeManager, PrivilegeManager>();
+        services.AddScoped<IScreenManager, ScreenManager>();
+        services.AddScoped<IGraphClient, GraphClient>();
+    }
 
-        public static void RegisterServices(IServiceCollection services)
-        {
-            services.ThrowIfNull();
+    public static void RegisterViews(IViewProducer viewProducer)
+    {
+        viewProducer.ThrowIfNull();
 
-            services.AddSingleton<ILogsManager, JsonLogsManager>();
-            services.AddSingleton<IDebugLogsWriter, Services.Logging.DebugLogsWriter>();
-            services.AddSingleton<ILoggerFactory, LoggerFactory>(sp =>
-            {
-                var factory = new LoggerFactory();
-                factory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
-                return factory;
-            });
-            services.AddSingleton<ILogsWriter, CompositeLogsWriter>(sp => new CompositeLogsWriter(
-                sp.GetService<ILogsManager>(),
-                sp.GetService<IDebugLogsWriter>()));
+        viewProducer.RegisterPermanentView<CompanionView>();
+        viewProducer.RegisterView<SettingsView>();
+        viewProducer.RegisterView<AskUpdateView>();
+        viewProducer.RegisterView<UpdateView>();
+        viewProducer.RegisterView<AccountsView>();
+        viewProducer.RegisterView<ExperimentalSettingsView>();
+        viewProducer.RegisterView<ExecutablesView>();
+        viewProducer.RegisterView<BuildTemplateView>();
+        viewProducer.RegisterView<BuildsListView>();
+        viewProducer.RegisterView<RequestElevationView>();
+        viewProducer.RegisterView<ScreenChoiceView>();
+        viewProducer.RegisterView<VersionManagementView>();
+        viewProducer.RegisterView<LogsView>();
+        viewProducer.RegisterView<IconDownloadView>();
+        viewProducer.RegisterView<GraphAuthorizationView>();
+        viewProducer.RegisterView<BuildsSynchronizationView>();
+    }
 
-            services.AddScoped((sp) => new ScopeMetadata(new CorrelationVector()));
-            services.AddSingleton<ViewManager>();
-            services.AddSingleton<IViewManager, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
-            services.AddSingleton<IViewProducer, ViewManager>(sp => sp.GetRequiredService<ViewManager>());
-            services.AddSingleton<PostUpdateActionManager>();
-            services.AddSingleton<IPostUpdateActionManager>(sp => sp.GetRequiredService<PostUpdateActionManager>());
-            services.AddSingleton<IPostUpdateActionProducer>(sp => sp.GetRequiredService<PostUpdateActionManager>());
-            services.AddSingleton<IPostUpdateActionProvider>(sp => sp.GetRequiredService<PostUpdateActionManager>());
-            services.AddSingleton<IConfigurationManager, ConfigurationManager>();
-            services.AddSingleton<ILiteDatabase, LiteDatabase>(sp => new LiteDatabase("Daybreak.db"));
-            services.AddSingleton<IMutexHandler, MutexHandler>();
-            services.AddSingleton<IShortcutManager, ShortcutManager>();
-            services.AddSingleton<IIconBrowser, IconBrowser>();
-            services.AddSingleton<IIconDownloader, IconDownloader>();
-            services.AddScoped<ICredentialManager, CredentialManager>();
-            services.AddScoped<IApplicationLauncher, ApplicationLauncher>();
-            services.AddScoped<IScreenshotProvider, ScreenshotProvider>();
-            services.AddScoped<IBloogumClient, BloogumClient>();
-            services.AddScoped<IApplicationUpdater, ApplicationUpdater>();
-            services.AddScoped<IBuildTemplateManager, BuildTemplateManager>();
-            services.AddScoped<IIconCache, IconCache>();
-            services.AddScoped<IPrivilegeManager, PrivilegeManager>();
-            services.AddScoped<IScreenManager, ScreenManager>();
-            services.AddScoped<IGraphClient, GraphClient>();
-        }
+    public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)
+    {
+        postUpdateActionProducer.ThrowIfNull();
 
-        public static void RegisterViews(IViewProducer viewProducer)
-        {
-            viewProducer.ThrowIfNull();
-
-            viewProducer.RegisterPermanentView<MainView>();
-            viewProducer.RegisterView<SettingsView>();
-            viewProducer.RegisterView<AskUpdateView>();
-            viewProducer.RegisterView<UpdateView>();
-            viewProducer.RegisterView<SettingsCategoryView>();
-            viewProducer.RegisterView<AccountsView>();
-            viewProducer.RegisterView<ExperimentalSettingsView>();
-            viewProducer.RegisterView<ExecutablesView>();
-            viewProducer.RegisterView<BuildTemplateView>();
-            viewProducer.RegisterView<BuildsListView>();
-            viewProducer.RegisterView<RequestElevationView>();
-            viewProducer.RegisterView<ScreenChoiceView>();
-            viewProducer.RegisterView<VersionManagementView>();
-            viewProducer.RegisterView<LogsView>();
-            viewProducer.RegisterView<IconDownloadView>();
-            viewProducer.RegisterView<GraphAuthorizationView>();
-            viewProducer.RegisterView<BuildsSynchronizationView>();
-        }
-
-        public static void RegisterPostUpdateActions(IPostUpdateActionProducer postUpdateActionProducer)
-        {
-            postUpdateActionProducer.ThrowIfNull();
-
-            postUpdateActionProducer.AddPostUpdateAction<RenameInstallerAction>();
-        }
+        postUpdateActionProducer.AddPostUpdateAction<RenameInstallerAction>();
     }
 }

Daybreak/Controls/Buttons/FilePickerGlyph.xaml

@@ -12,11 +12,7 @@
         <Viewbox Stretch="Fill">
             <Grid>
                 <Ellipse Height="4" Width="4" StrokeThickness="0.2" Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Ellipse>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                    <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
-                </StackPanel>
+                <local:ThreeDotsGlyph Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Padding="0.5"></local:ThreeDotsGlyph>
             </Grid>
         </Viewbox>
         <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>

Daybreak/Controls/Buttons/MenuButton.xaml

@@ -0,0 +1,41 @@
+<UserControl x:Class="Daybreak.Controls.Buttons.MenuButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls.Buttons"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:behaviors="clr-namespace:Daybreak.Behaviors"
+             xmlns:converters="clr-namespace:Daybreak.Converters"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <converters:MenuButtonHighlightConverter x:Key="HighlightConverter"></converters:MenuButtonHighlightConverter>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"></ColumnDefinition>
+            <ColumnDefinition Width="*"></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+        <Rectangle
+            Fill="{Binding ElementName=_this, Path=HighlightColor, Mode=OneWay}"
+            Opacity="{Binding ElementName=_this, Path=Highlighted, Converter={StaticResource HighlightConverter}}"
+            Grid.ColumnSpan="2">
+        </Rectangle>
+        <ContentPresenter Margin="5" 
+                          Content="{Binding ElementName=_this, Path=InnerContent, Mode=OneWay}" />
+        <TextBlock Grid.Column="1" 
+                   Text="{Binding ElementName=_this, Path=Title, Mode=OneWay}" 
+                   FontSize="{Binding ElementName=_this, Path=FontSize, Mode=OneWay}"
+                   FontFamily="{Binding ElementName=_this, Path=FontFamily, Mode=OneWay}"
+                   Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                   VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap"
+                   TextAlignment="Left" />
+        <Rectangle Fill="Transparent"
+                   MouseEnter="Grid_MouseEnter" 
+                   MouseLeave="Grid_MouseLeave"
+                   MouseLeftButtonDown="Rectangle_MouseLeftButtonDown"
+                   Grid.ColumnSpan="2" />
+    </Grid>
+</UserControl>

Daybreak/Controls/Buttons/MenuButton.xaml.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Windows.Extensions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Daybreak.Controls.Buttons;
+
+/// <summary>
+/// Interaction logic for MenuButton.xaml
+/// </summary>
+public partial class MenuButton : UserControl
+{
+    public event EventHandler Clicked;
+
+    [GenerateDependencyProperty]
+    private bool highlighted;
+    [GenerateDependencyProperty]
+    private Brush highlightColor;
+    [GenerateDependencyProperty]
+    private FrameworkElement innerContent;
+    [GenerateDependencyProperty]
+    private string title;
+
+    public MenuButton()
+    {
+        this.InitializeComponent();
+    }
+
+    private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = true;
+    }
+
+    private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = false;
+    }
+
+    private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
+    }
+}

Daybreak/Controls/Buttons/TileButton.xaml.cs

@@ -3,66 +3,65 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Daybreak.Controls
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for TileButton.xaml
+/// </summary>
+public partial class TileButton : UserControl
 {
-    /// <summary>
-    /// Interaction logic for TileButton.xaml
-    /// </summary>
-    public partial class TileButton : UserControl
+    public event EventHandler Clicked;
+
+    public static readonly DependencyProperty HighlightedProperty =
+        DependencyProperty.Register("Highlighted", typeof(bool), typeof(TileButton), null);
+    public static readonly DependencyProperty HighlightColorProperty =
+        DependencyProperty.Register("HighlightColor", typeof(Brush), typeof(TileButton), null);
+    public static readonly DependencyProperty InnerContentProperty =
+        DependencyProperty.Register("InnerContent", typeof(FrameworkElement), typeof(TileButton), null);
+    public static readonly DependencyProperty TitleProperty =
+        DependencyProperty.Register("Title", typeof(string), typeof(TileButton), null);
+
+    public TileButton()
     {
-        public event EventHandler Clicked;
+        this.InitializeComponent();
+    }
 
-        public static readonly DependencyProperty HighlightedProperty =
-            DependencyProperty.Register("Highlighted", typeof(bool), typeof(TileButton), null);
-        public static readonly DependencyProperty HighlightColorProperty =
-            DependencyProperty.Register("HighlightColor", typeof(Brush), typeof(TileButton), null);
-        public static readonly DependencyProperty InnerContentProperty =
-            DependencyProperty.Register("InnerContent", typeof(FrameworkElement), typeof(TileButton), null);
-        public static readonly DependencyProperty TitleProperty =
-            DependencyProperty.Register("Title", typeof(string), typeof(TileButton), null);
+    public bool Highlighted
+    {
+        get => (bool)this.GetValue(HighlightedProperty);
+        set => this.SetValue(HighlightedProperty, value);
+    }
 
-        public TileButton()
-        {
-            this.InitializeComponent();
-        }
+    public string Title
+    {
+        get => this.GetValue(TitleProperty) as string;
+        set => this.SetValue(TitleProperty, value);
+    }
 
-        public bool Highlighted
-        {
-            get => (bool)this.GetValue(HighlightedProperty);
-            set => this.SetValue(HighlightedProperty, value);
-        }
+    public FrameworkElement InnerContent
+    {
+        get => this.GetValue(InnerContentProperty) as FrameworkElement;
+        set => this.SetValue(InnerContentProperty, value);
+    }
 
-        public string Title
-        {
-            get => this.GetValue(TitleProperty) as string;
-            set => this.SetValue(TitleProperty, value);
-        }
+    public Brush HighlightColor
+    {
+        get => this.GetValue(HighlightColorProperty) as Brush;
+        set => this.SetValue(HighlightColorProperty, value);
+    }
 
-        public FrameworkElement InnerContent
-        {
-            get => this.GetValue(InnerContentProperty) as FrameworkElement;
-            set => this.SetValue(InnerContentProperty, value);
-        }
+    private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = true;
+    }
 
-        public Brush HighlightColor
-        {
-            get => this.GetValue(HighlightColorProperty) as Brush;
-            set => this.SetValue(HighlightColorProperty, value);
-        }
+    private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+    {
+        this.Highlighted = false;
+    }
 
-        private void Grid_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlighted = true;
-        }
-
-        private void Grid_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            this.Highlighted = false;
-        }
-
-        private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            Clicked?.Invoke(this, e);
-        }
+    private void Rectangle_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        this.Clicked?.Invoke(this, e);
     }
 }

Daybreak/Controls/Glyphs/CogGlyph.xaml

@@ -0,0 +1,18 @@
+<UserControl x:Class="Daybreak.Controls.CogGlyph"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <Grid>
+            <Path Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                        Data="m76.89,45.018c0,-1.587 -0.151,-3.138 -0.383,-4.66l11.227,-6.48l-11.639,-20.136l-11.616,6.47c-2.421,-1.931 -5.479,-3.506 -8.479,-4.664l0,-11.548l-22,0l0,11.548c-4,1.112 -5.649,2.617 -8.005,4.448l-11.251,-6.604l-11.914,20.006l11.12,6.604c-0.262,1.643 -0.45,3.308 -0.45,5.016c0,1.587 0.153,3.136 0.376,4.658l-11.228,6.484l11.634,20.135l11.424,-6.472c2.431,1.933 4.294,3.506 8.294,4.665l0,12.512l22,0l0,-12.512c3,-1.115 5.839,-2.618 8.19,-4.449l11.348,6.604l11.96,-20.006l-11.095,-6.603c0.258,-1.64 0.487,-3.304 0.487,-5.016zm-31.704,14.137c-7.799,0 -14.138,-6.332 -14.138,-14.138c0,-7.808 6.339,-14.136 14.138,-14.136c7.81,0 14.14,6.328 14.14,14.136c-0.001,7.806 -6.331,14.138 -14.14,14.138z"></Path>
+            <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                        Data="m56.5,89l-22,0c-1.381,0 -2.5,-1.119 -2.5,-2.5l0,-10.199c-2.612,-0.955 -4.464,-2.126 -6.274,-3.49l-10.229,5.671c-1.192,0.661 -2.694,0.244 -3.377,-0.936l-11.633,-20.135c-0.331,-0.574 -0.422,-1.257 -0.25,-1.897s0.591,-1.188 1.165,-1.519l9.794,-5.654c-0.121,-1.164 -0.181,-2.262 -0.181,-3.323c0,-1.317 0.112,-2.592 0.254,-3.721l-9.656,-5.75c-0.57,-0.34 -0.982,-0.893 -1.145,-1.537c-0.163,-0.644 -0.063,-1.326 0.279,-1.896l11.977,-20.006c0.702,-1.173 2.218,-1.564 3.399,-0.878l9.927,5.762c1.618,-1.213 3.362,-2.346 5.949,-3.273l0,-10.219c0.001,-1.381 1.12,-2.5 2.501,-2.5l22,0c1.381,0 2.5,1.119 2.5,2.5l0,10.377c2.124,0.938 4.104,2.059 5.919,3.35l9.939,-5.657c1.19,-0.677 2.713,-0.269 3.4,0.922l11.639,20.135c0.332,0.574 0.423,1.257 0.251,1.897s-0.591,1.188 -1.165,1.519l-9.781,5.646c0.126,1.165 0.188,2.266 0.188,3.329c0,1.327 -0.108,2.597 -0.246,3.717l9.692,5.752c0.571,0.339 0.983,0.891 1.147,1.533c0.163,0.644 0.065,1.325 -0.274,1.896l-11.897,20.005c-0.703,1.183 -2.234,1.573 -3.416,0.876l-9.798,-5.765c-1.782,1.25 -3.634,2.29 -5.598,3.144l0,10.324c0,1.381 -1.119,2.5 -2.5,2.5zm-19.5,-5l17,0l0,-9.512c0,-1.045 0.649,-1.979 1.629,-2.344c2.624,-0.975 5.004,-2.309 7.275,-4.078c0.809,-0.629 1.921,-0.702 2.804,-0.182l9.078,5.341l9.347,-15.716l-8.974,-5.325c-0.88,-0.522 -1.354,-1.528 -1.194,-2.538c0.198,-1.259 0.425,-2.923 0.425,-4.629c0,-1.314 -0.116,-2.716 -0.354,-4.284c-0.154,-1.018 0.33,-2.026 1.222,-2.541l9.061,-5.23l-9.145,-15.818l-9.208,5.241c-0.888,0.505 -1.995,0.42 -2.795,-0.219c-2.199,-1.754 -4.747,-3.196 -7.57,-4.286c-0.964,-0.372 -1.6,-1.299 -1.6,-2.332l0,-9.548l-17.001,0l0,9.548c0,1.123 -0.748,2.107 -1.83,2.408c-3.47,0.965 -5.073,2.212 -7.293,3.938l-0.098,0.076c-0.804,0.625 -1.909,0.7 -2.789,0.188l-9.243,-5.365l-9.423,15.739l8.937,5.321c0.879,0.524 1.351,1.531 1.189,2.542c-0.202,1.27 -0.435,2.943 -0.435,4.622c0,1.318 0.112,2.724 0.342,4.297c0.148,1.013 -0.337,2.015 -1.224,2.526l-9.065,5.234l9.151,15.842l9.525,-5.28c0.883,-0.49 1.976,-0.4 2.768,0.229c2.384,1.896 4.207,3.214 7.684,4.221c1.069,0.31 1.804,1.29 1.804,2.402l0,9.512zm8.186,-22.345c-9.174,0 -16.638,-7.464 -16.638,-16.638c0,-9.173 7.464,-16.636 16.638,-16.636c9.175,0 16.64,7.463 16.64,16.636c-0.001,9.174 -7.466,16.638 -16.64,16.638zm0,-28.273c-6.417,0 -11.638,5.22 -11.638,11.636c0,6.417 5.221,11.638 11.638,11.638c6.418,0 11.64,-5.221 11.64,-11.638c-0.001,-6.416 -5.222,-11.636 -11.64,-11.636z"></Path>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Glyphs/CogGlyph.xaml.cs

@@ -0,0 +1,14 @@
+using System.Windows.Controls;
+
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for CogGlyph.xaml
+/// </summary>
+public partial class CogGlyph : UserControl
+{
+    public CogGlyph()
+    {
+        this.InitializeComponent();
+    }
+}

Daybreak/Controls/Glyphs/ThreeDotsGlyph.xaml

@@ -0,0 +1,17 @@
+<UserControl x:Class="Daybreak.Controls.ThreeDotsGlyph"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             mc:Ignorable="d" 
+             x:Name="_this"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
+            <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
+            <Ellipse Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Height="1" Width="1"></Ellipse>
+        </StackPanel>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/Glyphs/ThreeDotsGlyph.xaml.cs

@@ -0,0 +1,14 @@
+using System.Windows.Controls;
+
+namespace Daybreak.Controls;
+
+/// <summary>
+/// Interaction logic for ThreeDotsGlyph.xaml
+/// </summary>
+public partial class ThreeDotsGlyph : UserControl
+{
+    public ThreeDotsGlyph()
+    {
+        this.InitializeComponent();
+    }
+}

Daybreak/Controls/MenuList.xaml

@@ -0,0 +1,93 @@
+<UserControl x:Class="Daybreak.Controls.MenuList"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             xmlns:buttons="clr-namespace:Daybreak.Controls.Buttons"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <StackPanel>
+        <buttons:MenuButton Title="Game companion" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="GameCompanionButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:GoldenArrowGlyph Foreground="White"
+                                   Width="40"></local:GoldenArrowGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Account settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="AccountSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:AvatarGlyph Foreground="White"
+                                   Width="40"></local:AvatarGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Guildwars settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="GuildwarsSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:FileGlyph Foreground="White"
+                                 Width="40"></local:FileGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Launcher settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="LauncherSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:CogGlyph Foreground="White"
+                                Width="40"
+                                Height="20"></local:CogGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Experimental settings" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="ExperimentalSettingsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:ExperimentGlyph Foreground="White"
+                                       Width="40"></local:ExperimentGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Manage builds" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="ManageBuildsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:FireballGlyph Foreground="White"
+                                       Width="40"></local:FireballGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Manage client version" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="VersionManagementButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:StaticGlyph Foreground="White"
+                                       Width="40"></local:StaticGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+        <buttons:MenuButton Title="Logs" 
+                            Foreground="White"
+                            HighlightColor="White"
+                            Height="30"
+                            Clicked="LogsButton_Clicked">
+            <buttons:MenuButton.InnerContent>
+                <local:LogsGlyph Foreground="White"
+                                       Width="40"></local:LogsGlyph>
+            </buttons:MenuButton.InnerContent>
+        </buttons:MenuButton>
+    </StackPanel>
+</UserControl>

Daybreak/Controls/MenuList.xaml.cs

@@ -0,0 +1,78 @@
+using Daybreak.Configuration;
+using Daybreak.Launch;
+using Daybreak.Services.ViewManagement;
+using Daybreak.Views;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Configuration;
+using System.Windows.Controls;
+
+namespace Daybreak.Controls
+{
+    /// <summary>
+    /// Interaction logic for MenuList.xaml
+    /// </summary>
+    public partial class MenuList : UserControl
+    {
+        public MenuList()
+        {
+            this.InitializeComponent();
+        }
+
+        private void GameCompanionButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<CompanionView>();
+        }
+
+        private void AccountSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<AccountsView>();
+        }
+
+        private void GuildwarsSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<ExecutablesView>();
+        }
+
+        private void LauncherSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<SettingsView>();
+        }
+
+        private void ExperimentalSettingsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<ExperimentalSettingsView>();
+        }
+
+        private void ManageBuildsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            var options = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<ILiveOptions<ApplicationConfiguration>>();
+            if (options.Value.ExperimentalFeatures.DownloadIcons)
+            {
+                viewManager.ShowView<IconDownloadView>();
+            }
+            else
+            {
+                viewManager.ShowView<BuildsListView>();
+            }
+        }
+
+        private void VersionManagementButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<VersionManagementView>();
+        }
+
+        private void LogsButton_Clicked(object sender, EventArgs e)
+        {
+            var viewManager = Launcher.Instance.ApplicationServiceProvider.GetRequiredService<IViewManager>();
+            viewManager.ShowView<LogsView>();
+        }
+    }
+}

Daybreak/Converters/MenuButtonHighlightConverter.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Daybreak.Converters
+{
+    public class MenuButtonHighlightConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType == typeof(double) &&
+                value is bool boolean)
+            {
+                return boolean ? 0.4 : 0;
+            }
+            else
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType == typeof(bool) &&
+                value is double doubleValue)
+            {
+                return doubleValue == 0.4;
+            }
+            else
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}

Daybreak/Daybreak.csproj

@@ -10,7 +10,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.6.9</Version>
+    <Version>0.9.7</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
   </PropertyGroup>

Daybreak/Launch/MainWindow.xaml

@@ -3,11 +3,11 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
         xmlns:local="clr-namespace:Daybreak.Launch"
         xmlns:wcl="clr-namespace:WCL;assembly=WCL"
         mc:Ignorable="d"
         xmlns:controls="clr-namespace:Daybreak.Controls"
+        xmlns:converters="clr-namespace:Daybreak.Converters"
         xmlns:effects="clr-namespace:System.Windows.Media.Extensions.Effects;assembly=WpfExtended"
         WindowStyle="None"
         ResizeMode="NoResize"
@@ -25,14 +25,7 @@
                         <ControlTemplate TargetType="{x:Type ToggleButton}">
                             <Grid>
                                 <Rectangle x:Name="OverlayRect" Fill="{TemplateBinding Background}" Opacity="0"></Rectangle>
-                                <Viewbox Margin="5" Stretch="Uniform">
-                                    <Grid>
-                                        <Path Stroke="{TemplateBinding Foreground}" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        Data="m76.89,45.018c0,-1.587 -0.151,-3.138 -0.383,-4.66l11.227,-6.48l-11.639,-20.136l-11.616,6.47c-2.421,-1.931 -5.479,-3.506 -8.479,-4.664l0,-11.548l-22,0l0,11.548c-4,1.112 -5.649,2.617 -8.005,4.448l-11.251,-6.604l-11.914,20.006l11.12,6.604c-0.262,1.643 -0.45,3.308 -0.45,5.016c0,1.587 0.153,3.136 0.376,4.658l-11.228,6.484l11.634,20.135l11.424,-6.472c2.431,1.933 4.294,3.506 8.294,4.665l0,12.512l22,0l0,-12.512c3,-1.115 5.839,-2.618 8.19,-4.449l11.348,6.604l11.96,-20.006l-11.095,-6.603c0.258,-1.64 0.487,-3.304 0.487,-5.016zm-31.704,14.137c-7.799,0 -14.138,-6.332 -14.138,-14.138c0,-7.808 6.339,-14.136 14.138,-14.136c7.81,0 14.14,6.328 14.14,14.136c-0.001,7.806 -6.331,14.138 -14.14,14.138z"></Path>
-                                        <Path Fill="{TemplateBinding Foreground}" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        Data="m56.5,89l-22,0c-1.381,0 -2.5,-1.119 -2.5,-2.5l0,-10.199c-2.612,-0.955 -4.464,-2.126 -6.274,-3.49l-10.229,5.671c-1.192,0.661 -2.694,0.244 -3.377,-0.936l-11.633,-20.135c-0.331,-0.574 -0.422,-1.257 -0.25,-1.897s0.591,-1.188 1.165,-1.519l9.794,-5.654c-0.121,-1.164 -0.181,-2.262 -0.181,-3.323c0,-1.317 0.112,-2.592 0.254,-3.721l-9.656,-5.75c-0.57,-0.34 -0.982,-0.893 -1.145,-1.537c-0.163,-0.644 -0.063,-1.326 0.279,-1.896l11.977,-20.006c0.702,-1.173 2.218,-1.564 3.399,-0.878l9.927,5.762c1.618,-1.213 3.362,-2.346 5.949,-3.273l0,-10.219c0.001,-1.381 1.12,-2.5 2.501,-2.5l22,0c1.381,0 2.5,1.119 2.5,2.5l0,10.377c2.124,0.938 4.104,2.059 5.919,3.35l9.939,-5.657c1.19,-0.677 2.713,-0.269 3.4,0.922l11.639,20.135c0.332,0.574 0.423,1.257 0.251,1.897s-0.591,1.188 -1.165,1.519l-9.781,5.646c0.126,1.165 0.188,2.266 0.188,3.329c0,1.327 -0.108,2.597 -0.246,3.717l9.692,5.752c0.571,0.339 0.983,0.891 1.147,1.533c0.163,0.644 0.065,1.325 -0.274,1.896l-11.897,20.005c-0.703,1.183 -2.234,1.573 -3.416,0.876l-9.798,-5.765c-1.782,1.25 -3.634,2.29 -5.598,3.144l0,10.324c0,1.381 -1.119,2.5 -2.5,2.5zm-19.5,-5l17,0l0,-9.512c0,-1.045 0.649,-1.979 1.629,-2.344c2.624,-0.975 5.004,-2.309 7.275,-4.078c0.809,-0.629 1.921,-0.702 2.804,-0.182l9.078,5.341l9.347,-15.716l-8.974,-5.325c-0.88,-0.522 -1.354,-1.528 -1.194,-2.538c0.198,-1.259 0.425,-2.923 0.425,-4.629c0,-1.314 -0.116,-2.716 -0.354,-4.284c-0.154,-1.018 0.33,-2.026 1.222,-2.541l9.061,-5.23l-9.145,-15.818l-9.208,5.241c-0.888,0.505 -1.995,0.42 -2.795,-0.219c-2.199,-1.754 -4.747,-3.196 -7.57,-4.286c-0.964,-0.372 -1.6,-1.299 -1.6,-2.332l0,-9.548l-17.001,0l0,9.548c0,1.123 -0.748,2.107 -1.83,2.408c-3.47,0.965 -5.073,2.212 -7.293,3.938l-0.098,0.076c-0.804,0.625 -1.909,0.7 -2.789,0.188l-9.243,-5.365l-9.423,15.739l8.937,5.321c0.879,0.524 1.351,1.531 1.189,2.542c-0.202,1.27 -0.435,2.943 -0.435,4.622c0,1.318 0.112,2.724 0.342,4.297c0.148,1.013 -0.337,2.015 -1.224,2.526l-9.065,5.234l9.151,15.842l9.525,-5.28c0.883,-0.49 1.976,-0.4 2.768,0.229c2.384,1.896 4.207,3.214 7.684,4.221c1.069,0.31 1.804,1.29 1.804,2.402l0,9.512zm8.186,-22.345c-9.174,0 -16.638,-7.464 -16.638,-16.638c0,-9.173 7.464,-16.636 16.638,-16.636c9.175,0 16.64,7.463 16.64,16.636c-0.001,9.174 -7.466,16.638 -16.64,16.638zm0,-28.273c-6.417,0 -11.638,5.22 -11.638,11.636c0,6.417 5.221,11.638 11.638,11.638c6.418,0 11.64,-5.221 11.64,-11.638c-0.001,-6.416 -5.222,-11.636 -11.64,-11.636z"></Path>
-                                    </Grid>
-                                </Viewbox>
+                                <controls:ThreeDotsGlyph Margin="13"></controls:ThreeDotsGlyph>
                             </Grid>
                             <ControlTemplate.Triggers>
                                 <MultiTrigger>
@@ -63,30 +56,47 @@
             <RowDefinition Height="30"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <Border BorderBrush="Transparent" BorderThickness="0" Grid.RowSpan="2">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Border BorderBrush="Transparent" BorderThickness="0" Grid.RowSpan="2" Grid.ColumnSpan="2">
             <Border.Effect>
                 <BlurEffect Radius="5" KernelType="Gaussian" RenderingBias="Performance"></BlurEffect>
             </Border.Effect>
-            <controls:ImageViewer x:Name="ImageViewer">
+            <controls:ImageViewer x:Name="ImageViewer"
+                                  MouseDown="TitleBar_MouseLeftButtonDown">
                 <controls:ImageViewer.Effect>
                     <effects:LightStreak Attenuation="0.4" BrightThreshold="0.9"></effects:LightStreak>
                 </controls:ImageViewer.Effect>
             </controls:ImageViewer>
         </Border>
         <wcl:TitleBar x:Name="Titlebar"
+                      Grid.ColumnSpan="2"
                       Background="Transparent" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown"
                       WindowState="Normal" MinimizeButtonClicked="TitleBar_MinimizeButtonClicked"
                       MaximizeButtonClicked="TitleBar_MaximizeButtonClicked"
                       RestoreButtonClicked="TitleBar_RestoreButtonClicked"
                       CloseButtonClicked="TitleBar_CloseButtonClicked"
                       Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></wcl:TitleBar>
-        <ToggleButton Style="{StaticResource Window_SettingsButton}" Width="50" Height="30" HorizontalAlignment="Right"
-                      Margin="0, 0, 150, 0" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Click="SettingsButton_Clicked"></ToggleButton>
-        <controls:OpaqueButton Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
-                 Text="{Binding ElementName=_this, Path=CreditText, Mode=OneWay}" VerticalAlignment="Bottom"
-                 HorizontalAlignment="Right" Margin="0, 0, 20, 30" FontSize="22" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+        <controls:OpaqueButton Grid.Row="1"
+                               Grid.Column="1"
+                               Background="Transparent"
+                               BorderBrush="Transparent"
+                               BorderThickness="0"
+                               Opacity="0.6"
+                               Text="{Binding ElementName=_this, Path=CreditText, Mode=OneWay}"
+                               VerticalAlignment="Bottom"
+                               HorizontalAlignment="Right" 
+                               Margin="0, 0, 20, 30" 
+                               FontSize="22" 
+                               Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
                  Clicked="CreditTextBox_MouseLeftButtonDown" Cursor="Hand"></controls:OpaqueButton>
-        <WrapPanel Grid.Row="1"  Margin="0, 0, 20, 10" VerticalAlignment="Bottom" HorizontalAlignment="Right">
+        <WrapPanel Grid.Row="1"
+                   Grid.Column="1"
+                   Margin="0, 0, 20, 10"
+                   VerticalAlignment="Bottom"
+                   HorizontalAlignment="Right">
             <controls:OpaqueButton Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
                      Text="{Binding ElementName=_this, Path=CurrentVersionText, Mode=OneWay}" FontSize="10"
                      Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
@@ -100,9 +110,35 @@
                      Visibility="{Binding ElementName=_this, Path=IsRunningAsAdmin, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
                      Clicked="VersionText_Clicked"></controls:OpaqueButton>
         </WrapPanel>
-        <Grid x:Name="Container" Grid.Row="1">
+        <Grid x:Name="Container"
+                  Grid.Column="1"
+                  Grid.Row="1"/>
+        <Grid x:Name="MenuContainer"
+                  Width="0"
+                  Grid.RowSpan="2"
+                  VerticalAlignment="Stretch"
+                  HorizontalAlignment="Left"
+                  Background="#A0202020">
+            <controls:MenuList Margin="0, 30, 0, 0"/>
         </Grid>
-        <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Active="True"></wcl:Border>
+        <ToggleButton Style="{StaticResource Window_SettingsButton}"
+                      Width="50"
+                      Height="30"
+                      HorizontalAlignment="Left"
+                      Margin="0, 0, 0, 0"
+                      Grid.ColumnSpan="2"
+                      Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Click="SettingsButton_Clicked"></ToggleButton>
+        <ToggleButton Style="{StaticResource Window_SettingsButton}"
+                      Width="50"
+                      Height="30"
+                      HorizontalAlignment="Left"
+                      Margin="0, 0, 0, 0"
+                      Grid.ColumnSpan="2"
+                      Foreground="White"
+                      Visibility="{Binding ElementName=_this, Path=IsShowingDropdown, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
+                      Click="SettingsButton_Clicked"></ToggleButton>
+        <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Grid.ColumnSpan="2" Active="True"></wcl:Border>
         <controls:ChromiumBrowserWrapper x:Name="BackgroundWebView"
                                          VerticalAlignment="Center"
                                          HorizontalAlignment="Center"

Daybreak/Launch/MainWindow.xaml.cs

@@ -14,10 +14,13 @@ using System.Diagnostics;
 using System.Extensions;
 using System.Threading;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Extensions;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 
 namespace Daybreak.Launch
@@ -44,6 +47,8 @@ namespace Daybreak.Launch
         private string currentVersionText;
         [GenerateDependencyProperty]
         private bool isRunningAsAdmin;
+        [GenerateDependencyProperty]
+        private bool isShowingDropdown;
 
         public MainWindow(
             IViewManager viewManager,
@@ -76,6 +81,12 @@ namespace Daybreak.Launch
 
         private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
+            if (e.ChangedButton is not MouseButton.Left &&
+                e.LeftButton is not MouseButtonState.Pressed)
+            {
+                return;
+            }
+
             this.DragMove();
         }
 
@@ -144,7 +155,46 @@ namespace Daybreak.Launch
 
         private void SettingsButton_Clicked(object sender, EventArgs e)
         {
-            this.viewManager.ShowView<SettingsCategoryView>();
+            sender.As<ToggleButton>().IsEnabled = false;
+            var widthAnimation = new DoubleAnimation
+            {
+                From = this.IsShowingDropdown ?
+                    this.MenuContainer.ActualWidth :
+                    0,
+                To = this.IsShowingDropdown ?
+                    0 :
+                    300,
+                Duration = new Duration(TimeSpan.FromMilliseconds(200)),
+                DecelerationRatio = 0.7
+            };
+
+            var opacityAnimation = new DoubleAnimation
+            {
+                From = this.IsShowingDropdown ?
+                    this.MenuContainer.Opacity :
+                    0,
+                To = this.IsShowingDropdown ?
+                    0 :
+                    1,
+                Duration = new Duration(TimeSpan.FromMilliseconds(100)),
+                DecelerationRatio = 0.7
+            };
+
+            var storyBoard = new Storyboard();
+            storyBoard.Children.Add(widthAnimation);
+            Storyboard.SetTarget(widthAnimation, this.MenuContainer);
+            Storyboard.SetTargetProperty(widthAnimation, new PropertyPath(Grid.WidthProperty));
+            storyBoard.Children.Add(opacityAnimation);
+            Storyboard.SetTarget(opacityAnimation, this.MenuContainer);
+            Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath(Grid.OpacityProperty));
+
+            storyBoard.Completed += (_, _) =>
+            {
+                sender.As<ToggleButton>().IsEnabled = true;
+                this.IsShowingDropdown = !this.IsShowingDropdown;
+            };
+
+            storyBoard.Begin();
         }
 
         private void CreditTextBox_MouseLeftButtonDown(object sender, EventArgs e)
@@ -187,7 +237,7 @@ namespace Daybreak.Launch
             }
             else
             {
-                this.viewManager.ShowView<MainView>();
+                this.viewManager.ShowView<CompanionView>();
                 this.PeriodicallyCheckForUpdates();
             }
         }

Daybreak/Services/ApplicationLauncher/ApplicationLauncher.cs

@@ -65,7 +65,7 @@ namespace Daybreak.Services.ApplicationLauncher
                     {
                         if (this.privilegeManager.AdminPrivileges is false)
                         {
-                            this.privilegeManager.RequestAdminPrivileges<MainView>("You need administrator rights in order to start using multi-launch");
+                            this.privilegeManager.RequestAdminPrivileges<CompanionView>("You need administrator rights in order to start using multi-launch");
                             return false;
                         }
 

Daybreak/Views/AccountsView.xaml

@@ -10,13 +10,12 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="#A0202020">
         <TextBlock HorizontalAlignment="Center" Text="Accounts settings" FontSize="22" Foreground="White"></TextBlock>
-        <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Left" Margin="5"
-                             Clicked="BackButton_Clicked" VerticalAlignment="Top"></controls:BackButton>
         <controls:AddButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Right" Margin="5, 5, 45, 5"
                              Clicked="AddButton_Clicked" VerticalAlignment="Top"></controls:AddButton>
         <controls:SaveButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Right" Margin="5"
                              Clicked="SaveButton_Clicked" VerticalAlignment="Top"></controls:SaveButton>
-        <ListView ItemsSource="{Binding ElementName=_this, Path=Accounts, Mode=OneWay}" Background="Transparent" Margin="0, 40, 0, 0">
+        <ListView ItemsSource="{Binding ElementName=_this, Path=Accounts, Mode=OneWay}" Background="Transparent" Margin="0, 40, 0, 0"
+                  BorderThickness="0">
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>

Daybreak/Views/AccountsView.xaml.cs

@@ -17,16 +17,13 @@ namespace Daybreak.Views
     public partial class AccountsView : UserControl
     {
         private readonly ICredentialManager credentialManager;
-        private readonly IViewManager viewManager;
 
         public ObservableCollection<LoginCredentials> Accounts { get; } = new();
 
         public AccountsView(
-            ICredentialManager credentialManager,
-            IViewManager viewManager)
+            ICredentialManager credentialManager)
         {
             this.credentialManager = credentialManager.ThrowIfNull(nameof(credentialManager));
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
             this.GetCredentials();
         }
@@ -37,11 +34,6 @@ namespace Daybreak.Views
             this.Accounts.AddRange(creds);
         }
 
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsCategoryView>();
-        }
-
         private void AddButton_Clicked(object sender, EventArgs e)
         {
             var newCredentials = new LoginCredentials();
@@ -55,7 +47,6 @@ namespace Daybreak.Views
         private async void SaveButton_Clicked(object sender, EventArgs e)
         {
             await this.credentialManager.StoreCredentials(this.Accounts.ToList()).ConfigureAwait(true);
-            this.viewManager.ShowView<SettingsCategoryView>();
         }
 
         private void AccountTemplate_RemoveClicked(object sender, EventArgs e)

Daybreak/Views/AskUpdateView.xaml.cs

@@ -41,7 +41,7 @@ namespace Daybreak.Views
             this.logger.LogInformation("User declined update");
             this.liveOptions.Value.AutoCheckUpdate = false;
             this.liveOptions.UpdateOption();
-            this.viewManager.ShowView<MainView>();
+            this.viewManager.ShowView<CompanionView>();
         }
 
         private async void YesButton_Clicked(object sender, System.EventArgs e)

Daybreak/Views/BuildsListView.xaml

@@ -14,8 +14,6 @@
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5"
-                             Clicked="BackButton_Clicked"></controls:BackButton>
         <controls:AddButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5"
                             Clicked="AddButton_Clicked"></controls:AddButton>
         <controls:SynchronizeButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5, 5, 45, 5"

Daybreak/Views/BuildsListView.xaml.cs

@@ -44,11 +44,6 @@ namespace Daybreak.Views
             this.viewManager.ShowView<BuildTemplateView>(sender.As<ListView>().SelectedItem);
         }
 
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsCategoryView>();
-        }
-
         private void AddButton_Clicked(object sender, EventArgs e)
         {
             var build = this.buildTemplateManager.CreateBuild();

Daybreak/Views/CompanionView.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="Daybreak.Views.MainView"
+<UserControl x:Class="Daybreak.Views.CompanionView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Daybreak/Views/CompanionView.xaml.cs

@@ -1,12 +1,9 @@
 using Daybreak.Configuration;
-using Daybreak.Controls;
 using Daybreak.Exceptions;
 using Daybreak.Models.Builds;
 using Daybreak.Services.ApplicationLauncher;
-using Daybreak.Services.BuildTemplates;
 using Daybreak.Services.Screens;
 using Daybreak.Services.ViewManagement;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Configuration;
 using System.Extensions;
@@ -24,7 +21,7 @@ namespace Daybreak.Views
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Fields used by source generator for DependencyProperty")]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0052:Remove unread private members", Justification = "Used by source generators")]
-    public partial class MainView : UserControl
+    public partial class CompanionView : UserControl
     {
         private readonly IApplicationLauncher applicationDetector;
         private readonly IViewManager viewManager;
@@ -54,7 +51,7 @@ namespace Daybreak.Views
         [GenerateDependencyProperty(InitialValue = true)]
         private bool browsersEnabled;
 
-        public MainView(
+        public CompanionView(
             IApplicationLauncher applicationDetector,
             IViewManager viewManager,
             ILiveUpdateableOptions<ApplicationConfiguration> liveOptions,

Daybreak/Views/ExecutablesView.xaml

@@ -10,13 +10,12 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Background="#A0202020">
         <TextBlock HorizontalAlignment="Center" Text="Executables settings" FontSize="22" Foreground="White"></TextBlock>
-        <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Left" Margin="5"
-                             Clicked="BackButton_Clicked" VerticalAlignment="Top"></controls:BackButton>
         <controls:AddButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Right" Margin="5, 5, 45, 5"
                              Clicked="AddButton_Clicked" VerticalAlignment="Top"></controls:AddButton>
         <controls:SaveButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Right" Margin="5"
                              Clicked="SaveButton_Clicked" VerticalAlignment="Top"></controls:SaveButton>
-        <ListView ItemsSource="{Binding ElementName=_this, Path=Paths, Mode=OneWay}" Background="Transparent" Margin="0, 40, 0, 0">
+        <ListView ItemsSource="{Binding ElementName=_this, Path=Paths, Mode=OneWay}" Background="Transparent" Margin="0, 40, 0, 0"
+                  BorderThickness="0">
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>

Daybreak/Views/ExecutablesView.xaml.cs

@@ -18,15 +18,12 @@ namespace Daybreak.Views
     public partial class ExecutablesView : UserControl
     {
         private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
-        private readonly IViewManager viewManager;
         public ObservableCollection<GuildwarsPath> Paths { get; } = new();
 
         public ExecutablesView(
-            ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions,
-            IViewManager viewManager)
+            ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions)
         {
             this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull(nameof(liveUpdateableOptions));
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.InitializeComponent();
             this.GetPaths();
         }
@@ -36,11 +33,6 @@ namespace Daybreak.Views
             this.Paths.AddRange(this.liveUpdateableOptions.Value.GuildwarsPaths);
         }
 
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsCategoryView>();
-        }
-
         private void AddButton_Clicked(object sender, EventArgs e)
         {
             var newPath = new GuildwarsPath();
@@ -55,7 +47,6 @@ namespace Daybreak.Views
         {
             this.liveUpdateableOptions.Value.GuildwarsPaths = this.Paths.ToList();
             this.liveUpdateableOptions.UpdateOption();
-            this.viewManager.ShowView<SettingsCategoryView>();
         }
 
         private void GuildwarsPathTemplate_DefaultClicked(object sender, EventArgs e)

Daybreak/Views/ExperimentalSettingsView.xaml

@@ -71,8 +71,6 @@
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" Margin="5"
-                             Clicked="BackButton_Clicked" VerticalAlignment="Top" HorizontalAlignment="Left"></controls:BackButton>
         <controls:SaveButton Foreground="White" Height="30" Width="30" Grid.Column="0" Margin="5"
                              Clicked="SaveButton_Clicked" VerticalAlignment="Top" HorizontalAlignment="Right"></controls:SaveButton>
         <StackPanel Margin="50, 0, 50, 0" HorizontalAlignment="Center">

Daybreak/Views/ExperimentalSettingsView.xaml.cs

@@ -4,7 +4,6 @@ using System;
 using System.Configuration;
 using System.Extensions;
 using System.Linq;
-using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Extensions;
 using System.Windows.Input;
@@ -29,14 +28,11 @@ namespace Daybreak.Views
         [GenerateDependencyProperty]
         public bool downloadIcons;
 
-        private readonly IViewManager viewManager;
         private readonly ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions;
 
         public ExperimentalSettingsView(
-            IViewManager viewManager,
             ILiveUpdateableOptions<ApplicationConfiguration> liveUpdateableOptions)
         {
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.liveUpdateableOptions = liveUpdateableOptions.ThrowIfNull(nameof(liveUpdateableOptions));
             this.InitializeComponent();
             this.LoadExperimentalSettings();
@@ -72,12 +68,6 @@ namespace Daybreak.Views
         private void SaveButton_Clicked(object sender, EventArgs e)
         {
             this.SaveExperimentalSettings();
-            this.viewManager.ShowView<SettingsCategoryView>();
-        }
-
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsCategoryView>();
         }
 
         private void TextBox_AllowNumbersOnly(object sender, TextCompositionEventArgs e)

Daybreak/Views/GraphAuthorizationView.xaml.cs

@@ -38,14 +38,14 @@ public partial class GraphAuthorizationView : UserControl
         if (authorizationResult.TryExtractFailure(out var failure))
         {
             this.logger.LogError(failure, "Authorization failed");
-            this.viewManager.ShowView<MainView>();
+            this.viewManager.ShowView<CompanionView>();
             return;
         }
 
         if (this.DataContext is not ViewRedirectContext redirectContext)
         {
             this.logger.LogError("Cannot redirect to proper view. No view set in context");
-            this.viewManager.ShowView<MainView>();
+            this.viewManager.ShowView<CompanionView>();
             return;
         }
 

Daybreak/Views/LogsView.xaml

@@ -18,8 +18,6 @@
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <controls:BackButton Foreground="White" Height="30" Width="30" HorizontalAlignment="Left" Margin="5"
-                             Clicked="BackButton_Clicked"></controls:BackButton>
         <controls:BinButton Foreground="White" Height="30" Width="30" HorizontalAlignment="Right" Margin="5"
                             Clicked="BinButton_Clicked"></controls:BinButton>
         <controls:RefreshGlyph Foreground="White" Height="30" Width="30" HorizontalAlignment="Right" Margin="0, 5, 45, 5"

Daybreak/Views/LogsView.xaml.cs

@@ -1,7 +1,6 @@
 using Daybreak.Models;
 using Daybreak.Services.Logging;
 using Daybreak.Services.ViewManagement;
-using Daybreak.Utils;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using System;
@@ -18,19 +17,16 @@ namespace Daybreak.Views
     /// </summary>
     public partial class LogsView : UserControl
     {
-        private readonly IViewManager viewManager;
         private readonly ILogsManager logManager;
         private readonly ILogger<LogsView> logger;
 
         public ObservableCollection<Log> Logs { get; } = new ObservableCollection<Log>();
 
         public LogsView(
-            IViewManager viewManager,
             ILogsManager logManager,
             ILogger<LogsView> logger)
         {
             this.logManager = logManager.ThrowIfNull(nameof(logManager));
-            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.InitializeComponent();
             this.UpdateLogs();
@@ -62,10 +58,6 @@ namespace Daybreak.Views
                 this.logger.LogInformation("Exporting canceled");
             }
         }
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsCategoryView>();
-        }
         private void BinButton_Clicked(object sender, EventArgs e)
         {
             this.logManager.DeleteLogs();

Daybreak/Views/RequestElevationView.xaml.cs

@@ -42,7 +42,7 @@ namespace Daybreak.Views
             else
             {
                 this.logger.LogWarning("Elevation request context is not set. Returning to home page");
-                this.viewManager.ShowView<MainView>();
+                this.viewManager.ShowView<CompanionView>();
             }
         }
     }

Daybreak/Views/ScreenChoiceView.xaml.cs

@@ -87,7 +87,7 @@ namespace Daybreak.Views
         private void SaveButton_Clicked(object sender, EventArgs e)
         {
             this.liveOptions.Value.DesiredGuildwarsScreen = this.selectedId;
-            this.viewManager.ShowView<SettingsCategoryView>();
+            this.viewManager.ShowView<SettingsView>();
         }
 
         private void OpaqueButton_Clicked(object sender, EventArgs e)

Daybreak/Views/SettingsCategoryView.xaml

@@ -1,60 +0,0 @@
-<UserControl x:Class="Daybreak.Views.SettingsCategoryView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Daybreak.Views"
-             xmlns:controls="clr-namespace:Daybreak.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Background="#A0202020">
-        <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" Margin="5"
-                             Clicked="BackButton_Clicked" VerticalAlignment="Top" HorizontalAlignment="Left"></controls:BackButton>
-        <WrapPanel Orientation="Vertical" VerticalAlignment="Bottom">
-            <WrapPanel Orientation="Horizontal">
-                <controls:TileButton Title="Account settings" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="AccountButton_Clicked" Width="150" Height="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:AvatarGlyph></controls:AvatarGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-                <controls:TileButton Title="Guildwars settings" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="FileButton_Clicked" Height="150" Width="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:FileGlyph></controls:FileGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-                <controls:TileButton Title="Launcher settings" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="LauncherButton_Clicked" Width="150" Height="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:GoldenArrowGlyph></controls:GoldenArrowGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-                <controls:TileButton Title="Experimental settings" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="ExperimentalButton_Clicked" Height="150" Width="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:ExperimentGlyph></controls:ExperimentGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-                <controls:TileButton Title="Builds" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="BuildsButton_Clicked" Height="150" Width="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:FireballGlyph></controls:FireballGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-                <controls:TileButton Title="Version management" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="VersionButton_Clicked" Height="150" Width="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:StaticGlyph></controls:StaticGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-                <controls:TileButton Title="Logs" Foreground="White" BorderBrush="White" BorderThickness="2"
-                             HighlightColor="White" Clicked="LogsButton_Clicked" Height="150" Width="150">
-                    <controls:TileButton.InnerContent>
-                        <controls:LogsGlyph></controls:LogsGlyph>
-                    </controls:TileButton.InnerContent>
-                </controls:TileButton>
-            </WrapPanel>
-        </WrapPanel>
-    </Grid>
-</UserControl>

Daybreak/Views/SettingsCategoryView.xaml.cs

@@ -1,74 +0,0 @@
-using Daybreak.Configuration;
-using Daybreak.Services.ViewManagement;
-using System.Configuration;
-using System.Core.Extensions;
-using System.Extensions;
-using System.Windows.Controls;
-
-namespace Daybreak.Views
-{
-    /// <summary>
-    /// Interaction logic for SettingsCategoryView.xaml
-    /// </summary>
-    public partial class SettingsCategoryView : UserControl
-    {
-        private readonly IViewManager viewManager;
-        private readonly ILiveOptions<ApplicationConfiguration> liveOptions;
-
-        public SettingsCategoryView(
-            ILiveOptions<ApplicationConfiguration> liveOptions,
-            IViewManager viewManager)
-        {
-            this.liveOptions = liveOptions.ThrowIfNull();
-            this.viewManager = viewManager.ThrowIfNull();
-            this.InitializeComponent();
-        }
-
-        private void AccountButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<AccountsView>();
-        }
-
-        private void LauncherButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsView>();
-        }
-
-        private void ExperimentalButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<ExperimentalSettingsView>();
-        }
-
-        private void BuildsButton_Clicked(object sender, System.EventArgs e)
-        {
-            if (this.liveOptions.Value.ExperimentalFeatures.DownloadIcons)
-            {
-                this.viewManager.ShowView<IconDownloadView>();
-            }
-            else
-            {
-                this.viewManager.ShowView<BuildsListView>();
-            }
-        }
-
-        private void VersionButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<VersionManagementView>(this);
-        }
-
-        private void LogsButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<LogsView>();
-        }
-
-        private void FileButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<ExecutablesView>();
-        }
-
-        private void BackButton_Clicked(object sender, System.EventArgs e)
-        {
-            this.viewManager.ShowView<MainView>();
-        }
-    }
-}

Daybreak/Views/SettingsView.xaml

@@ -77,8 +77,6 @@
                 <ColumnDefinition Width="*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <TextBlock Text="Launcher settings" FontSize="22" Foreground="White" HorizontalAlignment="Center" Grid.ColumnSpan="2"></TextBlock>
-            <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Left" Margin="5"
-                                Clicked="BackButton_Clicked"></controls:BackButton>
             <controls:SaveButton Foreground="White" Height="30" Width="30" Grid.Column="1" HorizontalAlignment="Right" Margin="5"
                                 Clicked="SaveButton_Clicked"></controls:SaveButton>
             <StackPanel Orientation="Vertical" Grid.Row="1">

Daybreak/Views/SettingsView.xaml.cs

@@ -86,7 +86,6 @@ namespace Daybreak.Views
             currentConfig.PlaceShortcut = this.ShortcutPlaced;
             currentConfig.AutoCheckUpdate = this.AutoCheckUpdate;
             this.liveUpdateableOptions.UpdateOption();
-            this.viewManager.ShowView<SettingsCategoryView>();
         }
 
         private void ToolboxFilePickerGlyph_Clicked(object sender, EventArgs e)
@@ -139,11 +138,6 @@ namespace Daybreak.Views
             this.viewManager.ShowView<ScreenChoiceView>();
         }
 
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            this.viewManager.ShowView<SettingsCategoryView>();
-        }
-
         private void TextBox_AllowOnlyNumbers(object sender, System.Windows.Input.TextCompositionEventArgs e)
         {
             if (int.TryParse(e.Text, out _) is false)

Daybreak/Views/UpdateView.xaml.cs

@@ -59,7 +59,7 @@ namespace Daybreak.Views
         {
             if (this.DataContext is not Version version)
             {
-                this.viewManager.ShowView<MainView>();
+                this.viewManager.ShowView<CompanionView>();
                 throw new InvalidOperationException("No version specified for download");
             }
 
@@ -87,7 +87,7 @@ namespace Daybreak.Views
             }
             else
             {
-                this.viewManager.ShowView<MainView>();
+                this.viewManager.ShowView<CompanionView>();
             }
         }
     }

Daybreak/Views/VersionManagementView.xaml

@@ -14,8 +14,6 @@
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <controls:BackButton Foreground="White" Height="30" Width="30" Grid.Column="0" HorizontalAlignment="Left" Margin="5"
-                                Clicked="BackButton_Clicked"></controls:BackButton>
         <TextBlock Text="Manage application version" FontSize="18" Foreground="White" HorizontalAlignment="Center"></TextBlock>
         <WrapPanel Grid.Row="1" HorizontalAlignment="Center" Margin="10">
             <TextBlock Text="Current version: " Foreground="White" FontSize="16"></TextBlock>

Daybreak/Views/VersionManagementView.xaml.cs

@@ -77,17 +77,5 @@ namespace Daybreak.Views
 
             this.viewManager.ShowView<UpdateView>(desiredVersion);
         }
-
-        private void BackButton_Clicked(object sender, EventArgs e)
-        {
-            if (this.DataContext is UserControl userControl)
-            {
-                this.viewManager.ShowView(userControl.GetType());
-            }
-            else
-            {
-                this.viewManager.ShowView<MainView>();
-            }
-        }
     }
 }