diff --git a/Client/Rubberduck.Editor/App.xaml.cs b/Client/Rubberduck.Editor/App.xaml.cs
index f9533a2e..f75cc4c7 100644
--- a/Client/Rubberduck.Editor/App.xaml.cs
+++ b/Client/Rubberduck.Editor/App.xaml.cs
@@ -198,21 +198,26 @@ private void ShowStartupToolwindows(EditorSettings settings)
 
         private async Task LoadWelcomeTabAsync(IShellWindowViewModel model)
         {
-            //var fileSystem = _serviceProvider.GetRequiredService<IFileSystem>();
-            //var path = fileSystem.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Rubberduck", "Templates", "Welcome.md");
-            //var content = await fileSystem.File.ReadAllTextAsync(path);
-
-            //var showSettingsCommand = _serviceProvider.GetRequiredService<ShowRubberduckSettingsCommand>();
-            //var closeToolWindowCommand = _serviceProvider.GetRequiredService<CloseToolWindowCommand>();
-            //var activeDocumentStatus = _serviceProvider.GetRequiredService<IDocumentStatusViewModel>();
-            //var welcome = new MarkdownDocumentTabViewModel(new WorkspaceFileUri(null!, new Uri(path)), "Welcome", content, isReadOnly: true, showSettingsCommand, closeToolWindowCommand, activeDocumentStatus, () => _languageClient.LanguageClient!);
-
-            //var welcomeTabContent = new MarkdownEditorControl() { DataContext = welcome };
-            //welcome.ContentControl = welcomeTabContent;
-            //welcome.IsSelected = true;
-
-            //model.DocumentWindows.Add(welcome);
-            //model.ActiveDocumentTab = welcome;
+            var fileSystem = _serviceProvider.GetRequiredService<IFileSystem>();
+            var folder = fileSystem.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Rubberduck", "Templates");
+            var filename = "Welcome.md";
+            var path = fileSystem.Path.Combine(folder, filename);
+            var content = await fileSystem.File.ReadAllTextAsync(path);
+
+            var rootUri = new Uri(folder);
+            var fileUri = new WorkspaceFileUri(filename, rootUri);
+
+            var showSettingsCommand = _serviceProvider.GetRequiredService<ShowRubberduckSettingsCommand>();
+            var closeToolWindowCommand = _serviceProvider.GetRequiredService<CloseToolWindowCommand>();
+            var activeDocumentStatus = _serviceProvider.GetRequiredService<IDocumentStatusViewModel>();
+            var documentState = new DocumentState(fileUri, content, isOpened: true);
+            var welcome = new MarkdownDocumentTabViewModel(documentState, isReadOnly: true, showSettingsCommand, closeToolWindowCommand, activeDocumentStatus, () => _languageClient.LanguageClient!);
+            var welcomeTabContent = new MarkdownEditorControl() { DataContext = welcome };
+            welcome.ContentControl = welcomeTabContent;
+            welcome.IsSelected = true;
+
+            model.DocumentWindows.Add(welcome);
+            model.ActiveDocumentTab = welcome;
         }
 
         protected override void OnExit(ExitEventArgs e)
diff --git a/Client/Rubberduck.UI/Converters/WrapPanelItemWidthConverter.cs b/Client/Rubberduck.UI/Converters/WrapPanelItemWidthConverter.cs
index 42d59aa8..31881d84 100644
--- a/Client/Rubberduck.UI/Converters/WrapPanelItemWidthConverter.cs
+++ b/Client/Rubberduck.UI/Converters/WrapPanelItemWidthConverter.cs
@@ -14,7 +14,7 @@ namespace Rubberduck.UI.Converters
     public class WrapPanelItemWidthConverter : IValueConverter
     {
         public double MinItemWidth { get; set; } = 300;
-        public double MaxItemWidth { get; set; } = 512;
+        public double MaxItemWidth { get; set; } = 720;
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
diff --git a/Client/Rubberduck.UI/Resources/FontAwesome/arrows-left-right-to-line-solid.png b/Client/Rubberduck.UI/Resources/FontAwesome/arrows-left-right-to-line-solid.png
new file mode 100644
index 00000000..782ea54f
Binary files /dev/null and b/Client/Rubberduck.UI/Resources/FontAwesome/arrows-left-right-to-line-solid.png differ
diff --git a/Client/Rubberduck.UI/Rubberduck.UI.csproj b/Client/Rubberduck.UI/Rubberduck.UI.csproj
index d9234181..7f900ecb 100644
--- a/Client/Rubberduck.UI/Rubberduck.UI.csproj
+++ b/Client/Rubberduck.UI/Rubberduck.UI.csproj
@@ -158,6 +158,7 @@
     <None Remove="Resources\Custom\vector-ducky-blur-1480.png" />
     <None Remove="Resources\Custom\vector-ducky-color.png" />
     <None Remove="Resources\Custom\vector-ducky-shadow-1480.png" />
+    <None Remove="Resources\FontAwesome\arrows-left-right-to-line-solid.png" />
     <None Remove="Resources\FontAwesome\arrows-spin-solid.png" />
     <None Remove="Resources\FontAwesome\ban-solid.png" />
     <None Remove="Resources\FontAwesome\bomb-solid.png" />
@@ -417,6 +418,7 @@
     <Resource Include="Resources\Custom\vector-ducky-blur-1480.png" />
     <Resource Include="Resources\Custom\vector-ducky-color.png" />
     <Resource Include="Resources\Custom\vector-ducky-shadow-1480.png" />
+    <Resource Include="Resources\FontAwesome\arrows-left-right-to-line-solid.png" />
     <Resource Include="Resources\FontAwesome\arrows-spin-solid.png" />
     <Resource Include="Resources\FontAwesome\ban-solid.png" />
     <Resource Include="Resources\FontAwesome\bomb-solid.png" />
diff --git a/Client/Rubberduck.UI/Services/Settings/SettingsWindowViewModel.cs b/Client/Rubberduck.UI/Services/Settings/SettingsWindowViewModel.cs
index e75c5c18..d5d22d09 100644
--- a/Client/Rubberduck.UI/Services/Settings/SettingsWindowViewModel.cs
+++ b/Client/Rubberduck.UI/Services/Settings/SettingsWindowViewModel.cs
@@ -28,6 +28,14 @@ public SettingsWindowViewModel(UIServiceHelper service, MessageActionCommand[] a
             ShowSettingsCommand = new DelegateCommand(service, parameter => ResetToDefaults());
             service.RunOnMainThread(() => Settings = _factory.CreateViewModel(_service.Settings));
 
+            ExpandSettingGroupCommand = new DelegateCommand(service, parameter =>
+            {
+                if (parameter is ISettingGroupViewModel model)
+                {
+                    ExecuteExpandSettingGroupCommand(model);
+                }
+            });
+
             CommandBindings = new CommandBinding[]
             {
                 new(NavigationCommands.Search, DialogCommandHandlers.BrowseLocationCommandBinding_Executed, DialogCommandHandlers.BrowseLocationCommandBinding_CanExecute),
@@ -38,7 +46,26 @@ public SettingsWindowViewModel(UIServiceHelper service, MessageActionCommand[] a
 
         public bool ShowPinButton => false;
         
-        public ISettingGroupViewModel Settings { get; private set; }
+        public ICommand ExpandSettingGroupCommand { get; }
+
+        private void ExecuteExpandSettingGroupCommand(ISettingGroupViewModel model)
+        {
+            Selection = model;
+        }
+
+        private ISettingGroupViewModel _settings;
+        public ISettingGroupViewModel Settings 
+        {
+            get => _settings;
+            private set
+            {
+                if (_settings != value)
+                {
+                    _settings = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         private ISettingViewModel _selection;
         public ISettingViewModel Selection
diff --git a/Client/Rubberduck.UI/Shared/Settings/SettingGroupViewModel.cs b/Client/Rubberduck.UI/Shared/Settings/SettingGroupViewModel.cs
index a8c69545..df00b182 100644
--- a/Client/Rubberduck.UI/Shared/Settings/SettingGroupViewModel.cs
+++ b/Client/Rubberduck.UI/Shared/Settings/SettingGroupViewModel.cs
@@ -57,6 +57,20 @@ public bool IsEnabled
             }
         }
 
+        private bool _isExpanded;
+        public bool IsExpanded
+        {
+            get => _isExpanded;
+            set
+            {
+                if (_isExpanded != value)
+                {
+                    _isExpanded = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public RubberduckSetting ToSetting() => _settingGroup with { Value = Items.Select(e => e.ToSetting()).ToArray() };
     }
 }
diff --git a/Client/Rubberduck.UI/Shared/Settings/SettingsWindow.xaml b/Client/Rubberduck.UI/Shared/Settings/SettingsWindow.xaml
index 6304a160..473153f4 100644
--- a/Client/Rubberduck.UI/Shared/Settings/SettingsWindow.xaml
+++ b/Client/Rubberduck.UI/Shared/Settings/SettingsWindow.xaml
@@ -34,10 +34,11 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <Border Background="{DynamicResource ThemeWhiteLightColorBrush50}">
+                <Border>
                     <ListView MinWidth="160" Margin="4"
-                              Background="Transparent" 
-                              BorderThickness="0"
+                              Background="{DynamicResource ThemeBackgroundColorBrush}" 
+                              BorderThickness="1"
+                              BorderBrush="{DynamicResource ThemeWhiteDarkColorBrush}"
                               VerticalAlignment="Stretch"
                               ScrollViewer.VerticalScrollBarVisibility="Auto"
                               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -62,7 +63,12 @@
                     </ListView>
                 </Border>
 
-                <templates:SettingGroupControl Grid.Column="1" DataContext="{Binding Selection}" />
+                
+                <templates:SettingGroupControl Grid.Column="1" 
+                                               DataContext="{Binding Selection}"
+                                               Background="{DynamicResource ThemeWhiteLightColorBrush75}" 
+                                               BorderThickness="1" BorderBrush="{DynamicResource ThemeWhiteDarkColorBrush}"
+                                               Margin="5"/>
             </Grid>
         </shell:ThunderFrame>
         <Thumb Grid.Row="1" HorizontalAlignment="Right" IsEnabled="True" IsHitTestVisible="True" WindowChrome.IsHitTestVisibleInChrome="True"
diff --git a/Client/Rubberduck.UI/Shared/Settings/Templates/SettingGroupControl.xaml b/Client/Rubberduck.UI/Shared/Settings/Templates/SettingGroupControl.xaml
index bcb4a188..b422699e 100644
--- a/Client/Rubberduck.UI/Shared/Settings/Templates/SettingGroupControl.xaml
+++ b/Client/Rubberduck.UI/Shared/Settings/Templates/SettingGroupControl.xaml
@@ -42,8 +42,7 @@
                 </Label>
             </ScrollViewer>
             <ScrollViewer DockPanel.Dock="Top" VerticalScrollBarVisibility="Auto">
-                <ListBox HorizontalContentAlignment="Stretch"
-                         Background="Transparent" BorderThickness="0"
+                <ListBox HorizontalContentAlignment="Stretch" BorderThickness="0"
                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                          ScrollViewer.VerticalScrollBarVisibility="Auto"
                          VerticalContentAlignment="Stretch"
@@ -58,7 +57,9 @@
                     </ListBox.ItemContainerStyle>
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <WrapPanel ItemWidth="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer, Mode=FindAncestor}, Converter={StaticResource WrapPanelItemWidthConverter}, ConverterParameter={StaticResource ItemsViewSource}}" />
+                            <WrapPanel ItemWidth="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer, Mode=FindAncestor}, 
+                                Converter={StaticResource WrapPanelItemWidthConverter}, 
+                                ConverterParameter={StaticResource ItemsViewSource}}" />
                         </ItemsPanelTemplate>
                     </ListBox.ItemsPanel>
                 </ListBox>
diff --git a/Client/Rubberduck.UI/Shared/Settings/Templates/SettingSubGroupControl.xaml b/Client/Rubberduck.UI/Shared/Settings/Templates/SettingSubGroupControl.xaml
index 06e0fbb2..b435b4c0 100644
--- a/Client/Rubberduck.UI/Shared/Settings/Templates/SettingSubGroupControl.xaml
+++ b/Client/Rubberduck.UI/Shared/Settings/Templates/SettingSubGroupControl.xaml
@@ -27,6 +27,13 @@
                                     CheckedIcon="{DynamicResource UnlockedIcon}"
                                     IsChecked="{Binding IsEnabled}"
                                     Visibility="{Binding IsReadOnlyRecommended, Converter={StaticResource BoolToVisibilityConverter}}" />
+                <shell:FlatToggleButton DockPanel.Dock="Right" VerticalAlignment="Top" Height="16"
+                                        Icon="{DynamicResource ExpandSectionIcon}"
+                                        ToolTip="Expand this setting group"
+                                        Command="{Binding DataContext.ExpandSettingGroupCommand, RelativeSource={RelativeSource AncestorType=viewmodels:SettingsWindow, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding}"
+                                        IsChecked="{Binding IsExpanded}">
+                </shell:FlatToggleButton>
                 <Label DockPanel.Dock="Top" Style="{DynamicResource FormTitleLabelStyle}" Margin="0" IsEnabled="{Binding IsEnabled}">
                     <TextBlock Text="{Binding Name}" TextWrapping="Wrap" />
                 </Label>
diff --git a/Client/Rubberduck.UI/Styles/DefaultStyle.xaml b/Client/Rubberduck.UI/Styles/DefaultStyle.xaml
index 66c72d45..a8cd5b30 100644
--- a/Client/Rubberduck.UI/Styles/DefaultStyle.xaml
+++ b/Client/Rubberduck.UI/Styles/DefaultStyle.xaml
@@ -502,9 +502,9 @@
 
     <Style x:Key="SectionBorderStyle" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Background" Value="{DynamicResource ThemeBackgroundMediumColorBrush}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource ThemeBackgroundDarkColorBrush}" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Background" Value="{DynamicResource ThemeBackgroundColorBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ThemeAccent1DarkColorBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="8" />
             <Setter Property="Padding" Value="10,10,10,10" />
         </Style.Setters>
diff --git a/Client/Rubberduck.UI/Styles/Icons.xaml b/Client/Rubberduck.UI/Styles/Icons.xaml
index ef03ca0a..821593cf 100644
--- a/Client/Rubberduck.UI/Styles/Icons.xaml
+++ b/Client/Rubberduck.UI/Styles/Icons.xaml
@@ -19,6 +19,8 @@
     <BitmapImage x:Key="CircleCheckIcon" UriSource="pack://application:,,,/Rubberduck.UI;component/Resources/FontAwesome/circle-check-solid.png" />
     <BitmapImage x:Key="CircleWarnIcon" UriSource="pack://application:,,,/Rubberduck.UI;component/Resources/FontAwesome/circle-exclamation-solid.png" />
 
+    <BitmapImage x:Key="ExpandSectionIcon" UriSource="pack://application:,,,/Rubberduck.UI;component/Resources/FontAwesome/arrows-left-right-to-line-solid.png" />
+
     <BitmapImage x:Key="CollapseAllIcon" UriSource="pack://application:,,,/Rubberduck.UI;component/Resources/FontAwesome/square-minus-regular.png" />
     <BitmapImage x:Key="ExpandAllIcon" UriSource="pack://application:,,,/Rubberduck.UI;component/Resources/FontAwesome/square-plus-regular.png" />
 
diff --git a/Shared/Rubberduck.InternalApi/Settings/Model/TelemetryServer/IsTelemetryEnabledSetting.cs b/Shared/Rubberduck.InternalApi/Settings/Model/TelemetryServer/IsTelemetryEnabledSetting.cs
index 4db7923a..9bb0093e 100644
--- a/Shared/Rubberduck.InternalApi/Settings/Model/TelemetryServer/IsTelemetryEnabledSetting.cs
+++ b/Shared/Rubberduck.InternalApi/Settings/Model/TelemetryServer/IsTelemetryEnabledSetting.cs
@@ -5,7 +5,7 @@
 /// </summary>
 public record class IsTelemetryEnabledSetting : BooleanRubberduckSetting
 {
-    public static bool DefaultSettingValue { get; } = true;
+    public static bool DefaultSettingValue { get; } = false;
 
     public IsTelemetryEnabledSetting()
     {