diff --git a/EarTrumpet.Tests/EarTrumpet.Tests.csproj b/EarTrumpet.Tests/EarTrumpet.Tests.csproj
new file mode 100644
index 000000000..8cb2e8ebc
--- /dev/null
+++ b/EarTrumpet.Tests/EarTrumpet.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+        <UseWPF>true</UseWPF>
+        <IsPackable>false</IsPackable>
+        <Platforms>x64</Platforms>
+        <PlatformTarget>x64</PlatformTarget>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <SelfContained>false</SelfContained>
+        <OutputPath>..\Build\Tests\</OutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\EarTrumpet\EarTrumpet.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/EarTrumpet.Tests/LocalizationTests.cs b/EarTrumpet.Tests/LocalizationTests.cs
new file mode 100644
index 000000000..a110cc2d6
--- /dev/null
+++ b/EarTrumpet.Tests/LocalizationTests.cs
@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+using Xunit;
+
+namespace EarTrumpet.Tests;
+
+// Guards the "no hardcoded text" rule for the settings UI: every resource XAML points at must exist,
+// and the strings this redesign introduced must be translated for the two supported languages.
+public class LocalizationTests
+{
+    private static readonly string s_project = FindProjectDir();
+
+    private static string FindProjectDir()
+    {
+        var dir = new DirectoryInfo(AppContext.BaseDirectory);
+        while (dir != null && !File.Exists(Path.Combine(dir.FullName, "EarTrumpet", "EarTrumpet.csproj")))
+        {
+            dir = dir.Parent;
+        }
+        return Path.Combine(dir?.FullName ?? throw new InvalidOperationException("repo root not found"), "EarTrumpet");
+    }
+
+    private static string[] Keys(string resx)
+        => XDocument.Load(Path.Combine(s_project, "Properties", resx)).Root.Elements("data").Select(e => (string)e.Attribute("name")).ToArray();
+
+    private static string[] XamlResourceRefs()
+        => Directory.GetFiles(s_project, "*.xaml", SearchOption.AllDirectories)
+            .Where(f => !f.Contains(Path.DirectorySeparatorChar + "obj" + Path.DirectorySeparatorChar))
+            .SelectMany(f => Regex.Matches(File.ReadAllText(f), @"resx:Resources\.(\w+)").Select(m => m.Groups[1].Value))
+            .Distinct().ToArray();
+
+    [Fact]
+    public void EveryXamlResourceExistsInDefaultResx()
+    {
+        var keys = Keys("Resources.resx");
+        Assert.Empty(XamlResourceRefs().Except(keys));
+    }
+
+    [Fact]
+    public void EveryDesignerPropertyExistsInDefaultResx()
+    {
+        var designer = File.ReadAllText(Path.Combine(s_project, "Properties", "Resources.Designer.cs"));
+        var props = Regex.Matches(designer, @"public static string (\w+) \{").Select(m => m.Groups[1].Value);
+        Assert.Empty(props.Except(Keys("Resources.resx")));
+    }
+
+    [Fact]
+    public void SettingsRedesignStringsAreTranslatedToSpanish()
+    {
+        var es = Keys("Resources.es-ES.resx");
+        var redesign = Keys("Resources.resx").Where(k =>
+            k == "GeneralSettingsPageText" || k.StartsWith("SettingsSection") ||
+            (k.StartsWith("Settings") && (k.EndsWith("Description") || k.Contains("Volume") || k.Contains("Snap") ||
+                                          k.Contains("ScrollWheel") || k.Contains("Translucent") || k.Contains("Legacy")))).ToArray();
+        Assert.NotEmpty(redesign);
+        Assert.Empty(redesign.Except(es));
+    }
+}
diff --git a/EarTrumpet.Tests/VolumeMathTests.cs b/EarTrumpet.Tests/VolumeMathTests.cs
new file mode 100644
index 000000000..c9c3496e5
--- /dev/null
+++ b/EarTrumpet.Tests/VolumeMathTests.cs
@@ -0,0 +1,68 @@
+using EarTrumpet.DataModel;
+using EarTrumpet.Extensions;
+using EarTrumpet.UI.Helpers;
+using Xunit;
+
+namespace EarTrumpet.Tests;
+
+public class VolumeMathTests
+{
+    [Theory]
+    [InlineData(0, 5, 5)]
+    [InlineData(3, 5, 5)]
+    [InlineData(5, 5, 10)]
+    [InlineData(98, 5, 100)]
+    [InlineData(100, 5, 100)]
+    public void NextSnapPoint_LandsOnGridAboveAndNeverExceeds100(double current, int step, double expected)
+        => Assert.Equal(expected, VolumeStepper.NextSnapPoint(current, step));
+
+    [Theory]
+    [InlineData(100, 5, 95)]
+    [InlineData(7, 5, 5)]
+    [InlineData(5, 5, 0)]
+    [InlineData(2, 5, 0)]
+    [InlineData(0, 5, 0)]
+    public void PreviousSnapPoint_LandsOnGridBelowAndNeverGoesNegative(double current, int step, double expected)
+        => Assert.Equal(expected, VolumeStepper.PreviousSnapPoint(current, step));
+
+    [Theory]
+    [InlineData(12, 5, 10)]
+    [InlineData(13, 5, 15)]
+    [InlineData(99.6, 3, 100)] // 100 stays reachable when it is not on the grid
+    [InlineData(1, 3, 0)]
+    public void NearestSnapPoint_RoundsToGridButKeepsFullVolumeReachable(double current, int step, double expected)
+        => Assert.Equal(expected, VolumeStepper.NearestSnapPoint(current, step));
+
+    [Fact]
+    public void Bound_ClampsBothEnds()
+    {
+        Assert.Equal(0d, (-5d).Bound(0, 1));
+        Assert.Equal(1d, 5d.Bound(0, 1));
+        Assert.Equal(0.5d, 0.5d.Bound(0, 1));
+    }
+
+    [Theory]
+    [InlineData(1.0)]
+    [InlineData(0.5)]
+    [InlineData(0.01)]
+    public void LogarithmicConversion_RoundTrips(double linear)
+        => Assert.Equal(linear, linear.LinearToLog().LogToLinear(), 9);
+
+    [Fact]
+    public void FullVolumeIs0Db()
+        => Assert.Equal(0d, 1d.LinearToLog(), 9);
+
+    [Fact]
+    public void ForceOpaque_DisablesTransparencyRegardlessOfWindows()
+    {
+        try
+        {
+            SystemSettings.ForceOpaque = true;
+            Assert.False(SystemSettings.IsTransparencyEnabled);
+        }
+        finally
+        {
+            SystemSettings.ForceOpaque = false;
+        }
+    }
+}
diff --git a/EarTrumpet.sln b/EarTrumpet.sln
index 873269e34..f4584c5f1 100644
--- a/EarTrumpet.sln
+++ b/EarTrumpet.sln
@@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Chocolatey", "Chocolatey",
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "EarTrumpet.Package", "EarTrumpet.Package\EarTrumpet.Package.wapproj", "{EA5510ED-F014-4587-A505-64C59D5B2627}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarTrumpet.Tests", "EarTrumpet.Tests\EarTrumpet.Tests.csproj", "{BA949B87-C0DF-4986-99CB-30458590F3FF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -83,6 +85,24 @@ Global
 		{EA5510ED-F014-4587-A505-64C59D5B2627}.VSDebug|x86.ActiveCfg = Debug|x86
 		{EA5510ED-F014-4587-A505-64C59D5B2627}.VSDebug|x86.Build.0 = Debug|x86
 		{EA5510ED-F014-4587-A505-64C59D5B2627}.VSDebug|x86.Deploy.0 = Debug|x86
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Debug|ARM64.ActiveCfg = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Debug|ARM64.Build.0 = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Debug|x64.ActiveCfg = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Debug|x64.Build.0 = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Debug|x86.ActiveCfg = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Debug|x86.Build.0 = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Release|ARM64.ActiveCfg = Release|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Release|ARM64.Build.0 = Release|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Release|x64.ActiveCfg = Release|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Release|x64.Build.0 = Release|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Release|x86.ActiveCfg = Release|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.Release|x86.Build.0 = Release|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.VSDebug|ARM64.ActiveCfg = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.VSDebug|ARM64.Build.0 = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.VSDebug|x64.ActiveCfg = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.VSDebug|x64.Build.0 = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.VSDebug|x86.ActiveCfg = Debug|x64
+		{BA949B87-C0DF-4986-99CB-30458590F3FF}.VSDebug|x86.Build.0 = Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/EarTrumpet/Addons/EarTrumpet.Actions/ViewModel/ActionsCategoryViewModel.cs b/EarTrumpet/Addons/EarTrumpet.Actions/ViewModel/ActionsCategoryViewModel.cs
index 358b16c78..f07866a80 100644
--- a/EarTrumpet/Addons/EarTrumpet.Actions/ViewModel/ActionsCategoryViewModel.cs
+++ b/EarTrumpet/Addons/EarTrumpet.Actions/ViewModel/ActionsCategoryViewModel.cs
@@ -40,11 +40,6 @@ public ActionsCategoryViewModel()
             Glyph = "\xE948",
             GlyphFontSize = 15,
         } ];
-
-        if (Pages.Count == 2)
-        {
-            Toolbar[0].Command.Execute(null);
-        }
     }
 
     internal void ReloadSavedPages()
diff --git a/EarTrumpet/App.xaml b/EarTrumpet/App.xaml
index fb57d8fd4..3988fa609 100644
--- a/EarTrumpet/App.xaml
+++ b/EarTrumpet/App.xaml
@@ -588,20 +588,21 @@
                 <Setter Property="ItemContainerTemplateSelector" Value="{StaticResource MenuSelector}" />
                 <Setter Property="Placement" Value="Mouse" />
                 <Setter Property="Grid.IsSharedSizeScope" Value="True" />
-                <Setter Property="MinWidth" Value="311" />
+                <Setter Property="MinWidth" Value="240" />
                 <Setter Property="HasDropShadow" Value="True" />
                 <Setter Property="FontSize" Value="12" />
                 <Setter Property="Theme:Brush.Foreground" Value="Theme={Theme}BaseHigh, HighContrast=MenuText" />
                 <Setter Property="Theme:Brush.Background" Value="Theme={Theme}ChromeMediumLow, HighContrast=Menu" />
-                <Setter Property="Theme:Brush.BorderBrush" Value="Light=LightChromeHigh, Dark=ControlDarkAppButtonTextDisabled/0.9, HighContrast=ControlText" />
+                <Setter Property="Theme:Brush.BorderBrush" Value="Light=#1A000000, Dark=#33FFFFFF, HighContrast=ControlText" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ContextMenu}">
                             <Border x:Name="Border">
-                                <Border Padding="2,8"
+                                <Border Padding="2"
                                         Background="{TemplateBinding Background}"
                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="1">
+                                        BorderThickness="1"
+                                        CornerRadius="8">
                                     <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto">
                                         <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                                     </ScrollViewer>
@@ -611,12 +612,12 @@
                                 <Trigger Property="HasDropShadow" Value="True">
                                     <Setter TargetName="Border" Property="CornerRadius" Value="0" />
                                     <Setter TargetName="Border" Property="Background" Value="Transparent" />
-                                    <Setter TargetName="Border" Property="Padding" Value="0,0,5,5" />
+                                    <Setter TargetName="Border" Property="Padding" Value="0,0,12,12" />
                                     <Setter TargetName="Border" Property="Effect">
                                         <Setter.Value>
-                                            <DropShadowEffect BlurRadius="4"
-                                                              Opacity="0.8"
-                                                              ShadowDepth="2" />
+                                            <DropShadowEffect BlurRadius="12"
+                                                              Opacity="0.35"
+                                                              ShadowDepth="3" />
                                         </Setter.Value>
                                     </Setter>
                                 </Trigger>
@@ -626,7 +627,7 @@
                 </Setter>
             </Style>
             <Style TargetType="{x:Type Separator}">
-                <Setter Property="Margin" Value="8,2,8,2" />
+                <Setter Property="Margin" Value="12,3" />
                 <Setter Property="OverridesDefaultStyle" Value="True" />
                 <Setter Property="Theme:Brush.Foreground" Value="Theme={Theme}BaseMediumLow, HighContrast=ControlText" />
                 <Setter Property="Template">
@@ -647,9 +648,11 @@
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type MenuItem}">
                             <Border x:Name="Border"
-                                    Height="32"
+                                    Height="30"
+                                    Margin="4,1"
                                     Background="Transparent"
-                                    BorderThickness="0">
+                                    BorderThickness="0"
+                                    CornerRadius="4">
                                 <Grid Margin="0,-1,0,0">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="32" SharedSizeGroup="Icon" />
@@ -662,11 +665,19 @@
                                             BorderThickness="1">
                                         <TextBlock x:Name="CheckMark"
                                                    Theme:Brush.Foreground="Theme={Theme}BaseMedium, HighContrast=ControlText"
-                                                   FontFamily="Segoe MDL2 Assets"
+                                                   FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
                                                    SnapsToDevicePixels="False"
                                                    Text="{TemplateBinding Tag}"
                                                    Visibility="Hidden" />
                                     </Border>
+                                    <TextBlock x:Name="IconText"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Theme:Brush.Foreground="Theme={Theme}BaseMedium, HighContrast=ControlText"
+                                               FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
+                                               FontSize="14"
+                                               SnapsToDevicePixels="False"
+                                               Text="{TemplateBinding Icon}" />
                                     <ContentPresenter x:Name="HeaderHost"
                                                       Grid.Column="1"
                                                       Margin="0,0,8,0"
@@ -681,7 +692,7 @@
                                             Visibility="Collapsed">
                                         <TextBlock x:Name="GlyphText"
                                                    Theme:Brush.Foreground="Theme={Theme}BaseMedium, HighContrast=ControlText"
-                                                   FontFamily="Segoe MDL2 Assets"
+                                                   FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
                                                    SnapsToDevicePixels="False"
                                                    Text="&#xE0E3;" />
                                     </Border>
@@ -696,11 +707,17 @@
                                            PopupAnimation="Fade">
 
                                         <Border x:Name="SubmenuBorder"
+                                                Margin="0,0,12,12"
                                                 Theme:Brush.Background="Theme={Theme}ChromeMediumLow, HighContrast=Menu"
-                                                Theme:Brush.BorderBrush="Theme={Theme}ChromeHigh, HighContrast=ControlText"
+                                                Theme:Brush.BorderBrush="Light=#1A000000, Dark=#33FFFFFF, HighContrast=ControlText"
                                                 BorderThickness="1"
+                                                CornerRadius="8"
                                                 SnapsToDevicePixels="True">
-                                            <Border Padding="2,6"
+                                            <Border.Effect>
+                                                <DropShadowEffect BlurRadius="12" Opacity="0.35" ShadowDepth="3" />
+                                            </Border.Effect>
+                                            <Border Padding="4"
+                                                    CornerRadius="7"
                                                     Background="{TemplateBinding Background}"
                                                     BorderBrush="{TemplateBinding BorderBrush}"
                                                     BorderThickness="1">
@@ -740,12 +757,14 @@
                           IsCheckable="{Binding IsChecked}"
                           IsChecked="{Binding IsChecked}"
                           IsEnabled="{Binding IsEnabled}"
+                          Icon="{Binding Icon}"
                           Tag="{Binding Glyph}" />
             </DataTemplate>
             <HierarchicalDataTemplate x:Key="ContextMenuSubItemTemplate" ItemsSource="{Binding Children}">
                 <MenuItem Command="{Binding Command}"
                           Header="{Binding DisplayName}"
                           ItemContainerTemplateSelector="{Binding RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}, Path=ItemContainerTemplateSelector}"
+                          Icon="{Binding Icon}"
                           ItemsSource="{Binding Children}"
                           UsesItemContainerTemplate="True" />
             </HierarchicalDataTemplate>
diff --git a/EarTrumpet/App.xaml.cs b/EarTrumpet/App.xaml.cs
index ee4a2952b..3cf0e9961 100644
--- a/EarTrumpet/App.xaml.cs
+++ b/EarTrumpet/App.xaml.cs
@@ -69,6 +69,15 @@ public static AppSettings Settings
 
     private void OnAppStartup(object sender, StartupEventArgs e)
     {
+        // es-MX, es-AR, ... have no satellite assembly of their own: use the Spanish (Spain) strings instead of English.
+        var ui = System.Globalization.CultureInfo.CurrentUICulture;
+        if (ui.TwoLetterISOLanguageName == "es" && ui.Name != "es-ES")
+        {
+            var spanish = System.Globalization.CultureInfo.GetCultureInfo("es-ES");
+            System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = spanish;
+            Thread.CurrentThread.CurrentUICulture = spanish;
+        }
+
         RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
 
         Exit += (_, __) => IsShuttingDown = true;
@@ -78,6 +87,7 @@ private void OnAppStartup(object sender, StartupEventArgs e)
         PackageName = PackageHelper.GetFamilyName(HasIdentity);
 
         Settings = new AppSettings();
+        DataModel.SystemSettings.ForceOpaque = !Settings.UseTranslucentWindows;
         _errorReporter = new ErrorReporter(Settings);
 
         if (SingleInstanceAppMutex.TakeExclusivity())
@@ -113,7 +123,7 @@ private void ContinueStartup()
         Exit += (_, __) => _trayIcon.IsVisible = false;
         CollectionViewModel.TrayPropertyChanged += () => UpdateTrayTooltip();
 
-        _flyoutViewModel = new FlyoutViewModel(CollectionViewModel, () => _trayIcon.SetFocus(), Settings);
+        _flyoutViewModel = new FlyoutViewModel(CollectionViewModel, ReturnFocusAfterFlyout, Settings);
         FlyoutWindow = new FlyoutWindow(_flyoutViewModel);
         // Initialize the FlyoutWindow last because its Show/Hide cycle will pump messages, causing UI frames
         // to be executed, breaking the assumption that startup is complete.
@@ -145,7 +155,7 @@ private void CompleteStartup()
         _mixerWindow = new WindowHolder(CreateMixerExperience);
         _settingsWindow = new WindowHolder(CreateSettingsExperience);
 
-        Settings.FlyoutHotkeyTyped += () => _flyoutViewModel.OpenFlyout(InputType.Keyboard);
+        Settings.FlyoutHotkeyTyped += OnFlyoutHotkeyTyped;
         Settings.MixerHotkeyTyped += () => _mixerWindow.OpenOrClose();
         Settings.SettingsHotkeyTyped += () => _settingsWindow.OpenOrBringToFront();
         Settings.AbsoluteVolumeUpHotkeyTyped += AbsoluteVolumeIncrement;
@@ -153,7 +163,11 @@ private void CompleteStartup()
         Settings.RegisterHotkeys();
         Settings.UseLogarithmicVolumeChanged += (_, __) => UpdateTrayTooltip();
 
-        _trayIcon.PrimaryInvoke += (_, type) => _flyoutViewModel.OpenFlyout(type);
+        _trayIcon.PrimaryInvoke += (_, type) =>
+        {
+            _windowBeforeHotkey = default;
+            _flyoutViewModel.OpenFlyout(type);
+        };
         _trayIcon.SecondaryInvoke += (_, args) => _trayIcon.ShowContextMenu(GetTrayContextMenuItems(), args.Point);
         _trayIcon.TertiaryInvoke += (_, __) => CollectionViewModel.Default?.ToggleMute.Execute(null);
         _trayIcon.Scrolled += TrayIconScrolled;
@@ -164,6 +178,32 @@ private void CompleteStartup()
         ShowFullMixerWindowIfConfigured();
     }
 
+    // Window that had focus when the flyout hotkey opened the flyout, so closing it can hand focus back (#1751).
+    private HWND _windowBeforeHotkey;
+
+    private void OnFlyoutHotkeyTyped()
+    {
+        if (_flyoutViewModel.State == FlyoutViewState.Hidden)
+        {
+            _windowBeforeHotkey = PInvoke.GetForegroundWindow();
+        }
+        _flyoutViewModel.OpenFlyout(InputType.Keyboard);
+    }
+
+    private void ReturnFocusAfterFlyout()
+    {
+        var previous = _windowBeforeHotkey;
+        _windowBeforeHotkey = default;
+        if (previous != default && PInvoke.IsWindow(previous))
+        {
+            PInvoke.SetForegroundWindow(previous);
+        }
+        else
+        {
+            _trayIcon.SetFocus();
+        }
+    }
+
     private void ShowFullMixerWindowIfConfigured()
     {
         if (Settings.ShowFullMixerWindowOnStartup)
@@ -188,8 +228,11 @@ private void TrayIconScrolled(object _, int wheelDelta)
     {
         if (Settings.UseScrollWheelInTray && (!Settings.UseGlobalMouseWheelHook || _flyoutViewModel.State == FlyoutViewState.Hidden))
         {
-            CollectionViewModel.Default?.IncrementVolume(
-                Math.Sign(wheelDelta) * (Settings.UseLogarithmicVolume ? 0.2f : 2.0f));
+            var device = CollectionViewModel.Default;
+            if (device != null)
+            {
+                device.Volume = (float)VolumeStepper.Step(device.Volume, Math.Sign(wheelDelta));
+            }
         }
     }
 
@@ -324,15 +367,17 @@ private List<ContextMenuItem> GetTrayContextMenuItems()
                 new ContextMenuSeparator(),
                 new ContextMenuItem
                 {
+                    Icon = "\xE7F4",
                     DisplayName = EarTrumpet.Properties.Resources.WindowsLegacyMenuText,
                     Children =
                     [
-                        new() { DisplayName = EarTrumpet.Properties.Resources.LegacyVolumeMixerText, Command =  new RelayCommand(LegacyControlPanelHelper.StartLegacyAudioMixer) },
-                        new() { DisplayName = EarTrumpet.Properties.Resources.PlaybackDevicesText, Command = new RelayCommand(() => LegacyControlPanelHelper.Open("playback")) },
-                        new() { DisplayName = EarTrumpet.Properties.Resources.RecordingDevicesText, Command = new RelayCommand(() => LegacyControlPanelHelper.Open("recording")) },
-                        new() { DisplayName = EarTrumpet.Properties.Resources.SoundsControlPanelText, Command = new RelayCommand(() => LegacyControlPanelHelper.Open("sounds")) },
-                        new() { DisplayName = EarTrumpet.Properties.Resources.OpenSoundSettingsText, Command = new RelayCommand(() => SettingsPageHelper.Open("sound")) },
+                        new() { Icon = "\xE767", DisplayName = EarTrumpet.Properties.Resources.LegacyVolumeMixerText, Command =  new RelayCommand(LegacyControlPanelHelper.StartLegacyAudioMixer) },
+                        new() { Icon = "\xE7F5", DisplayName = EarTrumpet.Properties.Resources.PlaybackDevicesText, Command = new RelayCommand(() => LegacyControlPanelHelper.Open("playback")) },
+                        new() { Icon = "\xE720", DisplayName = EarTrumpet.Properties.Resources.RecordingDevicesText, Command = new RelayCommand(() => LegacyControlPanelHelper.Open("recording")) },
+                        new() { Icon = "\xE8D6", DisplayName = EarTrumpet.Properties.Resources.SoundsControlPanelText, Command = new RelayCommand(() => LegacyControlPanelHelper.Open("sounds")) },
+                        new() { Icon = "\xE713", DisplayName = EarTrumpet.Properties.Resources.OpenSoundSettingsText, Command = new RelayCommand(() => SettingsPageHelper.Open("sound")) },
                         new() {
+                            Icon = "\xE9E9",
                             DisplayName = Environment.OSVersion.IsAtLeast(OSVersions.Windows11) ?
                                 EarTrumpet.Properties.Resources.OpenAppsVolume_Windows11_Text
                                 : EarTrumpet.Properties.Resources.OpenAppsVolume_Windows10_Text, Command = new RelayCommand(() => SettingsPageHelper.Open("apps-volume")) },
@@ -350,9 +395,9 @@ private List<ContextMenuItem> GetTrayContextMenuItems()
 
         ret.AddRange(
             [
-                new() { DisplayName = EarTrumpet.Properties.Resources.FullWindowTitleText, Command = new RelayCommand(_mixerWindow.OpenOrBringToFront) },
-                new() { DisplayName = EarTrumpet.Properties.Resources.SettingsWindowText, Command = new RelayCommand(_settingsWindow.OpenOrBringToFront) },
-                new() { DisplayName = EarTrumpet.Properties.Resources.ContextMenuExitTitle, Command = new RelayCommand(Shutdown) },
+                new() { Icon = "\xE9E9", DisplayName = EarTrumpet.Properties.Resources.FullWindowTitleText, Command = new RelayCommand(_mixerWindow.OpenOrBringToFront) },
+                new() { Icon = "\xE713", DisplayName = EarTrumpet.Properties.Resources.SettingsWindowText, Command = new RelayCommand(_settingsWindow.OpenOrBringToFront) },
+                new() { Icon = "\xE7E8", DisplayName = EarTrumpet.Properties.Resources.ContextMenuExitTitle, Command = new RelayCommand(Shutdown) },
             ]);
         return ret;
     }
@@ -365,10 +410,8 @@ private Window CreateSettingsExperience()
             EarTrumpet.Properties.Resources.SettingsDescriptionText,
             null,
             [
-                new EarTrumpetShortcutsPageViewModel(Settings),
-                new EarTrumpetMouseSettingsPageViewModel(Settings),
                 new EarTrumpetCommunitySettingsPageViewModel(Settings),
-                new EarTrumpetLegacySettingsPageViewModel(Settings),
+                new EarTrumpetShortcutsPageViewModel(Settings),
                 new EarTrumpetAboutPageViewModel(_errorReporter.DisplayDiagnosticData, Settings)
             ]);
 
@@ -411,7 +454,7 @@ private void AbsoluteVolumeIncrement()
         foreach (var device in CollectionViewModel.AllDevices.Where(d => !d.IsMuted || d.IsAbsMuted))
         {
             device.IsAbsMuted = false;
-            device.IncrementVolume(2);
+            device.Volume = (float)VolumeStepper.Step(device.Volume, 1, VolumeStepper.LogarithmicHotkeyStep);
         }
     }
 
@@ -420,7 +463,7 @@ private void AbsoluteVolumeDecrement()
         foreach (var device in CollectionViewModel.AllDevices.Where(d => !d.IsMuted))
         {
             var wasMuted = device.IsMuted;
-            device.Volume -= 2;
+            device.Volume = (float)VolumeStepper.Step(device.Volume, -1, VolumeStepper.LogarithmicHotkeyStep);
 
             if (!wasMuted == (device.Volume <= 0))
             {
diff --git a/EarTrumpet/AppSettings.cs b/EarTrumpet/AppSettings.cs
index 310cad2d5..592c484f3 100644
--- a/EarTrumpet/AppSettings.cs
+++ b/EarTrumpet/AppSettings.cs
@@ -146,6 +146,18 @@ public bool UseGlobalMouseWheelHook
         set => _settings.Set("UseGlobalMouseWheelHook", value);
     }
 
+    public bool UseScrollWheelInSliders
+    {
+        get => _settings.Get("UseScrollWheelInSliders", true);
+        set => _settings.Set("UseScrollWheelInSliders", value);
+    }
+
+    public bool UseTranslucentWindows
+    {
+        get => _settings.Get("UseTranslucentWindows", true);
+        set => _settings.Set("UseTranslucentWindows", value);
+    }
+
     public bool HasShownFirstRun
     {
         get => _settings.HasKey("hasShownFirstRun");
@@ -178,6 +190,28 @@ public float LogarithmicVolumeMinDb
         }
     }
 
+    public int VolumeStepAmount
+    {
+        // Clamped on the way out as well as in: a value written directly to the registry
+        // would otherwise reach the step maths, where zero divides.
+        get => BoundVolumeStep(_settings.Get("VolumeStepAmount", 2));
+        set => _settings.Set("VolumeStepAmount", BoundVolumeStep(value));
+    }
+
+    private static int BoundVolumeStep(int value) => Math.Max(1, Math.Min(50, value));
+
+    public bool UseRangeSnapping
+    {
+        get => _settings.Get("UseRangeSnapping", true);
+        set => _settings.Set("UseRangeSnapping", value);
+    }
+
+    public bool UseSliderSnap
+    {
+        get => _settings.Get("UseSliderSnap", false);
+        set => _settings.Set("UseSliderSnap", value);
+    }
+
     public WINDOWPLACEMENT? FullMixerWindowPlacement
     {
         get => _settings.Get("FullMixerWindowPlacement", default(WINDOWPLACEMENT?));
diff --git a/EarTrumpet/DataModel/Audio/Mocks/AudioDevice.cs b/EarTrumpet/DataModel/Audio/Mocks/AudioDevice.cs
index 18b218e99..35cc5fd9f 100644
--- a/EarTrumpet/DataModel/Audio/Mocks/AudioDevice.cs
+++ b/EarTrumpet/DataModel/Audio/Mocks/AudioDevice.cs
@@ -1,5 +1,6 @@
 using EarTrumpet.DataModel.WindowsAudio;
 using EarTrumpet.DataModel.WindowsAudio.Internal;
+using EarTrumpet.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -52,6 +53,11 @@ public float Volume
         }
     }
 
+    public float GetVolumeScalar() => _volume;
+    public float GetVolumeLogarithmic() => _volume.LinearToLog();
+    public void SetVolumeScalar(float value) => Volume = value.Bound(0, 1f);
+    public void SetVolumeLogarithmic(float value) => Volume = value.LogToLinear().Bound(0, 1f);
+
     public float PeakValue1 { get; set; }
     public float PeakValue2 { get; set; }
     public IEnumerable<IAudioDeviceChannel> Channels { get; } = new List<IAudioDeviceChannel>();
diff --git a/EarTrumpet/DataModel/Audio/Mocks/AudioDeviceSession.cs b/EarTrumpet/DataModel/Audio/Mocks/AudioDeviceSession.cs
index 8b32c54a2..797640d98 100644
--- a/EarTrumpet/DataModel/Audio/Mocks/AudioDeviceSession.cs
+++ b/EarTrumpet/DataModel/Audio/Mocks/AudioDeviceSession.cs
@@ -67,6 +67,21 @@ public float Volume
         }
     }
 
+    public float GetVolumeScalar() => _volume;
+    public float GetVolumeLogarithmic() => _volume.LinearToLog();
+    public void SetVolumeScalar(float value) => SetVolumeInternal(value.Bound(0, 1f));
+    public void SetVolumeLogarithmic(float value) => SetVolumeInternal(value.LogToLinear().Bound(0, 1f));
+
+    // Bypasses the Volume setter, which converts to log when UseLogarithmicVolume is on.
+    private void SetVolumeInternal(float value)
+    {
+        if (_volume != value)
+        {
+            _volume = value;
+            RaisePropertyChanged(nameof(Volume));
+        }
+    }
+
     public float PeakValue1 { get; set; }
 
     public float PeakValue2 { get; set; }
diff --git a/EarTrumpet/DataModel/SystemSettings.cs b/EarTrumpet/DataModel/SystemSettings.cs
index b7a6805c8..f0ee815d2 100644
--- a/EarTrumpet/DataModel/SystemSettings.cs
+++ b/EarTrumpet/DataModel/SystemSettings.cs
@@ -9,7 +9,9 @@ public static class SystemSettings
 {
     private static readonly string s_PersonalizeKey = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
 
-    public static bool IsTransparencyEnabled => ReadDword(s_PersonalizeKey, "EnableTransparency");
+    // App-level override (Settings > Appearance > Translucent windows); Windows' own setting still applies on top.
+    public static bool ForceOpaque { get; set; }
+    public static bool IsTransparencyEnabled => !ForceOpaque && ReadDword(s_PersonalizeKey, "EnableTransparency");
     public static bool UseAccentColor => ReadDword(s_PersonalizeKey, "ColorPrevalence");
     public static bool IsLightTheme => ReadDword(s_PersonalizeKey, "AppsUseLightTheme", 1);
     public static bool IsSystemLightTheme => LightThemeShim(ReadDword(s_PersonalizeKey, "SystemUsesLightTheme"));
diff --git a/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSession.cs b/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSession.cs
index 7cb30623a..183572714 100644
--- a/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSession.cs
+++ b/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSession.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
@@ -359,6 +360,14 @@ private void SyncPersistedEndpoint(IAudioDevice parent)
         {
             if (parent.Id != persistedDeviceId)
             {
+                // SetDefaultEndPoint ignores devices we do not know (disabled, unplugged, or not enumerated yet at
+                // startup). Hiding the session anyway would leave the app listed on no device at all, so stay put.
+                if (!Parent.Parent.Devices.Any(d => d.Id == persistedDeviceId))
+                {
+                    Trace.WriteLine($"FORCE-MOVE skipped, persisted device unavailable: {persistedDeviceId}");
+                    return;
+                }
+
                 Trace.WriteLine($"FORCE-MOVE: {_state} {parent.Id} -> {persistedDeviceId}");
 
                 MoveToDevice(persistedDeviceId, false);
diff --git a/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSessionCollection.cs b/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSessionCollection.cs
index 9fcf41d46..358adefaf 100644
--- a/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSessionCollection.cs
+++ b/EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSessionCollection.cs
@@ -20,18 +20,29 @@ internal class AudioDeviceSessionCollection : IAudioSessionNotification
     private readonly List<IAudioDeviceSession> _movedSessions = [];
     private IAudioSessionManager2 _sessionManager;
     private WeakReference<IAudioDevice> _parent;
+    private DispatcherTimer _retryTimer;
+    private int _retriesLeft = 5;
 
     public AudioDeviceSessionCollection(IAudioDevice parent, IMMDevice device, Dispatcher foregroundDispatcher)
     {
         _parent = new WeakReference<IAudioDevice>(parent);
         _dispatcher = foregroundDispatcher;
 
+        if (!TryInitialize(device))
+        {
+            ScheduleRetry(device);
+        }
+    }
+
+    private bool TryInitialize(IMMDevice device)
+    {
         try
         {
-            _sessionManager = device.Activate<IAudioSessionManager2>();
-            _sessionManager.RegisterSessionNotification(this);
-            
-            var enumerator = _sessionManager.GetSessionEnumerator();
+            var sessionManager = device.Activate<IAudioSessionManager2>();
+            sessionManager.RegisterSessionNotification(this);
+            _sessionManager = sessionManager;
+
+            var enumerator = sessionManager.GetSessionEnumerator();
             enumerator.GetCount(out var count);
 
             for (var i = 0; i < count; i++)
@@ -39,27 +50,57 @@ public AudioDeviceSessionCollection(IAudioDevice parent, IMMDevice device, Dispa
                 enumerator.GetSession(i, out var session);
                 CreateAndAddSession(session);
             }
+            return true;
         }
         catch (Exception ex)
         {
             device.GetId(out var deviceId);
             Trace.WriteLine($"AudioDeviceSessionCollection Create dev={deviceId} {ex}");
+            // Registered but could not enumerate: new sessions still arrive via notifications, do not register twice.
+            return _sessionManager != null;
         }
     }
 
+    // When EarTrumpet starts with Windows the audio service may not be ready yet; without a retry this device would
+    // stay empty until the app is restarted.
+    private void ScheduleRetry(IMMDevice device)
+    {
+        _dispatcher.BeginInvoke((Action)(() =>
+        {
+            _retryTimer = new DispatcherTimer(DispatcherPriority.Background, _dispatcher) { Interval = TimeSpan.FromSeconds(2) };
+            _retryTimer.Tick += (_, __) =>
+            {
+                if (TryInitialize(device) || --_retriesLeft <= 0)
+                {
+                    _retryTimer.Stop();
+                }
+            };
+            _retryTimer.Start();
+        }));
+    }
+
     ~AudioDeviceSessionCollection()
     {
-        foreach (var session in _sessions)
+        // An exception escaping a finalizer terminates the process, and the device may already be invalidated or
+        // activation may have failed (_sessionManager null).
+        try
         {
-            session.PropertyChanged -= Session_PropertyChanged;
-        }
+            foreach (var session in _sessions)
+            {
+                session.PropertyChanged -= Session_PropertyChanged;
+            }
 
-        foreach (var session in _movedSessions)
+            foreach (var session in _movedSessions)
+            {
+                session.PropertyChanged -= MovedSession_PropertyChanged;
+            }
+
+            _sessionManager?.UnregisterSessionNotification(this);
+        }
+        catch (Exception ex)
         {
-            session.PropertyChanged -= MovedSession_PropertyChanged;
+            Trace.WriteLine($"AudioDeviceSessionCollection dtor Failed: {ex}");
         }
-
-        _sessionManager.UnregisterSessionNotification(this);
     }
 
     private void CreateAndAddSession(IAudioSessionControl session)
diff --git a/EarTrumpet/DebugHelpers.cs b/EarTrumpet/DebugHelpers.cs
index 070d08a13..f93190ba7 100644
--- a/EarTrumpet/DebugHelpers.cs
+++ b/EarTrumpet/DebugHelpers.cs
@@ -25,26 +25,26 @@ public IEnumerable<ContextMenuItem> NotificationAreaContextMenuItems
                 return new List<ContextMenuItem>
                     {
                         new() {
-                            DisplayName = "Developer options",
+                            Icon = "\xE943",
+                            DisplayName = Properties.Resources.DeveloperOptionsMenuText,
                             Children = new List<ContextMenuItem>
                             {
                                 new() {
-                                    DisplayName = "Remove all devices",
+                                    DisplayName = Properties.Resources.DeveloperRemoveAllDevicesText,
                                     Command = new RelayCommand(DebugRemoveAllDevices),
                                     Glyph = "\xE894",
                                     IsChecked = true,
                                 },
                                 new() {
-                                    DisplayName = "Add mock device",
+                                    DisplayName = Properties.Resources.DeveloperAddMockDeviceText,
                                     Command = new RelayCommand(DebugAddMockDevice),
                                     Glyph = "\xE948",
                                     IsChecked = true,
                                 },
-                                new ContextMenuSeparator(),
                                 new() {
-                                    DisplayName = "View colors",
-                                    Command = new RelayCommand(() => ProcessHelper.StartNoThrow("EarTrumpet.ColorTool.exe")),
-                                    Glyph = "\xE790",
+                                    DisplayName = Properties.Resources.DeveloperRestoreRealDevicesText,
+                                    Command = new RelayCommand(() => WindowsAudioFactory.Create(AudioDeviceKind.Playback).RefreshAllDevices()),
+                                    Glyph = "\xE72C",
                                     IsChecked = true,
                                 },
                             },
@@ -119,7 +119,7 @@ private static void DebugAddMockDevice()
         AddMockApp(mockDevice,
             "Chr0me",
             "Chr0me",
-            @"%ProgramFilesx86%\Google\Chrome\Application\chrome.exe");
+            @"%ProgramFiles(x86)%\Google\Chrome\Application\chrome.exe");
 
         var addInfo = devManager.GetType().GetMethod("Add", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
         addInfo.Invoke(devManager, [mockDevice]);
diff --git a/EarTrumpet/NativeMethods.txt b/EarTrumpet/NativeMethods.txt
index 71062eb53..c2c2fcf5e 100644
--- a/EarTrumpet/NativeMethods.txt
+++ b/EarTrumpet/NativeMethods.txt
@@ -35,6 +35,7 @@ GetDpiForShellUIComponent
 GetDpiForSystem
 GetDpiForWindow
 GetForegroundWindow
+IsWindow
 GetGuiResources
 GetPackageApplicationIds
 GetPackageId
diff --git a/EarTrumpet/Properties/Resources.Designer.cs b/EarTrumpet/Properties/Resources.Designer.cs
index e3aef0abd..3612964b6 100644
--- a/EarTrumpet/Properties/Resources.Designer.cs
+++ b/EarTrumpet/Properties/Resources.Designer.cs
@@ -1486,6 +1486,15 @@ public static string SettingsUseLogarithmicVolume {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Use the scroll wheel to change volume while hovering over the EarTrumpet volume slider.
+        /// </summary>
+        public static string SettingsUseScrollWheelInSliders {
+            get {
+                return ResourceManager.GetString("SettingsUseScrollWheelInSliders", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Use the scroll wheel to change volume while hovering over the EarTrumpet icon.
         /// </summary>
@@ -1755,5 +1764,221 @@ public static string WindowsLegacyMenuText {
                 return ResourceManager.GetString("WindowsLegacyMenuText", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Volume step amount.
+        /// </summary>
+        public static string SettingsVolumeStepAmount {
+            get {
+                return ResourceManager.GetString("SettingsVolumeStepAmount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Snap scroll wheel to volume step grid.
+        /// </summary>
+        public static string SettingsUseRangeSnapping {
+            get {
+                return ResourceManager.GetString("SettingsUseRangeSnapping", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Snap slider to volume steps when dragging.
+        /// </summary>
+        public static string SettingsUseSliderSnap {
+            get {
+                return ResourceManager.GetString("SettingsUseSliderSnap", resourceCulture);
+            }
+        }
+        /// <summary>
+        ///   Looks up a localized string similar to General.
+        /// </summary>
+        public static string GeneralSettingsPageText {
+            get {
+                return ResourceManager.GetString("GeneralSettingsPageText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Volume.
+        /// </summary>
+        public static string SettingsSectionVolume {
+            get {
+                return ResourceManager.GetString("SettingsSectionVolume", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mouse.
+        /// </summary>
+        public static string SettingsSectionMouse {
+            get {
+                return ResourceManager.GetString("SettingsSectionMouse", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Appearance.
+        /// </summary>
+        public static string SettingsSectionAppearance {
+            get {
+                return ResourceManager.GetString("SettingsSectionAppearance", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Startup.
+        /// </summary>
+        public static string SettingsSectionStartup {
+            get {
+                return ResourceManager.GetString("SettingsSectionStartup", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Match how loudness is perceived instead of a linear 0-100 scale.
+        /// </summary>
+        public static string SettingsUseLogarithmicVolumeDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseLogarithmicVolumeDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Quietest level shown on the logarithmic scale.
+        /// </summary>
+        public static string SettingsLogarithmicScaleMinimumDescription {
+            get {
+                return ResourceManager.GetString("SettingsLogarithmicScaleMinimumDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to How much the volume changes per scroll or key press.
+        /// </summary>
+        public static string SettingsVolumeStepAmountDescription {
+            get {
+                return ResourceManager.GetString("SettingsVolumeStepAmountDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scrolling lands on the step grid instead of offsetting from the current value.
+        /// </summary>
+        public static string SettingsUseRangeSnappingDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseRangeSnappingDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Sliders jump between steps while dragging.
+        /// </summary>
+        public static string SettingsUseSliderSnapDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseSliderSnapDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scroll over the tray icon to change the default device volume.
+        /// </summary>
+        public static string SettingsUseScrollWheelInTrayDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseScrollWheelInTrayDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scroll anywhere on screen to change volume while the flyout is open.
+        /// </summary>
+        public static string SettingsUseGlobalMouseWheelHookDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseGlobalMouseWheelHookDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scroll over a slider in the flyout or mixer to change its volume.
+        /// </summary>
+        public static string SettingsUseScrollWheelInSlidersDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseScrollWheelInSlidersDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show the original EarTrumpet tray icon.
+        /// </summary>
+        public static string SettingsUseLegacyEarTrumpetIconDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseLegacyEarTrumpetIconDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open the full mixer window every time EarTrumpet starts.
+        /// </summary>
+        public static string SettingsShowFullMixerWindowOnStartupDescription {
+            get {
+                return ResourceManager.GetString("SettingsShowFullMixerWindowOnStartupDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Translucent windows.
+        /// </summary>
+        public static string SettingsUseTranslucentWindows {
+            get {
+                return ResourceManager.GetString("SettingsUseTranslucentWindows", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Blur the background of the flyout and settings. Turn off for solid windows. Also requires Windows transparency effects.
+        /// </summary>
+        public static string SettingsUseTranslucentWindowsDescription {
+            get {
+                return ResourceManager.GetString("SettingsUseTranslucentWindowsDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Developer options.
+        /// </summary>
+        public static string DeveloperOptionsMenuText {
+            get {
+                return ResourceManager.GetString("DeveloperOptionsMenuText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remove all devices.
+        /// </summary>
+        public static string DeveloperRemoveAllDevicesText {
+            get {
+                return ResourceManager.GetString("DeveloperRemoveAllDevicesText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add mock device.
+        /// </summary>
+        public static string DeveloperAddMockDeviceText {
+            get {
+                return ResourceManager.GetString("DeveloperAddMockDeviceText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Restore real devices.
+        /// </summary>
+        public static string DeveloperRestoreRealDevicesText {
+            get {
+                return ResourceManager.GetString("DeveloperRestoreRealDevicesText", resourceCulture);
+            }
+        }
+        
     }
 }
diff --git a/EarTrumpet/Properties/Resources.es-ES.resx b/EarTrumpet/Properties/Resources.es-ES.resx
index 23381128c..c52ccc215 100644
--- a/EarTrumpet/Properties/Resources.es-ES.resx
+++ b/EarTrumpet/Properties/Resources.es-ES.resx
@@ -676,4 +676,82 @@ Deseas abrir [https://eartrumpet.app/jmp/fixfonts] ahora?</value>
   <data name="SettingsShowFullMixerWindowOnStartup" xml:space="preserve">
     <value>Mostrar la ventana completa del mezclador al iniciar</value>
   </data>
+  <data name="GeneralSettingsPageText" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="SettingsSectionVolume" xml:space="preserve">
+    <value>Volumen</value>
+  </data>
+  <data name="SettingsSectionMouse" xml:space="preserve">
+    <value>Ratón</value>
+  </data>
+  <data name="SettingsSectionAppearance" xml:space="preserve">
+    <value>Apariencia</value>
+  </data>
+  <data name="SettingsSectionStartup" xml:space="preserve">
+    <value>Inicio</value>
+  </data>
+  <data name="SettingsUseScrollWheelInSliders" xml:space="preserve">
+    <value>Usar la rueda del ratón para cambiar el volumen sobre un control deslizante</value>
+  </data>
+  <data name="SettingsVolumeStepAmount" xml:space="preserve">
+    <value>Tamaño del paso de volumen</value>
+  </data>
+  <data name="SettingsUseRangeSnapping" xml:space="preserve">
+    <value>Ajustar la rueda a la cuadrícula del paso de volumen</value>
+  </data>
+  <data name="SettingsUseSliderSnap" xml:space="preserve">
+    <value>Ajustar el control deslizante a los pasos al arrastrar</value>
+  </data>
+  <data name="SettingsLogarithmicScaleMinimum" xml:space="preserve">
+    <value>Mínimo de la escala logarítmica</value>
+  </data>
+  <data name="SettingsUseLogarithmicVolumeDescription" xml:space="preserve">
+    <value>Se ajusta a cómo percibimos el volumen en lugar de una escala lineal de 0 a 100</value>
+  </data>
+  <data name="SettingsLogarithmicScaleMinimumDescription" xml:space="preserve">
+    <value>Nivel más bajo que muestra la escala logarítmica</value>
+  </data>
+  <data name="SettingsVolumeStepAmountDescription" xml:space="preserve">
+    <value>Cuánto cambia el volumen con cada desplazamiento o pulsación de tecla</value>
+  </data>
+  <data name="SettingsUseRangeSnappingDescription" xml:space="preserve">
+    <value>La rueda salta a la cuadrícula de pasos en lugar de sumar al valor actual</value>
+  </data>
+  <data name="SettingsUseSliderSnapDescription" xml:space="preserve">
+    <value>Los controles deslizantes saltan entre pasos al arrastrar</value>
+  </data>
+  <data name="SettingsUseScrollWheelInTrayDescription" xml:space="preserve">
+    <value>Desplaza sobre el icono de la bandeja para cambiar el volumen del dispositivo predeterminado</value>
+  </data>
+  <data name="SettingsUseGlobalMouseWheelHookDescription" xml:space="preserve">
+    <value>Desplaza en cualquier parte de la pantalla para cambiar el volumen mientras el control flotante está abierto</value>
+  </data>
+  <data name="SettingsUseScrollWheelInSlidersDescription" xml:space="preserve">
+    <value>Desplaza sobre un control deslizante del control flotante o del mezclador para cambiar su volumen</value>
+  </data>
+  <data name="SettingsUseLegacyEarTrumpetIconDescription" xml:space="preserve">
+    <value>Muestra el icono original de EarTrumpet en la bandeja</value>
+  </data>
+  <data name="SettingsShowFullMixerWindowOnStartupDescription" xml:space="preserve">
+    <value>Abre la ventana completa del mezclador cada vez que se inicia EarTrumpet</value>
+  </data>
+  <data name="SettingsUseTranslucentWindows" xml:space="preserve">
+    <value>Ventanas translúcidas</value>
+  </data>
+  <data name="SettingsUseTranslucentWindowsDescription" xml:space="preserve">
+    <value>Difumina el fondo del control flotante y de los ajustes. Desactívalo para ventanas sólidas. También requiere los efectos de transparencia de Windows</value>
+  </data>
+  <data name="DeveloperOptionsMenuText" xml:space="preserve">
+    <value>Opciones de desarrollador</value>
+  </data>
+  <data name="DeveloperRemoveAllDevicesText" xml:space="preserve">
+    <value>Quitar todos los dispositivos</value>
+  </data>
+  <data name="DeveloperAddMockDeviceText" xml:space="preserve">
+    <value>Añadir dispositivo de prueba</value>
+  </data>
+  <data name="DeveloperRestoreRealDevicesText" xml:space="preserve">
+    <value>Restaurar dispositivos reales</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EarTrumpet/Properties/Resources.resx b/EarTrumpet/Properties/Resources.resx
index 97f1fb8d9..cfe1d1a15 100644
--- a/EarTrumpet/Properties/Resources.resx
+++ b/EarTrumpet/Properties/Resources.resx
@@ -664,6 +664,9 @@ Open [https://eartrumpet.app/jmp/fixstartup] to resolve this?</value>
   <data name="SettingsUseScrollWheelInTray" xml:space="preserve">
     <value>Use the scroll wheel to change volume while hovering over the EarTrumpet icon</value>
   </data>
+  <data name="SettingsUseScrollWheelInSliders" xml:space="preserve">
+    <value>Use the scroll wheel to change volume while hovering over a volume slider</value>
+  </data>
   <data name="SettingsUseGlobalMouseWheelHook" xml:space="preserve">
     <value>Use the scroll wheel to change volume while the flyout is open</value>
   </data>
@@ -685,4 +688,76 @@ Open [https://eartrumpet.app/jmp/fixstartup] to resolve this?</value>
   <data name="VolumeUnit_Decibel" xml:space="preserve">
     <value>dB</value>
   </data>
+  <data name="SettingsVolumeStepAmount" xml:space="preserve">
+    <value>Volume step amount</value>
+  </data>
+  <data name="SettingsUseRangeSnapping" xml:space="preserve">
+    <value>Snap scroll wheel to volume step grid</value>
+  </data>
+  <data name="SettingsUseSliderSnap" xml:space="preserve">
+    <value>Snap slider to volume steps when dragging</value>
+  </data>
+  <data name="GeneralSettingsPageText" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="SettingsSectionVolume" xml:space="preserve">
+    <value>Volume</value>
+  </data>
+  <data name="SettingsSectionMouse" xml:space="preserve">
+    <value>Mouse</value>
+  </data>
+  <data name="SettingsSectionAppearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="SettingsSectionStartup" xml:space="preserve">
+    <value>Startup</value>
+  </data>
+  <data name="SettingsUseLogarithmicVolumeDescription" xml:space="preserve">
+    <value>Match how loudness is perceived instead of a linear 0-100 scale</value>
+  </data>
+  <data name="SettingsLogarithmicScaleMinimumDescription" xml:space="preserve">
+    <value>Quietest level shown on the logarithmic scale</value>
+  </data>
+  <data name="SettingsVolumeStepAmountDescription" xml:space="preserve">
+    <value>How much the volume changes per scroll or key press</value>
+  </data>
+  <data name="SettingsUseRangeSnappingDescription" xml:space="preserve">
+    <value>Scrolling lands on the step grid instead of offsetting from the current value</value>
+  </data>
+  <data name="SettingsUseSliderSnapDescription" xml:space="preserve">
+    <value>Sliders jump between steps while dragging</value>
+  </data>
+  <data name="SettingsUseScrollWheelInTrayDescription" xml:space="preserve">
+    <value>Scroll over the tray icon to change the default device volume</value>
+  </data>
+  <data name="SettingsUseGlobalMouseWheelHookDescription" xml:space="preserve">
+    <value>Scroll anywhere on screen to change volume while the flyout is open</value>
+  </data>
+  <data name="SettingsUseScrollWheelInSlidersDescription" xml:space="preserve">
+    <value>Scroll over a slider in the flyout or mixer to change its volume</value>
+  </data>
+  <data name="SettingsUseLegacyEarTrumpetIconDescription" xml:space="preserve">
+    <value>Show the original EarTrumpet tray icon</value>
+  </data>
+  <data name="SettingsShowFullMixerWindowOnStartupDescription" xml:space="preserve">
+    <value>Open the full mixer window every time EarTrumpet starts</value>
+  </data>
+  <data name="SettingsUseTranslucentWindows" xml:space="preserve">
+    <value>Translucent windows</value>
+  </data>
+  <data name="SettingsUseTranslucentWindowsDescription" xml:space="preserve">
+    <value>Blur the background of the flyout and settings. Turn off for solid windows. Also requires Windows transparency effects</value>
+  </data>
+  <data name="DeveloperOptionsMenuText" xml:space="preserve">
+    <value>Developer options</value>
+  </data>
+  <data name="DeveloperRemoveAllDevicesText" xml:space="preserve">
+    <value>Remove all devices</value>
+  </data>
+  <data name="DeveloperAddMockDeviceText" xml:space="preserve">
+    <value>Add mock device</value>
+  </data>
+  <data name="DeveloperRestoreRealDevicesText" xml:space="preserve">
+    <value>Restore real devices</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EarTrumpet/UI/Controls/SettingsCard.cs b/EarTrumpet/UI/Controls/SettingsCard.cs
new file mode 100644
index 000000000..6b13cb41f
--- /dev/null
+++ b/EarTrumpet/UI/Controls/SettingsCard.cs
@@ -0,0 +1,76 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace EarTrumpet.UI.Controls;
+
+// Windows 11 style settings row: [glyph] title + description on the left, the control (Content) on the right.
+// With a Command it behaves as a link row: clickable, focusable, with a chevron.
+public class SettingsCard : ContentControl
+{
+    public static readonly DependencyProperty HeaderProperty =
+        DependencyProperty.Register(nameof(Header), typeof(string), typeof(SettingsCard));
+    public static readonly DependencyProperty DescriptionProperty =
+        DependencyProperty.Register(nameof(Description), typeof(string), typeof(SettingsCard));
+    public static readonly DependencyProperty GlyphProperty =
+        DependencyProperty.Register(nameof(Glyph), typeof(string), typeof(SettingsCard));
+    public static readonly DependencyProperty CommandProperty =
+        DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(SettingsCard), new PropertyMetadata(null, OnCommandChanged));
+
+    public string Header
+    {
+        get => (string)GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
+    }
+
+    public string Description
+    {
+        get => (string)GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
+    }
+
+    public string Glyph
+    {
+        get => (string)GetValue(GlyphProperty);
+        set => SetValue(GlyphProperty, value);
+    }
+
+    public ICommand Command
+    {
+        get => (ICommand)GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var card = (SettingsCard)d;
+        var clickable = e.NewValue != null;
+        card.Cursor = clickable ? Cursors.Hand : null;
+        card.Focusable = clickable;
+        card.IsTabStop = clickable;
+    }
+
+    protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonUp(e);
+        Invoke();
+    }
+
+    protected override void OnKeyDown(KeyEventArgs e)
+    {
+        base.OnKeyDown(e);
+        if (e.Key == Key.Enter || e.Key == Key.Space)
+        {
+            Invoke();
+            e.Handled = true;
+        }
+    }
+
+    private void Invoke()
+    {
+        if (Command?.CanExecute(null) == true)
+        {
+            Command.Execute(null);
+        }
+    }
+}
diff --git a/EarTrumpet/UI/Controls/VolumeSlider.cs b/EarTrumpet/UI/Controls/VolumeSlider.cs
index 2f5cf5efc..f93683f65 100644
--- a/EarTrumpet/UI/Controls/VolumeSlider.cs
+++ b/EarTrumpet/UI/Controls/VolumeSlider.cs
@@ -1,4 +1,5 @@
-using System;
+using EarTrumpet.UI.Helpers;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -202,17 +203,37 @@ private void OnMouseMove(object sender, MouseEventArgs e)
 
     private void OnMouseWheel(object sender, MouseWheelEventArgs e)
     {
-        var amount = Math.Sign(e.Delta) * (App.Settings.UseLogarithmicVolume ? 0.2 : 2.0);
-        ChangePositionByAmount(amount);
+        if (!App.Settings.UseScrollWheelInSliders)
+        {
+            return;
+        }
+
+        var direction = Math.Sign(e.Delta);
+        if (UsesVolumeStepSettings)
+        {
+            Value = Bound(VolumeStepper.Step(Value, direction));
+        }
+        else
+        {
+            ChangePositionByAmount(direction * (App.Settings.UseLogarithmicVolume ? 0.2 : 2.0));
+        }
         e.Handled = true;
     }
 
     public void SetPositionByControlPoint(Point point)
     {
         var percent = point.X / ActualWidth;
-        Value = App.Settings.UseLogarithmicVolume
-            ? Bound(Math.Round(Minimum + percent * (Maximum - Minimum), 1))
-            : Bound(Minimum + (Maximum - Minimum) * percent);
+        if (App.Settings.UseLogarithmicVolume)
+        {
+            Value = Bound(Math.Round(Minimum + percent * (Maximum - Minimum), 1));
+        }
+        else
+        {
+            var rawValue = (Maximum - Minimum) * percent;
+            Value = Bound(UsesVolumeStepSettings && App.Settings.UseSliderSnap
+                ? VolumeStepper.NearestSnapPoint(rawValue, App.Settings.VolumeStepAmount)
+                : rawValue);
+        }
     }
 
     public void ChangePositionByAmount(double amount)
@@ -224,4 +245,8 @@ public double Bound(double val)
     {
         return Math.Max(Minimum, Math.Min(Maximum, val));
     }
+
+    // Action-configuration sliders carry their own units and bounds (they can be decibels), so
+    // the user's percentage-based step and snapping settings do not apply to them.
+    private bool UsesVolumeStepSettings => !UseCustomRange;
 }
diff --git a/EarTrumpet/UI/Helpers/ShellNotifyIcon.cs b/EarTrumpet/UI/Helpers/ShellNotifyIcon.cs
index 389b1c28c..3baf1e1c6 100644
--- a/EarTrumpet/UI/Helpers/ShellNotifyIcon.cs
+++ b/EarTrumpet/UI/Helpers/ShellNotifyIcon.cs
@@ -319,7 +319,9 @@ public void ShowContextMenu(IEnumerable itemsSource, Point point)
                 contextMenu.PlacementRectangle = Rect.Empty;
                 contextMenu.PlacementTarget = null;
                 contextMenu.HorizontalOffset = point.X / (WindowsTaskbar.Dpi / (double)96);
-                contextMenu.VerticalOffset = point.Y / (WindowsTaskbar.Dpi / (double)96);
+                // Keep the menu above the taskbar: Placement.Top anchors its bottom edge at this Y.
+                var workArea = System.Windows.Forms.Screen.FromPoint(new System.Drawing.Point((int)point.X, (int)point.Y)).WorkingArea;
+                contextMenu.VerticalOffset = Math.Min(point.Y, workArea.Bottom) / (WindowsTaskbar.Dpi / (double)96);
             }
 
             Themes.Options.SetSource(contextMenu, Themes.Options.SourceKind.System);
diff --git a/EarTrumpet/UI/Helpers/VolumeStepper.cs b/EarTrumpet/UI/Helpers/VolumeStepper.cs
new file mode 100644
index 000000000..8ddb79757
--- /dev/null
+++ b/EarTrumpet/UI/Helpers/VolumeStepper.cs
@@ -0,0 +1,79 @@
+using System;
+
+namespace EarTrumpet.UI.Helpers;
+
+/// <summary>
+/// Single source of truth for how far one volume nudge moves and where it lands, so that the
+/// tray icon, the global mouse wheel hook, the flyout sliders and the volume hotkeys all agree
+/// with the step size the user configured.
+/// </summary>
+/// <remarks>
+/// Values are a percentage (0-100). Logarithmic volume works in decibels and has its own fixed
+/// step, so the user's step and snapping settings do not apply to it; callers pass the step that
+/// mode should use and bound the result themselves.
+/// </remarks>
+public static class VolumeStepper
+{
+    /// <summary>Step used by scroll wheels while logarithmic volume is on.</summary>
+    public const double LogarithmicWheelStep = 0.2;
+
+    /// <summary>Step used by the volume hotkeys while logarithmic volume is on.</summary>
+    public const double LogarithmicHotkeyStep = 2.0;
+
+    /// <summary>
+    /// The volume one nudge away from <paramref name="current"/>, honouring the configured step
+    /// size and snap-to-grid behaviour.
+    /// </summary>
+    /// <param name="current">Current volume, as a percentage (or decibels while logarithmic).</param>
+    /// <param name="direction">Positive to raise, negative to lower.</param>
+    /// <param name="logarithmicStep">Step to use while logarithmic volume is on.</param>
+    public static double Step(double current, int direction, double logarithmicStep = LogarithmicWheelStep)
+    {
+        var sign = Math.Sign(direction);
+        if (sign == 0)
+        {
+            return current;
+        }
+
+        if (App.Settings.UseLogarithmicVolume)
+        {
+            // Decibels: the caller owns the bounds, which differ per slider.
+            return current + sign * logarithmicStep;
+        }
+
+        var step = App.Settings.VolumeStepAmount;
+        if (App.Settings.UseRangeSnapping)
+        {
+            return sign > 0 ? NextSnapPoint(current, step) : PreviousSnapPoint(current, step);
+        }
+
+        return Bound(current + sign * step);
+    }
+
+    /// <summary>First point on the step grid above <paramref name="current"/>.</summary>
+    public static double NextSnapPoint(double current, int step)
+    {
+        return Math.Min(100, Math.Floor(current / step) * step + step);
+    }
+
+    /// <summary>First point on the step grid below <paramref name="current"/>.</summary>
+    public static double PreviousSnapPoint(double current, int step)
+    {
+        return Math.Max(0, Math.Ceiling(current / step) * step - step);
+    }
+
+    /// <summary>
+    /// Closest point on the step grid. 100 stays reachable even when it does not sit on the grid,
+    /// so that a step size like 3 can still reach full volume.
+    /// </summary>
+    public static double NearestSnapPoint(double current, int step)
+    {
+        var snap = Math.Round(current / step) * step;
+        return Math.Abs(100 - current) < Math.Abs(snap - current) ? 100 : Bound(snap);
+    }
+
+    private static double Bound(double value)
+    {
+        return Math.Max(0, Math.Min(100, value));
+    }
+}
diff --git a/EarTrumpet/UI/Themes/Manager.cs b/EarTrumpet/UI/Themes/Manager.cs
index 4846f4e65..5820e0861 100644
--- a/EarTrumpet/UI/Themes/Manager.cs
+++ b/EarTrumpet/UI/Themes/Manager.cs
@@ -106,6 +106,8 @@ private void WndProc(int msg, IntPtr _, IntPtr lParam)
         }
     }
 
+    public void RefreshTheme() => OnThemeColorsChanged();
+
     private void OnThemeColorsChanged()
     {
         if (_themeChangeTimer.IsEnabled)
diff --git a/EarTrumpet/UI/ViewModels/ContextMenuItem.cs b/EarTrumpet/UI/ViewModels/ContextMenuItem.cs
index 5776a9943..022a0ecf2 100644
--- a/EarTrumpet/UI/ViewModels/ContextMenuItem.cs
+++ b/EarTrumpet/UI/ViewModels/ContextMenuItem.cs
@@ -6,6 +6,7 @@ namespace EarTrumpet.UI.ViewModels;
 public class ContextMenuItem
 {
     public string Glyph { get; set; } = "\xE0E7"; // Checkmark
+    public string Icon { get; set; } // Fluent glyph shown in the icon column for non-checked items
     public string DisplayName { get; set; }
     public ICommand Command { get; set; }
     public bool IsChecked { get; set; }
diff --git a/EarTrumpet/UI/ViewModels/EarTrumpetAboutPageViewModel.cs b/EarTrumpet/UI/ViewModels/EarTrumpetAboutPageViewModel.cs
index dca0727c2..576a202a8 100644
--- a/EarTrumpet/UI/ViewModels/EarTrumpetAboutPageViewModel.cs
+++ b/EarTrumpet/UI/ViewModels/EarTrumpetAboutPageViewModel.cs
@@ -29,7 +29,7 @@ public EarTrumpetAboutPageViewModel(Action openDiagnostics, AppSettings settings
         _openDiagnostics = openDiagnostics;
         Glyph = "\xE946";
         Title = Properties.Resources.AboutTitle;
-        AboutText = $"EarTrumpet {App.PackageVersion}";
+        AboutText = App.PackageVersion.ToString();
 
         OpenAboutCommand = new RelayCommand(OpenAbout);
         OpenDiagnosticsCommand = new RelayCommand(OpenDiagnostics);
diff --git a/EarTrumpet/UI/ViewModels/EarTrumpetCommunitySettingsPageViewModel.cs b/EarTrumpet/UI/ViewModels/EarTrumpetCommunitySettingsPageViewModel.cs
index 0abba004a..3eed08c0b 100644
--- a/EarTrumpet/UI/ViewModels/EarTrumpetCommunitySettingsPageViewModel.cs
+++ b/EarTrumpet/UI/ViewModels/EarTrumpetCommunitySettingsPageViewModel.cs
@@ -35,10 +35,85 @@ public bool ShowFullMixerWindowOnStartup
         set => _settings.ShowFullMixerWindowOnStartup = value;
     }
 
+    public int VolumeStepAmount
+    {
+        get => _settings.VolumeStepAmount;
+        set
+        {
+            if (_settings.VolumeStepAmount != value)
+            {
+                _settings.VolumeStepAmount = value;
+                RaisePropertyChanged(nameof(VolumeStepAmount));
+            }
+        }
+    }
+
+    public bool UseRangeSnapping
+    {
+        get => _settings.UseRangeSnapping;
+        set
+        {
+            if (_settings.UseRangeSnapping != value)
+            {
+                _settings.UseRangeSnapping = value;
+                RaisePropertyChanged(nameof(UseRangeSnapping));
+            }
+        }
+    }
+
+    public bool UseSliderSnap
+    {
+        get => _settings.UseSliderSnap;
+        set
+        {
+            if (_settings.UseSliderSnap != value)
+            {
+                _settings.UseSliderSnap = value;
+                RaisePropertyChanged(nameof(UseSliderSnap));
+            }
+        }
+    }
+
+    public bool UseScrollWheelInTray
+    {
+        get => _settings.UseScrollWheelInTray;
+        set => _settings.UseScrollWheelInTray = value;
+    }
+
+    public bool UseGlobalMouseWheelHook
+    {
+        get => _settings.UseGlobalMouseWheelHook;
+        set => _settings.UseGlobalMouseWheelHook = value;
+    }
+
+    public bool UseScrollWheelInSliders
+    {
+        get => _settings.UseScrollWheelInSliders;
+        set => _settings.UseScrollWheelInSliders = value;
+    }
+
+    public bool UseTranslucentWindows
+    {
+        get => _settings.UseTranslucentWindows;
+        set
+        {
+            _settings.UseTranslucentWindows = value;
+            DataModel.SystemSettings.ForceOpaque = !value;
+            Themes.Manager.Current?.RefreshTheme();
+            RaisePropertyChanged(nameof(UseTranslucentWindows));
+        }
+    }
+
+    public bool UseLegacyIcon
+    {
+        get => _settings.UseLegacyIcon;
+        set => _settings.UseLegacyIcon = value;
+    }
+
     public EarTrumpetCommunitySettingsPageViewModel(AppSettings settings) : base(null)
     {
         _settings = settings;
-        Title = Properties.Resources.CommunitySettingsPageText;
+        Title = Properties.Resources.GeneralSettingsPageText;
         Glyph = "\xE902";
     }
 }
\ No newline at end of file
diff --git a/EarTrumpet/UI/ViewModels/EarTrumpetLegacySettingsPageViewModel.cs b/EarTrumpet/UI/ViewModels/EarTrumpetLegacySettingsPageViewModel.cs
deleted file mode 100644
index a03b4ce6d..000000000
--- a/EarTrumpet/UI/ViewModels/EarTrumpetLegacySettingsPageViewModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-namespace EarTrumpet.UI.ViewModels;
-
-public class EarTrumpetLegacySettingsPageViewModel : SettingsPageViewModel
-{
-    public bool UseLegacyIcon
-    {
-        get => _settings.UseLegacyIcon;
-        set => _settings.UseLegacyIcon = value;
-    }
-
-    private readonly AppSettings _settings;
-
-    public EarTrumpetLegacySettingsPageViewModel(AppSettings settings) : base(null)
-    {
-        _settings = settings;
-        Title = Properties.Resources.LegacySettingsPageText;
-        Glyph = "\xE825";
-    }
-}
\ No newline at end of file
diff --git a/EarTrumpet/UI/ViewModels/EarTrumpetMouseSettingsPageViewModel.cs b/EarTrumpet/UI/ViewModels/EarTrumpetMouseSettingsPageViewModel.cs
deleted file mode 100644
index fb678952a..000000000
--- a/EarTrumpet/UI/ViewModels/EarTrumpetMouseSettingsPageViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-namespace EarTrumpet.UI.ViewModels;
-
-public class EarTrumpetMouseSettingsPageViewModel : SettingsPageViewModel
-{
-    public bool UseScrollWheelInTray
-    {
-        get => _settings.UseScrollWheelInTray;
-        set => _settings.UseScrollWheelInTray = value;
-    }
-
-    public bool UseGlobalMouseWheelHook
-    {
-        get => _settings.UseGlobalMouseWheelHook;
-        set => _settings.UseGlobalMouseWheelHook = value;
-    }
-
-    private readonly AppSettings _settings;
-
-    public EarTrumpetMouseSettingsPageViewModel(AppSettings settings) : base(null)
-    {
-        _settings = settings;
-        Title = Properties.Resources.MouseSettingsPageText;
-        Glyph = "\xE962";
-    }
-}
\ No newline at end of file
diff --git a/EarTrumpet/UI/ViewModels/FlyoutViewModel.cs b/EarTrumpet/UI/ViewModels/FlyoutViewModel.cs
index c8ee6dafc..c71f72e6a 100644
--- a/EarTrumpet/UI/ViewModels/FlyoutViewModel.cs
+++ b/EarTrumpet/UI/ViewModels/FlyoutViewModel.cs
@@ -326,7 +326,8 @@ private int OnMouseWheelEvent(object sender, System.Windows.Forms.MouseEventArgs
         {
             if (!_winRect.Contains(new Point(e.X, e.Y)))
             {
-                existing.IncrementVolume(Math.Sign(e.Delta) * 2);
+                existing.Volume = (float)VolumeStepper.Step(
+                    existing.Volume, Math.Sign(e.Delta), VolumeStepper.LogarithmicHotkeyStep);
                 return -1;
             }
         }
diff --git a/EarTrumpet/UI/ViewModels/SettingsViewModel.cs b/EarTrumpet/UI/ViewModels/SettingsViewModel.cs
index f809d7cee..1b164f15d 100644
--- a/EarTrumpet/UI/ViewModels/SettingsViewModel.cs
+++ b/EarTrumpet/UI/ViewModels/SettingsViewModel.cs
@@ -69,6 +69,11 @@ public SettingsViewModel(string title, IEnumerable<SettingsCategoryViewModel> ca
         Title = title;
         Categories = new ObservableCollection<SettingsCategoryViewModel>(categories);
         GoHome = new RelayCommand(() => Selected = null);
+
+        // Open on the first category so the page list is always visible; Home still lists every category.
+        Backstack.IsDisablingUpdates = true;
+        Selected = Categories.Count > 0 ? Categories[0] : null;
+        Backstack.IsDisablingUpdates = false;
     }
 
     public void InvokeSearchResult(SettingsCategoryViewModel cat, SettingsPageViewModel page)
diff --git a/EarTrumpet/UI/Views/SettingsWindow.xaml b/EarTrumpet/UI/Views/SettingsWindow.xaml
index b72d72c62..5e92a6eea 100644
--- a/EarTrumpet/UI/Views/SettingsWindow.xaml
+++ b/EarTrumpet/UI/Views/SettingsWindow.xaml
@@ -30,199 +30,164 @@
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <conv:NegateConverter x:Key="NegateConverter"/>
+        <Style x:Key="CardToggle" BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
+            <Setter Property="Margin" Value="0" />
+        </Style>
+        <Style x:Key="CardSectionTitle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="Margin" Value="0,20,0,8" />
+        </Style>
+        <Style TargetType="{x:Type ctl:SettingsCard}">
+            <Setter Property="Margin" Value="0,0,0,4" />
+            <Setter Property="Padding" Value="16,12" />
+            <Setter Property="IsTabStop" Value="False" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ctl:SettingsCard}">
+                        <Border x:Name="CardBorder"
+                                Padding="{TemplateBinding Padding}"
+                                Theme:Brush.Background="Light=#B3FFFFFF, Dark=#0DFFFFFF, HighContrast=Window"
+                                Theme:Brush.BorderBrush="Light=#14000000, Dark=#19000000, HighContrast=Text"
+                                BorderThickness="1"
+                                CornerRadius="4">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock x:Name="GlyphText"
+                                           Margin="0,0,16,0"
+                                           VerticalAlignment="Center"
+                                           FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
+                                           FontSize="18"
+                                           Text="{TemplateBinding Glyph}" />
+                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                    <TextBlock FontSize="14" Text="{TemplateBinding Header}" TextWrapping="Wrap" />
+                                    <TextBlock x:Name="DescriptionText"
+                                               Margin="0,2,0,0"
+                                               FontSize="12"
+                                               Opacity="0.7"
+                                               Text="{TemplateBinding Description}"
+                                               TextWrapping="Wrap" />
+                                </StackPanel>
+                                <ContentPresenter Grid.Column="2"
+                                                  Margin="16,0,0,0"
+                                                  VerticalAlignment="Center" />
+                                <TextBlock x:Name="Chevron"
+                                           Grid.Column="3"
+                                           Margin="16,0,0,0"
+                                           VerticalAlignment="Center"
+                                           FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
+                                           FontSize="12"
+                                           Opacity="0.7"
+                                           Text="&#xE76C;" />
+                            </Grid>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="Description" Value="{x:Null}">
+                                <Setter TargetName="DescriptionText" Property="Visibility" Value="Collapsed" />
+                            </Trigger>
+                            <Trigger Property="Glyph" Value="{x:Null}">
+                                <Setter TargetName="GlyphText" Property="Visibility" Value="Collapsed" />
+                            </Trigger>
+                            <Trigger Property="Command" Value="{x:Null}">
+                                <Setter TargetName="Chevron" Property="Visibility" Value="Collapsed" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="CardBorder" Property="Theme:Brush.BorderBrush" Value="SystemAccent/0.6" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <DataTemplate DataType="{x:Type vm:EarTrumpetShortcutsPageViewModel}">
-            <StackPanel Orientation="Vertical">
-                <TextBlock Style="{StaticResource BodyText}" Text="{x:Static resx:Resources.SettingsOpenEarTrumpetText}" />
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.DefaultHotkeyDescriptionText}" />
-                    <TextBlock Grid.Column="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodyText}"
-                               Text="{Binding DefaultHotKey}" />
-                    <TextBlock Grid.Row="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.HotkeyDescriptionText}" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{Binding OpenFlyoutHotkey}"
-                                    IsTabStop="False" />
-                </Grid>
-                <TextBlock Style="{StaticResource BodyText}" Text="{x:Static resx:Resources.SettingsOpenMixerText}" />
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.DefaultHotkeyDescriptionText}" />
-                    <TextBlock Grid.Column="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodyText}"
-                               Text="{Binding DefaultMixerHotKey}" />
-                    <TextBlock Grid.Row="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.HotkeyDescriptionText}" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{Binding OpenMixerHotkey}"
-                                    IsTabStop="False" />
-                </Grid>
-                <TextBlock Style="{StaticResource BodyText}" Text="{x:Static resx:Resources.SettingsOpenSettingsText}" />
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.DefaultHotkeyDescriptionText}" />
-                    <TextBlock Grid.Column="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodyText}"
-                               Text="{Binding DefaultSettingsHotKey}" />
-                    <TextBlock Grid.Row="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.HotkeyDescriptionText}" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{Binding OpenSettingsHotkey}"
-                                    IsTabStop="False" />
-                </Grid>
-                <TextBlock Style="{StaticResource BodyText}" Text="{x:Static resx:Resources.SettingsAbsoluteVolumeUpText}" />
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.DefaultHotkeyDescriptionText}" />
-                    <TextBlock Grid.Column="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodyText}"
-                               Text="{Binding DefaultSettingsHotKey}" />
-                    <TextBlock Grid.Row="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.HotkeyDescriptionText}" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{Binding AbsoluteVolumeUpHotkey}"
-                                    IsTabStop="False" />
-                </Grid>
-                <TextBlock Style="{StaticResource BodyText}" Text="{x:Static resx:Resources.SettingsAbsoluteVolumeDownText}" />
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.DefaultHotkeyDescriptionText}" />
-                    <TextBlock Grid.Column="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodyText}"
-                               Text="{Binding DefaultSettingsHotKey}" />
-                    <TextBlock Grid.Row="1"
-                               VerticalAlignment="Center"
-                               Style="{StaticResource BodySubText}"
-                               Text="{x:Static resx:Resources.HotkeyDescriptionText}" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{Binding AbsoluteVolumeDownHotkey}"
-                                    IsTabStop="False" />
-                </Grid>
-            </StackPanel>
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type vm:EarTrumpetMouseSettingsPageViewModel}">
-            <StackPanel Orientation="Vertical">
-                <CheckBox HorizontalAlignment="Left"
-                          Content="{x:Static resx:Resources.SettingsUseScrollWheelInTray}"
-                          IsChecked="{Binding UseScrollWheelInTray, Mode=TwoWay}" />
-                <CheckBox HorizontalAlignment="Left"
-                          Content="{x:Static resx:Resources.SettingsUseGlobalMouseWheelHook}"
-                          IsChecked="{Binding UseGlobalMouseWheelHook, Mode=TwoWay}" />
+            <StackPanel Margin="12,12,24,24" Orientation="Vertical">
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsOpenEarTrumpetText}">
+                    <ContentControl Content="{Binding OpenFlyoutHotkey}" IsTabStop="False" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsOpenMixerText}">
+                    <ContentControl Content="{Binding OpenMixerHotkey}" IsTabStop="False" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsOpenSettingsText}">
+                    <ContentControl Content="{Binding OpenSettingsHotkey}" IsTabStop="False" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsAbsoluteVolumeUpText}">
+                    <ContentControl Content="{Binding AbsoluteVolumeUpHotkey}" IsTabStop="False" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsAbsoluteVolumeDownText}">
+                    <ContentControl Content="{Binding AbsoluteVolumeDownHotkey}" IsTabStop="False" />
+                </ctl:SettingsCard>
             </StackPanel>
         </DataTemplate>
         <DataTemplate DataType="{x:Type vm:EarTrumpetCommunitySettingsPageViewModel}">
-            <StackPanel Orientation="Vertical">
-                <CheckBox HorizontalAlignment="Left"
-                          Content="{x:Static resx:Resources.SettingsUseLogarithmicVolume}"
-                          IsChecked="{Binding UseLogarithmicVolume, Mode=TwoWay}" />
-                <StackPanel>
-                    <!-- Localization required -->
-                    <TextBlock VerticalAlignment="Center"
-                               Style="{StaticResource BodyText}"
-                               Text="{x:Static resx:Resources.SettingsLogarithmicScaleMinimum}" />
-                    <StackPanel Orientation="Horizontal"
-                                Margin="12,0,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Bottom">
-                        <!--
-                            -96 dB is the min volume range of most devices
-                            -12 dB is arbitrarily chosen
-                            NegateConverter is used to flip the slider so that left is -12 and right is -96
-                        -->
-                        <Slider Minimum="12"
-                                Maximum="96"
-                                Width="200"
-                                IsEnabled="{Binding UseLogarithmicVolume}"
-                                IsSnapToTickEnabled="True"
-                                TickFrequency="1"
+            <StackPanel Margin="12,0,24,24" Orientation="Vertical">
+                <TextBlock Style="{StaticResource CardSectionTitle}" Text="{x:Static resx:Resources.SettingsSectionVolume}" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseLogarithmicVolume}"
+                                  Description="{x:Static resx:Resources.SettingsUseLogarithmicVolumeDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseLogarithmicVolume, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsLogarithmicScaleMinimum}"
+                                  Description="{x:Static resx:Resources.SettingsLogarithmicScaleMinimumDescription}"
+                                  Visibility="{Binding UseLogarithmicVolume, Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <StackPanel Orientation="Horizontal">
+                        <Slider Width="140" VerticalAlignment="Center" Minimum="12" Maximum="96" IsSnapToTickEnabled="True" TickFrequency="1"
                                 Value="{Binding LogarithmicVolumeMinDb, Converter={StaticResource NegateConverter}, Mode=TwoWay}" />
-                        <TextBlock VerticalAlignment="Center"
-                                   Style="{StaticResource BodyText}"
-                                   Text="{Binding LogarithmicVolumeMinDb, StringFormat=\{0\} dB}" />
+                        <TextBlock Width="48" Margin="8,0,0,0" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding LogarithmicVolumeMinDb, StringFormat=\{0\} dB}" />
                     </StackPanel>
-                </StackPanel>
-                <CheckBox HorizontalAlignment="Left"
-                          Content="{x:Static resx:Resources.SettingsShowFullMixerWindowOnStartup}"
-                          IsChecked="{Binding ShowFullMixerWindowOnStartup, Mode=TwoWay}" />
-            </StackPanel>
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type vm:EarTrumpetLegacySettingsPageViewModel}">
-            <StackPanel Orientation="Vertical">
-                <CheckBox HorizontalAlignment="Left"
-                          Content="{x:Static resx:Resources.SettingsUseLegacyEarTrumpetIcon}"
-                          IsChecked="{Binding UseLegacyIcon, Mode=TwoWay}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsVolumeStepAmount}"
+                                  Description="{x:Static resx:Resources.SettingsVolumeStepAmountDescription}">
+                    <StackPanel Orientation="Horizontal">
+                        <Slider Width="140" VerticalAlignment="Center" Minimum="1" Maximum="50" IsSnapToTickEnabled="True" TickFrequency="1"
+                                Value="{Binding VolumeStepAmount, Mode=TwoWay}" />
+                        <TextBlock Width="48" Margin="8,0,0,0" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding VolumeStepAmount, StringFormat=\{0\}%}" />
+                    </StackPanel>
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseRangeSnapping}"
+                                  Description="{x:Static resx:Resources.SettingsUseRangeSnappingDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseRangeSnapping, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseSliderSnap}"
+                                  Description="{x:Static resx:Resources.SettingsUseSliderSnapDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseSliderSnap, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <TextBlock Style="{StaticResource CardSectionTitle}" Text="{x:Static resx:Resources.SettingsSectionMouse}" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseScrollWheelInTray}"
+                                  Description="{x:Static resx:Resources.SettingsUseScrollWheelInTrayDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseScrollWheelInTray, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseScrollWheelInSliders}"
+                                  Description="{x:Static resx:Resources.SettingsUseScrollWheelInSlidersDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseScrollWheelInSliders, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseGlobalMouseWheelHook}"
+                                  Description="{x:Static resx:Resources.SettingsUseGlobalMouseWheelHookDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseGlobalMouseWheelHook, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <TextBlock Style="{StaticResource CardSectionTitle}" Text="{x:Static resx:Resources.SettingsSectionAppearance}" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseTranslucentWindows}"
+                                  Description="{x:Static resx:Resources.SettingsUseTranslucentWindowsDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseTranslucentWindows, Mode=TwoWay}" AutomationProperties.Name="{x:Static resx:Resources.SettingsUseTranslucentWindows}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsUseLegacyEarTrumpetIcon}"
+                                  Description="{x:Static resx:Resources.SettingsUseLegacyEarTrumpetIconDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding UseLegacyIcon, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
+                <TextBlock Style="{StaticResource CardSectionTitle}" Text="{x:Static resx:Resources.SettingsSectionStartup}" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.SettingsShowFullMixerWindowOnStartup}"
+                                  Description="{x:Static resx:Resources.SettingsShowFullMixerWindowOnStartupDescription}">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding ShowFullMixerWindowOnStartup, Mode=TwoWay}" AutomationProperties.Name="{Binding Path=(ctl:SettingsCard.Header), RelativeSource={RelativeSource AncestorType=ctl:SettingsCard}}" />
+                </ctl:SettingsCard>
             </StackPanel>
         </DataTemplate>
         <DataTemplate DataType="{x:Type vm:EarTrumpetAboutPageViewModel}">
-            <StackPanel>
-                <StackPanel Margin="12,24" Orientation="Horizontal">
-                    <Border Width="40"
-                            Height="30"
-                            Margin="0,0,8,0">
+            <StackPanel Margin="12,12,24,24">
+                <StackPanel Margin="4,12,0,20" Orientation="Horizontal">
+                    <Border Width="56" Height="42" Margin="0,0,16,0">
                         <Canvas>
                             <Path Width="40"
                                   Height="30"
@@ -231,41 +196,27 @@
                                   Stretch="Uniform" />
                         </Canvas>
                     </Border>
-                    <TextBlock FontSize="24" Text="EarTrumpet" />
-                </StackPanel>
-                <StackPanel Orientation="Horizontal">
-                    <StackPanel>
-                        <TextBlock VerticalAlignment="Center"
-                                   Style="{StaticResource BodyText}"
-                                   Text="{Binding AboutText}" />
-                        <TextBlock VerticalAlignment="Center"
-                                   Style="{StaticResource BodyText}"
-                                   Text="© File-New-Project" />
-                        <CheckBox Margin="12,24,12,-6"
-                                  HorizontalAlignment="Left"
-                                  Content="{x:Static resx:Resources.PrivacyCheckboxText}"
-                                  IsChecked="{Binding IsTelemetryEnabled, Mode=TwoWay}" />
-                        <TextBlock Style="{StaticResource HyperlinkBlock}">
-                            <Hyperlink Command="{Binding OpenPrivacyPolicyCommand}">
-                                <Run Text="{x:Static resx:Resources.PrivacyPolicyText}" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <TextBlock Style="{StaticResource HyperlinkBlock}"><Hyperlink Command="{Binding OpenAboutCommand}">
-                                <Run Text="{x:Static resx:Resources.WebsiteText}" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <TextBlock Style="{StaticResource HyperlinkBlock}">
-                            <Hyperlink Command="{Binding OpenFeedbackCommand}">
-                                <Run Text="{x:Static resx:Resources.ContextMenuSendFeedback}" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <TextBlock Style="{StaticResource HyperlinkBlock}">
-                            <Hyperlink Command="{Binding OpenDiagnosticsCommand}">
-                                <Run Text="{x:Static resx:Resources.TroubleshootEarTrumpetText}" />
-                            </Hyperlink>
-                        </TextBlock>
+                    <StackPanel VerticalAlignment="Center">
+                        <TextBlock FontSize="24" FontWeight="SemiBold" Text="EarTrumpet" />
+                        <TextBlock Margin="0,2,0,0" Opacity="0.7" Text="{Binding AboutText}" />
+                        <TextBlock Opacity="0.7" Text="&#169; File-New-Project" />
                     </StackPanel>
                 </StackPanel>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.PrivacyCheckboxText}" Glyph="&#xE72E;">
+                    <CheckBox Style="{StaticResource CardToggle}" IsChecked="{Binding IsTelemetryEnabled, Mode=TwoWay}" AutomationProperties.Name="{x:Static resx:Resources.PrivacyCheckboxText}" />
+                </ctl:SettingsCard>
+                <ctl:SettingsCard Header="{x:Static resx:Resources.PrivacyPolicyText}"
+                                  Command="{Binding OpenPrivacyPolicyCommand}"
+                                  Glyph="&#xE8D7;" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.WebsiteText}"
+                                  Command="{Binding OpenAboutCommand}"
+                                  Glyph="&#xE774;" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.ContextMenuSendFeedback}"
+                                  Command="{Binding OpenFeedbackCommand}"
+                                  Glyph="&#xED15;" />
+                <ctl:SettingsCard Header="{x:Static resx:Resources.TroubleshootEarTrumpetText}"
+                                  Command="{Binding OpenDiagnosticsCommand}"
+                                  Glyph="&#xE90F;" />
             </StackPanel>
         </DataTemplate>
         <DataTemplate DataType="{x:Type vm:SettingsPageHeaderViewModel}">
@@ -410,13 +361,15 @@
             <Setter Property="HorizontalContentAlignment" Value="Left" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Height" Value="48" />
+            <Setter Property="Height" Value="40" />
             <Setter Property="FocusVisualStyle" Value="{StaticResource Windows10FocusVisualStyle}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListViewItem}">
                         <Border x:Name="Bd"
+                                Margin="8,2"
                                 Background="{TemplateBinding Background}"
+                                CornerRadius="4"
                                 SnapsToDevicePixels="true">
                             <ContentPresenter Margin="0"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -430,6 +383,9 @@
                                 </MultiTrigger.Conditions>
                                 <Setter TargetName="Bd" Property="Theme:Brush.Background" Value="Theme={Theme}ListLow, HighContrast=Highlight" />
                             </MultiTrigger>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="Bd" Property="Theme:Brush.Background" Value="SystemAccent/0.18" />
+                            </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>