diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index da62df1..05d7f95 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -57,16 +57,74 @@ jobs:
           date_stamp="$(date -u +%Y%m%d)"
           default_tag_name="pre-${date_stamp}"
 
-          latest_stable_tag="$(git tag -l 'v[0-9]*.[0-9]*.[0-9]*' --sort=-v:refname | head -n 1)"
-          if [[ -z "${latest_stable_tag}" ]]; then
-            base_version="0.1.0"
-          else
-            base_version="${latest_stable_tag#v}"
+          # Every tag that carries a semver version: stable vX.Y.Z and plain
+          # semver pre-releases such as 3.0.0-rc2. Tags like pre-YYYYMMDD do not
+          # encode a version and are intentionally ignored (their versions never
+          # exceed the stable-based auto line).
+          all_versions="$(
+            git tag -l \
+              | sed -E 's/^v//' \
+              | grep -E '^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$' \
+              | sort -u || true
+          )"
+
+          latest_stable_base="$(
+            printf '%s\n' "${all_versions}" \
+              | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' \
+              | sort -V | tail -n 1 || true
+          )"
+
+          latest_prerelease_base="$(
+            printf '%s\n' "${all_versions}" \
+              | grep -E '^[0-9]+\.[0-9]+\.[0-9]+-' \
+              | sed -E 's/-.*$//' \
+              | sort -V | tail -n 1 || true
+          )"
+
+          # An unreleased line is "in progress" when its base is newer than the
+          # latest stable, e.g. 3.0.0-rc2 while the latest stable is v2.7.2.
+          active_line=""
+          if [[ -n "${latest_prerelease_base}" ]]; then
+            newest_base="$(printf '%s\n%s\n' "${latest_stable_base:-0.0.0}" "${latest_prerelease_base}" | sort -V | tail -n 1)"
+            if [[ "${newest_base}" == "${latest_prerelease_base}" && "${latest_prerelease_base}" != "${latest_stable_base}" ]]; then
+              active_line="${latest_prerelease_base}"
+            fi
           fi
 
-          IFS='.' read -r major minor patch <<< "${base_version}"
-          next_patch=$((patch + 1))
-          default_next_version="${major}.${minor}.${next_patch}-pre.${date_stamp}"
+          if [[ -n "${active_line}" ]]; then
+            # Continue the in-progress line with a date-stamped release candidate.
+            # The date keeps it ordering above the previous candidate
+            # (3.0.0-rc3.20260917 > 3.0.0-rc2) while still allowing only one
+            # pre-release per day; the tag always equals the version so the next
+            # run can detect it again.
+            escaped_line="${active_line//./\\.}"
+            highest_pre="$(printf '%s\n' "${all_versions}" | grep -E "^${escaped_line}-" | sort -V | tail -n 1)"
+            suffix="${highest_pre#${active_line}-}"
+            rc_number=""
+
+            if [[ "${suffix}" =~ ^rc([0-9]+)$ ]]; then
+              # Manually cut candidate (e.g. rc2) -> start the next one (rc3).
+              rc_number=$(( BASH_REMATCH[1] + 1 ))
+            elif [[ "${suffix}" =~ ^rc([0-9]+)\. ]]; then
+              # Date-stamped candidate (e.g. rc3.20260917) -> keep the same
+              # candidate number and just refresh the date.
+              rc_number="${BASH_REMATCH[1]}"
+            else
+              highest_rc="$(printf '%s\n' "${all_versions}" | grep -Eo "^${escaped_line}-rc[0-9]+" | grep -Eo '[0-9]+$' | sort -n | tail -n 1 || true)"
+              rc_number=$(( ${highest_rc:-0} + 1 ))
+            fi
+
+            default_next_version="${active_line}-rc${rc_number}.${date_stamp}"
+            default_tag_name="${default_next_version}"
+          else
+            if [[ -z "${latest_stable_base}" ]]; then
+              latest_stable_base="0.1.0"
+            fi
+
+            IFS='.' read -r major minor patch <<< "${latest_stable_base}"
+            next_patch=$((patch + 1))
+            default_next_version="${major}.${minor}.${next_patch}-pre.${date_stamp}"
+          fi
 
           tag_name="${default_tag_name}"
           next_version="${default_next_version}"
diff --git a/MapWizard.Desktop/App.axaml b/MapWizard.Desktop/App.axaml
index e267277..0c87dcf 100644
--- a/MapWizard.Desktop/App.axaml
+++ b/MapWizard.Desktop/App.axaml
@@ -4,7 +4,6 @@
     xmlns:local="clr-namespace:MapWizard.Desktop"
     xmlns:mapWizardTheme="clr-namespace:MapWizard.Theme;assembly=MapWizard.Theme"
     xmlns:converters="clr-namespace:MapWizard.Desktop.Converters"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     x:Class="MapWizard.Desktop.App">
 
     <Application.DataTemplates>
@@ -15,8 +14,6 @@
         <FluentTheme />
         <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
         <mapWizardTheme:MapWizardTheme />
-        <materialIcons:MaterialIconStyles />
-
         <!-- Desktop interaction states should respond immediately. -->
         <Style Selector="Button, ToggleButton, ListBoxItem, ComboBoxItem, MenuItem, TabItem, TreeViewItem">
             <Setter Property="Transitions"><Transitions /></Setter>
@@ -25,6 +22,9 @@
 
     <Application.Resources>
         <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="avares://MapWizard.Desktop/Assets/BrandIcons.axaml" />
+            </ResourceDictionary.MergedDictionaries>
             <converters:IndexToTransformConverter x:Key="IndexToTransformConverter" />
             <!-- ThemeService populates these dictionaries from MapWizard.Theme palettes. -->
             <ResourceDictionary.ThemeDictionaries>
diff --git a/MapWizard.Desktop/App.axaml.cs b/MapWizard.Desktop/App.axaml.cs
index aeda798..8ce2bf1 100644
--- a/MapWizard.Desktop/App.axaml.cs
+++ b/MapWizard.Desktop/App.axaml.cs
@@ -10,9 +10,7 @@
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using MapWizard.Desktop.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using MapWizard.Desktop.Controls;
 using MapWizard.Desktop.DependencyInjection;
 using MapWizard.Desktop.Services;
 using MapWizard.Desktop.Views;
@@ -42,8 +40,6 @@ public override void OnFrameworkInitializationCompleted()
     {
         var services = _services ?? throw new InvalidOperationException("Application services were not initialized.");
         var mainWindow = services.GetRequiredService<MainWindow>();
-        // Defer the startup update check until the window is open so that the
-        // modal host is live; otherwise the update modal falls back to a toast.
         mainWindow.Opened += (_, _) => mainWindow.GetViewModel().RequestStartupUpdateCheck();
 
         switch (ApplicationLifetime)
@@ -57,240 +53,5 @@ public override void OnFrameworkInitializationCompleted()
         }
 
         base.OnFrameworkInitializationCompleted();
-        RunResizeProbe();
-        RunChromeProbe();
-    }
-
-    /// <summary>
-    /// Prints title-bar control geometry for chrome alignment debugging.
-    /// Enable with MAPWIZARD_CHROME_PROBE=1.
-    /// </summary>
-    private static void RunChromeProbe()
-    {
-        if (Environment.GetEnvironmentVariable("MAPWIZARD_CHROME_PROBE") != "1" ||
-            Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
-            desktop.MainWindow is not Views.MainWindow window)
-        {
-            return;
-        }
-
-        void Dump()
-        {
-            Console.WriteLine("== chrome probe ==");
-            foreach (var scrollBar in window.GetVisualDescendants().OfType<ScrollBar>())
-            {
-                var b = scrollBar.TranslatePoint(new Point(0, 0), window) ?? default;
-                var owner = scrollBar.GetVisualAncestors().OfType<Control>().Take(3)
-                    .Select(c => c.GetType().Name + (c.Classes.Count > 0 ? $"[{string.Join("+", c.Classes)}]" : null));
-                Console.WriteLine(
-                    $"scrollbar {scrollBar.Orientation} pos={b.X:F2},{b.Y:F2} size={scrollBar.Bounds.Width:F2}x{scrollBar.Bounds.Height:F2} chain={string.Join(" -> ", owner)}");
-            }
-
-            Console.WriteLine($"window pos={window.Position.X}x{window.Position.Y} size={window.Bounds.Width:F2}x{window.Bounds.Height:F2}");
-            foreach (var border in window.GetVisualDescendants().OfType<Border>()
-                         .Where(b => b.Classes.Contains("ContentIsland")))
-            {
-                var o = border.TranslatePoint(new Point(0, 0), window) ?? default;
-                Console.WriteLine($"contentIsland pos={o.X:F2},{o.Y:F2} size={border.Bounds.Width:F2}x{border.Bounds.Height:F2} clip={border.ClipToBounds}");
-            }
-
-            foreach (var viewer in window.GetVisualDescendants().OfType<SmoothScrollViewer>())
-            {
-                var o = viewer.TranslatePoint(new Point(0, 0), window) ?? default;
-                Console.WriteLine($"smoothViewer pos={o.X:F2},{o.Y:F2} size={viewer.Bounds.Width:F2}x{viewer.Bounds.Height:F2}");
-            }
-            Console.WriteLine("  scrollbar dump end.");
-            foreach (var button in window.GetVisualDescendants().OfType<Avalonia.Controls.Primitives.TemplatedControl>())
-            {
-                if (!button.Classes.Contains("WindowControlButton") &&
-                    !button.Classes.Contains("TitleBarActionButton"))
-                {
-                    continue;
-                }
-
-                var origin = button.TranslatePoint(new Point(0, 0), window) ?? default;
-                Console.WriteLine(
-                    $"{string.Join("+", button.Classes)} pos={origin.X:F1},{origin.Y:F1} size={button.Bounds.Width:F1}x{button.Bounds.Height:F1}");
-
-                foreach (var child in button.GetVisualDescendants().OfType<Visual>())
-                {
-                    if (child is not Avalonia.Controls.Shapes.Path || child.Bounds.Size.Width == 0)
-                    {
-                        continue;
-                    }
-
-                    var childPos = child.TranslatePoint(new Point(0, 0), button) ?? default;
-                    Console.WriteLine(
-                        $"  path pos={childPos.X:F1},{childPos.Y:F1} size={child.Bounds.Width:F1}x{child.Bounds.Height:F1}");
-                }
-            }
-
-            foreach (var border in window.GetVisualDescendants().OfType<Border>()
-                         .Where(b => b.Classes.Contains("TitleBarIsland")))
-            {
-                var origin = border.TranslatePoint(new Point(0, 0), window) ?? default;
-                Console.WriteLine(
-                    $"island pos={origin.X:F1},{origin.Y:F1} size={border.Bounds.Width:F1}x{border.Bounds.Height:F1}");
-            }
-        }
-
-        window.Opened += (_, _) => DispatcherTimer.RunOnce(() =>
-            {
-                var page = Environment.GetEnvironmentVariable("MAPWIZARD_RESIZE_PROBE_PAGE");
-                if (!string.IsNullOrEmpty(page))
-                {
-                    switch (page.ToLowerInvariant())
-                    {
-                        case "hitsoundcopier": window.NavigateToHitSoundCopier(); break;
-                        case "metadata": window.NavigateToMetadataManager(); break;
-                        case "colourstudio": window.NavigateToComboColourStudio(); break;
-                        case "settings": window.NavigateToSettings(); break;
-                        default: break;
-                    }
-                }
-
-                DispatcherTimer.RunOnce(Dump, TimeSpan.FromMilliseconds(400));
-            }, TimeSpan.FromMilliseconds(600));
-    }
-
-    private static void RunResizeProbe()
-    {
-        if (Environment.GetEnvironmentVariable("MAPWIZARD_RESIZE_PROBE") != "1" ||
-            Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
-            desktop.MainWindow is not { } window)
-        {
-            return;
-        }
-
-        DispatcherTimer.RunOnce(
-            () =>
-            {
-                var flags = (Environment.GetEnvironmentVariable("MAPWIZARD_RESIZE_PROBE_FLAGS") ?? string.Empty)
-                    .Split(',', StringSplitOptions.RemoveEmptyEntries);
-
-                if (flags.Contains("nomask"))
-                {
-                    foreach (var viewer in window.GetVisualDescendants().OfType<SmoothScrollViewer>())
-                    {
-                        viewer.IsScrollFadeEnabled = false;
-                    }
-                }
-
-                if (flags.Contains("noshadow"))
-                {
-                    foreach (var border in window.GetVisualDescendants().OfType<Border>())
-                    {
-                        border.BoxShadow = default;
-                    }
-                }
-
-                if (flags.Contains("bake") || flags.Contains("small"))
-                {
-                    foreach (var border in window.GetVisualDescendants().OfType<Border>()
-                                 .Where(b => b.Classes.Contains("WindowBackdrop")))
-                    {
-                        var brush = new Avalonia.Media.RadialGradientBrush
-                        {
-                            Center = new Avalonia.RelativePoint(0.5, 0, Avalonia.RelativeUnit.Relative),
-                            GradientOrigin = new Avalonia.RelativePoint(0.5, 0, Avalonia.RelativeUnit.Relative),
-                            RadiusX = new Avalonia.RelativeScalar(0.75, Avalonia.RelativeUnit.Relative),
-                            RadiusY = new Avalonia.RelativeScalar(0.75, Avalonia.RelativeUnit.Relative)
-                        };
-                        brush.GradientStops.Add(new Avalonia.Media.GradientStop(Avalonia.Media.Color.Parse("#0EB8DB87"), 0));
-                        brush.GradientStops.Add(new Avalonia.Media.GradientStop(Avalonia.Media.Colors.Transparent, 1));
-                        border.Opacity = 1;
-                        border.Background = brush;
-                        if (flags.Contains("small"))
-                        {
-                            border.Height = 320;
-                            border.VerticalAlignment = Avalonia.Layout.VerticalAlignment.Top;
-                        }
-                    }
-                }
-
-                if (flags.Contains("nobackdrop"))
-                {
-                    foreach (var border in window.GetVisualDescendants().OfType<Border>()
-                                 .Where(b => b.Classes.Contains("WindowBackdrop")))
-                    {
-                        border.IsVisible = false;
-                    }
-                }
-
-                var page = Environment.GetEnvironmentVariable("MAPWIZARD_RESIZE_PROBE_PAGE");
-                if (window is Views.MainWindow mainWindow && !string.IsNullOrEmpty(page))
-                {
-                    switch (page.ToLowerInvariant())
-                    {
-                        case "hitsoundcopier": mainWindow.NavigateToHitSoundCopier(); break;
-                        case "metadata": mainWindow.NavigateToMetadataManager(); break;
-                        case "colourstudio": mainWindow.NavigateToComboColourStudio(); break;
-                        case "settings": mainWindow.NavigateToSettings(); break;
-                        case "start": mainWindow.NavigateToStart(); break;
-                    }
-                }
-
-                Measure(window);
-            },
-            TimeSpan.FromMilliseconds(1500));
-    }
-
-    private static void Measure(Avalonia.Controls.Window window)
-    {
-        var sample = new System.Collections.Generic.List<double>();
-        var frames = new System.Collections.Generic.List<double>();
-        var compositor = Avalonia.Rendering.Composition.Compositor.TryGetDefaultCompositor();
-        double lastFrame = Stopwatch.GetTimestamp();
-        Action? frameRequest = null;
-        frameRequest = () =>
-        {
-            var now2 = Stopwatch.GetTimestamp();
-            frames.Add((now2 - lastFrame) * 1000d / Stopwatch.Frequency);
-            lastFrame = now2;
-        };
-        var cpuStart = Process.GetCurrentProcess().TotalProcessorTime;
-        var wall = Stopwatch.StartNew();
-        var last = Stopwatch.GetTimestamp();
-        var tick = 0;
-
-        var timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(5) };
-        timer.Tick += (_, _) =>
-        {
-            var now = Stopwatch.GetTimestamp();
-            sample.Add((now - last) * 1000d / Stopwatch.Frequency);
-            last = now;
-            tick++;
-
-            var axis = Environment.GetEnvironmentVariable("MAPWIZARD_RESIZE_PROBE_AXIS") ?? "both";
-            var phase = tick * 0.06;
-            if (axis != "height")
-            {
-                window.Width = 1180 + (Math.Sin(phase) * 90);
-            }
-            if (axis != "width")
-            {
-                window.Height = 700 + (Math.Cos(phase) * 60);
-            }
-            compositor?.RequestCompositionUpdate(frameRequest!);
-
-            if (tick < 600)
-            {
-                return;
-            }
-
-            timer.Stop();
-            wall.Stop();
-            var cpu = Process.GetCurrentProcess().TotalProcessorTime - cpuStart;
-            var ordered = sample.OrderBy(x => x).ToArray();
-            var p95 = ordered[(int)(ordered.Length * 0.95)];
-            var frameStats = frames.Count == 0
-                ? "frames=0"
-                : $"frames={frames.Count} frameMs={frames.Average():F2} p95Frame={frames.OrderBy(x => x).ElementAt((int)(frames.Count * 0.95)):F2}";
-            Console.WriteLine(
-                $"PROBE resize ticks={sample.Count} wall={wall.ElapsedMilliseconds}ms cpu={cpu.TotalMilliseconds:F0}ms " +
-                $"avgTick={sample.Average():F2}ms p95Tick={p95:F2}ms maxTick={ordered[^1]:F2}ms {frameStats}");
-            (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown();
-        };
-        timer.Start();
     }
 }
diff --git a/MapWizard.Desktop/Assets/BrandIcons.axaml b/MapWizard.Desktop/Assets/BrandIcons.axaml
new file mode 100644
index 0000000..25742c6
--- /dev/null
+++ b/MapWizard.Desktop/Assets/BrandIcons.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Simple Icons (CC0) brand marks, 24x24 viewBox. -->
+    <StreamGeometry x:Key="BrandGithub">M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12</StreamGeometry>
+    <StreamGeometry x:Key="BrandDiscord">M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z</StreamGeometry>
+</ResourceDictionary>
diff --git a/MapWizard.Desktop/Assets/app-icon-256.png b/MapWizard.Desktop/Assets/app-icon-256.png
new file mode 100644
index 0000000..f16be2b
Binary files /dev/null and b/MapWizard.Desktop/Assets/app-icon-256.png differ
diff --git a/MapWizard.Desktop/Assets/app-icon-64.png b/MapWizard.Desktop/Assets/app-icon-64.png
new file mode 100644
index 0000000..35acb83
Binary files /dev/null and b/MapWizard.Desktop/Assets/app-icon-64.png differ
diff --git a/MapWizard.Desktop/Assets/app-icon.icns b/MapWizard.Desktop/Assets/app-icon.icns
index be6d370..824a367 100644
Binary files a/MapWizard.Desktop/Assets/app-icon.icns and b/MapWizard.Desktop/Assets/app-icon.icns differ
diff --git a/MapWizard.Desktop/Assets/app-icon.ico b/MapWizard.Desktop/Assets/app-icon.ico
index 9d00dc8..09722d0 100644
Binary files a/MapWizard.Desktop/Assets/app-icon.ico and b/MapWizard.Desktop/Assets/app-icon.ico differ
diff --git a/MapWizard.Desktop/Assets/generate-app-icons.py b/MapWizard.Desktop/Assets/generate-app-icons.py
index ced352f..aca1767 100644
--- a/MapWizard.Desktop/Assets/generate-app-icons.py
+++ b/MapWizard.Desktop/Assets/generate-app-icons.py
@@ -1,6 +1,12 @@
 #!/usr/bin/env python3
 """Regenerate packaged icons from the canonical mapwizard.svg artwork.
 
+The SVG is the untouched Inkscape source; this script only controls how it is
+rasterized. Each target size is rendered from the vector at a supersampled
+resolution and downscaled with a proper prefilter, then handed to Pillow as an
+exact frame (`append_images`). That avoids Pillow's single-pass resize of one
+1024px raster, which aliased badly on the small ICO/ICNS sizes.
+
 Requires rsvg-convert and Pillow. Run from any directory with:
     python3 MapWizard.Desktop/Assets/generate-app-icons.py
 """
@@ -15,22 +21,71 @@
 ASSETS = Path(__file__).resolve().parent
 SOURCE = ASSETS / "mapwizard.svg"
 
+ICO_SIZES = (16, 20, 24, 28, 32, 40, 48, 64, 96, 128, 256)
+# Pillow's ICNS writer maps these widths onto ic07..ic14; 16/24 have no slot.
+ICNS_SIZES = (32, 64, 128, 256, 512, 1024)
+MASTER_SIZE = 1024
 
-def main() -> None:
-    rendered = subprocess.run(
-        ["rsvg-convert", "--width", "1024", "--height", "1024", str(SOURCE)],
+# Small in-app logos. Rendering these from the vector (rather than letting the
+# UI downscale the 1024px master at runtime) avoids the hard aliasing that a
+# large single-pass reduction produces on the thin strokes.
+UI_SIZES = (64, 256)
+
+
+def supersample_factor(size: int) -> int:
+    """More samples at small sizes, where aliasing is most visible."""
+    if size <= 32:
+        return 8
+    if size <= 128:
+        return 4
+    if size <= 512:
+        return 2
+    return 1
+
+
+def render(size: int) -> Image.Image:
+    """Rasterize the SVG at `size`, supersampled and filtered down."""
+    factor = supersample_factor(size)
+    raw = subprocess.run(
+        [
+            "rsvg-convert",
+            "--width",
+            str(size * factor),
+            "--height",
+            str(size * factor),
+            str(SOURCE),
+        ],
         check=True,
         capture_output=True,
     ).stdout
-    with Image.open(BytesIO(rendered)) as image:
-        icon = image.convert("RGBA")
-        icon.save(ASSETS / "app-icon.png", format="PNG")
-        icon.save(
-            ASSETS / "app-icon.ico",
-            format="ICO",
-            sizes=[(size, size) for size in (16, 24, 32, 48, 64, 128, 256)],
-        )
-        icon.save(ASSETS / "app-icon.icns", format="ICNS")
+    image = Image.open(BytesIO(raw)).convert("RGBA")
+    if factor != 1:
+        image = image.resize((size, size), Image.Resampling.LANCZOS)
+    return image
+
+
+def main() -> None:
+    frames = {size: render(size) for size in sorted(set(ICO_SIZES) | set(ICNS_SIZES) | {MASTER_SIZE})}
+
+    frames[MASTER_SIZE].save(ASSETS / "app-icon.png", format="PNG")
+
+    for size in UI_SIZES:
+        render(size).save(ASSETS / f"app-icon-{size}.png", format="PNG")
+
+    ico_base = frames[256]
+    ico_base.save(
+        ASSETS / "app-icon.ico",
+        format="ICO",
+        sizes=[(size, size) for size in ICO_SIZES],
+        append_images=[frames[size] for size in ICO_SIZES if size != 256],
+    )
+
+    icns_base = frames[MASTER_SIZE]
+    icns_base.save(
+        ASSETS / "app-icon.icns",
+        format="ICNS",
+        append_images=[frames[size] for size in ICNS_SIZES if size != MASTER_SIZE],
+    )
 
 
 if __name__ == "__main__":
diff --git a/MapWizard.Desktop/Controls/SmoothScrollViewer.cs b/MapWizard.Desktop/Controls/SmoothScrollViewer.cs
index c633292..089d7c7 100644
--- a/MapWizard.Desktop/Controls/SmoothScrollViewer.cs
+++ b/MapWizard.Desktop/Controls/SmoothScrollViewer.cs
@@ -22,6 +22,8 @@ namespace MapWizard.Desktop.Controls;
 public class SmoothScrollViewer : ScrollViewer
 {
     private const double ScrollEpsilon = 1d;
+    private static readonly TimeSpan AnimationDetachDelay =
+        Scrollable.DefaultDuration + TimeSpan.FromMilliseconds(80);
 
     private static bool _isGlobalSmoothScrollingEnabled = true;
     private static event EventHandler? GlobalSmoothScrollingChanged;
@@ -50,11 +52,12 @@ public class SmoothScrollViewer : ScrollViewer
     private bool _isWheelAnimationActive;
     private PointerWheelEventArgs? _pendingWheelEvent;
     private bool _isWheelDispatching;
+    private readonly WheelInputClassifier _wheelInputClassifier = new();
 
     public SmoothScrollViewer()
     {
         ScrollChanged += OnScrollChanged;
-        _wheelAnimationTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(380) };
+        _wheelAnimationTimer = new DispatcherTimer { Interval = AnimationDetachDelay };
         _wheelAnimationTimer.Tick += (_, _) => DetachSmoothScrolling();
         AddHandler(PointerWheelChangedEvent, OnPointerWheelStart, RoutingStrategies.Tunnel, handledEventsToo: true);
         AddHandler(PointerWheelChangedEvent, OnPointerWheelAfter, RoutingStrategies.Bubble, handledEventsToo: true);
@@ -162,6 +165,7 @@ protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e
         _presenter = null;
         _horizontalScrollBar = null;
         _verticalScrollBar = null;
+        _wheelInputClassifier.Reset();
     }
 
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
@@ -210,7 +214,10 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
     private void OnScrollChanged(object? sender, ScrollChangedEventArgs e)
     {
-        UpdateFade();
+        if (IsScrollFadeEnabled)
+        {
+            UpdateFade();
+        }
     }
 
     private void OnPointerWheelStart(object? sender, PointerWheelEventArgs e)
@@ -220,9 +227,10 @@ private void OnPointerWheelStart(object? sender, PointerWheelEventArgs e)
             return;
         }
 
-        // Avalonia reports physical wheel detents as whole deltas. Fractional
-        // deltas come from precision devices and must track the finger directly.
-        if (!IsWholeDetent(e.Delta.X) || !IsWholeDetent(e.Delta.Y))
+        // Precision devices must remain coupled to the finger. Avalonia does not
+        // expose a touchpad flag, so the classifier uses fractional deltas and
+        // event cadence, retaining the result for the rest of the input burst.
+        if (_wheelInputClassifier.IsPrecisionInput(e.Delta.X, e.Delta.Y))
         {
             DetachSmoothScrolling();
             return;
@@ -258,9 +266,11 @@ private void OnPointerWheelAfter(object? sender, PointerWheelEventArgs e)
         _isWheelDispatching = false;
     }
 
-    private void OnPointerPressed(object? sender, PointerPressedEventArgs e) => DetachSmoothScrolling();
-
-    private static bool IsWholeDetent(double value) => Math.Abs(value - Math.Round(value)) < 0.001d;
+    private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        _wheelInputClassifier.Reset();
+        DetachSmoothScrolling();
+    }
 
     private void ResolveContentVisual()
     {
diff --git a/MapWizard.Desktop/Controls/WheelInputClassifier.cs b/MapWizard.Desktop/Controls/WheelInputClassifier.cs
new file mode 100644
index 0000000..c592ae4
--- /dev/null
+++ b/MapWizard.Desktop/Controls/WheelInputClassifier.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Diagnostics;
+
+namespace MapWizard.Desktop.Controls;
+
+/// <summary>
+/// Distinguishes discrete mouse-wheel input from precision scrolling as far as
+/// Avalonia's wheel event API allows. Fractional and horizontal deltas identify
+/// a precision gesture. Once identified, occasional integer deltas remain direct
+/// for the rest of that gesture without misclassifying rapid mouse-wheel detents.
+/// </summary>
+internal sealed class WheelInputClassifier
+{
+    private static readonly long SessionGapTicks = ToStopwatchTicks(TimeSpan.FromMilliseconds(180));
+
+    private long _lastEventTimestamp;
+    private bool _isPrecisionSession;
+
+    public bool IsPrecisionInput(double deltaX, double deltaY)
+    {
+        var now = Stopwatch.GetTimestamp();
+        var elapsed = _lastEventTimestamp == 0 ? long.MaxValue : now - _lastEventTimestamp;
+
+        if (elapsed > SessionGapTicks)
+        {
+            _isPrecisionSession = false;
+        }
+
+        var hasFractionalDelta = !IsWholeDetent(deltaX) || !IsWholeDetent(deltaY);
+        var hasHorizontalDelta = Math.Abs(deltaX) >= 0.001d;
+        if (hasFractionalDelta || hasHorizontalDelta)
+        {
+            _isPrecisionSession = true;
+        }
+
+        _lastEventTimestamp = now;
+        return _isPrecisionSession;
+    }
+
+    public void Reset()
+    {
+        _lastEventTimestamp = 0;
+        _isPrecisionSession = false;
+    }
+
+    private static bool IsWholeDetent(double value) =>
+        Math.Abs(value - Math.Round(value)) < 0.001d;
+
+    private static long ToStopwatchTicks(TimeSpan duration) =>
+        (long)(duration.TotalSeconds * Stopwatch.Frequency);
+}
diff --git a/MapWizard.Desktop/MapWizard.Desktop.csproj b/MapWizard.Desktop/MapWizard.Desktop.csproj
index 39eb1d0..433af60 100644
--- a/MapWizard.Desktop/MapWizard.Desktop.csproj
+++ b/MapWizard.Desktop/MapWizard.Desktop.csproj
@@ -14,13 +14,14 @@
     <PackageReference Include="Avalonia" Version="12.1.2" />
     <PackageReference Include="Avalonia.Controls.ColorPicker" Version="12.1.2" />
     <PackageReference Include="Avalonia.Desktop" Version="12.1.2" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.2" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.2" />
     <PackageReference Include="Avalonia.Wayland" Version="12.1.2" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="ManagedBass" Version="4.0.2" />
     <PackageReference Include="MapWizard.BeatmapParser" Version="1.0.6" />
     <PackageReference Include="Markdown.Avalonia.Tight" Version="12.0.0-a3" />
-    <PackageReference Include="Material.Icons.Avalonia" Version="3.0.2" />
+    <PackageReference Include="Lucide.Avalonia" Version="0.2.22" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
     <PackageReference Include="OsuMemoryDataProvider" Version="0.12.2" />
     <PackageReference Include="OsuWineMemReader" Version="1.0.1" />
@@ -39,6 +40,8 @@
     <None Include="Assets\Skins\Legacy\**\*" CopyToOutputDirectory="PreserveNewest" />
     <AvaloniaResource Include="Assets\app-icon.ico" />
     <AvaloniaResource Include="Assets\app-icon.png" />
+    <AvaloniaResource Include="Assets\app-icon-64.png" />
+    <AvaloniaResource Include="Assets\app-icon-256.png" />
     <AvaloniaResource Include="Assets\mapwizard.svg" />
   </ItemGroup>
 
diff --git a/MapWizard.Desktop/Models/AppLinks.cs b/MapWizard.Desktop/Models/AppLinks.cs
new file mode 100644
index 0000000..f766998
--- /dev/null
+++ b/MapWizard.Desktop/Models/AppLinks.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Diagnostics;
+
+namespace MapWizard.Desktop.Models;
+
+/// <summary>
+/// External links shown in the app (title bar, settings support tab).
+/// </summary>
+public static class AppLinks
+{
+    public const string Repository = "https://github.com/maotovisk/MapWizard";
+    public const string Issues = "https://github.com/maotovisk/MapWizard/issues";
+    public const string Website = "https://mapwizard.maot.dev";
+
+    // Kept as the short link so the invite lives only in the Cloudflare redirect.
+    public const string Discord = "https://mapwizard.maot.dev/discord";
+    public const string Documentation = "https://mapwizard.maot.dev/#/wiki/Getting_started/en";
+
+    /// <summary>
+    /// Opens an http/https URL in the default browser. Returns false for invalid
+    /// URLs or when the shell cannot launch the link.
+    /// </summary>
+    public static bool TryOpen(string url)
+    {
+        if (!Uri.TryCreate(url, UriKind.Absolute, out var uri) ||
+            (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps))
+        {
+            return false;
+        }
+
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = uri.ToString(),
+                UseShellExecute = true
+            });
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
diff --git a/MapWizard.Desktop/Models/LazerSessionState.cs b/MapWizard.Desktop/Models/LazerSessionState.cs
new file mode 100644
index 0000000..4f617a1
--- /dev/null
+++ b/MapWizard.Desktop/Models/LazerSessionState.cs
@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+
+namespace MapWizard.Desktop.Models;
+
+public sealed record LazerSessionState(
+    bool IsRunning,
+    IReadOnlyList<string> MountedBeatmapPaths);
diff --git a/MapWizard.Desktop/Models/QuickStartTool.cs b/MapWizard.Desktop/Models/QuickStartTool.cs
new file mode 100644
index 0000000..e1580f6
--- /dev/null
+++ b/MapWizard.Desktop/Models/QuickStartTool.cs
@@ -0,0 +1,9 @@
+using Lucide.Avalonia;
+
+namespace MapWizard.Desktop.Models;
+
+/// <summary>
+/// One entry in the Quick Start list. <see cref="Key"/> is resolved by the view
+/// to the matching navigation target.
+/// </summary>
+public sealed record QuickStartTool(string Key, string Name, string Description, LucideIconKind Icon);
diff --git a/MapWizard.Desktop/Program.cs b/MapWizard.Desktop/Program.cs
index 73335c3..42e628a 100644
--- a/MapWizard.Desktop/Program.cs
+++ b/MapWizard.Desktop/Program.cs
@@ -21,7 +21,7 @@ public static void Main(string[] args)
 
         VelopackApp.Build()
             .Run();
-        
+
         BuildAvaloniaApp(forceSoftwareRendering)
             .StartWithClassicDesktopLifetime(args);
     }
@@ -31,12 +31,17 @@ private static AppBuilder BuildAvaloniaApp(bool forceSoftwareRendering)
     {
         var app = AppBuilder.Configure<App>()
             .UsePlatformDetect()
-            .LogToTrace();
+            .WithInterFont();
+#if DEBUG
+        app = app.LogToTrace();
+#endif
 
         if (OperatingSystem.IsLinux())
         {
+            // For now, avalonia does not automatically choose Wayland in `UsePlatformDetect`,
+            // so we need to manually check for it. SEE: https://github.com/AvaloniaUI/Avalonia/pull/21448
             if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("WAYLAND_DISPLAY")))
-                app.UseWayland();
+                app.UseWaylandWithFallback();
             else
                 app.With(new X11PlatformOptions()
                 {
@@ -50,8 +55,7 @@ private static AppBuilder BuildAvaloniaApp(bool forceSoftwareRendering)
                         ]
                 });
         }
-
         return app;
     }
-    
+
 }
diff --git a/MapWizard.Desktop/Services/MemoryService/ILazerLookupService.cs b/MapWizard.Desktop/Services/MemoryService/ILazerLookupService.cs
index ae838fd..7407600 100644
--- a/MapWizard.Desktop/Services/MemoryService/ILazerLookupService.cs
+++ b/MapWizard.Desktop/Services/MemoryService/ILazerLookupService.cs
@@ -1,9 +1,8 @@
-using System.Collections.Generic;
 using MapWizard.Desktop.Models;
 
 namespace MapWizard.Desktop.Services.MemoryService;
 
 public interface ILazerLookupService
 {
-    Result<IReadOnlyList<string>> GetMountedBeatmapPaths();
+    Result<LazerSessionState> GetSessionState();
 }
diff --git a/MapWizard.Desktop/Services/MemoryService/LazerLookupService.cs b/MapWizard.Desktop/Services/MemoryService/LazerLookupService.cs
index 5b4d44b..b5c6374 100644
--- a/MapWizard.Desktop/Services/MemoryService/LazerLookupService.cs
+++ b/MapWizard.Desktop/Services/MemoryService/LazerLookupService.cs
@@ -12,22 +12,22 @@ namespace MapWizard.Desktop.Services.MemoryService;
 /// Finds beatmaps exposed by osu!lazer's "Edit externally" operation.
 /// </summary>
 /// <remarks>
-/// lazer mounts a beatmap set at <c>Path.GetTempPath()/&lt;beatmap-set SHA-256&gt;</c> and removes
-/// it after the user finishes external editing. Reading and writing that mount lets lazer remain
+/// osu!lazer mounts a beatmap set at <c>Path.GetTempPath()/&lt;beatmap-set SHA-256&gt;</c> and removes
+/// it after the user finishes external editing. Reading and writing that mount lets osu!lazer remain
 /// the sole owner of its Realm database and content-addressed file store.
 /// </remarks>
 public sealed class LazerLookupService : ILazerLookupService
 {
     private static readonly string[] lazerProcessNames = ["osu!", "osu", "osu.Desktop"];
 
-    public Result<IReadOnlyList<string>> GetMountedBeatmapPaths()
+    public Result<LazerSessionState> GetSessionState()
     {
         try
         {
             var processStartUtc = GetRunningLazerStartTimeUtc();
             if (processStartUtc is null)
             {
-                return Success([]);
+                return Success(isRunning: false, []);
             }
 
             var mountedSet = Directory.EnumerateDirectories(Path.GetTempPath(), "*", SearchOption.TopDirectoryOnly)
@@ -37,14 +37,14 @@ public Result<IReadOnlyList<string>> GetMountedBeatmapPaths()
                 .OrderByDescending(candidate => candidate!.LastWriteUtc)
                 .FirstOrDefault();
 
-            return Success(mountedSet?.BeatmapPaths ?? []);
+            return Success(isRunning: true, mountedSet?.BeatmapPaths ?? []);
         }
         catch (Exception ex)
         {
             MapWizard.Tools.HelperExtensions.MapWizardLogger.LogException(ex);
-            return new Result<IReadOnlyList<string>>
+            return new Result<LazerSessionState>
             {
-                Value = [],
+                Value = new LazerSessionState(false, []),
                 Status = ResultStatus.Error,
                 ErrorMessage = $"Unable to inspect osu!lazer's external-edit folder. {ex.Message}"
             };
@@ -153,9 +153,11 @@ private static bool IsSha256DirectoryName(string name)
         return true;
     }
 
-    private static Result<IReadOnlyList<string>> Success(IReadOnlyList<string> paths) => new()
+    private static Result<LazerSessionState> Success(
+        bool isRunning,
+        IReadOnlyList<string> paths) => new()
     {
-        Value = paths,
+        Value = new LazerSessionState(isRunning, paths),
         Status = ResultStatus.Success
     };
 
diff --git a/MapWizard.Desktop/Transitions/BlurSlideFadeTransition.cs b/MapWizard.Desktop/Transitions/BlurSlideFadeTransition.cs
index 76b0665..453f6a0 100644
--- a/MapWizard.Desktop/Transitions/BlurSlideFadeTransition.cs
+++ b/MapWizard.Desktop/Transitions/BlurSlideFadeTransition.cs
@@ -72,14 +72,16 @@ public async Task Start(Visual? from, Visual? to, bool forward, CancellationToke
     private async Task AnimateOutAsync(Visual from, double direction, CancellationToken cancellationToken)
     {
         var blur = new BlurEffect { Radius = 0d };
+        var translation = new TranslateTransform();
         from.Effect = blur;
+        from.RenderTransform = translation;
 
         const int steps = 10;
         for (var i = 1; i <= steps; i++)
         {
             var t = SmoothStep((double)i / steps);
             from.Opacity = 1d - t;
-            from.RenderTransform = new TranslateTransform(-direction * SlideDistance * t, 0d);
+            translation.X = -direction * SlideDistance * t;
             blur.Radius = MaxBlurRadius * t;
             await Task.Delay(OutDuration / steps, cancellationToken);
         }
@@ -88,9 +90,10 @@ private async Task AnimateOutAsync(Visual from, double direction, CancellationTo
     private async Task AnimateInAsync(Visual to, double direction, CancellationToken cancellationToken)
     {
         var blur = new BlurEffect { Radius = MaxBlurRadius };
+        var translation = new TranslateTransform(direction * SlideDistance, 0d);
         to.Effect = blur;
         to.Opacity = 0d;
-        to.RenderTransform = new TranslateTransform(direction * SlideDistance, 0d);
+        to.RenderTransform = translation;
         to.IsVisible = true;
 
         const int steps = 14;
@@ -98,7 +101,7 @@ private async Task AnimateInAsync(Visual to, double direction, CancellationToken
         {
             var t = SmoothStep((double)i / steps);
             to.Opacity = t;
-            to.RenderTransform = new TranslateTransform(direction * SlideDistance * (1d - t), 0d);
+            translation.X = direction * SlideDistance * (1d - t);
             blur.Radius = MaxBlurRadius * (1d - t);
             await Task.Delay(InDuration / steps, cancellationToken);
         }
diff --git a/MapWizard.Desktop/Utils/BeatmapSelectionUtils.cs b/MapWizard.Desktop/Utils/BeatmapSelectionUtils.cs
index d94841c..83130fd 100644
--- a/MapWizard.Desktop/Utils/BeatmapSelectionUtils.cs
+++ b/MapWizard.Desktop/Utils/BeatmapSelectionUtils.cs
@@ -30,16 +30,24 @@ public static class BeatmapSelectionUtils
         string emptyMemoryMessage,
         CancellationToken cancellationToken = default)
     {
-        var lazerResult = lazerLookupService.GetMountedBeatmapPaths();
-        var stableResult = osuMemoryReaderService.GetBeatmapPath();
-
-        if (lazerResult.Status == ResultStatus.Success && lazerResult.Value is { Count: > 0 } mountedBeatmaps)
+        // Both probes enumerate processes and perform filesystem, IPC, or native-memory work.
+        // Keep them off Avalonia's dispatcher; everything after this await intentionally resumes
+        // on the UI thread because it may open a modal or show a notification.
+        var (lazerResult, stableResult) = await Task.Run(
+            () => (
+                lazerLookupService.GetSessionState(),
+                osuMemoryReaderService.GetBeatmapPath()),
+            cancellationToken);
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var stableBeatmapPath = stableResult.Status == ResultStatus.Success &&
+                                !string.IsNullOrWhiteSpace(stableResult.Value)
+            ? stableResult.Value
+            : null;
+
+        if (lazerResult.Status == ResultStatus.Success &&
+            lazerResult.Value?.MountedBeatmapPaths is { Count: > 0 } mountedBeatmaps)
         {
-            var stableBeatmapPath = stableResult.Status == ResultStatus.Success &&
-                                    !string.IsNullOrWhiteSpace(stableResult.Value)
-                ? stableResult.Value
-                : null;
-
             return await ShowBeatmapSourcePickerAsync(
                 modalService,
                 mountedBeatmaps,
@@ -48,6 +56,20 @@ public static class BeatmapSelectionUtils
                 cancellationToken);
         }
 
+        if (stableBeatmapPath is not null)
+        {
+            return stableBeatmapPath;
+        }
+
+        if (lazerResult.Status == ResultStatus.Success && lazerResult.Value?.IsRunning == true)
+        {
+            return await GuideLazerMountAsync(
+                lazerLookupService,
+                modalService,
+                showToast,
+                cancellationToken);
+        }
+
         return ResolveBeatmapFromMemoryResult(
             stableResult,
             showToast,
@@ -59,6 +81,118 @@ public static class BeatmapSelectionUtils
             emptyMemoryMessage);
     }
 
+    private static async Task<string?> GuideLazerMountAsync(
+        ILazerLookupService lazerLookupService,
+        IModalService modalService,
+        Action<NotificationType, string, string> showToast,
+        CancellationToken cancellationToken)
+    {
+        var content = new StackPanel
+        {
+            Width = 520,
+            Spacing = 12,
+            Children =
+            {
+                new TextBlock
+                {
+                    Text = "You currently have osu!lazer open, but MapWizard could not find a mounted beatmap folder.",
+                    TextWrapping = Avalonia.Media.TextWrapping.Wrap
+                },
+                CreateInstructionStep("1", "Open the beatmap in osu!lazer's editor."),
+                CreateInstructionStep("2", "Open the File menu and choose “Edit externally”."),
+                CreateInstructionStep("3", "Keep the external-edit screen open, then return to MapWizard."),
+                new ImportantNotice
+                {
+                    Message = "Keep the external-edit screen open until MapWizard has finished."
+                }
+            }
+        };
+
+        bool shouldRetry;
+        try
+        {
+            shouldRetry = await modalService.ShowConfirmationAsync(
+                "Mount a beatmap from osu!lazer",
+                content,
+                "I mounted the folder",
+                "Cancel",
+                cancellationToken);
+        }
+        catch (InvalidOperationException)
+        {
+            showToast(
+                NotificationType.Warning,
+                "osu!lazer",
+                "Could not show mounting instructions because another dialog is already open.");
+            return null;
+        }
+
+        if (!shouldRetry || cancellationToken.IsCancellationRequested)
+        {
+            return null;
+        }
+
+        var refreshedResult = await Task.Run(
+            lazerLookupService.GetSessionState,
+            cancellationToken);
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (refreshedResult.Status == ResultStatus.Error)
+        {
+            showToast(
+                NotificationType.Error,
+                "osu!lazer",
+                refreshedResult.ErrorMessage ?? "Unable to inspect osu!lazer's mounted beatmap folder.");
+            return null;
+        }
+
+        if (refreshedResult.Value?.MountedBeatmapPaths is not { Count: > 0 } mountedBeatmaps)
+        {
+            showToast(
+                NotificationType.Warning,
+                "No mounted beatmap found",
+                "Keep osu!lazer's external-edit screen open, then try From osu! again.");
+            return null;
+        }
+
+        return await ShowBeatmapSourcePickerAsync(
+            modalService,
+            mountedBeatmaps,
+            stableBeatmapPath: null,
+            showToast,
+            cancellationToken);
+    }
+
+    private static Grid CreateInstructionStep(string number, string instruction)
+    {
+        var numberLabel = new TextBlock
+        {
+            Text = number,
+            Width = 24,
+            Height = 24,
+            FontWeight = Avalonia.Media.FontWeight.Bold,
+            TextAlignment = Avalonia.Media.TextAlignment.Center,
+            VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center
+        };
+
+        var instructionLabel = new TextBlock
+        {
+            Text = instruction,
+            TextWrapping = Avalonia.Media.TextWrapping.Wrap,
+            VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center
+        };
+
+        var step = new Grid
+        {
+            ColumnDefinitions = new ColumnDefinitions("Auto,*"),
+            ColumnSpacing = 10
+        };
+        step.Children.Add(numberLabel);
+        Grid.SetColumn(instructionLabel, 1);
+        step.Children.Add(instructionLabel);
+        return step;
+    }
+
     public static string? TryGetBeatmapFromMemory(
         IOsuMemoryReaderService osuMemoryReaderService,
         Action<NotificationType, string, string> showToast,
@@ -117,7 +251,7 @@ public static class BeatmapSelectionUtils
 
         content.Children.Add(new ImportantNotice
         {
-            Message = "Keep lazer's external-edit screen open until MapWizard has finished."
+            Message = "Keep osu!lazer's external-edit screen open until MapWizard has finished."
         });
 
         var sourceCards = new StackPanel { Spacing = 12 };
@@ -169,7 +303,7 @@ void AddSourceCard(
         try
         {
             return await modalService.ShowAsync(
-                new ModalRequest(content, "Select lazer difficulty"),
+                new ModalRequest(content, "Select osu!lazer difficulty"),
                 cancellationToken) as string;
         }
         catch (InvalidOperationException)
diff --git a/MapWizard.Desktop/Utils/MapPickerDialogUtils.cs b/MapWizard.Desktop/Utils/MapPickerDialogUtils.cs
index 61f6ffe..d7c1e48 100644
--- a/MapWizard.Desktop/Utils/MapPickerDialogUtils.cs
+++ b/MapWizard.Desktop/Utils/MapPickerDialogUtils.cs
@@ -28,7 +28,14 @@ public static class MapPickerDialogUtils
         CancellationToken token,
         string? preferredMapsetDirectoryPath = null)
     {
-        var songsPath = SongsPathResolver.ResolveSongsPath(settingsService, songLibraryService);
+        // Auto-detection can enumerate processes and probe several filesystem locations.
+        // Resolve it away from Avalonia's dispatcher, then create the dialog controls on
+        // the captured UI context after the await.
+        var songsPath = await Task.Run(
+            () => SongsPathResolver.ResolveSongsPath(settingsService, songLibraryService),
+            token);
+        token.ThrowIfCancellationRequested();
+
         var songSelectViewModel = new SongSelectDialogViewModel(
             songLibraryService,
             filesService,
diff --git a/MapWizard.Desktop/ViewModels/HitSoundVisualizerViewModel.cs b/MapWizard.Desktop/ViewModels/HitSoundVisualizerViewModel.cs
index b0f21b9..05f3dda 100644
--- a/MapWizard.Desktop/ViewModels/HitSoundVisualizerViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/HitSoundVisualizerViewModel.cs
@@ -13,7 +13,7 @@
 using BeatmapParser.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Material.Icons;
+using Lucide.Avalonia;
 using MapWizard.Desktop.Extensions;
 using MapWizard.Desktop.Models;
 using MapWizard.Desktop.Models.HitSoundVisualizer;
@@ -135,11 +135,11 @@ public ObservableCollection<SelectedMap> AdditionalBeatmaps
     [ObservableProperty] private ObservableCollection<HitSoundVisualizerSampleChange> _sampleChanges = [];
     [ObservableProperty] private ObservableCollection<TimelineRowLabel> _timelineRowLabels =
     [
-        new TimelineRowLabel("Sample changes", MaterialIconKind.Tune),
-        new TimelineRowLabel("HitNormal", MaterialIconKind.MusicNote),
-        new TimelineRowLabel("Whistle", MaterialIconKind.Bullhorn),
-        new TimelineRowLabel("Finish", MaterialIconKind.Star),
-        new TimelineRowLabel("Clap", MaterialIconKind.HandClap)
+        new TimelineRowLabel("Sample changes", LucideIconKind.SlidersHorizontal),
+        new TimelineRowLabel("HitNormal", LucideIconKind.Music),
+        new TimelineRowLabel("Whistle", LucideIconKind.Megaphone),
+        new TimelineRowLabel("Finish", LucideIconKind.Star),
+        new TimelineRowLabel("Clap", LucideIconKind.Hand)
     ];
 
     /// <summary>
@@ -164,9 +164,9 @@ public ObservableCollection<SelectedMap> AdditionalBeatmaps
     public string CursorTimeText => FormatTimeLabel(CursorTimeMs);
     public string TimelineEndText => FormatTimeLabel((int)Math.Round(TimelineEndMs));
     public string PlaybackButtonText => IsPlaybackRunning ? "Pause" : (IsPlaybackPaused ? "Resume" : "Play");
-    public MaterialIconKind PlaybackButtonIconKind => IsPlaybackRunning
-        ? MaterialIconKind.Pause
-        : MaterialIconKind.Play;
+    public LucideIconKind PlaybackButtonIconKind => IsPlaybackRunning
+        ? LucideIconKind.Pause
+        : LucideIconKind.Play;
     public string AudioSourceStatus => !HasLoadedSongAudio || string.IsNullOrWhiteSpace(_loadedAudioFilePath)
         ? "Song audio unavailable (playback disabled)."
         : $"Song: {Path.GetFileName(_loadedAudioFilePath)}";
@@ -178,8 +178,8 @@ public ObservableCollection<SelectedMap> AdditionalBeatmaps
         : $"Legacy fallback skin: {Path.GetFileName(_legacySkinDirectoryPath)}";
     public string SongVolumeText => $"{Math.Clamp(SongVolumePercent, 0, 100)}%";
     public string HitSoundVolumeText => $"{Math.Clamp(HitSoundVolumePercent, 0, 100)}%";
-    public MaterialIconKind SongVolumeIconKind => SongVolumePercent <= 0 ? MaterialIconKind.MusicNoteOff : MaterialIconKind.MusicNote;
-    public MaterialIconKind EffectsVolumeIconKind => HitSoundVolumePercent <= 0 ? MaterialIconKind.VolumeOff : MaterialIconKind.VolumeHigh;
+    public LucideIconKind SongVolumeIconKind => SongVolumePercent <= 0 ? LucideIconKind.VolumeX : LucideIconKind.Music;
+    public LucideIconKind EffectsVolumeIconKind => HitSoundVolumePercent <= 0 ? LucideIconKind.VolumeOff : LucideIconKind.Volume2;
     public string SelectedSnapDivisorText => $"1/{SelectedSnapDivisorDenominator}";
     public string ContextSamplePointTimeText => FormatTimeLabel(ContextSamplePointTimeMs);
     public bool ShowSamplePointContextPopup => IsSampleRowContextActive;
@@ -3515,4 +3515,4 @@ private SampleSet ResolveAutoSampleSetForPointAtTime(HitSound hitSound, int time
 /// Titles timeline rows with a fancy addition name + icon so the row header
 /// can be flashed when its hitsound plays.
 /// </summary>
-public sealed record TimelineRowLabel(string Title, MaterialIconKind Icon);
+public sealed record TimelineRowLabel(string Title, LucideIconKind Icon);
diff --git a/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs b/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs
index b6ff6f7..5e6f926 100644
--- a/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/MainWindowViewModel.cs
@@ -5,6 +5,7 @@
 using CommunityToolkit.Mvvm.Input;
 using MapWizard.Desktop.Enums;
 using MapWizard.Desktop.Extensions;
+using MapWizard.Desktop.Models;
 using MapWizard.Desktop.Services;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -156,25 +157,27 @@ private void OpenSettings()
         [RelayCommand]
         private void OpenGithub()
         {
-            var githubUrl = "https://github.com/maotovisk/MapWizard";
-            var uri = new Uri(githubUrl);
+            OpenExternalLink(AppLinks.Repository, "GitHub");
+        }
 
-            if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
-            {
-                System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
-                {
-                    FileName = uri.ToString(),
-                    UseShellExecute = true
-                });
-            }
-            else
+        [RelayCommand]
+        private void OpenDiscord()
+        {
+            OpenExternalLink(AppLinks.Discord, "Discord");
+        }
+
+        private void OpenExternalLink(string url, string title)
+        {
+            if (AppLinks.TryOpen(url))
             {
-                NotificationService.ShowToast(
-                    NotificationType.Error,
-                    "Invalid URL",
-                    "The URL is not valid.",
-                    TimeSpan.FromSeconds(8));
+                return;
             }
+
+            NotificationService.ShowToast(
+                NotificationType.Error,
+                title,
+                "The link could not be opened.",
+                TimeSpan.FromSeconds(8));
         }
     }
 }
diff --git a/MapWizard.Desktop/ViewModels/SettingsViewModel.cs b/MapWizard.Desktop/ViewModels/SettingsViewModel.cs
index 54e3542..8677785 100644
--- a/MapWizard.Desktop/ViewModels/SettingsViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/SettingsViewModel.cs
@@ -11,6 +11,7 @@
 using CommunityToolkit.Mvvm.Input;
 using MapWizard.Desktop.Controls;
 using MapWizard.Desktop.Extensions;
+using MapWizard.Desktop.Models;
 using MapWizard.Desktop.Models.Settings;
 using MapWizard.Desktop.Services;
 using MapWizard.Desktop.Services.Playback;
@@ -75,6 +76,36 @@ public partial class SettingsViewModel(
 
     public string ConfigDirectoryPath { get; } = settingsService.ConfigDirectoryPath;
 
+    public string VersionLabel { get; } = updateService.VersionLabel;
+
+    [RelayCommand]
+    private void OpenDiscord()
+    {
+        OpenExternalLink(AppLinks.Discord, "Discord");
+    }
+
+    [RelayCommand]
+    private void OpenIssues()
+    {
+        OpenExternalLink(AppLinks.Issues, "GitHub");
+    }
+
+    [RelayCommand]
+    private void OpenDocumentation()
+    {
+        OpenExternalLink(AppLinks.Documentation, "Documentation");
+    }
+
+    private void OpenExternalLink(string url, string title)
+    {
+        if (AppLinks.TryOpen(url))
+        {
+            return;
+        }
+
+        notificationService.ShowToast(NotificationType.Error, title, "The link could not be opened.");
+    }
+
     [RelayCommand]
     private void OpenConfigDirectory()
     {
diff --git a/MapWizard.Desktop/ViewModels/SongSelectDialogViewModel.cs b/MapWizard.Desktop/ViewModels/SongSelectDialogViewModel.cs
index 5328b25..7da6047 100644
--- a/MapWizard.Desktop/ViewModels/SongSelectDialogViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/SongSelectDialogViewModel.cs
@@ -581,14 +581,18 @@ private async Task LoadMountedLazerMapsetAsync(CancellationToken cancellationTok
     {
         try
         {
-            var mountedBeatmaps = lazerLookupService.GetMountedBeatmapPaths();
-            if (mountedBeatmaps.Status != ResultStatus.Success || mountedBeatmaps.Value is not { Count: > 0 })
+            var mountedBeatmaps = await Task.Run(
+                lazerLookupService.GetSessionState,
+                cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+            if (mountedBeatmaps.Status != ResultStatus.Success ||
+                mountedBeatmaps.Value?.MountedBeatmapPaths is not { Count: > 0 } mountedPaths)
             {
                 MountedLazerMapset = null;
                 return;
             }
 
-            var mountedDirectory = Path.GetDirectoryName(mountedBeatmaps.Value[0]);
+            var mountedDirectory = Path.GetDirectoryName(mountedPaths[0]);
             if (string.IsNullOrWhiteSpace(mountedDirectory) || !Directory.Exists(mountedDirectory))
             {
                 MountedLazerMapset = null;
diff --git a/MapWizard.Desktop/ViewModels/WelcomePageViewModel.cs b/MapWizard.Desktop/ViewModels/WelcomePageViewModel.cs
index 171601d..f0e9ac0 100644
--- a/MapWizard.Desktop/ViewModels/WelcomePageViewModel.cs
+++ b/MapWizard.Desktop/ViewModels/WelcomePageViewModel.cs
@@ -1,10 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Layout;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Lucide.Avalonia;
 using MapWizard.Desktop.Extensions;
+using MapWizard.Desktop.Models;
 using MapWizard.Desktop.Services;
 using MapWizard.Desktop.Views.Dialogs;
 using MapWizard.Tools.HelperExtensions;
@@ -15,10 +19,69 @@ namespace MapWizard.Desktop.ViewModels;
 public partial class WelcomePageViewModel(
     INotificationService notificationService,
     IModalService modalService,
-    IUpdateService updateService) : ViewModelBase
+    IUpdateService updateService,
+    ISettingsService settingsService,
+    ISongLibraryService songLibraryService) : ViewModelBase
 {
     public string Message { get; set; } = "Welcome to MapWizard, select a tool to get started!";
 
+    /// <summary>Tools shown in the Start list.</summary>
+    public IReadOnlyList<QuickStartTool> Tools { get; } =
+    [
+        new("copier", "Hitsound Copier", "Copy hitsounds between difficulties.", LucideIconKind.Copy),
+        new("metadata", "Metadata Manager", "Edit and sync metadata across a mapset.", LucideIconKind.Files),
+        new("hitsound-editor", "HitSound Editor", "Inspect and tweak hitsounds on a timeline.", LucideIconKind.ChartLine),
+        new("combo-colour", "Combo Colour Studio", "Design and apply combo colour patterns.", LucideIconKind.Palette),
+        new("map-cleaner", "Map Cleaner", "Resnap objects and remove unused timing points.", LucideIconKind.BrushCleaning),
+    ];
+
+    [ObservableProperty]
+    private bool _isSongsFolderConfigured;
+
+    [ObservableProperty]
+    private string _songsFolderStatusText = "osu! Songs folder not set.";
+
+    public void RefreshSongsFolderStatus()
+    {
+        var songsPath = settingsService.GetMainSettings().SongsPath;
+        IsSongsFolderConfigured = songLibraryService.IsValidSongsPath(songsPath);
+        SongsFolderStatusText = IsSongsFolderConfigured
+            ? $"Songs folder: {songsPath}"
+            : "osu! Songs folder not set.";
+    }
+
+    [RelayCommand]
+    private async Task CheckForUpdates()
+    {
+        await CheckForUpdatesCoreAsync(showNotInstalledMessage: true);
+    }
+
+    [RelayCommand]
+    private void OpenDiscord()
+    {
+        OpenExternalLink(AppLinks.Discord, "Discord");
+    }
+
+    [RelayCommand]
+    private void OpenDocumentation()
+    {
+        OpenExternalLink(AppLinks.Documentation, "Documentation");
+    }
+
+    [RelayCommand]
+    private void OpenGithub()
+    {
+        OpenExternalLink(AppLinks.Repository, "GitHub");
+    }
+
+    private void OpenExternalLink(string url, string title)
+    {
+        if (!AppLinks.TryOpen(url))
+        {
+            notificationService.ShowToast(NotificationType.Error, title, "The link could not be opened.");
+        }
+    }
+
     private bool _startupCheckDone;
 
     public async Task CheckForUpdatesOnStartupAsync()
@@ -102,7 +165,28 @@ private async Task ShowUpdateAvailableModalAsync(UpdateInfo info)
         laterButton.Click += async (_, _) => await modalService.CloseAsync(null);
         footerPanel.Children.Add(laterButton);
 
-        var updateButton = new Button { Content = "Update" };
+        var updateButton = new Button
+        {
+            Content = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                Spacing = 8,
+                Children =
+                {
+                    new LucideIcon
+                    {
+                        Kind = LucideIconKind.Download,
+                        Size = 16,
+                        VerticalAlignment = VerticalAlignment.Center
+                    },
+                    new TextBlock
+                    {
+                        Text = "Update",
+                        VerticalAlignment = VerticalAlignment.Center
+                    }
+                }
+            }
+        };
         updateButton.Classes.Add("Flat");
         updateButton.Classes.Add("Compact");
         updateButton.Click += async (_, _) => await modalService.CloseAsync("Update");
diff --git a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
index e32a5d9..fdcc6ef 100644
--- a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
+++ b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
@@ -6,7 +6,6 @@
     xmlns:local="clr-namespace:MapWizard.Desktop.Converters"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     xmlns:models="using:MapWizard.Desktop.Models"
     xmlns:vm="clr-namespace:MapWizard.Desktop.ViewModels"
@@ -76,27 +75,24 @@
                         BorderBrush="{DynamicResource MapWizardAccentBrush}"
                         BorderThickness="1">
                     <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
-                        <materialIcons:MaterialIcon Kind="CheckCircle"
-                                                    Width="14"
-                                                    Height="14"
+                        <LucideIcon Kind="CircleCheck"
+                                                    Size="14"
                                                     Foreground="#64D58A"
                                                     IsVisible="{Binding IsProjectSavedIndicatorVisible}" />
                         <TextBlock Text="Saved"
                                    FontSize="12"
                                    IsVisible="{Binding IsProjectSavedIndicatorVisible}" />
 
-                        <materialIcons:MaterialIcon Kind="CircleEditOutline"
-                                                    Width="14"
-                                                    Height="14"
+                        <LucideIcon Kind="SquarePen"
+                                                    Size="14"
                                                     Foreground="#E8C57A"
                                                     IsVisible="{Binding IsProjectUnsavedIndicatorVisible}" />
                         <TextBlock Text="Unsaved changes"
                                    FontSize="12"
                                    IsVisible="{Binding IsProjectUnsavedIndicatorVisible}" />
 
-                        <materialIcons:MaterialIcon Kind="CircleOutline"
-                                                    Width="14"
-                                                    Height="14"
+                        <LucideIcon Kind="Circle"
+                                                    Size="14"
                                                     Foreground="{DynamicResource MapWizardTextSecondaryBrush}"
                                                     IsVisible="{Binding IsProjectNotSavedIndicatorVisible}" />
                         <TextBlock Text="Not saved"
@@ -112,7 +108,7 @@
                         IsEnabled="{Binding CanSaveProject}"
                         ToolTip.Tip="Save local combo project (Ctrl+S)">
                     <StackPanel Orientation="Horizontal" Spacing="8">
-                        <materialIcons:MaterialIcon Kind="ContentSaveOutline" Width="24" Height="24" />
+                        <LucideIcon Kind="Save" Size="24" />
                         <TextBlock VerticalAlignment="Center"
                                    FontWeight="Normal"
                                    FontSize="16"
@@ -124,7 +120,7 @@
                         Command="{Binding ExportColourHaxCommand}"
                         ToolTip.Tip="Export colour hax to target beatmaps">
                     <StackPanel Orientation="Horizontal" Spacing="8">
-                        <materialIcons:MaterialIcon Kind="ContentSave" Width="24" Height="24" />
+                        <LucideIcon Kind="Save" Size="24" />
                         <TextBlock VerticalAlignment="Center"
                                    FontWeight="Normal"
                                    FontSize="16"
@@ -141,8 +137,6 @@
                 <controls:BeatmapSelectionPanel
                     OriginMap="{Binding OriginBeatmap}"
                     DestinationMaps="{Binding DestinationBeatmaps}"
-                    SourceSubtitle="Select the beatmap to load combo colours from."
-                    TargetSubtitle="Select the beatmaps to export the colour hax to."
                     OriginMemoryToolTip="Use currently selected osu! beatmap"
                     DestinationMemoryToolTip="Add currently selected osu! beatmap" />
 
@@ -166,7 +160,7 @@
                                                     Command="{ReflectionBinding DataContext.RemoveColourCommand, ElementName=Root}"
                                                     CommandParameter="{Binding}"
                                                     ToolTip.Tip="Remove this combo colour">
-                                                <materialIcons:MaterialIcon Kind="Close" Width="20" Height="20" />
+                                                <LucideIcon Kind="X" Size="20" />
                                             </Button>
                                         </StackPanel>
                                     </Grid>
@@ -176,7 +170,7 @@
 
                         <Grid ColumnDefinitions="Auto,Auto,Auto,*,Auto,Auto" ColumnSpacing="8">
                             <Button Classes="Basic" Command="{Binding AddColourCommand}" ToolTip.Tip="Add new combo colour">
-                                <materialIcons:MaterialIcon Kind="Add" Width="24" Height="24" />
+                                <LucideIcon Kind="Plus" Size="24" />
                             </Button>
 
                             <TextBlock Grid.Column="1" Text="Palette size" VerticalAlignment="Center" />
@@ -191,7 +185,7 @@
                                     Command="{Binding GenerateColoursFromBackgroundCommand}"
                                     ToolTip.Tip="Generate combo colours from beatmap background">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
-                                    <materialIcons:MaterialIcon Kind="ImageFilterCenterFocusStrong" Width="18" Height="18" />
+                                    <LucideIcon Kind="Focus" Size="18" />
                                     <TextBlock Text="From BG" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Button>
@@ -202,7 +196,7 @@
                                     Command="{Binding PickImageAndGenerateColoursCommand}"
                                     ToolTip.Tip="Generate combo colours from selected image">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
-                                    <materialIcons:MaterialIcon Kind="FolderImage" Width="18" Height="18" />
+                                    <LucideIcon Kind="Image" Size="18" />
                                     <TextBlock Text="From Image" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Button>
@@ -220,7 +214,7 @@
                                     Command="{Binding ImportColourHaxFromOriginCommand}"
                                     ToolTip.Tip="Import colour hax from selected source beatmap">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
-                                    <materialIcons:MaterialIcon Kind="Import" Width="18" Height="18" />
+                                    <LucideIcon Kind="Import" Size="18" />
                                     <TextBlock Text="Import ColourHax" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Button>
@@ -281,21 +275,21 @@
                                                         Command="{ReflectionBinding DataContext.AddColourToPointCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Add combo colour to this point sequence">
-                                                    <materialIcons:MaterialIcon Kind="Add" Width="16" Height="16" />
+                                                    <LucideIcon Kind="Plus" Size="16" />
                                                 </Button>
 
                                                 <Button Classes="Basic"
                                                         Command="{ReflectionBinding DataContext.AddColourPointFromSequenceCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Create a new colour point from this sequence">
-                                                    <materialIcons:MaterialIcon Kind="ContentCopy" Width="16" Height="16" />
+                                                    <LucideIcon Kind="Copy" Size="16" />
                                                 </Button>
 
                                                 <Button Classes="Basic"
                                                         Command="{ReflectionBinding DataContext.RemoveColourPointCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Remove this colour point">
-                                                    <materialIcons:MaterialIcon Kind="Delete" Width="18" Height="18" />
+                                                    <LucideIcon Kind="Trash" Size="18" />
                                                 </Button>
                                             </StackPanel>
                                         </Grid>
@@ -309,7 +303,7 @@
                                 Command="{Binding AddColourPointCommand}"
                                 ToolTip.Tip="Add colour point">
                             <StackPanel Orientation="Horizontal" Spacing="4">
-                                <materialIcons:MaterialIcon Kind="Add" Width="18" Height="18" />
+                                <LucideIcon Kind="Plus" Size="18" />
                                 <TextBlock Text="Add Point" VerticalAlignment="Center" />
                             </StackPanel>
                         </Button>
diff --git a/MapWizard.Desktop/Views/Controls/AppDropdown.axaml b/MapWizard.Desktop/Views/Controls/AppDropdown.axaml
index fe0eed7..7545020 100644
--- a/MapWizard.Desktop/Views/Controls/AppDropdown.axaml
+++ b/MapWizard.Desktop/Views/Controls/AppDropdown.axaml
@@ -1,7 +1,6 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
     x:Class="MapWizard.Desktop.Views.Controls.AppDropdown"
     x:Name="Root">
@@ -72,9 +71,8 @@
             <TextBlock VerticalAlignment="Center"
                        Text="{Binding SelectedText, ElementName=Root}"
                        TextTrimming="CharacterEllipsis" />
-            <materialIcons:MaterialIcon Grid.Column="1"
-                                        Width="16"
-                                        Height="16"
+            <LucideIcon Grid.Column="1"
+                                        Size="16"
                                         Kind="ChevronDown" />
         </Grid>
 
diff --git a/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml b/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml
index 2494fe2..13d4f0a 100644
--- a/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml
+++ b/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml
@@ -6,7 +6,6 @@
   xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
   xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
   xmlns:models="using:MapWizard.Desktop.Models"
-  xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
   mc:Ignorable="d"
   d:DesignWidth="760"
@@ -25,6 +24,21 @@
       <Setter Property="VerticalAlignment" Value="Stretch" />
     </Style>
 
+    <Style Selector="Border.CombinedSelectionPanel">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+    </Style>
+
+    <Style Selector="Border.CombinedSelectionPanel.withTargets">
+      <Setter Property="CornerRadius" Value="16" />
+      <Setter Property="Background" Value="{DynamicResource MapWizardSurfaceBrush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource MapWizardBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="16" />
+    </Style>
+
     <Style Selector="Border.SourceSelectionPanel">
       <Setter Property="Padding" Value="0" />
       <Setter Property="ClipToBounds" Value="True" />
@@ -33,10 +47,20 @@
 
     <Style Selector="Border.SourceSelectionPanel.withTargets">
       <Setter Property="VerticalAlignment" Value="Stretch" />
-      <Setter Property="Padding" Value="16" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="0" />
+      <Setter Property="Padding" Value="0" />
       <Setter Property="ClipToBounds" Value="False" />
     </Style>
 
+    <Style Selector="Border.TargetsSelectionPanel">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="CornerRadius" Value="0" />
+      <Setter Property="Padding" Value="0" />
+    </Style>
+
     <Style Selector="Grid.SourcePanelContent">
       <Setter Property="Margin" Value="12,10,12,10" />
       <Setter Property="RowSpacing" Value="7" />
@@ -98,10 +122,9 @@
 
     <Style Selector="Button.MemoryActionButton">
       <Setter Property="Background" Value="{DynamicResource MapWizardControlBackgroundBrush}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource MapWizardControlBorderBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
       <Setter Property="CornerRadius" Value="8" />
-      <Setter Property="Padding" Value="10,7" />
       <Setter Property="FontSize" Value="13" />
       <Setter Property="FontWeight" Value="Normal" />
       <Setter Property="Foreground" Value="{DynamicResource MapWizardTextBrush}" />
@@ -109,21 +132,41 @@
 
     <Style Selector="Button.MemoryActionButton:pointerover">
       <Setter Property="Background" Value="{DynamicResource MapWizardAccent25Brush}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource MapWizardAccentBrush}" />
+      <Setter Property="BorderBrush" Value="Transparent" />
       <Setter Property="Foreground" Value="{DynamicResource MapWizardTextBrush}" />
     </Style>
 
+    <Style Selector="Button.MapSourceActionButton">
+      <Setter Property="MinWidth" Value="108" />
+      <Setter Property="Height" Value="34" />
+      <Setter Property="Padding" Value="10,5" />
+    </Style>
+
+    <Style Selector="theme|BusyIndicator.AsyncActionIndicator">
+      <Setter Property="Width" Value="16" />
+      <Setter Property="Height" Value="3" />
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector="theme|BusyIndicator.AsyncActionIndicator /template/ Border#PART_Indicator">
+      <Setter Property="Width" Value="7" />
+      <Setter Property="Height" Value="3" />
+    </Style>
+
+    <Style Selector="Grid.AsyncActionActivity.busy LucideIcon">
+      <Setter Property="IsVisible" Value="False" />
+    </Style>
+
+    <Style Selector="Grid.AsyncActionActivity.busy theme|BusyIndicator.AsyncActionIndicator">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
     <Style Selector="TextBlock.PanelTitle">
       <Setter Property="FontSize" Value="20" />
       <Setter Property="FontWeight" Value="Bold" />
       <Setter Property="Foreground" Value="{DynamicResource MapWizardTextBrush}" />
     </Style>
 
-    <Style Selector="TextBlock.PanelSubtitle">
-      <Setter Property="FontSize" Value="12.5" />
-      <Setter Property="Foreground" Value="{DynamicResource MapWizardTextSecondaryBrush}" />
-    </Style>
-
     <Style Selector="TextBlock.FieldLabel">
       <Setter Property="FontSize" Value="12" />
       <Setter Property="FontWeight" Value="SemiBold" />
@@ -207,7 +250,7 @@
       <Setter Property="Background" Value="#4DE06C75" />
     </Style>
 
-    <Style Selector="Button.TargetRemoveButton materialIcons|MaterialIcon">
+    <Style Selector="Button.TargetRemoveButton LucideIcon">
       <Setter Property="Foreground" Value="#E06C75" />
     </Style>
 
@@ -229,13 +272,12 @@
       <Setter Property="Background" Value="#44FFFFFF" />
     </Style>
 
-    <Style Selector="materialIcons|MaterialIcon.MapsetChevron">
+    <Style Selector="LucideIcon.MapsetChevron">
       <Setter Property="Kind" Value="ChevronRight" />
-      <Setter Property="Width" Value="18" />
-      <Setter Property="Height" Value="18" />
+      <Setter Property="Size" Value="18" />
     </Style>
 
-    <Style Selector="materialIcons|MaterialIcon.MapsetChevron.expanded">
+    <Style Selector="LucideIcon.MapsetChevron.expanded">
       <Setter Property="Kind" Value="ChevronDown" />
     </Style>
 
@@ -314,7 +356,7 @@
       <Setter Property="Background" Value="{DynamicResource MapWizardAccentBrush}" />
     </Style>
 
-    <Style Selector="materialIcons|MaterialIcon.DiffIndicatorCheck">
+    <Style Selector="LucideIcon.DiffIndicatorCheck">
       <Setter Property="Foreground" Value="{DynamicResource MapWizardAccentForegroundBrush}" />
     </Style>
 
@@ -400,7 +442,7 @@
                   IsEnabled="{Binding CanClearSelection, ElementName=Root}"
                   ToolTip.Tip="Clear the current source and targets">
             <StackPanel Orientation="Horizontal" Spacing="5">
-              <materialIcons:MaterialIcon Kind="CloseCircleOutline" Width="18" Height="18" />
+              <LucideIcon Kind="CircleX" Size="18" />
               <TextBlock Text="Clear Selection" VerticalAlignment="Center" />
             </StackPanel>
           </Button>
@@ -410,7 +452,7 @@
                   IsEnabled="{Binding HasOriginSelection, ElementName=Root}"
                   ToolTip.Tip="Open the folder of the selected source beatmap">
             <StackPanel Orientation="Horizontal" Spacing="5">
-              <materialIcons:MaterialIcon Kind="FolderOpen" Width="18" Height="18" />
+              <LucideIcon Kind="FolderOpen" Size="18" />
               <TextBlock Text="Open Source Folder" VerticalAlignment="Center" />
             </StackPanel>
           </Button>
@@ -418,8 +460,9 @@
       </Grid>
 
       <!-- Source / Targets -->
-      <Grid ColumnDefinitions="*,Auto,*"
-            ColumnSpacing="12">
+      <Border Classes="CombinedSelectionPanel"
+              Classes.withTargets="{Binding ShowDestinationSection, ElementName=Root}">
+      <Grid ColumnDefinitions="*,48,*">
 
         <!-- SOURCE -->
         <Border Grid.Column="0"
@@ -461,29 +504,41 @@
                            Classes="PanelTitle"
                            Classes.overArtwork="{Binding ShowSourceOnlyBackdrop, ElementName=Root}"
                            IsVisible="{Binding !ShowDestinationSection, ElementName=Root}" />
-                <TextBlock Text="{Binding SourceSubtitle, ElementName=Root}"
-                           Classes="PanelSubtitle"
-                           IsVisible="{Binding ShowSourceSubtitle, ElementName=Root}"
-                           TextWrapping="Wrap" />
               </StackPanel>
 
               <StackPanel Grid.Column="1"
                           Orientation="Horizontal"
                           Spacing="8"
                           VerticalAlignment="Center">
-                <Button Classes="Compact MemoryActionButton"
+                <Button Classes="Compact MemoryActionButton MapSourceActionButton"
                         Command="{ReflectionBinding SetOriginFromMemoryCommand}"
                         ToolTip.Tip="{Binding OriginMemoryToolTip, ElementName=Root}">
                   <StackPanel Orientation="Horizontal" Spacing="5">
-                    <materialIcons:MaterialIcon Kind="Import" Width="16" Height="16" />
+                    <Grid Width="16"
+                          Height="16"
+                          Classes="AsyncActionActivity"
+                          Classes.busy="{ReflectionBinding SetOriginFromMemoryCommand.IsRunning}">
+                      <LucideIcon Kind="Import" Size="16" />
+                      <theme:BusyIndicator Classes="AsyncActionIndicator"
+                                           IsRunning="{ReflectionBinding SetOriginFromMemoryCommand.IsRunning}"
+                                           VerticalAlignment="Center" />
+                    </Grid>
                     <TextBlock Text="From osu!" VerticalAlignment="Center" />
                   </StackPanel>
                 </Button>
-                <Button Classes="Flat Compact"
+                <Button Classes="Flat Compact MapSourceActionButton"
                         Command="{ReflectionBinding PickOriginFileCommand}"
                         ToolTip.Tip="Open the Map Picker">
                   <StackPanel Orientation="Horizontal" Spacing="5">
-                    <materialIcons:MaterialIcon Kind="FileSearchOutline" Width="16" Height="16" />
+                    <Grid Width="16"
+                          Height="16"
+                          Classes="AsyncActionActivity"
+                          Classes.busy="{ReflectionBinding PickOriginFileCommand.IsRunning}">
+                      <LucideIcon Kind="FileSearch" Size="16" />
+                      <theme:BusyIndicator Classes="AsyncActionIndicator"
+                                           IsRunning="{ReflectionBinding PickOriginFileCommand.IsRunning}"
+                                           VerticalAlignment="Center" />
+                    </Grid>
                     <TextBlock Text="Map Picker" VerticalAlignment="Center" />
                   </StackPanel>
                 </Button>
@@ -493,7 +548,7 @@
                         IsVisible="{Binding !ShowDestinationSection, ElementName=Root}"
                         ToolTip.Tip="Clear the selected beatmap">
                   <StackPanel Orientation="Horizontal" Spacing="5">
-                    <materialIcons:MaterialIcon Kind="CloseCircleOutline" Width="16" Height="16" />
+                    <LucideIcon Kind="CircleX" Size="16" />
                     <TextBlock Text="Clear" VerticalAlignment="Center" />
                   </StackPanel>
                 </Button>
@@ -503,7 +558,7 @@
                         IsVisible="{Binding !ShowDestinationSection, ElementName=Root}"
                         ToolTip.Tip="Open the selected beatmap's folder">
                   <StackPanel Orientation="Horizontal" Spacing="5">
-                    <materialIcons:MaterialIcon Kind="FolderOpen" Width="16" Height="16" />
+                    <LucideIcon Kind="FolderOpen" Size="16" />
                     <TextBlock Text="Folder" VerticalAlignment="Center" />
                   </StackPanel>
                 </Button>
@@ -610,9 +665,8 @@
                 <StackPanel HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Spacing="6">
-                  <materialIcons:MaterialIcon Kind="MusicNoteOutline"
-                                              Width="34"
-                                              Height="34"
+                  <LucideIcon Kind="Music"
+                                              Size="34"
                                               Opacity="0.5"
                                               HorizontalAlignment="Center" />
                   <TextBlock Text="No source selected"
@@ -636,27 +690,35 @@
           </Grid>
         </Border>
 
-        <!-- Arrow -->
-        <materialIcons:MaterialIcon Grid.Column="1"
-                                    Kind="ArrowRight"
-                                    Width="22"
-                                    Height="22"
-                                    VerticalAlignment="Center"
-                                    Foreground="{DynamicResource MapWizardAccentBrush}"
-                                    IsVisible="{Binding ShowDestinationSection, ElementName=Root}" />
+        <!-- Workflow divider -->
+        <Grid Grid.Column="1"
+              IsVisible="{Binding ShowDestinationSection, ElementName=Root}">
+          <Border Width="1"
+                  Margin="0,4"
+                  HorizontalAlignment="Center"
+                  Background="{DynamicResource MapWizardBorderBrush}" />
+          <Border Width="32"
+                  Height="36"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  Background="{DynamicResource MapWizardSurfaceBrush}">
+            <LucideIcon Kind="ArrowRight"
+                                        Size="22"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Foreground="{DynamicResource MapWizardAccentBrush}" />
+          </Border>
+        </Grid>
 
         <!-- TARGETS -->
         <Border Grid.Column="2"
-                Classes="SelectionPanel"
+                Classes="SelectionPanel TargetsSelectionPanel"
                 VerticalAlignment="Stretch"
                 IsVisible="{Binding ShowDestinationSection, ElementName=Root}">
           <Grid RowDefinitions="Auto,*" RowSpacing="14">
             <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
               <StackPanel Spacing="2">
                 <TextBlock Text="Targets" Classes="PanelTitle" />
-                <TextBlock Text="{Binding TargetSubtitle, ElementName=Root}"
-                           Classes="PanelSubtitle"
-                           TextWrapping="Wrap" />
               </StackPanel>
 
               <StackPanel Grid.Column="1"
@@ -664,19 +726,35 @@
                           Spacing="8"
                           VerticalAlignment="Center"
                           IsVisible="{Binding !HasVisibleDestinationCards, ElementName=Root}">
-                <Button Classes="Compact MemoryActionButton"
+                <Button Classes="Compact MemoryActionButton MapSourceActionButton"
                         Command="{ReflectionBinding AddDestinationFromMemoryCommand}"
                         ToolTip.Tip="{Binding DestinationMemoryToolTip, ElementName=Root}">
                   <StackPanel Orientation="Horizontal" Spacing="5">
-                    <materialIcons:MaterialIcon Kind="Import" Width="16" Height="16" />
+                    <Grid Width="16"
+                          Height="16"
+                          Classes="AsyncActionActivity"
+                          Classes.busy="{ReflectionBinding AddDestinationFromMemoryCommand.IsRunning}">
+                      <LucideIcon Kind="Import" Size="16" />
+                      <theme:BusyIndicator Classes="AsyncActionIndicator"
+                                           IsRunning="{ReflectionBinding AddDestinationFromMemoryCommand.IsRunning}"
+                                           VerticalAlignment="Center" />
+                    </Grid>
                     <TextBlock Text="From osu!" VerticalAlignment="Center" />
                   </StackPanel>
                 </Button>
-                <Button Classes="Flat Compact"
+                <Button Classes="Flat Compact MapSourceActionButton"
                         Command="{ReflectionBinding PickDestinationFileCommand}"
                         ToolTip.Tip="Open the Map Picker">
                   <StackPanel Orientation="Horizontal" Spacing="5">
-                    <materialIcons:MaterialIcon Kind="FileSearchOutline" Width="16" Height="16" />
+                    <Grid Width="16"
+                          Height="16"
+                          Classes="AsyncActionActivity"
+                          Classes.busy="{ReflectionBinding PickDestinationFileCommand.IsRunning}">
+                      <LucideIcon Kind="FileSearch" Size="16" />
+                      <theme:BusyIndicator Classes="AsyncActionIndicator"
+                                           IsRunning="{ReflectionBinding PickDestinationFileCommand.IsRunning}"
+                                           VerticalAlignment="Center" />
+                    </Grid>
                     <TextBlock Text="Map Picker" VerticalAlignment="Center" />
                   </StackPanel>
                 </Button>
@@ -716,7 +794,7 @@
                                       Click="DestinationMapsetExpandButton_OnClick"
                                       ToolTip.Tip="Show or hide this mapset's difficulties" />
 
-                              <materialIcons:MaterialIcon Classes="MapsetChevron"
+                              <LucideIcon Classes="MapsetChevron"
                                                           Classes.expanded="{Binding IsExpanded}"
                                                           Foreground="#EEEEEE"
                                                           Margin="6"
@@ -769,7 +847,7 @@
                                       Click="DestinationMapsetRemoveButton_OnClick"
                                       IsVisible="{Binding !IsSuggested}"
                                       ToolTip.Tip="Remove this mapset from targets">
-                                <materialIcons:MaterialIcon Kind="Close" Width="16" Height="16" />
+                                <LucideIcon Kind="X" Size="16" />
                               </Button>
                           </Grid>
                         </Border>
@@ -803,10 +881,9 @@
                                       <Border Classes="DiffIndicatorBoxSelected"
                                               CornerRadius="5"
                                               IsVisible="{Binding IsSelected}" />
-                                      <materialIcons:MaterialIcon Classes="DiffIndicatorCheck"
+                                      <LucideIcon Classes="DiffIndicatorCheck"
                                                                   Kind="Check"
-                                                                  Width="12"
-                                                                  Height="12"
+                                                                  Size="12"
                                                                   HorizontalAlignment="Center"
                                                                   VerticalAlignment="Center"
                                                                   IsVisible="{Binding IsSelected}" />
@@ -835,9 +912,8 @@
                 <StackPanel HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Spacing="6">
-                  <materialIcons:MaterialIcon Kind="FormatListChecks"
-                                              Width="34"
-                                              Height="34"
+                  <LucideIcon Kind="ListChecks"
+                                              Size="34"
                                               Opacity="0.5"
                                               HorizontalAlignment="Center" />
                   <TextBlock Text="No targets selected"
@@ -862,27 +938,43 @@
                           Command="{ReflectionBinding PickDestinationFileCommand}"
                           ToolTip.Tip="Add a beatmap to the targets">
                     <StackPanel Orientation="Horizontal" Spacing="5">
-                      <materialIcons:MaterialIcon Kind="Plus" Width="16" Height="16" />
+                      <LucideIcon Kind="Plus" Size="16" />
                       <TextBlock Text="Add map" VerticalAlignment="Center" />
                     </StackPanel>
                   </Button>
 
                   <Button Grid.Column="2"
-                          Classes="Compact MemoryActionButton"
+                          Classes="Compact MemoryActionButton MapSourceActionButton"
                           Command="{ReflectionBinding AddDestinationFromMemoryCommand}"
                           ToolTip.Tip="{Binding DestinationMemoryToolTip, ElementName=Root}">
                     <StackPanel Orientation="Horizontal" Spacing="5">
-                      <materialIcons:MaterialIcon Kind="Import" Width="16" Height="16" />
+                      <Grid Width="16"
+                            Height="16"
+                            Classes="AsyncActionActivity"
+                            Classes.busy="{ReflectionBinding AddDestinationFromMemoryCommand.IsRunning}">
+                        <LucideIcon Kind="Import" Size="16" />
+                        <theme:BusyIndicator Classes="AsyncActionIndicator"
+                                             IsRunning="{ReflectionBinding AddDestinationFromMemoryCommand.IsRunning}"
+                                             VerticalAlignment="Center" />
+                      </Grid>
                       <TextBlock Text="From osu!" VerticalAlignment="Center" />
                     </StackPanel>
                   </Button>
 
                   <Button Grid.Column="3"
-                          Classes="Flat Compact"
+                          Classes="Flat Compact MapSourceActionButton"
                           Command="{ReflectionBinding PickDestinationFileCommand}"
                           ToolTip.Tip="Open the Map Picker">
                     <StackPanel Orientation="Horizontal" Spacing="5">
-                      <materialIcons:MaterialIcon Kind="FileSearchOutline" Width="16" Height="16" />
+                      <Grid Width="16"
+                            Height="16"
+                            Classes="AsyncActionActivity"
+                            Classes.busy="{ReflectionBinding PickDestinationFileCommand.IsRunning}">
+                        <LucideIcon Kind="FileSearch" Size="16" />
+                        <theme:BusyIndicator Classes="AsyncActionIndicator"
+                                             IsRunning="{ReflectionBinding PickDestinationFileCommand.IsRunning}"
+                                             VerticalAlignment="Center" />
+                      </Grid>
                       <TextBlock Text="Map Picker" VerticalAlignment="Center" />
                     </StackPanel>
                   </Button>
@@ -892,6 +984,7 @@
           </Grid>
         </Border>
       </Grid>
+      </Border>
     </StackPanel>
   </Border>
 </UserControl>
diff --git a/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml.cs b/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml.cs
index 5bcc0f4..e325444 100644
--- a/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml.cs
+++ b/MapWizard.Desktop/Views/Controls/BeatmapSelectionPanel.axaml.cs
@@ -59,22 +59,9 @@ public partial class BeatmapSelectionPanel : UserControl
     public static readonly StyledProperty<string> OriginEmptyPromptProperty =
         AvaloniaProperty.Register<BeatmapSelectionPanel, string>(nameof(OriginEmptyPrompt), "Select an origin beatmap");
 
-    public static readonly StyledProperty<string> SourceSubtitleProperty =
-        AvaloniaProperty.Register<BeatmapSelectionPanel, string>(
-            nameof(SourceSubtitle),
-            "Select the difficulty you want to use.");
-
-    public static readonly StyledProperty<string> TargetSubtitleProperty =
-        AvaloniaProperty.Register<BeatmapSelectionPanel, string>(
-            nameof(TargetSubtitle),
-            "Select the difficulties you want to copy to.");
-
     public static readonly StyledProperty<bool> CanClearSelectionProperty =
         AvaloniaProperty.Register<BeatmapSelectionPanel, bool>(nameof(CanClearSelection));
 
-    public static readonly StyledProperty<bool> ShowSourceSubtitleProperty =
-        AvaloniaProperty.Register<BeatmapSelectionPanel, bool>(nameof(ShowSourceSubtitle));
-
     public static readonly StyledProperty<bool> ShowSourceOnlyBackdropProperty =
         AvaloniaProperty.Register<BeatmapSelectionPanel, bool>(nameof(ShowSourceOnlyBackdrop));
 
@@ -259,30 +246,12 @@ public string OriginEmptyPrompt
         private set => SetValue(OriginEmptyPromptProperty, value);
     }
 
-    public string SourceSubtitle
-    {
-        get => GetValue(SourceSubtitleProperty);
-        set => SetValue(SourceSubtitleProperty, value);
-    }
-
-    public string TargetSubtitle
-    {
-        get => GetValue(TargetSubtitleProperty);
-        set => SetValue(TargetSubtitleProperty, value);
-    }
-
     public bool CanClearSelection
     {
         get => GetValue(CanClearSelectionProperty);
         private set => SetValue(CanClearSelectionProperty, value);
     }
 
-    public bool ShowSourceSubtitle
-    {
-        get => GetValue(ShowSourceSubtitleProperty);
-        private set => SetValue(ShowSourceSubtitleProperty, value);
-    }
-
     public bool ShowSourceOnlyBackdrop
     {
         get => GetValue(ShowSourceOnlyBackdropProperty);
@@ -667,7 +636,6 @@ private void UpdateShowDestinationSection()
     {
         ShowDestinationSection = ShowDestinationSelection;
         SourceColumnSpan = ShowDestinationSection ? 1 : 3;
-        ShowSourceSubtitle = ShowDestinationSection || !HasOriginSelection;
         ShowSourceOnlyBackdrop = HasOriginSelection && !ShowDestinationSection;
         ShowSourceMapCardBackdrop = HasOriginSelection && ShowDestinationSection;
     }
diff --git a/MapWizard.Desktop/Views/Controls/ColourPointModeDropdown.axaml b/MapWizard.Desktop/Views/Controls/ColourPointModeDropdown.axaml
index 9b02aef..cadae84 100644
--- a/MapWizard.Desktop/Views/Controls/ColourPointModeDropdown.axaml
+++ b/MapWizard.Desktop/Views/Controls/ColourPointModeDropdown.axaml
@@ -1,7 +1,6 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     x:Class="MapWizard.Desktop.Views.Controls.ColourPointModeDropdown"
     x:Name="Root"
     MinWidth="102">
@@ -42,7 +41,7 @@
                        Foreground="{DynamicResource MapWizardTextBrush}"
                        VerticalAlignment="Center"
                        Text="{Binding SelectedModeLabel, ElementName=Root}" />
-            <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="14" Height="14"
+            <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="14"
                                         Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
         </Grid>
 
@@ -63,7 +62,7 @@
                                     Classes="HeaderClose"
                                     Click="CloseFlyout_OnClick"
                                     ToolTip.Tip="Close">
-                                <materialIcons:MaterialIcon Kind="Close" Width="16" Height="16" />
+                                <LucideIcon Kind="X" Size="16" />
                             </Button>
                         </Grid>
 
diff --git a/MapWizard.Desktop/Views/Controls/ComboColourDropdown.axaml b/MapWizard.Desktop/Views/Controls/ComboColourDropdown.axaml
index 72ecc9c..91d03fc 100644
--- a/MapWizard.Desktop/Views/Controls/ComboColourDropdown.axaml
+++ b/MapWizard.Desktop/Views/Controls/ComboColourDropdown.axaml
@@ -1,7 +1,6 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:models="clr-namespace:MapWizard.Desktop.Models"
     x:Class="MapWizard.Desktop.Views.Controls.ComboColourDropdown"
     x:Name="Root"
@@ -107,7 +106,7 @@
                                             Classes="HeaderClose"
                                             Click="CloseFlyout_OnClick"
                                             ToolTip.Tip="Close">
-                                        <materialIcons:MaterialIcon Kind="Close" Width="16" Height="16" />
+                                        <LucideIcon Kind="X" Size="16" />
                                     </Button>
                                 </Grid>
 
@@ -161,7 +160,7 @@
                     Command="{Binding RemoveTokenCommand, ElementName=Root}"
                     CommandParameter="{Binding RemoveTokenCommandParameter, ElementName=Root}"
                     ToolTip.Tip="Remove this combo from sequence">
-                <materialIcons:MaterialIcon Kind="Close" Width="12" Height="12"
+                <LucideIcon Kind="X" Size="12"
                                             Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
             </Button>
         </Grid>
diff --git a/MapWizard.Desktop/Views/Controls/ImportantNotice.axaml b/MapWizard.Desktop/Views/Controls/ImportantNotice.axaml
index 60aec1b..90f7e2b 100644
--- a/MapWizard.Desktop/Views/Controls/ImportantNotice.axaml
+++ b/MapWizard.Desktop/Views/Controls/ImportantNotice.axaml
@@ -4,7 +4,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     x:Class="MapWizard.Desktop.Views.Controls.ImportantNotice"
     x:DataType="controls:ImportantNotice"
     x:Name="Root"
@@ -18,9 +17,8 @@
             CornerRadius="10"
             Padding="12,10">
         <Grid ColumnDefinitions="Auto,*" ColumnSpacing="10">
-            <materialIcons:MaterialIcon Kind="AlertCircleOutline"
-                                        Width="20"
-                                        Height="20"
+            <LucideIcon Kind="CircleAlert"
+                                        Size="20"
                                         Margin="0,1,0,0"
                                         Foreground="{DynamicResource MapWizardImportantNoticeAccent}" />
 
diff --git a/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml b/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml
index c620487..11734cd 100644
--- a/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml
+++ b/MapWizard.Desktop/Views/Controls/MillisecondFlyoutInput.axaml
@@ -1,7 +1,6 @@
 <UserControl
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     x:Class="MapWizard.Desktop.Views.Controls.MillisecondFlyoutInput"
     x:Name="Root"
     MinWidth="126">
@@ -33,14 +32,14 @@
             HorizontalAlignment="Stretch"
             Click="TriggerButton_OnClick">
         <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="6" VerticalAlignment="Center">
-            <materialIcons:MaterialIcon Kind="TimerOutline" Width="14" Height="14"
+            <LucideIcon Kind="Timer" Size="14"
                                         Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
             <TextBlock Grid.Column="1"
                        FontWeight="Normal"
                        Foreground="{DynamicResource MapWizardTextBrush}"
                        VerticalAlignment="Center"
                        Text="{Binding DisplayValue, ElementName=Root}" />
-            <materialIcons:MaterialIcon Grid.Column="2" Kind="ChevronDown" Width="14" Height="14"
+            <LucideIcon Grid.Column="2" Kind="ChevronDown" Size="14"
                                         Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
         </Grid>
 
@@ -62,7 +61,7 @@
                                     Classes="HeaderClose"
                                     Click="CloseFlyout_OnClick"
                                     ToolTip.Tip="Close">
-                                <materialIcons:MaterialIcon Kind="Close" Width="16" Height="16" />
+                                <LucideIcon Kind="X" Size="16" />
                             </Button>
                         </Grid>
 
@@ -80,7 +79,7 @@
                                     Classes="Basic Compact"
                                     Click="ApplyButton_OnClick"
                                     ToolTip.Tip="Apply time">
-                                <materialIcons:MaterialIcon Kind="Check" Width="16" Height="16" />
+                                <LucideIcon Kind="Check" Size="16" />
                             </Button>
                         </Grid>
                     </StackPanel>
diff --git a/MapWizard.Desktop/Views/Controls/ModalHost.axaml b/MapWizard.Desktop/Views/Controls/ModalHost.axaml
index 578edc3..8bdf00b 100644
--- a/MapWizard.Desktop/Views/Controls/ModalHost.axaml
+++ b/MapWizard.Desktop/Views/Controls/ModalHost.axaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     mc:Ignorable="d"
     d:DesignWidth="900"
     d:DesignHeight="640"
@@ -84,7 +83,7 @@
                             Click="CloseButton_OnClick"
                             IsVisible="{Binding ShowCloseButton, ElementName=Root}"
                             ToolTip.Tip="Close">
-                        <materialIcons:MaterialIcon Kind="Close" Width="18" Height="18" />
+                        <LucideIcon Kind="X" Size="18" />
                     </Button>
                 </Grid>
 
diff --git a/MapWizard.Desktop/Views/Controls/ModalHost.axaml.cs b/MapWizard.Desktop/Views/Controls/ModalHost.axaml.cs
index 8571b6c..01ed680 100644
--- a/MapWizard.Desktop/Views/Controls/ModalHost.axaml.cs
+++ b/MapWizard.Desktop/Views/Controls/ModalHost.axaml.cs
@@ -19,7 +19,7 @@ public partial class ModalHost : UserControl
     private const double OverlayRightInset = 14d;
     private const double OverlayMinimumWidth = 460d;
     private const double OverlayMaximumWidth = 620d;
-    private const double OverlayBackgroundBlurRadius = 10d;
+    private const double BackgroundBlurRadius = 10d;
     private int _transitionVersion;
     private Visual? _blurredTarget;
     private IEffect? _previousBackgroundEffect;
@@ -126,19 +126,12 @@ public async Task OpenAsync(CancellationToken cancellationToken = default)
         DialogCard.RenderTransform = GetClosedTransform();
         IsVisible = true;
         IsOpen = true;
-        var animateBackgroundBlur = Presentation == ModalPresentation.MapPickerOverlay;
-        if (animateBackgroundBlur)
-        {
-            PrepareBackgroundBlur();
-        }
-
-        var blurAnimation = animateBackgroundBlur
-            ? AnimateBackgroundBlurAsync(
-                OverlayBackgroundBlurRadius,
-                TimeSpan.FromMilliseconds(260),
-                version,
-                cancellationToken)
-            : Task.CompletedTask;
+        PrepareBackgroundBlur();
+        var blurAnimation = AnimateBackgroundBlurAsync(
+            BackgroundBlurRadius,
+            TimeSpan.FromMilliseconds(260),
+            version,
+            cancellationToken);
 
         try
         {
diff --git a/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml b/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml
index cf3679f..4f6c4fe 100644
--- a/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml
+++ b/MapWizard.Desktop/Views/Controls/ModernColorPicker.axaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:primitives="clr-namespace:Avalonia.Controls.Primitives;assembly=Avalonia.Controls.ColorPicker"
              xmlns:local="clr-namespace:MapWizard.Desktop.Views.Controls"
-             xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              x:Class="MapWizard.Desktop.Views.Controls.ModernColorPicker"
              x:Name="Root"
              MinWidth="150">
@@ -89,10 +88,9 @@
                            Foreground="{DynamicResource MapWizardTextBrush}"
                            VerticalAlignment="Center"
                            Text="#FFFFFF" />
-                <materialIcons:MaterialIcon Grid.Column="2"
+                <LucideIcon Grid.Column="2"
                                             Kind="ChevronDown"
-                                            Width="16"
-                                            Height="16"
+                                            Size="16"
                                             Foreground="{DynamicResource MapWizardTextBrush}" />
             </Grid>
             <FlyoutBase.AttachedFlyout>
@@ -113,9 +111,8 @@
                                         Classes="HeaderClose"
                                         Click="CloseFlyout_OnClick"
                                         ToolTip.Tip="Close">
-                                    <materialIcons:MaterialIcon Kind="Close"
-                                                                Width="16"
-                                                                Height="16" />
+                                    <LucideIcon Kind="X"
+                                                                Size="16" />
                                 </Button>
                             </Grid>
                             <primitives:ColorSpectrum x:Name="ColourSpectrum"
diff --git a/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml b/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml
index 2920d39..dafdfee 100644
--- a/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml
+++ b/MapWizard.Desktop/Views/Dialogs/SongMapsetCard.axaml
@@ -5,7 +5,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="clr-namespace:MapWizard.Desktop.ViewModels"
     xmlns:dialogs="clr-namespace:MapWizard.Desktop.Views.Dialogs"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     x:Class="MapWizard.Desktop.Views.Dialogs.SongMapsetCard"
     x:DataType="vm:SongMapsetCardViewModel"
@@ -28,13 +27,13 @@
         <Style Selector="Border.CardRoot TextBlock">
             <Setter Property="Foreground" Value="{DynamicResource MapWizardTextBrush}" />
         </Style>
-        <Style Selector="Border.CardRoot materialIcons|MaterialIcon">
+        <Style Selector="Border.CardRoot LucideIcon">
             <Setter Property="Foreground" Value="{DynamicResource MapWizardTextBrush}" />
         </Style>
         <Style Selector="Grid.MapsetHeader TextBlock">
             <Setter Property="Foreground" Value="#EEEEEE" />
         </Style>
-        <Style Selector="Grid.MapsetHeader materialIcons|MaterialIcon">
+        <Style Selector="Grid.MapsetHeader LucideIcon">
             <Setter Property="Foreground" Value="#D8D8D8" />
         </Style>
 
@@ -88,7 +87,7 @@
             <Setter Property="CornerRadius" Value="15,15,4,4" />
         </Style>
 
-        <Style Selector="materialIcons|MaterialIcon.ExpansionChevron">
+        <Style Selector="LucideIcon.ExpansionChevron">
             <Setter Property="Kind" Value="ChevronDown" />
             <Setter Property="RenderTransform" Value="rotate(0deg)" />
             <Setter Property="Transitions">
@@ -102,7 +101,7 @@
                 </Transitions>
             </Setter>
         </Style>
-        <Style Selector="materialIcons|MaterialIcon.ExpansionChevron.expanded">
+        <Style Selector="LucideIcon.ExpansionChevron.expanded">
             <Setter Property="RenderTransform" Value="rotate(-180deg)" />
         </Style>
 
@@ -242,9 +241,8 @@
                         <Border Classes="HintPill"
                                 IsVisible="{Binding IsMountedInLazer}">
                             <StackPanel Orientation="Horizontal" Spacing="5">
-                                <materialIcons:MaterialIcon Kind="Pin"
-                                                            Width="11"
-                                                            Height="11"
+                                <LucideIcon Kind="Pin"
+                                                            Size="11"
                                                             Foreground="{DynamicResource MapWizardPickerHintIcon}" />
                                 <TextBlock Text="Mounted in osu!lazer"
                                            FontSize="11"
@@ -256,9 +254,8 @@
                         <Border Classes="HintPill"
                                 IsVisible="{Binding IsPreferredMapset}">
                             <StackPanel Orientation="Horizontal" Spacing="5">
-                                <materialIcons:MaterialIcon Kind="Pin"
-                                                            Width="11"
-                                                            Height="11"
+                                <LucideIcon Kind="Pin"
+                                                            Size="11"
                                                             Foreground="{DynamicResource MapWizardPickerHintIcon}" />
                                 <TextBlock Text="Currently Selected"
                                            FontSize="11"
@@ -274,15 +271,13 @@
                                 <TextBlock Text="{Binding DifficultyCountLabel}"
                                            FontSize="12"
                                             FontWeight="SemiBold" />
-                                <materialIcons:MaterialIcon Kind="CheckCircle"
-                                                            Width="12"
-                                                            Height="12"
+                                <LucideIcon Kind="CircleCheck"
+                                                            Size="12"
                                                             Foreground="{DynamicResource MapWizardPickerCheckIcon}"
                                                             IsVisible="{Binding AllDifficultiesSelected}" />
-                                <materialIcons:MaterialIcon Classes="ExpansionChevron"
+                                <LucideIcon Classes="ExpansionChevron"
                                                             Classes.expanded="{Binding IsExpanded}"
-                                                            Width="15"
-                                                            Height="15" />
+                                                            Size="15" />
                             </StackPanel>
                         </Border>
                     </StackPanel>
@@ -312,7 +307,7 @@
                                 CommandParameter="{Binding}"
                                 ToolTip.Tip="Select or clear all difficulties in this mapset">
                             <StackPanel Orientation="Horizontal" Spacing="6">
-                                <materialIcons:MaterialIcon Kind="CheckAll" Width="14" Height="14" />
+                                <LucideIcon Kind="CheckCheck" Size="14" />
                                 <TextBlock Text="{Binding SelectAllButtonLabel}" />
                             </StackPanel>
                         </Button>
@@ -331,9 +326,8 @@
                                           Command="{ReflectionBinding DataContext.SelectDifficultyCommand, RelativeSource={RelativeSource AncestorType=dialogs:SongSelectDialog}}"
                                           CommandParameter="{Binding}">
                                 <StackPanel Orientation="Horizontal" Spacing="7">
-                                    <materialIcons:MaterialIcon Kind="CheckCircle"
-                                                                Width="14"
-                                                                Height="14"
+                                    <LucideIcon Kind="CircleCheck"
+                                                                Size="14"
                                                                 IsVisible="{Binding IsSelected}" />
                                     <TextBlock Text="{Binding Name}"
                                                TextTrimming="CharacterEllipsis"
diff --git a/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml b/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml
index f9e20b7..3c56787 100644
--- a/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml
+++ b/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml
@@ -7,7 +7,6 @@
     xmlns:dialogs="clr-namespace:MapWizard.Desktop.Views.Dialogs"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     mc:Ignorable="d"
     d:DesignWidth="920"
     d:DesignHeight="660"
@@ -75,7 +74,7 @@
                         MinHeight="38"
                         Padding="8"
                         ToolTip.Tip="Reload song folders and refresh results">
-                    <materialIcons:MaterialIcon Kind="Refresh" Width="18" Height="18" />
+                    <LucideIcon Kind="RefreshCw" Size="18" />
                 </Button>
 
                 <Button Grid.Column="2"
@@ -85,7 +84,7 @@
                         MinHeight="38"
                         Padding="8"
                         ToolTip.Tip="Open native file picker fallback">
-                    <materialIcons:MaterialIcon Kind="FolderOpen" Width="18" Height="18" />
+                    <LucideIcon Kind="FolderOpen" Size="18" />
                 </Button>
 
                 <Button Grid.Column="3"
@@ -95,7 +94,7 @@
                         MinHeight="38"
                         Padding="8"
                         ToolTip.Tip="Close">
-                    <materialIcons:MaterialIcon Kind="Close" Width="18" Height="18" />
+                    <LucideIcon Kind="X" Size="18" />
                 </Button>
             </Grid>
 
diff --git a/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml.cs b/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml.cs
index cb88a08..517f214 100644
--- a/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml.cs
+++ b/MapWizard.Desktop/Views/Dialogs/SongSelectDialog.axaml.cs
@@ -1,10 +1,10 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 using MapWizard.Desktop.ViewModels;
 
@@ -13,6 +13,10 @@ namespace MapWizard.Desktop.Views.Dialogs;
 public partial class SongSelectDialog : UserControl
 {
     private const double CenterScrollEdgeThreshold = 56d;
+    private static readonly TimeSpan ScrollWorkInterval = TimeSpan.FromMilliseconds(50);
+    private readonly DispatcherTimer _scrollWorkTimer;
+    private ScrollViewer? _pendingScrollViewer;
+    private bool _hasPendingScrollWork;
 
     /// <summary>Raised when the header close (X) button is clicked.</summary>
     public event EventHandler? PickerCloseRequested;
@@ -24,6 +28,8 @@ private void ClosePickerButton_OnClick(object? sender, RoutedEventArgs e)
 
     public SongSelectDialog()
     {
+        _scrollWorkTimer = new DispatcherTimer { Interval = ScrollWorkInterval };
+        _scrollWorkTimer.Tick += OnScrollWorkTimerTick;
         InitializeComponent();
         AddHandler(
             InputElement.PointerPressedEvent,
@@ -34,7 +40,47 @@ public SongSelectDialog()
 
     private void MapsetScrollViewer_OnScrollChanged(object? sender, ScrollChangedEventArgs e)
     {
-        if (sender is not ScrollViewer scrollViewer || DataContext is not SongSelectDialogViewModel viewModel)
+        if (sender is not ScrollViewer scrollViewer)
+        {
+            return;
+        }
+
+        _pendingScrollViewer = scrollViewer;
+        _hasPendingScrollWork = true;
+
+        // Run the first update immediately, then cap the geometry scan at 20 Hz
+        // while precision scrolling is producing a high-frequency event stream.
+        if (!_scrollWorkTimer.IsEnabled)
+        {
+            ProcessPendingScrollWork();
+            _scrollWorkTimer.Start();
+        }
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        _scrollWorkTimer.Stop();
+        _pendingScrollViewer = null;
+        _hasPendingScrollWork = false;
+        base.OnDetachedFromVisualTree(e);
+    }
+
+    private void OnScrollWorkTimerTick(object? sender, EventArgs e)
+    {
+        if (!_hasPendingScrollWork)
+        {
+            _scrollWorkTimer.Stop();
+            return;
+        }
+
+        ProcessPendingScrollWork();
+    }
+
+    private void ProcessPendingScrollWork()
+    {
+        _hasPendingScrollWork = false;
+        if (_pendingScrollViewer is not { } scrollViewer ||
+            DataContext is not SongSelectDialogViewModel viewModel)
         {
             return;
         }
@@ -71,7 +117,7 @@ private void MapsetScrollViewer_OnScrollChanged(object? sender, ScrollChangedEve
         int? firstVisibleIndex = null;
         int? lastVisibleIndex = null;
 
-        foreach (var container in MapsetItemsControl.GetRealizedContainers().ToArray())
+        foreach (var container in MapsetItemsControl.GetRealizedContainers())
         {
             if (!container.IsVisible || container.Bounds.Height <= 0d)
             {
diff --git a/MapWizard.Desktop/Views/HitSoundCopier/HitSoundCopierView.axaml b/MapWizard.Desktop/Views/HitSoundCopier/HitSoundCopierView.axaml
index 7cb072e..7b908d9 100644
--- a/MapWizard.Desktop/Views/HitSoundCopier/HitSoundCopierView.axaml
+++ b/MapWizard.Desktop/Views/HitSoundCopier/HitSoundCopierView.axaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
@@ -29,7 +28,7 @@
             Command="{Binding CopyHitSoundsCommand}"
             ToolTip.Tip="Copy the hitsounds">
             <StackPanel Orientation="Horizontal" Spacing="8">
-                <materialIcons:MaterialIcon Kind="ContentSave" Width="24" Height="24" />
+                <LucideIcon Kind="Save" Size="24" />
                 <TextBlock
                     VerticalAlignment="Center"
                     FontWeight="Normal"
@@ -45,8 +44,6 @@
                 <controls:BeatmapSelectionPanel
                     OriginMap="{Binding OriginBeatmap}"
                     DestinationMaps="{Binding DestinationBeatmaps}"
-                    SourceSubtitle="Select one difficulty to copy hitsounds from."
-                    TargetSubtitle="Select one or more target difficulties to copy to."
                     OriginMemoryToolTip="Get the current beatmap selected in the osu! client."
                     DestinationMemoryToolTip="Add the current beatmap selected in the osu! client." />
 
diff --git a/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml b/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml
index 06377ca..80c5ecf 100644
--- a/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml
+++ b/MapWizard.Desktop/Views/HitSoundVisualizer/HitSoundVisualizerView.axaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
@@ -197,7 +196,7 @@
                     Margin="0,0,8,0"
                     ToolTip.Tip="Export hitsound timeline">
                 <StackPanel Orientation="Horizontal" Spacing="6">
-                    <materialIcons:MaterialIcon Kind="ContentSave" Width="24" Height="24" />
+                    <LucideIcon Kind="Save" Size="24" />
                     <TextBlock VerticalAlignment="Center"
                                FontWeight="Normal"
                                FontSize="16"
@@ -214,14 +213,14 @@
                                 <Button Classes="timeline-btn"
                                         Command="{Binding ExportApplyToTargetDiffCommand}">
                                     <StackPanel Orientation="Horizontal" Spacing="6">
-                                        <materialIcons:MaterialIcon Kind="FileReplaceOutline" Width="16" Height="16" />
+                                        <LucideIcon Kind="Replace" Size="16" />
                                         <TextBlock VerticalAlignment="Center" Text="Apply To Target Diff" />
                                     </StackPanel>
                                 </Button>
                                 <Button Classes="timeline-btn"
                                         Command="{Binding ExportHitsoundDiffCommand}">
                                     <StackPanel Orientation="Horizontal" Spacing="6">
-                                        <materialIcons:MaterialIcon Kind="MusicCircleOutline" Width="16" Height="16" />
+                                        <LucideIcon Kind="Disc3" Size="16" />
                                         <TextBlock VerticalAlignment="Center" Text="Export Circle-only Hitsound Diff" />
                                     </StackPanel>
                                 </Button>
@@ -240,7 +239,6 @@
                     OriginMap="{Binding OriginBeatmap}"
                     DestinationMaps="{Binding DestinationBeatmaps}"
                     ShowDestinationSelection="False"
-                    SourceSubtitle="Select the beatmap you want to visualize hitsounds from."
                     OriginMemoryToolTip="Get the current beatmap selected in the osu! client." />
 
                 <theme:BusyArea IsBusy="{Binding IsPreparingPlayback}"
@@ -250,7 +248,7 @@
                         <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10">
                             <TextBlock Text="Timeline Player" VerticalAlignment="Center" FontWeight="SemiBold" />
                             <Button Grid.Column="1" Classes="timeline-btn" ToolTip.Tip="Hitsound Editor">
-                                <materialIcons:MaterialIcon Kind="Pencil" Width="16" Height="16" />
+                                <LucideIcon Kind="Pencil" Size="16" />
                                 <Button.Flyout>
                                     <Flyout Placement="BottomEdgeAlignedRight">
                                         <Border Classes="PopupSurface timeline-flyout-surface">
@@ -265,7 +263,7 @@
                                                     <Button Grid.Row="0" Grid.Column="1" Classes="timeline-select">
                                                         <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6">
                                                             <TextBlock VerticalAlignment="Center" Text="{Binding SelectedSampleSetName}" />
-                                                            <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                                            <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                                         </Grid>
                                                         <Button.Flyout>
                                                             <Flyout Placement="BottomEdgeAlignedLeft">
@@ -290,18 +288,18 @@
                                                         <Grid ColumnDefinitions="*,*,*,*" ColumnSpacing="4">
                                                             <ToggleButton Grid.Column="0" Classes="timeline-seg-btn" IsChecked="{Binding IsHitNormalSelected}">
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                                                    <materialIcons:MaterialIcon Kind="MusicNote" Width="14" Height="14" />
+                                                                    <LucideIcon Kind="Music" Size="14" />
                                                                     <TextBlock Text="Normal" />
                                                                 </StackPanel>
                                                             </ToggleButton>
                                                             <ToggleButton Grid.Column="1" Classes="timeline-seg-btn" IsChecked="{Binding IsHitWhistleSelected}" ToolTip.Tip="Whistle">
-                                                                <materialIcons:MaterialIcon Kind="Bullhorn" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                <LucideIcon Kind="Megaphone" Size="14" HorizontalAlignment="Center" />
                                                             </ToggleButton>
                                                             <ToggleButton Grid.Column="2" Classes="timeline-seg-btn" IsChecked="{Binding IsHitFinishSelected}" ToolTip.Tip="Finish">
-                                                                <materialIcons:MaterialIcon Kind="Star" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                <LucideIcon Kind="Star" Size="14" HorizontalAlignment="Center" />
                                                             </ToggleButton>
                                                             <ToggleButton Grid.Column="3" Classes="timeline-seg-btn" IsChecked="{Binding IsHitClapSelected}" ToolTip.Tip="Clap">
-                                                                <materialIcons:MaterialIcon Kind="HandClap" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                <LucideIcon Kind="Hand" Size="14" HorizontalAlignment="Center" />
                                                             </ToggleButton>
                                                         </Grid>
                                                     </Border>
@@ -313,7 +311,7 @@
                                                             IsEnabled="{Binding HasSelectedPoint}"
                                                             Margin="0,0,8,8">
                                                         <StackPanel Orientation="Horizontal" Spacing="6">
-                                                            <materialIcons:MaterialIcon Kind="ContentCopy" Width="16" Height="16" />
+                                                            <LucideIcon Kind="Copy" Size="16" />
                                                             <TextBlock VerticalAlignment="Center" Text="Copy Selected" />
                                                         </StackPanel>
                                                     </Button>
@@ -322,7 +320,7 @@
                                                             IsEnabled="{Binding HasSelectedPoint}"
                                                             Margin="0,0,8,8">
                                                         <StackPanel Orientation="Horizontal" Spacing="6">
-                                                            <materialIcons:MaterialIcon Kind="ContentSaveEdit" Width="16" Height="16" />
+                                                            <LucideIcon Kind="FilePen" Size="16" />
                                                             <TextBlock VerticalAlignment="Center" Text="Apply To Selection" />
                                                         </StackPanel>
                                                     </Button>
@@ -331,7 +329,7 @@
                                                             IsEnabled="{Binding HasSelectedPoint}"
                                                             Margin="0,0,8,8">
                                                         <StackPanel Orientation="Horizontal" Spacing="6">
-                                                            <materialIcons:MaterialIcon Kind="Play" Width="16" Height="16" />
+                                                            <LucideIcon Kind="Play" Size="16" />
                                                             <TextBlock VerticalAlignment="Center" Text="Play Selected" />
                                                         </StackPanel>
                                                     </Button>
@@ -340,7 +338,7 @@
                                                             IsEnabled="{Binding HasSelectedPoint}"
                                                             Margin="0,0,8,8">
                                                         <StackPanel Orientation="Horizontal" Spacing="6">
-                                                            <materialIcons:MaterialIcon Kind="Delete" Width="16" Height="16" />
+                                                            <LucideIcon Kind="Trash" Size="16" />
                                                             <TextBlock VerticalAlignment="Center" Text="Remove Selected" />
                                                         </StackPanel>
                                                     </Button>
@@ -358,26 +356,26 @@
                                           Classes="timeline-toolbar-toggle"
                                           IsChecked="{Binding FollowPlaybackCursor}"
                                           ToolTip.Tip="Follow playback cursor">
-                                <materialIcons:MaterialIcon Kind="CrosshairsGps" Width="16" Height="16" />
+                                <LucideIcon Kind="Crosshair" Size="16" />
                             </ToggleButton>
                             <Button Grid.Row="0"
                                     Grid.Column="1"
                                     Classes="timeline-btn"
                                     Command="{Binding ZoomToSelectionCommand}"
                                     ToolTip.Tip="Zoom In">
-                                <materialIcons:MaterialIcon Kind="MagnifyPlus" Width="16" Height="16" />
+                                <LucideIcon Kind="ZoomIn" Size="16" />
                             </Button>
                             <Button Grid.Row="0"
                                     Grid.Column="2"
                                     Classes="timeline-btn"
                                     Command="{Binding ZoomOutCommand}"
                                     ToolTip.Tip="Zoom Out">
-                                <materialIcons:MaterialIcon Kind="MagnifyMinus" Width="16" Height="16" />
+                                <LucideIcon Kind="ZoomOut" Size="16" />
                             </Button>
 
                             <Button Grid.Row="0" Grid.Column="4" Classes="timeline-select" ToolTip.Tip="HS Selector">
                                 <Grid ColumnDefinitions="Auto,*" ColumnSpacing="6" MinWidth="110">
-                                    <materialIcons:MaterialIcon Kind="FilterVariant" Width="16" Height="16" />
+                                    <LucideIcon Kind="ListFilter" Size="16" />
                                     <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="HS Selector" />
                                 </Grid>
                                 <Button.Flyout>
@@ -393,7 +391,7 @@
                                                     <Button Grid.Row="0" Grid.Column="1" Classes="timeline-select">
                                                         <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6">
                                                             <TextBlock VerticalAlignment="Center" Text="{Binding HsSelectorNormalBankFilterName}" />
-                                                            <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                                            <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                                         </Grid>
                                                         <Button.Flyout>
                                                             <Flyout Placement="BottomEdgeAlignedLeft">
@@ -411,7 +409,7 @@
                                                     <Button Grid.Row="1" Grid.Column="1" Classes="timeline-select">
                                                         <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6">
                                                             <TextBlock VerticalAlignment="Center" Text="{Binding HsSelectorAdditionBankFilterName}" />
-                                                            <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                                            <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                                         </Grid>
                                                         <Button.Flyout>
                                                             <Flyout Placement="BottomEdgeAlignedLeft">
@@ -436,18 +434,18 @@
                                                         <Grid ColumnDefinitions="*,*,*,*" ColumnSpacing="4">
                                                             <ToggleButton Grid.Column="0" Classes="timeline-seg-btn" IsChecked="{Binding HsSelectorIncludeHitNormal}">
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                                                    <materialIcons:MaterialIcon Kind="MusicNote" Width="14" Height="14" />
+                                                                    <LucideIcon Kind="Music" Size="14" />
                                                                     <TextBlock Text="Normal" />
                                                                 </StackPanel>
                                                             </ToggleButton>
                                                             <ToggleButton Grid.Column="1" Classes="timeline-seg-btn" IsChecked="{Binding HsSelectorIncludeWhistle}" ToolTip.Tip="Whistle">
-                                                                <materialIcons:MaterialIcon Kind="Bullhorn" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                <LucideIcon Kind="Megaphone" Size="14" HorizontalAlignment="Center" />
                                                             </ToggleButton>
                                                             <ToggleButton Grid.Column="2" Classes="timeline-seg-btn" IsChecked="{Binding HsSelectorIncludeFinish}" ToolTip.Tip="Finish">
-                                                                <materialIcons:MaterialIcon Kind="Star" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                <LucideIcon Kind="Star" Size="14" HorizontalAlignment="Center" />
                                                             </ToggleButton>
                                                             <ToggleButton Grid.Column="3" Classes="timeline-seg-btn" IsChecked="{Binding HsSelectorIncludeClap}" ToolTip.Tip="Clap">
-                                                                <materialIcons:MaterialIcon Kind="HandClap" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                <LucideIcon Kind="Hand" Size="14" HorizontalAlignment="Center" />
                                                             </ToggleButton>
                                                         </Grid>
                                                     </Border>
@@ -457,7 +455,7 @@
                                                         Command="{Binding SelectHitsoundsByFilterCommand}"
                                                         IsEnabled="{Binding HasAnyHsSelectorAudioTypeEnabled}">
                                                     <StackPanel Orientation="Horizontal" Spacing="6">
-                                                        <materialIcons:MaterialIcon Kind="Check" Width="16" Height="16" />
+                                                        <LucideIcon Kind="Check" Size="16" />
                                                         <TextBlock VerticalAlignment="Center" Text="Select" />
                                                     </StackPanel>
                                                 </Button>
@@ -478,7 +476,7 @@
                                     IsEnabled="{Binding CanEditHeaderBanks}">
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6" MinWidth="108">
                                     <TextBlock VerticalAlignment="Center" Text="{Binding HeaderNormalBankName}" />
-                                    <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                    <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                 </Grid>
                                 <Button.Flyout>
                                     <Flyout Placement="BottomEdgeAlignedLeft">
@@ -503,7 +501,7 @@
                                     IsEnabled="{Binding CanEditHeaderBanks}">
                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6" MinWidth="108">
                                     <TextBlock VerticalAlignment="Center" Text="{Binding HeaderAdditionBankName}" />
-                                    <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                    <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                 </Grid>
                                 <Button.Flyout>
                                     <Flyout Placement="BottomEdgeAlignedLeft">
@@ -521,7 +519,7 @@
                             <Button Grid.Row="0" Grid.Column="10" Classes="timeline-btn">
                                 <StackPanel Orientation="Horizontal" Spacing="6">
                                     <TextBlock VerticalAlignment="Center" Text="{Binding SelectedSnapDivisorText}" />
-                                    <materialIcons:MaterialIcon Kind="ChevronDown" Width="16" Height="16" />
+                                    <LucideIcon Kind="ChevronDown" Size="16" />
                                 </StackPanel>
                                 <Button.Flyout>
                                     <Flyout Placement="BottomEdgeAlignedLeft">
@@ -568,9 +566,8 @@
                                                                     Spacing="7"
                                                                     Margin="10,0"
                                                                     VerticalAlignment="Center">
-                                                            <materialIcons:MaterialIcon Kind="{Binding Icon}"
-                                                                                        Width="13"
-                                                                                        Height="13"
+                                                            <LucideIcon Kind="{Binding Icon}"
+                                                                                        Size="13"
                                                                                         VerticalAlignment="Center" />
                                                             <TextBlock VerticalAlignment="Center"
                                                                        Text="{Binding Title}"
@@ -625,7 +622,7 @@
                                                             <Button Grid.Row="0" Grid.Column="1" Classes="timeline-select">
                                                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6">
                                                                     <TextBlock VerticalAlignment="Center" Text="{Binding SelectedSampleSetName}" />
-                                                                    <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                                                    <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                                                 </Grid>
                                                                 <Button.Flyout>
                                                                     <Flyout Placement="BottomEdgeAlignedLeft">
@@ -650,18 +647,18 @@
                                                                 <Grid ColumnDefinitions="*,*,*,*" ColumnSpacing="4">
                                                                     <ToggleButton Grid.Column="0" Classes="timeline-seg-btn" IsChecked="{Binding IsHitNormalSelected}">
                                                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
-                                                                            <materialIcons:MaterialIcon Kind="MusicNote" Width="14" Height="14" />
+                                                                            <LucideIcon Kind="Music" Size="14" />
                                                                             <TextBlock Text="Normal" />
                                                                         </StackPanel>
                                                                     </ToggleButton>
                                                                     <ToggleButton Grid.Column="1" Classes="timeline-seg-btn" IsChecked="{Binding IsHitWhistleSelected}" ToolTip.Tip="Whistle">
-                                                                        <materialIcons:MaterialIcon Kind="Bullhorn" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                        <LucideIcon Kind="Megaphone" Size="14" HorizontalAlignment="Center" />
                                                                     </ToggleButton>
                                                                     <ToggleButton Grid.Column="2" Classes="timeline-seg-btn" IsChecked="{Binding IsHitFinishSelected}" ToolTip.Tip="Finish">
-                                                                        <materialIcons:MaterialIcon Kind="Star" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                        <LucideIcon Kind="Star" Size="14" HorizontalAlignment="Center" />
                                                                     </ToggleButton>
                                                                     <ToggleButton Grid.Column="3" Classes="timeline-seg-btn" IsChecked="{Binding IsHitClapSelected}" ToolTip.Tip="Clap">
-                                                                        <materialIcons:MaterialIcon Kind="HandClap" Width="14" Height="14" HorizontalAlignment="Center" />
+                                                                        <LucideIcon Kind="Hand" Size="14" HorizontalAlignment="Center" />
                                                                     </ToggleButton>
                                                                 </Grid>
                                                             </Border>
@@ -673,7 +670,7 @@
                                                                     IsEnabled="{Binding HasSelectedPoint}"
                                                                     Margin="0,0,8,8">
                                                                 <StackPanel Orientation="Horizontal" Spacing="6">
-                                                                    <materialIcons:MaterialIcon Kind="ContentCopy" Width="16" Height="16" />
+                                                                    <LucideIcon Kind="Copy" Size="16" />
                                                                     <TextBlock VerticalAlignment="Center" Text="Copy Selected" />
                                                                 </StackPanel>
                                                             </Button>
@@ -682,7 +679,7 @@
                                                                     IsEnabled="{Binding HasSelectedPoint}"
                                                                     Margin="0,0,8,8">
                                                                 <StackPanel Orientation="Horizontal" Spacing="6">
-                                                                    <materialIcons:MaterialIcon Kind="ContentSaveEdit" Width="16" Height="16" />
+                                                                    <LucideIcon Kind="FilePen" Size="16" />
                                                                     <TextBlock VerticalAlignment="Center" Text="Apply To Selection" />
                                                                 </StackPanel>
                                                             </Button>
@@ -691,7 +688,7 @@
                                                                     IsEnabled="{Binding HasSelectedPoint}"
                                                                     Margin="0,0,8,8">
                                                                 <StackPanel Orientation="Horizontal" Spacing="6">
-                                                                    <materialIcons:MaterialIcon Kind="Play" Width="16" Height="16" />
+                                                                    <LucideIcon Kind="Play" Size="16" />
                                                                     <TextBlock VerticalAlignment="Center" Text="Play Selected" />
                                                                 </StackPanel>
                                                             </Button>
@@ -700,7 +697,7 @@
                                                                     IsEnabled="{Binding HasSelectedPoint}"
                                                                     Margin="0,0,8,8">
                                                                 <StackPanel Orientation="Horizontal" Spacing="6">
-                                                                    <materialIcons:MaterialIcon Kind="Delete" Width="16" Height="16" />
+                                                                    <LucideIcon Kind="Trash" Size="16" />
                                                                     <TextBlock VerticalAlignment="Center" Text="Remove Selected" />
                                                                 </StackPanel>
                                                             </Button>
@@ -718,7 +715,7 @@
                                                             <Button Grid.Row="0" Grid.Column="1" Classes="timeline-select">
                                                                 <Grid ColumnDefinitions="*,Auto" ColumnSpacing="6">
                                                                     <TextBlock VerticalAlignment="Center" Text="{Binding ContextSampleSetName}" />
-                                                                    <materialIcons:MaterialIcon Grid.Column="1" Kind="ChevronDown" Width="16" Height="16" />
+                                                                    <LucideIcon Grid.Column="1" Kind="ChevronDown" Size="16" />
                                                                 </Grid>
                                                                 <Button.Flyout>
                                                                     <Flyout Placement="BottomEdgeAlignedLeft">
@@ -756,13 +753,13 @@
                                                             <Button Classes="timeline-btn"
                                                                     Command="{Binding ApplyContextSamplePointCommand}"
                                                                     ToolTip.Tip="Save Sample Point">
-                                                                <materialIcons:MaterialIcon Kind="ContentSave" Width="16" Height="16" />
+                                                                <LucideIcon Kind="Save" Size="16" />
                                                             </Button>
                                                             <Button Classes="timeline-btn"
                                                                     Command="{Binding RemoveContextSamplePointCommand}"
                                                                     IsEnabled="{Binding ContextSamplePointExists}"
                                                                     ToolTip.Tip="Delete Sample Point">
-                                                                <materialIcons:MaterialIcon Kind="Delete" Width="16" Height="16" />
+                                                                <LucideIcon Kind="Trash" Size="16" />
                                                             </Button>
                                                         </StackPanel>
                                                     </StackPanel>
@@ -803,19 +800,19 @@
                         <Button Classes="timeline-transport-btn"
                                 Command="{Binding TogglePlaybackCommand}"
                                 ToolTip.Tip="{Binding PlaybackButtonText}">
-                            <materialIcons:MaterialIcon Kind="{Binding PlaybackButtonIconKind}" Width="16" Height="16" />
+                            <LucideIcon Kind="{Binding PlaybackButtonIconKind}" Size="16" />
                         </Button>
                         <Button Classes="timeline-transport-btn"
                                 Command="{Binding StopPlaybackSessionCommand}"
                                 ToolTip.Tip="Stop">
-                            <materialIcons:MaterialIcon Kind="Stop" Width="16" Height="16" />
+                            <LucideIcon Kind="Square" Size="16" />
                         </Button>
 
                         <Button Classes="timeline-mute-btn"
                                 Command="{Binding ToggleSongMuteCommand}"
                                 PointerWheelChanged="SongVolumeButton_OnPointerWheelChanged"
                                 ToolTip.Tip="{Binding SongVolumeText, StringFormat=Song volume: {0} | Scroll: +/-1% | Click: mute/unmute}">
-                            <materialIcons:MaterialIcon Kind="{Binding SongVolumeIconKind}" Width="16" Height="16" />
+                            <LucideIcon Kind="{Binding SongVolumeIconKind}" Size="16" />
                             <Button.ContextFlyout>
                                 <Flyout Placement="TopEdgeAlignedLeft">
                                     <Border Classes="PopupSurface timeline-flyout-surface">
@@ -824,7 +821,7 @@
                                                     Command="{Binding ToggleSongMuteCommand}"
                                                     PointerWheelChanged="SongVolumeButton_OnPointerWheelChanged">
                                                 <StackPanel Orientation="Horizontal" Spacing="6">
-                                                    <materialIcons:MaterialIcon Kind="{Binding SongVolumeIconKind}" Width="14" Height="14" />
+                                                    <LucideIcon Kind="{Binding SongVolumeIconKind}" Size="14" />
                                                     <TextBlock VerticalAlignment="Center" Text="Song" />
                                                 </StackPanel>
                                             </Button>
@@ -848,7 +845,7 @@
                                 Command="{Binding ToggleHitSoundMuteCommand}"
                                 PointerWheelChanged="EffectsVolumeButton_OnPointerWheelChanged"
                                 ToolTip.Tip="{Binding HitSoundVolumeText, StringFormat=Effects volume: {0} | Scroll: +/-1% | Click: mute/unmute}">
-                            <materialIcons:MaterialIcon Kind="{Binding EffectsVolumeIconKind}" Width="16" Height="16" />
+                            <LucideIcon Kind="{Binding EffectsVolumeIconKind}" Size="16" />
                             <Button.ContextFlyout>
                                 <Flyout Placement="TopEdgeAlignedLeft">
                                     <Border Classes="PopupSurface timeline-flyout-surface">
@@ -857,7 +854,7 @@
                                                     Command="{Binding ToggleHitSoundMuteCommand}"
                                                     PointerWheelChanged="EffectsVolumeButton_OnPointerWheelChanged">
                                                 <StackPanel Orientation="Horizontal" Spacing="6">
-                                                    <materialIcons:MaterialIcon Kind="{Binding EffectsVolumeIconKind}" Width="14" Height="14" />
+                                                    <LucideIcon Kind="{Binding EffectsVolumeIconKind}" Size="14" />
                                                     <TextBlock VerticalAlignment="Center" Text="Effects" />
                                                 </StackPanel>
                                             </Button>
diff --git a/MapWizard.Desktop/Views/MainWindow.axaml b/MapWizard.Desktop/Views/MainWindow.axaml
index fadb677..99c3399 100644
--- a/MapWizard.Desktop/Views/MainWindow.axaml
+++ b/MapWizard.Desktop/Views/MainWindow.axaml
@@ -4,7 +4,6 @@
     xmlns:vm="using:MapWizard.Desktop.ViewModels"
     xmlns:views="clr-namespace:MapWizard.Desktop.Views"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:welcomePage="clr-namespace:MapWizard.Desktop.Views.WelcomePage"
     xmlns:hitSoundVisualizer="clr-namespace:MapWizard.Desktop.Views.HitSoundVisualizer"
     xmlns:metadataManager="clr-namespace:MapWizard.Desktop.Views.MetadataManager"
@@ -94,16 +93,43 @@
             <Setter Property="CornerRadius" Value="12" />
             <Setter Property="BoxShadow" Value="0 5 16 0 #26000000" />
         </Style>
-        <Style Selector="Border.ContentIslandShadow">
+        <!-- Card chrome for tool/settings pages. It sits behind the page content
+             and simply fades/scales in and out as the Start page is left/entered. -->
+        <Style Selector="Border.ContentIslandCard">
             <Setter Property="Background" Value="{DynamicResource MapWizardSurfaceOpaqueBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource MapWizardBorderBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="12" />
             <Setter Property="BoxShadow" Value="0 5 16 0 #26000000" />
+            <Setter Property="Opacity" Value="1" />
             <Setter Property="IsHitTestVisible" Value="False" />
+            <Setter Property="RenderTransformOrigin" Value="50%,50%" />
+            <Setter Property="RenderTransform" Value="scale(1)" />
+            <Setter Property="Transitions">
+                <Transitions>
+                    <DoubleTransition Property="Opacity" Duration="0:0:0.22">
+                        <DoubleTransition.Easing>
+                            <CubicEaseOut />
+                        </DoubleTransition.Easing>
+                    </DoubleTransition>
+                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.22">
+                        <TransformOperationsTransition.Easing>
+                            <CubicEaseOut />
+                        </TransformOperationsTransition.Easing>
+                    </TransformOperationsTransition>
+                </Transitions>
+            </Setter>
+        </Style>
+        <Style Selector="Border.ContentIslandCard.no-card">
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="RenderTransform" Value="scale(0.97)" />
         </Style>
+        <!-- Transparent host for the page content. It keeps the rounded clip so
+             content cannot spill past the card corners, while the card chrome
+             above it can fade and scale on its own. -->
         <Style Selector="Border.ContentIsland">
-            <Setter Property="Background" Value="{DynamicResource MapWizardSurfaceOpaqueBrush}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource MapWizardBorderBrush}" />
-            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
             <Setter Property="CornerRadius" Value="12" />
             <Setter Property="ClipToBounds" Value="True" />
         </Style>
@@ -151,8 +177,8 @@
 
     <VisualLayerManager>
         <Panel>
-        <!-- Rounded, self-drawn window shell: dark base + backdrop, clipped to
-             the shell shape so the drawn frame's shadow shows around it. -->
+        <!-- Linux keeps the app-drawn shell; MainWindow removes this radius on
+             Windows so the OS compositor owns the outer corners. -->
         <Border x:Name="WindowShell"
                 Classes="WindowShell"
                 Background="{DynamicResource MapWizardWindowBackgroundBrush}"
@@ -187,7 +213,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsWelcomeSelected}" />
-                                <materialIcons:MaterialIcon Kind="Home"
+                                <LucideIcon Kind="House" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -216,7 +242,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsHitSoundCopierSelected}" />
-                                <materialIcons:MaterialIcon Kind="ContentCopy"
+                                <LucideIcon Kind="Copy" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -245,7 +271,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsMetadataManagerSelected}" />
-                                <materialIcons:MaterialIcon Kind="FileDocumentMultiple"
+                                <LucideIcon Kind="Files" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -274,7 +300,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsHitSoundVisualizerSelected}" />
-                                <materialIcons:MaterialIcon Kind="ChartTimelineVariant"
+                                <LucideIcon Kind="ChartLine" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -303,7 +329,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsComboColourStudioSelected}" />
-                                <materialIcons:MaterialIcon Kind="Palette"
+                                <LucideIcon Kind="Palette" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -332,7 +358,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsMapCleanerSelected}" />
-                                <materialIcons:MaterialIcon Kind="Broom"
+                                <LucideIcon Kind="BrushCleaning" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -363,7 +389,7 @@
                                         Background="{DynamicResource MapWizardAccentBrush}"
                                         Opacity="0.20"
                                         IsVisible="{Binding IsSettingsSelected}" />
-                                <materialIcons:MaterialIcon Kind="Cog"
+                                <LucideIcon Kind="Settings" Size="18"
                                                             Foreground="{DynamicResource MapWizardTextBrush}"
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center" />
@@ -390,10 +416,11 @@
 
         <Panel Grid.Column="1"
                Margin="0,0,10,10">
-            <!-- Shadow lives on its own layer: the island sets ClipToBounds so
-                 page content cannot spill past its rounded corners, which would
-                 otherwise clip the island's own box shadow away. -->
-            <Border Classes="ContentIslandShadow" />
+            <!-- Card chrome layer. A separate sibling from the content host so it
+                 can fade/scale without dragging the page content with it, and so
+                 its box shadow is not clipped by the content's rounded clip. -->
+            <Border Classes="ContentIslandCard"
+                    Classes.no-card="{Binding IsWelcomeSelected}" />
             <Border Classes="ContentIsland">
                 <TransitioningContentControl Content="{Binding CurrentPageViewModel}">
                     <TransitioningContentControl.PageTransition>
@@ -429,7 +456,7 @@
                                 Spacing="9"
                                 VerticalAlignment="Center"
                                 IsHitTestVisible="False">
-                        <Image Source="/Assets/app-icon.png"
+                        <Image Source="/Assets/app-icon-64.png"
                                Width="23"
                                Height="23"
                                Stretch="Uniform"
@@ -443,13 +470,33 @@
 
                 <Border Grid.Column="2"
                         Classes="TitleBarIsland">
-                    <Button Classes="TitleBarActionButton"
-                            Command="{Binding OpenGithubCommand}"
-                            ToolTip.Tip="View on GitHub">
-                        <materialIcons:MaterialIcon Kind="Github" Width="18" Height="18"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center" />
-                    </Button>
+                    <StackPanel Orientation="Horizontal"
+                                VerticalAlignment="Center">
+                        <Button Classes="TitleBarActionButton"
+                                Command="{Binding OpenGithubCommand}"
+                                ToolTip.Tip="View on GitHub">
+                            <Viewbox Width="18" Height="18"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center">
+                                <Canvas Width="24" Height="24">
+                                    <Path Fill="{DynamicResource MapWizardTextBrush}"
+                                          Data="{StaticResource BrandGithub}" />
+                                </Canvas>
+                            </Viewbox>
+                        </Button>
+                        <Button Classes="TitleBarActionButton"
+                                Command="{Binding OpenDiscordCommand}"
+                                ToolTip.Tip="Join the Discord">
+                            <Viewbox Width="18" Height="18"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center">
+                                <Canvas Width="24" Height="24">
+                                    <Path Fill="{DynamicResource MapWizardTextBrush}"
+                                          Data="{StaticResource BrandDiscord}" />
+                                </Canvas>
+                            </Viewbox>
+                        </Button>
+                    </StackPanel>
                 </Border>
 
                 <Border Grid.Column="3"
diff --git a/MapWizard.Desktop/Views/MainWindow.axaml.cs b/MapWizard.Desktop/Views/MainWindow.axaml.cs
index 11602f7..7b9d293 100644
--- a/MapWizard.Desktop/Views/MainWindow.axaml.cs
+++ b/MapWizard.Desktop/Views/MainWindow.axaml.cs
@@ -47,6 +47,8 @@ public MainWindow(
 
         public void NavigateToHitSoundCopier() => ViewModel.NavigateToHitSoundCopier();
 
+        public void NavigateToHitSoundVisualizer() => ViewModel.NavigateToHitSoundVisualizer();
+
         public void NavigateToMetadataManager() => ViewModel.NavigateToMetadataManager();
 
         public void NavigateToComboColourStudio() => ViewModel.NavigateToComboColourStudio();
@@ -73,8 +75,16 @@ private void ApplyPlatformWindowChrome()
 
         private void UpdateShellCorners()
         {
+            if (OperatingSystem.IsWindows())
+            {
+                WindowShell.CornerRadius = default;
+                WindowShell.ClipToBounds = false;
+                return;
+            }
+
             var square = WindowState is WindowState.Maximized or WindowState.FullScreen;
-            WindowShell.CornerRadius = square ? default : new CornerRadius(ShellCornerRadius);
+            WindowShell.CornerRadius = square ? default : new CornerRadius(12d);
+            WindowShell.ClipToBounds = true;
         }
 
         private void UpdateWindowControlGlyphs()
diff --git a/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml b/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
index 437b631..150ea8a 100644
--- a/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
+++ b/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
@@ -24,7 +23,7 @@
         <Style Selector="Border.SnapChip TextBlock">
             <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         </Style>
-        <Style Selector="Border.SnapChip materialIcons|MaterialIcon">
+        <Style Selector="Border.SnapChip LucideIcon">
             <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         </Style>
         <Style Selector="Button.SnapChipClose">
@@ -67,7 +66,7 @@
                     Command="{Binding CleanMapsCommand}"
                     ToolTip.Tip="Apply map cleaner actions">
                 <StackPanel Orientation="Horizontal" Spacing="8">
-                    <materialIcons:MaterialIcon Kind="ContentSave" Width="24" Height="24" />
+                    <LucideIcon Kind="Save" Size="24" />
                     <TextBlock
                         VerticalAlignment="Center"
                         FontWeight="Normal"
@@ -85,7 +84,6 @@
                     SectionTitle="Beatmap Selection"
                     OriginMap="{Binding OriginBeatmap}"
                     DestinationMaps="{Binding DestinationBeatmaps}"
-                    SourceSubtitle="Select the beatmap you want to clean."
                     ShowDestinationSelection="False"
                     OriginPathChangedCommand="{Binding ReanalyzeOriginAfterPathChangeCommand}" />
 
@@ -110,7 +108,7 @@
                                                         Command="{ReflectionBinding DataContext.RemoveSnapCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Remove snap">
-                                                    <materialIcons:MaterialIcon Kind="Close" Width="14" Height="14" />
+                                                    <LucideIcon Kind="X" Size="14" />
                                                 </Button>
                                             </StackPanel>
                                         </Border>
diff --git a/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml b/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
index f2b03a2..a0f49bb 100644
--- a/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
+++ b/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
@@ -7,7 +7,6 @@
   xmlns:local="clr-namespace:MapWizard.Desktop.Converters"
   xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
   xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
-  xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
   xmlns:models="using:MapWizard.Desktop.Models"
   mc:Ignorable="d"
@@ -38,7 +37,7 @@
         Command="{Binding ApplyMetadataCommand}"
         ToolTip.Tip="Export metadata to selected beatmaps">
         <StackPanel Orientation="Horizontal" Spacing="8">
-          <materialIcons:MaterialIcon Kind="ContentSave" Width="24" Height="24" />
+          <LucideIcon Kind="Save" Size="24" />
           <TextBlock
             VerticalAlignment="Center"
             FontWeight="Normal"
@@ -55,9 +54,7 @@
 
         <controls:BeatmapSelectionPanel
           OriginMap="{Binding OriginBeatmap}"
-          DestinationMaps="{Binding DestinationBeatmaps}"
-          SourceSubtitle="Select the beatmap to import metadata from."
-          TargetSubtitle="Select the beatmaps to export the metadata to." />
+          DestinationMaps="{Binding DestinationBeatmaps}" />
         
         <!-- METADATA -->
         <Grid ColumnDefinitions="*,*" Margin="0,8,0,0">
@@ -185,7 +182,7 @@
                                   Command="{ReflectionBinding DataContext.RemoveColourCommand, ElementName=Root}"
                                   CommandParameter="{Binding}" 
                                   ToolTip.Tip="Remove this colour">
-                            <materialIcons:MaterialIcon Kind="Close" Width="24" Height="24" />
+                            <LucideIcon Kind="X" Size="24" />
                           </Button>
                         </StackPanel>
                       </Grid>
@@ -193,7 +190,7 @@
                   </ItemsControl.ItemTemplate>
                 </ItemsControl>
                 <Button Classes="Basic" Command="{Binding AddColourCommand}" ToolTip.Tip="Add a new combo colour">
-                  <materialIcons:MaterialIcon Kind="Add" Width="24" Height="24" />
+                  <LucideIcon Kind="Plus" Size="24" />
                 </Button>
               </StackPanel>
             </StackPanel>
diff --git a/MapWizard.Desktop/Views/Settings/SettingsView.axaml b/MapWizard.Desktop/Views/Settings/SettingsView.axaml
index da738ac..b4f999d 100644
--- a/MapWizard.Desktop/Views/Settings/SettingsView.axaml
+++ b/MapWizard.Desktop/Views/Settings/SettingsView.axaml
@@ -6,7 +6,6 @@
     xmlns:vm="clr-namespace:MapWizard.Desktop.ViewModels"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:settingsModels="clr-namespace:MapWizard.Desktop.Models.Settings"
     xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
     x:Class="MapWizard.Desktop.Views.Settings.SettingsView"
@@ -101,14 +100,19 @@
             <RadioButton x:Name="AppearanceNav" Classes="SettingsNav" Content="Appearance" Tag="Appearance" Click="CategoryButton_OnClick" />
             <RadioButton x:Name="AudioNav" Classes="SettingsNav" Content="Audio" Tag="Audio" Click="CategoryButton_OnClick" />
             <RadioButton x:Name="InformationNav" Classes="SettingsNav" Content="Information" Tag="Information" Click="CategoryButton_OnClick" />
+            <RadioButton x:Name="SupportNav" Classes="SettingsNav" Content="Support" Tag="Support" Click="CategoryButton_OnClick" />
         </StackPanel>
 
         <appControls:SmoothScrollViewer x:Name="SettingsScrollViewer"
                                         Grid.Column="1"
                                         HorizontalScrollBarVisibility="Disabled"
                                         ScrollChanged="SettingsScrollViewer_OnScrollChanged">
-            <StackPanel x:Name="SettingsSections" MaxWidth="980" HorizontalAlignment="Stretch">
-                <theme:Surface x:Name="GeneralSection" Margin="0,0,0,16" Padding="20"><theme:SectionGroup Header="General">
+            <theme:Surface x:Name="SettingsCard"
+                           MaxWidth="980"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Top">
+                <StackPanel x:Name="SettingsSections" Spacing="28">
+                    <theme:SectionGroup x:Name="GeneralSection" Header="General">
                         <StackPanel Spacing="20">
                             <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
                                 <StackPanel Spacing="4">
@@ -152,20 +156,10 @@
                                     <TextBlock Text="Auto Detect" />
                                 </Button>
                             </Grid>
-
-                            <Button Classes="Flat Compact"
-                                    HorizontalAlignment="Left"
-                                    IsEnabled="{Binding CanRestartToApplyUpdate}"
-                                    Command="{Binding RestartToApplyUpdateCommand}">
-                                <TextBlock Text="{Binding UpdateStreamBadgeText}"
-                                           FontSize="12"
-                                           FontWeight="Normal"
-                                           TextDecorations="Underline" />
-                            </Button>
                         </StackPanel>
-                </theme:SectionGroup></theme:Surface>
+                    </theme:SectionGroup>
 
-                <theme:Surface x:Name="AppearanceSection" Margin="0,0,0,16" Padding="20"><theme:SectionGroup Header="Appearance">
+                    <theme:SectionGroup x:Name="AppearanceSection" Header="Appearance">
                         <StackPanel Spacing="20">
                             <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
                                 <TextBlock Text="Variant" FontWeight="Bold" VerticalAlignment="Center" />
@@ -251,9 +245,9 @@
                                               IsChecked="{Binding IsSmoothWheelScrollingEnabled, Mode=TwoWay}" />
                             </Grid>
                         </StackPanel>
-                </theme:SectionGroup></theme:Surface>
+                    </theme:SectionGroup>
 
-                <theme:Surface x:Name="AudioSection" Margin="0,0,0,16" Padding="20"><theme:SectionGroup Header="Audio">
+                    <theme:SectionGroup x:Name="AudioSection" Header="Audio">
                         <StackPanel Spacing="20">
                             <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
                                 <StackPanel Spacing="4">
@@ -308,9 +302,9 @@
                                 </StackPanel>
                             </Grid>
                         </StackPanel>
-                </theme:SectionGroup></theme:Surface>
+                    </theme:SectionGroup>
 
-                <theme:Surface x:Name="InformationSection" Margin="0,0,0,16" Padding="20"><theme:SectionGroup Header="Information">
+                    <theme:SectionGroup x:Name="InformationSection" Header="Information">
                         <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="8" VerticalAlignment="Center">
                             <TextBlock Text="Config Directory:" VerticalAlignment="Center" />
                             <TextBlock Grid.Column="1"
@@ -328,11 +322,65 @@
                                     Command="{Binding OpenConfigDirectoryCommand}"
                                     ToolTip.Tip="Open config directory"
                                     AutomationProperties.Name="Open config directory">
-                                <materialIcons:MaterialIcon Kind="FolderOpen" Width="18" Height="18" />
+                                <LucideIcon Kind="FolderOpen" Size="18" />
                             </Button>
                         </Grid>
-                </theme:SectionGroup></theme:Surface>
-            </StackPanel>
+                    </theme:SectionGroup>
+
+                    <theme:SectionGroup x:Name="SupportSection" Header="Support">
+                        <StackPanel Spacing="16">
+                            <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="12" VerticalAlignment="Center">
+                                <LucideIcon Kind="Info" Size="20" VerticalAlignment="Center" />
+                                <StackPanel Grid.Column="1" Spacing="2">
+                                    <TextBlock Text="{Binding VersionLabel}" FontWeight="Bold" />
+                                    <TextBlock Text="The MapWizard build currently running."
+                                               FontSize="12"
+                                               Opacity="0.82" />
+                                </StackPanel>
+                                <Button Grid.Column="2"
+                                        Classes="Basic Compact"
+                                        Padding="0"
+                                        VerticalAlignment="Center"
+                                        IsEnabled="{Binding CanRestartToApplyUpdate}"
+                                        Command="{Binding RestartToApplyUpdateCommand}">
+                                    <TextBlock Text="{Binding UpdateStreamBadgeText}"
+                                               FontSize="12"
+                                               FontWeight="Normal" />
+                                </Button>
+                            </Grid>
+
+                            <TextBlock TextWrapping="Wrap"
+                                       Text="Need a hand or found a bug? Join the Discord for quick questions, or open an issue on GitHub. When reporting a problem, include your version, operating system, and the steps that reproduce it." />
+
+                            <WrapPanel>
+                                <Button Classes="Basic" Margin="0,0,8,8" Command="{Binding OpenDiscordCommand}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <Viewbox Width="16" Height="16" VerticalAlignment="Center">
+                                            <Canvas Width="24" Height="24">
+                                                <Path Fill="{DynamicResource MapWizardTextBrush}"
+                                                      Data="{StaticResource BrandDiscord}" />
+                                            </Canvas>
+                                        </Viewbox>
+                                        <TextBlock Text="Join the Discord" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Button>
+                                <Button Classes="Basic" Margin="0,0,8,8" Command="{Binding OpenIssuesCommand}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <LucideIcon Kind="Bug" Size="16" VerticalAlignment="Center" />
+                                        <TextBlock Text="Report an issue" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Button>
+                                <Button Classes="Basic" Margin="0,0,8,8" Command="{Binding OpenDocumentationCommand}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <LucideIcon Kind="BookOpen" Size="16" VerticalAlignment="Center" />
+                                        <TextBlock Text="Documentation" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Button>
+                            </WrapPanel>
+                        </StackPanel>
+                    </theme:SectionGroup>
+                </StackPanel>
+            </theme:Surface>
         </appControls:SmoothScrollViewer>
     </Grid>
 </UserControl>
diff --git a/MapWizard.Desktop/Views/Settings/SettingsView.axaml.cs b/MapWizard.Desktop/Views/Settings/SettingsView.axaml.cs
index 90b80e0..b977d63 100644
--- a/MapWizard.Desktop/Views/Settings/SettingsView.axaml.cs
+++ b/MapWizard.Desktop/Views/Settings/SettingsView.axaml.cs
@@ -62,7 +62,8 @@ private void SettingsScrollViewer_OnScrollChanged(object? sender, ScrollChangedE
             (GeneralSection, GeneralNav),
             (AppearanceSection, AppearanceNav),
             (AudioSection, AudioNav),
-            (InformationSection, InformationNav)
+            (InformationSection, InformationNav),
+            (SupportSection, SupportNav)
         };
 
         var selected = sections[0].Button;
@@ -86,6 +87,7 @@ private void SettingsScrollViewer_OnScrollChanged(object? sender, ScrollChangedE
         "Appearance" => AppearanceSection,
         "Audio" => AudioSection,
         "Information" => InformationSection,
+        "Support" => SupportSection,
         _ => GeneralSection
     };
 }
diff --git a/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml b/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml
index a262c1d..2c5e1cc 100644
--- a/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml
+++ b/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml
@@ -4,97 +4,248 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:vm="clr-namespace:MapWizard.Desktop.ViewModels"
+    xmlns:models="clr-namespace:MapWizard.Desktop.Models"
     xmlns:controls="clr-namespace:MapWizard.Desktop.Views.Controls"
     xmlns:appControls="clr-namespace:MapWizard.Desktop.Controls"
-    xmlns:theme="clr-namespace:MapWizard.Theme.Controls;assembly=MapWizard.Theme"
-    xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     mc:Ignorable="d"
-    d:DesignWidth="800"
-    d:DesignHeight="450"
+    d:DesignWidth="900"
+    d:DesignHeight="600"
     x:Class="MapWizard.Desktop.Views.WelcomePage.WelcomePageView"
     x:DataType="vm:WelcomePageViewModel"
-    Padding="24">
-    <Grid RowDefinitions="Auto,*" VerticalAlignment="Center" RowSpacing="20">
-        <StackPanel Grid.Row="0" HorizontalAlignment="Center" Spacing="8">
-            <TextBlock Text="Welcome to MapWizard" FontSize="30" FontWeight="Bold" HorizontalAlignment="Center" />
-            <TextBlock HorizontalAlignment="Center" Text="Select a tool to get started."></TextBlock>
+    Padding="28">
+    <UserControl.Styles>
+        <Style Selector="TextBlock.section-label">
+            <Setter Property="FontSize" Value="11" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="LetterSpacing" Value="0.6" />
+            <Setter Property="Foreground" Value="{DynamicResource MapWizardTextSecondaryBrush}" />
+            <Setter Property="Margin" Value="4,0,0,8" />
+        </Style>
+
+        <!-- List row: no borders, soft rounded hover. Hover feedback is instant
+             (no transitions) so the list feels responsive. -->
+        <Style Selector="Button.list-row">
+            <Setter Property="Padding" Value="12" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="12" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="FocusAdorner" Value="{x:Null}" />
+        </Style>
+        <Style Selector="Button.list-row /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource TemplatedParent}}" />
+        </Style>
+        <Style Selector="Button.list-row:pointerover">
+            <Setter Property="Background" Value="{DynamicResource MapWizardControlHoverBrush}" />
+        </Style>
+
+        <Style Selector="Border.row-icon-plate">
+            <Setter Property="CornerRadius" Value="10" />
+            <Setter Property="Background" Value="{DynamicResource MapWizardAccentBrush}" />
+            <Setter Property="Opacity" Value="0.16" />
+        </Style>
+        <Style Selector="Button.list-row:pointerover Border.row-icon-plate">
+            <Setter Property="Opacity" Value="0.34" />
+        </Style>
+
+        <!-- Chevron only shows while the row is hovered. -->
+        <Style Selector="Border.row-chevron">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+        <Style Selector="Button.list-row:pointerover Border.row-chevron">
+            <Setter Property="Opacity" Value="0.9" />
+        </Style>
+    </UserControl.Styles>
+
+    <Grid RowDefinitions="Auto,*" RowSpacing="18">
+        <StackPanel Grid.Row="0"
+                    Spacing="12"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+            <Image Source="/Assets/app-icon-256.png"
+                   Width="80"
+                   Height="80"
+                   HorizontalAlignment="Center"
+                   Stretch="Uniform"
+                   RenderOptions.BitmapInterpolationMode="HighQuality" />
+            <TextBlock Text="Welcome to MapWizard"
+                       FontSize="26"
+                       FontWeight="Bold"
+                       HorizontalAlignment="Center" />
         </StackPanel>
-        
 
-        <appControls:SmoothScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled">
-            <controls:CenteredWrapPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" ItemSpacing="10">
-                <Grid Margin="15">
-                    <theme:Surface Width="260" Height="220" Margin="0,0,0,25" Padding="16" CornerRadius="18">
-                        <StackPanel VerticalAlignment="Center" Spacing="12">
-                            <Border Width="56" Height="56" CornerRadius="28" HorizontalAlignment="Center" Background="{DynamicResource MapWizardAccentBrush}" Opacity="0.2">
-                                <materialIcons:MaterialIcon Kind="ContentCopy" Width="28" Height="28" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                            </Border>
-                            <TextBlock Text="Hitsound Copier" FontWeight="Bold" FontSize="18" HorizontalAlignment="Center" />
-                            <TextBlock Text="Copy hitsounds between difficulties fast."
-                                       TextWrapping="Wrap"
-                                       HorizontalAlignment="Center"
-                                       TextAlignment="Center" />
-                        </StackPanel>
-                    </theme:Surface>
-                    <Button Width="160"
-                            Height="40"
-                            Margin="0,0,0,7"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Bottom"
-                            Classes="Flat Rounded"
-                            Click="OpenHitSoundCopier_OnClick">
-                        Open
-                    </Button>
-                </Grid>
+        <appControls:SmoothScrollViewer Grid.Row="1"
+                                        HorizontalScrollBarVisibility="Disabled"
+                                        VerticalContentAlignment="Center">
+            <Grid ColumnDefinitions="2*,*"
+                  ColumnSpacing="32"
+                  MaxWidth="1080"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Center">
+                <!-- Left column: tools -->
+                <StackPanel Grid.Column="0">
+                    <TextBlock Classes="section-label" Text="TOOLS" />
+                    <ItemsControl ItemsSource="{Binding Tools}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate x:DataType="models:QuickStartTool">
+                                <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                        Click="OpenTool_OnClick" ToolTip.Tip="{Binding Description}">
+                                    <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                        <Grid Width="38" Height="38">
+                                            <Border Classes="row-icon-plate" />
+                                            <LucideIcon Kind="{Binding Icon}" Size="19"
+                                                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                        Foreground="{DynamicResource MapWizardTextBrush}" />
+                                        </Grid>
+                                        <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+                                            <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                                            <TextBlock Text="{Binding Description}"
+                                                       FontSize="12"
+                                                       Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                        </StackPanel>
+                                        <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                            <LucideIcon Kind="ChevronRight" Size="16"
+                                                        Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                        </Border>
+                                    </Grid>
+                                </Button>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
 
-                <Grid Margin="15">
-                    <theme:Surface Width="260" Height="220" Margin="0,0,0,25" Padding="16" CornerRadius="18">
-                        <StackPanel VerticalAlignment="Center" Spacing="12">
-                            <Border Width="56" Height="56" CornerRadius="28" HorizontalAlignment="Center" Background="{DynamicResource MapWizardAccentBrush}" Opacity="0.2">
-                                <materialIcons:MaterialIcon Kind="FileDocumentMultiple" Width="28" Height="28" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                            </Border>
-                            <TextBlock Text="Metadata Manager" FontWeight="Bold" FontSize="18" HorizontalAlignment="Center" />
-                            <TextBlock Text="Edit and sync metadata across maps."
-                                       TextWrapping="Wrap"
-                                       HorizontalAlignment="Center"
-                                       TextAlignment="Center" />
+                <!-- Right column: quick actions and support -->
+                <StackPanel Grid.Column="1" Spacing="24">
+                    <StackPanel>
+                        <TextBlock Classes="section-label" Text="QUICK ACTIONS" />
+                        <StackPanel>
+                            <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                    Click="OpenSettings_OnClick"
+                                    IsVisible="{Binding !IsSongsFolderConfigured}"
+                                    ToolTip.Tip="{Binding SongsFolderStatusText}">
+                                <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                    <Grid Width="38" Height="38">
+                                        <Border Classes="row-icon-plate" />
+                                        <LucideIcon Kind="FolderOpen" Size="19" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Foreground="{DynamicResource MapWizardTextBrush}" />
+                                    </Grid>
+                                    <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+                                        <TextBlock Text="Set osu! Songs folder" FontWeight="SemiBold" />
+                                        <TextBlock Text="Point Map Picker at your osu! library."
+                                                   FontSize="12"
+                                                   Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </StackPanel>
+                                    <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                        <LucideIcon Kind="ChevronRight" Size="16"
+                                                    Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </Border>
+                                </Grid>
+                            </Button>
+                            <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                    Click="OpenSettings_OnClick" ToolTip.Tip="Open settings">
+                                <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                    <Grid Width="38" Height="38">
+                                        <Border Classes="row-icon-plate" />
+                                        <LucideIcon Kind="Settings" Size="19" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Foreground="{DynamicResource MapWizardTextBrush}" />
+                                    </Grid>
+                                    <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+                                        <TextBlock Text="Open settings" FontWeight="SemiBold" />
+                                        <TextBlock Text="Theme, audio, updates, and paths."
+                                                   FontSize="12"
+                                                   Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </StackPanel>
+                                    <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                        <LucideIcon Kind="ChevronRight" Size="16"
+                                                    Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </Border>
+                                </Grid>
+                            </Button>
+                            <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                    Command="{Binding CheckForUpdatesCommand}" ToolTip.Tip="Check for updates">
+                                <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                    <Grid Width="38" Height="38">
+                                        <Border Classes="row-icon-plate" />
+                                        <LucideIcon Kind="RefreshCw" Size="19" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Foreground="{DynamicResource MapWizardTextBrush}" />
+                                    </Grid>
+                                    <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+                                        <TextBlock Text="Check for updates" FontWeight="SemiBold" />
+                                        <TextBlock Text="See if a newer MapWizard is available."
+                                                   FontSize="12"
+                                                   Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </StackPanel>
+                                    <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                        <LucideIcon Kind="ChevronRight" Size="16"
+                                                    Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </Border>
+                                </Grid>
+                            </Button>
                         </StackPanel>
-                    </theme:Surface>
-                    <Button Width="160"
-                            Height="40"
-                            Margin="0,0,0,7"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Bottom"
-                            Classes="Flat Rounded"
-                            Click="OpenMetadataManager_OnClick">
-                        Open
-                    </Button>
-                </Grid>
+                    </StackPanel>
 
-                <Grid Margin="15">
-                    <theme:Surface Width="260" Height="220" Margin="0,0,0,25" Padding="16" CornerRadius="18">
-                        <StackPanel VerticalAlignment="Center" Spacing="12">
-                            <Border Width="56" Height="56" CornerRadius="28" HorizontalAlignment="Center" Background="{DynamicResource MapWizardAccentBrush}" Opacity="0.2">
-                                <materialIcons:MaterialIcon Kind="Palette" Width="28" Height="28" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                            </Border>
-                            <TextBlock Text="Combo Colour Studio" FontWeight="Bold" FontSize="18" HorizontalAlignment="Center" />
-                            <TextBlock Text="Design and apply combo colour patterns."
-                                       TextWrapping="Wrap"
-                                       HorizontalAlignment="Center"
-                                       TextAlignment="Center" />
+                    <StackPanel>
+                        <TextBlock Classes="section-label" Text="SUPPORT" />
+                        <StackPanel>
+                            <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                    Command="{Binding OpenDiscordCommand}">
+                                <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                    <Grid Width="38" Height="38">
+                                        <Border Classes="row-icon-plate" />
+                                        <Viewbox Width="19" Height="19" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                            <Canvas Width="24" Height="24">
+                                                <Path Fill="{DynamicResource MapWizardTextBrush}" Data="{StaticResource BrandDiscord}" />
+                                            </Canvas>
+                                        </Viewbox>
+                                    </Grid>
+                                    <TextBlock Grid.Column="1" Text="Join the Discord"
+                                               VerticalAlignment="Center" FontWeight="SemiBold" />
+                                    <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                        <LucideIcon Kind="ChevronRight" Size="16"
+                                                    Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </Border>
+                                </Grid>
+                            </Button>
+                            <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                    Command="{Binding OpenDocumentationCommand}">
+                                <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                    <Grid Width="38" Height="38">
+                                        <Border Classes="row-icon-plate" />
+                                        <LucideIcon Kind="BookOpen" Size="19" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                    Foreground="{DynamicResource MapWizardTextBrush}" />
+                                    </Grid>
+                                    <TextBlock Grid.Column="1" Text="Documentation"
+                                               VerticalAlignment="Center" FontWeight="SemiBold" />
+                                    <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                        <LucideIcon Kind="ChevronRight" Size="16"
+                                                    Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </Border>
+                                </Grid>
+                            </Button>
+                            <Button Classes="list-row" HorizontalAlignment="Stretch"
+                                    Command="{Binding OpenGithubCommand}">
+                                <Grid ColumnDefinitions="Auto,*,Auto" ColumnSpacing="14">
+                                    <Grid Width="38" Height="38">
+                                        <Border Classes="row-icon-plate" />
+                                        <Viewbox Width="19" Height="19" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                            <Canvas Width="24" Height="24">
+                                                <Path Fill="{DynamicResource MapWizardTextBrush}" Data="{StaticResource BrandGithub}" />
+                                            </Canvas>
+                                        </Viewbox>
+                                    </Grid>
+                                    <TextBlock Grid.Column="1" Text="GitHub"
+                                               VerticalAlignment="Center" FontWeight="SemiBold" />
+                                    <Border Grid.Column="2" Classes="row-chevron" VerticalAlignment="Center">
+                                        <LucideIcon Kind="ChevronRight" Size="16"
+                                                    Foreground="{DynamicResource MapWizardTextSecondaryBrush}" />
+                                    </Border>
+                                </Grid>
+                            </Button>
                         </StackPanel>
-                    </theme:Surface>
-                    <Button Width="160"
-                            Height="40"
-                            Margin="0,0,0,7"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Bottom"
-                            Classes="Flat Rounded"
-                            Click="OpenComboColourStudio_OnClick">
-                        Open
-                    </Button>
-                </Grid>
-            </controls:CenteredWrapPanel>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
         </appControls:SmoothScrollViewer>
     </Grid>
 </UserControl>
diff --git a/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml.cs b/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml.cs
index 2f9a1ce..4bda96f 100644
--- a/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml.cs
+++ b/MapWizard.Desktop/Views/WelcomePage/WelcomePageView.axaml.cs
@@ -1,6 +1,8 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
+using MapWizard.Desktop.Models;
+using MapWizard.Desktop.ViewModels;
 
 namespace MapWizard.Desktop.Views.WelcomePage;
 
@@ -9,20 +11,45 @@ public partial class WelcomePageView : UserControl
     public WelcomePageView()
     {
         InitializeComponent();
+        AttachedToVisualTree += (_, _) =>
+        {
+            if (DataContext is WelcomePageViewModel vm)
+            {
+                vm.RefreshSongsFolderStatus();
+            }
+        };
     }
 
-    private void OpenHitSoundCopier_OnClick(object? sender, RoutedEventArgs e)
+    private void OpenTool_OnClick(object? sender, RoutedEventArgs e)
     {
-        this.FindAncestorOfType<MainWindow>()?.NavigateToHitSoundCopier();
-    }
+        if (sender is not Button { DataContext: QuickStartTool tool })
+        {
+            return;
+        }
 
-    private void OpenMetadataManager_OnClick(object? sender, RoutedEventArgs e)
-    {
-        this.FindAncestorOfType<MainWindow>()?.NavigateToMetadataManager();
+        var mainWindow = this.FindAncestorOfType<MainWindow>();
+        switch (tool.Key)
+        {
+            case "copier":
+                mainWindow?.NavigateToHitSoundCopier();
+                break;
+            case "metadata":
+                mainWindow?.NavigateToMetadataManager();
+                break;
+            case "hitsound-editor":
+                mainWindow?.NavigateToHitSoundVisualizer();
+                break;
+            case "combo-colour":
+                mainWindow?.NavigateToComboColourStudio();
+                break;
+            case "map-cleaner":
+                mainWindow?.NavigateToMapCleaner();
+                break;
+        }
     }
 
-    private void OpenComboColourStudio_OnClick(object? sender, RoutedEventArgs e)
+    private void OpenSettings_OnClick(object? sender, RoutedEventArgs e)
     {
-        this.FindAncestorOfType<MainWindow>()?.NavigateToComboColourStudio();
+        this.FindAncestorOfType<MainWindow>()?.NavigateToSettings();
     }
 }
diff --git a/MapWizard.Theme/Controls/AnimatedHeightBorder.cs b/MapWizard.Theme/Controls/AnimatedHeightBorder.cs
index bb89abc..4f652ea 100644
--- a/MapWizard.Theme/Controls/AnimatedHeightBorder.cs
+++ b/MapWizard.Theme/Controls/AnimatedHeightBorder.cs
@@ -22,6 +22,7 @@ public sealed class AnimatedHeightBorder : Border
     private Size _lastMeasuredContentSize;
     private DateTime _animationEndsAt;
     private bool _isAttached;
+    private bool _isTrackingLayout;
 
     public AnimatedHeightBorder()
     {
@@ -31,7 +32,6 @@ public AnimatedHeightBorder()
         };
         _settledMeasureTimer.Tick += OnSettledMeasureTimerTick;
         SizeChanged += OnSizeChanged;
-        LayoutUpdated += OnLayoutUpdated;
     }
 
     protected override Type StyleKeyOverride => typeof(AnimatedHeightBorder);
@@ -46,6 +46,7 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
         _isAttached = true;
+        UpdateLayoutTracking();
         ScheduleHeightUpdate();
         RestartSettledMeasureTimer();
     }
@@ -53,6 +54,7 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
         _isAttached = false;
+        UpdateLayoutTracking();
         _settledMeasureTimer.Stop();
         base.OnDetachedFromVisualTree(e);
     }
@@ -64,6 +66,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
         if (change.Property == IsExpandedProperty)
         {
             PseudoClasses.Set(":expanded", IsExpanded);
+            UpdateLayoutTracking();
             ScheduleHeightUpdate();
             RestartSettledMeasureTimer();
         }
@@ -78,7 +81,7 @@ private void OnSizeChanged(object? sender, SizeChangedEventArgs e)
     {
         // Height changes continuously during the transition. Only a width change
         // can alter wrapping and therefore the measured expansion target.
-        if (Math.Abs(e.NewSize.Width - e.PreviousSize.Width) <= 0.5d)
+        if (!IsExpanded || Math.Abs(e.NewSize.Width - e.PreviousSize.Width) <= 0.5d)
         {
             return;
         }
@@ -102,6 +105,26 @@ private void OnLayoutUpdated(object? sender, EventArgs e)
         }
     }
 
+    private void UpdateLayoutTracking()
+    {
+        var shouldTrack = _isAttached && IsExpanded;
+        if (shouldTrack == _isTrackingLayout)
+        {
+            return;
+        }
+
+        if (shouldTrack)
+        {
+            LayoutUpdated += OnLayoutUpdated;
+        }
+        else
+        {
+            LayoutUpdated -= OnLayoutUpdated;
+        }
+
+        _isTrackingLayout = shouldTrack;
+    }
+
     private void OnSettledMeasureTimerTick(object? sender, EventArgs e)
     {
         _settledMeasureTimer.Stop();
diff --git a/MapWizard.Theme/Controls/BusyIndicator.cs b/MapWizard.Theme/Controls/BusyIndicator.cs
index 9680c43..15c68fe 100644
--- a/MapWizard.Theme/Controls/BusyIndicator.cs
+++ b/MapWizard.Theme/Controls/BusyIndicator.cs
@@ -24,6 +24,7 @@ public sealed class BusyIndicator : TemplatedControl
     private Control? _track;
     private Control? _indicator;
     private CompositionVisual? _indicatorVisual;
+    private List<IDisposable>? _geometrySubscriptions;
 
     public static readonly StyledProperty<bool> IsRunningProperty =
         AvaloniaProperty.Register<BusyIndicator, bool>(nameof(IsRunning));
@@ -56,6 +57,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 
         _track = e.NameScope.Find<Control>("PART_Track");
         _indicator = e.NameScope.Find<Control>("PART_Indicator");
+        TrackGeometry();
         UpdateAnimationState();
     }
 
@@ -69,6 +71,8 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
         StopAnimation();
+        _geometrySubscriptions?.ForEach(subscription => subscription.Dispose());
+        _geometrySubscriptions = null;
         _track = null;
         _indicator = null;
         TrackAncestors(null);
@@ -77,6 +81,26 @@ protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e
 
     private List<IDisposable>? _ancestorSubscriptions;
 
+    private void TrackGeometry()
+    {
+        _geometrySubscriptions?.ForEach(subscription => subscription.Dispose());
+        _geometrySubscriptions = [];
+
+        if (_track is not null)
+        {
+            _geometrySubscriptions.Add(_track
+                .GetPropertyChangedObservable(Visual.BoundsProperty)
+                .Subscribe(new AnonymousObserver<AvaloniaPropertyChangedEventArgs>(_ => UpdateAnimationState())));
+        }
+
+        if (_indicator is not null)
+        {
+            _geometrySubscriptions.Add(_indicator
+                .GetPropertyChangedObservable(Visual.BoundsProperty)
+                .Subscribe(new AnonymousObserver<AvaloniaPropertyChangedEventArgs>(_ => UpdateAnimationState())));
+        }
+    }
+
     private void TrackAncestors(Visual? root)
     {
         _ancestorSubscriptions?.ForEach(d => d.Dispose());
diff --git a/MapWizard.Theme/Controls/MapWizardWindow.cs b/MapWizard.Theme/Controls/MapWizardWindow.cs
index 2eb9502..bb5757f 100644
--- a/MapWizard.Theme/Controls/MapWizardWindow.cs
+++ b/MapWizard.Theme/Controls/MapWizardWindow.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -10,17 +10,13 @@ namespace MapWizard.Theme.Controls;
 
 /// <summary>
 /// MapWizard's client-side-decorated application window.
-/// Decoration painting is done by the app: a custom titlebar with caption
-/// buttons plus Avalonia's drawn frame (border, shadow, resize grips), so the
-/// look is identical on Linux (Wayland/X11), Windows and macOS.
+/// The app provides the titlebar controls. Windows owns its outer shape and
+/// corners; Linux keeps the app-drawn shell because compositor behavior varies.
 /// On macOS the native traffic lights are kept (full decorations) so the
 /// window controls sit at the top-left, as per platform convention.
 /// </summary>
 public class MapWizardWindow : Window
 {
-    /// <summary>The corner radius applied to the window shell in its normal state.</summary>
-    public const double ShellCornerRadius = 12;
-
     public MapWizardWindow()
     {
         WindowDecorations = OperatingSystem.IsMacOS()
@@ -28,8 +24,16 @@ public MapWizardWindow()
             : WindowDecorations.BorderOnly;
         ExtendClientAreaToDecorationsHint = true;
         ExtendClientAreaTitleBarHeightHint = 60;
-        TransparencyLevelHint = [WindowTransparencyLevel.Transparent];
-        Background = Brushes.Transparent;
+        if (OperatingSystem.IsWindows())
+        {
+            Classes.Add("Windows");
+            TransparencyLevelHint = [WindowTransparencyLevel.None];
+        }
+        else
+        {
+            TransparencyLevelHint = [WindowTransparencyLevel.Transparent];
+            Background = Brushes.Transparent;
+        }
         AddHandler(PointerPressedEvent, OnWindowPointerPressed, RoutingStrategies.Tunnel);
     }
 
@@ -64,11 +68,24 @@ private void OnWindowPointerPressed(object? sender, PointerPressedEventArgs e)
             return;
         }
 
-        var ancestors = source.GetVisualAncestors().OfType<Control>().ToArray();
-        var isTitleBar = source.Classes.Contains("WindowTitleBar") ||
-                         ancestors.Any(x => x.Classes.Contains("WindowTitleBar"));
-        var isButton = source is Button || ancestors.Any(x => x is Button);
-        if (!isTitleBar || isButton)
+        var isTitleBar = false;
+        Visual? current = source;
+        while (current is not null)
+        {
+            if (current is Button)
+            {
+                return;
+            }
+
+            if (current is Control control && control.Classes.Contains("WindowTitleBar"))
+            {
+                isTitleBar = true;
+            }
+
+            current = current.GetVisualParent();
+        }
+
+        if (!isTitleBar)
         {
             return;
         }
diff --git a/MapWizard.Theme/MapWizard.Theme.csproj b/MapWizard.Theme/MapWizard.Theme.csproj
index 57e8444..61f46e9 100644
--- a/MapWizard.Theme/MapWizard.Theme.csproj
+++ b/MapWizard.Theme/MapWizard.Theme.csproj
@@ -8,5 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="12.1.2" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.2" />
   </ItemGroup>
 </Project>
diff --git a/MapWizard.Theme/MapWizardTheme.axaml b/MapWizard.Theme/MapWizardTheme.axaml
index c274cbb..d514a18 100644
--- a/MapWizard.Theme/MapWizardTheme.axaml
+++ b/MapWizard.Theme/MapWizardTheme.axaml
@@ -113,7 +113,7 @@
             <CornerRadius x:Key="MapWizardCornerLarge">15</CornerRadius>
             <system:TimeSpan x:Key="MapWizardMotionFast">0:0:0.12</system:TimeSpan>
             <system:TimeSpan x:Key="MapWizardMotionNormal">0:0:0.2</system:TimeSpan>
-            <FontFamily x:Key="MapWizardFontFamily">Quicksand, Noto Sans, Noto Sans CJK SC, Segoe UI, Arial</FontFamily>
+            <FontFamily x:Key="MapWizardFontFamily">$Default, fonts:Inter#Inter, Noto Sans, Noto Sans CJK SC, Segoe UI, Arial</FontFamily>
         </ResourceDictionary>
     </Styles.Resources>
 
@@ -124,6 +124,16 @@
         <Setter Property="FontSize" Value="14" />
     </Style>
 
+    <!-- Linux keeps MapWizard's app-drawn shell. On Windows the app frame is
+         square and the OS compositor applies the platform's native corners. -->
+    <Style Selector="chrome|WindowDrawnDecorations /template/ Border#PART_WindowBorder">
+        <Setter Property="CornerRadius" Value="13" />
+    </Style>
+    <Style Selector="chrome|WindowDrawnDecorations:maximized /template/ Border#PART_WindowBorder,
+                     Window.Windows chrome|WindowDrawnDecorations /template/ Border#PART_WindowBorder">
+        <Setter Property="CornerRadius" Value="0" />
+    </Style>
+
     <Style Selector="Border.WindowBackdrop">
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Background">
@@ -134,14 +144,6 @@
         </Setter>
     </Style>
 
-    <!-- Rounded drawn window frame matching the app's window shell. -->
-    <Style Selector="chrome|WindowDrawnDecorations /template/ Border#PART_WindowBorder">
-        <Setter Property="CornerRadius" Value="13" />
-    </Style>
-    <Style Selector="chrome|WindowDrawnDecorations:maximized /template/ Border#PART_WindowBorder">
-        <Setter Property="CornerRadius" Value="0" />
-    </Style>
-
     <!-- Keep scrollbars inset from host edges (islands/dialog borders). -->
     <Style Selector="ScrollViewer /template/ ScrollBar#PART_VerticalScrollBar">
         <Setter Property="Margin" Value="0,6,4,6" />
diff --git a/MapWizard.Theme/Motion/Scrollable.cs b/MapWizard.Theme/Motion/Scrollable.cs
index 672020a..f349330 100644
--- a/MapWizard.Theme/Motion/Scrollable.cs
+++ b/MapWizard.Theme/Motion/Scrollable.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Animation.Easings;
 using Avalonia.Rendering.Composition;
 
 namespace MapWizard.Theme.Motion;
@@ -8,13 +9,20 @@ namespace MapWizard.Theme.Motion;
 /// </summary>
 public static class Scrollable
 {
+    /// <summary>
+    /// Short enough to react immediately while still softening discrete wheel detents.
+    /// The exponential curve is the closed-form equivalent of repeatedly lerping
+    /// toward the target and does not require a UI-thread timer per frame.
+    /// </summary>
+    public static readonly TimeSpan DefaultDuration = TimeSpan.FromMilliseconds(180);
+
     public static void MakeScrollable(CompositionVisual visual, TimeSpan? duration = null)
     {
         var compositor = visual.Compositor;
         var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
         offsetAnimation.Target = "Offset";
-        offsetAnimation.InsertExpressionKeyFrame(1f, "this.FinalValue");
-        offsetAnimation.Duration = duration ?? TimeSpan.FromMilliseconds(250);
+        offsetAnimation.InsertExpressionKeyFrame(1f, "this.FinalValue", new ExponentialEaseOut());
+        offsetAnimation.Duration = duration ?? DefaultDuration;
 
         var animationGroup = compositor.CreateAnimationGroup();
         animationGroup.Add(offsetAnimation);
diff --git a/install/install.sh b/install/install.sh
new file mode 100755
index 0000000..f053d17
--- /dev/null
+++ b/install/install.sh
@@ -0,0 +1,259 @@
+#!/usr/bin/env bash
+#
+# MapWizard installer for Linux and macOS.
+#
+# Windows uses the Setup.exe from the releases page instead; this script only
+# handles the platforms where Velopack ships an AppImage (.AppImage) or a pkg
+# (.pkg).
+#
+# Usage:
+#   curl -fsSL https://mapwizard.maot.dev/install | bash
+#
+# Options:
+#   --pre              Install the newest pre-release instead of the latest stable.
+#   --version <tag>    Install a specific release tag (e.g. v2.7.2 or 3.0.0-rc2).
+#   --dir <path>       Linux only: where to place the AppImage (default: ~/.local/bin).
+#   --portable         macOS only: unzip to ~/Applications instead of using the pkg.
+#   --no-desktop       Linux only: skip the desktop launcher.
+#   -h, --help         Show this help.
+#
+set -euo pipefail
+
+REPO="maotovisk/MapWizard"
+API="https://api.github.com/repos/${REPO}"
+PAGE="https://github.com/${REPO}/releases"
+
+CHANNEL="stable"
+VERSION=""
+INSTALL_DIR=""
+PORTABLE=0
+NO_DESKTOP=0
+
+log() { printf '%s\n' "$*"; }
+warn() { printf 'warning: %s\n' "$*" >&2; }
+die() {
+    printf 'error: %s\n' "$*" >&2
+    exit 1
+}
+
+usage() {
+    cat <<'EOF'
+MapWizard installer for Linux and macOS.
+
+Usage:
+  curl -fsSL https://mapwizard.maot.dev/install | bash
+
+Options:
+  --pre              Install the newest pre-release instead of the latest stable.
+  --version <tag>    Install a specific release tag (e.g. v2.7.2 or 3.0.0-rc2).
+  --dir <path>       Linux only: where to place the AppImage (default: ~/.local/bin).
+  --portable         macOS only: unzip to ~/Applications instead of using the pkg.
+  --no-desktop       Linux only: skip the desktop launcher.
+  -h, --help         Show this help.
+EOF
+}
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --pre) CHANNEL="prerelease" ;;
+        --version)
+            [[ $# -ge 2 ]] || die "--version needs a tag"
+            VERSION="$2"
+            shift
+            ;;
+        --dir)
+            [[ $# -ge 2 ]] || die "--dir needs a path"
+            INSTALL_DIR="$2"
+            shift
+            ;;
+        --portable) PORTABLE=1 ;;
+        --no-desktop) NO_DESKTOP=1 ;;
+        -h | --help)
+            usage
+            exit 0
+            ;;
+        *) die "unknown option: $1 (try --help)" ;;
+    esac
+    shift
+done
+
+command -v curl >/dev/null 2>&1 || die "curl is required"
+command -v uname >/dev/null 2>&1 || die "uname is required"
+
+OS="$(uname -s)"
+ARCH="$(uname -m)"
+
+case "$OS" in
+    Linux) ;;
+    Darwin) ;;
+    *) die "unsupported platform '${OS}'. On Windows, download and run the Setup.exe from ${PAGE}/latest" ;;
+esac
+
+case "$ARCH" in
+    x86_64 | amd64) ;;
+    arm64)
+        [[ "$OS" == "Darwin" ]] || die "no arm64 Linux build is published yet (only linux-x64)"
+        warn "the macOS build is x64; Apple Silicon needs Rosetta 2 (macOS will offer to install it)"
+        ;;
+    aarch64)
+        die "no arm64 Linux build is published yet (only linux-x64)"
+        ;;
+    *) die "unsupported architecture '${ARCH}'" ;;
+esac
+
+# Pull the release metadata. Stable uses releases/latest; --pre takes the newest
+# release of any kind; a pinned version looks the tag up directly.
+release_json=""
+fetch_release() {
+    if [[ -n "$VERSION" ]]; then
+        local tag="$VERSION"
+        if [[ "$tag" != v* ]]; then
+            release_json="$(curl -fsSL "${API}/releases/tags/v${tag}" 2>/dev/null)" ||
+                release_json="$(curl -fsSL "${API}/releases/tags/${tag}" 2>/dev/null)" || return 1
+        else
+            release_json="$(curl -fsSL "${API}/releases/tags/${tag}" 2>/dev/null)" || return 1
+        fi
+    elif [[ "$CHANNEL" == "prerelease" ]]; then
+        release_json="$(curl -fsSL "${API}/releases?per_page=1" 2>/dev/null)" || return 1
+    else
+        release_json="$(curl -fsSL "${API}/releases/latest" 2>/dev/null)" || return 1
+    fi
+    return 0
+}
+
+release_tag() {
+    printf '%s' "$release_json" |
+        grep -o '"tag_name"[[:space:]]*:[[:space:]]*"[^"]*"' |
+        head -n 1 |
+        sed -E 's/.*"([^"]*)"$/\1/'
+}
+
+# Finds a browser_download_url whose name ends with the given suffix.
+asset_url() {
+    printf '%s' "$release_json" |
+        grep -o '"browser_download_url"[[:space:]]*:[[:space:]]*"[^"]*"' |
+        sed -E 's/.*"(https:[^"]*)"/\1/' |
+        grep -F -- "$1" |
+        head -n 1
+}
+
+fallback_url() {
+    local name="$1" tag
+    tag="$(release_tag || true)"
+    if [[ -n "$tag" ]]; then
+        printf '%s/download/%s/%s' "$PAGE" "$tag" "$name"
+    else
+        printf '%s/latest/download/%s' "$PAGE" "$name"
+    fi
+}
+
+fetch_release || true
+
+if [[ -z "$release_json" && "$CHANNEL" == "prerelease" ]]; then
+    die "could not reach the GitHub API to find the newest pre-release"
+fi
+
+TAG="$(release_tag || true)"
+[[ -n "$TAG" ]] || TAG="${VERSION:-latest}"
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+download() {
+    local url="$1" out="$2"
+    log "Downloading $(basename "$out") ..."
+    curl -fL --progress-bar -o "$out" "$url" || die "download failed: $url"
+}
+
+linux_asset="MapWizard.Desktop.AppImage"
+macos_pkg="MapWizard.Desktop-osx-Setup.pkg"
+macos_zip="MapWizard.Desktop-osx-Portable.zip"
+
+if [[ "$OS" == "Linux" ]]; then
+    url="$(asset_url ".AppImage" || true)"
+    [[ -n "$url" ]] || url="$(fallback_url "$linux_asset")"
+
+    dest_dir="${INSTALL_DIR:-$HOME/.local/bin}"
+    dest="${dest_dir}/MapWizard.AppImage"
+    mkdir -p "$dest_dir"
+    download "$url" "$tmpdir/$linux_asset"
+    mv -f "$tmpdir/$linux_asset" "$dest"
+    chmod +x "$dest"
+
+    if [[ "$NO_DESKTOP" -eq 0 ]]; then
+        data_dir="${XDG_DATA_HOME:-$HOME/.local/share}"
+        applications_dir="$data_dir/applications"
+        icons_dir="$data_dir/icons/hicolor/256x256/apps"
+        mkdir -p "$applications_dir"
+
+        icon_line=""
+        if (cd "$tmpdir" && "$dest" --appimage-extract '.DirIcon' >/dev/null 2>&1) &&
+            [[ -f "$tmpdir/squashfs-root/.DirIcon" ]]; then
+            mkdir -p "$icons_dir"
+            if cp "$tmpdir/squashfs-root/.DirIcon" "$icons_dir/mapwizard.png" 2>/dev/null; then
+                icon_line="Icon=mapwizard"
+            fi
+        fi
+
+        {
+            printf '[Desktop Entry]\n'
+            printf 'Type=Application\n'
+            printf 'Name=MapWizard\n'
+            printf 'Comment=osu! beatmap utility suite\n'
+            printf 'Exec=%s %%U\n' "$dest"
+            printf 'Terminal=false\n'
+            printf 'Categories=Utility;\n'
+            if [[ -n "$icon_line" ]]; then
+                printf '%s\n' "$icon_line"
+            fi
+        } >"$applications_dir/mapwizard.desktop"
+
+        command -v update-desktop-database >/dev/null 2>&1 &&
+            update-desktop-database "$applications_dir" >/dev/null 2>&1 || true
+
+        case ":${PATH}:" in
+            *":${dest_dir}:"*) ;;
+            *) warn "${dest_dir} is not on your PATH; run MapWizard with ${dest}" ;;
+        esac
+    fi
+
+    log ""
+    log "MapWizard ${TAG} installed to ${dest}"
+    log "Launch it with: ${dest}"
+else
+    # macOS
+    if [[ "$PORTABLE" -eq 1 ]]; then
+        url="$(asset_url "-osx-Portable.zip" || true)"
+        [[ -n "$url" ]] || url="$(fallback_url "$macos_zip")"
+        dest_dir="$HOME/Applications"
+        mkdir -p "$dest_dir"
+        download "$url" "$tmpdir/$macos_zip"
+        log "Extracting to ${dest_dir} ..."
+        ditto -x -k "$tmpdir/$macos_zip" "$dest_dir" >/dev/null 2>&1 ||
+            die "could not extract ${macos_zip}"
+        app_path="$(find "$dest_dir" -maxdepth 1 -name 'MapWizard*.app' -print -quit)"
+        [[ -n "$app_path" ]] && xattr -dr com.apple.quarantine "$app_path" 2>/dev/null || true
+        log ""
+        log "MapWizard ${TAG} installed to ${app_path:-$dest_dir}"
+    else
+        url="$(asset_url ".pkg" || true)"
+        [[ -n "$url" ]] || url="$(fallback_url "$macos_pkg")"
+        download "$url" "$tmpdir/$macos_pkg"
+
+        if [[ ! -t 0 && ! -e /dev/tty ]]; then
+            die "the installer needs sudo but no terminal is available; run without piping: curl -fsSL ... -o install.sh && bash install.sh"
+        fi
+
+        log "Installing the package (sudo required) ..."
+        sudo installer -pkg "$tmpdir/$macos_pkg" -target / ||
+            die "package installation failed"
+
+        app_path="$(find /Applications "$HOME/Applications" -maxdepth 1 -name 'MapWizard*.app' -print -quit 2>/dev/null)"
+        [[ -n "$app_path" ]] && sudo xattr -dr com.apple.quarantine "$app_path" 2>/dev/null || true
+
+        log ""
+        log "MapWizard ${TAG} installed${app_path:+ to $app_path}"
+    fi
+fi
+
+log "Update later from inside the app (Settings > Updates)."
diff --git a/readme.md b/readme.md
index a6db556..9c2ff94 100644
--- a/readme.md
+++ b/readme.md
@@ -1,25 +1,45 @@
 # MapWizard
 
-Cross-platform osu! beatmap utility suite built with C#/.NET 10 and Avalonia.
+osu! beatmap toolset for Windows, Linux, and macOS, built with C#/.NET 10 and Avalonia.
 
 [![GitHub release](https://img.shields.io/github/v/release/maotovisk/MapWizard?style=flat-square)](https://github.com/maotovisk/MapWizard/releases)
 ![Platforms](https://img.shields.io/badge/platforms-Windows%20%7C%20Linux%20%7C%20macOS-blue?style=flat-square)
 ![Framework](https://img.shields.io/badge/.NET-10.0-blueviolet?style=flat-square)
 [![Repo](https://img.shields.io/badge/GitHub-maotovisk%2FMapWizard-black?style=flat-square)](https://github.com/maotovisk/MapWizard)
+[![Discord](https://img.shields.io/badge/Discord-join-5865F2?style=flat-square&logo=discord&logoColor=white)](https://mapwizard.maot.dev/discord)
 
-## Current Features
+## Install
+
+### Linux and macOS:
+
+You can install MapWizard by running the following command:
+
+```bash
+curl -fsSL https://mapwizard.maot.dev/install | bash
+```
+
+or grab the [latest release](https://github.com/maotovisk/MapWizard/releases/latest) manually.
+
+### Windows
+
+You can install MapWizard by downloading and running the `.exe` installer from the
+[latest release](https://github.com/maotovisk/MapWizard/releases/latest).
+
+## Current Tools
 
 - HitSound Copier
 - Metadata Manager
 - Combo Colour Studio
 - Map Picker
-- Theme/settings management
-- Update stream + updater integration
+- HitSound Editor (beta)
+- Map Cleaner
 
 ## Projects
 
-- `MapWizard.Desktop`: Avalonia desktop app.
+- `MapWizard.Desktop`: Avalonia desktop app (main application).
+- `MapWizard.Theme`: Custom Avalonia theme for the app.
 - `MapWizard.Tools`: core tooling logic.
+- `MapWizard.CLI`: soon-to-be command-line interface for the app.
 - `MapWizard.Tests`: test suite.
 
 ## Requirements
@@ -43,7 +63,7 @@ Optional software rendering fallback:
 dotnet run --project MapWizard.Desktop -- --software-rendering
 ```
 
-Or:
+Or set the environment variable:
 
 ```bash
 MAPWIZARD_FORCE_SOFTWARE_RENDERING=1 dotnet run --project MapWizard.Desktop
@@ -83,7 +103,7 @@ Combo Colour Studio local projects:
 - macOS: `~/Library/Application Support/MapWizard/ComboColourStudio/projects.json`
 - Linux: `$XDG_DATA_HOME/MapWizard/ComboColourStudio/projects.json` (fallback: `~/.local/share/MapWizard/ComboColourStudio/projects.json`)
 
-## Credits
+## Credits and Special Thanks
 
 - [OliBomby's Mapping Tools](https://github.com/olibomby/mapping_tools) for inspiration.
 - The original [Map Wizard](https://github.com/maotovisk/map-wizard) (Tauri/Svelte implementation).
@@ -94,4 +114,5 @@ Combo Colour Studio local projects:
 
 ## Contributing
 
-Issues and pull requests are welcome.
+Issues and pull requests are welcome. For questions, help, and updates, join the
+[Discord](https://mapwizard.maot.dev/discord).