diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 72f0e1e0..9c3f1d97 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,14 +14,6 @@ updates:
       nuget:
         patterns:
           - "*"
-    ignore:
-      # SixLabors moved ImageSharp v4 / ImageSharp.Drawing v3 to the commercial
-      # "Six Labors Split License", which hard-fails the build without a paid
-      # license key. Stay on the Apache-2.0 3.1.x / 2.1.x line. See PR #21.
-      - dependency-name: "SixLabors.ImageSharp"
-        update-types: ["version-update:semver-major"]
-      - dependency-name: "SixLabors.ImageSharp.Drawing"
-        update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "github-actions"
     directory: "/"
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 116f6e08..db0dfaea 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,14 +4,14 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Packages -->
-    <PackageVersion Include="Discord.Net" Version="3.20.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="10.0.12" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.12" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.12" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
+    <PackageVersion Include="Discord.Net" Version="3.20.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="10.0.13" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.13" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.13" />
     <PackageVersion Include="Persistord.Core" Version="1.0.0-beta.3" />
     <PackageVersion Include="Persistord.Managed" Version="1.0.0-beta.3" />
     <PackageVersion Include="RustMapsApi" Version="1.0.0-beta.4" />
@@ -22,8 +22,6 @@
     <PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.1" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
-    <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
     <PackageVersion Include="SkiaSharp" Version="4.153.1" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="4.153.1" />
     <!-- Pinned to override the transitive 2.1.11 pulled by Microsoft.EntityFrameworkCore.Sqlite,
@@ -37,7 +35,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
     <PackageVersion Include="coverlet.collector" Version="10.1.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="4.0.1" />
     <PackageVersion Include="NSubstitute" Version="6.2.0" />
     <PackageVersion Include="Persistord.Testing" Version="1.0.0-beta.3" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.5.85" />
diff --git a/src/RustPlusBot.Features.Map/Assets/MapIcons.cs b/src/RustPlusBot.Features.Map/Assets/MapIcons.cs
index 6e1f500d..b23a27a5 100644
--- a/src/RustPlusBot.Features.Map/Assets/MapIcons.cs
+++ b/src/RustPlusBot.Features.Map/Assets/MapIcons.cs
@@ -1,8 +1,7 @@
 using System.Collections.Concurrent;
 using RustPlusBot.Abstractions.Connections;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
+using RustPlusBot.Features.Map.Rendering;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Assets;
 
@@ -19,12 +18,12 @@ public static class MapIcons
 {
     private const string ResourcePrefix = "RustPlusBot.Features.Map.Assets.icons.";
 
-    private static readonly ConcurrentDictionary<string, Image<Rgba32>?> Cache = new(StringComparer.Ordinal);
+    private static readonly ConcurrentDictionary<string, SKImage?> Cache = new(StringComparer.Ordinal);
 
     /// <summary>Gets the icon for a marker kind, or null when there is no icon for that kind.</summary>
     /// <param name="kind">The marker kind.</param>
     /// <returns>The cached icon image, or null.</returns>
-    public static Image<Rgba32>? Marker(MarkerKind kind)
+    public static SKImage? Marker(MarkerKind kind)
     {
         var key = KeyFor(kind);
         return key is null ? null : Native(key);
@@ -34,11 +33,11 @@ public static class MapIcons
     /// <param name="kind">The marker kind.</param>
     /// <param name="size">The box edge length in pixels; the longest icon edge is scaled to it.</param>
     /// <returns>The cached scaled icon, or null.</returns>
-    public static Image<Rgba32>? Marker(MarkerKind kind, int size) => Scaled(KeyFor(kind), size);
+    public static SKImage? Marker(MarkerKind kind, int size) => Scaled(KeyFor(kind), size);
 
     /// <summary>Gets the travelling vendor icon.</summary>
     /// <returns>The cached vendor icon image, or null.</returns>
-    public static Image<Rgba32>? Vendor() => Native("vendor");
+    public static SKImage? Vendor() => Native("vendor");
 
     private static string? KeyFor(MarkerKind kind) => kind switch
     {
@@ -49,7 +48,7 @@ public static class MapIcons
         _ => null,
     };
 
-    private static Image<Rgba32>? Native(string? key) => key is null
+    private static SKImage? Native(string? key) => key is null
         ? null
         : Cache.GetOrAdd(key, static k => k switch
         {
@@ -58,21 +57,31 @@ public static class MapIcons
             _ => LoadPng(k),
         });
 
-    private static Image<Rgba32>? LoadPng(string key)
+    private static SKImage? LoadPng(string key)
     {
         var asm = typeof(MapIcons).Assembly;
         using var stream = asm.GetManifestResourceStream(ResourcePrefix + key + ".png");
-        return stream is null ? null : Image.Load<Rgba32>(stream);
+        return stream is null ? null : Raster.Decode(stream);
     }
 
-    private static Image<Rgba32>? Scaled(string? key, int size) => key is null
+    private static SKImage? Scaled(string? key, int size) => key is null
         ? null
         : Cache.GetOrAdd($"{key}@{size}", _ =>
         {
             var native = Native(key);
-            return native?.Clone(ctx => ctx.Resize(new ResizeOptions
-            {
-                Mode = ResizeMode.Max, Size = new Size(size, size),
-            }));
+            return native is null ? null : FitBox(native, size);
         });
+
+    /// <summary>Scales an icon so its longest edge equals the box edge, keeping the aspect ratio.</summary>
+    /// <param name="native">The full-size icon.</param>
+    /// <param name="size">The box edge length in pixels.</param>
+    /// <returns>The scaled icon.</returns>
+    private static SKImage FitBox(SKImage native, int size)
+    {
+        var scale = Math.Min((float)size / native.Width, (float)size / native.Height);
+        var width = Math.Max(1, (int)MathF.Round(native.Width * scale));
+        var height = Math.Max(1, (int)MathF.Round(native.Height * scale));
+        return Raster.Draw(width, height,
+            canvas => canvas.DrawImage(native, SKRect.Create(width, height), Raster.Smooth));
+    }
 }
diff --git a/src/RustPlusBot.Features.Map/Assets/MarkerIconComposer.cs b/src/RustPlusBot.Features.Map/Assets/MarkerIconComposer.cs
index 86fe98df..d83f357f 100644
--- a/src/RustPlusBot.Features.Map/Assets/MarkerIconComposer.cs
+++ b/src/RustPlusBot.Features.Map/Assets/MarkerIconComposer.cs
@@ -1,6 +1,5 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
+using RustPlusBot.Features.Map.Rendering;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Assets;
 
@@ -22,66 +21,64 @@ internal static class MarkerIconComposer
     private const float ChinookBladeScale = 0.62f;
 
     /// <summary>The single main-rotor hub offset, in body pixels (populated on first access).</summary>
-    internal static IReadOnlyList<PointF> HeliRotorOffsets { get; } = HeliOffsets();
+    internal static IReadOnlyList<SKPoint> HeliRotorOffsets { get; } = HeliOffsets();
 
     /// <summary>The two tandem-rotor offsets (front, rear), in body pixels.</summary>
-    internal static IReadOnlyList<PointF> ChinookRotorOffsets { get; } = ChinookOffsets();
+    internal static IReadOnlyList<SKPoint> ChinookRotorOffsets { get; } = ChinookOffsets();
 
     /// <summary>Builds the patrol-heli composite (body + one rotor blade on the hub).</summary>
     /// <returns>The composited heli icon; caller owns disposal.</returns>
-    internal static Image<Rgba32> Heli() =>
+    internal static SKImage Heli() =>
         Compose("heli", HeliRotorOffsets, HeliBladeScale);
 
     /// <summary>Builds the CH47 composite (body + two rotor blades at the tandem positions).</summary>
     /// <returns>The composited chinook icon; caller owns disposal.</returns>
-    internal static Image<Rgba32> Chinook() =>
+    internal static SKImage Chinook() =>
         Compose("chinook", ChinookRotorOffsets, ChinookBladeScale);
 
-    private static IReadOnlyList<PointF> HeliOffsets()
+    private static IReadOnlyList<SKPoint> HeliOffsets()
     {
         using var body = Load("heli");
 
         // Hub sits slightly forward of centre.
-        return [new PointF(body.Width / 2f, body.Height * 0.44f)];
+        return [new SKPoint(body.Width / 2f, body.Height * 0.44f)];
     }
 
-    private static IReadOnlyList<PointF> ChinookOffsets()
+    private static IReadOnlyList<SKPoint> ChinookOffsets()
     {
         using var body = Load("chinook");
         var cx = body.Width / 2f;
         return
         [
-            new PointF(cx, body.Height * 0.20f), // front rotor
-            new PointF(cx, body.Height * 0.80f), // rear rotor
+            new SKPoint(cx, body.Height * 0.20f), // front rotor
+            new SKPoint(cx, body.Height * 0.80f), // rear rotor
         ];
     }
 
-    private static Image<Rgba32> Compose(string bodyKey, IReadOnlyList<PointF> offsets, float bladeScale)
+    private static SKImage Compose(string bodyKey, IReadOnlyList<SKPoint> offsets, float bladeScale)
     {
-        var canvas = Load(bodyKey); // returned to caller (cached by MapIcons); not disposed here
+        using var body = Load(bodyKey);
         using var blade = Load("blade");
-        var edge = (int)(Math.Min(canvas.Width, canvas.Height) * bladeScale);
-        using var scaledBlade = blade.Clone(c => c.Resize(edge, edge));
+        var edge = (int)(Math.Min(body.Width, body.Height) * bladeScale);
 
-        canvas.Mutate(ctx =>
+        // Returned to the caller (cached by MapIcons); not disposed here.
+        return Raster.Draw(body.Width, body.Height, canvas =>
         {
+            canvas.DrawImage(body, 0, 0, SKSamplingOptions.Default);
             foreach (var offset in offsets)
             {
-                var topLeft = new Point(
-                    (int)(offset.X - (scaledBlade.Width / 2f)),
-                    (int)(offset.Y - (scaledBlade.Height / 2f)));
-                ctx.DrawImage(scaledBlade, topLeft, 1f);
+                var left = (int)(offset.X - (edge / 2f));
+                var top = (int)(offset.Y - (edge / 2f));
+                canvas.DrawImage(blade, SKRect.Create(left, top, edge, edge), Raster.Smooth);
             }
         });
-
-        return canvas;
     }
 
-    private static Image<Rgba32> Load(string key)
+    private static SKImage Load(string key)
     {
         var asm = typeof(MarkerIconComposer).Assembly;
         using var stream = asm.GetManifestResourceStream(ResourcePrefix + key + ".png")
                            ?? throw new InvalidOperationException($"Embedded marker asset '{key}.png' not found.");
-        return Image.Load<Rgba32>(stream);
+        return Raster.Decode(stream);
     }
 }
diff --git a/src/RustPlusBot.Features.Map/Assets/MonumentIconSource.cs b/src/RustPlusBot.Features.Map/Assets/MonumentIconSource.cs
index 09ed1ad3..71b03219 100644
--- a/src/RustPlusBot.Features.Map/Assets/MonumentIconSource.cs
+++ b/src/RustPlusBot.Features.Map/Assets/MonumentIconSource.cs
@@ -3,8 +3,7 @@
 using RustMapsApi.V4.Assets;
 using RustMapsApi.V4.Models;
 using RustPlusBot.Abstractions.Events;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
+using RustPlusBot.Features.Map.Rendering;
 using SkiaSharp;
 using Svg.Skia;
 
@@ -21,14 +20,14 @@ namespace RustPlusBot.Features.Map.Assets;
 /// <param name="logger">Logs tokens that resolve to no icon, once per token per process.</param>
 public sealed partial class MonumentIconSource(IMonumentAssetSource assets, ILogger<MonumentIconSource> logger)
 {
-    private readonly ConcurrentDictionary<(MonumentType Type, int Size), Lazy<Image<Rgba32>?>> _cache = new();
+    private readonly ConcurrentDictionary<(MonumentType Type, int Size), Lazy<SKImage?>> _cache = new();
     private readonly ConcurrentDictionary<string, byte> _reported = new(StringComparer.Ordinal);
 
     /// <summary>Gets the icon for a monument token scaled to a square box, or null when no icon exists.</summary>
     /// <param name="token">The Rust+ monument protobuf token (or prefab name).</param>
     /// <param name="size">The box edge length in pixels.</param>
     /// <returns>The cached icon, or null (reported once per token).</returns>
-    public Image<Rgba32>? Monument(string token, int size)
+    public SKImage? Monument(string token, int size)
     {
         var type = MonumentTokenMap.TypeFor(token);
         if (type is null)
@@ -48,20 +47,20 @@ public sealed partial class MonumentIconSource(IMonumentAssetSource assets, ILog
     /// <param name="kind">Which rig.</param>
     /// <param name="size">The box edge length in pixels.</param>
     /// <returns>The cached rig icon, or null.</returns>
-    public Image<Rgba32>? Rig(RigKind kind, int size) => kind switch
+    public SKImage? Rig(RigKind kind, int size) => kind switch
     {
         RigKind.Small => For(MonumentType.OilrigSmall, "oil_rig_small", size),
         RigKind.Large => For(MonumentType.OilrigLarge, "large_oil_rig", size),
         _ => null,
     };
 
-    private Image<Rgba32>? For(MonumentType type, string token, int size)
+    private SKImage? For(MonumentType type, string token, int size)
     {
         // GetOrAdd's value factory may run more than once under a first-request race; the Lazy wrapper
         // (ExecutionAndPublication) guarantees Rasterize itself runs exactly once per key, so no losing
         // image is leaked and the rasterization-failure Warning fires at most once per (type, size).
         var image = _cache
-            .GetOrAdd((type, size), key => new Lazy<Image<Rgba32>?>(() => Rasterize(key.Type, key.Size)))
+            .GetOrAdd((type, size), key => new Lazy<SKImage?>(() => Rasterize(key.Type, key.Size)))
             .Value;
         if (image is null)
         {
@@ -79,7 +78,7 @@ private void ReportOnce(string token, MonumentType? type)
         }
     }
 
-    private Image<Rgba32>? Rasterize(MonumentType type, int size)
+    private SKImage? Rasterize(MonumentType type, int size)
     {
         if (!assets.TryGetAsset(type, out var asset))
         {
@@ -97,20 +96,14 @@ private void ReportOnce(string token, MonumentType? type)
                 }
             }
 
-            var bounds = svg.Picture!.CullRect;
-            using var bitmap = new SKBitmap(new SKImageInfo(size, size, SKColorType.Rgba8888, SKAlphaType.Premul));
-            using (var canvas = new SKCanvas(bitmap))
+            var picture = svg.Picture!;
+            var bounds = picture.CullRect;
+            return Raster.Draw(size, size, canvas =>
             {
-                canvas.Clear(SKColors.Transparent);
                 canvas.Scale(size / bounds.Width, size / bounds.Height);
                 canvas.Translate(-bounds.Left, -bounds.Top);
-                canvas.DrawPicture(svg.Picture);
-            }
-
-            using var skImage = SKImage.FromBitmap(bitmap);
-            using var png = skImage.Encode(SKEncodedImageFormat.Png, 100);
-            using var ms = png.AsStream();
-            return Image.Load<Rgba32>(ms);
+                canvas.DrawPicture(picture);
+            });
         }
 #pragma warning disable CA1031 // Broad catch: a bad SVG must degrade to "no icon", never break a render.
         catch (Exception ex)
diff --git a/src/RustPlusBot.Features.Map/Composing/MapComposer.cs b/src/RustPlusBot.Features.Map/Composing/MapComposer.cs
index 0e4f1df5..8b5fc97f 100644
--- a/src/RustPlusBot.Features.Map/Composing/MapComposer.cs
+++ b/src/RustPlusBot.Features.Map/Composing/MapComposer.cs
@@ -5,7 +5,7 @@
 using RustPlusBot.Features.Map.Assets;
 using RustPlusBot.Features.Map.Rendering;
 using RustPlusBot.Persistence.Map;
-using SixLabors.ImageSharp;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Composing;
 
@@ -151,13 +151,13 @@ private List<MarkerPlacement> GatherMarkers(
         return markers;
     }
 
-    private static List<PointF> ProjectTrail(IReadOnlyList<TrailPoint> history, MapProjection projection)
+    private static List<SKPoint> ProjectTrail(IReadOnlyList<TrailPoint> history, MapProjection projection)
     {
-        var trail = new List<PointF>(history.Count);
+        var trail = new List<SKPoint>(history.Count);
         foreach (var h in history)
         {
             var (tx, ty) = projection.ToPixel(h.X, h.Y);
-            trail.Add(new PointF(tx, ty));
+            trail.Add(new SKPoint(tx, ty));
         }
 
         return trail;
diff --git a/src/RustPlusBot.Features.Map/Rendering/MapRenderStyle.cs b/src/RustPlusBot.Features.Map/Rendering/MapRenderStyle.cs
index 36463341..f902765b 100644
--- a/src/RustPlusBot.Features.Map/Rendering/MapRenderStyle.cs
+++ b/src/RustPlusBot.Features.Map/Rendering/MapRenderStyle.cs
@@ -1,5 +1,5 @@
 using RustPlusBot.Abstractions.Connections;
-using SixLabors.ImageSharp;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Rendering;
 
@@ -48,12 +48,12 @@ public static int MarkerIconSize(MarkerKind kind) =>
     /// <summary>Gets the trail color for a marker kind.</summary>
     /// <param name="kind">The marker kind.</param>
     /// <returns>The base (fully opaque) trail color.</returns>
-    public static Color TrailColor(MarkerKind kind) => kind switch
+    public static SKColor TrailColor(MarkerKind kind) => kind switch
     {
-        MarkerKind.CargoShip => Color.ParseHex("4FC3F7"),
-        MarkerKind.PatrolHelicopter => Color.ParseHex("EF5350"),
-        MarkerKind.Chinook => Color.ParseHex("FFB74D"),
-        MarkerKind.TravellingVendor => Color.ParseHex("81C784"),
-        _ => Color.White,
+        MarkerKind.CargoShip => SKColor.Parse("4FC3F7"),
+        MarkerKind.PatrolHelicopter => SKColor.Parse("EF5350"),
+        MarkerKind.Chinook => SKColor.Parse("FFB74D"),
+        MarkerKind.TravellingVendor => SKColor.Parse("81C784"),
+        _ => SKColors.White,
     };
 }
diff --git a/src/RustPlusBot.Features.Map/Rendering/MapRenderer.cs b/src/RustPlusBot.Features.Map/Rendering/MapRenderer.cs
index 47483af7..4d8821f6 100644
--- a/src/RustPlusBot.Features.Map/Rendering/MapRenderer.cs
+++ b/src/RustPlusBot.Features.Map/Rendering/MapRenderer.cs
@@ -1,12 +1,7 @@
 using System.Globalization;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Features.Map.Assets;
-using SixLabors.Fonts;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Rendering;
 
@@ -23,22 +18,22 @@ public sealed class MapRenderer(MonumentIconSource monumentIcons)
     private const float OutlinePenWidth = 1f;
     private const float ActiveRingWidth = 3f;
 
-    private static readonly FontFamily Family = LoadFamily();
-    private static readonly Font GridLabelFont = Family.CreateFont(MapRenderStyle.GridLabelFontSize);
+    private static readonly SKTypeface Typeface = LoadTypeface();
 
-    private static FontFamily LoadFamily()
+    private static SKTypeface LoadTypeface()
     {
         var asm = typeof(MapRenderer).Assembly;
         using var stream = asm.GetManifestResourceStream("RustPlusBot.Features.Map.Assets.LiberationSans-Regular.ttf")
                            ?? throw new InvalidOperationException(
                                "Embedded map font 'RustPlusBot.Features.Map.Assets.LiberationSans-Regular.ttf' not found.");
-        var collection = new FontCollection();
-        return collection.Add(stream, CultureInfo.InvariantCulture);
+        return SKTypeface.FromStream(stream)
+               ?? throw new InvalidOperationException("Embedded map font could not be loaded.");
     }
 
     /// <summary>Renders the map tile plus the requested overlay layers to PNG bytes.</summary>
     /// <param name="request">The base image, projection, and overlay data to render.</param>
     /// <returns>PNG-encoded bytes of a square image with <see cref="OutputSize"/> pixels on each side.</returns>
+    /// <exception cref="InvalidOperationException">The base image bytes are not a decodable image.</exception>
     public byte[] Render(MapRenderRequest request)
     {
         ArgumentNullException.ThrowIfNull(request);
@@ -50,58 +45,60 @@ public byte[] Render(MapRenderRequest request)
         ArgumentNullException.ThrowIfNull(request.Rigs);
         ArgumentNullException.ThrowIfNull(request.Layers);
 
-        using var image = Image.Load<Rgba32>(request.BaseJpeg);
-        image.Mutate(ctx => ctx.Resize(OutputSize, OutputSize));
+        using var surface = SKSurface.Create(new SKImageInfo(OutputSize, OutputSize));
+        var canvas = surface.Canvas;
+        using (var baseImage = SKImage.FromEncodedData(request.BaseJpeg)
+                               ?? throw new InvalidOperationException("The base map image could not be decoded."))
+        {
+            canvas.DrawImage(baseImage, SKRect.Create(OutputSize, OutputSize), Raster.Smooth);
+        }
 
         if (request.Layers.Grid)
         {
-            DrawGrid(image, request.Projection, request.GridStyle);
+            DrawGrid(canvas, request.Projection, request.GridStyle);
         }
 
         if (request.Layers.Monuments)
         {
-            DrawMonuments(image, request.Monuments);
+            DrawMonuments(canvas, request.Monuments);
         }
 
         if (request.Layers.Tunnels && request.Tunnels is { Count: > 0 })
         {
-            DrawMonuments(image, request.Tunnels);
+            DrawMonuments(canvas, request.Tunnels);
         }
 
         if (request.Layers.Markers || request.Layers.Vendor)
         {
-            DrawTrails(image, request.Markers);
+            DrawTrails(canvas, request.Markers);
         }
 
         if (request.Layers.Markers)
         {
-            DrawMarkers(image, request.Markers);
+            DrawMarkers(canvas, request.Markers);
         }
 
         if (request.Layers.Rigs)
         {
-            DrawRigs(image, request.Rigs);
+            DrawRigs(canvas, request.Rigs);
         }
 
         if (request.Layers.Players)
         {
-            DrawPlayers(image, request.Players);
+            DrawPlayers(canvas, request.Players);
         }
 
-        using var ms = new MemoryStream();
-        image.SaveAsPng(ms);
-        return ms.ToArray();
+        using var snapshot = surface.Snapshot();
+        return Raster.EncodePng(snapshot);
     }
 
-    private static void DrawGrid(Image<Rgba32> image, MapProjection projection, MapGridStyle gridStyle)
+    private static void DrawGrid(SKCanvas canvas, MapProjection projection, MapGridStyle gridStyle)
     {
         if (projection.WorldSize == 0)
         {
             return;
         }
 
-        var lineColor = Color.FromRgba(255, 255, 255, 80);
-        var labelColor = Color.FromRgba(255, 255, 255, 140);
         var cells = MapGrid.CellCount(projection.WorldSize);
 
         // The lattice is anchored at the west edge and at the style's row anchor (the world's north
@@ -122,161 +119,176 @@ private static void DrawGrid(Image<Rgba32> image, MapProjection projection, MapG
         var right = anchorX + (cells * stepX);
         var bottom = anchorY + (cells * stepY);
 
-        image.Mutate(ctx =>
+        using var linePaint = Stroke(new SKColor(255, 255, 255, 80), OutlinePenWidth);
+        for (var k = 0; k <= cells; k++)
         {
-            for (var k = 0; k <= cells; k++)
-            {
-                var x = anchorX + (k * stepX);
-                ctx.DrawLine(lineColor, OutlinePenWidth, new PointF(x, anchorY), new PointF(x, bottom));
-                var y = anchorY + (k * stepY);
-                ctx.DrawLine(lineColor, OutlinePenWidth, new PointF(anchorX, y), new PointF(right, y));
-            }
+            var x = anchorX + (k * stepX);
+            canvas.DrawLine(x, anchorY, x, bottom, linePaint);
+            var y = anchorY + (k * stepY);
+            canvas.DrawLine(anchorX, y, right, y, linePaint);
+        }
 
-            // Every labelled cell (A0 in the north-west corner), each label just inside its cell's
-            // top-left corner (companion-app placement).
-            for (var col = 0; col < cells; col++)
+        // Every labelled cell (A0 in the north-west corner), each label just inside its cell's
+        // top-left corner (companion-app placement). DrawText takes the baseline, so drop each
+        // label by the font's ascent to put its top edge at the corner offset.
+        // Unhinted, subpixel-positioned glyphs keep the small labels light rather than pixel-snapped bold.
+        using var font = new SKFont(Typeface, MapRenderStyle.GridLabelFontSize)
+        {
+            Edging = SKFontEdging.Antialias, Hinting = SKFontHinting.None, Subpixel = true,
+        };
+        using var labelPaint = new SKPaint
+        {
+            IsAntialias = true, Color = new SKColor(255, 255, 255, 140)
+        };
+        var ascent = -font.Metrics.Ascent;
+        for (var col = 0; col < cells; col++)
+        {
+            for (var row = 0; row < cells; row++)
             {
-                for (var row = 0; row < cells; row++)
-                {
-                    var label = MapGrid.ColumnLetters(col) + row.ToString(CultureInfo.InvariantCulture);
-                    ctx.DrawText(new RichTextOptions(GridLabelFont)
-                        {
-                            Origin = new PointF(anchorX + (col * stepX) + 2f, anchorY + (row * stepY) + 2f)
-                        },
-                        label, labelColor);
-                }
+                var label = MapGrid.ColumnLetters(col) + row.ToString(CultureInfo.InvariantCulture);
+                canvas.DrawText(label, anchorX + (col * stepX) + 2f, anchorY + (row * stepY) + 2f + ascent,
+                    SKTextAlign.Left, font, labelPaint);
             }
-        });
+        }
     }
 
-    private static void DrawTrails(Image<Rgba32> image, IReadOnlyList<MarkerPlacement> markers)
+    private static void DrawTrails(SKCanvas canvas, IReadOnlyList<MarkerPlacement> markers)
     {
-        image.Mutate(ctx =>
+        // A dashed pen keeps the trail from looking like a solid smear; the dash pattern is in
+        // multiples of the pen width.
+        using var dash = SKPathEffect.CreateDash(
+            [.. MapRenderStyle.TrailDash.Select(d => d * MapRenderStyle.TrailWidth)], 0f);
+        using var paint = Stroke(SKColors.Transparent, MapRenderStyle.TrailWidth);
+        paint.PathEffect = dash;
+
+        foreach (var marker in markers)
         {
-            foreach (var marker in markers)
+            if (marker.Trail.Count < 2)
+            {
+                continue;
+            }
+
+            var baseColor = MapRenderStyle.TrailColor(marker.Kind);
+            for (var i = 1; i < marker.Trail.Count; i++)
             {
-                if (marker.Trail.Count < 2)
-                {
-                    continue;
-                }
-
-                var baseColor = MapRenderStyle.TrailColor(marker.Kind);
-                for (var i = 1; i < marker.Trail.Count; i++)
-                {
-                    // Fade from faint (oldest) to the alpha ceiling (newest) so direction still reads,
-                    // but stays subtle. A dashed pen keeps it from looking like a solid smear.
-                    var alpha = MapRenderStyle.TrailMaxAlpha * i / (marker.Trail.Count - 1);
-                    var pen = new PatternPen(baseColor.WithAlpha(alpha), MapRenderStyle.TrailWidth,
-                        MapRenderStyle.TrailDash);
-                    ctx.DrawLine(pen, marker.Trail[i - 1], marker.Trail[i]);
-                }
+                // Fade from faint (oldest) to the alpha ceiling (newest) so direction still reads,
+                // but stays subtle.
+                var alpha = MapRenderStyle.TrailMaxAlpha * i / (marker.Trail.Count - 1);
+                paint.Color = baseColor.WithAlpha(ToByte(alpha));
+                canvas.DrawLine(marker.Trail[i - 1], marker.Trail[i], paint);
             }
-        });
+        }
     }
 
-    private static void DrawMarkers(Image<Rgba32> image, IReadOnlyList<MarkerPlacement> markers)
+    private static void DrawMarkers(SKCanvas canvas, IReadOnlyList<MarkerPlacement> markers)
     {
-        // One Mutate for the whole layer: each Mutate builds and runs a fresh processing pipeline,
-        // so batching all the layer's DrawImage calls into a single Mutate avoids per-item overhead.
-        image.Mutate(ctx =>
+        foreach (var marker in markers)
         {
-            foreach (var marker in markers)
+            var icon = MapIcons.Marker(marker.Kind, MapRenderStyle.MarkerIconSize(marker.Kind));
+            if (icon is null)
+            {
+                continue;
+            }
+
+            if (marker.Rotation is { } rotation && Math.Abs(rotation) > 0.01f)
             {
-                var icon = MapIcons.Marker(marker.Kind, MapRenderStyle.MarkerIconSize(marker.Kind));
-                if (icon is null)
-                {
-                    continue;
-                }
-
-                if (marker.Rotation is { } rotation && Math.Abs(rotation) > 0.01f)
-                {
-                    using var rotated = icon.Clone(c => c.Rotate(-rotation));
-                    ctx.DrawImage(rotated, CenterAt(marker.PixelX, marker.PixelY, rotated), 1f);
-                }
-                else
-                {
-                    ctx.DrawImage(icon, CenterAt(marker.PixelX, marker.PixelY, icon), 1f);
-                }
+                // Counter-clockwise by the server heading, about the icon's centre.
+                canvas.Save();
+                canvas.Translate(marker.PixelX, marker.PixelY);
+                canvas.RotateDegrees(-rotation);
+                canvas.DrawImage(icon, -icon.Width / 2f, -icon.Height / 2f, Raster.Smooth);
+                canvas.Restore();
             }
-        });
+            else
+            {
+                DrawCentered(canvas, icon, marker.PixelX, marker.PixelY);
+            }
+        }
     }
 
-    private void DrawMonuments(Image<Rgba32> image, IReadOnlyList<MonumentPlacement> monuments)
+    private void DrawMonuments(SKCanvas canvas, IReadOnlyList<MonumentPlacement> monuments)
     {
-        // One Mutate for the whole layer (see DrawMarkers): monuments can be numerous, so a single
-        // pipeline beats one Mutate per monument.
-        image.Mutate(ctx =>
+        foreach (var monument in monuments)
         {
-            foreach (var monument in monuments)
+            var icon = monumentIcons.Monument(monument.Token, MapRenderStyle.MonumentIconSize);
+            if (icon is not null)
             {
-                var icon = monumentIcons.Monument(monument.Token, MapRenderStyle.MonumentIconSize);
-                if (icon is not null)
-                {
-                    ctx.DrawImage(icon, CenterAt(monument.PixelX, monument.PixelY, icon), 1f);
-                }
+                DrawCentered(canvas, icon, monument.PixelX, monument.PixelY);
             }
-        });
+        }
     }
 
-    private void DrawRigs(Image<Rgba32> image, IReadOnlyList<RigPlacement> rigs)
+    private void DrawRigs(SKCanvas canvas, IReadOnlyList<RigPlacement> rigs)
     {
-        image.Mutate(ctx =>
+        using var ringPaint = Stroke(SKColors.Red, ActiveRingWidth);
+        foreach (var rig in rigs)
         {
-            foreach (var rig in rigs)
+            var icon = monumentIcons.Rig(rig.Kind, MapRenderStyle.MonumentIconSize);
+            if (icon is null)
+            {
+                continue;
+            }
+
+            DrawCentered(canvas, icon, rig.PixelX, rig.PixelY);
+
+            if (rig.Active)
             {
-                var icon = monumentIcons.Rig(rig.Kind, MapRenderStyle.MonumentIconSize);
-                if (icon is null)
-                {
-                    continue;
-                }
-
-                ctx.DrawImage(icon, CenterAt(rig.PixelX, rig.PixelY, icon), 1f);
-
-                if (rig.Active)
-                {
-                    // Active rigs are in their combat window: ring them in red to flag the danger.
-                    var radius = (Math.Max(icon.Width, icon.Height) / 2f) + ActiveRingWidth;
-                    var ring = new EllipsePolygon(rig.PixelX, rig.PixelY, radius);
-                    ctx.Draw(Color.Red, ActiveRingWidth, ring);
-                }
+                // Active rigs are in their combat window: ring them in red to flag the danger.
+                var radius = (Math.Max(icon.Width, icon.Height) / 2f) + ActiveRingWidth;
+                canvas.DrawCircle(rig.PixelX, rig.PixelY, radius, ringPaint);
             }
-        });
+        }
     }
 
-    private static void DrawPlayers(Image<Rgba32> image, IReadOnlyList<PlayerPlacement> players)
+    private static void DrawPlayers(SKCanvas canvas, IReadOnlyList<PlayerPlacement> players)
     {
-        image.Mutate(ctx =>
+        using var paint = Stroke(SKColors.Transparent, MapRenderStyle.PlayerCrossWidth);
+        foreach (var player in players)
         {
-            foreach (var player in players)
-            {
-                DrawPlayerCross(ctx, player);
-            }
-        });
+            DrawPlayerCross(canvas, paint, player);
+        }
     }
 
-    private static void DrawPlayerCross(IImageProcessingContext ctx, PlayerPlacement player)
+    private static void DrawPlayerCross(SKCanvas canvas, SKPaint paint, PlayerPlacement player)
     {
         const float arm = MapRenderStyle.PlayerCrossArm;
         var alpha = player.IsOnline ? 1f : MapRenderStyle.PlayerOfflineAlpha;
-        var color = player.CrossColor.WithAlpha(alpha);
-        var halo = Color.FromRgba(0, 0, 0, (byte)(180 * alpha));
+        var color = player.CrossColor.WithAlpha(ToByte(alpha));
+        var halo = new SKColor(0, 0, 0, (byte)(180 * alpha));
 
         // Alive = '+', dead = 'x'.
         var (a1, a2, b1, b2) = player.IsAlive
-            ? (new PointF(player.PixelX - arm, player.PixelY), new PointF(player.PixelX + arm, player.PixelY),
-                new PointF(player.PixelX, player.PixelY - arm), new PointF(player.PixelX, player.PixelY + arm))
-            : (new PointF(player.PixelX - arm, player.PixelY - arm),
-                new PointF(player.PixelX + arm, player.PixelY + arm),
-                new PointF(player.PixelX - arm, player.PixelY + arm),
-                new PointF(player.PixelX + arm, player.PixelY - arm));
+            ? (new SKPoint(player.PixelX - arm, player.PixelY), new SKPoint(player.PixelX + arm, player.PixelY),
+                new SKPoint(player.PixelX, player.PixelY - arm), new SKPoint(player.PixelX, player.PixelY + arm))
+            : (new SKPoint(player.PixelX - arm, player.PixelY - arm),
+                new SKPoint(player.PixelX + arm, player.PixelY + arm),
+                new SKPoint(player.PixelX - arm, player.PixelY + arm),
+                new SKPoint(player.PixelX + arm, player.PixelY - arm));
 
         // Halo first (wider, dark), then the colored strokes on top.
-        ctx.DrawLine(halo, MapRenderStyle.PlayerCrossHaloWidth, a1, a2);
-        ctx.DrawLine(halo, MapRenderStyle.PlayerCrossHaloWidth, b1, b2);
-        ctx.DrawLine(color, MapRenderStyle.PlayerCrossWidth, a1, a2);
-        ctx.DrawLine(color, MapRenderStyle.PlayerCrossWidth, b1, b2);
+        paint.Color = halo;
+        paint.StrokeWidth = MapRenderStyle.PlayerCrossHaloWidth;
+        canvas.DrawLine(a1, a2, paint);
+        canvas.DrawLine(b1, b2, paint);
+        paint.Color = color;
+        paint.StrokeWidth = MapRenderStyle.PlayerCrossWidth;
+        canvas.DrawLine(a1, a2, paint);
+        canvas.DrawLine(b1, b2, paint);
     }
 
-    private static Point CenterAt(float x, float y, Image<Rgba32> icon) =>
-        new((int)(x - (icon.Width / 2f)), (int)(y - (icon.Height / 2f)));
+    /// <summary>Draws an icon centred on a point, snapped to whole pixels so the 1:1 blit stays crisp.</summary>
+    /// <param name="canvas">The target canvas.</param>
+    /// <param name="icon">The icon, already at its on-map size.</param>
+    /// <param name="x">The centre X in output pixels.</param>
+    /// <param name="y">The centre Y in output pixels.</param>
+    private static void DrawCentered(SKCanvas canvas, SKImage icon, float x, float y) =>
+        canvas.DrawImage(icon, (int)(x - (icon.Width / 2f)), (int)(y - (icon.Height / 2f)),
+            SKSamplingOptions.Default);
+
+    private static SKPaint Stroke(SKColor color, float width) => new()
+    {
+        IsAntialias = true, Style = SKPaintStyle.Stroke, StrokeWidth = width, Color = color,
+    };
+
+    private static byte ToByte(float alpha) => (byte)Math.Round(Math.Clamp(alpha, 0f, 1f) * 255f);
 }
diff --git a/src/RustPlusBot.Features.Map/Rendering/MarkerPlacement.cs b/src/RustPlusBot.Features.Map/Rendering/MarkerPlacement.cs
index da6b1e4e..47e631d4 100644
--- a/src/RustPlusBot.Features.Map/Rendering/MarkerPlacement.cs
+++ b/src/RustPlusBot.Features.Map/Rendering/MarkerPlacement.cs
@@ -1,5 +1,5 @@
 using RustPlusBot.Abstractions.Connections;
-using SixLabors.ImageSharp;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Rendering;
 
@@ -14,4 +14,4 @@ public sealed record MarkerPlacement(
     float PixelX,
     float PixelY,
     float? Rotation,
-    IReadOnlyList<PointF> Trail);
+    IReadOnlyList<SKPoint> Trail);
diff --git a/src/RustPlusBot.Features.Map/Rendering/PlayerPalette.cs b/src/RustPlusBot.Features.Map/Rendering/PlayerPalette.cs
index b28bcd44..699fc0eb 100644
--- a/src/RustPlusBot.Features.Map/Rendering/PlayerPalette.cs
+++ b/src/RustPlusBot.Features.Map/Rendering/PlayerPalette.cs
@@ -1,11 +1,11 @@
-using SixLabors.ImageSharp;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Rendering;
 
 /// <summary>One palette entry: the on-map cross color and the matching Discord legend square.</summary>
 /// <param name="Rgba">The cross color drawn on the map.</param>
 /// <param name="Emoji">The colored-square emoji used for this color in the legend.</param>
-public readonly record struct PlayerColor(Color Rgba, string Emoji);
+public readonly record struct PlayerColor(SKColor Rgba, string Emoji);
 
 /// <summary>
 /// The fixed nine-color player palette. Each color's RGB matches its Discord colored-square emoji so
@@ -17,15 +17,15 @@ public static class PlayerPalette
     /// <summary>The palette, ordered for maximum distinctiveness in the first slots.</summary>
     public static IReadOnlyList<PlayerColor> Entries { get; } =
     [
-        new(Color.ParseHex("E03131"), "🟥"), // red
-        new(Color.ParseHex("1971C2"), "🟦"), // blue
-        new(Color.ParseHex("2F9E44"), "🟩"), // green
-        new(Color.ParseHex("F2CC0C"), "🟨"), // yellow
-        new(Color.ParseHex("9C36B5"), "🟪"), // purple
-        new(Color.ParseHex("E8590C"), "🟧"), // orange
-        new(Color.ParseHex("8B5E34"), "🟫"), // brown
-        new(Color.ParseHex("212529"), "⬛"), // black
-        new(Color.ParseHex("F1F3F5"), "⬜"), // white
+        new(SKColor.Parse("E03131"), "🟥"), // red
+        new(SKColor.Parse("1971C2"), "🟦"), // blue
+        new(SKColor.Parse("2F9E44"), "🟩"), // green
+        new(SKColor.Parse("F2CC0C"), "🟨"), // yellow
+        new(SKColor.Parse("9C36B5"), "🟪"), // purple
+        new(SKColor.Parse("E8590C"), "🟧"), // orange
+        new(SKColor.Parse("8B5E34"), "🟫"), // brown
+        new(SKColor.Parse("212529"), "⬛"), // black
+        new(SKColor.Parse("F1F3F5"), "⬜"), // white
     ];
 
     /// <summary>Gets the palette entry for a zero-based player index, wrapping past the palette length.</summary>
diff --git a/src/RustPlusBot.Features.Map/Rendering/PlayerPlacement.cs b/src/RustPlusBot.Features.Map/Rendering/PlayerPlacement.cs
index 40d47a81..e5aae5e6 100644
--- a/src/RustPlusBot.Features.Map/Rendering/PlayerPlacement.cs
+++ b/src/RustPlusBot.Features.Map/Rendering/PlayerPlacement.cs
@@ -15,7 +15,7 @@ public sealed record PlayerPlacement(
     float PixelY,
     bool IsAlive,
     bool IsOnline,
-    SixLabors.ImageSharp.Color CrossColor);
+    SkiaSharp.SKColor CrossColor);
 
 /// <summary>One monument to draw, already projected to pixel coordinates.</summary>
 /// <param name="Token">The monument protobuf token (selects the icon).</param>
diff --git a/src/RustPlusBot.Features.Map/Rendering/Raster.cs b/src/RustPlusBot.Features.Map/Rendering/Raster.cs
new file mode 100644
index 00000000..de9fb5d6
--- /dev/null
+++ b/src/RustPlusBot.Features.Map/Rendering/Raster.cs
@@ -0,0 +1,43 @@
+using SkiaSharp;
+
+namespace RustPlusBot.Features.Map.Rendering;
+
+/// <summary>Small SkiaSharp helpers shared by the renderer and the icon sources.</summary>
+internal static class Raster
+{
+    /// <summary>Smooth sampling for scaled or rotated draws; mipmaps keep large downscales clean.</summary>
+    internal static readonly SKSamplingOptions Smooth = new(SKFilterMode.Linear, SKMipmapMode.Linear);
+
+    /// <summary>Decodes encoded image bytes (PNG/JPEG/…) into a raster image.</summary>
+    /// <param name="stream">The encoded image.</param>
+    /// <returns>The decoded raster image; caller owns disposal.</returns>
+    /// <exception cref="InvalidOperationException">The bytes are not a decodable image.</exception>
+    internal static SKImage Decode(Stream stream)
+    {
+        using var bitmap = SKBitmap.Decode(stream)
+                           ?? throw new InvalidOperationException("The image data could not be decoded.");
+        return SKImage.FromBitmap(bitmap);
+    }
+
+    /// <summary>Draws onto a fresh transparent canvas and returns the result as an immutable raster image.</summary>
+    /// <param name="width">The canvas width in pixels.</param>
+    /// <param name="height">The canvas height in pixels.</param>
+    /// <param name="draw">Draws the content.</param>
+    /// <returns>The drawn raster image; caller owns disposal.</returns>
+    internal static SKImage Draw(int width, int height, Action<SKCanvas> draw)
+    {
+        using var surface = SKSurface.Create(new SKImageInfo(width, height, SKColorType.Rgba8888, SKAlphaType.Premul));
+        surface.Canvas.Clear(SKColors.Transparent);
+        draw(surface.Canvas);
+        return surface.Snapshot();
+    }
+
+    /// <summary>Encodes an image as PNG.</summary>
+    /// <param name="image">The image to encode.</param>
+    /// <returns>The PNG bytes.</returns>
+    internal static byte[] EncodePng(SKImage image)
+    {
+        using var png = image.Encode(SKEncodedImageFormat.Png, 100);
+        return png.ToArray();
+    }
+}
diff --git a/src/RustPlusBot.Features.Map/RustPlusBot.Features.Map.csproj b/src/RustPlusBot.Features.Map/RustPlusBot.Features.Map.csproj
index a5d3e019..f7f21e18 100644
--- a/src/RustPlusBot.Features.Map/RustPlusBot.Features.Map.csproj
+++ b/src/RustPlusBot.Features.Map/RustPlusBot.Features.Map.csproj
@@ -23,8 +23,6 @@
   <ItemGroup>
     <PackageReference Include="RustMapsApi" />
     <PackageReference Include="RustMapsApi.Assets" />
-    <PackageReference Include="SixLabors.ImageSharp" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" />
     <PackageReference Include="SkiaSharp" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
     <PackageReference Include="Svg.Skia" />
diff --git a/tests/RustPlusBot.Features.Map.Tests/Hosting/MapRefreshTests.cs b/tests/RustPlusBot.Features.Map.Tests/Hosting/MapRefreshTests.cs
index 8cf48410..a4f4dfda 100644
--- a/tests/RustPlusBot.Features.Map.Tests/Hosting/MapRefreshTests.cs
+++ b/tests/RustPlusBot.Features.Map.Tests/Hosting/MapRefreshTests.cs
@@ -17,8 +17,6 @@
 using RustPlusBot.Features.Workspace.Locating;
 using RustPlusBot.Persistence.Connections;
 using RustPlusBot.Persistence.Map;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 using ConnectionState = RustPlusBot.Domain.Connections.ConnectionState;
 
 namespace RustPlusBot.Features.Map.Tests.Hosting;
@@ -562,13 +560,7 @@ public async Task PublishUntilAsync<TEvent>(Func<TEvent> make, Task until)
         /// <returns>The channel snowflake for that server.</returns>
         private static ulong ChannelFor(Guid serverId) => serverId == SecondServer ? SecondMapChannel : MapChannel;
 
-        private static byte[] BaseJpeg()
-        {
-            using var img = new Image<Rgba32>(64, 64, new Rgba32(0, 128, 0));
-            using var ms = new MemoryStream();
-            img.SaveAsJpeg(ms);
-            return ms.ToArray();
-        }
+        private static byte[] BaseJpeg() => TestImages.GreenJpeg();
 
         private static IRigState Rigs()
         {
diff --git a/tests/RustPlusBot.Features.Map.Tests/MapComposerTests.cs b/tests/RustPlusBot.Features.Map.Tests/MapComposerTests.cs
index 19923e13..abbf4c1f 100644
--- a/tests/RustPlusBot.Features.Map.Tests/MapComposerTests.cs
+++ b/tests/RustPlusBot.Features.Map.Tests/MapComposerTests.cs
@@ -9,8 +9,6 @@
 using RustPlusBot.Features.Map.Composing;
 using RustPlusBot.Features.Map.Rendering;
 using RustPlusBot.Persistence.Map;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace RustPlusBot.Features.Map.Tests;
 
@@ -20,13 +18,7 @@ public sealed class MapComposerTests
     private static readonly Guid Server = Guid.NewGuid();
     private static readonly MapDimensions Dims = new(2000, 2000, 100, 4000);
 
-    private static byte[] BaseJpeg()
-    {
-        using var img = new Image<Rgba32>(64, 64, new Rgba32(0, 128, 0));
-        using var ms = new MemoryStream();
-        img.SaveAsJpeg(ms);
-        return ms.ToArray();
-    }
+    private static byte[] BaseJpeg() => TestImages.GreenJpeg();
 
     private static IServiceScopeFactory ScopeFactory(IMapSettingsStore settingsStore) =>
         new ServiceCollection()
@@ -99,7 +91,7 @@ public async Task Renders_a_png_when_base_map_available()
         var result = await composer.ComposeAsync(Guild, Server, CancellationToken.None);
 
         Assert.NotNull(result);
-        using var image = Image.Load<Rgba32>(result.Png);
+        using var image = TestImages.Decode(result.Png);
         Assert.Equal(MapRenderer.OutputSize, image.Width);
     }
 
@@ -114,7 +106,7 @@ [new TrailPoint(2000f, 2000f)], null)),
         var result = await composer.ComposeAsync(Guild, Server, CancellationToken.None);
 
         Assert.NotNull(result);
-        using var image = Image.Load<Rgba32>(result.Png);
+        using var image = TestImages.Decode(result.Png);
         Assert.Equal(MapRenderer.OutputSize, image.Width);
     }
 
diff --git a/tests/RustPlusBot.Features.Map.Tests/MapRendererTests.cs b/tests/RustPlusBot.Features.Map.Tests/MapRendererTests.cs
index f9d11eaa..3c92784b 100644
--- a/tests/RustPlusBot.Features.Map.Tests/MapRendererTests.cs
+++ b/tests/RustPlusBot.Features.Map.Tests/MapRendererTests.cs
@@ -4,8 +4,7 @@
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Features.Map.Assets;
 using RustPlusBot.Features.Map.Rendering;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Tests;
 
@@ -19,32 +18,20 @@ private static MapRenderer CreateRenderer() =>
         new(new MonumentIconSource(new MonumentAssetSource(), NullLogger<MonumentIconSource>.Instance));
 
     /// <summary>A 64x64 solid-green JPEG, generated once in-test so the renderer has a real base image to decode.</summary>
-    private static byte[] BaseJpeg()
-    {
-        using var img = new Image<Rgba32>(64, 64, new Rgba32(0, 128, 0));
-        using var ms = new MemoryStream();
-        img.SaveAsJpeg(ms);
-        return ms.ToArray();
-    }
+    private static byte[] BaseJpeg() => TestImages.GreenJpeg();
 
-    private static byte[] SolidJpeg(int size)
-    {
-        using var img = new Image<Rgba32>(size, size, new Rgba32(40, 90, 120));
-        using var ms = new MemoryStream();
-        img.SaveAsJpeg(ms);
-        return ms.ToArray();
-    }
+    private static byte[] SolidJpeg(int size) => TestImages.SolidJpeg(size, new SKColor(40, 90, 120));
 
-    private static Rectangle ChangedPixelBounds(byte[] a, byte[] b)
+    private static SKRectI ChangedPixelBounds(byte[] a, byte[] b)
     {
-        using var ia = Image.Load<Rgba32>(a);
-        using var ib = Image.Load<Rgba32>(b);
+        using var ia = TestImages.Decode(a);
+        using var ib = TestImages.Decode(b);
         int minX = int.MaxValue, minY = int.MaxValue, maxX = -1, maxY = -1;
         for (var y = 0; y < ia.Height; y++)
         {
             for (var x = 0; x < ia.Width; x++)
             {
-                if (ia[x, y] != ib[x, y])
+                if (ia.GetPixel(x, y) != ib.GetPixel(x, y))
                 {
                     minX = Math.Min(minX, x);
                     minY = Math.Min(minY, y);
@@ -54,7 +41,7 @@ private static Rectangle ChangedPixelBounds(byte[] a, byte[] b)
             }
         }
 
-        return maxX < 0 ? Rectangle.Empty : new Rectangle(minX, minY, maxX - minX + 1, maxY - minY + 1);
+        return maxX < 0 ? SKRectI.Empty : SKRectI.Create(minX, minY, maxX - minX + 1, maxY - minY + 1);
     }
 
     [Fact]
@@ -73,7 +60,7 @@ public void Render_produces_a_png_of_the_output_size()
             Layers = MapLayerSet.AllOn,
         });
 
-        using var result = Image.Load<Rgba32>(bytes);
+        using var result = TestImages.Decode(bytes);
         Assert.Equal(MapRenderer.OutputSize, result.Width);
         Assert.Equal(MapRenderer.OutputSize, result.Height);
     }
@@ -141,7 +128,7 @@ public void Render_with_all_layers_produces_valid_png()
             Layers = MapLayerSet.AllOn,
         });
 
-        using var img = Image.Load(png); // throws if not a valid image
+        using var img = TestImages.Decode(png); // throws if not a valid image
         Assert.Equal(MapRenderer.OutputSize, img.Width);
     }
 
@@ -207,7 +194,7 @@ public void Trail_draws_pixels_between_history_points()
             Markers =
             [
                 new MarkerPlacement(MarkerKind.CargoShip, bx, by, null,
-                    [new PointF(ax, ay), new PointF(bx, by)])
+                    [new SKPoint(ax, ay), new SKPoint(bx, by)])
             ],
             Monuments = [],
             Players = [],
@@ -297,7 +284,7 @@ public void Player_cross_paints_in_the_assigned_color()
         var baseJpeg = SolidJpeg(2000);
         var (px, py) = projection.ToPixel(2000f, 2000f);
         var layers = new MapLayerSet(false, false, false, false, true, false);
-        var red = SixLabors.ImageSharp.Color.ParseHex("E03131");
+        var red = SKColor.Parse("E03131");
 
         var without = renderer.Render(new MapRenderRequest
         {
@@ -322,14 +309,14 @@ public void Player_cross_paints_in_the_assigned_color()
 
         Assert.False(without.AsSpan().SequenceEqual(with));
         // A red-dominant pixel must appear where the cross was drawn.
-        using var img = SixLabors.ImageSharp.Image.Load<SixLabors.ImageSharp.PixelFormats.Rgba32>(with);
+        using var img = TestImages.Decode(with);
         var found = false;
         for (var dy = -8; dy <= 8 && !found; dy++)
         {
             for (var dx = -8; dx <= 8 && !found; dx++)
             {
-                var p = img[(int)px + dx, (int)py + dy];
-                if (p.R > 150 && p.G < 120 && p.B < 120)
+                var p = img.GetPixel((int)px + dx, (int)py + dy);
+                if (p.Red > 150 && p.Green < 120 && p.Blue < 120)
                 {
                     found = true;
                 }
@@ -347,7 +334,7 @@ public void Alive_and_dead_players_render_differently()
         var baseJpeg = SolidJpeg(2000);
         var (px, py) = projection.ToPixel(2000f, 2000f);
         var layers = new MapLayerSet(false, false, false, false, true, false);
-        var blue = SixLabors.ImageSharp.Color.ParseHex("1971C2");
+        var blue = SKColor.Parse("1971C2");
 
         var alive = renderer.Render(new MapRenderRequest
         {
diff --git a/tests/RustPlusBot.Features.Map.Tests/MarkerIconComposerTests.cs b/tests/RustPlusBot.Features.Map.Tests/MarkerIconComposerTests.cs
index 770b6460..aed8840e 100644
--- a/tests/RustPlusBot.Features.Map.Tests/MarkerIconComposerTests.cs
+++ b/tests/RustPlusBot.Features.Map.Tests/MarkerIconComposerTests.cs
@@ -1,6 +1,5 @@
 using RustPlusBot.Features.Map.Assets;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Tests;
 
@@ -30,7 +29,8 @@ public void Chinook_has_two_rotors_placed_apart()
     public void Composited_chinook_adds_blade_pixels_to_the_bare_body()
     {
         // The composite must differ from the bare body — proving blades were actually drawn on.
-        using var composite = MarkerIconComposer.Chinook();
+        using var compositeImage = MarkerIconComposer.Chinook();
+        using var composite = SKBitmap.FromImage(compositeImage);
         using var body = LoadEmbedded("chinook");
 
         Assert.Equal(body.Width, composite.Width);
@@ -40,7 +40,7 @@ public void Composited_chinook_adds_blade_pixels_to_the_bare_body()
         {
             for (var x = 0; x < body.Width; x++)
             {
-                if (body[x, y] != composite[x, y])
+                if (body.GetPixel(x, y) != composite.GetPixel(x, y))
                 {
                     changed++;
                 }
@@ -50,10 +50,10 @@ public void Composited_chinook_adds_blade_pixels_to_the_bare_body()
         Assert.True(changed > 0, "composite identical to bare body — no blades drawn");
     }
 
-    private static Image<Rgba32> LoadEmbedded(string key)
+    private static SKBitmap LoadEmbedded(string key)
     {
         var asm = typeof(MarkerIconComposer).Assembly;
         using var stream = asm.GetManifestResourceStream($"RustPlusBot.Features.Map.Assets.icons.{key}.png")!;
-        return Image.Load<Rgba32>(stream);
+        return SKBitmap.Decode(stream);
     }
 }
diff --git a/tests/RustPlusBot.Features.Map.Tests/MonumentIconSourceTests.cs b/tests/RustPlusBot.Features.Map.Tests/MonumentIconSourceTests.cs
index bc39c555..f357f2b3 100644
--- a/tests/RustPlusBot.Features.Map.Tests/MonumentIconSourceTests.cs
+++ b/tests/RustPlusBot.Features.Map.Tests/MonumentIconSourceTests.cs
@@ -6,6 +6,7 @@
 using RustMapsApi.V4.Models;
 using RustPlusBot.Abstractions.Events;
 using RustPlusBot.Features.Map.Assets;
+using SkiaSharp;
 
 namespace RustPlusBot.Features.Map.Tests;
 
@@ -76,12 +77,13 @@ public void Every_known_token_rasterizes()
             var icon = source.Monument(token, 30);
             Assert.True(icon is not null, $"{token} produced no icon");
 
+            using var pixels = SKBitmap.FromImage(icon);
             var hasVisiblePixel = false;
-            for (var y = 0; y < icon.Height && !hasVisiblePixel; y++)
+            for (var y = 0; y < pixels.Height && !hasVisiblePixel; y++)
             {
-                for (var x = 0; x < icon.Width; x++)
+                for (var x = 0; x < pixels.Width; x++)
                 {
-                    if (icon[x, y].A > 0)
+                    if (pixels.GetPixel(x, y).Alpha > 0)
                     {
                         hasVisiblePixel = true;
                         break;
diff --git a/tests/RustPlusBot.Features.Map.Tests/TestImages.cs b/tests/RustPlusBot.Features.Map.Tests/TestImages.cs
new file mode 100644
index 00000000..dfdf0fd0
--- /dev/null
+++ b/tests/RustPlusBot.Features.Map.Tests/TestImages.cs
@@ -0,0 +1,30 @@
+using SkiaSharp;
+
+namespace RustPlusBot.Features.Map.Tests;
+
+/// <summary>Builds and decodes the images the map tests feed to and read back from the renderer.</summary>
+internal static class TestImages
+{
+    /// <summary>A solid-color square JPEG, so the renderer has a real base image to decode.</summary>
+    /// <param name="size">The edge length in pixels.</param>
+    /// <param name="color">The fill color.</param>
+    /// <returns>The JPEG bytes.</returns>
+    public static byte[] SolidJpeg(int size, SKColor color)
+    {
+        using var bitmap = new SKBitmap(size, size);
+        bitmap.Erase(color);
+        using var jpeg = bitmap.Encode(SKEncodedImageFormat.Jpeg, 90);
+        return jpeg.ToArray();
+    }
+
+    /// <summary>The 64x64 solid-green JPEG most tests use as a base map.</summary>
+    /// <returns>The JPEG bytes.</returns>
+    public static byte[] GreenJpeg() => SolidJpeg(64, new SKColor(0, 128, 0));
+
+    /// <summary>Decodes encoded image bytes, failing the test when they are not a valid image.</summary>
+    /// <param name="bytes">The encoded image.</param>
+    /// <returns>The decoded bitmap.</returns>
+    /// <exception cref="InvalidOperationException">The bytes are not a decodable image.</exception>
+    public static SKBitmap Decode(byte[] bytes) =>
+        SKBitmap.Decode(bytes) ?? throw new InvalidOperationException("Not a decodable image.");
+}
diff --git a/tools/RustPlusBot.MapParity/Program.cs b/tools/RustPlusBot.MapParity/Program.cs
index 1f04d373..756b9884 100644
--- a/tools/RustPlusBot.MapParity/Program.cs
+++ b/tools/RustPlusBot.MapParity/Program.cs
@@ -3,10 +3,7 @@
 using RustMapsApi.V4;
 using RustPlusBot.Abstractions.Connections;
 using RustPlusBot.Features.Map.Rendering;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
+using SkiaSharp;
 
 if (args.Length < 4
     || !int.TryParse(args[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out var size)
@@ -51,10 +48,14 @@ await File.WriteAllTextAsync(Path.Combine(outDir, "monuments.json"),
 
 // Project every monument through OUR MapProjection onto THEIR render and drop crosshairs.
 // If our math is right, every crosshair lands on the matching RustMaps monument icon.
-using var overlay = Image.Load<Rgba32>(imageBytes);
+using var overlay = SKBitmap.Decode(imageBytes);
 var projection =
     new MapProjection((uint)size, overlay.Width, overlay.Height, OceanMarginPx: 0, OutputSize: overlay.Width);
-overlay.Mutate(ctx =>
+using (var canvas = new SKCanvas(overlay))
+using (var pen = new SKPaint
+       {
+           IsAntialias = true, Style = SKPaintStyle.Stroke, StrokeWidth = 2f, Color = SKColors.Magenta
+       })
 {
     foreach (var monument in map.Monuments ?? [])
     {
@@ -65,14 +66,19 @@ await File.WriteAllTextAsync(Path.Combine(outDir, "monuments.json"),
 
         // RustMaps coordinates are centred on the map; MapProjection expects Rust+'s corner origin.
         var (px, py) = projection.ToPixel(c.X + (size / 2f), c.Y + (size / 2f));
-        ctx.DrawLine(Color.Magenta, 2f, new PointF(px - 12, py), new PointF(px + 12, py));
-        ctx.DrawLine(Color.Magenta, 2f, new PointF(px, py - 12), new PointF(px, py + 12));
+        canvas.DrawLine(px - 12, py, px + 12, py, pen);
+        canvas.DrawLine(px, py - 12, px, py + 12, pen);
         Console.WriteLine(
             $"{monument.Type,-30} world=({c.X,6},{c.Y,6}) "
             + $"grid={MapGrid.LabelFor(c.X + (size / 2f), c.Y + (size / 2f), (uint)size)} px=({px:F0},{py:F0})");
     }
-});
-await overlay.SaveAsPngAsync(Path.Combine(outDir, "overlay.png")).ConfigureAwait(false);
+}
+
+using (var png = overlay.Encode(SKEncodedImageFormat.Png, 100))
+{
+    await File.WriteAllBytesAsync(Path.Combine(outDir, "overlay.png"), png.ToArray()).ConfigureAwait(false);
+}
+
 await Console.Out.WriteLineAsync($"Wrote {outDir}/overlay.png — crosshairs must sit on the RustMaps monument markers.")
     .ConfigureAwait(false);
 return 0;
diff --git a/tools/RustPlusBot.MapParity/RustPlusBot.MapParity.csproj b/tools/RustPlusBot.MapParity/RustPlusBot.MapParity.csproj
index cd5fe347..a71b8e94 100644
--- a/tools/RustPlusBot.MapParity/RustPlusBot.MapParity.csproj
+++ b/tools/RustPlusBot.MapParity/RustPlusBot.MapParity.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="RustMapsApi" />
-    <PackageReference Include="SixLabors.ImageSharp" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" />
+    <PackageReference Include="SkiaSharp" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
   </ItemGroup>
 
   <ItemGroup>