diff --git a/.ci/compile.sh b/.ci/compile.sh
index d60683b6e..569ae9f6b 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -175,9 +175,9 @@ fi
 if [[ $MAKE_SANITIZE ]]; then
   flags+=("-DENABLE_SANITIZERS=ON")
 else
-  # The release-package step re-runs cmake in the same build dir, so an
-  # ENABLE_SANITIZERS=ON left over from the debug step would otherwise leak
-  # into the shipped binaries (libasan/libubsan Depends in the DEB).
+  # Every leg states the flag explicitly rather than relying on the CMake
+  # default, so a build directory reused from a sanitized configuration can
+  # never leak libasan/libubsan into a shipped binary.
   flags+=("-DENABLE_SANITIZERS=OFF")
 fi
 if [[ $MAKE_COVERAGE ]]; then
@@ -185,9 +185,6 @@ if [[ $MAKE_COVERAGE ]]; then
 fi
 if [[ $USE_CCACHE ]]; then
   flags+=("-DUSE_CCACHE=1")
-  # PCH-aware caching is required or ccache refuses to cache any TU that
-  # consumes a precompiled header, silently recompiling everything on every run.
-  ccache --set-config sloppiness=pch_defines,time_macros
   if [[ $CCACHE_SIZE ]]; then
     # note, this setting persists after running the script
     ccache --max-size "$CCACHE_SIZE"
@@ -311,16 +308,24 @@ if [[ $RUNNER_OS == macOS ]]; then
 
   if [[ $MAKE_PACKAGE ]]; then
     # Workaround https://github.com/actions/runner-images/issues/7522
-    # have hdiutil repeat the command 10 times in hope of success
+    # have hdiutil repeat the command 10 times in hope of success.
+    # The wrapper has to exit non-zero once it gives up: CPack reads that status to
+    # decide whether the disk image was created, so a zero exit turns a failed hdiutil
+    # into a much later, misleading "Problem copying the package" error that hides
+    # hdiutil's own message.
     hdiutil_script="/tmp/hdiutil.sh"
     # shellcheck disable=SC2016
     echo '#!/bin/bash
+    attempts=10
     i=0
-    while ! hdiutil "$@"; do
-      if (( ++i >= 10 )); then
-        echo "Error: hdiutil failed $i times!" >&2
-        break
+    while true; do
+      hdiutil "$@" && exit 0
+      rc=$?
+      if (( ++i >= attempts )); then
+        echo "::error::hdiutil $1 failed $i times (last status $rc), giving up" >&2
+        exit "$rc"
       fi
+      echo "hdiutil $1 attempt $i/$attempts failed (status $rc), retrying" >&2
       sleep 1
     done' >"$hdiutil_script"
     chmod +x "$hdiutil_script"
@@ -370,6 +375,21 @@ echo "Running cmake with flags: ${flags[*]}"
 cmake .. "${flags[@]}"
 echo "::endgroup::"
 
+if [[ $USE_CCACHE ]]; then
+  # PCH-aware caching is required or ccache refuses to cache any TU that consumes a
+  # precompiled header, silently recompiling everything on every run. The mtime and ctime
+  # entries cover files created during the build itself: the moc/uic/rcc output and the
+  # protobuf headers are generated after ccache starts, so without them every TU including
+  # one is read as a race and never cached. Checked-out sources are older than the compile
+  # that follows them and do not trip the check.
+  #
+  # This has to run after configure: CMakeLists.txt sets sloppiness=pch_defines,time_macros
+  # at configure time, and --set-config replaces the whole list rather than extending it, so
+  # setting it earlier would leave the build below with two entries. Re-asserting all four
+  # here is what actually reaches the compiler; the order is the point.
+  ccache --set-config sloppiness=pch_defines,time_macros,include_file_mtime,include_file_ctime
+fi
+
 echo "::group::Build project"
 cpuinfo
 echo "Running cmake --build with flags: ${buildflags[*]}"
@@ -474,6 +494,10 @@ if [[ $RUNNER_OS == Windows && ! $MAKE_NO_CLIENT ]]; then
   # FileShare.None is exactly that case, so this asserts the reason the probe was
   # added instead of only that the Restart Manager answers at all. It needs no NSIS
   # and no packaging, so it runs on every Windows build that gets this far.
+  # The holder is a process of its own: the probe never names the process that started it,
+  # which is what keeps an in-place uninstaller from being named as a holder of the
+  # directory it is emptying. The same DLL held by the script that starts the probe
+  # therefore has to come back as nothing, and that is the second case below.
   probe_check="./holder-probe-check.ps1"
   cat >"$probe_check" <<'POWERSHELL'
 $ErrorActionPreference = "Stop"
@@ -500,22 +524,149 @@ function Invoke-Probe([string] $guardDir) {
     return @{ Code = $code; Output = $output }
 }
 
+function Wait-UntilLocked([string] $path) {
+    $deadline = (Get-Date).AddSeconds(15)
+    while ((Get-Date) -lt $deadline) {
+        try {
+            $open = [IO.File]::Open($path, "Open", "ReadWrite", "None")
+            $open.Dispose()
+        } catch {
+            return
+        }
+        Start-Sleep -Milliseconds 100
+    }
+    throw "the holder never locked $path"
+}
+
 try {
     $file = Join-Path $dir "locked.dll"
     [IO.File]::WriteAllText($file, "x")
+
+    # The holder is a process of its own, not this script: the probe never names the process
+    # that started it (the case below asserts that), so a file held here would be left out on
+    # purpose and the check would pass for the wrong reason.
+    $holderScript = Join-Path $dir "hold.ps1"
+    Set-Content -LiteralPath $holderScript -Value @'
+param([string] $Path)
+$handle = [IO.File]::Open($Path, "Open", "ReadWrite", "None")
+Start-Sleep -Seconds 120
+'@
+    $powershell = Join-Path $env:SystemRoot "System32\WindowsPowerShell\v1.0\powershell.exe"
+    $holder = Start-Process -FilePath $powershell -PassThru -ArgumentList @(
+        "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "`"$holderScript`"", "-Path", "`"$file`"")
+    try {
+        Wait-UntilLocked $file
+        $locked = Invoke-Probe $dir
+        if ($locked.Code -ne 1) { throw "expected exit 1 for a locked file, got $($locked.Code) : $($locked.Output)" }
+        if ($locked.Output -notmatch "pid\s+$($holder.Id)\b") {
+            throw "the lookup did not name the process holding the file: $($locked.Output)"
+        }
+    } finally {
+        try { $holder.Kill() } catch { }
+        try { $holder.WaitForExit(5000) | Out-Null } catch { }
+    }
+
+    # The probe is started by the installer, or by an uninstaller that runs in place from the
+    # directory it is emptying, so the asking process holds files there itself. Naming it would
+    # ask the user to close the program that is asking - a question neither the close nor the
+    # end offer can answer, so the guard repeated it until the update was cancelled. A holder
+    # that is only the asking process has to come back as nothing.
     $handle = [IO.File]::Open($file, "Open", "ReadWrite", "None")
     try {
-        $locked = Invoke-Probe $dir
+        $self = Invoke-Probe $dir
     } finally {
         $handle.Dispose()
     }
-    if ($locked.Code -ne 1) { throw "expected exit 1 for a locked file, got $($locked.Code) : $($locked.Output)" }
-    if ($locked.Output -notmatch "pid\s+$PID\b") { throw "the lookup did not name this process: $($locked.Output)" }
+    if ($self.Code -ne 0) { throw "expected exit 0 when the asking process is the only holder, got $($self.Code) : $($self.Output)" }
+    if ($self.Output -match "pid\s+$PID\b") { throw "the lookup named the process that started it: $($self.Output)" }
+
+    # A payload executable that refuses to be replaced is running, whether or not this probe
+    # may name it: the Restart Manager does not report every mapping, and the image path of a
+    # process under another account cannot be read from here, so both process lookups can
+    # come back empty while the program is still there. Held here by the asking process, so
+    # that it cannot be named - the answer has to be "could not name it", never "nothing is
+    # holding it", which is what sent an update into an uninstall that could only fail
+    # halfway. Exit 3 is the code the guard answers by asking the user to close it and retry.
+    $image = Join-Path $dir "oracle.exe"
+    [IO.File]::WriteAllText($image, "x")
+    $handle = [IO.File]::Open($image, "Open", "ReadWrite", "None")
+    try {
+        $unnameable = Invoke-Probe $dir
+    } finally {
+        $handle.Dispose()
+    }
+    if ($unnameable.Code -ne 3) {
+        throw "expected exit 3 for a payload executable that is in use but cannot be named, got $($unnameable.Code) : $($unnameable.Output)"
+    }
+    if ($unnameable.Output -notmatch "oracle\.exe is in use") {
+        throw "the answer did not name the executable it could not replace: $($unnameable.Output)"
+    }
+
     $empty = Join-Path $dir "empty"
     New-Item -ItemType Directory -Force $empty | Out-Null
     $nothing = Invoke-Probe $empty
     if ($nothing.Code -ne 0) { throw "expected exit 0 for a directory with nothing open, got $($nothing.Code) : $($nothing.Output)" }
-    Write-Host "holder lookup named pid $PID for a locked file and named nothing for an empty directory"
+    # A process running from the directory is a holder even when it has no file open: an
+    # instance holds its payload as mapped images, not as handles, and that is the state
+    # the guard used to miss - it passed, the purge failed, and the install ended in a
+    # warning with no offer to close and try again. The image is a copy of a native
+    # Windows program, so it starts without its usual directory next to it, and it carries
+    # one of the payload's own names because that is what the lookup names.
+    $copy = Join-Path $dir "cockatrice.exe"
+    Copy-Item -LiteralPath (Join-Path $env:SystemRoot "System32\cmd.exe") -Destination $copy
+    $running = Start-Process -FilePath $copy -ArgumentList "/c", "ping -n 20 127.0.0.1 >nul" -PassThru
+    try {
+        Start-Sleep -Milliseconds 1500
+        $byImage = Invoke-Probe $dir
+    } finally {
+        try { $running.Kill() } catch { }
+        # Wait for the image to be released, or the cleanup below leaves the copy behind.
+        try { $running.WaitForExit(5000) | Out-Null } catch { }
+    }
+    if ($byImage.Code -ne 1) { throw "expected exit 1 for a process running from the directory, got $($byImage.Code) : $($byImage.Output)" }
+    if ($byImage.Output -notmatch "cockatrice\.exe \(pid\s+$($running.Id)") {
+        throw "the lookup did not name the process running from the directory: $($byImage.Output)"
+    }
+
+    # A program in a folder below the directory is not an instance of the installation, even
+    # when it carries a payload program's name: the install directory can be a folder the
+    # user keeps other applications in, each in its own subfolder, and naming one of those
+    # asked for a close the probe never sends and an end it refuses to perform, so the guard
+    # could only abort the update. A program that really does hold a payload file is still
+    # named, by the Restart Manager lookup exercised above.
+    $nested = Join-Path $dir "other"
+    New-Item -ItemType Directory -Force $nested | Out-Null
+    $nestedImage = Join-Path $nested "cockatrice.exe"
+    Copy-Item -LiteralPath (Join-Path $env:SystemRoot "System32\cmd.exe") -Destination $nestedImage
+    $nestedRunning = Start-Process -FilePath $nestedImage -ArgumentList "/c", "ping -n 20 127.0.0.1 >nul" -PassThru
+    try {
+        Start-Sleep -Milliseconds 1500
+        $inSubfolder = Invoke-Probe $dir
+    } finally {
+        try { $nestedRunning.Kill() } catch { }
+        try { $nestedRunning.WaitForExit(5000) | Out-Null } catch { }
+    }
+    if ($inSubfolder.Code -ne 0) {
+        throw "expected exit 0 for a program in a folder below the directory, got $($inSubfolder.Code) : $($inSubfolder.Output)"
+    }
+
+    # A program the user keeps in the directory itself is not a payload program either: the
+    # guard ends only what the payload installs, and naming anything else asks for an answer
+    # that cannot free a single file.
+    $foreign = Join-Path $dir "tool.exe"
+    Copy-Item -LiteralPath (Join-Path $env:SystemRoot "System32\cmd.exe") -Destination $foreign
+    $foreignRunning = Start-Process -FilePath $foreign -ArgumentList "/c", "ping -n 20 127.0.0.1 >nul" -PassThru
+    try {
+        Start-Sleep -Milliseconds 1500
+        $ignored = Invoke-Probe $dir
+    } finally {
+        try { $foreignRunning.Kill() } catch { }
+        try { $foreignRunning.WaitForExit(5000) | Out-Null } catch { }
+    }
+    if ($ignored.Code -ne 0) {
+        throw "expected exit 0 for a program the payload does not install, got $($ignored.Code) : $($ignored.Output)"
+    }
+    Write-Host "holder lookup named pid $($holder.Id) for a file another process holds, named nothing for a file only the asking process holds, reported a payload executable it could not name as in use instead of free, named nothing for an empty directory, named pid $($running.Id) for a payload program running from the directory, and named nothing for a payload program in a folder below it or for a program the payload does not install"
 } finally {
     Remove-Item -Recurse -Force $dir -ErrorAction SilentlyContinue
 }
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index c97b48342..5a306e023 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -33,10 +33,18 @@ on:
       - 'CMakeLists.txt'
       - 'vcpkg.json'
       - 'vcpkg'    # needed to match submodule bumps (gitlink)
+  # The legs the pull-request matrix leaves out run here instead, so the legacy distros and
+  # the slow macOS runner stay covered without gating a pull request on them. Tags still
+  # build every leg, because a tag is what ships.
+  schedule:
+    - cron: '23 3 * * *'
 
 # Cancel earlier, unfinished runs of this workflow on the same branch (unless on tag --> release)
 concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  # The event name is part of the group because a nightly run and a push run on master share
+  # refs/heads/master but must not cancel each other: the nightly would drop the push's vcpkg
+  # import, and a merge landing during the nightly would drop that night's coverage.
+  group: "${{ github.workflow }} @ ${{ github.ref_name }} (${{ github.event_name }})"
   cancel-in-progress: ${{ github.ref_type != 'tag' }}
 
 jobs:
@@ -101,6 +109,36 @@ jobs:
             --title "$release_name" \
             --notes-file "$body_path"
 
+  vcpkg-baseline:
+    name: vcpkg baseline
+    runs-on: ubuntu-slim
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v7
+
+      # vcpkg-tool reads versions/baseline.json out of the commit named by
+      # `builtin-baseline`, through the `vcpkg` submodule's git history. A submodule
+      # pointer that lags the manifest - e.g. a stale `vcpkg/` worktree captured by
+      # `git add` in a PR - makes every vcpkg leg fail in configure with "failed to
+      # `git show` versions/baseline.json". That reads like a baseline or network
+      # problem, when the pointer is what has to move. Check the two agree here in
+      # seconds instead of on five build legs.
+      - name: "Check the submodule pointer against the manifest baseline"
+        shell: bash
+        run: |
+          pointer="$(git rev-parse HEAD:vcpkg 2>/dev/null || true)"
+          baseline="$(sed -nE 's/.*"builtin-baseline"[[:space:]]*:[[:space:]]*"([0-9a-f]{40})".*/\1/p' vcpkg.json)"
+          if [[ -z "$pointer" || -z "$baseline" ]]; then
+            echo "::error file=vcpkg.json::could not read the vcpkg submodule pointer or the builtin-baseline"
+            exit 1
+          fi
+          if [[ "$pointer" != "$baseline" ]]; then
+            echo "::error file=vcpkg.json::vcpkg submodule is at $pointer but builtin-baseline is $baseline"
+            echo "Move them together: git -C vcpkg checkout $baseline && git add vcpkg"
+            exit 1
+          fi
+          echo "vcpkg submodule and builtin-baseline agree on $baseline"
+
   build-linux:
     strategy:
       fail-fast: false
@@ -111,6 +149,7 @@ jobs:
 
             allow-failure: yes
             package: skip    # We are packaged in Arch already
+            debug_test: yes    # see the note on Fedora 44 below
 
           - distro: Servatrice_Debian
             version: 12
@@ -118,77 +157,105 @@ jobs:
             package: DEB
             server_only: yes
             test: skip
-
-          - distro: Debian
-            version: 12
-
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
+            ccache_size: 400M    # server only, no client to compile
 
           - distro: Debian
             version: 13
 
             package: DEB
-
-          - distro: Fedora
-            version: 43
-
-            package: RPM
-            test: skip    # Running tests on all distros is superfluous
+            ccache_size: 850M    # the Release build plus the suite it runs
 
           - distro: Fedora
             version: 44
 
             package: RPM
-
-          - distro: Ubuntu
-            version: 24.04
-
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
+            # Arch and Fedora 44 are the two newest toolchains, and the -Wno-error= exceptions
+            # in CMakeLists.txt exist for exactly their warnings. They keep compiling Debug:
+            # only the Debug configuration passes -Werror, so these two are the legs where a
+            # new warning in either compiler still fails the build.
+            debug_test: yes
+            ccache_size: 900M    # Debug for the suite and Release for the package
 
           - distro: Ubuntu
             version: 26.04
 
             package: DEB
+            test: skip    # The sanitizer leg below runs this distro's suite
 
-            # The one leg that runs the suite under AddressSanitizer and
-            # UndefinedBehaviorSanitizer. Debian 13 and Fedora 44 keep covering the
-            # uninstrumented suite, so nothing is lost by instrumenting this one.
-            sanitize: yes
-
+          # The one leg that runs the suite under AddressSanitizer and
+          # UndefinedBehaviorSanitizer. Debian 13 and Fedora 44 keep covering the
+          # uninstrumented suite, so nothing is lost by instrumenting this one.
+          #
+          # It packages nothing. A sanitized Debug build is not something to ship, and
+          # carrying the package build here meant 18 minutes of Release compile queued
+          # behind the instrumented one in a single job. The leg above publishes this
+          # distro's DEB.
           - distro: Ubuntu
             version: 26.04
-            variant: cover    # separate image and ccache, same distro
+            variant: sanitize    # separate image and ccache, same distro
 
-            # The one leg that runs instrumented for line coverage and publishes the report as
-            # a workflow artifact. It is a separate leg rather than a second flag on the
-            # sanitizer leg because the two instruments answer different questions: the
-            # sanitizer leg reports what the run did wrong, the coverage leg reports what the
-            # run never touched at all. Combining them would also slow both down. Packaging is
-            # skipped because the leg above already publishes the DEB for this distro.
-            coverage: yes
             package: skip
+            sanitize: yes
+            ccache_size: 800M    # instrumented objects are larger
 
     name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }}
     needs: configure
+    # The nightly legs live in build-linux-nightly below. A leg is in exactly one of the two
+    # matrices, so nothing that reviews a change waits for a distro nobody is changing for.
+    if: github.event_name != 'schedule'
     runs-on: ubuntu-latest    # https://github.com/actions/runner-images
     continue-on-error: ${{ matrix.allow-failure == 'yes' }}
     timeout-minutes: 70
     env:
       CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}    # directory for caching docker image and ccache
       CCACHE_EVICTION_AGE: 7d
-      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      # The bound is sized against the repository's 10 GB cache quota
+      # (https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy),
+      # not against what one leg would like. The quota currently holds about 1.1 GB of
+      # CodeQL trap, 1.1 GB of vcpkg, 0.7 GB of Qt and 2.1 GB of docker buildkit layers
+      # (mode=min in docker-release.yml, added here, brings the last one down to roughly
+      # 0.3 GB - the one input here that is an expectation rather than a measurement, since
+      # mode=min still writes one layer per pushed binary) plus the compiler caches of the nine legs a pull request runs. The five
+      # nightly-only legs keep no compiler cache (see PERSIST_CCACHE below), which is what
+      # makes these per-leg bounds affordable. Accounting for all of it: 6.45G of ccache
+      # bounds + 3.2G of the fixed entries = 9.65G against the 10G quota.
+      #
+      # A configuration needs roughly 500-850 MB on Linux, so the old uniform 600M bound sat
+      # below what a leg writes: ccache spent each build deleting the entries the next run
+      # asked for (measured: 2624-3720 cleanup passes per build, 8% of calls served). Each
+      # leg states the size it needs instead: one configuration for most, two for Fedora 44
+      # (Debug for the suite, Release for the package), the server alone for Servatrice.
+      # Raising these further means caching fewer legs, since GitHub evicts a whole entry
+      # when the total is exceeded.
+      #
+      # Every key listed in LIVE_CCACHE_KEYS in prune-caches below must match this matrix.
+      CCACHE_SIZE: ${{ matrix.ccache_size || '700M' }}
       CMAKE_GENERATOR: 'Ninja'
       NAME: ${{ matrix.distro }}${{ matrix.version }}
       IMAGE_SUFFIX: ${{ matrix.variant }}
+      # Which build the suite runs in, decided once per leg here so the steps' if: conditions
+      # and their shells cannot drift apart. A step's own env is not visible to its if:, which
+      # is why these live at job level rather than on the release step.
+      #   DEBUG_TEST  the instrumented legs (symbols and instrumentation matter) and the two
+      #               newest distro toolchains, which only fail on a warning in Debug.
+      #   RUN_TESTS   every other leg that tests runs the suite against the release build it may
+      #               also package, so testing and packaging cost one compile instead of two.
+      DEBUG_TEST: ${{ matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes' }}
+      RUN_TESTS: ${{ matrix.test != 'skip' && !(matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes') }}
+      # Whether this leg restores and saves its compiler cache. Every leg a pull request
+      # runs keeps one; the nightly-only legs do not, so that the quota is spent on the
+      # builds that review a change. A tag build runs both sets, and the nightly legs are
+      # cold there - accepted, because a tag is rare and only the pull-request legs gate.
+      PERSIST_CCACHE: 'true'
 
-    steps:
+    # Shared with build-linux-nightly so the two leg sets run the same steps.
+    steps: &linux-steps
       - name: "Checkout"
         uses: actions/checkout@v7
 
       - name: "Restore compiler cache (ccache)"
         id: restore_ccache
+        if: env.PERSIST_CCACHE == 'true'
         uses: actions/cache/restore@v6
         with:
           key: ccache-${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}
@@ -198,8 +265,11 @@ jobs:
         shell: bash
         run: source .ci/docker.sh --build
 
+      # The instrumented legs and the two newest distro toolchains build and test Debug; every
+      # other leg runs its suite against the release build below, so testing and packaging cost
+      # one compile instead of two.
       - name: "Build debug and test"
-        if: matrix.test != 'skip'
+        if: env.DEBUG_TEST == 'true'
         shell: bash
         env:
           sanitize: '${{ matrix.sanitize }}'
@@ -239,15 +309,23 @@ jobs:
           path: coverage/
           if-no-files-found: warn
 
-      - name: "Build release package"
+      # One build serves both purposes: the suite runs against the same configuration that
+      # gets packaged, so a packaging leg no longer pays for a full Debug compile it then
+      # throws away. macOS and Windows have always tested their release build.
+      #
+      # Instrumented and debug-test legs reach this step only when they also package; their
+      # suite already ran in the debug step above, so the tests are not repeated here.
+      - name: "Build release, test and package"
         id: build
-        if: matrix.package != 'skip'
+        if: matrix.package != 'skip' || env.RUN_TESTS == 'true'
         shell: bash
         env:
           SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
           package: '${{ matrix.package }}'
           server_only: '${{ matrix.server_only }}'
-          WITH_CRASH_REPORTING: 'ON'
+          # Only a leg that packages builds the shipping configuration; a release build that
+          # only runs tests stays free of the crash reporting SDK.
+          WITH_CRASH_REPORTING: ${{ matrix.package != 'skip' && 'ON' || '' }}
           # Tag builds only: artifacts from master pushes and PR branches must not report to
           # Sentry. Forks get no secrets on pull_request, so they keep the mock fallback either way.
           # configure.outputs.tag is set for ANY tag, so beta (Development) tags get the DSN
@@ -257,6 +335,7 @@ jobs:
           source .ci/docker.sh
           args=()
           [[ $server_only == yes ]] && args+=(--no-client)
+          [[ $RUN_TESTS == true ]] && args+=(--test)
           [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
           args+=(--ccache "$CCACHE_SIZE")
           args+=(--cmake-generator "$CMAKE_GENERATOR")
@@ -266,7 +345,14 @@ jobs:
           # configures, and empty keeps the mock fallback.
           export RUN_ARGS="${RUN_ARGS:-} -e COCKATRICE_SENTRY_DSN"
 
-          RUN --server --release --package "$package" "${args[@]}"
+          # --package takes an optional type, so the flag and its argument have to travel
+          # together or the type would become the next flag.
+          package_args=()
+          [[ -n $package && $package != skip ]] && package_args+=(--package "$package")
+
+          # compile.sh runs the tests before the package target, so a failing suite stops the
+          # leg before anything is built into an installer.
+          RUN --server --release "${package_args[@]}" "${args[@]}"
 
       - name: "Install sentry-cli"
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
@@ -315,7 +401,7 @@ jobs:
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "Delete remote compiler cache (ccache)"
-        if: github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
+        if: github.ref == 'refs/heads/master' && env.PERSIST_CCACHE == 'true' && steps.restore_ccache.outputs.cache-hit
         continue-on-error: true
         env:
           CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
@@ -326,7 +412,7 @@ jobs:
           fi
 
       - name: "Save updated compiler cache (ccache)"
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' && env.PERSIST_CCACHE == 'true'
         uses: actions/cache/save@v6
         with:
           key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
@@ -368,33 +454,86 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
 
+  build-linux-nightly:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - distro: Debian
+            version: 12    # previous stable, still covered by the nightly
+
+            package: DEB
+            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Fedora
+            version: 43    # previous release, still covered by the nightly
+
+            package: RPM
+            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Ubuntu
+            version: 24.04    # previous LTS, still covered by the nightly
+
+            package: DEB
+            test: skip    # Running tests on all distros is superfluous
+
+          # The one leg that runs instrumented for line coverage and publishes the report as
+          # a workflow artifact. It stays a separate leg rather than a second flag on the
+          # sanitizer leg because the two instruments answer different questions: the
+          # sanitizer leg reports what the run did wrong, the coverage leg reports what the
+          # run never touched at all. Combining them would also slow both down.
+          #
+          # It moved here from build-linux: gcovr.cfg sets no fail_under, so the leg cannot
+          # fail a build, and nothing consumes the report per change, which made it an
+          # artifact nobody read on every pull request. On the default branch it becomes a
+          # trend instead. Image and ccache keys come from distro, version and variant, so
+          # they are unchanged and the warm cache that leg built still matches.
+          - distro: Ubuntu
+            version: 26.04
+            variant: cover    # separate image and ccache, same distro
+
+            coverage: yes
+            package: skip
+            # A report must not redden the nightly run: vcpkg-cache-import only imports the
+            # archives of a run whose conclusion is success.
+            allow-failure: yes
+
+    name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }}
+    needs: configure
+    # A nightly and a tag build cover the legs a pull request or a merge does not wait for:
+    # the previous release of each distro, and the one instrument that only reports.
+    if: github.event_name == 'schedule' || github.ref_type == 'tag'
+    runs-on: ubuntu-latest    # https://github.com/actions/runner-images
+    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
+    timeout-minutes: 70
+    env:
+      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}    # directory for caching docker image and ccache
+      CCACHE_EVICTION_AGE: 7d
+      # These legs do not keep a compiler cache: they run once a day (and on tags) and gate
+      # nothing, so their share of the 10 GB quota goes to the pull-request legs instead.
+      # A cold nightly build costs minutes on a runner nobody waits for; a cold pull request
+      # build costs a review. CCACHE_SIZE is still passed so ccache trims its scratch dir.
+      PERSIST_CCACHE: 'false'
+      CCACHE_SIZE: 600M
+      CMAKE_GENERATOR: 'Ninja'
+      NAME: ${{ matrix.distro }}${{ matrix.version }}
+      IMAGE_SUFFIX: ${{ matrix.variant }}
+      # The shared steps below gate on these, so they have to be derived here too. Left
+      # undefined they silently skipped the build the leg exists for: the coverage leg
+      # found build/ empty and its report collection failed on every nightly and tag run.
+      # Same derivation as the pull request job above.
+      DEBUG_TEST: ${{ matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes' }}
+      RUN_TESTS: ${{ matrix.test != 'skip' && !(matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes') }}
+    steps: *linux-steps
+
   build-vcpkg:
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: macOS
-            target: 13    # EOL 2025-09-15
-            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
-                                      # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout
-
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            make_package: 1
-            override_target: 13
-            package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
-            soc: Intel
-            type: Release
-            use_ccache: 1
-            vcpkg_scope: 'vcpkg/macos13-x64-xcode26.3/'
-            vcpkg_upload: 1    # only one leg per vcpkg_scope hands its archives over
-            xcode: "26.3"
-
-          - os: macOS
-            target: 14    # EOL 2026-??
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+            target: 14    # EOL 2026-09-14
+            runner: xcode-27    # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -409,11 +548,10 @@ jobs:
             vcpkg_deployment_target: 14
             vcpkg_scope: 'vcpkg/macos14-arm64-xcode26.6/'
             vcpkg_upload: 1    # only one leg per vcpkg_scope hands its archives over
-            xcode: "26.6"
 
           - os: macOS
-            target: 15
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+            target: 15    # EOL 2027-??
+            runner: xcode-27    # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -427,11 +565,10 @@ jobs:
             use_ccache: 1
             vcpkg_deployment_target: 14
             vcpkg_scope: 'vcpkg/macos14-arm64-xcode26.6/'
-            xcode: "26.6"
 
           - os: macOS
-            target: 26
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+            target: 27
+            runner: xcode-27    # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
@@ -442,7 +579,6 @@ jobs:
             use_ccache: 1
             vcpkg_deployment_target: 14
             vcpkg_scope: 'vcpkg/macos14-arm64-xcode26.6/'
-            xcode: "26.6"
 
           - os: Windows
             target: 10
@@ -466,14 +602,23 @@ jobs:
             vcpkg_upload: 1    # only one leg per vcpkg_scope hands its archives over
 
     name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
-    needs: configure
+    needs: [configure, vcpkg-baseline]
+    # The nightly leg lives in build-vcpkg-nightly below, next to the Linux nightly legs.
+    if: github.event_name != 'schedule'
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 100
     env:
       CCACHE_DIR: ${{ github.workspace }}/.cache/
-      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      # macOS configurations compile about twice the TUs of a Linux one, so each of these
+      # three legs gets a bound above what it has been measured to write. The four macOS
+      # legs used to be bounded at 600M from the same quota as the Linux ones; the three
+      # pull-request legs now get 700M each while the nightly Intel leg keeps none, and
+      # that is what fits (see CCACHE_SIZE in build-linux for the full arithmetic).
+      CCACHE_SIZE: 700M
+      PERSIST_CCACHE: 'true'
 
-    steps:
+    # Shared with build-vcpkg-nightly so the two leg sets run the same steps.
+    steps: &vcpkg-steps
       - name: "Checkout"
         uses: actions/checkout@v7
         with:
@@ -490,11 +635,11 @@ jobs:
         run: brew install ccache
 
       - name: "[macOS] Restore compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && env.PERSIST_CCACHE == 'true'
         id: restore_ccache
         uses: actions/cache/restore@v6
         with:
-          key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}
+          key: ccache-${{ matrix.os }}${{ matrix.override_target }}-${{ matrix.runner }}
           path: ${{ env.CCACHE_DIR }}
 
       - name: "[macOS] Install aqtinstall"
@@ -584,11 +729,17 @@ jobs:
       # job. A scope nobody has written to yet therefore leaves the directory missing
       # and fails the job, which is exactly the state every scope starts in. Make the
       # directory up front so an empty scope is a cache miss instead of an error.
+      # always() covers the cache step itself failing: the action's post save still runs
+      # then, and it should report the real error instead of ENOENT. It cannot rescue a
+      # failure before the cache step, since a post step only runs for an action whose
+      # main step did. The fallback keeps this guard from failing when the cache step was
+      # skipped and left no path output.
       - name: "Create vcpkg cache directory"
+        if: always()
         shell: bash
         env:
           CACHE_DIR: '${{ steps.vcpkg-cache.outputs.path }}'
-        run: mkdir -p "$CACHE_DIR"
+        run: mkdir -p "${CACHE_DIR:-$GITHUB_WORKSPACE/.vcpkg-cache}"
 
       # Uses environment variables, see compile.sh for more details
       - name: "Build Cockatrice"
@@ -603,7 +754,6 @@ jobs:
           # configure.outputs.tag is set for ANY tag, so beta (Development) tags get the DSN
           # and the symbol upload below just like full releases.
           COCKATRICE_SENTRY_DSN: ${{ needs.configure.outputs.tag != null && secrets.SENTRY_DSN || '' }}
-          DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
           GITHUB_TOKEN: ${{ github.token }}    # needed for vcpkg dependency graph updates, see VCPKG_FEATURE_FLAGS
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
@@ -815,7 +965,7 @@ jobs:
 
       # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
       - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && env.PERSIST_CCACHE == 'true' && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
         continue-on-error: true
         env:
           CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
@@ -826,7 +976,7 @@ jobs:
           fi
 
       - name: "[macOS] Cache updated compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && env.PERSIST_CCACHE == 'true' && github.ref == 'refs/heads/master'
         uses: actions/cache/save@v6
         with:
           key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
@@ -942,6 +1092,44 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
 
+  build-vcpkg-nightly:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macOS
+            target: 13    # EOL 2025-09-15
+            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+                                      # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            make_package: 1
+            override_target: 13
+            package_suffix: "-macOS13_Intel"
+            qt_version: 6.11.*
+            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            soc: Intel
+            type: Release
+            use_ccache: 1
+            vcpkg_scope: 'vcpkg/macos13-x64-xcode26.3/'
+            vcpkg_upload: 1    # only one leg per vcpkg_scope hands its archives over
+
+    name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+    needs: configure
+    # The EOL target on the slowest runner is too slow to gate a change, so it runs in the
+    # nightly and on tags only, where the vcpkg cache import also has to accept schedule runs.
+    if: github.event_name == 'schedule' || github.ref_type == 'tag'
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 100
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.cache/
+      # Like build-linux-nightly: this leg keeps no compiler cache, so the quota stays with
+      # the pull-request legs (see PERSIST_CCACHE there).
+      PERSIST_CCACHE: 'false'
+      CCACHE_SIZE: 600M
+    steps: *vcpkg-steps
+
   prune-caches:
     name: Prune caches
     # Only master writes caches at all, so only master may clean them up too
@@ -950,38 +1138,64 @@ jobs:
     continue-on-error: true    # freeing space must never fail a build
 
     steps:
-      # The repository holds 10Gi of cache against entries that want more, and GitHub
-      # evicts the least recently used entry whenever that is exceeded. The vcpkg
-      # entries are the reason that never happens: the restore above touches every
-      # entry under the prefix on every run, so a dead ABI generation keeps its access
-      # date fresh forever and age based eviction can never reach it. Deleting by age
-      # alone cannot fix that, only knowing which scope an entry belongs to can.
+      # The repository holds 10 GB of cache against entries that want more, and GitHub evicts
+      # the least recently used entry whenever that is exceeded. The vcpkg entries are the
+      # reason that never happens: the restore above touches every entry under the prefix on
+      # every run, so a dead ABI generation keeps its access date fresh forever and age based
+      # eviction can never reach it. Deleting by age alone cannot fix that, only knowing which
+      # scope an entry belongs to can. The same is true of a compiler cache of a leg that no
+      # longer keeps one: its restore would keep touching it, so the live key list below is
+      # what retires it.
+      #
+      # docker-release's image builds keep their layer cache in the same quota: one blob per
+      # layer, keyed buildkit-blob-1-<digest>, plus one index-<scope>-1-<hash> entry per image
+      # scope that lists them. They are written with mode=min, so only the final image stage
+      # is kept and the set stays small. A layer a build actually needs is downloaded, which
+      # refreshes its access date, so an old date means the builds have stopped using it and
+      # age is the right test. Dropping a blob an index still lists costs the next image build
+      # one rebuilt layer; docker-release gates nothing, so that is cheaper than keeping the
+      # entries forever.
       - name: "Delete unusable cache entries"
         shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
-          # Must list every vcpkg_scope of the build-vcpkg matrix above, or the entries of
-          # a scope that is still in use get deleted on the next run.
+          # Must list every vcpkg_scope of the build-vcpkg and build-vcpkg-nightly
+          # matrices above, or the entries of a scope that is still in use get deleted
+          # on the next run.
           LIVE_VCPKG_SCOPES: 'vcpkg/macos13-x64-xcode26.3/ vcpkg/macos14-arm64-xcode26.6/ vcpkg/windows10-x64-vs2026/'
+          # Must list the ccache key of every leg that keeps a compiler cache
+          # (PERSIST_CCACHE in build-linux and build-vcpkg), or a live entry is deleted.
+          # The nightly legs keep none, so their leftover entries are reclaimed here
+          # instead of waiting out the age rule.
+          LIVE_CCACHE_KEYS: 'ccache-Arch ccache-Servatrice_Debian12 ccache-Debian13 ccache-Fedora44 ccache-Ubuntu26.04 ccache-Ubuntu26.04sanitize ccache-macOS14-xcode-27 ccache-macOS15-xcode-27 ccache-macOS-xcode-27'
         run: |
           gh api --paginate "repos/$GITHUB_REPOSITORY/actions/caches?per_page=100" \
             --jq '.actions_caches[] | [.id, .ref, .key, .last_accessed_at] | @tsv' >"$RUNNER_TEMP/caches.tsv"
 
           cutoff="$(( $(date -u +%s) - 7 * 24 * 3600 ))"
           live=" ${LIVE_VCPKG_SCOPES} "
+          live_ccache=" ${LIVE_CCACHE_KEYS} "
+
           deleted=0
           while IFS=$'\t' read -r id ref key accessed; do
             [[ -n $id ]] || continue
-            # Only ever touch the key shapes this workflow creates, so that an entry of
-            # some other workflow can never be deleted by accident
+            # Only ever touch the key shapes our workflows create (buildkit-* and index-*
+            # come from docker-release.yml), so that an entry of some other workflow can
+            # never be deleted by accident
             case "$key" in
-              vcpkg/* | ccache-* | Qt*) ;;
+              vcpkg/* | ccache-* | Qt* | buildkit-* | index-*) ;;
               *) continue ;;
             esac
 
             reason=""
             if [[ $ref != refs/heads/master ]]; then
               reason="scoped to $ref"
+            elif [[ $key == ccache-* ]]; then
+              # An exact token compare: ccache-Ubuntu26.04 is a prefix of
+              # ccache-Ubuntu26.04sanitize, and both keys are live
+              if [[ $live_ccache != *" $key "* ]]; then
+                reason="no pull-request leg keeps it"
+              fi
             elif [[ $key == vcpkg/* ]]; then
               # "<scope>/<abi hash>", cut the hash off the end to get the scope
               scope="vcpkg/${key#vcpkg/}"
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 937386940..1537d6d4d 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -84,12 +84,18 @@ jobs:
           password: ${{ github.token }}
 
       # Don't push for non-publishing triggers
+      #
+      # The layer cache shares the repository's 10 GB Actions cache quota with the compiler
+      # caches (see CCACHE_SIZE in desktop-build.yml). mode=min keeps only the final image
+      # stage: the build stage sits behind `COPY . .`, so its compile layer is invalidated by
+      # every source change and was never read back, yet it was the bulk of the ~2 GB this
+      # cache held. The final runtime stage is the part that still pays off.
       - name: "Build image"
         if: steps.login.outcome != 'success'
         uses: docker/build-push-action@v7
         with:
           cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
-          cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=max,scope={0}', env.CACHE_SCOPE), '') }}
+          cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=min,scope={0}', env.CACHE_SCOPE), '') }}
           context: .
           platforms: ${{ matrix.platform }}
           push: false
@@ -101,7 +107,7 @@ jobs:
         uses: docker/build-push-action@v7
         with:
           cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
-          cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }}
+          cache-to: type=gha,mode=min,scope=${{ env.CACHE_SCOPE }}
           context: .
           labels: |
             org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }}
diff --git a/.github/workflows/vcpkg-cache-import.yml b/.github/workflows/vcpkg-cache-import.yml
index 3cc7b2203..0a377a8fd 100644
--- a/.github/workflows/vcpkg-cache-import.yml
+++ b/.github/workflows/vcpkg-cache-import.yml
@@ -4,12 +4,14 @@ name: Import vcpkg cache
 # rebuilds protobuf, openssl and abseil from source and saves them into the shared
 # cache, where every later run can restore them.
 #
-# Only master pushes are imported here: the collect step, keys.txt and the zip
-# contents all come from the workflow run being imported, so importing from an
-# unmerged pull request would let anyone who can push a branch — or a bot actor
-# such as Dependabot, whose PRs are same-repo — promote arbitrary binaries into
-# the scope that master and tag builds restore and link into signed releases.
-# Forks build untrusted code and must never reach that scope either.
+# Only master pushes and the nightly schedule run on master are imported here: the
+# collect step, keys.txt and the zip contents all come from the workflow run being
+# imported, so importing from an unmerged pull request would let anyone who can push
+# a branch — or a bot actor such as Dependabot, whose PRs are same-repo — promote
+# arbitrary binaries into the scope that master and tag builds restore and link into
+# signed releases. Forks build untrusted code and must never reach that scope either.
+# A scheduled run is the default branch at the commit a master push already built, so
+# it carries the same trust as a push.
 #
 # repository_dispatch is not used on purpose: it would also resolve to the default branch,
 # but it counts as a low-trust trigger and may only write there when it declares a
@@ -38,7 +40,7 @@ jobs:
     # the shared scope even if they somehow target the default branch.
     if: >-
       github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.event == 'push' &&
+      (github.event.workflow_run.event == 'push' || github.event.workflow_run.event == 'schedule') &&
       github.event.workflow_run.head_branch == 'master' &&
       github.event.workflow_run.head_repository.full_name == github.repository &&
       !endsWith(github.event.workflow_run.actor.login, '[bot]') &&
diff --git a/.gitmodules b/.gitmodules
index 732fec7ca..e69c8e686 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "doxygen-awesome-css"]
 	path = doc/doxygen/theme
 	url = https://github.com/jothepro/doxygen-awesome-css.git
+[submodule "external/qttesting"]
+	path = external/qttesting
+	url = https://github.com/Kitware/QtTesting.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41fe393e7..9044bc005 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,8 @@ option(WITH_CLIENT "Build Cockatrice client" ON)
 option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON)
 # Compile Servatrice
 option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF)
+# Compile GUI tests (QtTesting widget-level playback)
+option(WITH_GUI_TEST "Build the QtTesting-based GUI test harness" OFF)
 # Compile tests
 option(TEST "Build tests" OFF)
 # Build with AddressSanitizer and UndefinedBehaviorSanitizer
@@ -29,6 +31,14 @@ option(ENABLE_COVERAGE "Build instrumented for GCC line coverage" OFF)
 # Use vcpkg regardless of OS
 option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
+# The GUI test harness lives in a submodule; a checkout without it must still configure.
+if(WITH_GUI_TEST AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external/qttesting/CMakeLists.txt")
+  message(WARNING "WITH_GUI_TEST is ON but external/qttesting is missing, so GUI tests are disabled.\n"
+                  "Run 'git submodule update --init external/qttesting' to enable them."
+  )
+  set(WITH_GUI_TEST OFF)
+endif()
+
 # Default to "Release" build type
 # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
 if(DEFINED CMAKE_BUILD_TYPE)
@@ -55,6 +65,10 @@ if(USE_CCACHE AND NOT WIN32)
     # PCH-aware caching, matching .ci/compile.sh: without this ccache refuses
     # to cache any TU that consumes a precompiled header, so every PCH-backed
     # target recompiles from scratch on each build.
+    # The include_file_mtime/include_file_ctime entries that CI also sets are
+    # deliberately not set here: --set-config writes the user's global
+    # ccache.conf, and those two would turn off the modified-during-compile
+    # check for every project on the machine, not just this one.
     execute_process(COMMAND ${CCACHE_PROGRAM} --set-config sloppiness=pch_defines,time_macros)
     message(STATUS "Found CCache ${CCACHE_PROGRAM}")
   endif()
@@ -71,6 +85,8 @@ if(WIN32 OR USE_VCPKG)
   )
   # Qt path set by user or env var
   if(QTDIR
+     OR QTDIR32
+     OR QTDIR64
      OR DEFINED ENV{QTDIR}
      OR DEFINED ENV{QTDIR32}
      OR DEFINED ENV{QTDIR64}
@@ -90,7 +106,7 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 3.1.2)
+project("Cockatrice" VERSION 3.2.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
@@ -236,13 +252,13 @@ else()
   set(_lib_suffix 32)
 endif()
 
-if(DEFINED QTDIR${_lib_suffix})
+if(NOT "${QTDIR${_lib_suffix}}" STREQUAL "")
   list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
-elseif(DEFINED QTDIR)
+elseif(NOT "${QTDIR}" STREQUAL "")
   list(APPEND CMAKE_PREFIX_PATH "${QTDIR}")
-elseif(DEFINED ENV{QTDIR${_lib_suffix}})
+elseif(NOT "$ENV{QTDIR${_lib_suffix}}" STREQUAL "")
   list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR${_lib_suffix}}")
-elseif(DEFINED ENV{QTDIR})
+elseif(NOT "$ENV{QTDIR}" STREQUAL "")
   list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
 endif()
 
@@ -250,7 +266,22 @@ message(STATUS "Update Translations: ${UPDATE_TRANSLATIONS}")
 
 include(FindQtRuntime)
 
+# Reject APIs that were deprecated before the oldest Qt release we support
+# (6.4). Qt 6.5 renamed the switch, so use whichever spelling the found
+# version understands while still compiling everywhere.
+if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5)
+  add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x060400)
+else()
+  add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060400)
+endif()
+
+# Set once here for every target: these variables are inherited by the
+# subdirectories, so the per-directory copies were redundant. Only the
+# variables are set; qt_standard_project_setup would also change the runtime
+# output directories and the install RPATH.
 set(CMAKE_AUTOMOC TRUE)
+set(CMAKE_AUTOUIC TRUE)
+set(CMAKE_AUTORCC TRUE)
 
 # Find other needed libraries
 find_package(Protobuf CONFIG)
@@ -420,6 +451,9 @@ if(WITH_ORACLE OR WITH_CLIENT)
   add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models)
   add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_filters ${CMAKE_BINARY_DIR}/libcockatrice_filters)
 endif()
+if(WITH_CLIENT)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_game ${CMAKE_BINARY_DIR}/libcockatrice_game)
+endif()
 
 if(WITH_SERVER)
   add_subdirectory(servatrice)
@@ -443,6 +477,34 @@ if(WITH_ORACLE)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
+if(WITH_GUI_TEST)
+  set(QtTesting_QT_VERSION "6")
+  # QtTesting registers its own unit tests when BUILD_TESTING is on. They target the
+  # Qt version the harness was written for and fail on Qt 6.11 (toolbutton
+  # long-press recording), and they are not Cockatrice's tests, so suppress them
+  # for the duration of the subdirectory instead of painting ctest red.
+  if(DEFINED BUILD_TESTING)
+    set(_cockatrice_saved_build_testing ${BUILD_TESTING})
+  endif()
+  set(BUILD_TESTING
+      OFF
+      CACHE BOOL "Build the testing tree." FORCE
+  )
+  add_subdirectory(external/qttesting)
+  if(DEFINED _cockatrice_saved_build_testing)
+    set(BUILD_TESTING
+        ${_cockatrice_saved_build_testing}
+        CACHE BOOL "Build the testing tree." FORCE
+    )
+  else()
+    unset(BUILD_TESTING CACHE)
+  endif()
+  # cl.exe has no warnings-as-errors here, and it rejects -Wno-error with D8021.
+  if(NOT MSVC)
+    target_compile_options(qttesting PRIVATE -Wno-error)
+  endif()
+endif()
+
 if(TEST)
   include(CTest)
   add_subdirectory(tests)
@@ -450,5 +512,5 @@ endif()
 
 if(Qt6_FOUND AND Qt6_VERSION_MINOR GREATER_EQUAL 3)
   # Qt6.3+ requires project finalization to support translations
-  qt6_finalize_project()
+  qt_finalize_project()
 endif()
diff --git a/Testing/README.md b/Testing/README.md
new file mode 100644
index 000000000..cb990ec29
--- /dev/null
+++ b/Testing/README.md
@@ -0,0 +1,66 @@
+# GUI tests
+
+Widget-level playback tests for the Cockatrice client, driven by
+[QtTesting](https://github.com/Kitware/QtTesting) (`external/qttesting`, a submodule).
+Each `*_test.xml` file is a list of events that QtTesting replays against the running
+application; a test passes when every event is handled without error.
+
+## Running
+
+```bash
+git submodule update --init external/qttesting      # once
+cmake -S . -B build/debug -DCMAKE_BUILD_TYPE=Debug -DWITH_SERVER=0 -DWITH_GUI_TEST=ON
+cmake --build build/debug -j 24
+
+./Testing/run_test.sh --all                        # headless, offscreen
+./Testing/run_test.sh Testing/smoke_test.xml       # one file
+./Testing/run_test.sh --visual Testing/smoke_test.xml   # shows the window
+```
+
+`WITH_GUI_TEST` is on by default; a checkout without the submodule configures with a
+warning and no harness. `COCKATRICE_BIN` points the runner at another build, and
+`TEST_TIMEOUT` (seconds, default 180) bounds a single test — a failing event inside a
+modal dialog can otherwise leave the process alive. The client also hard-exits a few
+seconds after playback returns, whatever the result.
+
+The tests are **not** part of `ctest`: they need a card database and a developer's
+settings, so they stay a local loop for now.
+
+## Caveats
+
+- **Not hermetic.** The client reads the local settings and card database, so a test can
+  pass on one machine and fail on another. Avoid asserting things that restored
+  workspace state or user preferences decide (for example the number of open tabs).
+- **English labels only.** Menu entries are addressed by their (translated) text, so the
+  tests expect the source language. Widgets are addressed by objectName paths, which are
+  stable across translations.
+- Actions that open a dialog are followed by a `pause` event: playback continues in the
+  dialog's own event loop, and the pause gives the UI time to build itself.
+- Widget paths include Qt-internal names where a QTabWidget is involved
+  (`qt_tabwidget_stackedwidget`), and the deck views in a game are indexed
+  (`tabbedDeckView_0`, `tabbedDeckView_1`).
+
+## Writing a test
+
+A test is a `<events>` list. Widgets are named by their path from the main window, e.g.
+`MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu`. Useful commands:
+
+| Command | Arguments | Effect |
+|---------|-----------|--------|
+| `activate` | action or menu name | triggers a QAction (menus are opened first) |
+| `key` | Qt key code | presses that key on the focused widget |
+| `pause` | milliseconds | waits, letting the UI settle |
+| `clickCard` | `card,zone` | double click the card found in that zone (plays it from hand) |
+| `flipCard` | `card,zone` | right-click → *Turn Over* |
+| `cardAction` | `card,zone,label` | right-click → first menu entry whose label contains `label` (submenus included) |
+| `moveCard` | `card,srcZone,dstZone` | drags the card onto the destination zone |
+| `drawArrow` | `srcCard,srcZone,dstCard,dstZone` | right-drag an arrow between two cards |
+| `createToken` | `name,color,pt` | creates a token as the active local player |
+| `selectItem` | `item label` | selects the tree/list entry with that label |
+| `typeText` | `text` | types text one key event at a time |
+| `expectProperty` | `property,value` | fails playback unless the widget property matches |
+
+The card, item and property commands are `pqCockatriceEventPlayer`
+(`cockatrice/src/game_graphics/pq_cockatrice_event_player.h`). They resolve cards by name
+and zone through the `QGraphicsScene` and send real mouse events at the card's current
+viewport position, so a test does not depend on the window size or screen resolution.
diff --git a/Testing/card_actions_test.xml b/Testing/card_actions_test.xml
new file mode 100644
index 000000000..8d6de4c2b
--- /dev/null
+++ b/Testing/card_actions_test.xml
@@ -0,0 +1,69 @@
+<events>
+    <!--
+        Card actions (custom commands of pqCockatriceEventPlayer).
+
+        Exercises the context menu path (tap, counters in a submenu, flip),
+        arrow drawing, and dragging a card between zones. All of it through
+        mouse events on the game view, so the same file runs at any resolution.
+    -->
+
+    <!-- ===== Two-player local game ===== -->
+    <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="Start &amp;local game..." />
+    <event widget="MainWindow/localGameDialog/generalGroupBox/numberPlayersEdit" command="set_int" arguments="2" />
+    <event widget="MainWindow/localGameDialog" command="key" arguments="16777220" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+
+    <!-- ===== Player 1 loads a one-card deck ===== -->
+    <!-- (No tab-count assertion: the restored workspace state decides how many other
+         tabs exist, and the paths below already prove the game tab is there.) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/loadFromClipboardButton" command="activate" arguments="" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="typeText" arguments="1 Lightning Bolt" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit" command="keyEvent" arguments="6,16777220,67108864,,0,1" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/readyStartButton" command="activate" arguments="" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+
+    <!-- ===== Player 2 loads the same deck and readies up ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/loadFromClipboardButton" command="activate" arguments="" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="typeText" arguments="1 Lightning Bolt" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit" command="keyEvent" arguments="6,16777220,67108864,,0,1" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/readyStartButton" command="activate" arguments="" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+
+    <!-- ===== Player 1, precombat main ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- ===== A token to interact with ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="createToken" arguments="Goblin,r,1/1" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+
+    <!-- Tap it through the context menu -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="cardAction" arguments="Goblin,table,Tap / Untap" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+
+    <!-- Add a counter: the entry lives in the "Card counters" submenu -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="cardAction" arguments="Goblin,table,Add counter (A)" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+
+    <!-- Flip it face down -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="flipCard" arguments="Goblin,table" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+
+    <!-- ===== An arrow from a second token to the Goblin ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="createToken" arguments="Elf,w,1/1" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="drawArrow" arguments="Elf,table,Goblin,table" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- ===== Drag the Goblin into the graveyard ===== -->
+    <!-- A token that leaves the battlefield is destroyed rather than moved, so
+         there is nothing to drag back afterwards. -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="moveCard" arguments="Goblin,table,grave" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+</events>
diff --git a/Testing/deck_editor_open_test.xml b/Testing/deck_editor_open_test.xml
new file mode 100644
index 000000000..ab74b1c63
--- /dev/null
+++ b/Testing/deck_editor_open_test.xml
@@ -0,0 +1,4 @@
+<events>
+  <!-- Open a new deck editor tab from the home page -->
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabHome/homeWidget/homeActionsScrollArea/qt_scrollarea_viewport/homeButtonsBox/homeCreateNewDeckButton" command="activate" arguments="" />
+</events>
diff --git a/Testing/deck_editor_search_test.xml b/Testing/deck_editor_search_test.xml
new file mode 100644
index 000000000..6641ac3b2
--- /dev/null
+++ b/Testing/deck_editor_search_test.xml
@@ -0,0 +1,14 @@
+<events>
+  <!-- Open a new visual deck editor tab from the home page -->
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabHome/homeWidget/homeActionsScrollArea/qt_scrollarea_viewport/homeButtonsBox/homeCreateNewDeckButton" command="activate" arguments="" />
+  <!-- Type "Lightning" into the search box (keycodes for L-i-g-h-t-n-i-n-g) -->
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="76" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="105" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="103" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="104" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="116" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="110" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="105" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="110" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="103" />
+</events>
diff --git a/Testing/dialog_lifecycle_test.xml b/Testing/dialog_lifecycle_test.xml
new file mode 100644
index 000000000..00510b802
--- /dev/null
+++ b/Testing/dialog_lifecycle_test.xml
@@ -0,0 +1,11 @@
+<events>
+  <!-- Open and close Settings dialog (modal exec) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+  <event widget="MainWindow/settingsDialog" command="key" arguments="16777216" />
+
+  <!-- Open and close About dialog (modal exec) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;About Cockatrice" />
+  <event widget="MainWindow/aboutDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/game_mechanics_test.xml b/Testing/game_mechanics_test.xml
new file mode 100644
index 000000000..efef78707
--- /dev/null
+++ b/Testing/game_mechanics_test.xml
@@ -0,0 +1,101 @@
+<events>
+    <!--
+        Tier 7: Game Mechanics
+        Tests: play cards (clickCard), flip cards (flipCard),
+               create tokens (createToken), draw arrows (drawArrow).
+        All interactions are pure UI mouse events through the QGraphicsView viewport.
+    -->
+
+    <!-- ===== Start a local 2-player game ===== -->
+    <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="Start &amp;local game..." />
+    <!-- Force two players so both deck views exist, independent of the user's settings -->
+    <event widget="MainWindow/localGameDialog/generalGroupBox/numberPlayersEdit" command="set_int" arguments="2" />
+    <event widget="MainWindow/localGameDialog" command="key" arguments="16777220" />
+
+    <!-- ===== Player 1: Load 3-card deck ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/loadFromClipboardButton" command="activate" arguments="" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="keyEvent" arguments="6,65,67108864,,0,1" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="typeText" arguments="3 Lightning Bolt" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit" command="keyEvent" arguments="6,16777220,67108864,,0,1" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/readyStartButton" command="activate" arguments="" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+
+    <!-- ===== Player 2: Load same deck ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/loadFromClipboardButton" command="activate" arguments="" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="keyEvent" arguments="6,65,67108864,,0,1" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="typeText" arguments="3 Lightning Bolt" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit" command="keyEvent" arguments="6,16777220,67108864,,0,1" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/readyStartButton" command="activate" arguments="" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+
+    <!-- ===== Player 1, Turn 1 ===== -->
+    <!-- Upkeep → Draw → Main 1 -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- Create a Goblin token -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="createToken" arguments="Goblin,r,1/1" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+
+    <!-- Create a second token (Elf) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="createToken" arguments="Elf,w,1/1" />
+    <event widget="MainWindow" command="pause" arguments="1000" />
+
+    <!-- Flip the Goblin (right-click → Turn Over) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="flipCard" arguments="Goblin,table" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- Play a Lightning Bolt from hand (double-click) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="clickCard" arguments="Lightning Bolt,hand" />
+    <event widget="MainWindow" command="pause" arguments="500" -->
+
+    <!-- Draw arrow from Elf to Goblin (right-drag) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="drawArrow" arguments="Elf,table,Goblin,table" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- Advance through all remaining phases to end turn -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- ===== Player 2, Turn 1 ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <!-- Advance through all phases to end turn -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="200" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+</events>
diff --git a/Testing/integration_test.xml b/Testing/integration_test.xml
new file mode 100644
index 000000000..33191d1ac
--- /dev/null
+++ b/Testing/integration_test.xml
@@ -0,0 +1,45 @@
+<events>
+  <!-- Integration test: exercises multiple tiers in sequence -->
+
+  <!-- Tier 2: Open and close all menus -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+  <event widget="MainWindow/menubar" command="activate" arguments="dbMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+  <event widget="MainWindow/menubar" command="activate" arguments="tabsMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Tier 2: Open and close About (modal) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;About Cockatrice" />
+  <event widget="MainWindow/aboutDialog" command="key" arguments="16777216" />
+
+  <!-- Tier 4: Open and close ViewLog (non-modal) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="View &amp;Debug Log" />
+  <event widget="MainWindow/viewLogDialog" command="key" arguments="16777216" />
+
+  <!-- Tier 4: Open and close Tip of the Day (non-modal) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;Tip of the Day" />
+  <event widget="MainWindow/tipOfTheDayDialog" command="key" arguments="16777216" />
+
+  <!-- Tier 5: Settings search (state interaction) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="100" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="101" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="98" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="117" />
+  <event widget="MainWindow/settingsDialog/settingsOkButton" command="activate" arguments="" />
+
+  <!-- Tier 3: Open deck editor from home and type in search -->
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabHome/homeWidget/homeActionsScrollArea/qt_scrollarea_viewport/homeButtonsBox/homeCreateNewDeckButton" command="activate" arguments="" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="76" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="105" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="103" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="104" />
+  <event widget="MainWindow/tabSupervisor/stackedWidget/TabDeckEditorVisual/databaseDisplayDock/databaseDisplayDockContents/databaseDisplayWidget/searchEdit" command="key" arguments="116" />
+</events>
diff --git a/Testing/local_game_lifecycle_test.xml b/Testing/local_game_lifecycle_test.xml
new file mode 100644
index 000000000..bdc964921
--- /dev/null
+++ b/Testing/local_game_lifecycle_test.xml
@@ -0,0 +1,178 @@
+<events>
+    <!--
+        Tier 6: Local Game Lifecycle (Extended)
+        Tests: create game -> load decks -> ready up -> game starts
+              -> play through turns using menu activate commands
+
+        Phase actions triggered via activate on phasesMenu:
+          aNextPhaseAction advances phase + triggers phase action (e.g., draw at draw step)
+          aNextTurn in gameMenu triggers next turn
+
+        This avoids keyboard shortcut issues in offscreen/test environments.
+    -->
+
+    <!-- ===== Phase 1: Start a local game via main menu ===== -->
+    <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="Start &amp;local game..." />
+    <!-- Force two players so both deck views exist, independent of the user's settings -->
+    <event widget="MainWindow/localGameDialog/generalGroupBox/numberPlayersEdit" command="set_int" arguments="2" />
+    <event widget="MainWindow/localGameDialog" command="key" arguments="16777220" />
+
+    <!-- ===== Phase 2: Player 1 loads deck from clipboard ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/loadFromClipboardButton" command="activate" arguments="" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="keyEvent" arguments="6,65,67108864,,0,1" />
+    <!-- 1 Lightning Bolt -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="typeText" arguments="1 Lightning Bolt" />
+    <!-- Ctrl+Return to accept clipboard dialog -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit" command="keyEvent" arguments="6,16777220,67108864,,0,1" />
+    <!-- Delay -->
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Player 1 ready up -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_0/qt_tabwidget_stackedwidget/deckViewContainer/readyStartButton" command="activate" arguments="" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+
+    <!-- ===== Phase 3: Player 2 loads deck from clipboard ===== -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/loadFromClipboardButton" command="activate" arguments="" />
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="keyEvent" arguments="6,65,67108864,,0,1" />
+    <!-- 1 Lightning Bolt -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit/contentsEdit" command="typeText" arguments="1 Lightning Bolt" />
+    <!-- Ctrl+Return to accept clipboard dialog -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/dlgDeckTextEdit" command="keyEvent" arguments="6,16777220,67108864,,0,1" />
+    <!-- Delay -->
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Player 2 ready up -> game auto-starts -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/deckViewContainerWidget/tabbedDeckView_1/qt_tabwidget_stackedwidget/deckViewContainer/readyStartButton" command="activate" arguments="" />
+    <!-- Delay for game to start -->
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+
+    <!-- ===== Phase 4: Advance through all 11 phases via phasesMenu activate ===== -->
+    <!-- Using activate on phasesMenu triggers aNextPhaseAction which:
+         - advances the phase by 1
+         - calls triggerPhaseAction (e.g., draw card at draw step, untap all at untap) -->
+
+    <!-- Phase 0 (Untap) → 1 (Upkeep) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 1 (Upkeep) → 2 (Draw): TRIGGERS DRAW — Player 1 draws 1 card -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+    <!-- Phase 2 (Draw) → 3 (Main 1) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- ===== Main 1: Play a card from hand by double-click ===== -->
+    <!-- clickCard resolves card by name in the scene, maps to viewport coords at current window size. -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/mainWidget/gamePlayAreaWidget/gameView" command="clickCard" arguments="Lightning Bolt,hand" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- Phase 3 → 4 (Begin Combat) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <!-- Phase 4 → 5 (Declare Attackers) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 5 → 6 (Declare Blockers) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 6 → 7 (Combat Damage) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 7 → 8 (End Combat) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 8 → 9 (Main 2) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 9 → 10 (Cleanup) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 10 → 0 (Untap): TRIGGERS NEXT TURN + UNTAP ALL — now Player 2's turn -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <!-- Delay for turn transition -->
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+
+    <!-- ===== Phase 5: Player 2's turn — advance through all 11 phases ===== -->
+    <!-- Phase 0 (Untap) → 1 (Upkeep) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 1 (Upkeep) → 2 (Draw): TRIGGERS DRAW — Player 2 draws 1 card -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 2 (Draw) → 3 (Main 1) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 3 → 4 (Begin Combat) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 4 → 5 (Declare Attackers) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 5 → 6 (Declare Blockers) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 6 → 7 (Combat Damage) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 7 → 8 (End Combat) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 8 → 9 (Main 2) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 9 → 10 (Cleanup) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 10 → 0 (Untap): TRIGGERS NEXT TURN — back to Player 1 -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <!-- Delay -->
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+
+    <!-- ===== Phase 6: Player 1 turn 2 — advance to draw again ===== -->
+    <!-- Phase 0 (Untap) → 1 (Upkeep) -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <!-- Phase 1 (Upkeep) → 2 (Draw): TRIGGERS DRAW — Player 1 draws again -->
+    <event widget="MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu" command="activate" arguments="aNextPhaseAction" />
+    <event widget="MainWindow" command="key" arguments="32" />
+    <event widget="MainWindow" command="key" arguments="32" />
+
+</events>
diff --git a/Testing/menu_open_close_test.xml b/Testing/menu_open_close_test.xml
new file mode 100644
index 000000000..d894b47b5
--- /dev/null
+++ b/Testing/menu_open_close_test.xml
@@ -0,0 +1,19 @@
+<events>
+  <!-- Test 1: Open and close each top-level menu -->
+
+  <!-- Cockatrice menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Database menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="dbMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Tabs menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="tabsMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Help menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/nonmodal_manage_sets_test.xml b/Testing/nonmodal_manage_sets_test.xml
new file mode 100644
index 000000000..5fe2bfc0c
--- /dev/null
+++ b/Testing/nonmodal_manage_sets_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Test non-modal dialog lifecycle: open and close Manage Sets (QMainWindow) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="dbMenu" />
+  <event widget="MainWindow/menubar/dbMenu" command="activate" arguments="&amp;Manage sets..." />
+  <event widget="MainWindow/manageSetsWindow" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/nonmodal_tip_test.xml b/Testing/nonmodal_tip_test.xml
new file mode 100644
index 000000000..0f4ffc825
--- /dev/null
+++ b/Testing/nonmodal_tip_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Test non-modal dialog lifecycle: open and close Tip of the Day -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;Tip of the Day" />
+  <event widget="MainWindow/tipOfTheDayDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/nonmodal_view_log_test.xml b/Testing/nonmodal_view_log_test.xml
new file mode 100644
index 000000000..3369f1fd5
--- /dev/null
+++ b/Testing/nonmodal_view_log_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Test non-modal dialog lifecycle: open and close ViewLog -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="View &amp;Debug Log" />
+  <event widget="MainWindow/viewLogDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/run_test.sh b/Testing/run_test.sh
new file mode 100755
index 000000000..8ff3fe028
--- /dev/null
+++ b/Testing/run_test.sh
@@ -0,0 +1,118 @@
+#!/bin/bash
+# Run QtTesting XML test files against the Cockatrice build.
+#
+# Usage:
+#   ./Testing/run_test.sh [--visual] [--all | <test-file.xml> ...]
+#
+# Options:
+#   --visual    Run with native display (shows the GUI window).
+#               Default is headless (QT_QPA_PLATFORM=offscreen).
+#   --all       Run every *.xml file in Testing/.
+#
+# Environment:
+#   COCKATRICE_BIN   Path to the client binary (default: build/debug/cockatrice/cockatrice,
+#                    or the .app bundle binary on macOS).
+#   TEST_TIMEOUT     Seconds a single test may run before it is killed (default: 180).
+#                    Uses timeout, or gtimeout from coreutils on macOS.
+#
+# Requires the debug build to exist at build/debug/cockatrice/cockatrice.
+
+set -euo pipefail
+shopt -s nullglob
+
+REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
+if [ -n "${COCKATRICE_BIN:-}" ]; then
+    COCKATRICE="$COCKATRICE_BIN"
+elif [ "$(uname -s)" = "Darwin" ]; then
+    # A macOS build produces an app bundle, not a bare executable.
+    COCKATRICE="$REPO_ROOT/build/debug/cockatrice/cockatrice.app/Contents/MacOS/cockatrice"
+else
+    COCKATRICE="$REPO_ROOT/build/debug/cockatrice/cockatrice"
+fi
+TEST_DIR="$REPO_ROOT/Testing"
+TEST_TIMEOUT="${TEST_TIMEOUT:-180}"
+
+# Stock macOS has no `timeout`; coreutils provides `gtimeout`. Without either the
+# runner still works, but a hung test is not killed.
+TIMEOUT=()
+if command -v timeout >/dev/null 2>&1; then
+    TIMEOUT=(timeout --foreground "$TEST_TIMEOUT")
+elif command -v gtimeout >/dev/null 2>&1; then
+    TIMEOUT=(gtimeout --foreground "$TEST_TIMEOUT")
+else
+    echo "Warning: neither timeout nor gtimeout found; tests are not time-limited." >&2
+fi
+
+if [ ! -f "$COCKATRICE" ]; then
+    echo "Error: $COCKATRICE not found. Build first:" >&2
+    echo "  cmake --build build/debug" >&2
+    exit 1
+fi
+
+VISUAL=0
+if [ "${1:-}" = "--visual" ]; then
+    VISUAL=1
+    shift
+fi
+
+if [ "${1:-}" = "--all" ]; then
+    shift
+    TEST_FILES=("$TEST_DIR"/*.xml)
+    if [ ${#TEST_FILES[@]} -eq 0 ]; then
+        echo "No *.xml files found in $TEST_DIR" >&2
+        exit 1
+    fi
+elif [ $# -ge 1 ]; then
+    TEST_FILES=("$@")
+else
+    echo "Usage: $0 [--visual] [--all | <test-file.xml> ...]" >&2
+    echo "  Run a single test:  $0 Testing/smoke_test.xml" >&2
+    echo "  Run all tests:      $0 --all" >&2
+    echo "  Run visually:       $0 --visual Testing/smoke_test.xml" >&2
+    echo "  Run all visually:   $0 --visual --all" >&2
+    exit 1
+fi
+
+PASS=0
+FAIL=0
+FAILED_TESTS=()
+
+run_one() {
+    local file="$1"
+
+    local -a cmd=()
+    if [ "${#TIMEOUT[@]}" -gt 0 ]; then
+        cmd=("${TIMEOUT[@]}")
+    fi
+    cmd+=("$COCKATRICE" --no-connect --test "$file")
+
+    if [ "$VISUAL" -eq 1 ]; then
+        "${cmd[@]}"
+    else
+        env QT_QPA_PLATFORM=offscreen "${cmd[@]}"
+    fi
+}
+
+for f in "${TEST_FILES[@]}"; do
+    name="$(basename "$f")"
+    printf "%-40s " "$name"
+    if run_one "$f"; then
+        echo "PASS"
+        PASS=$((PASS + 1))
+    else
+        echo "FAIL"
+        FAIL=$((FAIL + 1))
+        FAILED_TESTS+=("$name")
+    fi
+done
+
+TOTAL=$((PASS + FAIL))
+echo ""
+echo "Results: $PASS/$TOTAL passed, $FAIL failed"
+if [ "$FAIL" -gt 0 ]; then
+    echo "Failed:"
+    for t in "${FAILED_TESTS[@]}"; do
+        echo "  $t"
+    done
+    exit 1
+fi
diff --git a/Testing/settings_dialog_test.xml b/Testing/settings_dialog_test.xml
new file mode 100644
index 000000000..2dd9dda0a
--- /dev/null
+++ b/Testing/settings_dialog_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Open Settings dialog via Cockatrice menu, then close with Escape -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+  <event widget="MainWindow/settingsDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/settings_navigation_test.xml b/Testing/settings_navigation_test.xml
new file mode 100644
index 000000000..c112966e0
--- /dev/null
+++ b/Testing/settings_navigation_test.xml
@@ -0,0 +1,33 @@
+<events>
+    <!--
+        Settings navigation (state assertions).
+
+        Navigates the settings page tree by label, checks that the page stack
+        followed, then filters with the search box and verifies the text landed
+        in the edit — then closes with the OK button.
+    -->
+    <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+    <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+    <event widget="MainWindow" command="pause" arguments="500" />
+
+    <!-- The dialog opens on the first page (General) -->
+    <event widget="MainWindow/settingsDialog/settingsView/pagesContainer/pagesWidget" command="expectProperty" arguments="currentIndex,0" />
+
+    <!-- Navigate to Shortcuts, the last page of the tree -->
+    <event widget="MainWindow/settingsDialog/settingsView/navTree" command="selectItem" arguments="Shortcuts" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/settingsDialog/settingsView/pagesContainer/pagesWidget" command="expectProperty" arguments="currentIndex,7" />
+
+    <!-- ... and back to General -->
+    <event widget="MainWindow/settingsDialog/settingsView/navTree" command="selectItem" arguments="General" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/settingsDialog/settingsView/pagesContainer/pagesWidget" command="expectProperty" arguments="currentIndex,0" />
+
+    <!-- Filters the settings by search term -->
+    <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="typeText" arguments="sound" />
+    <event widget="MainWindow" command="pause" arguments="300" />
+    <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="expectProperty" arguments="text,sound" />
+
+    <!-- Close -->
+    <event widget="MainWindow/settingsDialog/settingsOkButton" command="activate" arguments="" />
+</events>
diff --git a/Testing/settings_search_test.xml b/Testing/settings_search_test.xml
new file mode 100644
index 000000000..ba60251f0
--- /dev/null
+++ b/Testing/settings_search_test.xml
@@ -0,0 +1,13 @@
+<events>
+  <!-- Tier 5: State verification — open Settings, search for a page, close -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+  <!-- Type "sound" in the settings search to filter pages -->
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="115" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="111" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="117" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="110" />
+  <event widget="MainWindow/settingsDialog/settingsView/settingsSearchEdit" command="key" arguments="100" />
+  <!-- Close settings -->
+  <event widget="MainWindow/settingsDialog/settingsOkButton" command="activate" arguments="" />
+</events>
diff --git a/Testing/smoke_test.xml b/Testing/smoke_test.xml
new file mode 100644
index 000000000..a31edbdd4
--- /dev/null
+++ b/Testing/smoke_test.xml
@@ -0,0 +1,8 @@
+<events>
+  <!-- Open Help menu by activating it on the menu bar -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <!-- Click About Cockatrice (opens modal QMessageBox) -->
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;About Cockatrice" />
+  <!-- Close the modal dialog by pressing Escape (Qt::Key_Escape = 16777216) -->
+  <event widget="MainWindow/aboutDialog" command="key" arguments="16777216" />
+</events>
diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake
index 2d74aca4d..7b644276d 100644
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -1,6 +1,6 @@
 # Find a compatible Qt version
 # Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE
-# Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
+# Optional Input: Qt6_DIR -- Directory containing Qt6Config.cmake
 # Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt6
 # Output: SERVATRICE_QT_MODULES
 # Output: COCKATRICE_QT_MODULES
@@ -57,7 +57,17 @@ find_package(
   QUIET HINTS ${Qt6_DIR}
 )
 if(NOT Qt6_FOUND)
-  message(FATAL_ERROR "No suitable version of Qt was found")
+  set(_QT_DIAGNOSTIC "")
+  if(Qt6_NOT_FOUND_MESSAGE)
+    set(_QT_DIAGNOSTIC "\nQt package diagnostic: ${Qt6_NOT_FOUND_MESSAGE}")
+  endif()
+  message(FATAL_ERROR
+          "No suitable version of Qt was found. Qt 6.4.2 or newer with these components is required: "
+          "${REQUIRED_QT_COMPONENTS};Linguist.\n"
+          "Set QTDIR or CMAKE_PREFIX_PATH to the Qt installation prefix, or Qt6_DIR to the directory "
+          "containing Qt6Config.cmake."
+          "${_QT_DIAGNOSTIC}"
+  )
 endif()
 set(COCKATRICE_QT_VERSION_NAME Qt6)
 
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index ae156313d..923aded9d 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -12,10 +12,24 @@ Var NormalDestDir
 Var PortableDestDir
 Var PortableMode
 Var ReinstallMode
-Var AllowForceClose
 Var GuardDir
 Var OldUninstallString
 Var OldInstallDir
+; What ExecWait reported for the previous version's uninstaller, or "missing" /
+; "launch-failed" when RunOldUninstaller could not start it. Read by WaitForOldPayloadToDisappear: an uninstaller that ran in place
+; (_?=) and failed or was cancelled will not remove anything more, however long we wait.
+Var OldUninstallExit
+; Executable path parsed out of $OldUninstallString by ResolveOldUninstallExe. Used to
+; tell an uninstaller that is missing or cannot be started ("missing" / "launch-failed"
+; in $OldUninstallExit) from one that ran and failed.
+Var OldUninstallExe
+; Set to 1 by RemoveOldPayloadLeftovers only when every leftover it is responsible for is
+; gone; WaitForOldPayloadToDisappear aborts while it is still 0.
+Var OldPayloadRemoved
+; Scratch state of AppendUninstallerLog.
+Var UninstLogHandle
+Var UninstLogLine
+Var UninstLogChar
 Var DataBackupDir
 Var DataBackupDone
 Var DataBackupForDir
@@ -27,14 +41,48 @@ Var StaleFindName
 Var DataBackupFindHandle
 Var DataBackupFindName
 Var IsUpgrade
+; Set together by whichever purge block ran: the verdict RetryDllPurge measured
+; and whether a purge ran at all - a portable install into a directory without
+; portable.dat is neither purge block, and the abort below measures it itself.
+Var StaleRuntimeAfterPurge
+Var DllPurgeRan
 Var AbortReason
 ; Diagnostics for a failed purge: the holder probe in LogProcessesUsingInstallDir writes
 ; $HolderOutput (one log line) and sets $HolderFound when it named anything.
 Var HolderExit
 Var HolderOutput
 Var HolderFound
+; What the last RunHolderProbe call answered: its exit code and its line. Kept
+; apart from $HolderExit/$HolderOutput because the guard only wants to know
+; whether the payload is free, while the abort dialog reports what survived.
+Var GuardExit
+Var GuardOutput
+; How many times the guard has asked the payload programs to close by itself. Bounded, and
+; only repeated while the listing changed between rounds (see GuardAppsNotRunning).
+Var GuardCloseRounds
+; The listing the last automatic close was sent against, so a second round is spent only
+; when something actually exited and the rest is worth asking again. Empty before round one.
+Var GuardLastHolders
+; How many times the user asked to check again after closing programs by hand (logged only).
+Var GuardRecheckCount
+; The question CockEndPrompt/CockEndRecheckPrompt assemble: fixed sentences around the
+; probe's line, and the result has to stay inside the characters one NSIS string holds.
+Var GuardPrompt
 Var WaitPid
 Var LauncherExited
+; How long one WaitForSingleObject on the launcher's handle waits before asking the user
+; (see WaitForLauncherToExit). A variable because the first slice is short and the ones
+; after the first question are not.
+Var WaitSlice
+; Whether that handle carries PROCESS_TERMINATE as well as SYNCHRONIZE, and can therefore
+; be ended from the answer the dialog offers. Cleared when only the synchronize right could
+; be had (see WaitForLauncherToExit).
+Var WaitCanEnd
+; How far the launcher wait got with a launcher that has no window to ask: 0 before the
+; first round, 1 after the grace it was given, 2 after it was ended. A launcher whose
+; window is gone has answered its own close and is stuck in shutdown, so the dialog cannot
+; reach it and the wait may end it instead of asking the user (see WaitForLauncherToExit).
+Var WaitWindowless
 Var InstallLogPath
 Var LogHandle
 Var LogMessage
@@ -99,7 +147,10 @@ Page Custom PortableModePageCreate PortableModePageLeave
     Call CockLogWrite
 !macroend
 
-Function CockLogWrite
+; The body is shared because the uninstaller needs its own copy: un.* functions are
+; compiled into a separate binary, and inside one a Call may only name an un. function,
+; so CockLog's Call to CockLogWrite cannot be used there.
+!macro CockLogWriteBody
     Pop $LogMessage
     FileOpen $LogHandle "$InstallLogPath" a
     ${If} $LogHandle == ""
@@ -111,6 +162,20 @@ Function CockLogWrite
     FileSeek $LogHandle 0 END
     FileWrite $LogHandle "$LogMessage$\r$\n"
     FileClose $LogHandle
+!macroend
+
+Function CockLogWrite
+    !insertmacro CockLogWriteBody
+FunctionEnd
+
+; CockLog for un.* code: same lines, prefixed call target.
+!macro CockLogUn text
+    Push "${text}"
+    Call un.CockLogWrite
+!macroend
+
+Function un.CockLogWrite
+    !insertmacro CockLogWriteBody
 FunctionEnd
 
 ; Logs every file matching $INSTDIR\<mask>. Used to record the DLL inventory
@@ -153,6 +218,11 @@ StrCpy $LooseDeckNoticeShown ""
 ; No old install location resolved yet; Backup/Restore fall back to $INSTDIR
 ; when this is empty (the /R path where $INSTDIR already is the old dir).
 StrCpy $OldInstallDir ""
+StrCpy $OldUninstallExit ""
+; No purge has run and nothing has been measured yet. The section sets both
+; after a purge, or measures the directory itself when neither purge applies.
+StrCpy $StaleRuntimeAfterPurge 0
+StrCpy $DllPurgeRan 0
 ; Start each run from a clean file so the log that gets sent back is the last
 ; run, not every past run glued together.
 FileOpen $LogHandle "$InstallLogPath" w
@@ -219,10 +289,10 @@ ${EndIf}
 ; /PID= carries the process id of the application that started this installer.
 ; The in-app updater launches the installer and only then quits itself, so
 ; without it the installer has to guess whether the launching process is still
-; alive by polling powershell.exe for an image name - a guess that can come back
-; "not running" or "could not determine" while the process is very much alive and
-; still has its Qt DLLs mapped. An older client does not pass /PID= and an older
-; installer ignores it, so both sides of the pair have to keep working.
+; alive from the files it still has open - a guess that can come back "nothing
+; is holding them" while the client is very much alive and still has its Qt DLLs
+; mapped. An older client does not pass /PID= and an older installer ignores it,
+; so both sides of the pair have to keep working.
 ; Note that /D= must stay the last parameter on the command line, which is why
 ; the client puts it last and this one anywhere.
 StrCpy $WaitPid ""
@@ -260,18 +330,16 @@ ${Else}
 ${EndIf}
 
 ; Wait for the process that launched this installer to exit before anything is
-; replaced or deleted. It goes first because it is the one check here that needs
-; no powershell.exe: on a machine where the process lookup cannot run at all, the
-; launcher is still proven gone here instead of the whole upgrade being cancelled
-; by a check that was only ever a proxy for this one.
+; replaced or deleted. It goes first because a real handle on that process is
+; authority: the holder probe that follows asks the same question indirectly, by
+; looking at which files are still open.
 ;
 ; Then make sure no *other* application instance is still running (and holding
-; file locks) before the previous version is uninstalled. On a silent update
-; (/R /S) the running processes are asked to close gracefully and waited for;
-; Cockatrice itself is never force-killed (data loss, e.g. an unsaved deck) so the
-; update is aborted instead, while the console applications Oracle and Servatrice
-; are force-stopped by PID once the grace period is over. On interactive installs
-; the user is prompted to close them instead.
+; file locks) before the previous version is uninstalled. The probe names them
+; and the user is asked to close them; nothing is force-stopped without that
+; answer, because Cockatrice may hold an unsaved deck and Oracle writes the card
+; database in place. On /R the old version is about to be removed, so an answer
+; the probe cannot give cancels the upgrade before it starts rather than after it.
 ; Only needed this early for /R, where AutoUninstallIfNeeded runs below; for
 ; interactive installs the section re-checks after the directory page, when
 ; $INSTDIR is the directory the user actually picked.
@@ -295,6 +363,14 @@ ${If} ${NSIS_IS_64_BIT} == 1
     SetRegView 64
 ${EndIf}
 
+; The uninstaller logs to its own file: the installer truncates its log on every run, so
+; sharing one would mean either side erasing the other's account of a failed upgrade.
+StrCpy $InstallLogPath "$TEMP\Cockatrice-uninstaller.log"
+FileOpen $LogHandle "$InstallLogPath" w
+FileClose $LogHandle
+!insertmacro CockLogUn "=================================================================="
+!insertmacro CockLogUn "uninstaller start: @CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@ dir=$INSTDIR"
+
 ; Ensure no application instance is still running before removing files.
 Call un.EnsureAppsNotRunning
 
@@ -325,6 +401,61 @@ ${If} $ReinstallMode = 1
 ${EndIf}
 FunctionEnd
 
+; Sets $OldUninstallExe to the executable named in $OldUninstallString (everything up to
+; and including the first ".exe", without a leading quote), or "" when there is none.
+Function ResolveOldUninstallExe
+    Push $R7
+    Push $R8
+    StrLen $R8 $OldUninstallString
+    StrCpy $R7 0
+    roue_loop:
+    ${If} $R7 >= $R8
+        StrCpy $OldUninstallExe ""
+        Goto roue_out
+    ${EndIf}
+    StrCpy $OldUninstallExe $OldUninstallString 4 $R7
+    ${If} $OldUninstallExe == ".exe"
+        IntOp $R7 $R7 + 4
+        StrCpy $OldUninstallExe $OldUninstallString $R7
+        StrCpy $R8 $OldUninstallExe 1
+        ${If} $R8 == '"'
+            StrCpy $OldUninstallExe $OldUninstallExe "" 1
+        ${EndIf}
+        Goto roue_out
+    ${EndIf}
+    IntOp $R7 $R7 + 1
+    Goto roue_loop
+    roue_out:
+    Pop $R8
+    Pop $R7
+FunctionEnd
+
+; Runs "$OldUninstallString _?=$OldInstallDir" in place and sets $OldUninstallExit:
+; the uninstaller's own exit code when it ran, "missing" when the executable the
+; registry names does not exist, "launch-failed" when ExecWait could not start it.
+; The last two used to leave the code empty, which WaitForOldPayloadToDisappear read
+; as a cancelled uninstall and aborted on, although nobody had cancelled anything.
+; Uses $R5 for the exit code, as the callers did before.
+Function RunOldUninstaller
+    Call ResolveOldUninstallExe
+    StrCpy $R5 ""
+    ${If} $OldUninstallExe == ""
+    ${OrIfNot} ${FileExists} "$OldUninstallExe"
+        StrCpy $OldUninstallExit "missing"
+        !insertmacro CockLog "old uninstall: uninstaller '$OldUninstallExe' does not exist (command '$OldUninstallString')"
+        Return
+    ${EndIf}
+    ClearErrors
+    ExecWait '$OldUninstallString _?=$OldInstallDir' $R5
+    ${If} ${Errors}
+    ${OrIf} $R5 == ""
+        StrCpy $OldUninstallExit "launch-failed"
+        !insertmacro CockLog "old uninstall: could not start '$OldUninstallString _?=$OldInstallDir'"
+        Return
+    ${EndIf}
+    StrCpy $OldUninstallExit $R5
+FunctionEnd
+
 Function AutoUninstallIfNeeded
 
 SetShellVarContext all
@@ -349,7 +480,10 @@ StrCpy $OldInstallDir $INSTDIR
 StrCmp $R0 "" done32
 DetailPrint "Removing previous version (32-bit)..."
 Call BackupUserDataBeforeUninstall
-ExecWait '$R0 _?=$OldInstallDir'
+StrCpy $OldUninstallString $R0
+Call RunOldUninstaller
+!insertmacro CockLog "uninstall (32-bit): exit=$OldUninstallExit"
+Call WaitForOldPayloadToDisappear
 Call RestoreUserDataAfterUninstall
 
 done32:
@@ -364,7 +498,10 @@ ${If} ${RunningX64}
     StrCmp $R0 "" done64
     DetailPrint "Removing previous version (64-bit)..."
     Call BackupUserDataBeforeUninstall
-    ExecWait '$R0 _?=$OldInstallDir'
+    StrCpy $OldUninstallString $R0
+    Call RunOldUninstaller
+    !insertmacro CockLog "uninstall (64-bit): exit=$OldUninstallExit"
+    Call WaitForOldPayloadToDisappear
     Call RestoreUserDataAfterUninstall
 
     done64:
@@ -372,6 +509,192 @@ ${EndIf}
 
 FunctionEnd
 
+; Waits for the previous installation's payload to be gone, so the sections below never
+; write into a directory an old uninstaller is still emptying.
+;
+; ExecWait only waits for as long as the uninstaller runs in place: an NSIS uninstaller
+; that did not get a usable _?= copies itself to %TEMP%, starts that copy and exits, so
+; ExecWait returns at once while the copy keeps deleting - and it finishes after this
+; window has closed, removing the version that was just installed. Waiting for
+; cockatrice.exe to disappear covers both cases, and stops with a message instead of
+;
+; When the payload is still there after the wait, $OldUninstallExit decides: a non-zero
+; code means the uninstaller was cancelled or failed, and the install aborts saying so.
+; A zero code means it finished but skipped files someone was holding (NSIS Delete does
+; that silently), so RemoveOldPayloadLeftovers frees and removes them, and the install
+; only aborts - naming the holders - when even that fails.
+; installing over a directory that is still being emptied.
+Function WaitForOldPayloadToDisappear
+${If} $OldInstallDir == ""
+    Return
+${EndIf}
+; The registered uninstaller could not be run at all (missing, or ExecWait could not
+; start it): nothing is going to empty the directory, so waiting is pointless and
+; aborting as "cancelled" was wrong. Remove the previous payload the same way the
+; skipped-files recovery below does, and abort - naming why - only if that fails.
+${If} $OldUninstallExit == "missing"
+${OrIf} $OldUninstallExit == "launch-failed"
+    ${IfNot} ${FileExists} "$OldInstallDir\*.*"
+        !insertmacro CockLog "old uninstall: uninstaller $OldUninstallExit and $OldInstallDir is already gone"
+        Return
+    ${EndIf}
+    !insertmacro CockLog "old uninstall: uninstaller $OldUninstallExit ('$OldUninstallString'); removing $OldInstallDir payload directly"
+    Call AppendUninstallerLog
+    Call RemoveOldPayloadLeftovers
+    ${If} $OldPayloadRemoved != "1"
+        StrCpy $AbortReason \
+            "The previous version in $OldInstallDir could not be removed: its uninstaller ($OldUninstallExe) could not be run ($OldUninstallExit), and removing the files directly failed.$\r$\n$\r$\nStill in use by: $HolderOutput$\r$\n$\r$\nClose anything still using those files and run this installer again."
+        Call RestoreUserDataAfterUninstall
+        Call AbortInstall
+    ${EndIf}
+    !insertmacro CockLog "old uninstall: continuing after removing the payload of an uninstaller that could not run"
+    Return
+${EndIf}
+StrCpy $R2 0
+old_uninstall_wait:
+IfFileExists "$OldInstallDir\cockatrice.exe" 0 old_uninstall_gone
+IntOp $R2 $R2 + 1
+${If} $R2 > 60
+    !insertmacro CockLog "old uninstall: $OldInstallDir still holds cockatrice.exe after 30 s (uninstaller exit=$OldUninstallExit)"
+    ; The uninstaller's own account of what it skipped or why it stopped lives in its
+    ; separate log; copy it here so the report sent from AbortInstall carries it.
+    Call AppendUninstallerLog
+    ${If} $OldUninstallExit != "0"
+        ; Cancelled or failed with a non-zero exit code (an uninstaller that could not be
+        ; started is handled above): the old version was not meant to be removed, so
+        ; nothing is deleted on its behalf.
+        StrCpy $AbortReason \
+            "The previous version in $OldInstallDir is still there because its uninstaller was cancelled or failed (exit code '$OldUninstallExit').$\r$\n$\r$\nClose anything still using those files and run this installer again."
+        ; The backup was taken before the uninstaller ran; an abort must not leave the
+        ; only copy of the user data in %TEMP%, where the next run clears it.
+        Call RestoreUserDataAfterUninstall
+        Call AbortInstall
+    ${EndIf}
+    ; The uninstaller finished but skipped files - a running instance or a scanner holding
+    ; them, which NSIS Delete passes over silently. Free them and remove what is left.
+    Call RemoveOldPayloadLeftovers
+    ; The removal reports success only when every payload executable is gone and the
+    ; DLL/Plugins purge came back clean; cockatrice.exe alone would hide a locked
+    ; oracle.exe or a stale DLL the new payload is about to be written over.
+    ${If} $OldPayloadRemoved != "1"
+        StrCpy $AbortReason \
+            "The previous version in $OldInstallDir could not be fully removed after its uninstaller ran.$\r$\n$\r$\nStill in use by: $HolderOutput$\r$\n$\r$\nClose anything still using those files and run this installer again."
+        Call RestoreUserDataAfterUninstall
+        Call AbortInstall
+    ${EndIf}
+    ; The payload is gone and ExecWait already waited for the uninstaller; keep the
+    ; short settle the other paths use, then hand back to the caller's restore.
+    Sleep 1000
+    !insertmacro CockLog "old uninstall: continuing after removing the leftovers the uninstaller skipped"
+    Return
+${EndIf}
+Sleep 500
+Goto old_uninstall_wait
+old_uninstall_gone:
+${If} $R2 > 0
+    ; ExecWait returned while the old payload was still there: that uninstaller
+    ; copied itself to %TEMP%, and the copy is still working through its file list.
+    ; cockatrice.exe is gone before the rest of it, so let the copy settle before
+    ; the sections below start writing files it would otherwise remove.
+    Sleep 1000
+    !insertmacro CockLog "old uninstall: ExecWait returned early, settled 1 s after $R2 * 500 ms"
+${Else}
+    !insertmacro CockLog "old uninstall: $OldInstallDir was already clear when ExecWait returned"
+${EndIf}
+Return
+FunctionEnd
+
+; Called when the old uninstaller exited successfully but left its payload behind, or
+; could not be run at all (missing or not startable) and the payload is still there.
+; Frees the files the same way the guard does (close, then offer to end), deletes what
+; the uninstaller skipped, and on failure records which files survived and who holds
+; them in $HolderOutput, for the abort message. Sets $OldPayloadRemoved to 1 only when
+; every payload executable is gone and the DLL/Plugins purge is clean.
+Function RemoveOldPayloadLeftovers
+    !insertmacro CockLog "old uninstall: removing leftovers of $OldInstallDir"
+    StrCpy $OldPayloadRemoved 0
+    StrCpy $HolderOutput "nothing could be named"
+    StrCpy $GuardDir $OldInstallDir
+    Call GuardAppsNotRunning
+    ; The purge helpers work on $INSTDIR; point them at the old directory for the
+    ; duration (on /R the two are the same anyway).
+    Push $INSTDIR
+    StrCpy $INSTDIR $OldInstallDir
+    StrCpy $R2 0
+    rop_loop:
+    SetFileAttributes "$INSTDIR\cockatrice.exe" NORMAL
+    SetFileAttributes "$INSTDIR\oracle.exe" NORMAL
+    SetFileAttributes "$INSTDIR\servatrice.exe" NORMAL
+    Delete "$INSTDIR\cockatrice.exe"
+    Delete "$INSTDIR\oracle.exe"
+    Delete "$INSTDIR\servatrice.exe"
+    Delete "$INSTDIR\qt.conf"
+    Call RetryDllPurge
+    ; $R0 is RetryDllPurge's verdict (1 = a DLL or the Plugins directory survived).
+    ; Every payload executable has to be gone as well: a locked oracle.exe or
+    ; servatrice.exe is just as fatal to the install that follows as cockatrice.exe.
+    IfFileExists "$INSTDIR\cockatrice.exe" rop_retry
+    IfFileExists "$INSTDIR\oracle.exe" rop_retry
+    IfFileExists "$INSTDIR\servatrice.exe" rop_retry
+    ${If} $R0 == 0
+        Goto rop_done
+    ${EndIf}
+    rop_retry:
+    IntOp $R2 $R2 + 1
+    ${If} $R2 < 3
+        !insertmacro CockLog "old uninstall: leftovers of $OldInstallDir survived removal attempt $R2, retrying in 2 s"
+        Sleep 2000
+        Goto rop_loop
+    ${EndIf}
+    !insertmacro CockLog "old uninstall: leftovers of $OldInstallDir still present after 3 removal attempts"
+    !insertmacro CockLogListing "old-leftovers" "*.*"
+    ; Per-file Windows codes for the DLLs plus the holder probe's line ($HolderOutput).
+    Call LogStaleRuntimeDiagnostics
+    Pop $INSTDIR
+    Return
+    rop_done:
+    StrCpy $OldPayloadRemoved 1
+    ; Only now that the recovery has succeeded: deleting the old uninstaller on a
+    ; failed attempt would leave a directory whose UninstallString points at nothing,
+    ; so no later run could remove it. WriteUninstaller recreates it on success anyway.
+    SetFileAttributes "$INSTDIR\uninstall.exe" NORMAL
+    Delete "$INSTDIR\uninstall.exe"
+    !insertmacro CockLog "old uninstall: leftovers of $OldInstallDir removed"
+    !insertmacro CockLogListing "old-leftovers-after-removal" "*.*"
+    Pop $INSTDIR
+FunctionEnd
+
+; Copies the old uninstaller's log ($TEMP\Cockatrice-uninstaller.log) into this
+; installer's log, so the report AbortInstall sends shows what the uninstaller did.
+; Uninstallers older than this log simply have no file; that is logged too.
+Function AppendUninstallerLog
+    ClearErrors
+    FileOpen $UninstLogHandle "$TEMP\Cockatrice-uninstaller.log" r
+    ${If} ${Errors}
+    ${OrIf} $UninstLogHandle == ""
+        !insertmacro CockLog "uninstaller log: not found at $TEMP\Cockatrice-uninstaller.log"
+        Return
+    ${EndIf}
+    !insertmacro CockLog "uninstaller log begin ----------------------------------------"
+    aul_loop:
+    ClearErrors
+    FileRead $UninstLogHandle $UninstLogLine
+    IfErrors aul_done
+    ; Strip the line break FileRead keeps, so CockLog does not double it.
+    aul_trim:
+    StrCpy $R9 $UninstLogLine 1 -1
+    ${If} $R9 == "$\n"
+    ${OrIf} $R9 == "$\r"
+        StrCpy $UninstLogLine $UninstLogLine -1
+        Goto aul_trim
+    ${EndIf}
+    !insertmacro CockLog "uninstaller: $UninstLogLine"
+    Goto aul_loop
+    aul_done:
+    FileClose $UninstLogHandle
+    !insertmacro CockLog "uninstaller log end ------------------------------------------"
+FunctionEnd
+
 ; BackupUserDataBeforeUninstall / RestoreUserDataAfterUninstall
 ;
 ; The uninstallers shipped in 3.1.0/3.1.1 run a blanket "RMDir /r $INSTDIR".
@@ -673,222 +996,337 @@ FunctionEnd
 ; "The procedure entry point X could not be located in the dynamic link
 ; library ...Qt6Network.dll" on the next start.
 ;
-; On a silent update (/R /S) matching processes are asked to close gracefully
-; (WM_CLOSE) and waited for up to 60 s. Cockatrice is never force-stopped: it
-; may be holding an unsaved deck or showing a "really leave this game?"
-; confirmation, so if it refuses to close the install is aborted - nothing has
-; been replaced yet, so the update is simply deferred. Oracle and Servatrice
-; are console applications without a main window, so CloseMainWindow() does
-; nothing for them and waiting cannot help; they hold no unsaved user data and
-; are force-stopped by PID once the grace period is over. On interactive
-; installs and uninstalls the user is prompted to close them instead.
+; Both questions this installer has about running processes - "may I replace
+; the payload?" and "what is holding this file I could not delete?" - are
+; answered by tools/installer-holder-probe, a small executable built from this
+; repository and embedded in the installer and the uninstaller alike. It names
+; every process and service that has one of the payload files open or mapped
+; (the Restart Manager, RmRegisterResources/RmGetList) and, separately, every
+; payload program whose image lies in the directory being replaced rather than
+; in a folder below it.
 ;
-; Processes are matched by image name AND by their executable path living
-; under the guarded directory ($GuardDir, normally $INSTDIR), so unrelated
-; processes that merely share an image name (e.g. the Oracle DB instance
-; "oracle.exe") are never touched.
+; The second lookup is not redundant. Restart Manager answers "who has this
+; file open", and a running instance does not have to have one open: its own
+; image and the modules it loaded are mapped into it rather than opened by it,
+; and a mapped image is not reliably reported. That is the state the failed
+; updates this probe exists for were in - every DLL still on disk, an instance
+; running from the directory, and "nothing is holding them any more" as the
+; answer. A guard built on file handles alone therefore misses exactly the
+; instance it exists to find; it would pass, the purge would fail, and the
+; install would end in a warning with no offer to close and try again.
+;
+; Why not enumerate processes from this script: the NSIS stub is a 32-bit
+; process, so a bare "powershell" started from it is the 32-bit Windows
+; PowerShell, whose Get-Process cannot read the path of a 64-bit process. A
+; guard built on that misses exactly the running instance it exists to find.
+; The probe opens each process with PROCESS_QUERY_LIMITED_INFORMATION and calls
+; QueryFullProcessImageNameW, which has no bitness mismatch, and Restart
+; Manager is a system API rather than a view of this process's architecture.
+;
+; The files that count are the payload the purge removes and the installer
+; replaces: the three executables, the top-level DLLs, qt.conf and everything
+; below Plugins. A document, a log or a screenshot the user happens to have
+; open in the install directory is not part of it and cannot block an upgrade;
+; the image lookup matches on the directory a process runs from, so it does not
+; widen that set.
+;
+; Nothing is force-stopped without the user asking for it: Cockatrice may be holding
+; an unsaved deck or showing a "really leave this game?" confirmation, Oracle writes
+; the card database in place and can be killed mid-write, and Servatrice may be serving
+; a game. A close is a request, made automatically because that is what the user started
+; the installer to do: the probe first asks every instance over its local socket, which
+; reaches a hidden window and an instance sitting on its own confirmation, and falls back
+; to WM_CLOSE for an older client. The automatic close is retried while the set of holders
+; changes, so one instance exiting does not leave the next one unasked. When a close is
+; still not answered the user is told which program is in the way and is offered to force
+; close all three, check again after closing them by hand, or abort - the last resort, with
+; what it costs spelled out in the prompt.
 
-; usage: set $R2 to the base image name (without extension, e.g. "cockatrice",
-;        as accepted by Get-Process -Name), call this, result in $R0
-;        (1 = running from $GuardDir, 0 = not running, 2 = could not determine)
-Function IsAppRunning
-    ; Every caller has to set $GuardDir; an empty one would make the path check
-    ; below match every process that merely shares the image name, which is the
-    ; opposite of what this guard is for.
-    ${If} $GuardDir == ""
-        StrCpy $R0 2
-        Return
-    ${EndIf}
-    ; Pass the directory to guard to PowerShell via an environment variable so
-    ; it never has to be embedded into the -Command string: apostrophes in a
-    ; path would terminate the command early, and the path in a -like pattern
-    ; would treat [ and ] as wildcard characters.
-    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
-    ; Exit the process explicitly so nsExec's pop reflects whether a matching
-    ; process was found: powershell.exe exits 0 whether or not the pipeline
-    ; produced objects. 0 = not running, 1 = running, anything else = could not
-    ; be determined (see IsProcessLookupAvailable).
-    ; A process is only a match when its path is readable and lives under
-    ; $GuardDir. A process we cannot inspect is not one of ours: the updater is
-    ; always started by the application it updates, so it runs in the same user
-    ; session, and an interactive install is elevated and can read the paths of
-    ; the user's own processes. Assuming a match instead would be a hard stop
-    ; rather than a fail-closed guard - an Oracle database instance running as
-    ; SYSTEM has a process named "oracle" whose path raises Access denied, and
-    ; that would make every silent update abort and every interactive install
-    ; loop on the Retry prompt with no way out but Cancel.
-    nsExec::ExecToLog 'powershell -NoProfile -Command "if (Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | Select-Object -First 1) { exit 1 } else { exit 0 }"'
-    Pop $R0
-    ${If} $R0 == "0"
-        StrCpy $R0 0
-    ${ElseIf} $R0 == "1"
-        StrCpy $R0 1
-    ${Else}
-        ; powershell.exe could not be run at all (nsExec pushes the string
-        ; "error"), or died with an unexpected code. That is "could not
-        ; determine", which has to stay distinguishable from "definitely
-        ; running": a state that can never clear would block the installer
-        ; forever. IsProcessLookupAvailable warns about that case once.
-        StrCpy $R0 2
-    ${EndIf}
+; One sentence for every prompt whose Yes ends the whole set, so that answer reads the same
+; wherever the user meets it: this guard before anything is replaced, the uninstaller's, and
+; the recovery prompt after a failed purge.
+!define END_COST "An unsaved deck, a running game or an unwritten setting is lost, Servatrice drops its players, and an Oracle that is mid-write can damage the card database."
+
+; What the user does instead when they say no: the prompt's other answer stops the run, so they
+; are told how to get past the same wall next time. Also used by the abort dialogs, which is
+; where the answer to "why did it stop" ends up.
+!define AFTER_CLOSING_GUIDANCE "Answer the confirmation Cockatrice may be showing - open it from the notification area if it is hidden there - and use Task Manager for a program that would not end."
+
+; The escape hatch for a user who would rather not force-close anything: the same release,
+; downloaded and run by hand once Cockatrice is closed. Every abort dialog shows this and
+; offers to open the page, so an update that cannot free the files still leaves the user a
+; way forward that does not end in Task Manager.
+!define LATEST_RELEASE_URL "https://github.com/Cockatrice/Cockatrice/releases/latest"
+!define MANUAL_UPDATE_GUIDANCE "To update safely instead, close Cockatrice and download the latest installer from:$\r$\n${LATEST_RELEASE_URL}$\r$\nThen run it manually."
+
+; usage: set the variable named by the second argument to the probe's listing, then call
+; this. Sets $GuardPrompt to the question the guard and the recovery path ask.
+;
+; One macro rather than three copies, because the wording is a promise: Yes ends the
+; programs the payload installs - which is exactly the set EndHolders acts on - and anything
+; else the probe named has to be closed by hand, so a listing that includes a scanner or a
+; service hosted elsewhere does not come with an answer that cannot do what it says.
+;
+; Two answers, one of each: the automatic close already ran when this is asked, so Yes is the
+; only thing left that can free the files and No stops the run. The guard itself uses
+; CockEndRecheckPrompt instead, whose No checks again; this one stays for the recovery path,
+; where a retry cannot change anything because the purge was already retried.
+;
+; The assembled string has to fit the characters one NSIS string holds, which is what
+; bounds HOLDER_LINE_CHAR_MAX in tools\installer-holder-probe\holder_line.h: with the
+; longest listing that can arrive it stays inside that budget instead of being cut off at
+; the tail, where the cancel line is.
+;
+; @param header the sentence that introduces the listing, with its trailing colon
+; @param listing the variable holding the probe's line, $GuardOutput or $HolderOutput
+; @param cancelWord what No gives up, "installation" or "uninstallation"
+!macro CockEndPrompt header listing cancelWord
+    StrCpy $GuardPrompt "${header}$\r$\n$\r$\n${listing}"
+    StrCpy $GuardPrompt "$GuardPrompt$\r$\n$\r$\nChoose Yes to force close the Cockatrice, Oracle and Servatrice programs listed above. ${END_COST}$\r$\n$\r$\nChoose No to cancel the ${cancelWord}. ${AFTER_CLOSING_GUIDANCE}"
+!macroend
+
+; usage: like CockEndPrompt, for a MB_YESNOCANCEL question whose No checks again.
+;
+; The automatic close has already run, so the three answers are what is left: force close
+; the programs the payload installs (Yes), close them by hand and check again (No), or stop
+; the run (Cancel). No used to be the only alternative to ending them, which meant a user who
+; would rather close the instance themselves had to abandon the update and start the
+; installer again. The listing the question is asked with is refreshed on every pass, so the
+; question changes as programs go away instead of repeating itself word for word.
+;
+; The manual-update guidance lives in the abort dialog, which is where a Cancel ends up, not
+; in this prompt. With the longest listing HOLDER_LINE_CHAR_MAX allows, the assembled string
+; stays under 900 characters, inside the 1024 one NSIS string holds, so the Cancel line is
+; never the part that gets cut off.
+;
+; @param header the sentence that introduces the listing, with its trailing colon
+; @param listing the variable holding the probe's line, $GuardOutput
+; @param cancelWord what Cancel gives up, "installation" or "uninstallation"
+!macro CockEndRecheckPrompt header listing cancelWord
+    StrCpy $GuardPrompt "${header}$\r$\n$\r$\n${listing}"
+    StrCpy $GuardPrompt "$GuardPrompt$\r$\n$\r$\nChoose Yes to force close the Cockatrice, Oracle and Servatrice programs listed above. ${END_COST}$\r$\n$\r$\nChoose No to close them yourself, then check again - answer the confirmation Cockatrice may be showing, and open it from the notification area if it is hidden there.$\r$\n$\r$\nChoose Cancel to abort the ${cancelWord}."
+!macroend
+
+; Emitted once for the installer and once for the uninstaller: the uninstaller
+; cannot call installer functions, and its own copy of the probe keeps a running
+; 64-bit instance from being missed there too.
+!macro CockHolderProbeFunctions prefix tag
+Function ${prefix}ExtractHolderProbe
+    InitPluginsDir
+    IfFileExists "$PLUGINSDIR\installer-holder-probe.exe" ck_probe_ready_${tag}
+        File "/oname=$PLUGINSDIR\installer-holder-probe.exe" "..\..\..\installer-holder-probe.exe"
+    ck_probe_ready_${tag}:
 FunctionEnd
 
-; Sets $R0 to 1 if PowerShell can be started at all, 0 if it cannot. The
-; running instance check is built on top of it, so a machine where
-; powershell.exe is missing, blocked by policy or refused by antivirus is
-; reported once instead of being reported as "Cockatrice is running" on every
-; single check.
-Function IsProcessLookupAvailable
-    nsExec::ExecToLog 'powershell -NoProfile -Command "exit 0"'
-    Pop $R0
-    ${If} $R0 == "0"
-        StrCpy $R0 1
-    ${Else}
-        StrCpy $R0 0
-    ${EndIf}
+; usage: set $GuardDir to the directory to check, then call this. Sets
+; $GuardExit to the probe's exit code and $GuardOutput to its one-line answer.
+; 0 = nothing holds the payload and no payload program runs from the directory, 1 = the
+; line names what does, anything else = the probe could not answer (2 = no
+; directory was given, 3 = no payload program was named but one refuses to be replaced, or
+; the Restart Manager call failed and no payload program runs from the directory either,
+; "timeout" = it did not return in time).
+Function ${prefix}RunHolderProbe
+    Call ${prefix}ExtractHolderProbe
+    ; The directory travels in an environment variable, never on the command
+    ; line: a path with spaces, quotes or a trailing backslash then does not
+    ; have to survive NSIS quoting.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    ; /TIMEOUT because this can run before the first page: a Restart Manager
+    ; that does not answer must not leave the installer with no window and no
+    ; way out.
+    nsExec::ExecToStack /TIMEOUT=20000 '"$PLUGINSDIR\installer-holder-probe.exe"'
+    Pop $GuardExit
+    Pop $GuardOutput
 FunctionEnd
 
-Function CloseMatchingApps
-    ; gracefully ask every matching instance to close (sends WM_CLOSE)
-    ;
-    ; The filter here is deliberately the strict one: a process is only asked to
-    ; close when its path is readable and lives under $GuardDir. Treating a
-    ; process whose path cannot be read (an unrelated oracle.exe / servatrice.exe,
-    ; or one owned by another account running as SYSTEM) as a match would make
-    ; the installer close a third party application, and it runs elevated, so
-    ; CloseMainWindow() would succeed on it.
+; usage: set $GuardDir to the directory being replaced, then call this. Asks the running
+; Cockatrice to close, and waits for it to exit.
+;
+; The set is what the probe names: the processes holding a file of the version being
+; replaced, plus the payload programs running from the directory itself. The probe
+; closes that set by pid, which is why nothing here has to match an executable path. Only
+; cockatrice.exe is asked: Oracle writes the card database in place and Servatrice has no
+; window to ask, so both are left alone here and only ended by the explicit answer.
+;
+; Each instance is asked to close over the local socket it listens on, which is the same
+; request as clicking its close button and reaches one whose window is hidden in the
+; notification area or is sitting on its own confirmation. A client from before that socket
+; is asked with WM_CLOSE on its own window instead, and a visible window is brought forward
+; first. Either way the close is answered, not obeyed - Cockatrice asks before it quits while
+; a card database update is running, a game is open or a deck is unsaved - and that question
+; is only useful if it is in front of the installer instead of behind it.
+;
+; The probe waits up to 30 s for the processes it asked to exit, so the check that follows
+; measures a settled directory rather than sleeping for a fixed time. Its line goes into the
+; log as it stands: it names every holder, including the ones left to the user, so a close
+; that did nothing can be told apart from one that was never sent.
+;
+; Never a force-close here: the application decides whether to quit. Ending is a separate
+; answer the guard prompt offers when a close did not free the files, spelled out with what
+; it costs - see EndHolders - and it ends every program the payload installs.
+Function ${prefix}CloseHolders
+    Call ${prefix}ExtractHolderProbe
     System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
-    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { $$null = $$_.CloseMainWindow() }"'
+    ; The probe waits 30 s itself. The timeout here only bounds a probe that never returns;
+    ; the Restart Manager call inside it is the same one the holder listing makes.
+    nsExec::ExecToStack /TIMEOUT=40000 '"$PLUGINSDIR\installer-holder-probe.exe" --close-holders'
     Pop $R3
+    Pop $R4
+    ; Not the CockLog macro: this function exists twice and the uninstaller copy may only
+    ; Call un. functions, so the macro's two lines are spelled with the prefix here.
+    Push "close-holders: probe exit=$R3 [$R4]"
+    Call ${prefix}CockLogWrite
+    DetailPrint "Closing Cockatrice: $R4"
 FunctionEnd
 
-Function ForceCloseApps
-    ; stop the matching instances by PID once the grace period is over. Only
-    ; used for the console applications ($AllowForceClose), which have no window
-    ; to close and hold no unsaved user data. Same strict filter as above.
+; usage: set $GuardDir to the directory being replaced, then call this. Ends the running
+; Cockatrice, Oracle and Servatrice instances the probe names.
+;
+; This is the only place anything is stopped without being asked to stop, so it is only
+; reached after the user picked it from a prompt that says what it costs: a client that is
+; still running may have an unsaved deck, a game or a settings write in flight, Oracle may
+; be part-way through writing the card database, and Servatrice may be serving a game. The
+; probe ends the three programs the payload installs, services included, and nothing else:
+; a scanner or a program the user keeps in the directory is named and left to the user.
+Function ${prefix}EndHolders
+    Call ${prefix}ExtractHolderProbe
     System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
-    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { Stop-Process -Id $$_.Id -Force -ErrorAction SilentlyContinue }"'
+    ; The probe waits up to 5 s for what it ended to be gone, so the check that follows
+    ; measures a settled directory instead of racing the processes it just terminated.
+    nsExec::ExecToStack /TIMEOUT=20000 '"$PLUGINSDIR\installer-holder-probe.exe" --end-holders'
     Pop $R3
+    Pop $R4
+    Push "end-holders: probe exit=$R3 [$R4]"
+    Call ${prefix}CockLogWrite
+    DetailPrint "Ending Cockatrice, Oracle and Servatrice: $R4"
 FunctionEnd
+!macroend
 
-Function WaitForAppToClose
-    ; usage: set $R1 to the display name (e.g. "cockatrice.exe") and $R2 to the
-    ; base image name (e.g. "cockatrice")
-    Call IsAppRunning
-    !insertmacro CockLog "guard $R1: state=$R0 (dir=$GuardDir)"
-    ; Only a definite "running" is worth waiting for. "Not running" is done, and
-    ; "could not determine" must not keep the installer waiting on an answer it
-    ; will never get - but it cannot simply be waved through either, see
-    ; HandleUnknownAppState.
-    ${If} $R0 = 0
+!insertmacro CockHolderProbeFunctions "" install
+!insertmacro CockHolderProbeFunctions "un." uninstall
+
+; usage: set $GuardDir to the directory to guard, then call this.
+;
+; Asks Cockatrice to close once, then asks one question with one answer that can free the
+; payload. The automatic close is the same request clicking the window's close button makes,
+; so the common case - the client was still shutting down - never turns into a question. The
+; prompt is what remains when the close cannot reach everything: Oracle writes the card
+; database in place, Servatrice has no window, and a client that is sitting on its own
+; confirmation needs an answer nobody can give it from here. It offers to end the programs
+; the payload installs - and only those, which the text says - with what that costs (Yes),
+; and its other answer stops the install (No) instead of repeating the same dialog. What
+; survives an end is reported in the abort, never asked about again - ending is the last
+; resort, see EndHolders.
+;
+; An error is always shown, in every mode. A /S install without /R has nobody at
+; the keyboard, but this installer does not promise unattended runs: when an
+; error needs a decision, asking for one is better than silently leaving a
+; half-updated install behind. The happy path has no dialog, so a /S reinstall
+; that has nothing to report stays silent.
+Function GuardAppsNotRunning
+    !insertmacro CockLog "guard: checking $GuardDir (launcherExited=$LauncherExited)"
+    StrCpy $GuardCloseRounds 0
+    StrCpy $GuardRecheckCount 0
+    StrCpy $GuardLastHolders ""
+    guard_check:
+    Call RunHolderProbe
+    ${If} $GuardExit == "0"
+        !insertmacro CockLog "guard: nothing is holding the payload"
+        DetailPrint "No running Cockatrice, Oracle or Servatrice instance was found."
         Return
     ${EndIf}
-    ${If} $R0 = 2
-        Call HandleUnknownAppState
-        Return
-    ${EndIf}
-
-    ${If} ${Silent}
-        ; ask the application to close gracefully (WM_CLOSE), then wait for it to exit
-        DetailPrint "Closing $R1 ..."
-        Call CloseMatchingApps
-        ; wall-clock deadline: each poll has to spawn a fresh powershell.exe, so
-        ; a bare loop counter would not bound the real wait time to 60 s.
-        System::Call 'kernel32::GetTickCount()i.s'
-        Pop $R8
-        ck_wait_loop:
-        Sleep 500
-        Call IsAppRunning
-        ${If} $R0 = 0
-            !insertmacro CockLog "guard $R1: closed gracefully"
-            DetailPrint "$R1 closed."
+    ${If} $GuardExit == "1"
+        !insertmacro CockLog "guard: still in use by $GuardOutput"
+        ; Close it for the user first. The probe asks every instance over its local socket
+        ; and falls back to WM_CLOSE for an older client, so this is the same request as
+        ; clicking the window's close button: the application still answers its own "really
+        ; quit?" prompt, so nothing is lost. A second round is spent only when the listing
+        ; changed, which means something exited and the rest is worth asking again; repeating
+        ; the same request against the same processes cannot change anything.
+        ${If} $GuardCloseRounds < 2
+        ${AndIf} $GuardOutput != $GuardLastHolders
+            StrCpy $GuardLastHolders $GuardOutput
+            IntOp $GuardCloseRounds $GuardCloseRounds + 1
+            !insertmacro CockLog "guard: asking the payload programs to close (round $GuardCloseRounds)"
+            Call CloseHolders
+            Goto guard_check
+        ${EndIf}
+        DetailPrint "The install directory is in use by: $GuardOutput"
+        ; The close ran and did not free the files. Force-closing them is what the installer
+        ; can do (Yes); closing them by hand is what the user can do (No checks again, with
+        ; the fresh listing); Cancel stops the run and the abort dialog offers the same
+        ; update from the official download page. Without the middle answer a user who did
+        ; not want anything killed had no way forward but to abandon the update.
+        guard_ask:
+        !insertmacro CockEndRecheckPrompt "Cockatrice, Oracle or Servatrice is still using files of the installation:" $GuardOutput "installation"
+        MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 "$GuardPrompt" IDYES guard_end IDNO guard_recheck
+        Goto guard_cancel
+        guard_recheck:
+        IntOp $GuardRecheckCount $GuardRecheckCount + 1
+        !insertmacro CockLog "guard: user closed programs by hand, checking again (recheck $GuardRecheckCount)"
+        ; A fresh set gets a fresh automatic close, exactly as if the guard had just started:
+        ; what the user closed by hand may have been one instance of several.
+        StrCpy $GuardCloseRounds 0
+        StrCpy $GuardLastHolders ""
+        Goto guard_check
+        guard_cancel:
+        !insertmacro CockLog "guard: cancelled by user after $GuardRecheckCount recheck(s)"
+        StrCpy $AbortReason \
+            "The installation was cancelled because Cockatrice, Oracle or Servatrice is still running and holding files of the previous version.$\r$\n$\r$\n${AFTER_CLOSING_GUIDANCE}$\r$\n$\r$\nClose them and run the installer again."
+        ; RemoveOldPayloadLeftovers runs with the pre-uninstall backup already taken;
+        ; restoring here keeps this abort from stranding the only copy in %TEMP%.
+        Call RestoreUserDataAfterUninstall
+        Call AbortInstall
+        ; Only reached through Yes: AbortInstall does not return.
+        guard_end:
+        !insertmacro CockLog "guard: ending the payload programs on request, then checking again"
+        Call EndHolders
+        ; Measure once and report, rather than asking the same question again. Everything the
+        ; payload installs was ended, so what survived is a program this installer may not
+        ; open or does not own - another dialog offering to end it again would only repeat
+        ; itself.
+        Call RunHolderProbe
+        ${If} $GuardExit == "0"
+            !insertmacro CockLog "guard: nothing is holding the payload"
             Return
         ${EndIf}
-        ${If} $R0 = 2
-            Call HandleUnknownAppState
-            Return
-        ${EndIf}
-        System::Call 'kernel32::GetTickCount()i.s'
-        Pop $R9
-        IntOp $R9 $R9 - $R8
-        ${If} $R9 < 60000
-            Goto ck_wait_loop
-        ${EndIf}
-        ; The grace period is over. Cockatrice is never force-stopped: it may be
-        ; showing a "really leave this game?" confirmation or holding an unsaved
-        ; deck, and nothing has been replaced yet, so aborting just defers the
-        ; update and preserves the user's data.
-        ${If} $AllowForceClose = 0
-            !insertmacro CockLog "guard $R1: still running after 60s, aborting (no force close)"
-            DetailPrint "$R1 is still running after 60 s; aborting the update so that no data is lost."
+        !insertmacro CockLog "guard: still in use after ending them ($GuardExit): $GuardOutput"
+        ${If} $GuardExit == "1"
             StrCpy $AbortReason \
-                "$R1 did not close within 60 seconds, so the installation was aborted to avoid losing unsaved data.$\r$\n$\r$\nPlease close $R1 and run the installer again."
-            Call AbortInstall
+                "The installation was cancelled because these programs still hold files of the previous version and could not be ended:$\r$\n$\r$\n$GuardOutput$\r$\n$\r$\n${AFTER_CLOSING_GUIDANCE}$\r$\n$\r$\nClose them and run the installer again."
+        ${Else}
+            StrCpy $AbortReason \
+                "The installation was cancelled because, after ending Cockatrice, Oracle and Servatrice, the installer could not check whether they still hold files of the previous version.$\r$\n$\r$\nThe check reported: $GuardOutput$\r$\n$\r$\nClose them and run the installer again."
         ${EndIf}
-        ; Oracle and Servatrice are console applications: CloseMainWindow()
-        ; returned false for them and waiting longer cannot help. They hold no
-        ; unsaved user data, so stop them by PID.
-        !insertmacro CockLog "guard $R1: still running after 60s, force-stopping"
-        DetailPrint "Force-stopping $R1 ..."
-        Call ForceCloseApps
-        Sleep 2000
-        Call IsAppRunning
-        ${If} $R0 = 0
-            !insertmacro CockLog "guard $R1: force-stopped"
-            DetailPrint "$R1 closed."
-            Return
-        ${EndIf}
-        ${If} $R0 = 2
-            Call HandleUnknownAppState
-            Return
-        ${EndIf}
-        !insertmacro CockLog "guard $R1: could not be stopped, aborting"
-        DetailPrint "$R1 is still running after 60 s; aborting the update."
-        StrCpy $AbortReason \
-            "$R1 could not be stopped, so the installation was aborted.$\r$\n$\r$\nPlease close $R1 and run the installer again."
-        Call AbortInstall
-    ${Else}
-        ck_wait_prompt:
-        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
-            "$R1 is still running.$\r$\n$\r$\nPlease close it, then click Retry.$\r$\nClick Cancel to abort." \
-            IDCANCEL ck_abort_install
-        Call IsAppRunning
-        ${If} $R0 = 0
-            Return
-        ${EndIf}
-        ${If} $R0 = 2
-            Call HandleUnknownAppState
-            Return
-        ${EndIf}
-        Goto ck_wait_prompt
-        ck_abort_install:
-        Abort
-    ${EndIf}
-FunctionEnd
-
-; A process lookup came back "could not determine": powershell.exe ran but the
-; answer was not usable, e.g. the process could not be inspected at all. That
-; state is fine to carry on from when the user is at the keyboard - they can
-; close the applications by hand and the stale-runtime check still stands
-; between a failed guard and a mismatched install.
-;
-; It is not fine on a silent upgrade. There the whole point of this guard is to
-; know that nothing holds locks on the files about to be replaced, and this is
-; exactly the state where that is unknown, with no one to click a dialog: the
-; old code returned and let the install carry on into the mixed Qt DLL set that
-; made the next start fail. Cancel the update instead; the next attempt runs
-; with the applications closed and succeeds.
-Function HandleUnknownAppState
-    ${If} $ReinstallMode = 1
-        StrCpy $AbortReason \
-            "The installation was cancelled because it could not determine whether Cockatrice is still running.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
+        Call RestoreUserDataAfterUninstall
         Call AbortInstall
     ${EndIf}
-    DetailPrint "Could not determine whether $R1 is running; close Cockatrice, Oracle and Servatrice manually if the installation reports a problem."
-    ${IfNot} ${Silent}
-        MessageBox MB_OK|MB_ICONEXCLAMATION \
-            "This installer could not determine whether $R1 is still running.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice manually before continuing."
-    ${EndIf}
+    ; Not an answer at all: the probe was not configured, the Restart Manager
+    ; call failed and no payload program runs from the directory, a payload
+    ; program refuses to be replaced but no lookup could name it (it may run
+    ; under another account), or the probe timed out. Carrying on from that is a
+    ; decision, so it is asked for rather than assumed - the stale-runtime check
+    ; after the purge still stands between a failed guard and a mismatched
+    ; install, but it only fires after files have been replaced, and on an
+    ; upgrade the launcher asked for nobody is watching the installer's exit
+    ; code. Retry asks the probe again (a Restart Manager that was busy answers
+    ; the second time, and a program the user has closed frees its file), Ignore
+    ; installs anyway, Abort cancels instead of writing a payload next to files
+    ; the guard could not rule out.
+    !insertmacro CockLog "guard: the holder probe could not answer ($GuardExit): $GuardOutput"
+    DetailPrint "Could not confirm whether Cockatrice is still running: $GuardOutput"
+    MessageBox MB_ABORTRETRYIGNORE|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
+        "This installer could not confirm whether Cockatrice, Oracle or Servatrice is still running.$\r$\n$\r$\nThe check reported: $GuardOutput$\r$\n$\r$\nClose them, then choose Retry to check again. Choose Ignore to install anyway, or Abort to cancel the installation." \
+        IDRETRY guard_check IDABORT guard_unknown_abort
+    !insertmacro CockLog "guard: continuing without an answer from the probe"
+    Return
+    guard_unknown_abort:
+    StrCpy $AbortReason \
+        "The installation was cancelled because it could not confirm whether Cockatrice, Oracle or Servatrice is still running.$\r$\n$\r$\nThe check reported: $GuardOutput$\r$\n$\r$\nPlease close them and run the installer again."
+    ; Same reason as the cancel path above: this abort can be reached from the
+    ; leftover-removal guard, after the backup was taken.
+    Call RestoreUserDataAfterUninstall
+    Call AbortInstall
 FunctionEnd
 
 Function EnsureAppsNotRunning
@@ -899,103 +1337,155 @@ FunctionEnd
 
 ; Aborts the installation, showing $AbortReason to the user.
 ;
-; Every abort goes through here so the unattended case is handled the same way
-; everywhere: the in-app updater runs this installer silent and detached and
-; never looks at its exit code, so a plain Abort would leave the user with no
-; update and no explanation, while a /S install without /R is unattended - by a
-; package manager, for instance - and a message box there would block forever.
-; Only the first of those two gets a dialog; the second reports through the log
-; and the exit code.
+; Every abort goes through here so no failure ends silently: the in-app updater
+; runs this installer silent and detached and never looks at its exit code, and
+; a /S install without /R has nobody watching its exit code either, so a plain
+; Abort would leave the user with no update and no explanation. An error always
+; shows its dialog, in every mode; a silent run stays silent only for as long
+; as nothing goes wrong. The log path is part of the dialog, so a report can be
+; acted on without asking the user to find the file.
 Function AbortInstall
     !insertmacro CockLog "ABORT: $AbortReason"
     !insertmacro CockLog "full installer log: $InstallLogPath"
-    ; Show a dialog whenever someone is at the keyboard to see it: an interactive
-    ; install, or the in-app updater's /R upgrade. The /R upgrade is silent, but
-    ; the client that launched the installer has already quit, so the user is
-    ; still there. Only a /S install without /R is attended by a package manager
-    ; and must go straight to the exit code.
-    ${If} $ReinstallMode = 1
-    ${OrIfNot} ${Silent}
-        MessageBox MB_OK|MB_ICONEXCLAMATION "$AbortReason$\r$\n$\r$\nA detailed installer log was written to:$\r$\n$InstallLogPath"
-        ; Offer to send the installer log to Sentry so aborted installs can be diagnosed. This block already runs
-        ; only when someone is at the keyboard (attended install, or the updater's /R upgrade whose launcher has
-        ; quit), so a silent or package-manager install never reaches the prompt and its behavior is unchanged.
-        ; Only a package built with a baked DSN offers to send, so the prompt can only appear when a send
-        ; can actually go out. A preprocessor guard rather than a runtime test: a package built without a
-        ; DSN compiles the block out entirely, so it cannot even carry the helper or its baked endpoint.
-        ; No /SD here: a /SD would suppress this prompt on the silent /R upgrade, which is exactly the
-        ; attended-update case this offer exists for. The runtime gate above (ReinstallMode/Silent) is the
-        ; hang protection — a package-manager /S install without /R never reaches this box, matching the
-        ; two sibling MessageBox sites in this file.
-        !if "@CPACK_SENTRY_ENABLED@" == "1"
-            MessageBox MB_YESNO|MB_ICONQUESTION "Send the installer log to the developers to help fix this? The log contains file paths from this machine, which may include your Windows user name." IDYES sentry_send
-            !insertmacro CockLog "sentry send: declined by user"
-            Goto sentry_done
-            sentry_send:
-            ; The abort reason is already in the log file (CockLog writes "ABORT: ..." as the
-            ; first thing AbortInstall does), so the helper reads it from there. Nothing
-            ; reason-shaped crosses the command line, which keeps quoting trivial and needs
-            ; no NSIS string functions.
-            InitPluginsDir
-            ; Embedded by the same relative path that resolves NSIS.definitions.nsh above (both are
-            ; configure_file'd into the build root, which is three levels up from project.nsi). An
-            ; absolute CMake path here carries forward slashes, which makensis does not treat as
-            ; absolute and so fails to find the file at package time.
-            File "/oname=$PLUGINSDIR\send-installer-log.ps1" "..\..\..\SendInstallerLog.ps1"
-            ; The send can take up to the /TIMEOUT below, so put something on the details pane
-            ; the moment the user says yes rather than leaving the window blank until it returns.
-            DetailPrint "Sending installer log..."
-            nsExec::ExecToStack /TIMEOUT=60000 'powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File "$PLUGINSDIR\send-installer-log.ps1" -LogPath "$InstallLogPath"'
-            Pop $SentryResult
-            Pop $SentryOutput
-            ; $SentryOutput is a single line by construction: the helper flattens its message
-            ; and this log file is uploaded verbatim, so a stray newline must not be able to
-            ; forge extra lines into the artifact we send.
-            !insertmacro CockLog "sentry send: result=$SentryResult output=$SentryOutput"
-            ${If} $SentryResult == "0"
-                MessageBox MB_OK|MB_ICONINFORMATION "The installer log was sent. Thank you for helping improve Cockatrice!"
-            ${Else}
-                MessageBox MB_OK|MB_ICONEXCLAMATION "The installer log could not be sent. You can still share it manually; it was written to:$\r$\n$InstallLogPath"
-            ${EndIf}
-            sentry_done:
-        !endif
-    ${EndIf}
+    !insertmacro CockLog "manual update: ${LATEST_RELEASE_URL}"
+    ; The reason names what stopped the run; the manual-update paragraph is the way forward
+    ; that does not need this installer to free anything. Shown in every mode, exactly like
+    ; the reason, because a /R upgrade has nobody watching its exit code.
+    MessageBox MB_OK|MB_ICONEXCLAMATION "$AbortReason$\r$\n$\r$\n${MANUAL_UPDATE_GUIDANCE}$\r$\n$\r$\nA detailed installer log was written to:$\r$\n$InstallLogPath"
+    ; Offer the page as well: copying a URL out of a message box is a step users skip.
+    ; explorer.exe hands the URL to the already-running shell, so the browser opens at the
+    ; user's integrity level rather than as the elevated installer.
+    MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 "Open the download page now?$\r$\n$\r$\n${LATEST_RELEASE_URL}" IDNO abort_no_link
+    !insertmacro CockLog "manual update: opening the download page"
+    Exec '"$WINDIR\explorer.exe" "${LATEST_RELEASE_URL}"'
+    abort_no_link:
+    ; Offer to send the installer log to Sentry so aborted installs can be diagnosed.
+    ; Only a package built with a baked DSN offers to send, so the prompt can only appear
+    ; when a send can actually go out. A preprocessor guard rather than a runtime test: a
+    ; package built without a DSN compiles the block out entirely, so it cannot even carry
+    ; the helper or its baked endpoint. No /SD: the abort is exactly the case the offer
+    ; exists for, including on the silent /R upgrade.
+    !if "@CPACK_SENTRY_ENABLED@" == "1"
+        MessageBox MB_YESNO|MB_ICONQUESTION "Send the installer log to the developers to help fix this? The log contains file paths from this machine, which may include your Windows user name." IDYES sentry_send
+        !insertmacro CockLog "sentry send: declined by user"
+        Goto sentry_done
+        sentry_send:
+        ; The abort reason is already in the log file (CockLog writes "ABORT: ..." as the
+        ; first thing AbortInstall does), so the helper reads it from there. Nothing
+        ; reason-shaped crosses the command line, which keeps quoting trivial and needs
+        ; no NSIS string functions.
+        InitPluginsDir
+        ; Embedded by the same relative path that resolves NSIS.definitions.nsh above (both are
+        ; configure_file'd into the build root, which is three levels up from project.nsi). An
+        ; absolute CMake path here carries forward slashes, which makensis does not treat as
+        ; absolute and so fails to find the file at package time.
+        File "/oname=$PLUGINSDIR\send-installer-log.ps1" "..\..\..\SendInstallerLog.ps1"
+        ; The send can take up to the /TIMEOUT below, so put something on the details pane
+        ; the moment the user says yes rather than leaving the window blank until it returns.
+        DetailPrint "Sending installer log..."
+        nsExec::ExecToStack /TIMEOUT=60000 'powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File "$PLUGINSDIR\send-installer-log.ps1" -LogPath "$InstallLogPath"'
+        Pop $SentryResult
+        Pop $SentryOutput
+        ; $SentryOutput is a single line by construction: the helper flattens its message
+        ; and this log file is uploaded verbatim, so a stray newline must not be able to
+        ; forge extra lines into the artifact we send.
+        !insertmacro CockLog "sentry send: result=$SentryResult output=$SentryOutput"
+        ${If} $SentryResult == "0"
+            MessageBox MB_OK|MB_ICONINFORMATION "The installer log was sent. Thank you for helping improve Cockatrice!"
+        ${Else}
+            MessageBox MB_OK|MB_ICONEXCLAMATION "The installer log could not be sent. You can still share it manually; it was written to:$\r$\n$InstallLogPath"
+        ${EndIf}
+        sentry_done:
+    !endif
     SetErrorLevel 1
     Abort
 FunctionEnd
 
+; usage: set $GuardDir and $WaitPid, then call this. Asks the one process the installer
+; waits on to close and sets $R3 to what it could do: 1 = a window exists and was asked to
+; close (or is waiting on a question of its own), 4 = it has no window a user could answer,
+; anything else = the probe could not answer. Only 4 lets the wait act on its own; every
+; other code keeps the user in the decision, because the installer holds a live handle and
+; "the probe did not find it" is not the same answer as "it is gone".
+;
+; The guard's CloseHolders answers the same question for every holder and leaves a
+; windowless instance to the user, which is right there: the prompt names it. The launcher
+; is the one process nobody can be asked about - the in-app updater runs the installer
+; silent and detached, and a client that has already hidden its window has answered its
+; own prompts - so this answer has to say whether there was a window to ask at all.
+Function CloseLauncher
+    Call ExtractHolderProbe
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_LAUNCHER_PID", "$WaitPid")'
+    ; The probe waits 30 s itself when it posts a close. The timeout here only bounds a
+    ; probe that never returns; the Restart Manager call the other modes make is not
+    ; reached in this one.
+    nsExec::ExecToStack /TIMEOUT=40000 '"$PLUGINSDIR\installer-holder-probe.exe" --close-launcher'
+    Pop $R3
+    Pop $R4
+    Push "close-launcher: probe exit=$R3 [$R4]"
+    Call CockLogWrite
+    DetailPrint "Closing Cockatrice: $R4"
+FunctionEnd
+
 ; Waits for the application that launched this installer to exit, using the /PID=
 ; it passed. Sets $LauncherExited to 1 when that process is provably gone.
 ;
 ; This is the authority for the one question the rest of the installer can only
 ; approximate: is the process that started us still holding its Qt DLLs mapped?
-; A mapped module cannot be deleted, so an answer of "not running" obtained by
-; enumerating process names is what allows the update to write a new payload on
+; A mapped module cannot be deleted, so an answer of "nothing is holding them"
+; obtained from file handles is what allows the update to write a new payload on
 ; top of files it could not remove. Waiting on a real handle has no such gap,
-; needs no powershell.exe, and is unaffected by a process whose path cannot be
-; read - the case the name based check has to treat as "not ours" so it never
-; closes a third party application.
+; needs no process enumeration at all, and is unaffected by a process the holder
+; probe cannot inspect.
 ;
 ; Sets $LauncherExited to 0 when no usable /PID= was given, which is the older
 ; client that does not pass one; the caller then has no authority available and
-; falls back to the name based guard.
+; falls back to the holder probe.
+;
+; A launcher that survives the first grace is asked to close by the probe, and the
+; probe also answers whether there was a window a close could reach. A client hides
+; its window the moment its own close is accepted, so a launcher without one has
+; already answered its own prompts and is stuck in shutdown: no dialog can reach it
+; there, and the wait ends it after one more grace instead of asking the user a
+; question whose "keep waiting" answer can never change anything.
 Function WaitForLauncherToExit
     StrCpy $LauncherExited 0
+    StrCpy $WaitWindowless 0
     !insertmacro CockLog "wait-launcher: pid='$WaitPid'"
     ${If} $WaitPid == ""
         !insertmacro CockLog "wait-launcher: no pid given, falling back to name check"
         Return
     ${EndIf}
-    ; PROCESS_SYNCHRONIZE is the only access this needs - enough to wait on the
-    ; handle, and the least likely to be refused for a reason that has nothing to
-    ; do with the upgrade.
-    ;
     ; System.dll maps its output registers so that .rN writes $N and .RN writes
     ; $RN. The caller reads $R0/$R1, so the uppercase .RN form is required; the
     ; original .r0/.r1 wrote $0/$1 and left $R1 empty, which made the "did not
     ; exit" test below compare "" against "0" and abort on every /PID= upgrade.
+    ; Reopened on every round below, so a launcher that exited in the meantime answers
+    ; "already exited" instead of being waited on again.
+    ;
+    ; PROCESS_TERMINATE rides along with PROCESS_SYNCHRONIZE so that the "end it"
+    ; answer below acts on this very handle: the pid looked up again after a dialog
+    ; that can stay open as long as the user takes would name whatever process holds
+    ; that pid by then, and a handle cannot be handed to another process.
+    ;
+    ; When those rights are refused - a launcher started by another account, a
+    ; protected process - the wait still has to happen, so the ask is repeated with
+    ; synchronize access alone and $WaitCanEnd records that ending is not on offer.
+    ; Reporting "already exited" instead would be the worse answer: the payload would
+    ; be written over a live process, which is what this wait exists to prevent.
+    ;
+    ; Ten seconds, not the full grace: a client that started an update exits in well
+    ; under a second, so at ten seconds it is either flushing a card database or - far
+    ; more often - sitting on its own "quit anyway?" confirmation with nobody looking at
+    ; it. Silence for a minute is what makes that read as a hung installer. The full
+    ; grace is spent after the first question, so a user who answers Cockatrice's
+    ; confirmation is not asked again while they do it.
+    StrCpy $WaitSlice 10000
+    wait_launcher_open:
     ClearErrors
-    System::Call 'kernel32::OpenProcess(i 0x00100000, i 0, i $WaitPid) p.R0'
+    StrCpy $WaitCanEnd 1
+    System::Call 'kernel32::OpenProcess(i 0x00100001, i 0, i $WaitPid) p.R0'
     ; OpenProcess returns a null handle for a process that is already gone. The
     ; System plugin does not raise the NSIS error flag from a called function's
     ; return value, so ${Errors} alone never saw that case and the null handle was
@@ -1004,27 +1494,118 @@ Function WaitForLauncherToExit
     ${If} ${Errors}
         StrCpy $R0 0
     ${EndIf}
+    ${If} $R0 == 0
+        StrCpy $WaitCanEnd 0
+        ClearErrors
+        System::Call 'kernel32::OpenProcess(i 0x00100000, i 0, i $WaitPid) p.R0'
+        ${If} ${Errors}
+            StrCpy $R0 0
+        ${EndIf}
+    ${EndIf}
     ${If} $R0 == 0
     ; The launcher is gone - OpenProcess cannot open a dead process - which is
-    ; exactly the state the wait was for.
+    ; exactly the state the wait was for. A handle refused for want of the terminate
+    ; right is not this case; the synchronize-only ask above covers it.
         !insertmacro CockLog "wait-launcher: already exited"
         DetailPrint "The application that started this installer has already exited."
         StrCpy $LauncherExited 1
         Return
     ${EndIf}
     DetailPrint "Waiting for the application that started this installer to exit ..."
-    ; Same 60 s grace period the name based check uses, so a client that is slow
-    ; to flush its card database does not get less room than it used to.
     ; WAIT_OBJECT_0 is 0; WAIT_TIMEOUT is 258 and a failed wait reports 0xFFFFFFFF.
-    System::Call 'kernel32::WaitForSingleObject(p R0, i 60000) i.R1'
-    System::Call 'kernel32::CloseHandle(p R0)'
+    System::Call 'kernel32::WaitForSingleObject(p R0, i $WaitSlice) i.R1'
     ${If} $R1 != 0
-        !insertmacro CockLog "wait-launcher: did not exit within 60s (wait=$R1)"
-        DetailPrint "The application that started this installer did not exit within 60 s."
+    ; $R0 is deliberately still open: it is the process that timed out, and the answer
+    ; below has to act on that process and not on whatever $WaitPid names by then.
+        !insertmacro CockLog "wait-launcher: did not exit within $WaitSlice ms (wait=$R1, canEnd=$WaitCanEnd)"
+        DetailPrint "The application that started this installer did not exit in time."
+        ; Ask the launcher itself before asking the user. A client that has already hidden
+        ; its window has answered its own prompts and is stuck in shutdown: there is nothing
+        ; left a dialog could reach, and the "ask it to close again" answer the dialog used
+        ; to offer could only repeat itself until the user cancelled.
+        StrCpy $GuardDir $INSTDIR
+        Call CloseLauncher
+        ; $R3 = what the probe could do (see CloseLauncher), $R4 = its line, already logged.
+        ; A process that answered the close during the probe's own wait is gone by now.
+        System::Call 'kernel32::WaitForSingleObject(p R0, i 0) i.R1'
+        ${If} $R1 == 0
+            System::Call 'kernel32::CloseHandle(p R0)'
+            StrCpy $R0 0
+            Goto wait_launcher_open
+        ${EndIf}
+        ${If} $R3 == "4"
+            ; Nothing a user could answer: the window is gone, so the launcher is past its
+            ; own prompts and stuck in shutdown. It cannot be asked, and it is not going to
+            ; ask the user anything either, so the dialog below would be unanswerable.
+            ${If} $WaitCanEnd == 1
+                ${If} $WaitWindowless == 0
+                    ; Hiding the window is what the client does when its close is accepted,
+                    ; so what remains is the shutdown it already started: one full grace for
+                    ; that, without a question nobody could act on.
+                    StrCpy $WaitWindowless 1
+                    StrCpy $WaitSlice 60000
+                    !insertmacro CockLog "wait-launcher: no window to ask, giving it one more minute"
+                    System::Call 'kernel32::CloseHandle(p R0)'
+                    StrCpy $R0 0
+                    Goto wait_launcher_open
+                ${EndIf}
+                ${If} $WaitWindowless == 1
+                    ; It did not use that minute either. Ending it is what the dialog's Yes
+                    ; answer would have done, and there is no question left to put to the
+                    ; user: the instance lost its window before this round started.
+                    StrCpy $WaitWindowless 2
+                    !insertmacro CockLog "wait-launcher: still no window to ask; ending the launcher"
+                    DetailPrint "The application that started this installer could not be asked to close; ending it."
+                    System::Call 'kernel32::TerminateProcess(p R0, i 1) i.R2'
+                    !insertmacro CockLog "wait-launcher: ending the launcher returned $R2"
+                    System::Call 'kernel32::CloseHandle(p R0)'
+                    StrCpy $R0 0
+                    Goto wait_launcher_open
+                ${EndIf}
+            ${EndIf}
+        ${EndIf}
+        ; A window exists, or the launcher cannot be ended from here: the three answers
+        ; below. "Carry on anyway" is not one of them - a live process has its image and its
+        ; Qt DLLs mapped, so writing the payload over them is the broken install this wait
+        ; exists to prevent. Yes ends the launcher, Cancel cancels, and No keeps waiting:
+        ; the close and the bring-forward just happened above.
+        MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 \
+            "Cockatrice has not finished closing, so the installation is paused rather than replace files it is still using.$\r$\n$\r$\nIt may be waiting for you to answer its own question about an unsaved deck, an open game or a card database update.$\r$\n$\r$\nChoose Yes to end it now - an unsaved deck, a running game or an unwritten setting is lost.$\r$\n$\r$\nChoose No to keep waiting, or Cancel to cancel the installation." \
+            IDYES wait_launcher_end IDNO wait_launcher_retry
+        !insertmacro CockLog "wait-launcher: cancelled by user"
         StrCpy $AbortReason \
             "The application that started this update has not exited yet, so the installation was cancelled rather than replace files it is still using.$\r$\n$\r$\nPlease close Cockatrice and run the installer again."
         Call AbortInstall
+        ; Only reached through Yes or No: AbortInstall does not return.
+        wait_launcher_end:
+        ; End it through the handle waited on above, and through nothing else: no pid is
+        ; looked up again, so a process that inherited the number in the meantime - or a
+        ; /PID= that was not the launcher to begin with - cannot be hit by this.
+        !insertmacro CockLog "wait-launcher: ending the launcher on request"
+        ${If} $WaitCanEnd == 0
+            !insertmacro CockLog "wait-launcher: the launcher could not be opened to end it, asking it to close instead"
+            Goto wait_launcher_retry
+        ${EndIf}
+        System::Call 'kernel32::TerminateProcess(p R0, i 1) i.R3'
+        System::Call 'kernel32::CloseHandle(p R0)'
+        StrCpy $R0 0
+        !insertmacro CockLog "wait-launcher: ending the launcher returned $R3"
+        Goto wait_launcher_open
+        wait_launcher_retry:
+        System::Call 'kernel32::CloseHandle(p R0)'
+        StrCpy $R0 0
+        ; The question has been asked and answered once; from here the wait is the full
+        ; grace again, so a slow flush or a confirmation being answered does not turn
+        ; into a stream of prompts. The close itself and the bring-forward already
+        ; happened just before the dialog, so this only waits. The windowless grace starts
+        ; over as well: "keep waiting" must not be answered by ending the process a minute
+        ; later without asking again.
+        StrCpy $WaitWindowless 0
+        StrCpy $WaitSlice 60000
+        Goto wait_launcher_open
     ${EndIf}
+    System::Call 'kernel32::CloseHandle(p R0)'
+    StrCpy $R0 0
     !insertmacro CockLog "wait-launcher: launcher exited"
     DetailPrint "The application that started this installer has exited."
     StrCpy $LauncherExited 1
@@ -1048,57 +1629,6 @@ Function EnsureOldInstallNotRunning
     Call GuardAppsNotRunning
 FunctionEnd
 
-Function GuardAppsNotRunning
-    ; usage: set $GuardDir to the directory to guard, then call this
-    Call IsProcessLookupAvailable
-    !insertmacro CockLog "guard: powershell available=$R0 dir=$GuardDir launcherExited=$LauncherExited"
-    ${If} $R0 = 0
-        ; Without PowerShell we cannot tell whether a running instance is
-        ; holding locks on the files we are about to replace.
-        !insertmacro CockLog "guard: powershell unavailable, skipping instance check"
-        DetailPrint "Could not start powershell.exe; skipping the running instance check. Close Cockatrice, Oracle and Servatrice manually if the installation reports a problem."
-        ; On a silent upgrade that used to be a warning and nothing more, which
-        ; left the very process that launched the installer free to go on
-        ; replacing files it still had mapped - the one outcome this guard exists
-        ; to prevent - and then writing the new payload on top of them. Cancel
-        ; instead. An interactive install can still continue: the user is at the
-        ; keyboard, and refusing outright would leave them with an installer that
-        ; can never complete.
-        ;
-        ; Unless the launcher has already been waited on directly: WaitForLauncherToExit
-        ; needs no powershell.exe, so when it has run, Cockatrice is known to be
-        ; gone and the lookup failing to run costs nothing but the Oracle and
-        ; Servatrice checks. An older client that passes no /PID= leaves no such
-        ; authority, and there the upgrade is cancelled as before.
-        ${If} $LauncherExited != 1
-        ${AndIf} $ReinstallMode = 1
-            StrCpy $AbortReason \
-                "The installation was cancelled because it could not check whether Cockatrice is still running, because powershell.exe could not be started.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
-            Call AbortInstall
-        ${EndIf}
-        ; The user has to be told to close the applications by hand, but a /S
-        ; install without /R is unattended and would block on this forever.
-        ${If} $ReinstallMode = 1
-        ${OrIfNot} ${Silent}
-            MessageBox MB_OK|MB_ICONEXCLAMATION "This installer could not check whether Cockatrice is still running, because powershell.exe could not be started.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice manually before continuing."
-        ${EndIf}
-        Return
-    ${EndIf}
-    StrCpy $R1 "cockatrice.exe"
-    StrCpy $R2 "cockatrice"
-    ; a GUI application with unsaved user data: graceful close only
-    StrCpy $AllowForceClose 0
-    Call WaitForAppToClose
-    StrCpy $R1 "oracle.exe"
-    StrCpy $R2 "oracle"
-    StrCpy $AllowForceClose 1
-    Call WaitForAppToClose
-    StrCpy $R1 "servatrice.exe"
-    StrCpy $R2 "servatrice"
-    StrCpy $AllowForceClose 1
-    Call WaitForAppToClose
-FunctionEnd
-
 ; Sets $R0 to 1 if $INSTDIR looks like an existing Cockatrice install. Used to
 ; guard the stale-runtime-DLL purge so a first-time install into a pre-existing
 ; directory with an unrelated "Plugins" folder is never touched, while an
@@ -1176,6 +1706,92 @@ Function CheckStaleRuntimeMask
     ${EndIf}
 FunctionEnd
 
+; Clears the read-only attribute of everything the purge is about to delete.
+;
+; Delete and RMDir only set the error flag: a read-only file is left on disk
+; untouched, and the retry loop then cannot make progress however long it waits,
+; because the file is not held - it is protected. The abort diagnostics have a
+; branch for exactly that ("read-only, which stops Delete"), so a survivor that
+; is both free and read-only was a dead end until now. This runs on every
+; attempt, so an attribute set again between attempts is cleared as well.
+; SetFileAttributes has no wildcard support, hence the walks.
+Function ClearReadOnlyPurgeTargets
+    FindFirst $StaleFindHandle $StaleFindName "$INSTDIR\*.dll"
+    ${If} $StaleFindHandle != ""
+    crp_dll_loop:
+        SetFileAttributes "$INSTDIR\$StaleFindName" NORMAL
+        ClearErrors
+        FindNext $StaleFindHandle $StaleFindName
+        IfErrors 0 crp_dll_loop
+        FindClose $StaleFindHandle
+    ${EndIf}
+    StrCpy $R6 "$INSTDIR\Plugins"
+    Call ClearReadOnlyTree
+FunctionEnd
+
+; usage: set $R6 to a directory. Clears the read-only attribute of every entry
+; below it, so RMDir /r is not stopped by a single file. Saves and restores the
+; registers it works in, because it recurses into itself.
+Function ClearReadOnlyTree
+    Push $R6
+    Push $R7
+    Push $R8
+    FindFirst $R7 $R8 "$R6\*.*"
+    ${If} $R7 != ""
+    crt_loop:
+        ${If} $R8 != "."
+        ${AndIf} $R8 != ".."
+            SetFileAttributes "$R6\$R8" NORMAL
+            ; Only an entry with contents has anything below it that the purge
+            ; would fail on; an empty directory's own attribute is already
+            ; cleared above and there is nothing left to descend into.
+            ${If} ${FileExists} "$R6\$R8\*.*"
+                Push $R6
+                StrCpy $R6 "$R6\$R8"
+                Call ClearReadOnlyTree
+                Pop $R6
+            ${EndIf}
+        ${EndIf}
+        ClearErrors
+        FindNext $R7 $R8
+        IfErrors 0 crt_loop
+        FindClose $R7
+    ${EndIf}
+    Pop $R8
+    Pop $R7
+    Pop $R6
+FunctionEnd
+
+; Removes the Plugins directory and all top-level DLLs from $INSTDIR, then
+; retries up to two more times (2 s apart) when files remain locked, so that
+; transient holders such as antivirus scanners have a chance to release their
+; handles before the installer gives up. Three attempts total. The read-only
+; attribute is cleared before each attempt: a protected file is not a held one
+; and would never clear on its own.
+; Sets $R0 to 0 when the purge is clean, or to 1 when stale DLLs remain
+; after all attempts.
+Function RetryDllPurge
+    StrCpy $R5 0        ; counts retries after the initial attempt
+    rdp_loop:
+    Call ClearReadOnlyPurgeTargets
+    RMDir /r "$INSTDIR\Plugins"
+    Delete "$INSTDIR\*.dll"
+    Call HasStaleRuntimeFiles
+    ; $R0 = 0: all clear, nothing left to do.
+    ${If} $R0 = 0
+        Return
+    ${EndIf}
+    IntOp $R5 $R5 + 1
+    ; Allow two retries after the initial attempt ($R5 is the retry counter,
+    ; so the loop runs at most 3 times: attempt + retry 1 + retry 2).
+    ${If} $R5 > 2
+        !insertmacro CockLog "RetryDllPurge: stale files remain after 3 attempts, giving up"
+        Return          ; $R0 is already 1
+    ${EndIf}
+    !insertmacro CockLog "RetryDllPurge: retry $R5 of 2 after stale purge, sleeping 2 s"
+    Sleep 2000
+    Goto rdp_loop
+FunctionEnd  ; RetryDllPurge
 ; Turns a Win32 error code into the wording that goes into the log.
 ; usage: set $0 to the code, result in $R0.
 ;
@@ -1215,14 +1831,18 @@ FunctionEnd
 ; survived the purge" said which files were present but never which one was held,
 ; and never whether the cause was a lock or a permission.
 ;
-; The probe opens each survivor for DELETE access and then closes it again
-; without deleting anything. The code is read by the plugin right after that call
-; (?e), so a failure reports what Windows refused; clearing LastError first is
-; what makes a zero code mean "this open worked", i.e. the purge-time failure was
-; transient (an antivirus scan that has finished, an instance still shutting
-; down) rather than a standing condition. The plugin parses the call's arguments
-; between the clear and the call, so a non-zero code is reported as what Windows
-; said rather than as proof of a cause - the wording below never claims one.
+; Each survivor is opened for DELETE access and then asked the question DeleteFile
+; asks: SetFileInformationByHandle(FileDispositionInfo) marks it for deletion on
+; close, and the mark is cleared again right away, so nothing is deleted (and if
+; that cancel ever failed, the file would go when the handle closes - a file the
+; purge already tried to delete, and the line says so). That separates the three
+; causes a failed Delete cannot tell apart: another handle that does not share
+; delete refuses the mark, a read-only attribute refuses it, and a file nobody
+; holds accepts it and would have been deleted. The mark is read through ?e, so a
+; refusal reports Windows' own code; clearing LastError first keeps a zero code
+; meaning "accepted". The wording below reports what Windows said and never claims
+; a cause the code cannot prove. Which process is holding a survivor, if any, is
+; what the holders line after the loop answers.
 Function LogStaleRuntimeDiagnostics
     FindFirst $StaleFindHandle $StaleFindName "$INSTDIR\*.dll"
     ${If} $StaleFindHandle != ""
@@ -1239,21 +1859,52 @@ Function LogStaleRuntimeDiagnostics
         ${Else}
             Pop $R2
             ${If} $R2 = 0
-                ; A valid handle: close it. The open proves the file is not held
-                ; open, but not that Delete would succeed: a read-only file opens
-                ; for DELETE and still fails DeleteFile until the attribute is
-                ; cleared, which the purge does not do. Report that standing
-                ; cause instead of calling the failure transient.
-                System::Call 'kernel32::CloseHandle(p R1)'
-                System::Call 'kernel32::GetFileAttributesW(w "$INSTDIR\$StaleFindName") i.R3'
-                ${If} $R3 = -1
-                    StrCpy $R0 "a delete-access open now succeeds, but its attributes could not be read"
+                ; The open worked, which says nothing about Delete: a DLL a running
+                ; process has mapped opens for DELETE and still refuses DeleteFile, and
+                ; a read-only file does the same until its attribute is cleared. Ask
+                ; Windows the question the purge actually asks - mark the file for
+                ; deletion on close, then cancel that again. This is the same request
+                ; DeleteFile makes on a temporary handle, so its answer says whether a
+                ; delete would succeed now.
+                ClearErrors
+                System::Call '*(&i1 1) p.R4'
+                System::Call 'kernel32::SetFileInformationByHandle(p R1, i 4, p R4, i 1) i.R5 ?e'
+                ${If} ${Errors}
+                    StrCpy $R0 "a delete-access open now succeeds, but Windows could not be asked whether it would delete it"
                 ${Else}
+                    Pop $R6
+                    ${If} $R5 != 0
+                        ; Accepted: cancel the mark again, so this stays a question and
+                        ; does not turn into the deletion it is asking about. A cancel
+                        ; that fails leaves the file to go when the handle closes, which
+                        ; is what the purge wanted anyway; the line says so.
+                        ClearErrors
+                        System::Call '*(&i1 0) p.R4'
+                        System::Call 'kernel32::SetFileInformationByHandle(p R1, i 4, p R4, i 1) i.R5 ?e'
+                        ${If} ${Errors}
+                            StrCpy $R0 "a delete would succeed now, but the check could not undo the mark it set"
+                        ${Else}
+                            Pop $R6
+                            ${If} $R5 != 0
+                                StrCpy $R0 "a delete would succeed now - the earlier failure was transient"
+                            ${Else}
+                                StrCpy $R0 "a delete would succeed now, and it is marked for deletion from here on"
+                            ${EndIf}
+                        ${EndIf}
+                    ${Else}
+                        StrCpy $0 $R6
+                        Call GetWin32ErrorText
+                        StrCpy $R0 "a delete-access open now succeeds, but Windows refused to mark it for deletion: win32 error $R6: $R0"
+                    ${EndIf}
+                ${EndIf}
+                System::Call 'kernel32::CloseHandle(p R1)'
+                ; The read-only attribute is a cause on its own, and the purge clears it
+                ; before every attempt, so a survivor that is read-only had it set again.
+                System::Call 'kernel32::GetFileAttributesW(w "$INSTDIR\$StaleFindName") i.R3'
+                ${If} $R3 != -1
                     IntOp $R3 $R3 & 1
                     ${If} $R3 = 1
-                        StrCpy $R0 "a delete-access open now succeeds, but it is still read-only, which Delete does not clear"
-                    ${Else}
-                        StrCpy $R0 "a delete-access open now succeeds"
+                        StrCpy $R0 "$R0; it is read-only again"
                     ${EndIf}
                 ${EndIf}
             ${Else}
@@ -1271,45 +1922,35 @@ Function LogStaleRuntimeDiagnostics
     Call LogProcessesUsingInstallDir
 FunctionEnd
 
-; Names the applications and services that still have the install directory's files
-; open or mapped. Writes one line to the log and sets $HolderFound (1 when anything was
-; named), so the abort message can repeat that line to the user.
+; Names the applications and services that still have the payload open or mapped.
+; Writes one line to the log and sets $HolderFound (1 when anything was named), so the
+; abort message can repeat that line to the user.
 ;
-; The lookup is a small executable built from tools/installer-holder-probe, extracted to
-; $PLUGINSDIR only when the purge has already failed: the successful path pays nothing
-; for it, and $PLUGINSDIR takes it away again when the installer exits. It is compiled by
-; the same Windows build that compiles this installer, which is what lets it call the
-; Restart Manager API directly. The same call made from this script would have to
-; marshal RM_PROCESS_INFO through System::Call as a table of hand-computed offsets, and
-; that table is precisely what cannot be checked without a Windows toolchain; in
-; compiled code the layout belongs to the Windows SDK header.
+; The lookup is tools/installer-holder-probe, the same executable the guard runs before
+; anything is replaced; here it answers the other question, about files a purge could not
+; remove. It asks the Restart Manager (RmRegisterResources/RmGetList), which names a
+; process holding a plain handle on a file - an antivirus scanner - and names services as
+; well as user programs, and it adds every payload program running from the directory
+; itself - not one in a folder below it, which is another application the user installed
+; there - because a running instance holds its payload as mapped images rather than as open
+; handles and the Restart Manager does not reliably report those. Its remaining blind spot
+; is a handle taken in kernel mode, where there is no process to name; a payload executable
+; among the files then still refuses to be replaced, and the probe answers with that file
+; instead of naming nothing.
 ;
-; Restart Manager is what makes the answer complete. Walking processes can only name one
-; whose image lives here or that loaded one of these libraries, while Restart Manager
-; names a process that holds a plain handle on a file - an antivirus scanner - and names
-; services as well as user programs. Its blind spot is a handle taken in kernel mode,
-; where there is no process to name; then the codes logged above are the whole story, and
-; the probe says so by naming nothing rather than by failing.
-;
-; $INSTDIR travels through the same COCKATRICE_GUARD_DIR environment variable the
-; running-instance guard uses, so a path with spaces or apostrophes never has to be
-; embedded in a command line.
+; $INSTDIR travels through the same COCKATRICE_GUARD_DIR environment variable the guard
+; uses, so a path with spaces or apostrophes never has to be embedded in a command line.
 Function LogProcessesUsingInstallDir
     StrCpy $HolderExit 0
     StrCpy $HolderOutput ""
     StrCpy $HolderFound 0
-    InitPluginsDir
-    ; Embedded by the same relative path that resolves NSIS.definitions.nsh above (both
-    ; are built into the build root, which is three levels up from project.nsi).
-    File "/oname=$PLUGINSDIR\installer-holder-probe.exe" "..\..\..\installer-holder-probe.exe"
-    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$INSTDIR")'
-    ; /TIMEOUT because this runs on the abort path, ahead of the message box: one call
-    ; into the Restart Manager cannot take the minute a walk over every process can, but
-    ; if that service stalls it must not leave the installer hanging with nothing on
-    ; screen. On a timeout nsExec reports it through the exit code like any other failure.
-    nsExec::ExecToStack /TIMEOUT=20000 '"$PLUGINSDIR\installer-holder-probe.exe"'
-    Pop $HolderExit
-    Pop $HolderOutput
+    ; The directory that just failed the purge, not whatever a check before the directory
+    ; page looked at: a portable install into a custom folder reaches here with the two
+    ; being different.
+    StrCpy $GuardDir $INSTDIR
+    Call RunHolderProbe
+    StrCpy $HolderExit $GuardExit
+    StrCpy $HolderOutput $GuardOutput
     ; The exit code, not the text, decides what happened: it cannot be mangled by what
     ; nsExec leaves on the end of the captured output. 1 = the line below names what is
     ; holding the files, 0 = nothing holds them any more, anything else = the probe could
@@ -1317,149 +1958,99 @@ Function LogProcessesUsingInstallDir
     ${If} $HolderExit == "1"
         StrCpy $HolderFound 1
     ${ElseIf} $HolderExit == "0"
-        StrCpy $HolderOutput "nothing is holding them any more"
+        StrCpy $HolderOutput "nothing is holding them and no payload program is running from the directory"
     ${Else}
-        StrCpy $HolderOutput "the holder probe could not run: $HolderOutput"
+        StrCpy $HolderOutput "the holder probe could not name what holds them: $HolderOutput"
     ${EndIf}
     !insertmacro CockLog "holders: $HolderOutput"
 FunctionEnd
 
-; Uninstaller copies of the same routines (the uninstaller gets its own
-; function set compiled in, it cannot call the installer functions).
-Function un.IsAppRunning
-    ; An unset $GuardDir would match every process that merely shares the image
-    ; name, see IsAppRunning in the installer.
-    ${If} $GuardDir == ""
-        StrCpy $R0 2
+; Called after a purge left files behind and LogStaleRuntimeDiagnostics named who is
+; holding them. Instead of aborting straight away - which on /R strands the user, since
+; the old version is already uninstalled - it closes once, purges again, and only then
+; asks: end what is still holding the files, or try the removal again by hand. Sets
+; $StaleRuntimeAfterPurge to the last purge's verdict, so the caller still aborts when the
+; files survive.
+;
+; The shape is the guard's, deliberately: one automatic attempt at a graceful close, then a
+; prompt whose Yes ends the payload programs and whose No retries. A client that was still
+; shutting down releases the files in the automatic round and never sees a question, and an
+; Oracle or Servatrice - which a close cannot reach - is what the prompt exists for, so the
+; user is never left with a dialog whose answers cannot free anything.
+;
+; The automatic close is a request (WM_CLOSE) and the client keeps the last word: it may be
+; waiting for an answer to its own "really quit?" confirmation (a running card database
+; update, an open game, an unsaved deck), and that stays its decision. The instance is
+; brought forward first, so that confirmation is on screen rather than behind this
+; installer's prompt.
+;
+; Ending is the same last resort the guard offers, with the same cost spelled out, and only
+; ever the programs the payload installs - see EndHolders.
+;
+; Restart Manager's RmShutdown was the alternative and was rejected: it shuts down
+; services as well as applications, and the only way to bring them back is RmRestart,
+; which would restart this very application into files that are about to be replaced.
+;
+; Always offered, in every mode: a /S install without /R is the only case without someone
+; at the keyboard, and this installer does not promise unattended runs - if an error needs
+; a decision, it asks for one. No offer when the probe named nobody: there is nothing to
+; end, and the abort's per-file diagnostics already record what Windows said.
+;
+; One question after the automatic close, and never a loop: Yes ends the programs the
+; payload installs - and says so, because anything else the probe named is left to the user -
+; and purges again; the other answer gives up, and the caller's abort names what survived.
+; The listing is re-read before the question, so it says what is left now rather than
+; repeating the first one.
+Function RecoverFromHolders
+    ${If} $HolderFound != 1
+        !insertmacro CockLog "recover-holders: no holder was named, nothing to offer"
         Return
     ${EndIf}
-    ; Pass the directory to guard to PowerShell via an environment variable so
-    ; it never has to be embedded into the -Command string: apostrophes in a
-    ; path would terminate the command early, and the path in a -like pattern
-    ; would treat [ and ] as wildcard characters.
-    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
-    ; Exit the process explicitly so nsExec's pop reflects whether a matching
-    ; process was found: powershell.exe exits 0 whether or not the pipeline
-    ; produced objects. 0 = not running, 1 = running, anything else = could not
-    ; be determined (see un.IsProcessLookupAvailable).
-    ; Strict match: a readable path under $GuardDir, same as in the installer.
-    nsExec::ExecToLog 'powershell -NoProfile -Command "if (Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | Select-Object -First 1) { exit 1 } else { exit 0 }"'
-    Pop $R0
-    ${If} $R0 == "0"
-        StrCpy $R0 0
-    ${ElseIf} $R0 == "1"
-        StrCpy $R0 1
-    ${Else}
-        ; powershell.exe could not be run at all (nsExec pushes the string
-        ; "error"), or died with an unexpected code. That is "could not
-        ; determine", which has to stay distinguishable from "definitely
-        ; running": a state that can never clear would block the uninstaller
-        ; forever. un.IsProcessLookupAvailable warns about that case once.
-        StrCpy $R0 2
-    ${EndIf}
-FunctionEnd
-
-Function un.IsProcessLookupAvailable
-    nsExec::ExecToLog 'powershell -NoProfile -Command "exit 0"'
-    Pop $R0
-    ${If} $R0 == "0"
-        StrCpy $R0 1
-    ${Else}
-        StrCpy $R0 0
-    ${EndIf}
-FunctionEnd
-
-Function un.CloseMatchingApps
-    ; gracefully ask every matching instance to close (sends WM_CLOSE)
-    ;
-    ; Strict filter, same as in the installer: never close a process whose path
-    ; cannot be read, it is not necessarily one of ours.
-    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
-    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { $$null = $$_.CloseMainWindow() }"'
-    Pop $R3
-FunctionEnd
-
-Function un.ForceCloseApps
-    ; stop the matching instances by PID once the grace period is over, see
-    ; ForceCloseApps in the installer.
-    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
-    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { Stop-Process -Id $$_.Id -Force -ErrorAction SilentlyContinue }"'
-    Pop $R3
-FunctionEnd
-
-Function un.WaitForAppToClose
-    Call un.IsAppRunning
-    ; Only a definite "running" is worth waiting for, see WaitForAppToClose.
-    ${If} $R0 != 1
+    ; The automatic attempt, the same one the guard makes before it asks anything.
+    !insertmacro CockLog "recover-holders: closing cockatrice, then trying the removal again"
+    StrCpy $GuardDir $INSTDIR
+    Call CloseHolders
+    Call RetryDllPurge
+    StrCpy $StaleRuntimeAfterPurge $R0
+    !insertmacro CockLogListing "after-retry-purge" "*.dll"
+    !insertmacro CockLogListing "after-retry-plugins" "Plugins\*.*"
+    !insertmacro CockLog "recover-holders: stale-runtime after retry=$StaleRuntimeAfterPurge"
+    ${If} $StaleRuntimeAfterPurge = 0
+        DetailPrint "Files of the previous version were removed; continuing the installation."
         Return
     ${EndIf}
-
-    ${If} ${Silent}
-        DetailPrint "Closing $R1 ..."
-        Call un.CloseMatchingApps
-        ; wall-clock deadline: each poll has to spawn a fresh powershell.exe, so
-        ; a bare loop counter would not bound the real wait time to 60 s.
-        System::Call 'kernel32::GetTickCount()i.s'
-        Pop $R8
-        un_ck_wait_loop:
-        Sleep 500
-        Call un.IsAppRunning
-        ${If} $R0 = 0
-            DetailPrint "$R1 closed."
-            Return
-        ${EndIf}
-        ${If} $R0 != 1
-            Return
-        ${EndIf}
-        System::Call 'kernel32::GetTickCount()i.s'
-        Pop $R9
-        IntOp $R9 $R9 - $R8
-        ${If} $R9 < 60000
-            Goto un_ck_wait_loop
-        ${EndIf}
-        ; The grace period is over. Cockatrice is never force-stopped, see
-        ; WaitForAppToClose in the installer. A silent uninstall only reports
-        ; through the log and its exit code: it is also run unattended (the /R
-        ; updater uses it via QuietUninstallString, package managers use it
-        ; directly), and a message box would block there. The installer that ran
-        ; us reports the incomplete result to the user itself.
-        ${If} $AllowForceClose = 0
-            DetailPrint "$R1 is still running after 60 s; aborting so that no data is lost."
-            SetErrorLevel 1
-            Abort
-        ${EndIf}
-        DetailPrint "Force-stopping $R1 ..."
-        Call un.ForceCloseApps
-        Sleep 2000
-        Call un.IsAppRunning
-        ${If} $R0 = 0
-            DetailPrint "$R1 closed."
-            Return
-        ${EndIf}
-        ${If} $R0 != 1
-            Return
-        ${EndIf}
-        DetailPrint "$R1 is still running after 60 s; aborting."
-        SetErrorLevel 1
-        Abort
-    ${Else}
-        un_ck_wait_prompt:
-        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
-            "$R1 is still running.$\r$\n$\r$\nPlease close it, then click Retry.$\r$\nClick Cancel to abort." \
-            IDCANCEL un_ck_abort_install
-        Call un.IsAppRunning
-        ${If} $R0 = 0
-            Return
-        ${EndIf}
-        ${If} $R0 != 1
-            Return
-        ${EndIf}
-        Goto un_ck_wait_prompt
-        un_ck_abort_install:
-        Abort
+    ; Still stuck: refresh the names, so the prompt and the log describe what survived the
+    ; last attempt and not what was there before it.
+    Call LogStaleRuntimeDiagnostics
+    ${If} $HolderFound != 1
+        Return
     ${EndIf}
+    ; One question, the same one the guard asks and with the same two answers. No retry loop:
+    ; the purge has already been tried after the close, so the only thing that can still free
+    ; the files is ending them, and the caller's abort names whatever survives that.
+    !insertmacro CockEndPrompt "Files of the previous version of Cockatrice are still in use by:" $HolderOutput "installation"
+    MessageBox MB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2 "$GuardPrompt" IDYES rfh_end
+    !insertmacro CockLog "recover-holders: cancelled by user"
+    Return
+    ; Only reached through Yes: Return does not come back here.
+    rfh_end:
+    !insertmacro CockLog "recover-holders: ending the payload programs on request, then trying the removal again"
+    Call EndHolders
+    Call RetryDllPurge
+    StrCpy $StaleRuntimeAfterPurge $R0
+    !insertmacro CockLog "recover-holders: stale-runtime after end=$StaleRuntimeAfterPurge"
+    ${If} $StaleRuntimeAfterPurge = 0
+        DetailPrint "Files of the previous version were removed; continuing the installation."
+        Return
+    ${EndIf}
+    ; Refresh the names one last time so the abort that follows describes what survived the
+    ; end, and then let it stop the run: the same dialog again would only repeat itself.
+    Call LogStaleRuntimeDiagnostics
 FunctionEnd
 
+; Uninstaller copy of the guard (the uninstaller gets its own function set compiled in, it
+; cannot call the installer functions). ExtractHolderProbe and RunHolderProbe come from
+; CockHolderProbeFunctions above; only the policy differs.
 Function un.EnsureAppsNotRunning
     ; guards the install directory; the uninstaller only ever has to check this one
     StrCpy $GuardDir $INSTDIR
@@ -1467,29 +2058,80 @@ Function un.EnsureAppsNotRunning
 FunctionEnd
 
 Function un.GuardAppsNotRunning
-    Call un.IsProcessLookupAvailable
-    ${If} $R0 = 0
-        ; Same reasoning as in the installer: without PowerShell we cannot tell
-        ; whether a running instance still holds file locks, and refusing to
-        ; uninstall would leave the user with an uninstaller that never
-        ; completes. Warn once and continue.
-        DetailPrint "Could not start powershell.exe; skipping the running instance check. Close Cockatrice, Oracle and Servatrice manually if the uninstall reports a problem."
-        MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller could not check whether Cockatrice is still running, because powershell.exe could not be started.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice manually before continuing."
+    StrCpy $GuardCloseRounds 0
+    StrCpy $GuardRecheckCount 0
+    StrCpy $GuardLastHolders ""
+    un_guard_check:
+    !insertmacro CockLogUn "uninst-guard: checking $GuardDir"
+    Call un.RunHolderProbe
+    ${If} $GuardExit == "0"
+        !insertmacro CockLogUn "uninst-guard: nothing is holding the payload"
         Return
     ${EndIf}
-    StrCpy $R1 "cockatrice.exe"
-    StrCpy $R2 "cockatrice"
-    ; a GUI application with unsaved user data: graceful close only
-    StrCpy $AllowForceClose 0
-    Call un.WaitForAppToClose
-    StrCpy $R1 "oracle.exe"
-    StrCpy $R2 "oracle"
-    StrCpy $AllowForceClose 1
-    Call un.WaitForAppToClose
-    StrCpy $R1 "servatrice.exe"
-    StrCpy $R2 "servatrice"
-    StrCpy $AllowForceClose 1
-    Call un.WaitForAppToClose
+    ${If} $GuardExit == "1"
+        !insertmacro CockLogUn "uninst-guard: still in use by $GuardOutput"
+        ; Same convenience as in the installer: ask every instance to close, repeat only
+        ; while the set changed, then report what the close could not reach.
+        ${If} $GuardCloseRounds < 2
+        ${AndIf} $GuardOutput != $GuardLastHolders
+            StrCpy $GuardLastHolders $GuardOutput
+            IntOp $GuardCloseRounds $GuardCloseRounds + 1
+            !insertmacro CockLogUn "uninst-guard: asking the payload programs to close (round $GuardCloseRounds)"
+            Call un.CloseHolders
+            Goto un_guard_check
+        ${EndIf}
+        DetailPrint "The install directory is in use by: $GuardOutput"
+        ; Same question and the same three answers as the installer's guard: force close,
+        ; close by hand and check again, or abort. CockEndRecheckPrompt words it, so the two
+        ; copies promise the same thing.
+        !insertmacro CockEndRecheckPrompt "Cockatrice, Oracle or Servatrice is still using files of the installation:" $GuardOutput "uninstallation"
+        MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 "$GuardPrompt" IDYES un_guard_end IDNO un_guard_recheck
+        !insertmacro CockLogUn "uninst-guard: cancelled by user after $GuardRecheckCount recheck(s)"
+        ; The installer's Cancel lands in AbortInstall, which explains what to do next. The
+        ; uninstaller has no such dialog, so say the same thing here: a bare Abort would
+        ; close the window and leave the user with no reason and no next step.
+        MessageBox MB_OK|MB_ICONEXCLAMATION \
+            "The uninstallation was cancelled because Cockatrice, Oracle or Servatrice is still running and holding files of the installation.$\r$\n$\r$\n${AFTER_CLOSING_GUIDANCE}$\r$\n$\r$\nClose them and run the uninstaller again."
+        SetErrorLevel 1
+        Abort
+        un_guard_recheck:
+        IntOp $GuardRecheckCount $GuardRecheckCount + 1
+        !insertmacro CockLogUn "uninst-guard: user closed programs by hand, checking again (recheck $GuardRecheckCount)"
+        StrCpy $GuardCloseRounds 0
+        StrCpy $GuardLastHolders ""
+        Goto un_guard_check
+        ; Only reached through Yes: Abort does not return.
+        un_guard_end:
+        !insertmacro CockLogUn "uninst-guard: ending the payload programs on request, then checking again"
+        Call un.EndHolders
+        ; One measurement and a stop, not another question: what survived a terminate is a
+        ; program this uninstaller may not open or does not own, and ending it again cannot
+        ; change that.
+        Call un.RunHolderProbe
+        ${If} $GuardExit == "0"
+            !insertmacro CockLogUn "uninst-guard: nothing is holding the payload"
+            Return
+        ${EndIf}
+        !insertmacro CockLogUn "uninst-guard: still in use after ending them ($GuardExit): $GuardOutput"
+        SetErrorLevel 1
+        Abort
+    ${EndIf}
+    ; Same reasoning as in the installer: without an answer from the probe we cannot tell
+    ; whether a running instance still holds file locks, and refusing outright would leave
+    ; the user with an uninstaller that never completes. Same three answers too, so an
+    ; uninstall that hits a Restart Manager that was busy, or a payload program the user has
+    ; not closed yet, can simply be retried.
+    !insertmacro CockLogUn "uninst-guard: the holder probe could not answer ($GuardExit): $GuardOutput"
+    DetailPrint "Could not confirm whether Cockatrice is still running: $GuardOutput"
+    MessageBox MB_ABORTRETRYIGNORE|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
+        "This uninstaller could not confirm whether Cockatrice, Oracle or Servatrice is still running.$\r$\n$\r$\nThe check reported: $GuardOutput$\r$\n$\r$\nClose them, then choose Retry to check again. Choose Ignore to uninstall anyway, or Abort to cancel the uninstallation." \
+        IDRETRY un_guard_check IDABORT un_guard_unknown_abort
+    !insertmacro CockLogUn "uninst-guard: continuing without an answer from the probe"
+    Return
+    un_guard_unknown_abort:
+    !insertmacro CockLogUn "uninst-guard: cancelled after the probe could not answer"
+    SetErrorLevel 1
+    Abort
 FunctionEnd
 
 Function PortableModePageCreate
@@ -1545,7 +2187,10 @@ ${If} $PortableMode = 0
 
     ${If} $ReinstallMode = 0
         MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
-        Abort
+        ; Abort would only skip this page and install over the old version anyway;
+        ; the message said the old one must go first, so Cancel means cancel.
+        !insertmacro CockLog "componentsPagePre: cancelled at the previous-version prompt"
+        Quit
     ${Else}
         Goto uninst32
     ${EndIf}
@@ -1562,10 +2207,24 @@ ${If} $PortableMode = 0
     StrCpy $OldUninstallString $R0
     Call EnsureOldInstallNotRunning
     StrCpy $OldInstallDir $GuardDir
+    ; Run it silently. The question above is the one the user answered; the
+    ; uninstaller's own confirmation page would be a second one, and that one opens
+    ; behind this window, where nobody can answer it. The installer then looks hung,
+    ; the user clicks Next on it, the new version is installed, and the uninstaller
+    ; removes everything once this window closes. /S leaves no window to be behind,
+    ; so ExecWait is waiting for something that cannot outlive it.
+    ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
+    ${If} $R1 == ""
+        StrCpy $OldUninstallString "$OldUninstallString /S"
+    ${Else}
+        StrCpy $OldUninstallString $R1
+    ${EndIf}
     !insertmacro CockLog "componentsPagePre: old 32-bit uninstall '$OldUninstallString _?=$OldInstallDir' (oldDir=$OldInstallDir InstDir=$INSTDIR)"
     ClearErrors
     Call BackupUserDataBeforeUninstall
-    ExecWait "$OldUninstallString _?=$OldInstallDir"
+    Call RunOldUninstaller
+    !insertmacro CockLog "componentsPagePre: old 32-bit uninstall exit=$OldUninstallExit"
+    Call WaitForOldPayloadToDisappear
     Call RestoreUserDataAfterUninstall
 
 	done32:
@@ -1579,7 +2238,8 @@ ${If} $PortableMode = 0
 
 	    ${If} $ReinstallMode = 0
             MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
-            Abort
+            !insertmacro CockLog "componentsPagePre: cancelled at the previous-version prompt"
+            Quit
         ${Else}
             Goto uninst64
         ${EndIf}
@@ -1588,10 +2248,19 @@ ${If} $PortableMode = 0
 	    StrCpy $OldUninstallString $R0
 	    Call EnsureOldInstallNotRunning
 	    StrCpy $OldInstallDir $GuardDir
+	    ; Silent, for the reason given in the 32-bit branch above.
+	    ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
+	    ${If} $R1 == ""
+	        StrCpy $OldUninstallString "$OldUninstallString /S"
+	    ${Else}
+	        StrCpy $OldUninstallString $R1
+	    ${EndIf}
 	    !insertmacro CockLog "componentsPagePre: old 64-bit uninstall '$OldUninstallString _?=$OldInstallDir' (oldDir=$OldInstallDir InstDir=$INSTDIR)"
 	    ClearErrors
 	    Call BackupUserDataBeforeUninstall
-	    ExecWait "$OldUninstallString _?=$OldInstallDir"
+	    Call RunOldUninstaller
+	    !insertmacro CockLog "componentsPagePre: old 64-bit uninstall exit=$OldUninstallExit"
+	    Call WaitForOldPayloadToDisappear
 	    Call RestoreUserDataAfterUninstall
 
 		done64:
@@ -1631,6 +2300,23 @@ ${If} $ReinstallMode = 0
     Call EnsureAppsNotRunning
 ${EndIf}
 
+; Measured before either purge block, because it has to describe the directory as
+; it arrived here and not what a purge left of it: IsExistingCockatriceInstall
+; looks for cockatrice.exe, oracle.exe, servatrice.exe, uninstall.exe, Qt6*.dll
+; and qt.conf, and the portable purge below deletes exactly those. Taken after
+; that purge it answered "not an install" as soon as the only survivor was a file
+; it does not look for - a locked abseil_dll.dll or libssl-3-x64.dll, say - and
+; the abort further down was then skipped for the very directory the purge had
+; just failed in.
+; Remembered because the stale-runtime check below must only ever fire for a
+; directory this installer recognised as a Cockatrice install. Scanning for
+; leftovers in an unrelated directory (a first-time install into a folder that
+; happens to hold some Qt5 DLLs, say) would otherwise turn those files into an
+; abort reason even though the payload is about to overwrite nothing of theirs.
+Call IsExistingCockatriceInstall
+!insertmacro CockLog "section: IsExistingCockatriceInstall=$R0"
+StrCpy $IsUpgrade $R0
+
 ${If} $PortableMode = 1
 ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	; upgrade portable mode
@@ -1654,7 +2340,12 @@ ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	; what this has to guarantee is that nothing from the previous build is left
 	; to be loaded next to the new executables. Naming the families by hand is
 	; what let abseil_dll.dll through; see HasStaleRuntimeFiles.
-	Delete "$INSTDIR\*.dll"
+	Call RetryDllPurge
+	; The purge's own verdict: HasStaleRuntimeFiles measures *.dll + Plugins\*.*,
+	; the set that catches any leftover runtime DLL, Qt or otherwise. Held in a
+	; variable because $R0 is reused by the next function call in this section.
+	StrCpy $StaleRuntimeAfterPurge $R0
+	StrCpy $DllPurgeRan 1
 	Delete "$INSTDIR\qt.conf"
 	Delete "$INSTDIR\qdebug.txt"
 	Delete "$INSTDIR\servatrice.sql"
@@ -1685,25 +2376,13 @@ ${EndIf}
 ; checked without a Windows toolchain. Compiled by the same build that compiles this
 ; installer, the layout belongs to the Windows SDK, and .ci/compile.sh runs the probe
 ; on the Windows runners instead of trusting that it compiles.
-Call IsExistingCockatriceInstall
-!insertmacro CockLog "section: IsExistingCockatriceInstall=$R0"
-; Remembered because the stale-runtime check below must only ever fire for a
-; directory this installer recognised as a Cockatrice install. Scanning for
-; leftovers in an unrelated directory (a first-time install into a folder that
-; happens to hold some Qt5 DLLs, say) would otherwise turn those files into an
-; abort reason even though the payload is about to overwrite nothing of theirs.
-StrCpy $IsUpgrade $R0
 ${If} $PortableMode = 0
-${AndIf} $R0 = 1
+${AndIf} $IsUpgrade = 1
 	!insertmacro CockLog "section: non-portable upgrade purge"
 	!insertmacro CockLogListing "before-purge" "*.dll"
-	RMDir /r "$INSTDIR\Plugins"
-	; RMDir /r reports a failure only through the error flag, and only as a
-	; boolean; the surviving file names come from the listing below.
-	${If} ${FileExists} "$INSTDIR\Plugins\*.*"
-		!insertmacro CockLog "purge: '$INSTDIR\Plugins' could not be removed completely"
-	${EndIf}
-	Delete "$INSTDIR\*.dll"
+	Call RetryDllPurge
+	StrCpy $StaleRuntimeAfterPurge $R0
+	StrCpy $DllPurgeRan 1
 	!insertmacro CockLogListing "after-purge" "*.dll"
 	!insertmacro CockLogListing "after-plugins" "Plugins\*.*"
 ${EndIf}
@@ -1718,28 +2397,77 @@ ${EndIf}
 ; run on Windows or it contains an error", so stop here instead of compounding
 ; it. Nothing of the new payload has been written at this point, so the next run,
 ; with the applications closed, gets a clean install.
+; $StaleRuntimeAfterPurge is RetryDllPurge's verdict, measured with
+; HasStaleRuntimeFiles (*.dll + Plugins\*.*) - the set that catches any leftover
+; runtime DLL, Qt or otherwise. It exists only when a purge ran, and the two
+; purge blocks above cover every upgrade except one: a portable install into a
+; directory without portable.dat is neither of them, so that directory is
+; measured here instead. A test of $IsUpgrade alone could not stand in for it -
+; that only says the directory was ours before the purge, not what the purge
+; left behind.
+; A directory this installer did not recognise as an install never aborts: the
+; unrelated DLLs already in it (a first-time install into a folder that happens
+; to hold some Qt5 DLLs, say) are not leftovers, and the payload overwrites
+; nothing of theirs.
 ${If} $IsUpgrade = 1
-    Call HasStaleRuntimeFiles
-    !insertmacro CockLog "section: HasStaleRuntimeFiles=$R0"
+    ${If} $DllPurgeRan = 0
+        !insertmacro CockLog "section: no purge applies, measuring the directory instead"
+        Call HasStaleRuntimeFiles
+        StrCpy $StaleRuntimeAfterPurge $R0
+    ${EndIf}
+    !insertmacro CockLog "section: stale-runtime after purge=$StaleRuntimeAfterPurge"
 ${Else}
-    StrCpy $R0 0
+    StrCpy $StaleRuntimeAfterPurge 0
 ${EndIf}
-${If} $R0 = 1
+${If} $StaleRuntimeAfterPurge = 1
+    !insertmacro CockLog "section: files of a previous version survived the purge"
+    ; Who is holding the payload is recorded first, so the log that reaches us
+    ; answers the question the message can only guess at, and so the prompt can
+    ; name them and offer to close the ones this installer owns.
+    Call LogStaleRuntimeDiagnostics
+    ${If} $HolderFound = 1
+        ; On /R the previous version is already uninstalled at this point, so an abort
+        ; leaves the user with no working Cockatrice. It closes once, then offers to end
+        ; what is left; this updates $StaleRuntimeAfterPurge with the verdict after that
+        ; close, or after the end when the user asked for one.
+        Call RecoverFromHolders
+    ${Else}
+        ; Nothing is holding them. The three attempts in RetryDllPurge were two seconds
+        ; apart and all failed with no process to blame, which is the transient case a
+        ; virus scanner or a background indexer creates - or a permission problem that
+        ; will not clear. Give the delete one last chance before giving up: it costs a
+        ; second on a path that is about to abort anyway, and it keeps a lock that was
+        ; released in the meantime from turning into a failed upgrade.
+        !insertmacro CockLog "section: no holder named, one final purge attempt"
+        Sleep 1000
+        Call RetryDllPurge
+        StrCpy $StaleRuntimeAfterPurge $R0
+        !insertmacro CockLog "section: final-purge stale-runtime=$StaleRuntimeAfterPurge"
+    ${EndIf}
+${EndIf}
+${If} $StaleRuntimeAfterPurge = 1
     !insertmacro CockLog "section: aborting, files of a previous version survived the purge"
     DetailPrint "Files of a previous version could not be removed; aborting the installation."
-    ; Who is holding the payload is recorded before the abort, so the log that
-    ; reaches us answers the question the message can only guess at, and so the
-    ; message can name the processes to close whenever any were found.
-    Call LogStaleRuntimeDiagnostics
-    ; The in-app updater runs this installer silent and detached and never looks
-    ; at its exit code, so the user has to be told what happened. A /S install
-    ; without /R is unattended (a package manager, for instance) and a message
-    ; box there would block forever, so that case only reports through the log
-    ; and the exit code. AbortInstall owns that decision.
+    ; Say what is known and nothing more: the guard ran before anything was replaced,
+    ; so "most likely still running" is no longer a fair guess and would send the user
+    ; to close programs that are already closed.
     StrCpy $AbortReason \
-        "The installation could not remove all files of a previous version of Cockatrice, most likely because it is still running or was started as administrator, and was cancelled rather than leave a mismatched install behind.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
+        "The installation could not remove all files of a previous version of Cockatrice, and was cancelled rather than leave a mismatched installation behind."
     ${If} $HolderFound = 1
-        StrCpy $AbortReason "$AbortReason$\r$\n$\r$\nStill using the install directory:$\r$\n$HolderOutput"
+        StrCpy $AbortReason "$AbortReason$\r$\n$\r$\nStill using the install directory:$\r$\n$HolderOutput$\r$\n$\r$\nClose them and run the installer again."
+    ${ElseIf} $HolderExit == "0"
+        StrCpy $AbortReason "$AbortReason$\r$\n$\r$\nNo running program was found using those files. A file permission or a virus scanner may be preventing their removal; the installer log records what Windows reported for each file."
+    ${Else}
+        ; The check itself failed, so "no running program was found" would be a claim this
+        ; installer cannot make. Name the failure instead, and leave the per-file codes to
+        ; the log, where they already are.
+        StrCpy $AbortReason "$AbortReason$\r$\n$\r$\nThe check for a running program could not be completed: $HolderOutput$\r$\n$\r$\nClose Cockatrice, Oracle and Servatrice and run the installer again; the installer log records what Windows reported for each file."
+    ${EndIf}
+    ; "Run the installer again" is not enough on an in-app update: the old version
+    ; was uninstalled before the purge, so point at the installer that was downloaded.
+    ${If} $ReinstallMode = 1
+    ${AndIf} $PortableMode = 0
+        StrCpy $AbortReason "$AbortReason$\r$\n$\r$\nThe previous version has already been removed. To finish the update, run this installer again:$\r$\n$EXEPATH"
     ${EndIf}
     Call AbortInstall
 ${EndIf}
diff --git a/cmake/SendInstallerLog.ps1.in b/cmake/SendInstallerLog.ps1.in
index dfb8c3d63..585c726dd 100644
--- a/cmake/SendInstallerLog.ps1.in
+++ b/cmake/SendInstallerLog.ps1.in
@@ -57,6 +57,29 @@ try {
         }
     }
 
+    # --- What was holding the files, read from the log as well -------------------
+    # The guard and the close attempt each log one line naming every holder and what
+    # happened to it. Carrying the last of each as event data keeps an abort caused by
+    # a running instance actionable without opening the attachment. Kept out of the
+    # message so the issue still groups on the reason alone.
+    $Holders = ''
+    $CloseResult = ''
+    $EndResult = ''
+    if (Test-Path -LiteralPath $LogPath) {
+        $holderLine = Select-String -LiteralPath $LogPath -Pattern 'guard: still in use by (.*)$' | Select-Object -Last 1
+        if ($holderLine) {
+            $Holders = $holderLine.Matches[0].Groups[1].Value
+        }
+        $closeLine = Select-String -LiteralPath $LogPath -Pattern '(close-holders: .*)$' | Select-Object -Last 1
+        if ($closeLine) {
+            $CloseResult = $closeLine.Matches[0].Groups[1].Value
+        }
+        $endLine = Select-String -LiteralPath $LogPath -Pattern '(end-holders: .*)$' | Select-Object -Last 1
+        if ($endLine) {
+            $EndResult = $endLine.Matches[0].Groups[1].Value
+        }
+    }
+
     # --- Event ---------------------------------------------------------------
     $eventId = [guid]::NewGuid().ToString('N')
     $now = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ')
@@ -75,6 +98,9 @@ try {
         extra = @{
             reason = $Reason
             os = [System.Environment]::OSVersion.VersionString
+            holders = $Holders
+            close_result = $CloseResult
+            end_result = $EndResult
         }
     }
     $eventJson = $sentryEvent | ConvertTo-Json -Compress -Depth 6
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index bec858dcb..f34961b0b 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -15,6 +15,7 @@ set(cockatrice_SOURCES
     src/client/network/update/client/client_update_checker.cpp
     src/client/network/update/client/release_channel.cpp
     src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+    src/client/network/update/card_spoiler/spoiler_file.cpp
     src/client/crash/crash_reporter.cpp
     src/client/latency_graph_widget.cpp
     src/client/latency_status_widget.cpp
@@ -25,9 +26,7 @@ set(cockatrice_SOURCES
     src/client/settings/shortcut_treeview.cpp
     src/client/settings/shortcuts_settings.cpp
     src/interface/deck_loader/card_node_function.cpp
-    src/interface/deck_loader/deck_file_format.cpp
     src/interface/deck_loader/deck_loader.cpp
-    src/interface/deck_loader/loaded_deck.cpp
     src/interface/widgets/dialogs/dlg_connect.cpp
     src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -58,6 +57,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_settings.cpp
     src/interface/widgets/dialogs/dlg_startup_card_check.cpp
     src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+    src/interface/widgets/dialogs/dlg_turn_order.cpp
     src/interface/widgets/dialogs/dlg_update.cpp
     src/interface/widgets/dialogs/dlg_view_log.cpp
     src/interface/widgets/dialogs/override_printing_warning.cpp
@@ -71,36 +71,27 @@ set(cockatrice_SOURCES
     src/filters/filter_builder.cpp
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
-    src/game/abstract_game.cpp
-    src/game/arrow_registry.cpp
     src/game_graphics/board/abstract_card_drag_item.cpp
     src/game_graphics/board/abstract_card_item.cpp
     src/game_graphics/board/abstract_counter.cpp
-    src/game/board/arrow_data.cpp
     src/game_graphics/board/arrow_item.cpp
+    src/game_graphics/board/arrow_registry.cpp
     src/game_graphics/board/arrow_target.cpp
     src/game_graphics/board/card_drag_item.cpp
     src/game_graphics/board/card_item.cpp
-    src/game/board/card_list.cpp
-    src/game/board/card_state.cpp
     src/game_graphics/board/counter_general.cpp
-    src/game/board/counter_state.cpp
     src/game_graphics/board/translate_counter_name.cpp
     src/game_graphics/deckview/deck_view.cpp
     src/game_graphics/deckview/deck_view_container.cpp
     src/game_graphics/deckview/tabbed_deck_view_container.cpp
+    src/game_graphics/dialogs/dlg_annotation.cpp
     src/game_graphics/dialogs/dlg_create_token.cpp
     src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
     src/game_graphics/dialogs/dlg_roll_dice.cpp
-    src/game/game.cpp
-    src/game/game_event_handler.cpp
-    src/game/game_meta_info.cpp
     src/game_graphics/game_scene.cpp
-    src/game/game_state.cpp
     src/game_graphics/game_view.cpp
     src/game_graphics/hand_counter.cpp
     src/game_graphics/log/message_log_widget.cpp
-    src/game/phase.cpp
     src/game_graphics/phases_toolbar.cpp
     src/game_graphics/player/menu/card_menu.cpp
     src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -118,23 +109,11 @@ set(cockatrice_SOURCES
     src/game_graphics/tally/stats_tally.cpp
     src/game_graphics/tally/subtype_tally.cpp
     src/game_graphics/tally/tally.cpp
-    src/game/player/player_actions.cpp
     src/game_graphics/player/player_area.cpp
     src/game_graphics/player/player_dialogs.cpp
-    src/game/player/player_event_handler.cpp
     src/game_graphics/player/player_graphics_item.cpp
-    src/game/player/player_info.cpp
     src/game_graphics/player/player_list_widget.cpp
-    src/game/player/player_logic.cpp
-    src/game/player/player_manager.cpp
     src/game_graphics/player/player_target.cpp
-    src/game/replay.cpp
-    src/game/zones/card_zone_logic.cpp
-    src/game/zones/hand_zone_logic.cpp
-    src/game/zones/pile_zone_logic.cpp
-    src/game/zones/stack_zone_logic.cpp
-    src/game/zones/table_zone_logic.cpp
-    src/game/zones/view_zone_logic.cpp
     src/game_graphics/zones/card_zone.cpp
     src/game_graphics/zones/hand_zone.cpp
     src/game_graphics/zones/pile_zone.cpp
@@ -172,11 +151,13 @@ set(cockatrice_SOURCES
     src/interface/widgets/utility/reversed_completer_model.cpp
     src/interface/pixel_map_generator.cpp
     src/interface/theme_config.cpp
+    src/interface/theme_icon.cpp
     src/interface/theme_manager.cpp
     src/interface/palette_editor/color_button.cpp
     src/interface/palette_editor/palette_generator.cpp
     src/interface/palette_editor/quick_setup_panel.cpp
     src/interface/palette_editor/palette_grid_widget.cpp
+    src/interface/palette_editor/font_grid_widget.cpp
     src/interface/palette_editor/palette_editor_dialog.cpp
     src/interface/widgets/cards/additional_info/color_identity_widget.cpp
     src/interface/widgets/cards/additional_info/deck_color_identity.cpp
@@ -194,6 +175,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/cards/card_info_picture_widget.cpp
     src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
     src/interface/widgets/cards/card_info_text_widget.cpp
+    src/interface/widgets/cards/card_picture_delegate.cpp
     src/interface/widgets/cards/card_size_widget.cpp
     src/interface/widgets/cards/deck_card_zone_display_widget.cpp
     src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
@@ -271,6 +253,8 @@ set(cockatrice_SOURCES
     src/interface/widgets/playmat/playmat_settings_dialog.cpp
     src/interface/widgets/quick_settings/settings_button_widget.cpp
     src/interface/widgets/quick_settings/settings_popup_widget.cpp
+    src/interface/widgets/replay/replay_event_index.cpp
+    src/interface/widgets/replay/replay_event_sidebar.cpp
     src/interface/widgets/replay/replay_manager.cpp
     src/interface/widgets/replay/replay_quick_settings_widget.cpp
     src/interface/widgets/replay/replay_timeline_widget.cpp
@@ -313,6 +297,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/utility/sequence_edit.cpp
     src/interface/widgets/utility/visibility_change_listener.cpp
     src/interface/widgets/utility/visibility_change_listener.h
+    src/interface/widgets/visual_database_display/card_database_visual_view.cpp
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
@@ -345,6 +330,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
+    src/installer_close_server.cpp
     src/main.cpp
     src/single_instance_manager.cpp
     src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -450,6 +436,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
     src/interface/widgets/utility/compact_push_button.cpp
     src/interface/widgets/utility/compact_push_button.h
+    src/installer_close_server.h
     src/single_instance_manager.h
     src/client/url_scheme_event_filter.h
     src/interface/intents/intent_connect_to_server.cpp
@@ -468,6 +455,8 @@ set(cockatrice_SOURCES
     src/interface/intents/intent_open_shared_deck.h
     src/interface/intents/url_parser.cpp
     src/interface/intents/url_parser.h
+    src/interface/widgets/server/user/user_games_model.cpp
+    src/interface/widgets/server/user/user_games_model.h
     src/interface/widgets/server/user/user_info_popup.cpp
     src/interface/widgets/server/user/user_info_popup.h
 )
@@ -511,7 +500,15 @@ if(APPLE)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 endif(APPLE)
 
-qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+# The fonts and card artwork produce a large C++ byte array with qt_add_resources.
+# Embed the data in the compiled resource object instead, keeping compiler memory
+# independent of that payload. Qt's two-pass resource build is unsupported on iOS.
+if(IOS)
+  qt_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+else()
+  qt_add_big_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+endif()
+set_source_files_properties(${cockatrice_RESOURCES} PROPERTIES SKIP_AUTORCC ON)
 
 # Declare path variables
 set(ICONDIR
@@ -532,11 +529,12 @@ set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translation
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
 
-qt6_add_executable(
+qt_add_executable(
   cockatrice
   WIN32
   MACOSX_BUNDLE
   ${cockatrice_SOURCES}
+  ${cockatrice_RESOURCES}
   ${cockatrice_RESOURCES_RCC}
   ${cockatrice_MOC_SRCS}
   MANUAL_FINALIZATION
@@ -544,7 +542,7 @@ qt6_add_executable(
 
 target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h")
 
-qt6_add_shaders(
+qt_add_shaders(
   cockatrice
   "onboarding_shaders"
   PREFIX
@@ -556,7 +554,7 @@ qt6_add_shaders(
   src/interface/widgets/onboarding/shaders/brand_plate.frag
 )
 
-qt6_add_resources(
+qt_add_resources(
   cockatrice
   "onboarding_qml"
   PREFIX
@@ -572,6 +570,7 @@ target_link_libraries(
   PUBLIC libcockatrice_card
          libcockatrice_deck_list
          libcockatrice_filters
+         libcockatrice_game
          libcockatrice_utility
          libcockatrice_network
          libcockatrice_models
@@ -582,6 +581,14 @@ target_link_libraries(
 
 cockatrice_target_enable_crash_reporting(cockatrice)
 
+if(WITH_GUI_TEST)
+  # These two translate between XML test files and the QtTesting event pipeline;
+  # they need the QtTesting headers, so they only exist with the harness.
+  target_sources(cockatrice PRIVATE src/game_graphics/pq_cockatrice_event_player.cpp src/interface/recording.cpp)
+  target_link_libraries(cockatrice PRIVATE QtTesting)
+  target_compile_definitions(cockatrice PRIVATE WITH_GUI_TEST)
+endif()
+
 if(UNIX)
   if(APPLE)
     set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}")
@@ -788,7 +795,7 @@ endif()
 if(Qt6LinguistTools_FOUND)
   #Qt6 Translations happen after the executable is built up
   if(UPDATE_TRANSLATIONS)
-    qt6_add_translations(
+    qt_add_translations(
       cockatrice
       TS_FILES
       ${cockatrice_TS}
@@ -798,7 +805,7 @@ if(Qt6LinguistTools_FOUND)
       cockatrice_QM
     )
   else()
-    qt6_add_translations(cockatrice TS_FILES ${cockatrice_TS} QM_FILES_OUTPUT_VARIABLE cockatrice_QM)
+    qt_add_translations(cockatrice TS_FILES ${cockatrice_TS} QM_FILES_OUTPUT_VARIABLE cockatrice_QM)
   endif()
 
   if(UNIX)
@@ -824,4 +831,4 @@ if(Qt6LinguistTools_FOUND)
   endforeach()
 endif()
 
-qt6_finalize_target(cockatrice)
+qt_finalize_target(cockatrice)
diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 4ec3d2385..229cdd125 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -6,19 +6,18 @@
         <file>resources/hand.svg</file>
         <file>resources/hr.jpg</file>
 
-        <file>resources/icons/arrow_bottom_green.svg</file>
-        <file>resources/icons/arrow_down_green.svg</file>
+        <file>resources/icons/arrow_down.svg</file>
         <file>resources/icons/arrow_history.svg</file>
-        <file>resources/icons/arrow_left_green.svg</file>
+        <file>resources/icons/arrow_left.svg</file>
         <file>resources/icons/arrow_redo.svg</file>
-        <file>resources/icons/arrow_right_blue.svg</file>
-        <file>resources/icons/arrow_right_green.svg</file>
-        <file>resources/icons/arrow_top_green.svg</file>
-        <file>resources/icons/arrow_up_green.svg</file>
+        <file>resources/icons/arrow_right.svg</file>
+        <file>resources/icons/arrow_right_sideboard.svg</file>
+        <file>resources/icons/arrow_to_bottom.svg</file>
+        <file>resources/icons/arrow_to_top.svg</file>
+        <file>resources/icons/arrow_up.svg</file>
         <file>resources/icons/arrow_undo.svg</file>
         <file>resources/icons/circle_half_stroke.svg</file>
         <file>resources/icons/clearsearch.svg</file>
-        <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
@@ -28,7 +27,6 @@
         <file>resources/icons/filter.svg</file>
         <file>resources/icons/floppy_disk.svg</file>
         <file>resources/icons/forgot_password.svg</file>
-        <file>resources/icons/gear.svg</file>
         <file>resources/icons/increment.svg</file>
         <file>resources/icons/info.svg</file>
         <file>resources/icons/lock.svg</file>
@@ -41,7 +39,6 @@
         <file>resources/icons/reload.svg</file>
         <file>resources/icons/remove_row.svg</file>
         <file>resources/icons/rename.svg</file>
-        <file>resources/icons/scale_balanced.svg</file>
         <file>resources/icons/scales.svg</file>
         <file>resources/icons/scroll.svg</file>
         <file>resources/icons/search.svg</file>
@@ -52,7 +49,6 @@
         <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
         <file>resources/icons/tab_changed.svg</file>
-        <file>resources/icons/update.png</file>
         <file>resources/icons/view.svg</file>
 
         <file>resources/icons/mana/B.svg</file>
diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini
index 7ac0d9ca4..e4b845af9 100644
--- a/cockatrice/resources/config/qtlogging.ini
+++ b/cockatrice/resources/config/qtlogging.ini
@@ -10,6 +10,7 @@
 # or set <category> = false to disable logging
 
 #main = true
+#recording = true
 #qt_translator = true
 #window_main.* = true
 #release_channel = true
diff --git a/cockatrice/resources/icons/arrow_bottom_green.svg b/cockatrice/resources/icons/arrow_bottom_green.svg
deleted file mode 100644
index 3a45053ad..000000000
--- a/cockatrice/resources/icons/arrow_bottom_green.svg
+++ /dev/null
@@ -1,793 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9943 custom"
-   version="1.0"
-   sodipodi:docname="arrow_down_green.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="8.25663"
-     inkscape:cy="31.788561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 52.71118,29.086208 -12.351931,0 12.852459,-18.346676 -42.685714,0 12.327869,18.346676 -12.351929,0 21.104622,25.485735 z"
-       id="rect2714"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/arrow_down.svg b/cockatrice/resources/icons/arrow_down.svg
new file mode 100644
index 000000000..0ff237f52
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_down.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 5v13"/>
+  <path d="M18 12l-6 6-6-6"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_down_green.svg b/cockatrice/resources/icons/arrow_down_green.svg
deleted file mode 100644
index 574c12060..000000000
--- a/cockatrice/resources/icons/arrow_down_green.svg
+++ /dev/null
@@ -1,793 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9943 custom"
-   version="1.0"
-   sodipodi:docname="arrow_up_green.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="8.25663"
-     inkscape:cy="31.788561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 53.104623,35.38129 -12.351931,0 0,-32.248315 -17.505386,0 0,32.248315 -12.351929,0 21.104622,25.485735 21.104624,-25.485735 z"
-       id="rect2714"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/arrow_history.svg b/cockatrice/resources/icons/arrow_history.svg
index d130758e6..29374d23a 100644
--- a/cockatrice/resources/icons/arrow_history.svg
+++ b/cockatrice/resources/icons/arrow_history.svg
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-    <title>
-        history
-    </title>
-    <path d="M9 6v5h.06l2.48 2.47 1.41-1.41L11 10.11V6H9z"/>
-    <path d="M10 1a9 9 0 0 0-7.85 13.35L.5 16H6v-5.5l-2.38 2.38A7 7 0 1 1 10 17v2a9 9 0 0 0 0-18z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M3 12a9 9 0 1 0 3-6.7"/>
+  <path d="M3 4v5h5"/>
+  <path d="M12 7v5l3 2"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_left.svg b/cockatrice/resources/icons/arrow_left.svg
new file mode 100644
index 000000000..7a88deddb
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_left.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M19 12H6"/>
+  <path d="M12 6l-6 6 6 6"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_left_green.svg b/cockatrice/resources/icons/arrow_left_green.svg
deleted file mode 100644
index 1b9eb0684..000000000
--- a/cockatrice/resources/icons/arrow_left_green.svg
+++ /dev/null
@@ -1,791 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
-   version="1.0"
-   sodipodi:docname="test.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.203125"
-     inkscape:cx="3.6095445"
-     inkscape:cy="32"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="718"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 28.802264,8.8785925 2.0835141,31.441092 l 26.7187499,22.5625 0,-13.40625 31.59375,0 0,-18.3125 -31.59375,0 0,-13.4062495 z"
-       id="rect4156" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/arrow_redo.svg b/cockatrice/resources/icons/arrow_redo.svg
index dd89e3314..141260269 100644
--- a/cockatrice/resources/icons/arrow_redo.svg
+++ b/cockatrice/resources/icons/arrow_redo.svg
@@ -1,40 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
-     y="0px" width="485.212px" height="485.212px" viewBox="0 0 485.212 485.212"
-     style="enable-background:new 0 0 485.212 485.212;" xml:space="preserve">
-<g>
-	<path d="M242.607,424.559c-75.252,0-136.468-61.209-136.468-136.465c0-75.252,61.216-136.466,136.468-136.466v90.978   l151.629-121.302L242.607,0v90.978c-108.687,0-197.117,88.432-197.117,197.117c0,108.691,88.43,197.118,197.117,197.118   c108.687,0,197.114-88.427,197.114-197.118h-60.645C379.077,363.35,317.859,424.559,242.607,424.559z"/>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M15 14l5-5-5-5"/>
+  <path d="M20 9H9.5A5.5 5.5 0 0 0 4 14.5a5.5 5.5 0 0 0 5.5 5.5H13"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_right.svg b/cockatrice/resources/icons/arrow_right.svg
new file mode 100644
index 000000000..f0ac5d5bf
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_right.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M5 12h13"/>
+  <path d="M12 6l6 6-6 6"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_right_blue.svg b/cockatrice/resources/icons/arrow_right_blue.svg
deleted file mode 100644
index 334cd68fd..000000000
--- a/cockatrice/resources/icons/arrow_right_blue.svg
+++ /dev/null
@@ -1,789 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="add_to_sideboard.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="-15.396123"
-     inkscape:cy="31.722987"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#64c0ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 35.38129,10.895377 L 35.38129,23.247308 L 3.1329751,23.247308 L 3.1329751,40.752694 L 35.38129,40.752694 L 35.38129,53.104623 L 60.867025,32.000001 L 35.38129,10.895377 z"
-       id="rect2714"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/arrow_right_green.svg b/cockatrice/resources/icons/arrow_right_green.svg
deleted file mode 100644
index db491985d..000000000
--- a/cockatrice/resources/icons/arrow_right_green.svg
+++ /dev/null
@@ -1,789 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="add_to_deck.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="-45.970664"
-     inkscape:cy="31.722987"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 35.38129,10.895377 L 35.38129,23.247308 L 3.1329751,23.247308 L 3.1329751,40.752694 L 35.38129,40.752694 L 35.38129,53.104623 L 60.867025,32.000001 L 35.38129,10.895377 z"
-       id="rect2714"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/arrow_right_sideboard.svg b/cockatrice/resources/icons/arrow_right_sideboard.svg
new file mode 100644
index 000000000..79a8cd5d3
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_right_sideboard.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M3 12h9"/>
+  <path d="M8 7l5 5-5 5"/>
+  <path d="M16 7h4v10h-4"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_to_bottom.svg b/cockatrice/resources/icons/arrow_to_bottom.svg
new file mode 100644
index 000000000..291a527d2
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_to_bottom.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 4v11"/>
+  <path d="M6 9l6 6 6-6"/>
+  <path d="M5 20h14"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_to_top.svg b/cockatrice/resources/icons/arrow_to_top.svg
new file mode 100644
index 000000000..aac38cc33
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_to_top.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 20V9"/>
+  <path d="M6 15l6-6 6 6"/>
+  <path d="M5 4h14"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_top_green.svg b/cockatrice/resources/icons/arrow_top_green.svg
deleted file mode 100644
index c515c6a1d..000000000
--- a/cockatrice/resources/icons/arrow_top_green.svg
+++ /dev/null
@@ -1,793 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9943 custom"
-   version="1.0"
-   sodipodi:docname="arrow_bottom_green.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="8.25663"
-     inkscape:cy="31.788561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 11.002462,36.225266 12.351931,0 -12.852459,18.346676 42.685714,0 -12.327869,-18.346676 12.351929,0 -21.104622,-25.485734 z"
-       id="rect2714"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/arrow_undo.svg b/cockatrice/resources/icons/arrow_undo.svg
index 2e182ffb2..c748b37b8 100644
--- a/cockatrice/resources/icons/arrow_undo.svg
+++ b/cockatrice/resources/icons/arrow_undo.svg
@@ -1,40 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
-     y="0px" width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;"
-     xml:space="preserve">
-<g>
-	<path d="M256,448c79.406,0,144-64.594,144-144s-64.594-144-144-144v96L96,128L256,0v96c114.688,0,208,93.313,208,208   c0,114.688-93.312,208-208,208c-114.687,0-208-93.312-208-208h64C112,383.406,176.594,448,256,448z"/>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M9 14 4 9l5-5"/>
+  <path d="M4 9h10.5A5.5 5.5 0 0 1 20 14.5a5.5 5.5 0 0 1-5.5 5.5H11"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_up.svg b/cockatrice/resources/icons/arrow_up.svg
new file mode 100644
index 000000000..ac32b5c92
--- /dev/null
+++ b/cockatrice/resources/icons/arrow_up.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 19V6"/>
+  <path d="M6 12l6-6 6 6"/>
+</svg>
diff --git a/cockatrice/resources/icons/arrow_up_green.svg b/cockatrice/resources/icons/arrow_up_green.svg
deleted file mode 100644
index 1d0f61112..000000000
--- a/cockatrice/resources/icons/arrow_up_green.svg
+++ /dev/null
@@ -1,792 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9943 custom"
-   version="1.0"
-   sodipodi:docname="arrow_up_green.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2691"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2707"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2531"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2535"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2541"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2543"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2604"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2606"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2610"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2612"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2614"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2618"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2620"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="8.25663"
-     inkscape:cy="31.788561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 10.895377,28.61871 12.351931,0 0,32.248315 17.505386,0 0,-32.248315 12.351929,0 L 32.000001,3.132975 10.895377,28.61871 z"
-       id="rect2714"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/cockatrice/resources/icons/circle_half_stroke.svg b/cockatrice/resources/icons/circle_half_stroke.svg
index 42e4dbca2..c16f84858 100644
--- a/cockatrice/resources/icons/circle_half_stroke.svg
+++ b/cockatrice/resources/icons/circle_half_stroke.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M512 320C512 214 426 128 320 128L320 512C426 512 512 426 512 320zM64 320C64 178.6 178.6 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C178.6 576 64 461.4 64 320z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <circle cx="12" cy="12" r="9" fill="none" stroke="currentColor" stroke-width="2"/>
+  <path d="M12 3a9 9 0 0 1 0 18z" fill="currentColor"/>
+</svg>
diff --git a/cockatrice/resources/icons/clearsearch.svg b/cockatrice/resources/icons/clearsearch.svg
index be50d68d6..49d883c68 100644
--- a/cockatrice/resources/icons/clearsearch.svg
+++ b/cockatrice/resources/icons/clearsearch.svg
@@ -1,276 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_clearsearch.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3709">
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="0"
-         id="stop3711" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop3713" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3699">
-      <stop
-         style="stop-color:#ececec;stop-opacity:1;"
-         offset="0"
-         id="stop3701" />
-      <stop
-         style="stop-color:#ececec;stop-opacity:0;"
-         offset="1"
-         id="stop3703" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3632">
-      <stop
-         style="stop-color:#c87137;stop-opacity:1;"
-         offset="0"
-         id="stop3634" />
-      <stop
-         style="stop-color:#c87137;stop-opacity:0;"
-         offset="1"
-         id="stop3636" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3622">
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:1;"
-         offset="0"
-         id="stop3624" />
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:0;"
-         offset="1"
-         id="stop3626" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3685"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3709"
-       id="linearGradient3726"
-       gradientUnits="userSpaceOnUse"
-       x1="22.288248"
-       y1="35.505978"
-       x2="49.488647"
-       y2="49.106178" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3622"
-       id="linearGradient3728"
-       gradientUnits="userSpaceOnUse"
-       x1="30.59761"
-       y1="8.9243031"
-       x2="30.59761"
-       y2="21.545816" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3632"
-       id="linearGradient3730"
-       gradientUnits="userSpaceOnUse"
-       x1="28.430279"
-       y1="47.808765"
-       x2="29.960159"
-       y2="47.808765" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3699"
-       id="linearGradient3732"
-       gradientUnits="userSpaceOnUse"
-       x1="29.215645"
-       y1="1021.9559"
-       x2="31.852083"
-       y2="1021.9559" />
-    <inkscape:perspective
-       id="perspective3766"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3797"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3896"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3699"
-       id="linearGradient3911"
-       gradientUnits="userSpaceOnUse"
-       x1="29.215645"
-       y1="1021.9559"
-       x2="31.852083"
-       y2="1021.9559"
-       gradientTransform="translate(713.20829,-318.19428)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3709"
-       id="linearGradient3928"
-       gradientUnits="userSpaceOnUse"
-       x1="22.288248"
-       y1="35.505978"
-       x2="49.488647"
-       y2="49.106178" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3622"
-       id="linearGradient3930"
-       gradientUnits="userSpaceOnUse"
-       x1="30.59761"
-       y1="8.9243031"
-       x2="30.59761"
-       y2="21.545816" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3632"
-       id="linearGradient3932"
-       gradientUnits="userSpaceOnUse"
-       x1="28.430279"
-       y1="47.808765"
-       x2="29.960159"
-       y2="47.808765" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3699"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(713.20829,-318.19428)"
-       x1="29.215645"
-       y1="1021.9559"
-       x2="31.852083"
-       y2="1021.9559" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.84375"
-     inkscape:cx="11.205704"
-     inkscape:cy="35.993597"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-988.36218)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Verbot">
-    <g
-       sodipodi:type="inkscape:box3d"
-       style="fill:red;fill-opacity:1;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="g3936"
-       inkscape:perspectiveID="#perspective10"
-       inkscape:corner0="-32.72006 : 181.09419 : 0 : 1"
-       inkscape:corner7="-365.7807 : 14.86007 : 0.25 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path3946"
-         style="fill:#afafde;fill-rule:evenodd;stroke:none"
-         inkscape:box3dsidetype="13"
-         d="M -11.729084,0.76495424 L -1.0199203,-421.92491 L -1.5309297,-421.89731 L -17.73339,4.4426247 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path3942"
-         style="fill:#8686bf;fill-rule:evenodd;stroke:none"
-         inkscape:box3dsidetype="3"
-         d="M -11.729084,5241.4272 L -1.0199203,33.784832 L -1.0199203,-421.92491 L -11.729084,0.76495424 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path3938"
-         style="fill:#353564;fill-rule:evenodd;stroke:none"
-         inkscape:box3dsidetype="6"
-         d="M -11.729084,5241.4272 L -11.729084,0.76495424 L -17.73339,4.4426247 L -17.73339,5286.737 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path3940"
-         style="fill:#4d4d9f;fill-rule:evenodd;stroke:none"
-         inkscape:box3dsidetype="5"
-         d="M -11.729084,5241.4272 L -1.0199203,33.784832 L -1.5309297,34.124972 L -17.73339,5286.737 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path3948"
-         style="fill:#e9e9ff;fill-rule:evenodd;stroke:none"
-         inkscape:box3dsidetype="11"
-         d="M -17.73339,5286.737 L -1.5309297,34.124972 L -1.5309297,-421.89731 L -17.73339,4.4426247 z" />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path3944"
-         style="fill:#d7d7ff;fill-rule:evenodd;stroke:none"
-         inkscape:box3dsidetype="14"
-         d="M -1.0199203,33.784832 L -1.0199203,-421.92491 L -1.5309297,-421.89731 L -1.5309297,34.124972 z" />
-    </g>
-    <path
-       style="fill:#ff0000;fill-opacity:1;stroke:#cd3535;stroke-width:5.84793520000000020;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 52.385908,50.646333 C 62.721799,39.279033 61.886144,21.695001 50.518842,11.359112 39.151542,1.0232223 21.567509,1.8588773 11.231623,13.22618 0.89573232,24.593479 1.7313874,42.177512 13.098689,52.5134 c 11.3673,10.335889 28.951332,9.500234 39.287219,-1.867067 z M 49.738687,48.239307 C 41.198715,57.631478 26.946973,58.753059 17.056847,51.15466 L 49.541588,15.428288 c 8.502064,9.124975 8.737071,23.418851 0.197099,32.811019 z M 46.560682,12.717855 14.075941,48.444228 C 5.5738777,39.31925 5.3388704,25.025377 13.878842,15.633206 22.418813,6.2410344 36.670557,5.1194531 46.560682,12.717855 z"
-       id="path3787"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<circle cx="12" cy="12" r="8"/>
+  <path d="M9 9l6 6M15 9l-6 6"/>
 </svg>
diff --git a/cockatrice/resources/icons/cogwheel.svg b/cockatrice/resources/icons/cogwheel.svg
deleted file mode 100644
index 8c7aad617..000000000
--- a/cockatrice/resources/icons/cogwheel.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="102.5024mm" height="102.24421mm"
-     viewBox="0 0 102.5024 102.24421" version="1.1"
-     id="svg1"
-     inkscape:version="1.4 (e7c3feb100, 2024-10-09)" sodipodi:docname="cog_wheel.svg"
-     xmlns="http://www.w3.org/2000/svg">
-    <sodipodi:namedview id="namedview1" pagecolor="#ffffff" bordercolor="#000000" borderopacity="0.25"
-                        inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0"
-                        inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.66101291"
-                        inkscape:cx="146.74449" inkscape:cy="193.64221" inkscape:window-width="1829"
-                        inkscape:window-height="951" inkscape:window-x="0" inkscape:window-y="0"
-                        inkscape:window-maximized="1" inkscape:current-layer="layer1"/>
-    <defs id="defs1"/>
-    <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-66.148059,-97.377896)">
-        <g id="g1" transform="translate(-165.09777,-82.009607)">
-            <g id="g2" transform="matrix(0.26458333,0,0,0.26458333,64.983323,161.37858)">
-                <path style="fill:#333333;stroke-width:94.4882"
-                      d="m 721.34301,94.413051 40.00966,29.763289 29.51933,-9.27053 14.63768,-46.840589 36.83817,0.48792 13.41787,46.108699 28.29952,9.5145 40.74155,-28.299519 29.0314,21.468599 -15.85748,47.08454 16.58937,23.66426 48.30432,-2.68358 12.93,34.88648 -41.71741,27.07971 -0.48792,29.27536 40.49763,26.10387 -10.2464,34.15459 -48.54834,-0.97584 -18.78502,23.42029 15.85749,45.37681 -28.29952,21.71256 -41.22947,-29.27536 -28.54348,9.75846 -13.66184,47.57246 -38.30194,-0.73188 -14.63768,-48.30435 -27.07971,-9.27054 -40.00966,29.27537 -30.25121,-20.49276 17.32125,-46.35266 -17.80918,-24.64009 -49.76812,3.17149 -11.22222,-34.64251 40.74155,-27.07971 0.48792,-30.00725 -41.71739,-27.32367 12.19807,-32.93479 48.30435,2.68358 20.24879,-24.6401 -17.32126,-47.08455 z"
-                      id="path1"/>
-                <circle style="fill:#f9f9f9;stroke-width:72.1317" id="path2" cx="822.09906" cy="261.28262"
-                        r="83.434792"/>
-                <circle style="fill:#4d4d4d;stroke-width:40.5147" id="circle2" cx="822.09906" cy="261.28262"
-                        r="46.863361"/>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/conceded.svg b/cockatrice/resources/icons/conceded.svg
index a487f18bb..b9faf047c 100644
--- a/cockatrice/resources/icons/conceded.svg
+++ b/cockatrice/resources/icons/conceded.svg
@@ -1,103 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="skull.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2447"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2687"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.217407"
-     inkscape:cx="23.789126"
-     inkscape:cy="21.065041"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2551"
-     showgrid="false"
-     inkscape:window-width="1274"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2547">
-      <g
-         id="g2551"
-         transform="translate(0.2014828,0.2890558)">
-        <path
-           style="fill:#000000"
-           d="m 23.0625,7.875 c -2.309245,0.049099 -4.522809,0.469358 -6.125,1.28125 l -1.625,0.8125 -3,2.9375 c -4.4036271,4.810187 -5.7159942,14.310988 -2.03289,16.192421 0.470391,0.240289 2.475497,1.006426 3.728817,1.227998 2.521045,0.445688 2.327223,0.322567 2.787218,1.340469 0.238995,0.528863 0.09446,1.428157 -0.0144,3.364112 -0.222151,3.951055 -0.06236,4.424776 1.59375,4.75 1.098431,0.21571 1.347302,-0.472438 1.21875,-3.15625 -0.115618,-2.413774 0.583332,-2.187741 1.1875,0.375 0.547478,2.322281 0.410725,2.936824 1.34375,2.9375 0.919623,6.65e-4 1.076314,-0.818043 1.34375,-3 0.353869,-2.887142 1.125,-3.139658 1.125,-0.375 0,2.08688 -0.222077,3.589602 1.6875,3.40625 1.132862,-0.108774 1.082149,-3.370508 0.9375,-4.09375 -0.121253,-0.606271 -0.04263,-0.84375 0.25,-0.84375 0.538278,0 0.77605,0.936782 0.78125,3.0625 0.0023,0.939922 0.100607,1.819357 0.21875,1.9375 0.257103,0.257101 1.968476,-0.05495 2.375,-0.4375 0.16137,-0.151853 0.01366,-2.350878 0.21875,-5 0.35428,-4.576122 1.366108,-2.962194 4.245673,-3.85919 4.126605,-1.285455 4.289077,-3.901867 4.285577,-7.64081 -0.0033,-3.474911 -1.444977,-7.288916 -3.75,-9.9375 l -1.0625,-1.21875 -1.875,-1.5 C 31.003675,8.7156929 26.911241,7.7931682 23.0625,7.875 z M 15.625,19.03125 c 3.394247,0 7.005748,2.293983 4.9375,3.96875 -0.883048,0.715048 -6.772942,-0.473271 -8.34375,-1.15625 -2.8401606,-1.234886 -0.0067,-2.8125 3.40625,-2.8125 z M 30.40625,19.625 c 0.636388,-0.004 1.310094,0.03125 1.9375,0.03125 3.145949,0 6.024182,0.340703 3.875,2.03125 -0.761324,0.598858 -1.605395,1.78125 -5.125,1.78125 -4.382431,0 -4.28125,0.0393 -4.28125,-1.625 0,-1.934908 1.684585,-2.206867 3.59375,-2.21875 z M 24,26.086963 24.75,27.59375 25.46711,29.015215 23.96875,28.875 22.336963,28.850537 23.25,27.5625 24,26.086963 z"
-           transform="translate(-0.2014828,-0.2890558)"
-           id="path2693"
-           sodipodi:nodetypes="ccccssssssssssssssssssscccccssccsssscccccccc" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           id="rect3702"
-           width="3.0739832"
-           height="9.9355526"
-           x="41.498772"
-           y="27.689754"
-           transform="translate(-0.2014828,-0.2890558)" />
-      </g>
-    </g>
-    <g
-       id="g2471"
-       transform="matrix(4.0064997,0,0,4.0064997,-232.82633,-1139.1808)" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M5 21V4"/>
+  <path d="M5 4h12l-2 4 2 4H5"/>
 </svg>
diff --git a/cockatrice/resources/icons/decrement.svg b/cockatrice/resources/icons/decrement.svg
index 0ceddf69f..033245f85 100644
--- a/cockatrice/resources/icons/decrement.svg
+++ b/cockatrice/resources/icons/decrement.svg
@@ -1,205 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   version="1.0"
-   sodipodi:docname="deck_editor_decrement.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="26.34754"
-     inkscape:cy="29.107677"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1445"
-     inkscape:window-height="893"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <rect
-       style="fill:#ff7672;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect3548"
-       width="14.386732"
-       height="59.259636"
-       x="24.806633"
-       y="-61.629818"
-       transform="matrix(0,1,-1,0,0,0)" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M5 12h14"/>
 </svg>
diff --git a/cockatrice/resources/icons/delete.svg b/cockatrice/resources/icons/delete.svg
index 008d8d429..d79312f1e 100644
--- a/cockatrice/resources/icons/delete.svg
+++ b/cockatrice/resources/icons/delete.svg
@@ -1,357 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
-   version="1.0"
-   sodipodi:docname="remove_row.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="12.656427"
-     inkscape:cy="31.784541"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 6.433227,14.50946 L 23.923767,32 L 6.433227,49.490541 L 14.50946,57.566773 L 32,40.076233 L 49.490541,57.566773 L 57.566773,49.490541 L 40.076233,32 L 57.566773,14.50946 L 49.490541,6.433227 L 32,23.923767 L 14.50946,6.433227 L 6.433227,14.50946 z"
-       id="rect3548" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M4 7h16"/>
+  <path d="M9 7V4h6v3"/>
+  <path d="M6 7l1 13h10l1-13"/>
 </svg>
diff --git a/cockatrice/resources/icons/dragon.svg b/cockatrice/resources/icons/dragon.svg
index f45af39ef..cc48d1f5c 100644
--- a/cockatrice/resources/icons/dragon.svg
+++ b/cockatrice/resources/icons/dragon.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M352 188.5L300.1 175.5C293.6 173.9 288.8 168.4 288.1 161.7C287.4 155 290.9 148.6 296.8 145.6L337.6 125.2L294.3 92.7C288.8 88.6 286.5 81.4 288.7 74.8C290.9 68.2 297.1 64 304 64L464 64C494.2 64 522.7 78.2 540.8 102.4L598.4 179.2C604.6 187.5 608 197.6 608 208C608 234.5 586.5 256 560 256L538.5 256C521.5 256 505.2 249.3 493.2 237.3L479.9 224L447.9 224L447.9 245.5C447.9 270.3 460.7 293.4 481.7 306.6L588.3 373.2C620.4 393.3 639.9 428.4 639.9 466.3C639.9 526.9 590.8 576.1 530.1 576.1L32.3 576C29 576 25.7 575.6 22.7 574.6C13.5 571.8 6 565 2.3 556C1 552.7 .1 549.1 0 545.3C-.2 541.6 .3 538 1.3 534.6C4.1 525.4 10.9 517.9 19.9 514.2C22.9 513 26.1 512.2 29.4 512L433.3 476C441.6 475.3 448 468.3 448 459.9C448 455.6 446.3 451.5 443.3 448.5L398.9 404.1C368.9 374.1 352 333.4 352 291L352 188.5zM512 136.3C512 136.2 512 136.1 512 136C512 135.9 512 135.8 512 135.7L512 136.3zM510.7 143.7L464.3 132.1C464.1 133.4 464 134.7 464 136C464 149.3 474.7 160 488 160C498.6 160 507.5 153.2 510.7 143.7zM130.9 180.5C147.2 166 171.3 164.3 189.4 176.4L320 263.4L320 290.9C320 323.7 328.4 355.7 344 383.9L112 383.9C105.3 383.9 99.3 379.7 97 373.5C94.7 367.3 96.5 360.2 101.6 355.8L171 296.3L18.4 319.8C11.4 320.9 4.5 317.2 1.5 310.8C-1.5 304.4 .1 296.8 5.4 292L130.9 180.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+  <!-- Font Awesome Free 7.1.0, CC BY 4.0 / MIT; https://fontawesome.com/license/free -->
+  <g transform="translate(2 2) scale(0.03125)">
+    <path d="M352 188.5L300.1 175.5C293.6 173.9 288.8 168.4 288.1 161.7C287.4 155 290.9 148.6 296.8 145.6L337.6 125.2L294.3 92.7C288.8 88.6 286.5 81.4 288.7 74.8C290.9 68.2 297.1 64 304 64L464 64C494.2 64 522.7 78.2 540.8 102.4L598.4 179.2C604.6 187.5 608 197.6 608 208C608 234.5 586.5 256 560 256L538.5 256C521.5 256 505.2 249.3 493.2 237.3L479.9 224L447.9 224L447.9 245.5C447.9 270.3 460.7 293.4 481.7 306.6L588.3 373.2C620.4 393.3 639.9 428.4 639.9 466.3C639.9 526.9 590.8 576.1 530.1 576.1L32.3 576C29 576 25.7 575.6 22.7 574.6C13.5 571.8 6 565 2.3 556C1 552.7 .1 549.1 0 545.3C-.2 541.6 .3 538 1.3 534.6C4.1 525.4 10.9 517.9 19.9 514.2C22.9 513 26.1 512.2 29.4 512L433.3 476C441.6 475.3 448 468.3 448 459.9C448 455.6 446.3 451.5 443.3 448.5L398.9 404.1C368.9 374.1 352 333.4 352 291L352 188.5zM512 136.3C512 136.2 512 136.1 512 136C512 135.9 512 135.8 512 135.7L512 136.3zM510.7 143.7L464.3 132.1C464.1 133.4 464 134.7 464 136C464 149.3 474.7 160 488 160C498.6 160 507.5 153.2 510.7 143.7zM130.9 180.5C147.2 166 171.3 164.3 189.4 176.4L320 263.4L320 290.9C320 323.7 328.4 355.7 344 383.9L112 383.9C105.3 383.9 99.3 379.7 97 373.5C94.7 367.3 96.5 360.2 101.6 355.8L171 296.3L18.4 319.8C11.4 320.9 4.5 317.2 1.5 310.8C-1.5 304.4 .1 296.8 5.4 292L130.9 180.5z"/>
+  </g>
+</svg>
diff --git a/cockatrice/resources/icons/dropdown_collapsed.svg b/cockatrice/resources/icons/dropdown_collapsed.svg
index 52e833e65..429c24974 100644
--- a/cockatrice/resources/icons/dropdown_collapsed.svg
+++ b/cockatrice/resources/icons/dropdown_collapsed.svg
@@ -1,10 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
-        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-        ]>
-<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="460.5" height="531.74"
-     viewBox="0 0 460.5 531.74" overflow="visible" enable-background="new 0 0 460.5 531.74" xml:space="preserve">
-<polygon fill="#918d8d" points="0.5,0.866 459.5,265.87 0.5,530.874 "/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M9 6l6 6-6 6"/>
 </svg>
diff --git a/cockatrice/resources/icons/dropdown_expanded.svg b/cockatrice/resources/icons/dropdown_expanded.svg
index fa3ee205c..0b24aeb48 100644
--- a/cockatrice/resources/icons/dropdown_expanded.svg
+++ b/cockatrice/resources/icons/dropdown_expanded.svg
@@ -1,10 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
-        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-        ]>
-<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="531.74" height="460.5"
-     viewBox="0 0 531.74 460.5" overflow="visible" enable-background="new 0 0 531.74 460.5" xml:space="preserve">
-<polygon fill="#918d8d" points="530.874,0.5 265.87,459.5 0.866,0.5 "/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M6 9l6 6 6-6"/>
 </svg>
diff --git a/cockatrice/resources/icons/filter.svg b/cockatrice/resources/icons/filter.svg
index d53d9ba29..d9cdf879c 100644
--- a/cockatrice/resources/icons/filter.svg
+++ b/cockatrice/resources/icons/filter.svg
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
-     width="800px" height="800px" viewBox="0 0 971.986 971.986"
-     xml:space="preserve">
-<g>
-	<path d="M370.216,459.3c10.2,11.1,15.8,25.6,15.8,40.6v442c0,26.601,32.1,40.101,51.1,21.4l123.3-141.3
-		c16.5-19.8,25.6-29.601,25.6-49.2V500c0-15,5.7-29.5,15.8-40.601L955.615,75.5c26.5-28.8,6.101-75.5-33.1-75.5h-873
-		c-39.2,0-59.7,46.6-33.1,75.5L370.216,459.3z"/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M3 5h18l-7 8v6l-4 2v-8z"/>
+</svg>
diff --git a/cockatrice/resources/icons/floppy_disk.svg b/cockatrice/resources/icons/floppy_disk.svg
index 3c5b5054d..10b9e8172 100644
--- a/cockatrice/resources/icons/floppy_disk.svg
+++ b/cockatrice/resources/icons/floppy_disk.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M160 96C124.7 96 96 124.7 96 160L96 480C96 515.3 124.7 544 160 544L480 544C515.3 544 544 515.3 544 480L544 237.3C544 220.3 537.3 204 525.3 192L448 114.7C436 102.7 419.7 96 402.7 96L160 96zM192 192C192 174.3 206.3 160 224 160L384 160C401.7 160 416 174.3 416 192L416 256C416 273.7 401.7 288 384 288L224 288C206.3 288 192 273.7 192 256L192 192zM320 352C355.3 352 384 380.7 384 416C384 451.3 355.3 480 320 480C284.7 480 256 451.3 256 416C256 380.7 284.7 352 320 352z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M5 3h11l3 3v15H5z"/>
+  <path d="M8 3v6h8V3"/>
+  <path d="M8 14h8v7H8z"/>
+</svg>
diff --git a/cockatrice/resources/icons/forgot_password.svg b/cockatrice/resources/icons/forgot_password.svg
index f938ca3f4..3bfb3bdb1 100644
--- a/cockatrice/resources/icons/forgot_password.svg
+++ b/cockatrice/resources/icons/forgot_password.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48pt" height="48pt" viewBox="0 0 48 48" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:#000000;fill-opacity:1;" d="M 24 2 C 17.398438 2 12 7.398438 12 14 L 12 16 C 9.789063 16 8 17.789063 8 20 L 8 40 C 8 42.210938 9.789063 44 12 44 L 36 44 C 38.210938 44 40 42.210938 40 40 L 40 20 C 40 17.789063 38.210938 16 36 16 L 36 14 C 36 7.398438 30.601563 2 24 2 Z M 24 6 C 28.4375 6 32 9.5625 32 14 L 32 16 L 16 16 L 16 14 C 16 9.5625 19.554688 6 24 6 Z M 23.9375 19.9375 C 29.929688 19.9375 30 24.398438 30 25.25 C 30 29.71875 25.125 29.96875 25.375 33.875 L 21.875 33.875 C 21.578125 28.632813 26.0625 28.398438 26.0625 25.4375 C 26.0625 23.3125 24.632813 23.125 23.9375 23.125 C 21.859375 23.125 21.757813 25.09375 21.75 25.5 L 17.8125 25.5 C 17.820313 24.554688 18.015625 19.9375 23.9375 19.9375 Z M 23.6875 35.9375 C 25.671875 35.9375 25.875 37.765625 25.875 38.0625 C 25.875 38.351563 25.671875 40.125 23.6875 40.125 C 21.632813 40.125 21.5 38.351563 21.5 38.0625 C 21.5 37.765625 21.671875 35.9375 23.6875 35.9375 Z "/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<circle cx="7.5" cy="15.5" r="3.5"/>
+  <path d="M10 13l9-9"/>
+  <path d="M16 4l4 4"/>
+  <path d="M14 6l3 3"/>
 </svg>
diff --git a/cockatrice/resources/icons/gear.svg b/cockatrice/resources/icons/gear.svg
deleted file mode 100644
index fdee3a297..000000000
--- a/cockatrice/resources/icons/gear.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M259.1 73.5C262.1 58.7 275.2 48 290.4 48L350.2 48C365.4 48 378.5 58.7 381.5 73.5L396 143.5C410.1 149.5 423.3 157.2 435.3 166.3L503.1 143.8C517.5 139 533.3 145 540.9 158.2L570.8 210C578.4 223.2 575.7 239.8 564.3 249.9L511 297.3C511.9 304.7 512.3 312.3 512.3 320C512.3 327.7 511.8 335.3 511 342.7L564.4 390.2C575.8 400.3 578.4 417 570.9 430.1L541 481.9C533.4 495 517.6 501.1 503.2 496.3L435.4 473.8C423.3 482.9 410.1 490.5 396.1 496.6L381.7 566.5C378.6 581.4 365.5 592 350.4 592L290.6 592C275.4 592 262.3 581.3 259.3 566.5L244.9 496.6C230.8 490.6 217.7 482.9 205.6 473.8L137.5 496.3C123.1 501.1 107.3 495.1 99.7 481.9L69.8 430.1C62.2 416.9 64.9 400.3 76.3 390.2L129.7 342.7C128.8 335.3 128.4 327.7 128.4 320C128.4 312.3 128.9 304.7 129.7 297.3L76.3 249.8C64.9 239.7 62.3 223 69.8 209.9L99.7 158.1C107.3 144.9 123.1 138.9 137.5 143.7L205.3 166.2C217.4 157.1 230.6 149.5 244.6 143.4L259.1 73.5zM320.3 400C364.5 399.8 400.2 363.9 400 319.7C399.8 275.5 363.9 239.8 319.7 240C275.5 240.2 239.8 276.1 240 320.3C240.2 364.5 276.1 400.2 320.3 400z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/increment.svg b/cockatrice/resources/icons/increment.svg
index 6d5f7a85a..52dbdb2aa 100644
--- a/cockatrice/resources/icons/increment.svg
+++ b/cockatrice/resources/icons/increment.svg
@@ -1,199 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="increment.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="-58.636066"
-     inkscape:cy="33.549415"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="248" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.592359,5.717815 L 25.592359,25.62856 L 5.681613,25.62856 L 5.681613,38.371435 L 25.592359,38.371435 L 25.592359,58.282185 L 38.40764,58.282185 L 38.40764,38.371435 L 58.318387,38.371435 L 58.318387,25.62856 L 38.40764,25.62856 L 38.40764,5.717815 L 25.592359,5.717815 z"
-       id="rect3546" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 5v14"/>
+  <path d="M5 12h14"/>
 </svg>
diff --git a/cockatrice/resources/icons/info.svg b/cockatrice/resources/icons/info.svg
index 00b23cc2c..1305f6b3d 100644
--- a/cockatrice/resources/icons/info.svg
+++ b/cockatrice/resources/icons/info.svg
@@ -1,43 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2858"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="info.svg">
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Triangle"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3758-1"
-       sodipodi:cx="53.900002"
-       sodipodi:cy="78.5"
-       sodipodi:rx="46.5"
-       sodipodi:ry="46.5"
-       d="M 100.4,78.5 A 46.5,46.5 0 1 1 7.4000015,78.5 46.5,46.5 0 1 1 100.4,78.5 z"
-       transform="matrix(1.05866,0,0,1.05866,-7.0617752,-32.704809)" />
-    <g
-       style="font-size:133.49534607px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.06498075;stroke-opacity:1;font-family:'Magic:the Gathering';-inkscape-font-specification:'Magic:the Gathering'"
-       id="text3759">
-      <path
-         d="m 46.854005,16.085692 c 0.977733,-2.411704 1.683885,-4.193378 2.118456,-5.345028 0.369355,-1.1514901 0.771318,-1.9988718 1.205891,-2.5421482 0.456264,-0.4344718 1.347101,-0.825571 2.672514,-1.1732989 1.23846,-0.2823765 2.705082,-0.4670623 4.399871,-0.5540578 0.369346,8.46e-5 0.727854,8.46e-5 1.075524,0 1.694737,8.46e-5 2.672485,0.5758696 2.933248,1.7273567 -3e-5,0.1956326 -3e-5,0.3803183 0,0.5540579 -3e-5,1.3254743 -0.662726,2.9224633 -1.98809,4.7909703 -1.520969,2.238035 -3.43301,4.24785 -5.736128,6.029453 -2.32489,1.760018 -4.551983,2.781222 -6.681286,3.063614 -1.260224,-0.543125 -1.977239,-1.075454 -2.151048,-1.59699 -1.3e-5,-0.08684 -1.3e-5,-0.184616 0,-0.293325 -1.3e-5,-0.434484 0.228128,-1.010269 0.684424,-1.727357 0.521453,-0.890765 1.010327,-1.868513 1.466624,-2.933247 z M 31.372977,37.856906 c 2.650785,-0.716962 6.159814,-1.651255 10.527099,-2.802881 4.280354,-1.173242 7.398284,-1.803346 9.3538,-1.890315 0.08689,5.8e-5 0.173803,5.8e-5 0.260733,0 1.06464,5.8e-5 1.82511,0.358566 2.281415,1.075524 0.260711,0.630161 0.391077,1.520998 0.391099,2.672514 -2.2e-5,0.260787 -2.2e-5,0.532384 0,0.814791 -0.173844,1.586178 -0.260755,2.781204 -0.260733,3.58508 l 0,39.533656 c 1.238459,1e-5 2.976678,-0.673549 5.214662,-2.020681 1.673009,-0.977736 2.868034,-1.46661 3.58508,-1.466624 0.173791,1.4e-5 0.304158,0.04347 0.3911,0.130367 0.543162,0.369385 0.814759,0.771348 0.814791,1.20589 -3.2e-5,1.151583 -1.868617,2.66166 -5.605762,4.530238 -1.238507,0.717023 -3.063637,1.922912 -5.475395,3.617671 -2.49871,1.781679 -4.769259,3.204846 -6.811652,4.269505 -0.347658,0.347644 -0.923443,0.662696 -1.727357,0.945157 -0.260745,0.08691 -0.532342,0.130366 -0.814791,0.130367 -0.521477,-10e-7 -1.010351,-0.271598 -1.466623,-0.814791 C 41.856611,91.111641 41.7697,81.594892 41.76971,62.8221 c -1e-5,-1.955468 -1e-5,-4.008739 0,-6.15982 -1e-5,-2.129283 -0.08692,-4.128235 -0.260734,-5.996861 -0.260742,-1.781634 -0.706161,-3.204801 -1.336257,-4.269504 -0.717023,-1.347075 -1.60786,-2.368279 -2.672514,-3.063614 -1.151576,-0.630057 -2.357465,-1.260161 -3.617672,-1.890315 -1.325394,-0.521416 -2.161911,-1.053746 -2.509556,-1.59699 -0.195549,-0.173771 -0.293324,-0.434504 -0.293324,-0.7822 -0.08691,-0.369319 0.01086,-0.771282 0.293324,-1.20589 z"
-         style=""
-         id="path2993" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<circle cx="12" cy="12" r="9"/>
+  <path d="M12 11v6"/>
+  <path d="M12 7.5h.01"/>
 </svg>
diff --git a/cockatrice/resources/icons/lock.svg b/cockatrice/resources/icons/lock.svg
index b7ebf1a53..f150ece49 100644
--- a/cockatrice/resources/icons/lock.svg
+++ b/cockatrice/resources/icons/lock.svg
@@ -1,750 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="128.00000"
-   id="svg1931"
-   version="1.0"
-   width="128.00000"
-   x="0.00000000"
-   y="0.00000000"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="lock.svg">
-  <sodipodi:namedview
-     inkscape:window-height="933"
-     inkscape:window-width="1163"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="4"
-     inkscape:cx="-26.577351"
-     inkscape:cy="72.426878"
-     inkscape:window-x="204"
-     inkscape:window-y="90"
-     inkscape:current-layer="g5908"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:title>padlock</dc:title>
-        <dc:description />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>icon</rdf:li>
-            <rdf:li />
-            <rdf:li>lock</rdf:li>
-            <rdf:li>security</rdf:li>
-            <rdf:li>secure</rdf:li>
-            <rdf:li>padlock</rdf:li>
-            <rdf:li>signs_and_symbols</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:publisher>
-          <cc:Agent
-             rdf:about="http://www.openclipart.org">
-            <dc:title>AJ Ashton</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>AJ Ashton</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>AJ Ashton</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:date />
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3057">
-      <stop
-         id="stop3059"
-         offset="0.00000000"
-         style="stop-color:#282828;stop-opacity:1.0000000;" />
-      <stop
-         id="stop3061"
-         offset="1.0000000"
-         style="stop-color:#282828;stop-opacity:0.00000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2834">
-      <stop
-         id="stop2836"
-         offset="0"
-         style="stop-color:#e59a00;stop-opacity:1;" />
-      <stop
-         id="stop2838"
-         offset="1"
-         style="stop-color:#faff7d;stop-opacity:0.18367347;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2780">
-      <stop
-         id="stop2782"
-         offset="0.00000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2784"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.00000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2713">
-      <stop
-         id="stop2715"
-         offset="0.00000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2717"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2701">
-      <stop
-         id="stop2703"
-         offset="0"
-         style="stop-color:#db9300;stop-opacity:1;" />
-      <stop
-         id="stop2770"
-         offset="0.75"
-         style="stop-color:#fac700;stop-opacity:1;" />
-      <stop
-         id="stop2705"
-         offset="1"
-         style="stop-color:#fff363;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(2.151801,0.000000,0.000000,1.770850,-5.130350e-2,4.351838)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2707"
-       spreadMethod="reflect"
-       x1="29.613848"
-       x2="44.723549"
-       xlink:href="#linearGradient2701"
-       y1="52.608921"
-       y2="52.608921" />
-    <linearGradient
-       gradientTransform="matrix(1.121224,0.000000,0.000000,0.891883,0.000000,4.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2719"
-       spreadMethod="reflect"
-       x1="28.071486"
-       x2="28.071486"
-       xlink:href="#linearGradient2713"
-       y1="40.272228"
-       y2="42.645634" />
-    <linearGradient
-       gradientTransform="matrix(2.218790,0.000000,0.000000,1.825981,-5.130350e-2,-1.012826)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2732"
-       spreadMethod="reflect"
-       x1="29.093641"
-       x2="29.093641"
-       xlink:href="#linearGradient2713"
-       y1="46.357063"
-       y2="47.295517" />
-    <linearGradient
-       gradientTransform="matrix(2.218790,0.000000,0.000000,1.825981,-5.130350e-2,-1.012826)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2736"
-       spreadMethod="reflect"
-       x1="24.261463"
-       x2="24.605862"
-       xlink:href="#linearGradient2713"
-       y1="44.011002"
-       y2="45.887836" />
-    <linearGradient
-       gradientTransform="scale(1.102326,0.907173)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2740"
-       spreadMethod="reflect"
-       x1="17.681860"
-       x2="17.425413"
-       xlink:href="#linearGradient2713"
-       y1="60.433849"
-       y2="62.779984" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.433337,0.000000,0.000000,1.434961,6.409890,-0.113137)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2788"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.500069,0.000000,0.000000,1.675192,5.002970,-5.108149)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2792"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.621397,0.000000,0.000000,1.882058,2.388831,-9.409409)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2796"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.433337,0.000000,0.000000,1.434961,6.409890,-0.113137)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2811"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.500069,0.000000,0.000000,1.675192,5.002970,-5.108149)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2813"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.621397,0.000000,0.000000,1.882058,2.388831,-9.409409)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2815"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.433337,0.000000,0.000000,1.434961,6.409890,-0.113137)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2817"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.500069,0.000000,0.000000,1.675192,5.002970,-5.108149)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2819"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       gradientTransform="matrix(0.621397,0.000000,0.000000,1.882058,2.388831,-9.409409)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2821"
-       r="15.156592"
-       xlink:href="#linearGradient2780" />
-    <radialGradient
-       cx="17.191872"
-       cy="14.639010"
-       fx="17.191872"
-       fy="14.639010"
-       gradientTransform="scale(1.896245,0.527358)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2840"
-       r="3.5649405"
-       xlink:href="#linearGradient2834" />
-    <radialGradient
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       gradientTransform="matrix(2.366562,0,0,1.726511,-0.404355,-1.2826e-2)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2869"
-       r="6.0678878"
-       xlink:href="#linearGradient2834" />
-    <radialGradient
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       gradientTransform="matrix(-2.366562,0,0,1.726511,129.1226,-0.112925)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2873"
-       r="6.0678878"
-       xlink:href="#linearGradient2834" />
-    <linearGradient
-       gradientTransform="matrix(2.161083,0,0,1.804543,-5.13035e-2,2.267068)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2895"
-       x1="33.184048"
-       x2="33.184048"
-       xlink:href="#linearGradient2780"
-       y1="24.384579"
-       y2="-13.170087" />
-    <radialGradient
-       cx="27.270315"
-       cy="16.278088"
-       fx="27.270315"
-       fy="16.278088"
-       gradientTransform="scale(0.973329,1.027402)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2929"
-       r="13.638700"
-       xlink:href="#linearGradient2780" />
-    <linearGradient
-       gradientTransform="matrix(2.210222,0,0,1.964283,-1.515862,-2.171324)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2935"
-       x1="33.184048"
-       x2="33.184048"
-       xlink:href="#linearGradient2780"
-       y1="24.384579"
-       y2="-13.170087" />
-    <linearGradient
-       gradientTransform="matrix(1.632005,0,0,2.482509,-5.13035e-2,-1.2826e-2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2943"
-       x1="38.781849"
-       x2="38.781849"
-       xlink:href="#linearGradient2780"
-       y1="9.5745525"
-       y2="7.5863166" />
-    <linearGradient
-       gradientTransform="matrix(1.63752,0,0,2.47415,-5.13035e-2,-1.2826e-2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2951"
-       x1="38.362892"
-       x2="39.723621"
-       xlink:href="#linearGradient2780"
-       y1="11.170151"
-       y2="6.0918369" />
-    <radialGradient
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       gradientTransform="matrix(3.085042,0,0,2.052895,-15.9848,-3.14928)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2955"
-       r="6.0678878"
-       xlink:href="#linearGradient2834" />
-    <radialGradient
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       gradientTransform="matrix(-2.846279,0,0,2.087943,139.5254,-3.586178)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2959"
-       r="6.0678878"
-       xlink:href="#linearGradient2834" />
-    <radialGradient
-       cx="8.0178375"
-       cy="231.98276"
-       fx="8.0178375"
-       fy="231.98276"
-       gradientTransform="scale(3.741657,0.267261)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3063"
-       r="7.4833150"
-       xlink:href="#linearGradient3057" />
-    <radialGradient
-       cx="8.0178375"
-       cy="231.98276"
-       fx="8.0178375"
-       fy="231.98276"
-       gradientTransform="scale(3.741657,0.267261)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3069"
-       r="7.4833150"
-       xlink:href="#linearGradient3057" />
-    <radialGradient
-       cx="8.0178375"
-       cy="231.98276"
-       fx="8.0178375"
-       fy="231.98276"
-       gradientTransform="scale(3.741657,0.267261)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3071"
-       r="7.4833150"
-       xlink:href="#linearGradient3057" />
-    <linearGradient
-       gradientTransform="matrix(2.136116,0.000000,0.000000,1.825981,2.348697,-1.012826)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3080"
-       spreadMethod="pad"
-       x1="26.974447"
-       x2="26.974447"
-       xlink:href="#linearGradient2780"
-       y1="68.680031"
-       y2="44.981197" />
-    <linearGradient
-       gradientTransform="matrix(1.632005,0,0,2.436073,-5.13035e-2,2.009678)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3084"
-       x1="35.995708"
-       x2="35.995708"
-       xlink:href="#linearGradient2780"
-       y1="1.6246380"
-       y2="11.710631" />
-    <linearGradient
-       gradientTransform="matrix(2.218790,0.000000,0.000000,1.825981,-5.130350e-2,-1.012826)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3086"
-       spreadMethod="reflect"
-       x1="17.681860"
-       x2="17.425413"
-       xlink:href="#linearGradient2713"
-       y1="60.433849"
-       y2="62.779984" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2701"
-       id="linearGradient3106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.151801,0,0,1.77085,-5.13035e-2,4.351838)"
-       spreadMethod="reflect"
-       x1="29.613848"
-       y1="52.608921"
-       x2="44.723549"
-       y2="52.608921" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2713"
-       id="linearGradient3108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.21879,0,0,1.825981,-5.13035e-2,-1.012826)"
-       spreadMethod="reflect"
-       x1="29.093641"
-       y1="46.357063"
-       x2="29.093641"
-       y2="47.295517" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2713"
-       id="linearGradient3110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.21879,0,0,1.825981,-5.13035e-2,-1.012826)"
-       spreadMethod="reflect"
-       x1="24.261463"
-       y1="44.011002"
-       x2="24.605862"
-       y2="45.887836" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2713"
-       id="linearGradient3112"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.21879,0,0,1.825981,-5.13035e-2,-1.012826)"
-       spreadMethod="reflect"
-       x1="17.681860"
-       y1="60.433849"
-       x2="17.425413"
-       y2="62.779984" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="radialGradient3114"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.433337,0,0,1.434961,6.40989,-0.113137)"
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       r="15.156592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="radialGradient3116"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.500069,0,0,1.675192,5.00297,-5.108149)"
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       r="15.156592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="radialGradient3118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.621397,0,0,1.882058,2.388831,-9.409409)"
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       r="15.156592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="radialGradient3120"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.433337,0,0,1.434961,6.40989,-0.113137)"
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       r="15.156592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="radialGradient3122"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.500069,0,0,1.675192,5.00297,-5.108149)"
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       r="15.156592" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="radialGradient3124"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.621397,0,0,1.882058,2.388831,-9.409409)"
-       cx="20.360580"
-       cy="22.546398"
-       fx="20.360580"
-       fy="22.546396"
-       r="15.156592" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="linearGradient3126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.136116,0,0,1.825981,2.348697,-1.012826)"
-       spreadMethod="pad"
-       x1="26.974447"
-       y1="68.680031"
-       x2="26.974447"
-       y2="44.981197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2780"
-       id="linearGradient3130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.136116,0,0,1.825981,-87.401303,-67.012826)"
-       spreadMethod="pad"
-       x1="26.974447"
-       y1="68.680031"
-       x2="26.974447"
-       y2="44.981197" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2713"
-       id="linearGradient3142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.21879,0,0,1.825981,-54.801304,-67.512826)"
-       spreadMethod="reflect"
-       x1="17.681860"
-       y1="60.433849"
-       x2="17.425413"
-       y2="62.779984" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2713"
-       id="linearGradient3145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.21879,0,0,1.825981,-70.051304,-58.262826)"
-       spreadMethod="reflect"
-       x1="24.261463"
-       y1="44.011002"
-       x2="24.605862"
-       y2="45.887836" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2713"
-       id="linearGradient3148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.21879,0,0,1.825981,-62.551304,-52.512826)"
-       spreadMethod="reflect"
-       x1="29.093641"
-       y1="46.357063"
-       x2="29.093641"
-       y2="47.295517" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3057"
-       id="radialGradient4946"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.531304,0,0,0.53795,-15.775652,-129.52565)"
-       cx="8.0178375"
-       cy="231.98276"
-       fx="8.0178375"
-       fy="231.98276"
-       r="7.4833150" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3057"
-       id="radialGradient4949"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.531304,0,0,0.672437,-18.025652,-149.23087)"
-       cx="8.0178375"
-       cy="231.98276"
-       fx="8.0178375"
-       fy="231.98276"
-       r="7.4833150" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3057"
-       id="radialGradient4952"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.531304,0,0,0.53795,-11.275652,-137.01283)"
-       cx="8.0178375"
-       cy="231.98276"
-       fx="8.0178375"
-       fy="231.98276"
-       r="7.4833150" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="radialGradient4955"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.846279,0,0,2.087943,139.5254,-3.586178)"
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       r="6.0678878" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="radialGradient4958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.085042,0,0,2.052895,-15.9848,-3.14928)"
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       r="6.0678878" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="radialGradient4974"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.366562,0,0,1.726511,129.1226,-0.112925)"
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       r="6.0678878" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="radialGradient4977"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.366562,0,0,1.726511,-0.404355,-1.2826e-2)"
-       cx="21.595108"
-       cy="8.9813547"
-       fx="21.595108"
-       fy="8.9813547"
-       r="6.0678878" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="linearGradient6992"
-       x1="-229"
-       y1="36.5"
-       x2="-134"
-       y2="36.5"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="radialGradient7002"
-       cx="-118.5"
-       cy="-41"
-       fx="-118.5"
-       fy="-41"
-       r="30.5"
-       gradientTransform="matrix(1,0,0,0.655738,0,-14.11475)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="radialGradient7014"
-       cx="-35"
-       cy="-163"
-       fx="-35"
-       fy="-163"
-       r="59"
-       gradientTransform="matrix(1,0,0,0.576271,0,-69.0678)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="g5908">
-    <g
-       id="g5889"
-       style="fill:#989898;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2.4;stroke-miterlimit:4;stroke-dasharray:none">
-      <path
-         style="fill:#989898;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;stroke-dasharray:none"
-         id="rect2723"
-         d="M 64.359126,2 C 44.287226,2 28.128259,18.158966 28.128259,38.230867 L 28.128259,78.487385 L 38.192389,78.487385 L 38.192389,38.230867 C 38.192389,23.734494 49.862754,12.06413 64.359126,12.06413 C 78.855498,12.06413 90.525863,23.734494 90.525863,38.230867 L 90.525863,78.487385 L 100.58999,78.487385 L 100.58999,38.230867 C 100.58999,18.158966 84.431026,2 64.359126,2 z " />
-    </g>
-    <g
-       id="g4928"
-       style="fill:#edbb15;fill-opacity:1;stroke:#000000;stroke-width:2.8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       transform="translate(0,-0.25)">
-      <rect
-         y="57.359127"
-         x="24.102608"
-         width="80.513039"
-         style="fill:#edbb15;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         ry="0.5"
-         rx="0.49999997"
-         id="rect1941"
-         height="66.259109" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<rect x="5" y="11" width="14" height="10" rx="2"/>
+  <path d="M9 11V8a3 3 0 0 1 6 0v3"/>
 </svg>
diff --git a/cockatrice/resources/icons/not_ready_start.svg b/cockatrice/resources/icons/not_ready_start.svg
index 73afda9db..c20a5cfe6 100644
--- a/cockatrice/resources/icons/not_ready_start.svg
+++ b/cockatrice/resources/icons/not_ready_start.svg
@@ -1,368 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   version="1.0"
-   sodipodi:docname="icon_not_ready_start.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="-7.5402943"
-     inkscape:cy="36.374705"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.37689075;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3018"
-       sodipodi:cx="-25.967213"
-       sodipodi:cy="12.852459"
-       sodipodi:rx="9.04918"
-       sodipodi:ry="9.04918"
-       d="m -16.918033,12.852459 a 9.04918,9.04918 0 1 1 -18.09836,0 9.04918,9.04918 0 1 1 18.09836,0 z"
-       transform="matrix(3.392487,0,0,3.392487,120.35572,-11.470653)" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       d="M 12.146996,18.3904 25.952237,32.195642 12.146996,46.000885 18.521547,52.375436 32.326789,38.570194 46.132032,52.375436 52.506582,46.000885 38.701341,32.195642 52.506582,18.3904 46.132032,12.015849 32.326789,25.82109 18.521547,12.015849 12.146996,18.3904 z"
-       id="rect3548"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M6 6l12 12"/>
+  <path d="M18 6L6 18"/>
 </svg>
diff --git a/cockatrice/resources/icons/pen_to_square.svg b/cockatrice/resources/icons/pen_to_square.svg
index 60ff1d9c4..7d3e161ac 100644
--- a/cockatrice/resources/icons/pen_to_square.svg
+++ b/cockatrice/resources/icons/pen_to_square.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M535.6 85.7C513.7 63.8 478.3 63.8 456.4 85.7L432 110.1L529.9 208L554.3 183.6C576.2 161.7 576.2 126.3 554.3 104.4L535.6 85.7zM236.4 305.7C230.3 311.8 225.6 319.3 222.9 327.6L193.3 416.4C190.4 425 192.7 434.5 199.1 441C205.5 447.5 215 449.7 223.7 446.8L312.5 417.2C320.7 414.5 328.2 409.8 334.4 403.7L496 241.9L398.1 144L236.4 305.7zM160 128C107 128 64 171 64 224L64 480C64 533 107 576 160 576L416 576C469 576 512 533 512 480L512 384C512 366.3 497.7 352 480 352C462.3 352 448 366.3 448 384L448 480C448 497.7 433.7 512 416 512L160 512C142.3 512 128 497.7 128 480L128 224C128 206.3 142.3 192 160 192L256 192C273.7 192 288 177.7 288 160C288 142.3 273.7 128 256 128L160 128z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M11 4H6a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-5"/>
+  <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4z"/>
+</svg>
diff --git a/cockatrice/resources/icons/pencil.svg b/cockatrice/resources/icons/pencil.svg
index c8b81f698..d274e98db 100644
--- a/cockatrice/resources/icons/pencil.svg
+++ b/cockatrice/resources/icons/pencil.svg
@@ -1,123 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="64"
-   height="64"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="pencil.svg">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="752"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="38.985767"
-     inkscape:cx="49.593625"
-     inkscape:cy="9.752988"
-     inkscape:window-x="-4"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective20" />
-  </defs>
-  <path
-     style="fill:#f2f2f2;stroke:black;stroke-width:0.36091354;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4310"
-     d="M 10.735636,2.7007755 L 10.735636,59.759195 L 47.991073,59.759195 L 53.259135,54.575403 L 53.259135,2.7007755 L 10.735636,2.7007755 z" />
-  <path
-     style="opacity:0.43930634;fill:black;stroke:none"
-     id="rect4314-9-2"
-     d="M 47.539263,54.178486 L 53.43341,54.178486 L 47.539263,59.914352 L 47.539263,54.178486 z" />
-  <path
-     style="fill:#f2f2f2;stroke:black;stroke-width:0.33989298;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4314-9-5"
-     d="M 48.080899,54.683517 L 53.016926,54.683517 L 48.080899,59.569868 L 48.080899,54.683517 z" />
-  <path
-     style="opacity:0.43930634;fill:black;stroke:none"
-     id="rect4120-3"
-     d="M 7.8062475,55.039312 L 7.8339835,55.072982 L 4.5689682,57.65671 L 5.2398545,58.476426 L 6.3020905,59.774252 L 6.9450675,60.559879 L 10.210081,57.976151 L 35.079771,38.295796 L 35.107506,38.329466 L 37.205296,34.249681 L 32.67559,35.358116 L 7.8059005,55.03861 z" />
-  <rect
-     style="fill:#fc0;stroke:black;stroke-width:0.28297317;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4120"
-     transform="matrix(0.78188456,-0.62342324,0.63622425,0.77150419,0,0)"
-     y="46.463638"
-     x="-29.50437"
-     height="3.7814219"
-     width="31.701616" />
-  <rect
-     style="fill:#4d4d4d;stroke:black;stroke-width:0.28297317;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4122"
-     transform="matrix(0.78188456,-0.62342324,0.63622425,0.77150419,0,0)"
-     y="46.477345"
-     x="-33.674004"
-     height="3.7620518"
-     width="4.171114" />
-  <path
-     style="fill:#ffe680;stroke:black;stroke-width:0.28295398;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4124"
-     d="M 31.271515,34.459836 L 35.787845,33.312261 L 33.712851,37.420244 L 31.271515,34.459836 z" />
-  <path
-     style="fill:black;stroke:black;stroke-width:0.28295398;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4127"
-     d="M 34.451031,33.663829 L 35.778335,33.329236 L 35.171353,34.537276 L 34.451031,33.663829 z" />
-  <rect
-     style="fill:#333;stroke:black;stroke-width:0.28297317;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4122-4"
-     transform="matrix(0.78188456,-0.62342324,0.63622425,0.77150419,0,0)"
-     y="47.533978"
-     x="-33.669418"
-     height="1.698899"
-     width="4.171114" />
-  <rect
-     style="fill:#4d4d4d;stroke:black;stroke-width:0.28297317;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4122-8"
-     transform="matrix(0.78188456,-0.62342324,0.63622425,0.77150419,0,0)"
-     y="49.239918"
-     x="-33.669418"
-     height="1.0045688"
-     width="4.171114" />
-  <rect
-     style="fill:#a80;stroke:black;stroke-width:0.28297317;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     id="rect4122-4-7"
-     transform="matrix(0.78188456,-0.62342324,0.63622425,0.77150419,0,0)"
-     y="47.53389"
-     x="-29.508781"
-     height="1.698899"
-     width="31.643009" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 20h9"/>
+  <path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4z"/>
 </svg>
diff --git a/cockatrice/resources/icons/pin.svg b/cockatrice/resources/icons/pin.svg
index 71d4c9c9c..9c173286b 100644
--- a/cockatrice/resources/icons/pin.svg
+++ b/cockatrice/resources/icons/pin.svg
@@ -1,24 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="64" height="64">
-  <g transform="matrix(0 1 -1 0 99.465813 0)" opacity="0.7">
-    <path fill="#000000" fill-rule="evenodd" clip-rule="evenodd"
-    stroke="#ffffff"
-          stroke-width="4"
-          stroke-linejoin="round"
-          stroke-linecap="round"
-          d="M65.5 62
-             L78 49
-             C73.5 44.5 69.5 42 63 44
-             L45 31 C47 25 46 22 41.5 18
-             L19 41.5
-             C23 45.5 25 46.5 31 45
-             L44 62.5
-             C42.3 69 45 73.5 49 78
-             L61.5 65.5
-             L84 87
-             L87 87
-             L87.5 86.5
-             L87.5 83.5 Z" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M9 4h6l-1 6 3 3v2H7v-2l3-3z"/>
+  <path d="M12 15v6"/>
 </svg>
-
diff --git a/cockatrice/resources/icons/player.svg b/cockatrice/resources/icons/player.svg
index e83b24654..9fbe39a11 100644
--- a/cockatrice/resources/icons/player.svg
+++ b/cockatrice/resources/icons/player.svg
@@ -1,142 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2508"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_player.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2510">
-    <linearGradient
-       id="linearGradient5717">
-      <stop
-         style="stop-color:#003580;stop-opacity:1;"
-         offset="0"
-         id="stop5719" />
-      <stop
-         id="stop5727"
-         offset="0.25297618"
-         style="stop-color:#055897;stop-opacity:1;" />
-      <stop
-         id="stop5725"
-         offset="0.5"
-         style="stop-color:#00a4ff;stop-opacity:1;" />
-      <stop
-         id="stop5733"
-         offset="0.75"
-         style="stop-color:#055897;stop-opacity:1;" />
-      <stop
-         style="stop-color:#003580;stop-opacity:1;"
-         offset="1"
-         id="stop5721" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5717"
-       id="linearGradient5723"
-       x1="339.93985"
-       y1="482.58844"
-       x2="459.27341"
-       y2="355.50766"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.1263349,-0.1263349,0,74.367722,-7.5042832)" />
-    <linearGradient
-       id="linearGradient3234">
-      <stop
-         style="stop-color:#6f6f6f;stop-opacity:1;"
-         offset="0"
-         id="stop3236" />
-      <stop
-         id="stop3242"
-         offset="0.47999999"
-         style="stop-color:#e6e6e6;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop3244" />
-      <stop
-         id="stop3286"
-         offset="0.75"
-         style="stop-color:#bebebe;stop-opacity:1;" />
-      <stop
-         style="stop-color:#494949;stop-opacity:1;"
-         offset="1"
-         id="stop3238" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3234"
-       id="linearGradient5120"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.9332267e-2,8.9332267e-2,8.9332267e-2,-8.9332267e-2,-16.525693,40.126552)"
-       x1="202.99225"
-       y1="395.23221"
-       x2="251.27765"
-       y2="395.23221" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2516" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="35.570639"
-     inkscape:cy="33.231713"
-     inkscape:current-layer="g2536"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="619"
-     inkscape:window-y="35"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2513">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g2536"
-       transform="translate(-0.1818183,-3.0952293e-8)">
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3.4920001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:60.01653385"
-         d="m 60.100711,4.0811082 -8.925773,4.066985 C 41.14173,19.502755 31.186489,31.772714 19.035138,42.39632 16.923235,39.989095 14.162681,36.349247 12.592568,33.629733 L 7.4098614,38.84843 c 0,0 4.1855936,1.798155 5.3626626,2.627344 1.177067,0.829192 3.640464,3.136411 3.640464,3.136411 0,0 -6.9973489,9.844274 -12.8181741,11.40396 -1.8723058,0.501682 4.0691751,6.443164 4.5708593,4.570859 1.5576526,-5.813242 11.1468308,-13.589562 11.1468308,-13.589562 0,0 2.672321,3.126813 3.501514,4.30388 0.82919,1.177069 2.519371,5.470634 2.519371,5.470634 L 30.552085,51.58925 C 27.830216,50.017778 24.343721,47.501755 21.950055,45.40381 32.445673,33.693842 43.199214,24.522178 56.033726,13.00688 z"
-         id="path5116"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccscsscsccccc" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M14.5 17.5 3 6V3h3l11.5 11.5"/>
+  <path d="M13 19l6-6"/>
+  <path d="M16 16l4 4"/>
+  <path d="M19 21l2-2"/>
+  <path d="M5 14l4 4"/>
+  <path d="M7 17l-3 3"/>
 </svg>
diff --git a/cockatrice/resources/icons/ready_start.svg b/cockatrice/resources/icons/ready_start.svg
index 238d2aa46..4c4ea5d2d 100644
--- a/cockatrice/resources/icons/ready_start.svg
+++ b/cockatrice/resources/icons/ready_start.svg
@@ -1,81 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500"
-   height="500"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_ready_start.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4339754"
-     inkscape:cx="281.46845"
-     inkscape:cy="299.09369"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1600"
-     inkscape:window-height="1178"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-552.36218)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#0dc700;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:1;stroke-width:5.46761148;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path2984"
-       sodipodi:cx="-137.08441"
-       sodipodi:cy="104.52625"
-       sodipodi:rx="182.45049"
-       sodipodi:ry="182.45049"
-       d="m 45.366074,104.52625 c 0,100.76462 -81.685865,182.45049 -182.450484,182.45049 -100.76462,0 -182.45049,-81.68587 -182.45049,-182.45049 0,-100.7646178 81.68587,-182.450482 182.45049,-182.450482 100.764619,0 182.450484,81.6858642 182.450484,182.450482 z"
-       transform="matrix(1.3351351,0,0,1.3351351,434.51202,663.29215)" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 375.18246,681.4936 -180.66822,156.20036 -62.11391,-71.84189 -57.207882,49.50276 110.831342,128.16069 0.15088,-0.11694 0.7485,0.87896 237.72517,-205.58619 -49.46594,-57.19777 z"
-       id="rect3754"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M4 12l5 5L20 6"/>
 </svg>
diff --git a/cockatrice/resources/icons/reload.svg b/cockatrice/resources/icons/reload.svg
index 102995876..e09b1b7ef 100644
--- a/cockatrice/resources/icons/reload.svg
+++ b/cockatrice/resources/icons/reload.svg
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-     viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
-<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-    <g><path d="M586.9,373.6l95.6-84.4c-49.6-39.2-129.4-79.1-198.2-79.1c-134.9,0-248.2,90.5-280.2,212.8L10.6,374.5C64.4,168.3,255.2,15.8,482.5,15.8c126.7,0,258.8,63.7,345.4,141.4l90.8-80.1L990,479.6L586.9,373.6z M317.5,710.8c49.6,39.2,129.4,79.1,198.2,79.1c134.9,0,248.2-90.5,280.2-212.8l193.5,48.5c-53.7,206.2-244.6,358.7-471.9,358.7c-126.7,0-258.8-63.7-345.4-141.4l-90.8,80.1L10,520.4l403.1,106L317.5,710.8z"/></g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M20 12a8 8 0 1 1-2.3-5.7"/>
+  <path d="M20 4v5h-5"/>
+</svg>
diff --git a/cockatrice/resources/icons/remove_row.svg b/cockatrice/resources/icons/remove_row.svg
index 6f133cdb6..5d00ed57c 100644
--- a/cockatrice/resources/icons/remove_row.svg
+++ b/cockatrice/resources/icons/remove_row.svg
@@ -1,356 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2646"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   version="1.0"
-   sodipodi:docname="deck_editor_remove_row.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2648">
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4766">
-      <stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4758">
-      <stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" />
-      <stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2654" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3508"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3512"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient3520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient3522"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2482"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2484"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient2488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="590.62201"
-       y1="434.7522"
-       x2="698.54004"
-       y2="517.79218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient2490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9650128,0,0,0.9948433,-449.70565,-312.80927)"
-       x1="661.24402"
-       y1="602.90814"
-       x2="431.5"
-       y2="201.5482" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.625"
-     inkscape:cx="-27.27273"
-     inkscape:cy="30.210771"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2651">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Pfeil"
-     style="display:inline">
-    <path
-       style="fill:#ff7672;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 6.433227,14.50946 L 23.923767,32 L 6.433227,49.490541 L 14.50946,57.566773 L 32,40.076233 L 49.490541,57.566773 L 57.566773,49.490541 L 40.076233,32 L 57.566773,14.50946 L 49.490541,6.433227 L 32,23.923767 L 14.50946,6.433227 L 6.433227,14.50946 z"
-       id="rect3548" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M6 6l12 12"/>
+  <path d="M18 6L6 18"/>
 </svg>
diff --git a/cockatrice/resources/icons/rename.svg b/cockatrice/resources/icons/rename.svg
index c68a00246..bab850808 100644
--- a/cockatrice/resources/icons/rename.svg
+++ b/cockatrice/resources/icons/rename.svg
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
-    <path transform="scale(50)" d="m17 16h4v-8h-4" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m12 8h-9v8h9" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m6 12h5" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m20 4h-2c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h2" fill="none" stroke="#000"
-          stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2"/>
-    <path transform="scale(50)" d="m12 20h2c1.1 0 2-0.9 2-2v-12c0-1.1-0.9-2-2-2h-2" fill="none" stroke="#000"
-          stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linejoin="round">
+  <path d="M17 16h4V8h-4"/>
+  <path d="M12 8H3v8h9"/>
+  <path d="M6 12h5"/>
+  <path d="M20 4h-2c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h2"/>
+  <path d="M12 20h2c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2h-2"/>
 </svg>
diff --git a/cockatrice/resources/icons/scale_balanced.svg b/cockatrice/resources/icons/scale_balanced.svg
deleted file mode 100644
index fae468d38..000000000
--- a/cockatrice/resources/icons/scale_balanced.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M384 96L512 96C529.7 96 544 110.3 544 128C544 145.7 529.7 160 512 160L398.4 160C393.2 185.8 375.5 207.1 352 217.3L352 512L512 512C529.7 512 544 526.3 544 544C544 561.7 529.7 576 512 576L128 576C110.3 576 96 561.7 96 544C96 526.3 110.3 512 128 512L288 512L288 217.3C264.5 207 246.8 185.7 241.6 160L128 160C110.3 160 96 145.7 96 128C96 110.3 110.3 96 128 96L256 96C270.6 76.6 293.8 64 320 64C346.2 64 369.4 76.6 384 96zM439.6 384L584.4 384L512 259.8L439.6 384zM512 480C449.1 480 396.8 446 386 401.1C383.4 390.1 387 378.8 392.7 369L487.9 205.8C492.9 197.2 502.1 192 512 192C521.9 192 531.1 197.3 536.1 205.8L631.3 369C637 378.8 640.6 390.1 638 401.1C627.2 445.9 574.9 480 512 480zM126.8 259.8L54.4 384L199.3 384L126.8 259.8zM.9 401.1C-1.7 390.1 1.9 378.8 7.6 369L102.8 205.8C107.8 197.2 117 192 126.9 192C136.8 192 146 197.3 151 205.8L246.2 369C251.9 378.8 255.5 390.1 252.9 401.1C242.1 445.9 189.8 480 126.9 480C64 480 11.7 446 .9 401.1z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/scales.svg b/cockatrice/resources/icons/scales.svg
index a410921dd..4b2e16fcc 100644
--- a/cockatrice/resources/icons/scales.svg
+++ b/cockatrice/resources/icons/scales.svg
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="52pt" viewBox="0 0 52 52" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:#000000;fill-opacity:1;" d="M 25.605469 0.125 C 25.605469 0.125 23.265625 3.140625 23.265625 4.433594 C 23.265625 5.316406 23.765625 6.070313 24.5 6.464844 C 23.898438 6.65625 23.375 6.992188 22.960938 7.449219 C 22.011719 6.640625 20.628906 5.910156 18.710938 5.910156 C 16.640625 5.910156 14.863281 6.753906 13.355469 7.507813 C 12.601563 7.886719 11.925781 8.25 11.324219 8.496094 C 10.964844 8.09375 10.425781 7.878906 9.847656 7.878906 C 8.75 7.878906 7.878906 8.75 7.878906 9.847656 C 7.878906 10.949219 8.75 11.816406 9.847656 11.816406 C 10.757813 11.816406 11.519531 11.234375 11.757813 10.402344 C 12.578125 10.078125 13.386719 9.648438 14.21875 9.234375 C 15.671875 8.507813 17.179688 7.878906 18.710938 7.878906 C 20.496094 7.878906 21.519531 8.679688 22.097656 9.355469 C 22.074219 9.519531 22.035156 9.6875 22.035156 9.847656 C 22.035156 11.816406 23.636719 13.417969 25.605469 13.417969 C 27.574219 13.417969 29.175781 11.816406 29.175781 9.847656 C 29.175781 9.6875 29.136719 9.519531 29.113281 9.355469 C 29.691406 8.679688 30.714844 7.878906 32.5 7.878906 C 34.03125 7.878906 35.539063 8.507813 36.992188 9.234375 C 37.824219 9.648438 38.632813 10.078125 39.457031 10.402344 C 39.695313 11.234375 40.457031 11.816406 41.363281 11.816406 C 42.464844 11.816406 43.332031 10.949219 43.332031 9.847656 C 43.332031 8.75 42.464844 7.878906 41.363281 7.878906 C 40.785156 7.878906 40.246094 8.09375 39.886719 8.496094 C 39.285156 8.25 38.609375 7.886719 37.855469 7.507813 C 36.347656 6.753906 34.570313 5.910156 32.5 5.910156 C 30.585938 5.910156 29.199219 6.640625 28.253906 7.449219 C 27.835938 6.992188 27.3125 6.65625 26.714844 6.464844 C 27.445313 6.070313 27.945313 5.316406 27.945313 4.433594 C 27.945313 3.140625 25.605469 0.125 25.605469 0.125 Z M 9.539063 13.234375 C 9.25 13.332031 9.023438 13.558594 8.925781 13.847656 L 2.277344 31.515625 L 0 31.515625 C 1.445313 35.578125 5.285156 38.53125 9.847656 38.53125 C 14.410156 38.53125 18.25 35.578125 19.695313 31.515625 L 17.417969 31.515625 L 10.773438 13.847656 C 10.601563 13.402344 10.132813 13.140625 9.664063 13.234375 C 9.625 13.234375 9.578125 13.234375 9.539063 13.234375 Z M 41.054688 13.234375 C 40.761719 13.332031 40.539063 13.558594 40.441406 13.847656 L 33.792969 31.515625 L 31.515625 31.515625 C 32.960938 35.578125 36.800781 38.53125 41.363281 38.53125 C 45.925781 38.53125 49.765625 35.578125 51.210938 31.515625 L 48.933594 31.515625 L 42.285156 13.847656 C 42.117188 13.402344 41.648438 13.140625 41.179688 13.234375 C 41.140625 13.234375 41.09375 13.234375 41.054688 13.234375 Z M 21.914063 15.757813 C 21.914063 17.082031 22.589844 18.242188 23.636719 18.898438 L 23.636719 41.980469 C 21.429688 42.773438 19.796875 44.816406 19.695313 47.273438 L 15.757813 47.273438 C 14.671875 47.273438 13.789063 48.15625 13.789063 49.242188 L 13.789063 51.210938 L 37.425781 51.210938 L 37.425781 49.242188 C 37.425781 48.15625 36.539063 47.273438 35.453125 47.273438 L 31.515625 47.273438 C 31.414063 44.816406 29.785156 42.773438 27.574219 41.980469 L 27.574219 18.898438 C 28.621094 18.242188 29.300781 17.082031 29.300781 15.757813 Z M 9.847656 17.050781 L 15.328125 31.515625 L 4.371094 31.515625 Z M 41.363281 17.050781 L 46.84375 31.515625 L 35.886719 31.515625 Z "/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M12 3v18"/>
+  <path d="M5 7h14"/>
+  <path d="M5 7l-3 6a3 3 0 0 0 6 0z"/>
+  <path d="M19 7l3 6a3 3 0 0 1-6 0z"/>
+  <path d="M8 21h8"/>
 </svg>
diff --git a/cockatrice/resources/icons/scroll.svg b/cockatrice/resources/icons/scroll.svg
index f4828e679..edcf29d11 100644
--- a/cockatrice/resources/icons/scroll.svg
+++ b/cockatrice/resources/icons/scroll.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M32 176C32 134.5 63.6 100.4 104 96.4L104 96L384 96C437 96 480 139 480 192L480 368L304 368C264.2 368 232 400.2 232 440L232 500C232 524.3 212.3 544 188 544C163.7 544 144 524.3 144 500L144 272L80 272C53.5 272 32 250.5 32 224L32 176zM268.8 544C275.9 530.9 280 515.9 280 500L280 440C280 426.7 290.7 416 304 416L552 416C565.3 416 576 426.7 576 440L576 464C576 508.2 540.2 544 496 544L268.8 544zM112 144C94.3 144 80 158.3 80 176L80 224L144 224L144 176C144 158.3 129.7 144 112 144z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M4 19.5A2.5 2.5 0 0 1 6.5 17H20"/>
+  <path d="M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z"/>
+  <path d="M8 7h8"/>
+  <path d="M8 11h8"/>
+</svg>
diff --git a/cockatrice/resources/icons/search.svg b/cockatrice/resources/icons/search.svg
index 05439a12e..be4a87f00 100644
--- a/cockatrice/resources/icons/search.svg
+++ b/cockatrice/resources/icons/search.svg
@@ -1,198 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_search_black.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3709">
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="0"
-         id="stop3711" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:0;"
-         offset="1"
-         id="stop3713" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3699">
-      <stop
-         style="stop-color:#ececec;stop-opacity:1;"
-         offset="0"
-         id="stop3701" />
-      <stop
-         style="stop-color:#ececec;stop-opacity:0;"
-         offset="1"
-         id="stop3703" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3632">
-      <stop
-         style="stop-color:#c87137;stop-opacity:1;"
-         offset="0"
-         id="stop3634" />
-      <stop
-         style="stop-color:#c87137;stop-opacity:0;"
-         offset="1"
-         id="stop3636" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3622">
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:1;"
-         offset="0"
-         id="stop3624" />
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:0;"
-         offset="1"
-         id="stop3626" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3622"
-       id="linearGradient3628"
-       x1="30.59761"
-       y1="8.9243031"
-       x2="30.59761"
-       y2="21.545816"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3632"
-       id="linearGradient3638"
-       x1="28.430279"
-       y1="47.808765"
-       x2="29.960159"
-       y2="47.808765"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective3685"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3699"
-       id="linearGradient3705"
-       x1="29.215645"
-       y1="1021.9559"
-       x2="31.852083"
-       y2="1021.9559"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3709"
-       id="linearGradient3715"
-       x1="22.288248"
-       y1="35.505978"
-       x2="49.488647"
-       y2="49.106178"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3632"
-       id="linearGradient3730"
-       gradientUnits="userSpaceOnUse"
-       x1="28.430279"
-       y1="47.808765"
-       x2="29.960159"
-       y2="47.808765" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3699"
-       id="linearGradient3732"
-       gradientUnits="userSpaceOnUse"
-       x1="29.215645"
-       y1="1021.9559"
-       x2="31.852083"
-       y2="1021.9559" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.84375"
-     inkscape:cx="6.0725518"
-     inkscape:cy="32"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3717"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-988.36218)">
-    <g
-       id="g3717"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,729.31175,279.31708)">
-      <path
-         transform="matrix(1.7216859,0,0,1.7216859,-37.751505,955.72849)"
-         d="m 49.338646,35.505978 a 13.450199,13.450199 0 1 1 -26.900398,0 13.450199,13.450199 0 1 1 26.900398,0 z"
-         sodipodi:ry="13.450199"
-         sodipodi:rx="13.450199"
-         sodipodi:cy="35.505978"
-         sodipodi:cx="35.888447"
-         id="path2816"
-         style="fill:#222326;fill-opacity:0;stroke:#222326;stroke-width:1.90745997;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.08671958,-1.1164509,1.1164509,-0.08671958,2.9138372,1039.7631)"
-         d="m 18.613546,52.207172 a 2.5498009,12.302789 0 1 1 -5.099601,0 2.5498009,12.302789 0 1 1 5.099601,0 z"
-         sodipodi:ry="12.302789"
-         sodipodi:rx="2.5498009"
-         sodipodi:cy="52.207172"
-         sodipodi:cx="16.063745"
-         id="path2826"
-         style="fill:#222326;fill-opacity:1;stroke:#222326;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <circle cx="10.5" cy="10.5" r="6.5"/>
+  <path d="M15.5 15.5 21 21"/>
+</svg>
diff --git a/cockatrice/resources/icons/settings.svg b/cockatrice/resources/icons/settings.svg
index 77a2ccfa9..3942a0916 100644
--- a/cockatrice/resources/icons/settings.svg
+++ b/cockatrice/resources/icons/settings.svg
@@ -1,280 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="133.078"
-   id="Layer_1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_settings.svg"
-   sodipodi:version="0.32"
-   space="preserve"
-   style="overflow:visible;enable-background:new 0 0 132.882 133.078;"
-   version="1.1"
-   viewBox="0 0 132.882 133.078"
-   width="132.882">
-  <metadata
-     id="metadata3">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:title>Ruota dentata grigia</dc:title>
-        <dc:description />
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>unsorted</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:publisher>
-          <cc:Agent
-             rdf:about="http://www.openclipart.org/">
-            <dc:title>Open Clip Art Library</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Architetto Francesco Rollandin</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>Architetto Francesco Rollandin</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:date />
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs88" />
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     id="base"
-     inkscape:current-layer="Layer_1"
-     inkscape:cx="11.842486"
-     inkscape:cy="69.252383"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="928"
-     inkscape:window-width="1411"
-     inkscape:window-x="191"
-     inkscape:window-y="47"
-     inkscape:zoom="5.4103608"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <g
-     id="g3"
-     style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1">
-    <radialGradient
-       cx="66.5674"
-       cy="66.3169"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_5_"
-       r="65.835">
-      <stop
-         id="stop6"
-         offset="0"
-         style="stop-color:#F8F8F8" />
-      <stop
-         id="stop8"
-         offset="1"
-         style="stop-color:#7F7F7F" />
-    </radialGradient>
-    <path
-       d="M125.144,56.349c-3.771,0-7.545,0.045-11.314,0.186c-0.897-4.456-2.482-8.765-4.657-12.756   c-1.116-2.051-3.152-3.094-1.176-4.893c1.351-1.228,2.674-2.482,3.984-3.751c2.54-2.458,7.481-6.071,5.054-10.111   c-2.409-4.008-9.553-12.402-14.613-8.778c-3.259,2.332-6.025,5.805-8.753,8.728c-1.839,1.972-10.072-3.345-13.153-4.284   c-2.29-0.697-4.424-0.006-4.282-2.731c0.099-1.899,0.151-3.802,0.183-5.704c0.046-2.924,0.872-7.681-1.602-9.949   c-2.693-2.47-13.091-2.182-16.192-0.591c-2.902,1.487-2.505,5.529-2.49,8.222c0.011,2.005,0.038,4.011,0.09,6.017   c0.076,2.895,1.006,3.128-2.148,3.853c-4.414,1.016-8.685,2.631-12.661,4.795c-2.706,1.474-2.19,0.776-4.07-1.242   c-1.784-1.917-3.619-3.792-5.471-5.644c-5.942-5.942-11.491,1.433-15.473,6.153c-2.454,2.908-1.425,5.693,1.093,8.212   c1.554,1.552,3.121,3.095,4.703,4.618c3.003,2.895,2.475,2.563,0.439,6.089c-2.106,3.649-3.704,7.589-4.729,11.678   c-0.889,3.547-6.993,1.883-10.459,1.883c-8.083,0-6.575,7.183-6.646,13.097c-0.099,8.381,6.687,7.291,13.357,7.167   c3.019-0.057,3.419-1.006,4.392,2.141c0.679,2.203,1.527,4.354,2.533,6.43c0.999,2.063,2.151,4.05,3.442,5.944   c1.956,2.872-0.17,3.17-2.443,5.329c-2.402,2.283-7.031,5.432-7.215,9.075c-0.154,3.043,3.263,5.365,5.149,7.252   s4.212,5.316,7.26,5.158c3.995-0.206,7.724-5.77,10.257-8.424c1.112-1.164,2.211-2.339,3.291-3.532   c2.416,1.359,4.945,2.514,7.554,3.451c2.667,0.961,5.417,1.691,8.207,2.191c-0.196,2.286-0.295,4.58-0.357,6.873   c-0.093,3.384-1.316,9.583,1.551,12.215c2.403,2.205,7.079,1.192,10.013,1.252c2.549,0.054,6.151,0.456,7.717-2.1   c2.355-3.849,0.94-10.923,0.786-15.24c-0.107-2.931-1.017-3.003,2.18-3.832c3.045-0.79,6.019-1.861,8.864-3.205   c3.503-1.651,3.52-2.752,6.156,0.172c1.791,1.988,3.646,3.92,5.522,5.826c2.889,2.937,6.048,6.091,9.923,2.818   c2.688-2.271,7.617-6.12,8.636-9.61c1.223-4.195-4.952-8.343-7.479-10.767c-2.237-2.148-4.737-2.782-2.863-5.64   c1.603-2.441,2.973-5.036,4.082-7.737c0.839-2.045,1.528-4.15,2.061-6.296c2.411,0.156,4.826,0.234,7.239,0.275   c3.483,0.061,9.652,1.05,10.868-3.456C133.132,67.049,133.389,56.349,125.144,56.349 M65.631,84.78   c-10.628,0-20.194-8.436-20.194-19.325c0-10.889,9.565-19.324,20.194-19.324c10.627,0,20.195,8.435,20.195,19.324   C85.826,76.344,76.259,84.78,65.631,84.78"
-       id="path10"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <linearGradient
-       gradientTransform="matrix(776.0099 550.007 550.007 -776.0099 -66856.1797 490158.2813)"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_6_"
-       x1="-241.1641"
-       x2="-239.5807"
-       y1="461.063"
-       y2="461.063">
-      <stop
-         id="stop13"
-         offset="0"
-         style="stop-color:#FFFFFF" />
-      <stop
-         id="stop15"
-         offset="1"
-         style="stop-color:#000000" />
-    </linearGradient>
-    <path
-       d="M66.287,1.853c2.222-0.034,4.739-0.403,6.857,0.365c3.572,1.299,2.531,7.112,2.485,9.961   c-0.025,1.531-1.121,6.786-0.321,8.029c0.813,1.265,9.244,2.709,11.056,3.537c6.891,3.14,5.463,4.316,10.604-1.013   c2.665-2.76,6.867-9.078,11.128-5.777c2.658,2.06,9.874,8.281,8.585,11.593c-1.303,3.346-5.354,6.176-7.92,8.567   c-2.921,2.722-3.367,1.872-1.364,5.159c2.313,3.799,4.064,7.936,5.156,12.25c0.605,2.394-0.082,2.838,2.033,2.802   c4.069-0.069,10.315-1.296,14.178,0.4c3.522,1.548,2.268,9.16,2.229,12.543c-0.096,8.456-12.104,5.645-17.898,5.283   c0.156,0.011-6.795,14.843-7.944,16.447c-0.547,0.763,7.359,7.556,8.381,8.538c4.944,4.761,2.824,7.329-1.513,11.69   c-6.039,6.069-7.887,5.521-13.935-0.731c-2.149-2.219-4.261-4.48-6.246-6.85c-0.521-0.625-6.012,2.776-6.994,3.185   c-1.476,0.614-8.901,1.845-9.535,2.872c-1.004,1.622,0.309,8.013,0.33,9.982c0.096,8.526-0.896,10.481-9.352,10.481   c-2.232,0-4.709,0.411-6.843-0.365c-4-1.453-2.523-9.013-2.438-12.174c0.04-1.498,1.174-6.406,0.431-7.654   c-0.568-0.956-8.392-2.117-9.829-2.669c-0.787-0.303-6.762-3.507-7.049-3.207c-1.525,1.591-3.051,3.181-4.578,4.771   c-1.979,2.064-5.734,7.388-8.932,7.289c-2.806-0.048-9.959-7.553-11.098-10.111c-2.792-6.279,10.07-9.389,10.988-13.959   c0.043-0.212-9.882-17.351-8.595-17.368c-3.593,0.05-7.317,0.41-10.899,0.153c-6.971,0-5.875-6.05-5.83-11.202   c-0.16-7.395,3.619-7.569,9.824-7.444c2.137,0.043,4.276,0.086,6.414,0.128c0.444,0.01,2.333-7.586,2.722-8.551   c1.339-3.326,3.101-6.425,5.146-9.363c0.438-0.629-1.932-2.346-2.398-2.799c-3.363-3.273-10.421-7.872-5.851-12.794   c2.096-2.259,6.541-7.985,9.6-7.985c3.747,0,8.376,6.755,10.672,9.161c3.036,3.181,6.353-1.095,10.14-2.528   c3.945-1.491,9.292-0.362,9.213-4.943c-0.058-3.255-0.396-6.637-0.172-9.884C56.925,1.449,61.375,1.775,66.287,1.853 M69.694,0.223   c-3.688,0-9.813-1.099-12.571,1.586c-3.116,3.085-1.696,10.736-1.63,14.678c0.059,3.6-3.022,2.813-6.17,3.854   c-1.466,0.484-9.462,4.621-10.028,4.025c-2.892-3.043-6.707-8.735-10.962-9.909c-4.166-1.15-7.581,3.806-10.172,6.478   c-5.742,5.518-4.111,8.898,0.979,13.844c1.579,1.533,3.153,3.07,4.737,4.598c-2.533,3.705-4.533,7.768-5.897,12.042   c-1.361,4.257-0.689,4.336-4.944,4.254c-2.461-0.048-5.048-0.305-7.504,0.003c-6.472,0.811-5.456,7.242-5.495,12.174   c-0.062,8.137,3.169,9.687,10.582,9.567c2.239-0.035,4.479-0.076,6.717-0.105c1.116,4.185,2.831,8.202,5.067,11.91   c1.376,2.284,3.278,2.844,1.032,4.902c-1.601,1.465-3.171,2.964-4.72,4.482c-2.292,2.248-5.735,5.252-4.299,8.88   c1.176,2.967,7.935,9.732,10.902,10.908c4.637,1.839,8.851-4.352,11.594-7.205c1.362-1.417,2.717-2.845,4.093-4.25   c3.94,2.146,8.163,3.761,12.527,4.799c3.048,0.725,2.151,0.836,2.018,3.6c-0.091,1.868-0.145,3.736-0.175,5.606   c-0.057,3.465-0.923,9.161,2.917,11.094c3.094,1.558,9.554,0.977,13.091,0.706c8.238-0.634,5.907-11.882,5.715-17.565   c-0.093-2.766-0.968-2.98,2.009-3.78c2.121-0.57,4.206-1.277,6.235-2.116c2.025-0.838,3.997-1.808,5.898-2.898   c1.049,1.227,2.131,2.424,3.23,3.604c4.327,4.647,9.567,12.294,15.874,6.219c2.729-2.633,8.092-6.614,8.172-10.478   c0-4.122-5.587-7.971-8.271-10.553c-2.079-1.999-3.72-2.262-2.068-4.844c2.22-3.474,3.976-7.236,5.207-11.169   c1.902-6.08,17.526,3.361,19.05-6.681c0.542-3.585,1.057-12.592-1.447-15.135c-2.997-3.071-10.253-1.718-14.098-1.652   c-3.809,0.065-3-2.746-4.229-6.091c-1.123-3.054-5.727-8.679-3.43-10.785c6.34-5.817,12.979-10.456,5.196-17.885   c-2.6-2.681-6.001-7.617-10.181-6.482c-3.963,1.077-7.582,6.327-10.301,9.135c-2.466,2.545-4.07,0.031-7.078-1.328   c-2.639-1.192-9.949-2.184-9.821-4.885C77.38,10.375,79.38,0.223,69.694,0.223"
-       id="path17"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <linearGradient
-       gradientTransform="matrix(0 -214.9991 -214.9991 0 102181.7813 -51529.3086)"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_7_"
-       x1="-240.6104"
-       x2="-239.069"
-       y1="474.9624"
-       y2="474.9624">
-      <stop
-         id="stop20"
-         offset="0"
-         style="stop-color:#FFFFFF" />
-      <stop
-         id="stop22"
-         offset="1"
-         style="stop-color:#000000" />
-    </linearGradient>
-    <path
-       d="M44.65,65.457c0,26.066,41.962,26.066,41.962,0S44.65,39.39,44.65,65.457 M46.234,65.457   c0-24.025,38.794-24.025,38.794,0S46.234,89.482,46.234,65.457"
-       id="path24"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <radialGradient
-       cx="65.6309"
-       cy="65.4565"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_8_"
-       r="34.9484">
-      <stop
-         id="stop27"
-         offset="0"
-         style="stop-color:#F3F3F3" />
-      <stop
-         id="stop29"
-         offset="0.4367"
-         style="stop-color:#F1F1F1" />
-      <stop
-         id="stop31"
-         offset="0.594"
-         style="stop-color:#EAEAEA" />
-      <stop
-         id="stop33"
-         offset="0.7061"
-         style="stop-color:#DEDEDE" />
-      <stop
-         id="stop35"
-         offset="0.7968"
-         style="stop-color:#CDCDCD" />
-      <stop
-         id="stop37"
-         offset="0.8745"
-         style="stop-color:#B7B7B7" />
-      <stop
-         id="stop39"
-         offset="0.9419"
-         style="stop-color:#9D9D9D" />
-      <stop
-         id="stop41"
-         offset="1"
-         style="stop-color:#7F7F7F" />
-    </radialGradient>
-    <path
-       d="M65.631,31.895c-18.581,0-36.284,14.164-36.284,33.56c0,19.402,17.697,33.563,36.284,33.563   c18.586,0,36.283-14.16,36.283-33.563C101.914,46.058,84.212,31.895,65.631,31.895 M65.631,93.859   c-15.729,0-30.71-11.983-30.71-28.404c0-16.42,14.981-28.401,30.71-28.401c15.729,0,30.711,11.979,30.711,28.401   C96.343,81.877,81.362,93.859,65.631,93.859"
-       id="path43"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M24.022,47.759c1.389-2.133,2.794-4.254,4.284-6.319C26.071,40.979,24.669,46.14,24.022,47.759    M107.988,19.272c-1.503-5.967-10.331,4.207-11.839,5.825c-0.454,0.487-3.053,4-3.867,3.761c-4.902-3.622-10.62-6.063-16.557-7.381   c-1.076,3.631,8.287,4.644,11.055,6.028c2.139,1.068,4.24,4.338,6.308,2.435c3.427-3.154,6.553-6.757,10.268-9.576   c0.894-0.678,5.101-1.062,4.814,0.303C108.109,20.202,108.049,19.738,107.988,19.272 M40.692,28.996   c3.305-2.111,6.968-3.595,10.795-4.437c2.593-0.569,6.13,0.171,5.04-3.526C53.526,21.596,39.653,24.832,40.692,28.996"
-       id="path45"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M73.152,3.636c0,2.344-14.251,2.344-14.251,0S73.152,1.292,73.152,3.636"
-       id="path47"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M66.03,128.431c-0.671,0-7.125-0.13-7.125,1.282c0,1.931,14.251,1.933,14.251,0   C73.155,128.301,66.701,128.431,66.03,128.431"
-       id="path49"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M11.008,72.88c-0.671,0-7.125-0.131-7.125,1.282c0,1.916,14.251,1.913,14.251,0   C18.134,72.75,11.679,72.88,11.008,72.88"
-       id="path51"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M121.58,72.88c-0.671,0-7.125-0.13-7.125,1.282c0,1.914,14.251,1.914,14.251,0   C128.706,72.75,122.252,72.88,121.58,72.88"
-       id="path53"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M17.557,106.256c-1.294,0,2.25,4.292,2.338,4.391c1.444,1.629,4.758,5.852,7.256,5.852   c0.034,0.022-1.976-3.976-2.431-4.485C23.285,110.405,20.025,106.251,17.557,106.256"
-       id="path55"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M94.355,104.674c-0.578,0,7.519,12.467,9.826,10.159C105.671,113.348,96.25,104.674,94.355,104.674"
-       id="path57"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M26.671,16.666c1.05,1.051-9.306,11.41-10.357,10.358C15.267,25.972,25.62,15.62,26.671,16.666"
-       id="path59"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M115.199,27.97c-1.964,0-11.219,9.358-10.206,10.408C106.838,40.223,115.24,27.97,115.199,27.97"
-       id="path61"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M115.726,106.081c-1.962,0-11.194,9.419-10.205,10.408   C107.472,118.347,115.713,106.081,115.726,106.081"
-       id="path63"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M37.346,106.081c-1.842,0-4.608,3.414-5.731,4.537c-0.465,0.462-4.612,5.885-4.463,5.881   C29.433,118.323,37.092,106.081,37.346,106.081"
-       id="path65"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M27.347,115.672c-0.07,0.271-0.138,0.545-0.207,0.816C27.825,117.173,26.743,114.15,27.347,115.672"
-       id="path67"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M17.435,58.462c0,1.339-12.324-0.53-12.924,1.248c-0.368,1.084-0.489,11.103-1.228,11.024   c-1.711-0.183-0.224-10.043-0.08-11.327C3.558,56.244,17.435,57.476,17.435,58.462"
-       id="path69"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M23.478,100.129c-0.358,0.358-4.58,4.749-5.319,4.013c-0.977-0.977,8.35-10.312,9.332-9.33   C28.226,95.548,23.835,99.773,23.478,100.129"
-       id="path71"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M128.573,58.66c0,1.19-14.846,1.19-14.846,0S128.573,57.47,128.573,58.66"
-       id="path73"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M101.119,74.258c-7.886,24.178-41.95,33.291-60.554,15.481c0,3.725,7.864,8.189,10.455,9.559   c9.041,4.776,19.717,4.771,29.24,1.414C92.282,96.476,99.202,86.506,101.119,74.258 M101.58,72.276   c-0.306,0.617-0.461,1.277-0.461,1.982C100.85,75.084,101.843,72.276,101.58,72.276"
-       id="path75"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M90.129,90.213c-8.308,6.802-19.974,9.833-30.567,8.335C70.359,100.232,81.753,97.307,90.129,90.213   "
-       id="path77"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M35.812,60.705c0-9.224,8.177-18.148,16.011-21.707c8.522-3.872,17.985-3.937,26.437,0.105   c1.084,0.518,13.452,7.704,11.891,9.714c0.415-0.534-7.813-6.607-8.427-6.956c-7.797-4.435-17.463-4.583-25.884-1.935   C48.108,42.359,35.812,51.58,35.812,60.705"
-       id="path79"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M29.221,60.477c0-11.246,10.8-22.154,20.227-26.36c10.268-4.583,21.688-4.81,31.842,0.146   c3.762,1.836,7.336,4.222,10.343,7.144c0.161,0.158,3.231,3.874,2.678,3.895c-0.649,0.027-2.156-2.297-2.538-2.712   c-2.223-2.406-4.743-4.534-7.549-6.232c-9.406-5.692-21.297-5.859-31.503-2.277c-8.237,2.891-15.042,8.673-19.335,16.251   C31.957,52.851,29.221,57.912,29.221,60.477"
-       id="path81"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M96.321,66.114c0.076-0.002-1.774,6.544-1.93,6.928c-2.031,5.045-5.354,9.536-9.722,12.801   c-14.182,10.598-33.677,7.999-44.948-5.131c15.231,22.079,55.698,13.75,56.604-14.6"
-       id="path83"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       d="M87.782,85.129c-0.864,0.83-1.773,1.606-2.729,2.329C86.015,86.743,86.926,85.967,87.782,85.129    M39.057,80.084c-0.394,0,5.06,5.707,5.491,6.023C43.611,85.29,40.002,80.084,39.057,80.084"
-       id="path85"
-       style="fill:#007aff;fill-opacity:1;stroke:none;stroke-opacity:1" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.38a2 2 0 0 0-.73-2.73l-.15-.09a2 2 0 0 1-1-1.74v-.51a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z"/>
+  <circle cx="12" cy="12" r="3"/>
 </svg>
diff --git a/cockatrice/resources/icons/share.svg b/cockatrice/resources/icons/share.svg
index a84f55847..9d6ff21a0 100644
--- a/cockatrice/resources/icons/share.svg
+++ b/cockatrice/resources/icons/share.svg
@@ -1,25 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-
-<svg height="800"
-     width="800"
-     version="1.1"
-     id="_x32_"
-     viewBox="0 0 512 512"
-     xml:space="preserve"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:svg="http://www.w3.org/2000/svg">
-    <defs id="defs1"/>
-    <style type="text/css"
-           id="style1">
-	.st0{fill:#64C0FF;stroke:black;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1}
-</style>
-    <g id="g1"
-       transform="matrix(0.87097097,0,0,1.0008579,38.609049,-0.21963163)"
-       style="stroke-width:3.42738;stroke-dasharray:none">
-	<path class="st0"
-          d="M 512,255.995 277.045,65.394 v 103.574 c -17.255,0 -36.408,0 -57.542,0 -208.59,0 -249.35,153.44 -201.394,266.128 9.586,-103.098 142.053,-100.701 237.358,-100.701 7.247,0 14.446,0 21.578,0 v 112.211 z"
-          id="path1"
-          style="stroke-width:20;stroke:#000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<circle cx="6" cy="12" r="2.5"/>
+  <circle cx="18" cy="6" r="2.5"/>
+  <circle cx="18" cy="18" r="2.5"/>
+  <path d="M8.2 10.8l7.6-3.6"/>
+  <path d="M8.2 13.2l7.6 3.6"/>
 </svg>
diff --git a/cockatrice/resources/icons/sort_arrow_down.svg b/cockatrice/resources/icons/sort_arrow_down.svg
index adf10f9f0..e10b401f2 100644
--- a/cockatrice/resources/icons/sort_arrow_down.svg
+++ b/cockatrice/resources/icons/sort_arrow_down.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M278.6 438.6L182.6 534.6C170.1 547.1 149.8 547.1 137.3 534.6L41.3 438.6C28.8 426.1 28.8 405.8 41.3 393.3C53.8 380.8 74.1 380.8 86.6 393.3L128 434.7L128 128C128 110.3 142.3 96 160 96C177.7 96 192 110.3 192 128L192 434.7L233.4 393.3C245.9 380.8 266.2 380.8 278.7 393.3C291.2 405.8 291.2 426.1 278.7 438.6zM352 544C334.3 544 320 529.7 320 512C320 494.3 334.3 480 352 480L384 480C401.7 480 416 494.3 416 512C416 529.7 401.7 544 384 544L352 544zM352 416C334.3 416 320 401.7 320 384C320 366.3 334.3 352 352 352L448 352C465.7 352 480 366.3 480 384C480 401.7 465.7 416 448 416L352 416zM352 288C334.3 288 320 273.7 320 256C320 238.3 334.3 224 352 224L512 224C529.7 224 544 238.3 544 256C544 273.7 529.7 288 512 288L352 288zM352 160C334.3 160 320 145.7 320 128C320 110.3 334.3 96 352 96L576 96C593.7 96 608 110.3 608 128C608 145.7 593.7 160 576 160L352 160z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M4 6h10"/>
+  <path d="M4 12h7"/>
+  <path d="M4 18h4"/>
+  <path d="M18 8v10"/>
+  <path d="M15 15l3 3 3-3"/>
+</svg>
diff --git a/cockatrice/resources/icons/spectator.svg b/cockatrice/resources/icons/spectator.svg
index c580c448d..19242f058 100644
--- a/cockatrice/resources/icons/spectator.svg
+++ b/cockatrice/resources/icons/spectator.svg
@@ -1,106 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500"
-   height="500"
-   id="svg2825"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_spectator.svg">
-  <defs
-     id="defs2827">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2833" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3170"
-       id="linearGradient3176"
-       x1="348.1423"
-       y1="241.25623"
-       x2="362.82382"
-       y2="226.27509"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3170">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop3172" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop3174" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="161.90734"
-     inkscape:cy="313.43022"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="784"
-     inkscape:window-height="1162"
-     inkscape:window-x="2720"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2830">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-552.36218)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3609"
-       sodipodi:cx="382.85715"
-       sodipodi:cy="549.50507"
-       sodipodi:rx="71.428574"
-       sodipodi:ry="71.428574"
-       d="m 454.28572,549.50507 a 71.428574,71.428574 0 1 1 -142.85715,0 71.428574,71.428574 0 1 1 142.85715,0 z"
-       transform="matrix(1.278781,0,0,1.278781,-239.59045,89.665546)" />
-    <g
-       transform="matrix(4.0314732,0,0,4.0314732,-693.67321,-408.8113)"
-       id="g3178">
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="csssc"
-         id="path3159"
-         d="m 234.78774,331.58001 c -31.87684,0.0325 -57.71719,-31.08607 -58.23077,-32.66642 -1.24408,-3.82817 25.38817,-32.75179 57.265,-32.78433 31.87683,-0.0325 58.68772,30.04142 58.23076,32.66642 -0.17904,1.02851 -24.29715,32.20961 -55.54932,32.76812"
-         style="fill:none;stroke:#000000;stroke-width:6.60500002;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7-10-7-10-7z"/>
+  <circle cx="12" cy="12" r="3"/>
 </svg>
diff --git a/cockatrice/resources/icons/swap.svg b/cockatrice/resources/icons/swap.svg
index a18ca2f06..4eddb8c08 100644
--- a/cockatrice/resources/icons/swap.svg
+++ b/cockatrice/resources/icons/swap.svg
@@ -1,12 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" version="1.1" id="Capa_1"
-     xmlns="http://www.w3.org/2000/svg"
-     width="800px" height="800px" viewBox="0 0 71.753 71.753"
-     xml:space="preserve">
-<g>
-	<path d="M39.798,20.736H28.172v20.738L11.625,41.47V20.736H0L19.899,0.839L39.798,20.736z M51.855,70.914l19.897-19.896H60.129
-		V30.282l-16.547-0.004v20.74H31.957L51.855,70.914z"/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M4 8h13"/>
+  <path d="M14 5l3 3-3 3"/>
+  <path d="M20 16H7"/>
+  <path d="M10 13l-3 3 3 3"/>
+</svg>
diff --git a/cockatrice/resources/icons/sync.svg b/cockatrice/resources/icons/sync.svg
index e287b1993..fa00b3024 100644
--- a/cockatrice/resources/icons/sync.svg
+++ b/cockatrice/resources/icons/sync.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="520pt" height="520pt" viewBox="0 0 520 520" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:#000000;fill-opacity:1;" d="M 240 0 L 240 45 C 130.078125 55.234375 43.75 147.421875 43.75 260 C 43.75 318.671875 67.03125 371.640625 105 410.625 L 159.375 361.875 C 133.203125 335.859375 116.875 299.765625 116.875 260 C 116.875 187.8125 170.46875 127.96875 240 118.125 L 240 160 L 368.125 80 Z M 415 109.375 L 361.25 158.125 C 387.421875 184.140625 403.125 220.3125 403.125 260 C 403.125 332.265625 349.609375 391.484375 280 401.25 L 280 360 L 151.875 440 L 280 520 L 280 475 C 389.921875 464.765625 476.25 372.578125 476.25 260 C 476.25 201.328125 452.96875 148.359375 415 109.375 Z "/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M20 11a8 8 0 0 0-13.7-5.7L4 8"/>
+  <path d="M4 4v4h4"/>
+  <path d="M4 13a8 8 0 0 0 13.7 5.7L20 16"/>
+  <path d="M20 20v-4h-4"/>
 </svg>
diff --git a/cockatrice/resources/icons/tab_changed.svg b/cockatrice/resources/icons/tab_changed.svg
index ae09ef8fd..1d9b8d09c 100644
--- a/cockatrice/resources/icons/tab_changed.svg
+++ b/cockatrice/resources/icons/tab_changed.svg
@@ -1,116 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2858"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon_tab_changed.svg">
-  <defs
-     id="defs2860">
-    <linearGradient
-       id="linearGradient3753">
-      <stop
-         style="stop-color:#02db0e;stop-opacity:1;"
-         offset="0"
-         id="stop3755" />
-      <stop
-         style="stop-color:#02db0e;stop-opacity:1;"
-         offset="1"
-         id="stop3757" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2866" />
-    <inkscape:perspective
-       id="perspective2853"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3753"
-       id="linearGradient3766"
-       x1="103.53491"
-       y1="132.64713"
-       x2="-1.5473157"
-       y2="33.224445"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5"
-     inkscape:cx="-9.896878"
-     inkscape:cy="42.810059"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2863">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Triangle"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#007aff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
-       id="path3758-1"
-       sodipodi:cx="53.900002"
-       sodipodi:cy="78.5"
-       sodipodi:rx="46.5"
-       sodipodi:ry="46.5"
-       d="M 100.4,78.5 A 46.5,46.5 0 1 1 7.4000015,78.5 46.5,46.5 0 1 1 100.4,78.5 z"
-       transform="matrix(1.05866,0,0,1.05866,-7.0617752,-32.704809)" />
-    <g
-       style="font-size:133.49534607px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.06498075;stroke-opacity:1;font-family:'Magic:the Gathering';-inkscape-font-specification:'Magic:the Gathering'"
-       id="text3759">
-      <path
-         d="m 46.854005,16.085692 c 0.977733,-2.411704 1.683885,-4.193378 2.118456,-5.345028 0.369355,-1.1514901 0.771318,-1.9988718 1.205891,-2.5421482 0.456264,-0.4344718 1.347101,-0.825571 2.672514,-1.1732989 1.23846,-0.2823765 2.705082,-0.4670623 4.399871,-0.5540578 0.369346,8.46e-5 0.727854,8.46e-5 1.075524,0 1.694737,8.46e-5 2.672485,0.5758696 2.933248,1.7273567 -3e-5,0.1956326 -3e-5,0.3803183 0,0.5540579 -3e-5,1.3254743 -0.662726,2.9224633 -1.98809,4.7909703 -1.520969,2.238035 -3.43301,4.24785 -5.736128,6.029453 -2.32489,1.760018 -4.551983,2.781222 -6.681286,3.063614 -1.260224,-0.543125 -1.977239,-1.075454 -2.151048,-1.59699 -1.3e-5,-0.08684 -1.3e-5,-0.184616 0,-0.293325 -1.3e-5,-0.434484 0.228128,-1.010269 0.684424,-1.727357 0.521453,-0.890765 1.010327,-1.868513 1.466624,-2.933247 z M 31.372977,37.856906 c 2.650785,-0.716962 6.159814,-1.651255 10.527099,-2.802881 4.280354,-1.173242 7.398284,-1.803346 9.3538,-1.890315 0.08689,5.8e-5 0.173803,5.8e-5 0.260733,0 1.06464,5.8e-5 1.82511,0.358566 2.281415,1.075524 0.260711,0.630161 0.391077,1.520998 0.391099,2.672514 -2.2e-5,0.260787 -2.2e-5,0.532384 0,0.814791 -0.173844,1.586178 -0.260755,2.781204 -0.260733,3.58508 l 0,39.533656 c 1.238459,1e-5 2.976678,-0.673549 5.214662,-2.020681 1.673009,-0.977736 2.868034,-1.46661 3.58508,-1.466624 0.173791,1.4e-5 0.304158,0.04347 0.3911,0.130367 0.543162,0.369385 0.814759,0.771348 0.814791,1.20589 -3.2e-5,1.151583 -1.868617,2.66166 -5.605762,4.530238 -1.238507,0.717023 -3.063637,1.922912 -5.475395,3.617671 -2.49871,1.781679 -4.769259,3.204846 -6.811652,4.269505 -0.347658,0.347644 -0.923443,0.662696 -1.727357,0.945157 -0.260745,0.08691 -0.532342,0.130366 -0.814791,0.130367 -0.521477,-10e-7 -1.010351,-0.271598 -1.466623,-0.814791 C 41.856611,91.111641 41.7697,81.594892 41.76971,62.8221 c -1e-5,-1.955468 -1e-5,-4.008739 0,-6.15982 -1e-5,-2.129283 -0.08692,-4.128235 -0.260734,-5.996861 -0.260742,-1.781634 -0.706161,-3.204801 -1.336257,-4.269504 -0.717023,-1.347075 -1.60786,-2.368279 -2.672514,-3.063614 -1.151576,-0.630057 -2.357465,-1.260161 -3.617672,-1.890315 -1.325394,-0.521416 -2.161911,-1.053746 -2.509556,-1.59699 -0.195549,-0.173771 -0.293324,-0.434504 -0.293324,-0.7822 -0.08691,-0.369319 0.01086,-0.771282 0.293324,-1.20589 z"
-         style=""
-         id="path2993" />
-    </g>
-  </g>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<circle cx="12" cy="12" r="8"/>
+  <circle cx="12" cy="12" r="3.5" fill="currentColor" stroke="none"/>
 </svg>
diff --git a/cockatrice/resources/icons/update.png b/cockatrice/resources/icons/update.png
deleted file mode 100644
index 825c0aee7..000000000
Binary files a/cockatrice/resources/icons/update.png and /dev/null differ
diff --git a/cockatrice/resources/icons/view.svg b/cockatrice/resources/icons/view.svg
index e5676d825..19242f058 100644
--- a/cockatrice/resources/icons/view.svg
+++ b/cockatrice/resources/icons/view.svg
@@ -1,29 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="122.14841" height="72.055801" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="swerty_eye.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0">
-  <defs id="defs4">
-    <linearGradient inkscape:collect="always" id="linearGradient3170">
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop3172"/>
-      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop3174"/>
-    </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective10"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3170" id="linearGradient3176" x1="348.1423" y1="241.25623" x2="362.82382" y2="226.27509" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.9163562" inkscape:cx="296.89701" inkscape:cy="743.73197" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1024" inkscape:window-height="712" inkscape:window-x="-4" inkscape:window-y="-4"/>
-  <metadata id="metadata7">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-173.21257,-262.82673)">
-    <g id="g3178">
-      <path sodipodi:open="true" transform="matrix(1.7416,0,0,1.7416,-381.027,-111.162)" sodipodi:end="10.935153" sodipodi:start="4.6610829" d="M 352.96016,223.72064 A 11.219209,10.958297 0 1 1 352.85806,223.72622" sodipodi:ry="10.958297" sodipodi:rx="11.219209" sodipodi:cy="234.66452" sodipodi:cx="353.53552" id="path3166" style="opacity:1;fill:#0000de;fill-opacity:1;stroke:none;stroke-width:6.60500002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc"/>
-      <path sodipodi:nodetypes="csssc" id="path3159" d="M 234.78774,331.58001 C 202.9109,331.61255 177.07055,300.49394 176.55697,298.91359 C 175.31289,295.08542 201.94514,266.1618 233.82197,266.12926 C 265.6988,266.09672 292.50969,296.17068 292.05273,298.79568 C 291.87369,299.82419 267.75558,331.00529 236.50341,331.5638" style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:6.60500002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
-      <path sodipodi:open="true" transform="matrix(1.7416,0,0,1.7416,-380.897,-111.409)" sodipodi:end="10.935153" sodipodi:start="4.6610829" d="M 352.96016,223.72064 A 11.219209,10.958297 0 1 1 352.85806,223.72622" sodipodi:ry="10.958297" sodipodi:rx="11.219209" sodipodi:cy="234.66452" sodipodi:cx="353.53552" id="path3168" style="opacity:1;fill:url(#linearGradient3176);fill-opacity:1;stroke:none;stroke-width:6.60500002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc"/>
-      <path sodipodi:open="true" transform="matrix(1.38447,0,0,1.38447,-254.533,-26.8231)" sodipodi:end="4.6519677" sodipodi:start="0.53396878" d="M 363.19295,240.24179 A 11.219209,10.958297 0 1 1 352.85806,223.72622" sodipodi:ry="10.958297" sodipodi:rx="11.219209" sodipodi:cy="234.66452" sodipodi:cx="353.53552" id="path3162" style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:6.60500002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<path d="M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7-10-7-10-7z"/>
+  <circle cx="12" cy="12" r="3"/>
+</svg>
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
index e23e91b46..c702f91f1 100644
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
@@ -3,6 +3,7 @@
 #include "../../../interface/pixel_map_generator.h"
 #include "../../settings/cache_settings.h"
 #include "../interface/widgets/dialogs/dlg_connect.h"
+#include "../interface/widgets/dialogs/dlg_edit_password.h"
 #include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
 #include "../interface/widgets/dialogs/dlg_forgot_password_request.h"
 #include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
@@ -99,6 +100,10 @@ void ConnectionController::wireClientSignals()
 
     connect(remoteClient, &RemoteClient::sigPasswordVerifierReady, this,
             &ConnectionController::onPasswordVerifierReady);
+
+    connect(remoteClient, &RemoteClient::sigPasswordChangeSuccess, this,
+            &ConnectionController::onPasswordChangeSuccess);
+    connect(remoteClient, &RemoteClient::sigPasswordChangeError, this, &ConnectionController::onPasswordChangeError);
 }
 
 void ConnectionController::connectToServer()
@@ -244,17 +249,27 @@ void ConnectionController::onLoginError(int r,
 {
     switch (static_cast<Response::ResponseCode>(r)) {
         case Response::RespClientUpdateRequired: {
-            QString formatted = "Missing Features: ";
-            for (int i = 0; i < missingFeatures.size(); ++i) {
-                formatted.append(QString("\n     %1").arg(QChar(0x2022)) + " " + missingFeatures.value(i));
-            }
-
             QMessageBox msgBox(dialogParent);
             msgBox.setIcon(QMessageBox::Critical);
             msgBox.setWindowTitle(tr("Failed Login"));
-            msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") +
-                           "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'."));
-            msgBox.setDetailedText(formatted);
+
+            if (missingFeatures.isEmpty()) {
+                // Without a feature list this is either a login the client stopped itself or a
+                // strict server asking for a password; the reason string already says which and
+                // what to do. No client update can fix any of those causes, so show it instead of
+                // the update advice.
+                msgBox.setText(reasonStr.isEmpty() ? tr("The login did not complete.") : reasonStr);
+            } else {
+                QString formatted = tr("Missing Features:");
+                for (const QString &feature : missingFeatures) {
+                    formatted.append(QString("\n     %1 ").arg(QChar(0x2022)) + feature);
+                }
+
+                msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") +
+                               "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'."));
+                msgBox.setDetailedText(formatted);
+            }
+
             msgBox.exec();
             break;
         }
@@ -341,10 +356,16 @@ void ConnectionController::onLoginError(int r,
         }
 
         case Response::RespPasswordChangeRequired: {
-            QMessageBox::information(
-                dialogParent, tr("Password Change Required"),
-                tr("An administrator has reset your password. Please contact your server administrator to obtain "
-                   "your temporary password, then log in and change it via Account -> Change Password."));
+            // The credentials were right, but the account may not be used until a new password
+            // is chosen. Let the user complete the change here: sending them off to "ask the
+            // administrator for your temporary password" sends them in circles, since they just
+            // logged in with it and the session ends without a way to comply.
+            DlgEditPassword dlg(dialogParent);
+            dlg.setWindowTitle(tr("Password Change Required"));
+            if (dlg.exec()) {
+                remoteClient->changePasswordToServer(dlg.getOldPassword(), dlg.getNewPassword());
+                return; // onPasswordChangeSuccess/onPasswordChangeError decides the next step
+            }
             remoteClient->disconnectFromServer();
             return;
         }
@@ -507,6 +528,43 @@ void ConnectionController::onNotifyUserAboutUpdate()
            "To update your client, go to Help -> Check for Updates."));
 }
 
+void ConnectionController::onPasswordChangeSuccess()
+{
+    // The credential saved for this profile is stale now: drop it so the next login asks for
+    // the new password instead of replaying the old verifier.
+    if (!pendingSaveName.isEmpty()) {
+        SettingsCache::instance().servers().setServerPassword(pendingSaveName, "");
+    }
+
+    QMessageBox::information(dialogParent, tr("Password Changed"),
+                             tr("Your password has been changed. Please log in again with your new password."));
+    remoteClient->disconnectFromServer();
+    connectToServer();
+}
+
+void ConnectionController::onPasswordChangeError(int responseCode)
+{
+    QString reason;
+    switch (static_cast<Response::ResponseCode>(responseCode)) {
+        case Response::RespWrongPassword:
+            reason = tr("The current password is incorrect.");
+            break;
+        case Response::RespPasswordTooShort:
+            reason = tr("The new password is too short.");
+            break;
+        case Response::RespClientUpdateRequired:
+            reason = tr("The server does not accept the new password format.");
+            break;
+        default:
+            reason = tr("The password could not be changed (error %1).").arg(responseCode);
+            break;
+    }
+
+    QMessageBox::critical(dialogParent, tr("Password Change Failed"), reason);
+    remoteClient->disconnectFromServer();
+    connectToServer();
+}
+
 void ConnectionController::onForgotPasswordSuccess()
 {
     QMessageBox::information(
@@ -517,14 +575,38 @@ void ConnectionController::onForgotPasswordSuccess()
     SettingsCache::instance().servers().setFPPlayerName("");
 }
 
-void ConnectionController::onForgotPasswordError()
+void ConnectionController::onForgotPasswordError(int responseCode)
 {
-    QMessageBox::warning(
-        dialogParent, tr("Reset Password"),
-        tr("Failed to reset user account password, please contact the server operator to reset your password."));
-    SettingsCache::instance().servers().setFPHostName("");
-    SettingsCache::instance().servers().setFPPort("");
-    SettingsCache::instance().servers().setFPPlayerName("");
+    // Rate limiting is retryable, so it must not clear the prefill.
+    bool keepPrefill = false;
+    QString message;
+    switch (static_cast<Response::ResponseCode>(responseCode)) {
+        case Response::RespTooManyRequests:
+            // Retryable: keep the host/port/user prefill so the user can try again. The window
+            // is server-configured (an hour by default), so do not promise a shorter wait.
+            keepPrefill = true;
+            message = tr("Too many password reset attempts from your address. Please wait before "
+                         "requesting a new reset.");
+            break;
+        case Response::RespFunctionNotAllowed:
+            // Also returned for an unknown user, a banned user, and an expired token or
+            // challenge, so the message must not claim a single cause.
+            message = tr("The server did not accept the reset request. Check the user name, or contact "
+                         "the server operator to reset your password.");
+            break;
+        default:
+            message = tr("Failed to reset user account password, please contact the server operator to reset your "
+                         "password.");
+            break;
+    }
+
+    QMessageBox::warning(dialogParent, tr("Reset Password"), message);
+
+    if (!keepPrefill) {
+        SettingsCache::instance().servers().setFPHostName("");
+        SettingsCache::instance().servers().setFPPort("");
+        SettingsCache::instance().servers().setFPPlayerName("");
+    }
 }
 
 void ConnectionController::onPromptForgotPasswordReset()
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
index 150ec9e5b..2987a8d99 100644
--- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
@@ -87,13 +87,17 @@ private slots:
 
     // Forgot-password flow
     void onForgotPasswordSuccess();
-    void onForgotPasswordError();
+    void onForgotPasswordError(int responseCode);
     void onPromptForgotPasswordReset();
     void onPromptForgotPasswordChallenge();
 
     // Persists the derived scrypt verifier after a successful challenge-response login
     void onPasswordVerifierReady(const QString &verifier);
 
+    // Completes the forced password change the server demanded at login
+    void onPasswordChangeSuccess();
+    void onPasswordChangeError(int responseCode);
+
 private:
     void wireClientSignals();
     void updateWindowTitle();
diff --git a/cockatrice/src/client/network/interfaces/deck_analysis_url.h b/cockatrice/src/client/network/interfaces/deck_analysis_url.h
new file mode 100644
index 000000000..425056270
--- /dev/null
+++ b/cockatrice/src/client/network/interfaces/deck_analysis_url.h
@@ -0,0 +1,42 @@
+/**
+ * @file deck_analysis_url.h
+ * @ingroup ApiInterfaces
+ */
+
+#ifndef DECK_ANALYSIS_URL_H
+#define DECK_ANALYSIS_URL_H
+
+#include <QString>
+#include <QUrl>
+
+/**
+ * Validates a deck address returned by a deck analysis service.
+ *
+ * Only the expected host (optionally "www."-prefixed), HTTPS, default ports and
+ * URLs without user information are accepted. Legacy HTTP addresses for the same
+ * service are upgraded to HTTPS in place instead of being rejected.
+ *
+ * Relative addresses must be resolved against the response URL by the caller.
+ *
+ * @return true when @p url names a deck on @p serviceHost; false otherwise.
+ */
+inline bool normalizeAnalysisUrl(QUrl &url, const QString &serviceHost)
+{
+    const QString host = url.host().toLower();
+    const bool legacyHttp = url.scheme() == QStringLiteral("http");
+    const int defaultPort = legacyHttp ? 80 : 443;
+    if (!url.isValid() || (!legacyHttp && url.scheme() != QStringLiteral("https")) || !url.userInfo().isEmpty() ||
+        !url.path().startsWith('/') || (url.port() != -1 && url.port() != defaultPort) ||
+        (host != serviceHost && host != QStringLiteral("www.") + serviceHost)) {
+        return false;
+    }
+    // Both services accept HTTPS. Older public metadata may still identify the
+    // same deck with HTTP; retain its host/path/query while using HTTPS to open it.
+    if (legacyHttp) {
+        url.setScheme(QStringLiteral("https"));
+        url.setPort(-1);
+    }
+    return true;
+}
+
+#endif
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
index 508f0bdc9..22be120c4 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
@@ -1,5 +1,6 @@
 #include "deck_stats_interface.h"
 
+#include "deck_analysis_url.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
@@ -10,12 +11,14 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QPointer>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QSharedPointer>
 #include <QString>
+#include <QTextDocumentFragment>
 #include <QUrl>
-#include <QUrlQuery>
+#include <QWidget>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
@@ -29,30 +32,56 @@ DeckStatsInterface::DeckStatsInterface(QObject *parent) : QObject(parent)
     connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished);
 }
 
+void DeckStatsInterface::showError(const QString &message)
+{
+    // The notice belongs to the originating editor, not this one-shot request.
+    // Retire the request before opening UI: opening a window may reenter Qt.
+    QWidget *owner = qobject_cast<QWidget *>(parent());
+    auto *notice = new QMessageBox(QMessageBox::Critical, tr("Deck analysis"), message, QMessageBox::Ok, owner);
+    notice->setTextFormat(Qt::PlainText);
+    notice->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+    notice->setAttribute(Qt::WA_DeleteOnClose);
+    deleteLater();
+    notice->open();
+}
+
 void DeckStatsInterface::queryFinished(QNetworkReply *reply)
 {
-    if (reply->error() != QNetworkReply::NoError) {
-        QMessageBox::critical(nullptr, tr("Error"), reply->errorString());
-        reply->deleteLater();
-        deleteLater();
+    if (replyHandled) {
         return;
     }
-
-    QString data(reply->readAll());
+    replyHandled = true;
+    // All terminal paths release the reply before showing UI or invoking an
+    // external URL handler, either of which may destroy the originating editor.
     reply->deleteLater();
-
-    static const QRegularExpression rx("<meta property=\"og:url\" content=\"([^\"]+)\"");
-    auto match = rx.match(data);
-    if (!match.hasMatch()) {
-        QMessageBox::critical(nullptr, tr("Error"), tr("The reply from the server could not be parsed."));
-        deleteLater();
+    if (reply->error() != QNetworkReply::NoError) {
+        showError(reply->errorString());
         return;
     }
 
-    QString deckUrl = match.captured(1);
-    QDesktopServices::openUrl(deckUrl);
+    const QString data = QString::fromUtf8(reply->readAll());
+    static const QRegularExpression rx(
+        R"(<meta\b(?=[^>]*\bproperty\s*=\s*(['"])og:url\1)[^>]*\bcontent\s*=\s*(['"])(.*?)\2)",
+        QRegularExpression::CaseInsensitiveOption | QRegularExpression::DotMatchesEverythingOption);
+    const auto match = rx.match(data);
+    if (!match.hasMatch()) {
+        showError(tr("The reply from Deckstats did not contain a deck address."));
+        return;
+    }
 
+    const QString address = QTextDocumentFragment::fromHtml(match.captured(3)).toPlainText();
+    QUrl deckUrl = reply->url().resolved(QUrl(address, QUrl::StrictMode));
+    if (address.trimmed().isEmpty() || !normalizeAnalysisUrl(deckUrl, QStringLiteral("deckstats.net"))) {
+        showError(tr("The reply from Deckstats contained an invalid deck address."));
+        return;
+    }
+
+    QPointer<DeckStatsInterface> guard(this);
     deleteLater();
+    if (!QDesktopServices::openUrl(deckUrl) && guard) {
+        showError(tr("Could not open your browser. Open this address to see the analyzed deck:\n%1")
+                      .arg(deckUrl.toDisplayString()));
+    }
 }
 
 void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
@@ -60,12 +89,8 @@ void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray
     DeckList deckWithoutTokens;
     copyDeckWithoutTokens(deck, deckWithoutTokens);
 
-    QUrl params;
-    QUrlQuery urlQuery;
-    urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
-    urlQuery.addQueryItem("decktitle", deck.getName());
-    params.setQuery(urlQuery);
-    data.append(params.query(QUrl::EncodeReserved).toUtf8());
+    data.append("deck=" + QUrl::toPercentEncoding(deckWithoutTokens.writeToString_Plain()));
+    data.append("&decktitle=" + QUrl::toPercentEncoding(deck.getName()));
 }
 
 void DeckStatsInterface::analyzeDeck(const DeckList &deck)
@@ -84,7 +109,9 @@ void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList
 {
     auto copyIfNotAToken = [&destination](const auto node, const auto card) {
         CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (dbCard && !dbCard->getIsToken() && node->getName() != DECK_ZONE_MAYBEBOARD) {
+        // Missing local card data is not evidence that a card is a token. Keep
+        // its original name and quantity so the service analyzes the whole deck.
+        if ((!dbCard || !dbCard->getIsToken()) && node->getName() != DECK_ZONE_MAYBEBOARD) {
             DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1);
             addedCard->setNumber(card->getNumber());
         }
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
index e7791075c..b70646403 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
@@ -11,6 +11,7 @@
 #include <qtmetamacros.h>
 
 class QByteArray;
+class QString;
 class QNetworkAccessManager;
 class QNetworkReply;
 class DeckList;
@@ -20,6 +21,8 @@ class DeckStatsInterface : public QObject
     Q_OBJECT
 private:
     QNetworkAccessManager *manager;
+    bool replyHandled = false;
+    void showError(const QString &message);
 
     /**
      * Deckstats doesn't recognize token cards, and instead tries to find the
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
index 34dd03765..a57877b6a 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
@@ -1,5 +1,6 @@
 #include "tapped_out_interface.h"
 
+#include "deck_analysis_url.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
@@ -13,15 +14,17 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QPointer>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QRegularExpressionMatchIterator>
 #include <QSharedPointer>
 #include <QString>
 #include <QStringList>
+#include <QTextDocumentFragment>
 #include <QUrl>
-#include <QUrlQuery>
 #include <QVariant>
+#include <QWidget>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
@@ -35,54 +38,67 @@ TappedOutInterface::TappedOutInterface(QObject *parent) : QObject(parent)
     connect(manager, &QNetworkAccessManager::finished, this, &TappedOutInterface::queryFinished);
 }
 
+void TappedOutInterface::showError(const QString &message)
+{
+    // The notice belongs to the originating editor, not this one-shot request.
+    // Retire the request before opening UI: opening a window may reenter Qt.
+    QWidget *owner = qobject_cast<QWidget *>(parent());
+    auto *notice = new QMessageBox(QMessageBox::Critical, tr("Deck analysis"), message, QMessageBox::Ok, owner);
+    notice->setTextFormat(Qt::PlainText);
+    notice->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+    notice->setAttribute(Qt::WA_DeleteOnClose);
+    deleteLater();
+    notice->open();
+}
+
 void TappedOutInterface::queryFinished(QNetworkReply *reply)
 {
+    if (replyHandled) {
+        return;
+    }
+    replyHandled = true;
+    // All terminal paths release the reply before showing UI or invoking an
+    // external URL handler, either of which may destroy the originating editor.
+    reply->deleteLater();
     if (reply->error() != QNetworkReply::NoError) {
-        QMessageBox::critical(nullptr, tr("Error"), reply->errorString());
-        reply->deleteLater();
-        deleteLater();
+        showError(reply->errorString());
         return;
     }
 
-    int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    if (reply->hasRawHeader("Location")) {
-        /*
-         * If the reply contains a "Location" header, a relative URL to the deck on TappedOut
-         * can be extracted from the header. The http status is a 302 "redirect".
-         */
-        QString deckUrl = reply->rawHeader("Location");
-        qCInfo(TappedOutInterfaceLog) << "Tappedout: good reply, http status" << httpStatus << "location" << deckUrl;
-        QDesktopServices::openUrl("https://tappedout.net" + deckUrl);
-    } else {
-        /*
-         * Otherwise, the deck has not been parsed correctly. Error messages can be extracted
-         * from the html. Css pseudo selector for errors: $("div.alert-danger > ul > li")
-         */
-        QString data(reply->readAll());
-        QStringList errorMessageList = {tr("Unable to analyze the deck.")};
-
-        static const QRegularExpression rx("<div class=\"alert alert-danger.*?<ul>(.*?)</ul>");
-        auto match = rx.match(data);
-        if (match.hasMatch()) {
-            QString errors = match.captured(1);
-            static const QRegularExpression rx2("<li>(.*?)</li>");
-            static const QRegularExpression rxremove("<[^>]*>");
-            auto matchIterator = rx2.globalMatch(errors);
-            while (matchIterator.hasNext()) {
-                auto match2 = matchIterator.next();
-                errorMessageList.append(match2.captured(1).remove(rxremove).simplified());
-            }
+    const int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    if (httpStatus >= 200 && httpStatus < 400 && reply->hasRawHeader("Location")) {
+        const QByteArray location = reply->rawHeader("Location");
+        QUrl deckUrl = reply->url().resolved(QUrl::fromEncoded(location, QUrl::StrictMode));
+        if (location.trimmed().isEmpty() || !normalizeAnalysisUrl(deckUrl, QStringLiteral("tappedout.net"))) {
+            showError(tr("The reply from TappedOut contained an invalid deck address."));
+            return;
         }
-
-        QString errorMessage = errorMessageList.join("\n");
-        qCWarning(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size()
-                                         << "message" << errorMessage;
-
-        QMessageBox::critical(nullptr, tr("Error"), errorMessage);
+        QPointer<TappedOutInterface> guard(this);
+        deleteLater();
+        if (!QDesktopServices::openUrl(deckUrl) && guard) {
+            showError(tr("Could not open your browser. Open this address to see the analyzed deck:\n%1")
+                          .arg(deckUrl.toDisplayString()));
+        }
+        return;
     }
 
-    reply->deleteLater();
-    deleteLater();
+    const QString data = QString::fromUtf8(reply->readAll());
+    QStringList errorMessageList = {tr("Unable to analyze the deck on TappedOut.")};
+    static const QRegularExpression errorsRx("<div class=\"alert alert-danger.*?<ul>(.*?)</ul>",
+                                             QRegularExpression::DotMatchesEverythingOption);
+    const auto match = errorsRx.match(data);
+    if (match.hasMatch()) {
+        static const QRegularExpression itemRx("<li>(.*?)</li>", QRegularExpression::DotMatchesEverythingOption);
+        auto items = itemRx.globalMatch(match.captured(1));
+        while (items.hasNext()) {
+            const QString error = QTextDocumentFragment::fromHtml(items.next().captured(1)).toPlainText().simplified();
+            if (!error.isEmpty()) {
+                errorMessageList.append(error);
+            }
+        }
+    }
+    qCWarning(TappedOutInterfaceLog) << "TappedOut analysis failed, HTTP status" << httpStatus;
+    showError(errorMessageList.join('\n'));
 }
 
 void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
@@ -90,13 +106,9 @@ void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray
     DeckList mainboard, sideboard;
     copyDeckSplitMainAndSide(deck, mainboard, sideboard);
 
-    QUrl params;
-    QUrlQuery urlQuery;
-    urlQuery.addQueryItem("name", deck.getName());
-    urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true));
-    urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true));
-    params.setQuery(urlQuery);
-    data.append(params.query(QUrl::EncodeReserved).toUtf8());
+    data.append("name=" + QUrl::toPercentEncoding(deck.getName()));
+    data.append("&mainboard=" + QUrl::toPercentEncoding(mainboard.writeToString_Plain(false, true)));
+    data.append("&sideboard=" + QUrl::toPercentEncoding(sideboard.writeToString_Plain(false, true)));
 }
 
 void TappedOutInterface::analyzeDeck(const DeckList &deck)
@@ -117,7 +129,9 @@ void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckLi
 {
     auto copyMainOrSide = [&mainboard, &sideboard](const auto node, const auto card) {
         CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (!dbCard || dbCard->getIsToken() || node->getName() == DECK_ZONE_MAYBEBOARD) {
+        // Exclude confirmed tokens, but preserve cards missing from the local
+        // database, including newly released cards in an imported deck.
+        if ((dbCard && dbCard->getIsToken()) || node->getName() == DECK_ZONE_MAYBEBOARD) {
             return;
         }
 
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
index 615991b07..27e8c2273 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
@@ -14,6 +14,7 @@
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
 class QByteArray;
+class QString;
 class QNetworkAccessManager;
 class QNetworkReply;
 class DeckList;
@@ -29,6 +30,8 @@ class TappedOutInterface : public QObject
     Q_OBJECT
 private:
     QNetworkAccessManager *manager;
+    bool replyHandled = false;
+    void showError(const QString &message);
 
     void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard);
 private slots:
diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
index 7127b0a29..2b307735d 100644
--- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
+++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp
@@ -15,14 +15,18 @@ static const QString ARCHIDEKT_SUFFIX = "/?format=json";
 static const QString MOXFIELD_BASE = "https://api.moxfield.com/v2/decks/all/";
 static const QString MOXFIELD_SUFFIX = "/";
 
+static const QString DECKSTATS_BASE = "https://deckstats.net/decks/";
 static const QString DECKSTATS_SUFFIX = "?include_comments=1&export_mtgarena=1";
 
+static const QString MANABOX_BASE = "https://cloud.manabox.app/decks/";
+
 bool parseDeckUrl(const QString &url, ParsedDeckInfo &outInfo)
 {
     static QRegularExpression rxTappedOut("tappedout\\.net/(?:mtg-decks/)?([^/?#]+)");
     static QRegularExpression rxArchidekt("archidekt\\.com/decks/(\\d+)");
     static QRegularExpression rxMoxfield("moxfield\\.com/decks/([a-zA-Z0-9_-]+)");
     static QRegularExpression rxDeckstats("deckstats\\.net/decks/(\\d+/[a-zA-Z0-9_-]+)");
+    static QRegularExpression rxManabox("manabox\\.app/decks/([a-zA-Z0-9_-]+)");
 
     QRegularExpressionMatch match;
 
@@ -49,11 +53,18 @@ bool parseDeckUrl(const QString &url, ParsedDeckInfo &outInfo)
         return true;
     } else if ((match = rxDeckstats.match(url)).hasMatch()) {
         QString deckPath = match.captured(1);
-        outInfo = ParsedDeckInfo{.baseUrl = "https://deckstats.net/decks/",
+        outInfo = ParsedDeckInfo{.baseUrl = DECKSTATS_BASE,
                                  .deckID = deckPath,
-                                 .fullUrl = "https://deckstats.net/decks/" + deckPath + DECKSTATS_SUFFIX,
+                                 .fullUrl = DECKSTATS_BASE + deckPath + DECKSTATS_SUFFIX,
                                  .provider = DeckProvider::Deckstats};
         return true;
+    } else if ((match = rxManabox.match(url)).hasMatch()) {
+        QString deckPath = match.captured(1);
+        outInfo = ParsedDeckInfo{.baseUrl = MANABOX_BASE,
+                                 .deckID = deckPath,
+                                 .fullUrl = MANABOX_BASE + deckPath,
+                                 .provider = DeckProvider::Manabox};
+        return true;
     }
 
     return false;
diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
index bbdd70c97..d3bff976f 100644
--- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
+++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
@@ -15,6 +15,7 @@ enum class DeckProvider
     Archidekt,
     Moxfield,
     Deckstats,
+    Manabox,
     Unknown
 };
 
diff --git a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
index 87fde4d54..7e15d472f 100644
--- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
+++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
@@ -8,12 +8,19 @@
 #define INTERFACE_JSON_DECK_PARSER_H
 
 #include "../../../interface/deck_loader/card_node_function.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
 #include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QLoggingCategory>
+#include <QString>
+#include <QTextStream>
 #include <libcockatrice/card/import/card_name_normalizer.h>
 #include <libcockatrice/deck_list/deck_list.h>
 
+inline Q_LOGGING_CATEGORY(InterfaceJsonDeckParserLog, "interface_json_deck_parser");
+
 class IJsonDeckParser
 {
 public:
@@ -32,9 +39,6 @@ public:
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
-
         QString outputText;
         QTextStream outStream(&outputText);
 
@@ -50,8 +54,14 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
+        outStream.flush();
+        outStream.seek(0);
         deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
         deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
 
         return deckList;
     }
@@ -67,9 +77,6 @@ public:
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
-
         QString outputText;
         QTextStream outStream(&outputText);
 
@@ -97,8 +104,14 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
+        outStream.flush();
+        outStream.seek(0);
         deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
         deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {
@@ -114,6 +127,113 @@ public:
             }
         }
 
+        // Moxfield stores Oathbreaker signature spells in their own board,
+        // separate from both mainboard and commanders. They are playable deck
+        // cards, but must not replace the Oathbreaker as the banner card.
+        const QJsonObject signatureSpells = obj.value("signatureSpells").toObject();
+        for (auto it = signatureSpells.begin(); it != signatureSpells.end(); ++it) {
+            const QJsonObject entry = it.value().toObject();
+            const QJsonObject card = entry.value("card").toObject();
+            const QString name = card.value("name").toString();
+            const int quantity = entry.value("quantity").toInt();
+            if (name.isEmpty() || quantity <= 0) {
+                continue;
+            }
+            const QString set = card.value("set").toString().toUpper();
+            const QString collectorNumber = card.value("cn").toString();
+            const QString providerId = card.value("scryfall_id").toString();
+            deckList.addCards(name, quantity, DECK_ZONE_MAIN, -1, set, collectorNumber, providerId);
+        }
+
+        return deckList;
+    }
+};
+
+class ManaboxJsonParser : public IJsonDeckParser
+{
+    enum BoardType : quint32
+    {
+        MainBoard = 0,
+        SideBoard = 1,
+        Commander = 2,
+        MaybeBoard = 3,
+    };
+
+public:
+    DeckList parse(const QJsonObject &obj) override
+    {
+        DeckList deckList;
+
+        QString deckName = obj.value("name").toString();
+
+        QString outputText;
+        QString mainboardText;
+        QString sideboardText;
+        QTextStream mainboardStream(&mainboardText);
+        QTextStream sideboardStream(&sideboardText);
+        QTextStream outStream(&outputText);
+
+        auto commanderList = QList<QJsonObject>();
+        auto maybeboardList = QList<QJsonObject>();
+        for (auto entry : obj.value("cards").toArray()) {
+            auto card = entry.toObject();
+
+            auto collectorNumber = card.value("collectorNumber").toString();
+            auto cardName = card.value("name").toString();
+            auto boardType = static_cast<BoardType>(card.value("boardCategory").toInt());
+            auto setName = card.value("setId").toString();
+            auto quantity = card.value("quantity").toInt();
+            auto providerId = card.value("scryfallId").toString();
+
+            switch (boardType) {
+                case MainBoard:
+                    mainboardStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber
+                                    << '\n';
+                    break;
+                case SideBoard:
+                    sideboardStream << "SB: " << quantity << ' ' << cardName << " (" << setName << ") "
+                                    << collectorNumber << '\n';
+                    break;
+                case MaybeBoard:
+                    maybeboardList.append(card);
+                    break;
+                case Commander:
+                    commanderList.append(card);
+                    break;
+                default:
+                    qCWarning(InterfaceJsonDeckParserLog)
+                        << "Unknown ManaBox Zone" << card.value("boardCategory").toInt() << "for" << cardName;
+                    break;
+            }
+        }
+
+        outStream << mainboardText << sideboardText;
+
+        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
+        deckList.setName(deckName);
+        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+
+        for (const auto &maybeboardCard : maybeboardList) {
+            QString cardName = maybeboardCard.value("name").toString();
+            QString setName = maybeboardCard.value("setId").toString().toUpper();
+            QString collectorNumber = maybeboardCard.value("collectorNumber").toString();
+            QString providerId = maybeboardCard.value("scryfallId").toString();
+
+            for (int x = 0; x < maybeboardCard.value("quantity").toInt(); x++) {
+                deckList.addCard(cardName, DECK_ZONE_MAYBEBOARD, -1, setName, collectorNumber, providerId);
+            }
+        }
+        for (const auto &commanderCard : commanderList) {
+
+            QString commanderName = commanderCard.value("name").toString();
+            QString setName = commanderCard.value("setId").toString().toUpper();
+            QString collectorNumber = commanderCard.value("collectorNumber").toString();
+            QString providerId = commanderCard.value("scryfallId").toString();
+
+            deckList.setBannerCard({commanderName, providerId});
+            deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
+        }
+
         return deckList;
     }
 };
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
index 62668c4d9..d74414d4a 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp
@@ -2,253 +2,305 @@
 
 #include "../../../../main.h"
 #include "../../../settings/cache_settings.h"
+#include "spoiler_file.h"
 
-#include <QChar>
-#include <QCryptographicHash>
-#include <QDateTime>
+#include <QCoreApplication>
 #include <QDebug>
-#include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QFutureWatcher>
-#include <QIODevice>
-#include <QList>
-#include <QLocale>
-#include <QMessageLogger>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QSharedPointer>
 #include <QSystemTrayIcon>
-#include <QTimeZone>
+#include <QTimer>
 #include <QUrl>
 #include <QtConcurrentRun>
-#include <QtGlobal>
-#include <functional>
+#include <exception>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/network_manager.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <tuple>
-#include <utility>
 #include <version_string.h>
 
-#define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
-#define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
-
-SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *apParent) : QObject(apParent), cardUpdateProcess(nullptr)
+namespace
 {
-    isSpoilerDownloadEnabled = SettingsCache::instance().downloads().getDownloadSpoilersStatus();
-    if (isSpoilerDownloadEnabled) {
-        // Start the process of checking if we're in spoiler season
-        // File exists means we're in spoiler season
-        startSpoilerDownloadProcess(SPOILERS_STATUS_URL, false);
+const QUrl SPOILERS_STATUS_URL(
+    QStringLiteral("https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"));
+const QUrl SPOILERS_URL(QStringLiteral("https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"));
+// Request coordination stays on the GUI thread; reload workers never access it.
+QPointer<SpoilerBackgroundUpdater> currentUpdater;
+QPointer<QFutureWatcher<bool>> activeReload;
+quint64 newestOperation = 0;
+
+bool removeSpoilerFile(const QString &path)
+{
+    QFile file(path);
+    if (!file.exists()) {
+        return false;
+    }
+    if (!file.remove()) {
+        qCWarning(SpoilerBackgroundUpdaterLog) << "Could not remove spoiler database" << path << file.errorString();
+        return false;
+    }
+    return true;
+}
+} // namespace
+
+SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *parent, bool forceReload)
+    : QObject(parent), enabledAtStart(SettingsCache::instance().downloads().getDownloadSpoilersStatus()),
+      forceReload(forceReload), targetPath(SettingsCache::instance().paths().getSpoilerCardDatabasePath()),
+      operationId(++newestOperation), manager(NetworkManagerFactory::create(this)), notificationIcon(trayIcon)
+{
+    connect(&SettingsCache::instance().downloads(), &DownloadSettings::downloadSpoilerStatusChanged, this,
+            &SpoilerBackgroundUpdater::cancelIfSettingsChanged);
+    connect(&SettingsCache::instance().paths(), &PathsSettings::cardDatabasePathChanged, this,
+            &SpoilerBackgroundUpdater::cancelIfSettingsChanged);
+    // Even a disabled/no-op operation completes after its caller can connect signals.
+    QTimer::singleShot(0, this, &SpoilerBackgroundUpdater::begin);
+}
+
+void SpoilerBackgroundUpdater::begin()
+{
+    if (completed) {
+        return;
+    }
+    if (cancelled || operationId != newestOperation ||
+        (reloadOnly ? SettingsCache::instance().downloads().getDownloadSpoilersStatus()
+                    : (!enabledAtStart || !SettingsCache::instance().downloads().getDownloadSpoilersStatus())) ||
+        targetPath != SettingsCache::instance().paths().getSpoilerCardDatabasePath()) {
+        finish();
+        return;
+    }
+    const auto previous = currentUpdater;
+    if (activeReload) {
+        // The existing database API stores its final load status after its parser
+        // mutex is released. Do not overlap updater-owned calls to that API.
+        connect(activeReload, &QFutureWatcher<bool>::finished, this, &SpoilerBackgroundUpdater::begin,
+                static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
+        if (previous && previous != this) {
+            previous->cancel();
+        }
+        return;
+    }
+    currentUpdater = this;
+    QPointer<SpoilerBackgroundUpdater> guard(this);
+    if (previous && previous != this) {
+        previous->cancel();
+    }
+    if (!guard) {
+        return;
+    }
+    if (!isCurrent()) {
+        finish();
+    } else if (reloadOnly) {
+        if (QFileInfo::exists(targetPath) && !removeSpoilerFile(targetPath)) {
+            finish(tr("The spoiler database could not be removed. Check its file permissions and use Reload Card "
+                      "Database to retry."));
+            return;
+        }
+        reloadDatabase(false);
     } else {
-        qCInfo(SpoilerBackgroundUpdaterLog) << "Spoilers Disabled";
+        downloadFromURL(SPOILERS_STATUS_URL, false);
     }
 }
 
-void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool saveResults)
+bool SpoilerBackgroundUpdater::isCurrent() const
 {
-    auto spoilerURL = QUrl(url);
-    downloadFromURL(spoilerURL, saveResults);
+    return !completed && !cancelled && currentUpdater == this && operationId == newestOperation &&
+           (reloadOnly != SettingsCache::instance().downloads().getDownloadSpoilersStatus()) &&
+           targetPath == SettingsCache::instance().paths().getSpoilerCardDatabasePath();
 }
 
-void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
+void SpoilerBackgroundUpdater::cancelIfSettingsChanged()
 {
-    auto *nam = NetworkManagerFactory::create(this);
-    auto request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    QNetworkReply *reply = nam->get(request);
+    if (reloadOnly == SettingsCache::instance().downloads().getDownloadSpoilersStatus() ||
+        targetPath != SettingsCache::instance().paths().getSpoilerCardDatabasePath()) {
+        cancel();
+    }
+}
 
+void SpoilerBackgroundUpdater::cancel()
+{
+    if (completed) {
+        return;
+    }
+    cancelled = true;
+    const auto reply = activeReply;
+    activeReply.clear();
+    QPointer<SpoilerBackgroundUpdater> guard(this);
+    if (reply) {
+        reply->abort();
+        if (reply) {
+            reply->deleteLater();
+        }
+    }
+    // A running reload owns no updater state. Allow its completion to retire its
+    // watcher before a heap-owned updater is released by the caller.
+    if (guard && !reloading) {
+        finish();
+    }
+}
+
+void SpoilerBackgroundUpdater::downloadFromURL(const QUrl &url, bool saveResults)
+{
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    request.setTransferTimeout(60000);
+    activeReply = manager->get(request);
     if (saveResults) {
-        // This will write out to the file (used for spoiler.xml)
-        connect(reply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile);
+        connect(activeReply, &QNetworkReply::finished, this,
+                &SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile);
     } else {
-        // This will check the status (used to see if we're in spoiler season or not)
-        connect(reply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled);
+        connect(activeReply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled);
+    }
+}
+
+void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled()
+{
+    auto *reply = qobject_cast<QNetworkReply *>(sender());
+    if (!reply || reply != activeReply) {
+        return;
+    }
+    activeReply.clear();
+    reply->deleteLater();
+    if (!isCurrent()) {
+        finish();
+        return;
+    }
+    if (reply->error() == QNetworkReply::NoError) {
+        downloadFromURL(SPOILERS_URL, true);
+    } else if (reply->error() == QNetworkReply::ContentNotFoundError) {
+        const bool existed = QFileInfo::exists(targetPath);
+        seasonEnded = existed;
+        if (existed && !removeSpoilerFile(targetPath)) {
+            finish(tr("The spoiler season has ended, but the old spoiler database could not be removed."));
+            return;
+        }
+        if (existed || forceReload) {
+            reloadDatabase(false);
+        } else {
+            finish();
+        }
+    } else {
+        finish(tr("Could not check spoiler availability: %1").arg(reply->errorString()));
     }
 }
 
 void SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile()
 {
-    // Check for server reply
-    auto *reply = dynamic_cast<QNetworkReply *>(sender());
-    QNetworkReply::NetworkError errorCode = reply->error();
-
-    if (errorCode == QNetworkReply::NoError) {
-        spoilerData = reply->readAll();
-
-        // Save the spoiler.xml file to the disk
-        saveDownloadedFile(spoilerData);
-
-        reply->deleteLater();
-        emit spoilerCheckerDone();
+    auto *reply = qobject_cast<QNetworkReply *>(sender());
+    if (!reply || reply != activeReply) {
+        return;
+    }
+    activeReply.clear();
+    reply->deleteLater();
+    if (!isCurrent()) {
+        finish();
+        return;
+    }
+    if (reply->error() != QNetworkReply::NoError) {
+        finish(tr("Could not download spoilers: %1").arg(reply->errorString()));
+        return;
+    }
+    spoilerData = reply->readAll();
+    QString error;
+    const auto result = SpoilerFile::save(targetPath, spoilerData, [this] { return isCurrent(); }, error);
+    if (result == SpoilerFile::SaveResult::Failed) {
+        finish(isCurrent() ? error : QString());
+    } else if (result == SpoilerFile::SaveResult::Written || forceReload) {
+        reloadDatabase(result == SpoilerFile::SaveResult::Written);
     } else {
-        qCWarning(SpoilerBackgroundUpdaterLog) << "Error downloading spoilers file" << errorCode;
-        emit spoilerCheckerDone();
+        finish();
     }
 }
 
-bool SpoilerBackgroundUpdater::deleteSpoilerFile()
+void SpoilerBackgroundUpdater::reloadDatabase(bool updated)
 {
-    QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath();
-    QFileInfo fi(fileName);
-    QDir fileDir(fi.path());
-    QFile file(fileName);
-
-    // Delete the spoiler.xml file
-    if (file.exists() && file.remove()) {
-        qCInfo(SpoilerBackgroundUpdaterLog) << "Deleting spoiler.xml";
-        return true;
-    }
-
-    qCInfo(SpoilerBackgroundUpdaterLog) << "Error: Spoiler.xml not found or not deleted";
-    return false;
-}
-
-void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled()
-{
-    auto *response = dynamic_cast<QNetworkReply *>(sender());
-    QNetworkReply::NetworkError errorCode = response->error();
-
-    if (errorCode == QNetworkReply::ContentNotFoundError) {
-        // Spoiler season is offline at this point, so the spoiler.xml file can be safely deleted
-        // The user should run Oracle to get the latest card information
-        if (deleteSpoilerFile() && trayIcon) {
-            trayIcon->showMessage(tr("Spoilers season has ended"), tr("Deleting spoiler.xml. Please run Oracle"));
+    reloading = true;
+    auto *database = CardDatabaseManager::getInstance();
+    // The job outlives an individual request, so destroying that request cannot
+    // let a newer updater overlap the worker that is still completing.
+    auto *watcher = new QFutureWatcher<bool>(QCoreApplication::instance());
+    activeReload = watcher;
+    connect(watcher, &QFutureWatcher<bool>::finished, watcher, [watcher] {
+        if (activeReload == watcher) {
+            activeReload.clear();
         }
-
-        qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Season Offline";
-        emit spoilerCheckerDone();
-    } else if (errorCode == QNetworkReply::NoError) {
-        qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Service Online";
-        startSpoilerDownloadProcess(SPOILERS_URL, true);
-    } else if (errorCode == QNetworkReply::HostNotFoundError) {
-        if (trayIcon) {
-            trayIcon->showMessage(tr("Spoilers download failed"), tr("No internet connection"));
-        }
-
-        qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler download failed due to no internet connection";
-        emit spoilerCheckerDone();
-    } else {
-        if (trayIcon) {
-            trayIcon->showMessage(tr("Spoilers download failed"), tr("Error") + " " + (short)errorCode);
-        }
-
-        qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler download failed with reason" << errorCode;
-        emit spoilerCheckerDone();
-    }
-}
-
-bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
-{
-    QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath();
-    QFileInfo fi(fileName);
-    QDir fileDir(fi.path());
-
-    if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) {
-        return false;
-    }
-
-    // Check if the data matches. If it does, then spoilers are up to date.
-    if (getHash(fileName) == getHash(data)) {
-        if (trayIcon) {
-            trayIcon->showMessage(tr("Spoilers already up to date"), tr("No new spoilers added"));
-        }
-
-        qCInfo(SpoilerBackgroundUpdaterLog) << "Spoilers Up to Date";
-        return false;
-    }
-
-    QFile file(fileName);
-    if (!file.open(QIODevice::WriteOnly)) {
-        qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File open (w) failed for" << fileName;
-        file.close();
-        return false;
-    }
-
-    if (file.write(data) == -1) {
-        qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File write (w) failed for" << fileName;
-        file.close();
-        return false;
-    }
-
-    file.close();
-
-    // Data written, so reload the card database
-    qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written";
-    // Spoilers can introduce sets the config has never seen; the loader never
-    // runs checkUnknownSets() itself, so run it once the finished snapshot has
-    // been swapped in.
-    auto *watcher = new QFutureWatcher<void>(this);
-    connect(watcher, &QFutureWatcher<void>::finished, this, [watcher] {
         watcher->deleteLater();
-        CardDatabaseManager::getInstance()->checkUnknownSets();
     });
-    watcher->setFuture(QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); }));
-
-    // If the user has notifications enabled, let them know
-    // when the database was last updated
-    if (trayIcon) {
-        QList<QByteArray> lines = data.split('\n');
-
-        for (const QByteArray &line : lines) {
-            if (line.contains("Created At:")) {
-                QString timeStamp = QString(line).replace("Created At:", "").trimmed();
-                timeStamp.chop(6); // Remove " (UTC)"
-
-                auto utcTime = QLocale().toDateTime(timeStamp, "ddd, MMM dd yyyy, hh:mm:ss");
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-                utcTime.setTimeZone(QTimeZone::UTC);
-#else
-                utcTime.setTimeSpec(Qt::UTC);
-#endif
-
-                QString localTime = utcTime.toLocalTime().toString("MMM d, hh:mm");
-
-                trayIcon->showMessage(tr("Spoilers have been updated!"), tr("Last change:") + " " + localTime);
-                emit spoilersUpdatedSuccessfully();
-                return true;
-            }
+    connect(watcher, &QFutureWatcher<bool>::finished, this, [this, watcher, database, updated] {
+        bool loaded = false;
+        try {
+            loaded = watcher->result() && database->getLoadStatus() == Ok;
+        } catch (const std::exception &error) {
+            qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler database reload failed:" << error.what();
         }
-    }
-
-    return true;
+        reloading = false;
+        if (!isCurrent()) {
+            finish();
+        } else if (!loaded) {
+            finish(reloadOnly
+                       ? tr("Could not reload card data after disabling spoilers. Use Reload Card Database to retry.")
+                       : tr("Could not reload card data after updating spoilers. Use Update Spoilers to retry the "
+                            "reload."));
+        } else {
+            finish({}, updated);
+        }
+    });
+    watcher->setFuture(QtConcurrent::run([database] {
+        database->reloadCardDatabasesAndNotify();
+        return true;
+    }));
 }
 
-QByteArray SpoilerBackgroundUpdater::getHash(const QString fileName)
+void SpoilerBackgroundUpdater::finish(const QString &error, bool updated)
 {
-    QFile file(fileName);
-
-    if (file.open(QFile::ReadOnly)) {
-        // Only read the first 512 bytes (enough to get the "created" tag)
-        const QByteArray bytes = file.read(512);
-
-        QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
-        hash.addData(bytes);
-
-        qCInfo(SpoilerBackgroundUpdaterLog) << "File Hash =" << hash.result();
-
-        file.close();
-        return hash.result();
-    } else {
-        qCWarning(SpoilerBackgroundUpdaterLog) << "getHash ReadOnly failed!";
-        file.close();
-        return QByteArray();
+    if (completed) {
+        return;
+    }
+    completed = true;
+    spoilerData = QByteArray();
+    if (currentUpdater == this) {
+        currentUpdater.clear();
+    }
+    QPointer<SpoilerBackgroundUpdater> guard(this);
+    if (!error.isEmpty() && !cancelled) {
+        qCWarning(SpoilerBackgroundUpdaterLog) << error;
+        if (notificationIcon) {
+            notificationIcon->showMessage(tr("Spoiler update failed"), error);
+        }
+        if (!guard) {
+            return;
+        }
+        emit spoilerUpdateFailed(error);
+    } else if (updated && !cancelled) {
+        if (notificationIcon) {
+            notificationIcon->showMessage(tr("Spoilers have been updated!"),
+                                          tr("The card database now includes the downloaded spoilers."));
+        }
+    } else if (seasonEnded && !cancelled && notificationIcon) {
+        notificationIcon->showMessage(tr("Spoiler season has ended"),
+                                      tr("The spoiler database was removed. Please run Oracle to get released cards."));
+    }
+    if (guard) {
+        emit spoilerCheckerDone();
     }
 }
 
-QByteArray SpoilerBackgroundUpdater::getHash(QByteArray data)
+SpoilerBackgroundUpdater *SpoilerBackgroundUpdater::current()
 {
-    // Only read the first 512 bytes (enough to get the "created" tag)
-    const QByteArray bytes = data.left(512);
-
-    QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
-    hash.addData(bytes);
-
-    qCInfo(SpoilerBackgroundUpdaterLog) << "Data Hash =" << hash.result();
-
-    return hash.result();
+    return currentUpdater;
+}
+
+SpoilerBackgroundUpdater *SpoilerBackgroundUpdater::deleteSpoilerFile()
+{
+    // Deletion and the following reload share the operation lifetime. Callers can
+    // observe either failure before the queued operation starts, and an explicit
+    // retry still reloads when the file has already been removed.
+    auto *updater = new SpoilerBackgroundUpdater(QCoreApplication::instance(), true);
+    updater->reloadOnly = true;
+    connect(updater, &SpoilerBackgroundUpdater::spoilerCheckerDone, updater, &QObject::deleteLater);
+    return updater;
 }
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
index a6c4ed00f..fd90eb688 100644
--- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h
@@ -2,7 +2,6 @@
  * @file spoiler_background_updater.h
  * @ingroup Client
  */
-//! \todo Document this file.
 
 #ifndef COCKATRICE_SPOILER_DOWNLOADER_H
 #define COCKATRICE_SPOILER_DOWNLOADER_H
@@ -10,10 +9,13 @@
 #include <QByteArray>
 #include <QLoggingCategory>
 #include <QObject>
+#include <QPointer>
 #include <QString>
 #include <qtmetamacros.h>
 
-class QProcess;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QSystemTrayIcon;
 class QUrl;
 
 inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater");
@@ -22,30 +24,48 @@ class SpoilerBackgroundUpdater : public QObject
 {
     Q_OBJECT
 public:
-    explicit SpoilerBackgroundUpdater(QObject *apParent = nullptr);
+    explicit SpoilerBackgroundUpdater(QObject *parent = nullptr, bool forceReload = false);
     inline QString getCardUpdaterBinaryName()
     {
         return "oracle";
     }
-    QByteArray getHash(const QString fileName);
-    QByteArray getHash(QByteArray data);
-    static bool deleteSpoilerFile();
+    // Queues removal and reload; the application owns the returned updater and
+    // deletes it on completion. Callers can connect its failure/completion signals.
+    static SpoilerBackgroundUpdater *deleteSpoilerFile();
+    // The operation currently running, if any. The updater outlives the page that
+    // started it, so a reopened page uses this to observe the in-flight update.
+    static SpoilerBackgroundUpdater *current();
 
 private slots:
+    void begin();
     void actDownloadFinishedSpoilersFile();
     void actCheckIfSpoilerSeasonEnabled();
+    void cancelIfSettingsChanged();
 
 private:
-    bool isSpoilerDownloadEnabled;
-    QProcess *cardUpdateProcess;
+    const bool enabledAtStart;
+    const bool forceReload;
+    const QString targetPath;
+    const quint64 operationId;
+    QNetworkAccessManager *manager;
+    QPointer<QNetworkReply> activeReply;
+    QPointer<QSystemTrayIcon> notificationIcon;
     QByteArray spoilerData;
-    void startSpoilerDownloadProcess(QString url, bool saveResults);
-    void downloadFromURL(QUrl url, bool saveResults);
-    bool saveDownloadedFile(QByteArray data);
+    bool completed = false;
+    bool cancelled = false;
+    bool reloading = false;
+    bool seasonEnded = false;
+    bool reloadOnly = false;
+
+    bool isCurrent() const;
+    void cancel();
+    void finish(const QString &error = {}, bool updated = false);
+    void downloadFromURL(const QUrl &url, bool saveResults);
+    void reloadDatabase(bool updated);
 
 signals:
-    void spoilersUpdatedSuccessfully();
     void spoilerCheckerDone();
+    void spoilerUpdateFailed(const QString &message);
 };
 
-#endif // COCKATRICE_SPOILER_DOWNLOADER_H
\ No newline at end of file
+#endif // COCKATRICE_SPOILER_DOWNLOADER_H
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp
new file mode 100644
index 000000000..554ea1108
--- /dev/null
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp
@@ -0,0 +1,109 @@
+#include "spoiler_file.h"
+
+#include <QCoreApplication>
+#include <QCryptographicHash>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QSaveFile>
+#include <QXmlStreamReader>
+
+namespace
+{
+QByteArray hashFile(const QString &path)
+{
+    QFile file(path);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return {};
+    }
+    QCryptographicHash hash(QCryptographicHash::Sha256);
+    return hash.addData(&file) ? hash.result() : QByteArray();
+}
+} // namespace
+
+namespace SpoilerFile
+{
+QString validate(const QByteArray &data)
+{
+    QXmlStreamReader xml(data);
+    if (!xml.readNextStartElement() || xml.name() != QStringLiteral("cockatrice_carddatabase")) {
+        return QCoreApplication::translate(
+            "SpoilerBackgroundUpdater",
+            "The download is not a Cockatrice card database. The previous spoiler file was preserved.");
+    }
+    bool versionOk = false;
+    const int version = xml.attributes().value(QStringLiteral("version")).toInt(&versionOk);
+    if (!versionOk || (version != 3 && version != 4)) {
+        return QCoreApplication::translate(
+            "SpoilerBackgroundUpdater",
+            "The spoiler database uses an unsupported format. The previous spoiler file was preserved.");
+    }
+    bool hasCards = false;
+    int depth = 1;
+    while (!xml.atEnd()) {
+        const auto token = xml.readNext();
+        if (token == QXmlStreamReader::StartElement) {
+            ++depth;
+            if (depth == 2 && xml.name() == QStringLiteral("cards")) {
+                hasCards = true;
+            }
+        } else if (token == QXmlStreamReader::EndElement) {
+            --depth;
+        }
+    }
+    if (xml.hasError() || !hasCards) {
+        return QCoreApplication::translate(
+            "SpoilerBackgroundUpdater",
+            "The spoiler database is incomplete or invalid. The previous spoiler file was preserved.");
+    }
+    return {};
+}
+
+SaveResult
+save(const QString &targetPath, const QByteArray &data, const std::function<bool()> &isCurrent, QString &error)
+{
+    error = validate(data);
+    if (!error.isEmpty()) {
+        return SaveResult::Failed;
+    }
+    if (!isCurrent()) {
+        error = QCoreApplication::translate("SpoilerBackgroundUpdater",
+                                            "The spoiler update was cancelled because its settings changed.");
+        return SaveResult::Failed;
+    }
+    if (hashFile(targetPath) == QCryptographicHash::hash(data, QCryptographicHash::Sha256)) {
+        return SaveResult::Unchanged;
+    }
+    const QDir directory = QFileInfo(targetPath).dir();
+    if (!directory.exists() && !directory.mkpath(QStringLiteral("."))) {
+        error = QCoreApplication::translate("SpoilerBackgroundUpdater",
+                                            "Could not create the spoiler database directory: %1")
+                    .arg(directory.absolutePath());
+        return SaveResult::Failed;
+    }
+    QSaveFile file(targetPath);
+    file.setDirectWriteFallback(false);
+    if (!file.open(QIODevice::WriteOnly) || file.write(data) != data.size() || !file.flush()) {
+        error = QCoreApplication::translate(
+                    "SpoilerBackgroundUpdater",
+                    "Could not save the spoiler database to %1: %2. The previous file was preserved.")
+                    .arg(targetPath, file.errorString());
+        return SaveResult::Failed;
+    }
+    if (!isCurrent()) {
+        file.cancelWriting();
+        error = QCoreApplication::translate("SpoilerBackgroundUpdater",
+                                            "The spoiler update was cancelled because its settings changed.");
+        return SaveResult::Failed;
+    }
+    if (!file.commit()) {
+        error = QCoreApplication::translate(
+                    "SpoilerBackgroundUpdater",
+                    "Could not replace the spoiler database at %1: %2. The previous file was preserved.")
+                    .arg(targetPath, file.errorString());
+        return SaveResult::Failed;
+    }
+    return SaveResult::Written;
+}
+
+} // namespace SpoilerFile
diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_file.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_file.h
new file mode 100644
index 000000000..3a138cdea
--- /dev/null
+++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_file.h
@@ -0,0 +1,24 @@
+#ifndef COCKATRICE_SPOILER_FILE_H
+#define COCKATRICE_SPOILER_FILE_H
+
+#include <QByteArray>
+#include <QString>
+#include <functional>
+
+namespace SpoilerFile
+{
+enum class SaveResult
+{
+    Failed,
+    Unchanged,
+    Written
+};
+
+QString validate(const QByteArray &data);
+// Validate before opening the destination, compare complete files, and replace
+// atomically. Check operation ownership both before writing and before committing.
+SaveResult
+save(const QString &targetPath, const QByteArray &data, const std::function<bool()> &isCurrent, QString &error);
+} // namespace SpoilerFile
+
+#endif // COCKATRICE_SPOILER_FILE_H
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 08eccf1e4..b40e26377 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -6,6 +6,7 @@
 #include "shortcuts_settings.h"
 
 #include <QApplication>
+#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
@@ -47,7 +48,32 @@ Q_GLOBAL_STATIC(SettingsCache, settingsCache)
 
 SettingsCache &SettingsCache::instance()
 {
-    return *settingsCache; // returns a QT managed singleton reference
+    SettingsCache &cache = *settingsCache; // returns a QT managed singleton reference
+    // The release channels own QNetworkAccessManagers, which must be destroyed
+    // while the application object is alive. ~SettingsCache() runs during
+    // static teardown, after QApplication is gone, so hook the application's
+    // shutdown instead. Retried here because the first access may predate the
+    // application object.
+    cache.installShutdownHook();
+    return cache;
+}
+
+void SettingsCache::installShutdownHook()
+{
+    if (shutdownHookInstalled) {
+        return;
+    }
+    QCoreApplication *application = QCoreApplication::instance();
+    if (application == nullptr) {
+        return;
+    }
+    connect(application, &QCoreApplication::aboutToQuit, this, [this] {
+        for (ReleaseChannel *releaseChannel : std::as_const(releaseChannels)) {
+            delete releaseChannel;
+        }
+        releaseChannels.clear();
+    });
+    shutdownHookInstalled = true;
 }
 
 QString SettingsCache::getDataPath()
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h
index 5f699247d..8ccf6f76b 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -19,7 +19,6 @@ inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 
 class ReleaseChannel;
 
-#define DEFAULT_LANG_NAME "English"
 #define CLIENT_INFO_NOT_SET "notset"
 
 #define DEFAULT_FONT_SIZE 12
@@ -91,8 +90,13 @@ private:
     QString themeName;
 
     QList<ReleaseChannel *> releaseChannels;
+    bool shutdownHookInstalled = false;
     bool isPortableBuild;
 
+    // Connects the aboutToQuit handler that deletes the release channels while
+    // the application object is still alive; a no-op before it exists.
+    void installShutdownHook();
+
     [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
     [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
     void loadPaths();
diff --git a/cockatrice/src/client/settings/shortcut_treeview.cpp b/cockatrice/src/client/settings/shortcut_treeview.cpp
index 4a5bafb01..2501798cb 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.cpp
+++ b/cockatrice/src/client/settings/shortcut_treeview.cpp
@@ -1,5 +1,6 @@
 #include "shortcut_treeview.h"
 
+#include "../../interface/theme_manager.h"
 #include "cache_settings.h"
 #include "shortcuts_settings.h"
 
@@ -78,6 +79,18 @@ ShortcutTreeView::ShortcutTreeView(QWidget *parent) : QTreeView(parent)
 
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &ShortcutTreeView::refreshShortcuts);
+
+    // Group headers store their font on the item; re-apply the role family on
+    // font changes (setFont emits itemChanged, which repaints the rows).
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+        QFont groupFont = themeManager->appFont(AppFont::InterfaceDefault);
+        groupFont.setBold(true);
+        for (int row = 0; row < shortcutsModel->rowCount(); ++row) {
+            if (auto *groupItem = shortcutsModel->item(row)) {
+                groupItem->setFont(groupFont);
+            }
+        }
+    });
 }
 
 void ShortcutTreeView::populateShortcutsModel()
@@ -93,7 +106,8 @@ void ShortcutTreeView::populateShortcutsModel()
             curParent = parentItems.value(group);
         } else {
             curParent = new QStandardItem(group);
-            static QFont font = curParent->font();
+            // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+            QFont font = themeManager->appFont(AppFont::InterfaceDefault);
             font.setBold(true);
             curParent->setFont(font);
             parentItems.insert(group, curParent);
diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h
index 1feb2006b..f4bf23141 100644
--- a/cockatrice/src/database/interface/settings_card_preference_provider.h
+++ b/cockatrice/src/database/interface/settings_card_preference_provider.h
@@ -2,13 +2,18 @@
 #define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
 #include "../../client/settings/cache_settings.h"
 
+#include <QObject>
 #include <libcockatrice/interfaces/interface_card_preference_provider.h>
 #include <libcockatrice/settings/card_override_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
-class SettingsCardPreferenceProvider : public ICardPreferenceProvider
+class SettingsCardPreferenceProvider : public QObject, public ICardPreferenceProvider
 {
 public:
+    explicit SettingsCardPreferenceProvider(QObject *parent = nullptr) : QObject(parent)
+    {
+    }
+
     [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override
     {
         return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp
index 616311750..f0df897fc 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -1,6 +1,5 @@
 #include "deck_filter_string.h"
 
-#include "../interface/deck_loader/loaded_deck.h"
 #include "libcockatrice/card/card_localization.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/deck_list/deck_list.h"
@@ -15,6 +14,7 @@
 #include <algorithm>
 #include <any>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/utility/peglib.h>
 #include <mutex>
diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h
index 76b891b59..b27cf87ca 100644
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@@ -11,6 +11,7 @@
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 
 struct CardSearchLanguage;
 struct LoadedDeck;
diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp
index 22679abb1..9c2a91a5b 100644
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@@ -1,6 +1,6 @@
 #include "filter_builder.h"
 
-#include "../interface/pixel_map_generator.h"
+#include "../interface/theme_icon.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 
 #include <QComboBox>
@@ -30,7 +30,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
         typeCombo->addItem(CardFilter::typeName(static_cast<CardFilter::Type>(i)), QVariant(i));
     }
 
-    QPushButton *ok = new QPushButton(themePixmap(QStringLiteral("icons/increment")), QString());
+    QPushButton *ok = new QPushButton(loadThemedIcon(QStringLiteral("icons/increment")), QString());
     ok->setObjectName("ok");
     ok->setMaximumSize(20, 20);
 
diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp
index b3bf307f1..66fe39821 100644
--- a/cockatrice/src/filters/filter_tree_model.cpp
+++ b/cockatrice/src/filters/filter_tree_model.cpp
@@ -1,5 +1,7 @@
 #include "filter_tree_model.h"
 
+#include "../interface/theme_manager.h"
+
 #include <QFlags>
 #include <QFont>
 #include <QString>
@@ -11,6 +13,27 @@
 
 class QObject;
 
+namespace
+{
+/**
+ * @brief Visits every filter item below @p node, depth first.
+ */
+template <typename Callback> void forEachFilter(const FilterTreeNode *node, const Callback &callback)
+{
+    if (node == nullptr) {
+        return;
+    }
+
+    if (const auto *filterItem = dynamic_cast<const FilterItem *>(node)) {
+        callback(filterItem);
+    }
+
+    for (int i = 0; i < node->childCount(); ++i) {
+        forEachFilter(node->nodeAt(i), callback);
+    }
+}
+} // namespace
+
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
 {
     fTree = new FilterTree;
@@ -18,6 +41,12 @@ FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
     connect(fTree, &FilterTree::postInsertRow, this, &FilterTreeModel::proxyEndInsertRow);
     connect(fTree, &FilterTree::preRemoveRow, this, &FilterTreeModel::proxyBeginRemoveRow);
     connect(fTree, &FilterTree::postRemoveRow, this, &FilterTreeModel::proxyEndRemoveRow);
+    // FontRole data reads the DeckList role live; rebroadcast so attached
+    // views re-query instead of waiting for an incidental repaint.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+        emit layoutAboutToBeChanged();
+        emit layoutChanged();
+    });
 }
 
 FilterTreeModel::~FilterTreeModel()
@@ -110,46 +139,31 @@ void FilterTreeModel::clearFiltersOfType(CardFilter::Attr filterType)
 QList<const CardFilter *> FilterTreeModel::getFiltersOfType(CardFilter::Attr filterType) const
 {
     QList<const CardFilter *> filters;
-    if (!fTree) {
-        return filters;
-    }
-
-    std::function<void(const FilterTreeNode *)> traverse;
-    traverse = [&](const FilterTreeNode *node) {
-        if (const auto *filterItem = dynamic_cast<const FilterItem *>(node)) {
-            if (filterItem->attr() == filterType) {
-                QString text = filterItem->text();
-                filters.append(new CardFilter(text, filterItem->type(), filterItem->attr()));
-            }
+    forEachFilter(fTree, [&](const FilterItem *filterItem) {
+        if (filterItem->attr() == filterType) {
+            filters.append(new CardFilter(filterItem->text(), filterItem->type(), filterItem->attr()));
         }
-        for (int i = 0; i < node->childCount(); ++i) {
-            traverse(node->nodeAt(i));
-        }
-    };
-
-    traverse(fTree);
+    });
     return filters;
 }
 
+QStringList FilterTreeModel::getFilterTermsOfType(CardFilter::Attr filterType) const
+{
+    QStringList terms;
+    forEachFilter(fTree, [&](const FilterItem *filterItem) {
+        if (filterItem->attr() == filterType) {
+            terms.append(filterItem->text());
+        }
+    });
+    return terms;
+}
+
 QList<const CardFilter *> FilterTreeModel::allFilters() const
 {
     QList<const CardFilter *> filters;
-    if (!fTree) {
-        return filters;
-    }
-
-    std::function<void(const FilterTreeNode *)> traverse;
-    traverse = [&](const FilterTreeNode *node) {
-        if (const auto *filterItem = dynamic_cast<const FilterItem *>(node)) {
-            QString text = filterItem->text();
-            filters.append(new CardFilter(text, filterItem->type(), filterItem->attr()));
-        }
-        for (int i = 0; i < node->childCount(); ++i) {
-            traverse(node->nodeAt(i));
-        }
-    };
-
-    traverse(fTree);
+    forEachFilter(fTree, [&](const FilterItem *filterItem) {
+        filters.append(new CardFilter(filterItem->text(), filterItem->type(), filterItem->attr()));
+    });
     return filters;
 }
 
@@ -196,7 +210,8 @@ QVariant FilterTreeModel::data(const QModelIndex &index, int role) const
     switch (role) {
         case Qt::FontRole:
             if (!node->isLeaf()) {
-                QFont f;
+                // Family comes from the DeckList theme role; bold stays caller-side.
+                QFont f = themeManager->appFont(AppFont::DeckList);
                 f.setBold(true);
                 return f;
             }
diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h
index 826fcc941..05f34f508 100644
--- a/cockatrice/src/filters/filter_tree_model.h
+++ b/cockatrice/src/filters/filter_tree_model.h
@@ -28,7 +28,14 @@ public slots:
     void addFilter(const CardFilter *f);
     void removeFilter(const CardFilter *f);
     void clearFiltersOfType(CardFilter::Attr filterType);
+    /**
+     * @brief Copies every active filter of one attribute into new CardFilter objects.
+     *
+     * The caller owns the returned filters. Prefer getFilterTermsOfType() when only
+     * the terms are needed.
+     */
     [[nodiscard]] QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
+    /// @brief Copies every active filter into new CardFilter objects. The caller owns them.
     [[nodiscard]] QList<const CardFilter *> allFilters() const;
 
 private slots:
@@ -48,6 +55,13 @@ public:
     {
         return fTree;
     }
+
+    /**
+     * @brief The texts of every active filter of one attribute, without allocating filters.
+     *
+     * Prefer this over getFiltersOfType() when only the filter terms are needed.
+     */
+    [[nodiscard]] QStringList getFilterTermsOfType(CardFilter::Attr filterType) const;
     [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
     [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp
deleted file mode 100644
index 3f879a849..000000000
--- a/cockatrice/src/game/board/card_state.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "card_state.h"
-
-#include <QSharedPointer>
-
-void CardState::resetState(bool keepAnnotations)
-{
-    attacking = false;
-    counters.clear();
-    pt.clear();
-    if (!keepAnnotations) {
-        annotation.clear();
-    }
-    attachedTo = nullptr;
-}
-
-void CardState::setZone(CardZoneLogic *_zone)
-{
-    if (zone == _zone) {
-        return;
-    }
-
-    zone = _zone;
-    emit zoneChanged(this, zone);
-    emit stateChanged();
-}
-
-void CardState::setAttacking(bool _attacking)
-{
-    if (attacking == _attacking) {
-        return;
-    }
-    attacking = _attacking;
-    emit attackingChanged(_attacking);
-    emit stateChanged();
-}
-
-void CardState::insertCounter(int id, int value)
-{
-    counters.insert(id, value);
-
-    emit countersChanged(counters);
-    emit stateChanged();
-}
-
-void CardState::setCounter(int id, int value)
-{
-    if (value) {
-        counters[id] = value;
-    } else {
-        counters.remove(id);
-    }
-
-    emit countersChanged(counters);
-    emit stateChanged();
-}
-
-void CardState::clearCounters()
-{
-    counters.clear();
-    emit countersChanged(counters);
-    emit stateChanged();
-}
-
-void CardState::setAnnotation(const QString &_annotation)
-{
-    if (annotation == _annotation) {
-        return;
-    }
-    annotation = _annotation;
-    emit annotationChanged(annotation);
-    emit stateChanged();
-}
-
-void CardState::setPT(const QString &_pt)
-{
-    if (pt == _pt) {
-        return;
-    }
-    pt = _pt;
-    emit ptChanged(pt);
-    emit stateChanged();
-}
-
-void CardState::setDoesntUntap(bool _doesntUntap)
-{
-    if (doesntUntap == _doesntUntap) {
-        return;
-    }
-    doesntUntap = _doesntUntap;
-    emit doesntUntapChanged(_doesntUntap);
-    emit stateChanged();
-}
-
-void CardState::setDestroyOnZoneChange(bool _destroyOnZoneChange)
-{
-    if (destroyOnZoneChange == _destroyOnZoneChange) {
-        return;
-    }
-
-    destroyOnZoneChange = _destroyOnZoneChange;
-    emit destroyOnZoneChangeChanged(_destroyOnZoneChange);
-    emit stateChanged();
-}
-
-void CardState::setAttachedTo(CardItem *_attachedTo)
-{
-    if (attachedTo == _attachedTo) {
-        return;
-    }
-    attachedTo = _attachedTo;
-    emit attachedToChanged(_attachedTo);
-    emit stateChanged();
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/card_state.h b/cockatrice/src/game/board/card_state.h
deleted file mode 100644
index ca7aaf927..000000000
--- a/cockatrice/src/game/board/card_state.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef COCKATRICE_CARD_STATE_H
-#define COCKATRICE_CARD_STATE_H
-
-#include <QMap>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-
-class CardZoneLogic;
-class CardItem;
-
-class CardState : public QObject
-{
-    Q_OBJECT
-
-private:
-    bool attacking = false;
-    QMap<int, int> counters;
-    QString annotation;
-    QString pt;
-    bool doesntUntap = false;
-    bool destroyOnZoneChange = false;
-
-    CardItem *attachedTo = nullptr;
-    CardZoneLogic *zone = nullptr;
-
-signals:
-    void stateChanged();
-
-    void attackingChanged(bool newValue);
-    void countersChanged(const QMap<int, int> &newCounters);
-    void annotationChanged(const QString &newAnnotation);
-    void ptChanged(const QString &newPt);
-    void doesntUntapChanged(bool newValue);
-    void destroyOnZoneChangeChanged(bool newValue);
-    void attachedToChanged(CardItem *newAttachedTo);
-    void zoneChanged(CardState *changedCard, CardZoneLogic *newZone);
-
-public:
-    explicit CardState(QObject *parent, CardZoneLogic *_zone) : QObject(parent), zone(_zone)
-    {
-    }
-
-    void resetState(bool keepAnnotations);
-
-    CardZoneLogic *getZone() const
-    {
-        return zone;
-    }
-
-    void setZone(CardZoneLogic *_zone);
-
-    bool getAttacking() const
-    {
-        return attacking;
-    }
-    void setAttacking(bool _attacking);
-
-    const QMap<int, int> &getCounters() const
-    {
-        return counters;
-    }
-
-    void insertCounter(int id, int value);
-
-    void setCounter(int id, int value);
-
-    void clearCounters();
-
-    QString getAnnotation() const
-    {
-        return annotation;
-    }
-
-    void setAnnotation(const QString &_annotation);
-
-    QString getPT() const
-    {
-        return pt;
-    }
-
-    void setPT(const QString &_pt);
-
-    bool getDoesntUntap() const
-    {
-        return doesntUntap;
-    }
-
-    void setDoesntUntap(bool _doesntUntap);
-
-    bool getDestroyOnZoneChange() const
-    {
-        return destroyOnZoneChange;
-    }
-
-    void setDestroyOnZoneChange(bool _destroyOnZoneChange);
-
-    CardItem *getAttachedTo() const
-    {
-        return attachedTo;
-    }
-
-    void setAttachedTo(CardItem *_attachedTo);
-};
-
-#endif // COCKATRICE_CARD_STATE_H
diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h
deleted file mode 100644
index cc995dbac..000000000
--- a/cockatrice/src/game/replay.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @file replay.h
- * @ingroup GameLogic
- * @ingroup Replay
- */
-//! \todo Document this file.
-
-#ifndef COCKATRICE_REPLAY_H
-#define COCKATRICE_REPLAY_H
-
-#include "abstract_game.h"
-
-#include <qtmetamacros.h>
-
-class GameReplay;
-class QObject;
-
-class Replay : public AbstractGame
-{
-    Q_OBJECT
-
-public:
-    explicit Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame);
-};
-
-#endif // COCKATRICE_REPLAY_H
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
index 2e18fca2d..c707b4022 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
@@ -7,6 +7,7 @@
 #include <QBrush>
 #include <QColor>
 #include <QCursor>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
@@ -51,7 +52,20 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
                 update();
             });
 
-    connect(item, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater);
+    // The source card can be destroyed mid-drag (e.g. moved by a server event). deleteLater() alone is not enough:
+    // a scene repaint can run before the deferred delete and paint the dead card. Detach from the scene immediately.
+    connect(_item, &QObject::destroyed, this, [this]() {
+        hide();
+        if (QGraphicsScene *sc = scene()) {
+            sc->removeItem(this);
+        }
+        deleteLater();
+    });
+}
+
+AbstractCardItem *AbstractCardDragItem::getItem() const
+{
+    return item.data();
 }
 
 QPainterPath AbstractCardDragItem::shape() const
@@ -65,6 +79,10 @@ QPainterPath AbstractCardDragItem::shape() const
 
 void AbstractCardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
+    if (item.isNull()) {
+        return;
+    }
+
     item->paint(painter, option, widget);
 
     // adds a mask to the card so it looks like the card hasnt been placed yet
diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
index 18afdcbb8..80e40ff1d 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
@@ -14,6 +14,7 @@
 #include <QList>
 #include <QObject>
 #include <QPointF>
+#include <QPointer>
 #include <QRectF>
 #include <qtmetamacros.h>
 
@@ -24,7 +25,8 @@ class AbstractCardDragItem : public QObject, public QGraphicsItem
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
 protected:
-    AbstractCardItem *item;
+    /// Guarded pointer: the source card may be destroyed while this drag item still exists.
+    QPointer<AbstractCardItem> item;
     QPointF hotSpot;
     QList<AbstractCardDragItem *> childDrags;
 
@@ -44,10 +46,8 @@ public:
     }
     [[nodiscard]] QPainterPath shape() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    [[nodiscard]] AbstractCardItem *getItem() const
-    {
-        return item;
-    }
+    /// @return the source card, or nullptr if it has already been destroyed.
+    [[nodiscard]] AbstractCardItem *getItem() const;
     [[nodiscard]] QPointF getHotSpot() const
     {
         return hotSpot;
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
index cc121cfb2..84e062cd7 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
@@ -3,6 +3,7 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../interface/theme_manager.h"
 #include "../card_dimensions.h"
 #include "../game_scene.h"
 #include "../z_values.h"
@@ -34,7 +35,6 @@
 #include <QVariant>
 #include <QtGlobal>
 #include <algorithm>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/debug_settings.h>
@@ -43,13 +43,23 @@
 class QSizeF;
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id)
-    : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
-      bgColor(Qt::transparent), isHovered(false), realZValue(0), pendingSelectionCollapse(false)
+    : ArrowTarget(_owner, parent), state(new CardState(this, nullptr, cardRef, _id)), tapAngle(0),
+      bgColor(Qt::transparent), isHovered(false), realZValue(0)
 {
     setCursor(Qt::OpenHandCursor);
     setFlag(ItemIsSelectable);
     setCacheMode(DeviceCoordinateCache);
 
+    connect(state, &CardState::cardPixmapUpdated, this, &AbstractCardItem::pixmapUpdated);
+    connect(state, &CardState::cardInfoChanged, this, &AbstractCardItem::onCardInfoChanged);
+    connect(state, &CardState::cardRefChanged, this, &AbstractCardItem::onCardRefChanged);
+    connect(state, &CardState::tappedChanged, this, &AbstractCardItem::onTappedChanged);
+    connect(state, &CardState::facedownChanged, this, [this] { update(); });
+    connect(state, &CardState::colorChanged, this, [this] {
+        cacheBgColor();
+        update();
+    });
+
     connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::displayCardNamesChanged, this,
             [this] { update(); });
     connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
@@ -67,7 +77,7 @@ AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef
 
 AbstractCardItem::~AbstractCardItem()
 {
-    emit deleteCardInfoPopup(cardRef.name);
+    emit deleteCardInfoPopup(state->getCardRef().name);
 }
 
 QRectF AbstractCardItem::boundingRect() const
@@ -90,30 +100,29 @@ void AbstractCardItem::pixmapUpdated()
     emit sigPixmapUpdated();
 }
 
-void AbstractCardItem::refreshCardInfo()
+void AbstractCardItem::onCardInfoChanged()
 {
-    exactCard = CardDatabaseManager::query()->getCard(cardRef);
-
-    if (!exactCard && !cardRef.name.isEmpty()) {
-        CardInfo::UiAttributes attributes = {.tableRow = -1};
-        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes);
-        exactCard = ExactCard(info);
-    }
-    if (exactCard) {
-        connect(exactCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &AbstractCardItem::pixmapUpdated);
-    }
-
     cacheBgColor();
     update();
 }
 
+void AbstractCardItem::onCardRefChanged(const CardRef &oldCardRef, const CardRef & /*newCardRef*/)
+{
+    emit deleteCardInfoPopup(oldCardRef.name);
+}
+
+void AbstractCardItem::refreshCardInfo()
+{
+    state->refreshCardInfo();
+}
+
 /**
  * Convenience method to get the CardInfo of the exactCard
  * @return A const reference to the CardInfo, or an empty CardInfo if card was null
  */
 const CardInfo &AbstractCardItem::getCardInfo() const
 {
-    return exactCard.getInfo();
+    return state->getCardInfo();
 }
 
 void AbstractCardItem::setRealZValue(qreal _zValue)
@@ -146,7 +155,7 @@ void AbstractCardItem::transformPainter(QPainter *painter, const QSizeF &transla
     painter->rotate(angle);
     painter->translate(-translatedSize.width() / 2, -translatedSize.height() / 2);
 
-    QFont f;
+    QFont f = themeManager->appFont(AppFont::CardText);
     f.setPixelSize(fontSize * scale);
 
     painter->setFont(f);
@@ -158,13 +167,13 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
     QPixmap translatedPixmap;
     bool paintImage = true;
 
-    if (facedown || cardRef.name.isEmpty()) {
+    if (state->getFaceDown() || state->getCardRef().name.isEmpty()) {
         // never reveal card color, always paint the card back
         CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
     } else {
         // don't even spend time trying to load the picture if our size is too small
         if (translatedSize.width() > 10) {
-            CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
+            CardPictureLoader::getPixmap(translatedPixmap, state->getCard(), translatedSize.toSize());
             if (translatedPixmap.isNull()) {
                 paintImage = false;
             }
@@ -185,19 +194,20 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
         painter->drawPath(shape());
     }
 
-    if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() || facedown) {
+    if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() ||
+        state->getFaceDown()) {
         painter->save();
         transformPainter(painter, translatedSize, angle);
         painter->setPen(Qt::white);
         painter->setBackground(Qt::black);
         painter->setBackgroundMode(Qt::OpaqueMode);
         QString nameStr;
-        if (facedown) {
-            nameStr = "# " + QString::number(id);
+        if (state->getFaceDown()) {
+            nameStr = "# " + QString::number(state->getId());
         } else {
             QString prefix = "";
             if (SettingsCache::instance().debug().getShowCardId()) {
-                prefix = "#" + QString::number(id) + " ";
+                prefix = "#" + QString::number(state->getId()) + " ";
             }
             nameStr = prefix + CardLocalization::displayName(getCardInfo());
         }
@@ -235,21 +245,6 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *
     painter->restore();
 }
 
-void AbstractCardItem::setCardRef(const CardRef &_cardRef)
-{
-    if (cardRef == _cardRef) {
-        return;
-    }
-
-    emit deleteCardInfoPopup(cardRef.name);
-    if (exactCard) {
-        disconnect(exactCard.getCardPtr().data(), nullptr, this, nullptr);
-    }
-    cardRef = _cardRef;
-
-    refreshCardInfo();
-}
-
 void AbstractCardItem::setHovered(bool _hovered)
 {
     if (isHovered == _hovered) {
@@ -275,18 +270,17 @@ void AbstractCardItem::setHovered(bool _hovered)
 
 void AbstractCardItem::setColor(const QString &_color)
 {
-    color = _color;
-    cacheBgColor();
-    update();
+    state->setColor(_color);
 }
 
 void AbstractCardItem::cacheBgColor()
 {
     QChar colorChar;
-    if (color.isEmpty()) {
-        colorChar = exactCard.getInfo().getColorChar();
+    const QString cardColor = state->getColor();
+    if (cardColor.isEmpty()) {
+        colorChar = state->getCardInfo().getColorChar();
     } else {
-        colorChar = color.at(0);
+        colorChar = cardColor.at(0);
     }
 
     switch (colorChar.toLower().toLatin1()) {
@@ -314,17 +308,12 @@ void AbstractCardItem::cacheBgColor()
     }
 }
 
-void AbstractCardItem::setTapped(bool _tapped, bool canAnimate)
+void AbstractCardItem::onTappedChanged(bool newTapped, bool canAnimate)
 {
-    if (tapped == _tapped) {
-        return;
-    }
-
-    tapped = _tapped;
     if (SettingsCache::instance().cardsDisplay().getTapAnimation() && canAnimate) {
         static_cast<GameScene *>(scene())->registerAnimationItem(this);
     } else {
-        tapAngle = tapped ? 90 : 0;
+        tapAngle = newTapped ? 90 : 0;
         setTransform(QTransform()
                          .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
                          .rotate(tapAngle)
@@ -338,12 +327,6 @@ bool AbstractCardItem::animationEvent()
     return false;
 }
 
-void AbstractCardItem::setFaceDown(bool _facedown)
-{
-    facedown = _facedown;
-    update();
-}
-
 void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     cancelPendingSelectionCollapse();
@@ -357,7 +340,7 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
         }
     }
     if ((event->modifiers() & Qt::AltModifier) && event->button() == Qt::LeftButton) {
-        emit cardShiftClicked(cardRef.name);
+        emit cardShiftClicked(state->getCardRef().name);
     } else if ((event->modifiers() & Qt::ControlModifier)) {
         setSelected(!isSelected());
     } else if (!isSelected()) {
@@ -371,7 +354,7 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     if (event->button() == Qt::LeftButton) {
         setCursor(Qt::ClosedHandCursor);
     } else if (event->button() == Qt::MiddleButton) {
-        emit showCardInfoPopup(event->screenPos(), cardRef);
+        emit showCardInfoPopup(event->screenPos(), state->getCardRef());
     }
     event->accept();
 }
@@ -405,7 +388,7 @@ void AbstractCardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     }
 
     if (event->button() == Qt::MiddleButton) {
-        emit deleteCardInfoPopup(cardRef.name);
+        emit deleteCardInfoPopup(state->getCardRef().name);
     }
 
     // This function ensures the parent function doesn't mess around with our selection.
diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.h b/cockatrice/src/game_graphics/board/abstract_card_item.h
index e2b150ce8..eee8ec743 100644
--- a/cockatrice/src/game_graphics/board/abstract_card_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.h
@@ -16,8 +16,7 @@
 #include <QSizeF>
 #include <QString>
 #include <QtGlobal>
-#include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <libcockatrice/game/board/card_state.h>
 #include <qtmetamacros.h>
 
 class PlayerLogic;
@@ -29,13 +28,8 @@ class AbstractCardItem : public ArrowTarget, public IAnimatedItem
 {
     Q_OBJECT
 protected:
-    ExactCard exactCard;
-    int id;
-    CardRef cardRef;
-    bool tapped;
-    bool facedown;
+    CardState *state;
     int tapAngle;
-    QString color;
     QColor bgColor;
 
 private:
@@ -45,6 +39,9 @@ private:
     int selectionCollapseGeneration = 0; ///< Guards the deferred collapse timer against stale firings
 private slots:
     void pixmapUpdated();
+    void onCardInfoChanged();
+    void onCardRefChanged(const CardRef &oldCardRef, const CardRef &newCardRef);
+    void onTappedChanged(bool newTapped, bool canAnimate);
 
 public slots:
     void refreshCardInfo();
@@ -80,31 +77,38 @@ public:
     QSizeF getTranslatedSize(QPainter *painter) const;
     void paintPicture(QPainter *painter, const QSizeF &translatedSize, int angle);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+    [[nodiscard]] CardState *getState() const
+    {
+        return state;
+    }
     ExactCard getCard() const
     {
-        return exactCard;
+        return state->getCard();
     }
     const CardInfo &getCardInfo() const;
     int getId() const
     {
-        return id;
+        return state->getId();
     }
     void setId(int _id)
     {
-        id = _id;
+        state->setId(_id);
     }
     QString getName() const
     {
-        return cardRef.name;
+        return state->getCardRef().name;
     }
     QString getProviderId() const
     {
-        return cardRef.providerId;
+        return state->getCardRef().providerId;
+    }
+    void setCardRef(const CardRef &_cardRef)
+    {
+        state->setCardRef(_cardRef);
     }
-    void setCardRef(const CardRef &_cardRef);
     CardRef getCardRef() const
     {
-        return cardRef;
+        return state->getCardRef();
     }
     qreal getRealZValue() const
     {
@@ -116,27 +120,33 @@ public:
     {
         return isHovered;
     }
-    QString getColor() const
+    [[nodiscard]] QString getColor() const
     {
-        return color;
+        return state->getColor();
     }
     void setColor(const QString &_color);
     bool getTapped() const
     {
-        return tapped;
+        return state->getTapped();
+    }
+    void setTapped(bool _tapped, bool canAnimate = false)
+    {
+        state->setTapped(_tapped, canAnimate);
     }
-    void setTapped(bool _tapped, bool canAnimate = false);
     bool getFaceDown() const
     {
-        return facedown;
+        return state->getFaceDown();
+    }
+    void setFaceDown(bool _facedown)
+    {
+        state->setFaceDown(_facedown);
     }
-    void setFaceDown(bool _facedown);
     void processHoverEvent();
     /** @brief Drop a pending collapse and disarm any deferred collapse timer. */
     void cancelPendingSelectionCollapse();
     void deleteCardInfoPopup()
     {
-        emit deleteCardInfoPopup(cardRef.name);
+        emit deleteCardInfoPopup(state->getCardRef().name);
     }
 
     /** @brief Default: no per-tick animation. Subclasses override to animate. */
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp
index 8500b9c51..30ffde320 100644
--- a/cockatrice/src/game_graphics/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@@ -2,10 +2,6 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
-#include "../../game/board/counter_state.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_graphics/board/translate_counter_name.h"
 #include "../../interface/widgets/menus/tearoff_menu.h"
 
@@ -23,8 +19,10 @@
 #include <QString>
 #include <QVariant>
 #include <QtGlobal>
-#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
+#include <libcockatrice/game/board/counter_state.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/utility/expression.h>
 #include <qnamespace.h>
 
@@ -151,10 +149,7 @@ void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event)
             menu->exec(event->screenPos());
         }
     } else {
-        Command_IncCounter cmd;
-        cmd.set_counter_id(id);
-        cmd.set_delta(event->button() == Qt::LeftButton ? 1 : -1);
-        player->getPlayerActions()->sendGameCommand(cmd);
+        player->getPlayerActions()->actIncrementCounter(id, event->button() == Qt::LeftButton ? 1 : -1);
     }
     event->accept();
 }
@@ -172,10 +167,7 @@ void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
 
 void AbstractCounter::incrementCounter()
 {
-    Command_IncCounter cmd;
-    cmd.set_counter_id(id);
-    cmd.set_delta(static_cast<QAction *>(sender())->data().toInt());
-    player->getPlayerActions()->sendGameCommand(cmd);
+    player->getPlayerActions()->actIncrementCounter(id, static_cast<QAction *>(sender())->data().toInt());
 }
 
 void AbstractCounter::setCounter()
@@ -199,10 +191,7 @@ void AbstractCounter::setCounter()
     }
 
     Expression exp(value);
-    Command_SetCounter cmd;
-    cmd.set_counter_id(id);
-    cmd.set_value(static_cast<int>(exp.parse(dlg.textValue())));
-    player->getPlayerActions()->sendGameCommand(cmd);
+    player->getPlayerActions()->actSetCounter(id, static_cast<int>(exp.parse(dlg.textValue())));
 }
 
 AbstractCounterDialog::AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent)
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
index 50e80d359..3a740aa98 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
@@ -1,5 +1,7 @@
 #include "abstract_graphics_item.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QBrush>
 #include <QFont>
 #include <QFontMetrics>
@@ -20,7 +22,7 @@ void AbstractGraphicsItem::paintNumberEllipse(int number,
     painter->save();
 
     QString numStr = QString::number(number);
-    QFont font("Serif");
+    QFont font = themeManager->cardTextFont();
     font.setPixelSize(fontSize);
     font.setWeight(QFont::Bold);
 
diff --git a/cockatrice/src/game_graphics/board/arrow_item.cpp b/cockatrice/src/game_graphics/board/arrow_item.cpp
index c5a9b9c5e..f7df98ab5 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_item.cpp
@@ -2,11 +2,6 @@
 #include "arrow_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/arrow_data.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../game_scene.h"
 #include "../player/player_target.h"
 #include "../z_values.h"
@@ -27,12 +22,12 @@
 #include <QTransform>
 #include <QtGlobal>
 #include <QtMath>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
+#include <libcockatrice/game/board/arrow_data.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <libcockatrice/settings/interface_settings.h>
-#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <math.h>
 #include <qnamespace.h>
@@ -426,19 +421,19 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
         CardZoneLogic *startZone = startCard->getZone();
 
-        Command_CreateArrow cmd;
-        cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(data->color));
-        cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-        cmd.set_start_zone(startZone->getName().toStdString());
-        cmd.set_start_card_id(startCard->getId());
+        ArrowData arrow;
+        arrow.color = data->color;
+        arrow.startPlayerId = startZone->getPlayer()->getPlayerInfo()->getId();
+        arrow.startZone = startZone->getName();
+        arrow.startCardId = startCard->getId();
 
         if (auto *targetCard = qgraphicsitem_cast<CardItem *>(targetItem)) {
             CardZoneLogic *targetZone = targetCard->getZone();
-            cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
-            cmd.set_target_zone(targetZone->getName().toStdString());
-            cmd.set_target_card_id(targetCard->getId());
+            arrow.targetPlayerId = targetZone->getPlayer()->getPlayerInfo()->getId();
+            arrow.targetZone = targetZone->getName();
+            arrow.targetCardId = targetCard->getId();
         } else if (auto *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem)) {
-            cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
+            arrow.targetPlayerId = targetPlayer->getOwner()->getPlayerInfo()->getId();
         } else {
             delArrow();
             return;
@@ -447,22 +442,9 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
         if (startZone->getName() == ZoneNames::HAND) {
             startCard->playCard(false);
-            CardInfoPtr ci = startCard->getCard().getCardPtr();
-            bool playToStack = SettingsCache::instance().userInterface().getPlayToStack();
-            if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
-                       (playToStack && ci->getUiAttributes().tableRow != 0 &&
-                        startCard->getZone()->getName() != ZoneNames::STACK))) {
-                cmd.set_start_zone(ZoneNames::STACK);
-            } else {
-                cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE);
-            }
         }
 
-        if (deleteInPhase != 0) {
-            cmd.set_delete_in_phase(deleteInPhase);
-        }
-
-        player->getPlayerActions()->sendGameCommand(cmd);
+        player->getPlayerActions()->createArrow(startCard->getState(), arrow, deleteInPhase);
     }
 
     delArrow();
@@ -554,7 +536,7 @@ void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         auto *startCard = qgraphicsitem_cast<CardItem *>(startItem);
         auto *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
         if (startCard && targetCard) {
-            attachCards(startCard, targetCard);
+            player->getPlayerActions()->attachCards(startCard->getState(), targetCard->getState());
         }
     }
 
@@ -563,23 +545,3 @@ void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         child->mouseReleaseEvent(event);
     }
 }
-
-void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard)
-{
-    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) {
-        return;
-    }
-
-    // move card onto table first if attaching from some other zone
-    if (startCard->getZone()->getName() != ZoneNames::TABLE) {
-        player->getPlayerActions()->playCardToTable(startCard, false);
-    }
-
-    Command_AttachCard cmd;
-    cmd.set_start_zone(ZoneNames::TABLE);
-    cmd.set_card_id(startCard->getId());
-    cmd.set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(targetCard->getZone()->getName().toStdString());
-    cmd.set_target_card_id(targetCard->getId());
-    player->getPlayerActions()->sendGameCommand(cmd);
-}
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h
index 2395165fc..64a48cd14 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.h
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@@ -1,7 +1,6 @@
 #ifndef ARROWITEM_H
 #define ARROWITEM_H
 
-#include "../../game/board/arrow_data.h"
 #include "../animated_item.h"
 #include "arrow_target.h"
 #include "graphics_item_type.h"
@@ -18,6 +17,7 @@
 #include <QRectF>
 #include <QSharedPointer>
 #include <QtGlobal>
+#include <libcockatrice/game/board/arrow_data.h>
 #include <qtmetamacros.h>
 
 class CardItem;
@@ -131,7 +131,6 @@ private:
     PlayerLogic *player;
     QList<ArrowAttachItem *> childArrows;
     QMetaObject::Connection positionConnection;
-    void attachCards(CardItem *startCard, const CardItem *targetCard);
 
 public:
     explicit ArrowAttachItem(ArrowTarget *_startItem);
diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game_graphics/board/arrow_registry.cpp
similarity index 93%
rename from cockatrice/src/game/arrow_registry.cpp
rename to cockatrice/src/game_graphics/board/arrow_registry.cpp
index c05134a75..10b3cde2f 100644
--- a/cockatrice/src/game/arrow_registry.cpp
+++ b/cockatrice/src/game_graphics/board/arrow_registry.cpp
@@ -1,9 +1,9 @@
 #include "arrow_registry.h"
 
-#include "../game_graphics/board/arrow_item.h"
-#include "board/arrow_data.h"
+#include "arrow_item.h"
 
 #include <QSharedPointer>
+#include <libcockatrice/game/board/arrow_data.h>
 
 void ArrowRegistry::insert(QSharedPointer<ArrowData> data, ArrowItem *arrow)
 {
diff --git a/cockatrice/src/game/arrow_registry.h b/cockatrice/src/game_graphics/board/arrow_registry.h
similarity index 94%
rename from cockatrice/src/game/arrow_registry.h
rename to cockatrice/src/game_graphics/board/arrow_registry.h
index ca3b04090..7103747e8 100644
--- a/cockatrice/src/game/arrow_registry.h
+++ b/cockatrice/src/game_graphics/board/arrow_registry.h
@@ -4,6 +4,7 @@
 #include <QList>
 #include <QMap>
 #include <QSet>
+#include <libcockatrice/game/board/arrow_data.h>
 
 class ArrowItem;
 struct ArrowData;
diff --git a/cockatrice/src/game_graphics/board/card_drag_item.cpp b/cockatrice/src/game_graphics/board/card_drag_item.cpp
index 265ea759c..b263e8c92 100644
--- a/cockatrice/src/game_graphics/board/card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_drag_item.cpp
@@ -130,8 +130,9 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     sc->removeItem(this);
 
     QList<CardDragItem *> dragItemList;
-    CardZoneLogic *startZone = static_cast<CardItem *>(item)->getZone();
-    if (currentZone && !(static_cast<CardItem *>(item)->getAttachedTo() && (startZone == currentZone->getLogic()))) {
+    CardZoneLogic *startZone = static_cast<CardItem *>(item.data())->getZone();
+    if (currentZone &&
+        !(static_cast<CardItem *>(item.data())->getAttachedTo() && (startZone == currentZone->getLogic()))) {
         if (!occupied) {
             dragItemList.append(this);
         }
@@ -139,7 +140,7 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         for (int i = 0; i < childDrags.size(); i++) {
             CardDragItem *c = static_cast<CardDragItem *>(childDrags[i]);
             if (!occupied &&
-                !(static_cast<CardItem *>(c->item)->getAttachedTo() && (startZone == currentZone->getLogic())) &&
+                !(static_cast<CardItem *>(c->item.data())->getAttachedTo() && (startZone == currentZone->getLogic())) &&
                 !c->occupied) {
                 dragItemList.append(c);
             }
diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp
index 1901a634f..acd0764c9 100644
--- a/cockatrice/src/game_graphics/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@@ -1,17 +1,6 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/abstract_game.h"
-#include "../../game/board/card_state.h"
-#include "../../game/game_state.h"
-#include "../../game/phase.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/player/player_manager.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../card_dimensions.h"
 #include "../game_scene.h"
 #include "arrow_item.h"
@@ -41,6 +30,17 @@
 #include <QVariant>
 #include <QtGlobal>
 #include <libcockatrice/card/card_info.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/phase.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/card_ref.h>
@@ -53,8 +53,9 @@ CardItem::CardItem(PlayerLogic *_owner,
                    const CardRef &cardRef,
                    int _cardid,
                    CardZoneLogic *_zone)
-    : AbstractCardItem(parent, cardRef, _owner, _cardid), state(new CardState(this, _zone)), dragItem(nullptr)
+    : AbstractCardItem(parent, cardRef, _owner, _cardid), dragItem(nullptr)
 {
+    state->setZone(_zone);
     owner->addCard(this);
 
     connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, this, [this](int counterId) {
@@ -62,25 +63,44 @@ CardItem::CardItem(PlayerLogic *_owner,
             update();
         }
     });
+
+    connect(state, &CardState::stateReset, this, [this] {
+        if (scene()) {
+            static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
+        }
+        update();
+    });
+
+    // The retyped logic layer drives CardState setters directly (bypassing the CardItem wrappers that called
+    // update()), so repaint on every state change: attacking, annotation, doesntUntap, P/T and counters.
+    connect(state, &CardState::stateChanged, this, [this] { update(); });
+
+    connect(state, &CardState::viewDeleteRequested, this, &CardItem::deleteLater);
 }
 
 void CardItem::prepareDelete()
 {
     if (owner != nullptr) {
-        if (owner->getGame()->getActiveCard() == this) {
+        auto *gameScene = qobject_cast<GameScene *>(scene());
+        if (gameScene && gameScene->getActiveCard() == this) {
             emit owner->requestCardMenuUpdate(nullptr);
-            owner->getGame()->setActiveCard(nullptr);
+            gameScene->setActiveCard(nullptr);
         }
         owner = nullptr;
     }
 
-    while (!attachedCards.isEmpty()) {
-        attachedCards.first()->setZone(nullptr); // so that it won't try to call reorganizeCards()
-        attachedCards.first()->setAttachedTo(nullptr);
+    const QList<CardState *> &attachedStates = state->getAttachedCards();
+    while (!attachedStates.isEmpty()) {
+        auto *attachedItem = qobject_cast<CardItem *>(attachedStates.first()->parent());
+        if (attachedItem == nullptr) {
+            break;
+        }
+        attachedItem->setZone(nullptr); // so that it won't try to call reorganizeCards()
+        attachedItem->setAttachedTo(nullptr);
     }
 
     if (state->getAttachedTo() != nullptr) {
-        state->getAttachedTo()->removeAttachedCard(this);
+        state->getAttachedTo()->removeAttachedCard(state);
         state->setAttachedTo(nullptr);
     }
 }
@@ -127,7 +147,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
         painter->save();
         transformPainter(painter, translatedSize, tapAngle);
 
-        if (!getFaceDown() && state->getPT() == exactCard.getInfo().getPowTough()) {
+        if (!getFaceDown() && state->getPT() == state->getCardInfo().getPowTough()) {
             painter->setPen(Qt::white);
         } else {
             painter->setPen(QColor(255, 150, 0)); // dark orange
@@ -209,36 +229,13 @@ void CardItem::setPT(const QString &_pt)
 
 void CardItem::setAttachedTo(CardItem *_attachedTo)
 {
-    if (state->getAttachedTo() != nullptr) {
-        state->getAttachedTo()->removeAttachedCard(this);
-    }
+    CardState *newParent = _attachedTo == nullptr ? nullptr : _attachedTo->getState();
+    state->setAttachedTo(newParent);
 
-    gridPoint.setX(-1);
-    state->setAttachedTo(_attachedTo);
-    if (state->getAttachedTo() != nullptr) {
-        // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its
-        // attached cards
-        if (state->getAttachedTo()->getZone() == nullptr) {
-            deleteLater();
-        } else {
-            emit state->getAttachedTo()->getZone()->cardAdded(this);
-            state->getAttachedTo()->addAttachedCard(this);
-            if (state->getZone() != state->getAttachedTo()->getZone()) {
-                state->getAttachedTo()->getZone()->reorganizeCards();
-            }
-        }
-    } else {
-        // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its
-        // attached cards
-        if (state->getZone() == nullptr) {
-            deleteLater();
-        } else {
-            emit state->getZone()->cardAdded(this);
-        }
-    }
-
-    if (state->getZone() != nullptr) {
-        state->getZone()->reorganizeCards();
+    // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its attached
+    // cards
+    if (newParent != nullptr ? newParent->getZone() == nullptr : state->getZone() == nullptr) {
+        deleteLater();
     }
 }
 
@@ -248,13 +245,6 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
 void CardItem::resetState(bool keepAnnotations)
 {
     state->resetState(keepAnnotations);
-    attachedCards.clear();
-    setTapped(false, false);
-    setDoesntUntap(false);
-    if (scene()) {
-        static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
-    }
-    update();
 }
 
 void CardItem::processCardInfo(const ServerInfo_Card &_info)
@@ -390,7 +380,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
         // Use the buttonDownPos to align the hot spot with the position when
         // the user originally clicked
-        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown);
+        createDragItem(state->getId(), event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown);
         dragItem->grabMouse();
 
         int childIndex = 0;
@@ -433,42 +423,11 @@ void CardItem::playCard(bool faceDown)
                 emit playSelected(this);
             }
         } else {
-            state->getZone()->getPlayer()->getPlayerActions()->playCard(this, faceDown);
+            state->getZone()->getPlayer()->getPlayerActions()->playCard(state, faceDown);
         }
     }
 }
 
-QVariantList CardItem::parsePT(const QString &pt)
-{
-    QVariantList ptList = QVariantList();
-    if (!pt.isEmpty()) {
-        int sep = pt.indexOf('/');
-        if (sep == 0) {
-            ptList.append(QVariant(pt.mid(1))); // cut off starting '/' and take full string
-        } else {
-            int start = 0;
-            for (;;) {
-                QString item = pt.mid(start, sep - start);
-                if (item.isEmpty()) {
-                    ptList.append(QVariant(QString()));
-                } else if (item[0] == '+') {
-                    ptList.append(QVariant(item.mid(1).toInt())); // add as int
-                } else if (item[0] == '-') {
-                    ptList.append(QVariant(item.toInt())); // add as int
-                } else {
-                    ptList.append(QVariant(item)); // add as qstring
-                }
-                if (sep == -1) {
-                    break;
-                }
-                start = sep + 1;
-                sep = pt.indexOf('/', start);
-            }
-        }
-    }
-    return ptList;
-}
-
 /**
  * @brief returns true if the zone is a unwritable reveal zone view (eg a card reveal window). Will return false if zone
  * is nullptr.
@@ -493,7 +452,7 @@ void CardItem::handleClickedToPlay(bool shiftHeld)
         if (SettingsCache::instance().userInterface().getClickPlaysAllSelected()) {
             emit hideSelected(this);
         } else {
-            state->getZone()->removeCard(this);
+            state->getZone()->removeCard(state);
         }
     } else {
         playCard(shiftHeld);
@@ -537,16 +496,16 @@ bool CardItem::animationEvent()
 {
     int rotation = ROTATION_DEGREES_PER_FRAME;
     bool animationIncomplete = true;
-    if (!tapped) {
+    if (!state->getTapped()) {
         rotation *= -1;
     }
 
     tapAngle += rotation;
-    if (tapped && (tapAngle > 90)) {
+    if (state->getTapped() && (tapAngle > 90)) {
         tapAngle = 90;
         animationIncomplete = false;
     }
-    if (!tapped && (tapAngle < 0)) {
+    if (!state->getTapped() && (tapAngle < 0)) {
         tapAngle = 0;
         animationIncomplete = false;
     }
@@ -567,7 +526,9 @@ QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
         bool selected = value.toBool();
 
         if (selected) {
-            owner->getGame()->setActiveCard(this);
+            if (auto *gameScene = qobject_cast<GameScene *>(scene())) {
+                gameScene->setActiveCard(this);
+            }
         }
 
         emit selectionChanged(this, selected);
diff --git a/cockatrice/src/game_graphics/board/card_item.h b/cockatrice/src/game_graphics/board/card_item.h
index 0737d7f9c..01dacc021 100644
--- a/cockatrice/src/game_graphics/board/card_item.h
+++ b/cockatrice/src/game_graphics/board/card_item.h
@@ -7,7 +7,6 @@
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
-#include "../../game/board/card_state.h"
 #include "abstract_card_item.h"
 #include "graphics_item_type.h"
 
@@ -16,6 +15,7 @@
 #include <QPointF>
 #include <QString>
 #include <QVariantList>
+#include <libcockatrice/game/board/card_state.h>
 #include <qtmetamacros.h>
 
 class CardDragItem;
@@ -33,11 +33,7 @@ class CardItem : public AbstractCardItem
 {
     Q_OBJECT
 private:
-    CardState *state;
-
-    QPoint gridPoint;
     CardDragItem *dragItem;
-    QList<CardItem *> attachedCards;
 
     void prepareDelete();
     void handleClickedToPlay(bool shiftHeld);
@@ -60,10 +56,6 @@ public:
                       CardZoneLogic *_zone = nullptr);
 
     void retranslateUi();
-    [[nodiscard]] CardState *getState() const
-    {
-        return state;
-    }
     [[nodiscard]] CardZoneLogic *getZone() const
     {
         return state->getZone();
@@ -72,15 +64,15 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     [[nodiscard]] QPoint getGridPoint() const
     {
-        return gridPoint;
+        return state->getGridPoint();
     }
     void setGridPoint(const QPoint &_gridPoint)
     {
-        gridPoint = _gridPoint;
+        state->setGridPoint(_gridPoint);
     }
     [[nodiscard]] QPoint getGridPos() const
     {
-        return gridPoint;
+        return state->getGridPoint();
     }
     [[nodiscard]] PlayerLogic *getOwner() const
     {
@@ -123,22 +115,22 @@ public:
     {
         state->setDestroyOnZoneChange(_destroy);
     }
-    [[nodiscard]] CardItem *getAttachedTo() const
+    [[nodiscard]] CardState *getAttachedTo() const
     {
         return state->getAttachedTo();
     }
     void setAttachedTo(CardItem *_attachedTo);
-    void addAttachedCard(CardItem *card)
+    void addAttachedCard(CardState *card)
     {
-        attachedCards.append(card);
+        state->addAttachedCard(card);
     }
-    void removeAttachedCard(CardItem *card)
+    void removeAttachedCard(CardState *card)
     {
-        attachedCards.removeOne(card);
+        state->removeAttachedCard(card);
     }
-    [[nodiscard]] const QList<CardItem *> &getAttachedCards() const
+    [[nodiscard]] const QList<CardState *> &getAttachedCards() const
     {
-        return attachedCards;
+        return state->getAttachedCards();
     }
     void resetState(bool keepAnnotations = false);
     void processCardInfo(const ServerInfo_Card &_info);
@@ -150,26 +142,6 @@ public:
     void drawAttachArrow();
     void playCard(bool faceDown);
 
-    /**
-     * @brief Parses a string representing a p/t in order to extract the values from it.
-     *
-     * If the string contains '/', the string will be split at the '/' and each side will be parsed separately,
-     * which means the result list will have two elements.
-     *
-     * If '/' is not found, then the entire string is parsed together, which means the result list will
-     * have a single element.
-     *
-     * If either side of the split is empty, there will also only be a single element in the result list.
-     *
-     * This function will attempt to parse each substring as an int first, handling plus and minus prefixes.
-     * If successful, it will put the parsed value into the QVariant as an int.
-     * If failed, it will just put the substring into the QVariant as a QString.
-     *
-     * @param pt The p/t string
-     * @return A QVariantList that can contain one or two elements, where each QVariant can be either int or QString
-     */
-    static QVariantList parsePT(const QString &pt);
-
 protected:
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
diff --git a/cockatrice/src/game_graphics/board/counter_general.cpp b/cockatrice/src/game_graphics/board/counter_general.cpp
index 4a8bbd6a4..23618e6bf 100644
--- a/cockatrice/src/game_graphics/board/counter_general.cpp
+++ b/cockatrice/src/game_graphics/board/counter_general.cpp
@@ -1,6 +1,7 @@
 #include "counter_general.h"
 
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_manager.h"
 #include "abstract_graphics_item.h"
 
 #include <QFont>
@@ -41,7 +42,7 @@ void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /
     painter->drawPixmap(QPoint(0, 0), pixmap);
 
     if (value) {
-        QFont f("Serif");
+        QFont f = themeManager->cardTextFont();
         f.setPixelSize(qMax((int)(radius * scaleFactor), 10));
         f.setWeight(QFont::Bold);
         painter->setPen(Qt::black);
diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp
index 630530792..f62d33335 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp
@@ -77,7 +77,7 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos)
 
 void DeckViewCardDragItem::handleDrop(DeckViewCardContainer *target)
 {
-    auto *card = static_cast<DeckViewCard *>(item);
+    auto *card = static_cast<DeckViewCard *>(item.data());
     auto *start = static_cast<DeckViewCardContainer *>(item->parentItem());
     start->removeCard(card);
     target->addCard(card);
@@ -240,8 +240,8 @@ void DeckViewCardContainer::paint(QPainter *painter, const QStyleOptionGraphicsI
     painter->drawLine(QPointF(0, separatorY), QPointF(width, separatorY));
 
     painter->setPen(QColor(Qt::white));
-    QFont f("Serif");
-    f.setStyleHint(QFont::Serif);
+    // Family comes from the DeckList theme role; pixel sizes/weights unchanged.
+    QFont f = themeManager->deckListFont();
     f.setPixelSize(24);
     f.setWeight(QFont::Bold);
     painter->setFont(f);
@@ -292,8 +292,8 @@ QList<QPair<int, int>> DeckViewCardContainer::getRowsAndCols() const
 
 int DeckViewCardContainer::getCardTypeTextWidth() const
 {
-    QFont f("Serif");
-    f.setStyleHint(QFont::Serif);
+    // Family comes from the DeckList theme role; pixel size/weight unchanged.
+    QFont f = themeManager->deckListFont();
     f.setPixelSize(16);
     f.setWeight(QFont::Bold);
     QFontMetrics fm(f);
@@ -366,6 +366,15 @@ void DeckViewCardContainer::setWidth(qreal _width)
 
 DeckViewScene::DeckViewScene(QObject *parent) : QGraphicsScene(parent), locked(true), deck(0), optimalAspectRatio(1.0)
 {
+    // Zone headers read the DeckList role at paint time and cache their
+    // rendering, so touch every item to invalidate the caches and pick up the
+    // new family on font changes (containers cannot connect this themselves:
+    // QGraphicsItem is not a QObject).
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+        for (auto *item : items()) {
+            item->update();
+        }
+    });
 }
 
 DeckViewScene::~DeckViewScene()
diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
index 90b3bea11..fe63d7a6f 100644
--- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
@@ -2,13 +2,8 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/shortcuts_settings.h"
-#include "../../game/abstract_game.h"
-#include "../../game/game_event_handler.h"
-#include "../../game/game_state.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../interface/deck_loader/deck_file_format.h"
 #include "../../interface/deck_loader/deck_loader.h"
-#include "../../interface/deck_loader/loaded_deck.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
@@ -33,12 +28,12 @@
 #include <QRect>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
-#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
-#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_state.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/interface_settings.h>
@@ -76,6 +71,8 @@ void ToggleButton::setState(bool _state)
 DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
     : QWidget(nullptr), visualDeckStorageWidget(nullptr), parentGame(parent), playerId(_playerId)
 {
+    setObjectName("deckViewContainer");
+
     loadLocalButton = new QPushButton;
     loadRemoteButton = new QPushButton;
     loadFromClipboardButton = new QPushButton;
@@ -85,6 +82,14 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
     forceStartGameButton = new QPushButton;
     sideboardLockButton = new ToggleButton;
 
+    loadLocalButton->setObjectName("loadLocalButton");
+    loadRemoteButton->setObjectName("loadRemoteButton");
+    loadFromClipboardButton->setObjectName("loadFromClipboardButton");
+    readyStartButton->setObjectName("readyStartButton");
+    forceStartGameButton->setObjectName("forceStartGameButton");
+    unloadDeckButton->setObjectName("unloadDeckButton");
+    sideboardLockButton->setObjectName("sideboardLockButton");
+
     connect(loadLocalButton, &QPushButton::clicked, this, &DeckViewContainer::loadLocalDeck);
     connect(loadRemoteButton, &QPushButton::clicked, this, &DeckViewContainer::loadRemoteDeck);
     connect(loadFromClipboardButton, &QPushButton::clicked, this, &DeckViewContainer::loadFromClipboard);
@@ -314,9 +319,7 @@ void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
         return;
     }
 
-    Command_DeckSelect cmd;
-    cmd.set_deck(deckString.toStdString());
-    PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(cmd);
+    PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareDeckSelect(deckString);
     connect(pend, &PendingCommand::finished, this, &DeckViewContainer::deckSelectFinished);
     parentGame->getGame()->getGameEventHandler()->sendGameCommand(pend, playerId);
 
@@ -345,15 +348,7 @@ void DeckViewContainer::resolveAndSendPlaymat()
 
     lastResolvedPlaymat = resolved;
 
-    Command_SetPlaymat playmatCmd;
-    auto *pp = playmatCmd.mutable_playmat_params();
-    pp->set_card_name(resolved.card.name.toStdString());
-    pp->set_card_provider_id(resolved.card.providerId.toStdString());
-    pp->set_margin_pct_l(resolved.params.marginPctL);
-    pp->set_margin_pct_r(resolved.params.marginPctR);
-    pp->set_vertical_offset(resolved.params.verticalOffset);
-    pp->set_zoom(resolved.params.zoom);
-    PendingCommand *playmatPend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(playmatCmd);
+    PendingCommand *playmatPend = parentGame->getGame()->getGameEventHandler()->prepareSetPlaymat(resolved);
     const QString sentName = resolved.card.name;
     connect(playmatPend, &PendingCommand::finished, this, [this, sentName](const Response &r) {
         // Only RespFunctionNotAllowed signals a card art DENY rule. Older servers that predate
@@ -384,9 +379,7 @@ void DeckViewContainer::loadRemoteDeck()
 {
     DlgLoadRemoteDeck dlg(parentGame->getGame()->getClientForPlayer(playerId), this);
     if (dlg.exec()) {
-        Command_DeckSelect cmd;
-        cmd.set_deck_id(dlg.getDeckId());
-        PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(cmd);
+        PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareDeckSelectId(dlg.getDeckId());
         connect(pend, &PendingCommand::finished, this, &DeckViewContainer::deckSelectFinished);
         parentGame->getGame()->getGameEventHandler()->sendGameCommand(pend, playerId);
     }
@@ -446,28 +439,17 @@ void DeckViewContainer::forceStart()
         return;
     }
 
-    Command_ReadyStart cmd;
-    cmd.set_force_start(true);
-    cmd.set_ready(true);
-    parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
+    parentGame->getGame()->getGameEventHandler()->sendForceStart(playerId);
 }
 
 void DeckViewContainer::sideboardLockButtonClicked()
 {
-    Command_SetSideboardLock cmd;
-    cmd.set_locked(sideboardLockButton->getState());
-
-    parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
+    parentGame->getGame()->getGameEventHandler()->sendSetSideboardLock(sideboardLockButton->getState(), playerId);
 }
 
 void DeckViewContainer::sideboardPlanChanged()
 {
-    Command_SetSideboardPlan cmd;
-    const QList<MoveCard_ToZone> &newPlan = deckView->getSideboardPlan();
-    for (const auto &i : newPlan) {
-        cmd.add_move_list()->CopyFrom(i);
-    }
-    parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
+    parentGame->getGame()->getGameEventHandler()->sendSetSideboardPlan(deckView->getSideboardPlan(), playerId);
 }
 
 /**
@@ -479,9 +461,7 @@ void DeckViewContainer::sendReadyStartCommand(bool ready)
         resolveAndSendPlaymat();
     }
 
-    Command_ReadyStart cmd;
-    cmd.set_ready(ready);
-    parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
+    parentGame->getGame()->getGameEventHandler()->sendReadyStart(ready, playerId);
 }
 
 /**
diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
index 90cbed9a1..75ede0ca8 100644
--- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
@@ -14,6 +14,7 @@ class TabGame;
 TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
     : QTabWidget(nullptr), playerId(_playerId), parentGame(parent)
 {
+    setObjectName(QString("tabbedDeckView_%1").arg(_playerId));
     setTabsClosable(true);
     connect(this, &QTabWidget::tabCloseRequested, this, &TabbedDeckViewContainer::closeTab);
 
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp b/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp
new file mode 100644
index 000000000..c812f9c74
--- /dev/null
+++ b/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp
@@ -0,0 +1,13 @@
+#include "dlg_annotation.h"
+
+#include <QKeyEvent>
+
+void AnnotationDialog::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Return && event->modifiers() & Qt::ControlModifier) {
+        event->accept();
+        accept();
+        return;
+    }
+    QInputDialog::keyPressEvent(event);
+}
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_annotation.h b/cockatrice/src/game_graphics/dialogs/dlg_annotation.h
new file mode 100644
index 000000000..686377d3c
--- /dev/null
+++ b/cockatrice/src/game_graphics/dialogs/dlg_annotation.h
@@ -0,0 +1,22 @@
+/**
+ * @file dlg_annotation.h
+ * @ingroup GameDialogs
+ */
+
+#ifndef COCKATRICE_DLG_ANNOTATION_H
+#define COCKATRICE_DLG_ANNOTATION_H
+
+#include <QInputDialog>
+
+class AnnotationDialog : public QInputDialog
+{
+    Q_OBJECT
+    void keyPressEvent(QKeyEvent *e) override;
+
+public:
+    explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent)
+    {
+    }
+};
+
+#endif // COCKATRICE_DLG_ANNOTATION_H
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
index a03a1046b..323e61829 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
@@ -11,6 +11,7 @@
 #include <QList>
 #include <QString>
 #include <QStringList>
+#include <libcockatrice/game/player/token_info.h>
 #include <qtmetamacros.h>
 
 class QLabel;
@@ -25,17 +26,6 @@ class CardInfoPictureWidget;
 class QModelIndex;
 class QWidget;
 
-struct TokenInfo
-{
-    QString name;
-    QString color;
-    QString pt;
-    QString annotation;
-    bool destroy = true;
-    bool faceDown = false;
-    QString providerId;
-};
-
 class DlgCreateToken : public QDialog
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
index b9080bcc1..da2e70b0a 100644
--- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
@@ -11,6 +11,7 @@
 #include <QList>
 #include <QString>
 #include <QStringList>
+#include <libcockatrice/game/player/move_top_cards_until_options.h>
 #include <qtmetamacros.h>
 
 class FilterString;
@@ -21,13 +22,6 @@ class QLabel;
 class QSpinBox;
 class QWidget;
 
-struct MoveTopCardsUntilOptions
-{
-    QStringList exprs = {};
-    int numberOfHits = 1;
-    bool autoPlay = false;
-};
-
 class DlgMoveTopCardsUntil : public QDialog
 {
     Q_OBJECT
diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp
index cc3f9f1d3..128899a13 100644
--- a/cockatrice/src/game_graphics/game_scene.cpp
+++ b/cockatrice/src/game_graphics/game_scene.cpp
@@ -1,18 +1,11 @@
 #include "game_scene.h"
 
 #include "../client/settings/cache_settings.h"
-#include "../game/abstract_game.h"
-#include "../game/arrow_registry.h"
-#include "../game/board/arrow_data.h"
-#include "../game/player/player_actions.h"
-#include "../game/player/player_event_handler.h"
-#include "../game/player/player_info.h"
-#include "../game/player/player_logic.h"
-#include "../game/zones/card_zone_logic.h"
-#include "../game/zones/view_zone_logic.h"
+#include "../interface/theme_manager.h"
 #include "animated_item.h"
 #include "board/abstract_card_item.h"
 #include "board/arrow_item.h"
+#include "board/arrow_registry.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
 #include "player/menu/player_menu.h"
@@ -40,6 +33,16 @@
 #include <QSharedPointer>
 #include <QtMath>
 #include <algorithm>
+#include <functional>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/arrow_data.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_event_handler.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <numeric>
@@ -63,6 +66,14 @@ GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent)
     addItem(phasesToolbar);
     connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::minPlayersForMultiColumnLayoutChanged, this,
             &GameScene::rearrange);
+    // CardText items (P/T boxes, counters, player names) read the role at
+    // paint time and cache their rendering, so touch every item to invalidate
+    // the caches and pick up the new family on font changes.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+        for (auto *item : items()) {
+            item->update();
+        }
+    });
 
     rearrange();
 }
@@ -112,6 +123,15 @@ void GameScene::retranslateUi()
     }
 }
 
+QList<CardState *> GameScene::selectedCardStates() const
+{
+    QList<CardState *> selectedStates;
+    for (auto *card : selectedCards()) {
+        selectedStates.append(card->getState());
+    }
+    return selectedStates;
+}
+
 QList<CardItem *> GameScene::selectedCards() const
 {
     QList<CardItem *> selectedCards;
@@ -124,6 +144,67 @@ QList<CardItem *> GameScene::selectedCards() const
     return selectedCards;
 }
 
+/**
+ * @brief Selects every card of @p zone for which @p filter holds.
+ * @param filter A predicate to filter which cards are selected.
+ */
+static void selectCardsInZone(
+    const CardZoneLogic *zone,
+    std::function<bool(const CardItem *)> filter = [](const CardItem *) { return true; })
+{
+    if (!zone) {
+        return;
+    }
+
+    for (auto *cardState : zone->getCards()) {
+        auto *cardItem = cardState == nullptr ? nullptr : qobject_cast<CardItem *>(cardState->parent());
+        if (cardItem && filter(cardItem)) {
+            cardItem->setSelected(true);
+        }
+    }
+}
+
+void GameScene::selectAllInZone(const CardItem *card)
+{
+    if (!card) {
+        return;
+    }
+
+    selectCardsInZone(card->getZone());
+}
+
+void GameScene::selectSameRow(const CardItem *card)
+{
+    if (!card) {
+        return;
+    }
+
+    auto isSameRow = [card](const CardItem *cardItem) {
+        return qAbs(card->scenePos().y() - cardItem->scenePos().y()) < 50;
+    };
+    selectCardsInZone(card->getZone(), isSameRow);
+}
+
+void GameScene::selectSameColumn(const CardItem *card)
+{
+    if (!card) {
+        return;
+    }
+
+    auto isSameColumn = [card](const CardItem *cardItem) { return cardItem->x() == card->x(); };
+    selectCardsInZone(card->getZone(), isSameColumn);
+}
+
+CardItem *GameScene::getActiveCard() const
+{
+    return activeCard;
+}
+
+void GameScene::setActiveCard(CardItem *card)
+{
+    activeCard = card;
+}
+
 void GameScene::onCardSelectionChanged(AbstractCardItem *abstractCard, bool selected)
 {
     CardItem *card = qobject_cast<CardItem *>(abstractCard);
@@ -134,12 +215,12 @@ void GameScene::onCardSelectionChanged(AbstractCardItem *abstractCard, bool sele
     auto *owner = card->getOwner();
 
     if (selected) {
-        owner->requestCardMenuUpdate(card);
+        owner->requestCardMenuUpdate(card->getState());
         return;
     }
 
     if (selectedItems().isEmpty()) {
-        owner->getGame()->setActiveCard(nullptr);
+        setActiveCard(nullptr);
         owner->requestCardMenuUpdate(nullptr);
     }
 }
@@ -158,9 +239,9 @@ void GameScene::onCardRightClicked(AbstractCardItem *abstractCard, QPoint screen
         return;
     }
 
-    card->getOwner()->getGame()->setActiveCard(card);
+    setActiveCard(card);
 
-    if (auto *menu = view->getPlayerMenu()->updateCardMenu(card)) {
+    if (auto *menu = view->getPlayerMenu()->updateCardMenu(card->getState())) {
         menu->popup(screenPos);
     }
 }
@@ -173,7 +254,7 @@ void GameScene::playSelected(AbstractCardItem *card)
     if (!card->getOwner()) {
         return;
     }
-    card->getOwner()->getPlayerActions()->actPlay(selectedCards());
+    card->getOwner()->getPlayerActions()->actPlay(selectedCardStates());
 }
 
 void GameScene::playSelectedFaceDown(AbstractCardItem *card)
@@ -184,7 +265,7 @@ void GameScene::playSelectedFaceDown(AbstractCardItem *card)
     if (!card->getOwner()) {
         return;
     }
-    card->getOwner()->getPlayerActions()->actPlayFacedown(selectedCards());
+    card->getOwner()->getPlayerActions()->actPlayFacedown(selectedCardStates());
 }
 
 void GameScene::hideSelected(AbstractCardItem *card)
@@ -195,7 +276,7 @@ void GameScene::hideSelected(AbstractCardItem *card)
     if (!card->getOwner()) {
         return;
     }
-    card->getOwner()->getPlayerActions()->actHide(selectedCards());
+    card->getOwner()->getPlayerActions()->actHide(selectedCardStates());
 }
 
 /**
@@ -230,6 +311,8 @@ void GameScene::addPlayer(PlayerLogic *player)
             [this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayerLocally(id); });
 
     connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged);
+    connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardViewRefreshRequested, this,
+            &GameScene::onCardViewRefreshRequested);
 
     rearrange();
 }
@@ -359,6 +442,37 @@ QList<PlayerLogic *> GameScene::collectActivePlayers(int &firstPlayerIndex) cons
             }
         }
     }
+
+    // Lay out the table in seat order rather than id order. Players missing
+    // from the tracked order keep id order at the end.
+    QList<int> seatOrder;
+    for (auto *pgItem : playerViews.values()) {
+        if (PlayerLogic *p = pgItem->getLogic()) {
+            seatOrder = p->getGame()->getGameState()->getSeatOrder();
+            break;
+        }
+    }
+    if (!seatOrder.isEmpty()) {
+        std::sort(activePlayers.begin(), activePlayers.end(), [&](PlayerLogic *a, PlayerLogic *b) {
+            int indexA = seatOrder.indexOf(a->getPlayerInfo()->getId());
+            int indexB = seatOrder.indexOf(b->getPlayerInfo()->getId());
+            if (indexA == -1) {
+                indexA = seatOrder.size() + a->getPlayerInfo()->getId();
+            }
+            if (indexB == -1) {
+                indexB = seatOrder.size() + b->getPlayerInfo()->getId();
+            }
+            return indexA < indexB;
+        });
+        // Recompute the local-player index after sorting.
+        firstPlayerIndex = 0;
+        for (int i = 0; i < activePlayers.size(); ++i) {
+            if (activePlayers[i]->getPlayerInfo()->getLocal()) {
+                firstPlayerIndex = i;
+                break;
+            }
+        }
+    }
     return activePlayers;
 }
 
@@ -533,7 +647,11 @@ void GameScene::addArrow(QSharedPointer<ArrowData> data)
         return;
     }
 
-    CardItem *startCard = startZone->getCard(data->startCardId);
+    CardState *startCardState = startZone->getCard(data->startCardId);
+    if (!startCardState) {
+        return;
+    }
+    CardItem *startCard = qobject_cast<CardItem *>(startCardState->parent());
     if (!startCard) {
         return;
     }
@@ -544,7 +662,8 @@ void GameScene::addArrow(QSharedPointer<ArrowData> data)
     } else {
         auto *zone = targetView->getLogic()->getZones().value(data->targetZone);
         if (zone) {
-            targetItem = zone->getCard(data->targetCardId);
+            CardState *targetCardState = zone->getCard(data->targetCardId);
+            targetItem = targetCardState == nullptr ? nullptr : qobject_cast<CardItem *>(targetCardState->parent());
         }
     }
     if (!targetItem) {
@@ -572,11 +691,15 @@ void GameScene::requestArrowDeletion(int playerId, int arrowId)
     }
 }
 
-void GameScene::onCardZoneChanged(CardItem *card, bool sameZone)
+void GameScene::onCardZoneChanged(CardState *card, bool sameZone)
 {
+    auto *item = qobject_cast<CardItem *>(card->parent());
+    if (!item) {
+        return;
+    }
     QList<ArrowItem *> toDelete;
     for (auto *arrow : arrowRegistry.all()) {
-        if (arrow->getStartItem() == card || arrow->getTargetItem() == card) {
+        if (arrow->getStartItem() == item || arrow->getTargetItem() == item) {
             if (sameZone) {
                 arrow->updatePath();
             } else {
@@ -589,6 +712,25 @@ void GameScene::onCardZoneChanged(CardItem *card, bool sameZone)
     }
 }
 
+void GameScene::onCardViewRefreshRequested(CardState *card, bool zoneChanged, PlayerLogic *newOwner)
+{
+    auto *item = qobject_cast<CardItem *>(card->parent());
+    if (!item) {
+        return;
+    }
+    if (zoneChanged) {
+        item->deleteCardInfoPopup();
+    }
+    item->deleteDragItem();
+    if (zoneChanged) {
+        item->setBeingPointedAt(false);
+        item->setHovered(false);
+    }
+    if (newOwner) {
+        item->setOwner(newOwner);
+    }
+}
+
 void GameScene::clearArrowsForPlayer(int playerId)
 {
     for (int arrowId : arrowRegistry.idsForPlayer(playerId)) {
diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game_graphics/game_scene.h
index c7cae1e76..0d4db70a8 100644
--- a/cockatrice/src/game_graphics/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@@ -1,7 +1,9 @@
 #ifndef GAMESCENE_H
 #define GAMESCENE_H
 
-#include "../game/arrow_registry.h"
+#include "animated_item.h"
+#include "board/arrow_item.h"
+#include "board/arrow_registry.h"
 
 #include <QGraphicsScene>
 #include <QHash>
@@ -16,6 +18,8 @@
 #include <QString>
 #include <QTransform>
 #include <QtGlobal>
+#include <libcockatrice/game/board/arrow_data.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <qtmetamacros.h>
 
 // IWYU pragma: keep
@@ -39,6 +43,7 @@ class ZoneViewWidget;
 class CardZone;
 class AbstractCardItem;
 class CardItem;
+class CardState;
 class ServerInfo_Card;
 class PhasesToolbar;
 class QBasicTimer;
@@ -69,6 +74,7 @@ private:
     QList<ZoneViewWidget *> zoneViews;                  ///< Active zone view widgets
     QSize viewSize;                                     ///< Current view size
     QPointer<CardItem> hoveredCard;                     ///< Currently hovered card
+    QPointer<CardItem> activeCard;                      ///< Card the currently open context menu targets
     QBasicTimer *animationTimer;                        ///< Timer for scene animations
     QHash<QObject *, IAnimatedItem *> animatedItems;    ///< Items currently animating
     QHash<QObject *, QMetaObject::Connection>
@@ -107,6 +113,22 @@ public:
 
     /** @brief Gets all selected CardItems. */
     QList<CardItem *> selectedCards() const;
+    QList<CardState *> selectedCardStates() const;
+
+    /** @brief Selects every card sharing the zone of @p card. */
+    void selectAllInZone(const CardItem *card);
+
+    /** @brief Selects the cards laid out in the same visual row as @p card. */
+    void selectSameRow(const CardItem *card);
+
+    /** @brief Selects the cards laid out in the same visual column as @p card. */
+    void selectSameColumn(const CardItem *card);
+
+    /** @brief Card the currently open context menu targets, or null. */
+    CardItem *getActiveCard() const;
+
+    /** @brief Sets the card the currently open context menu targets. */
+    void setActiveCard(CardItem *card);
 
     /**
      * @brief Adds a player to the scene and stores their graphics item.
@@ -261,7 +283,15 @@ public slots:
     /// Queues up arrow deletion but doesn't directly modify the scene
     void requestArrowDeletion(int playerId, int arrowId);
 
-    void onCardZoneChanged(CardItem *card, bool sameZone);
+    void onCardZoneChanged(CardState *card, bool sameZone);
+    /**
+     * @brief Refreshes the view of a card that the server just moved.
+     *
+     * @param card The card that moved.
+     * @param zoneChanged Whether the card crossed a zone boundary.
+     * @param newOwner The player the card now belongs to, or nullptr to leave the owner alone.
+     */
+    void onCardViewRefreshRequested(CardState *card, bool zoneChanged, PlayerLogic *newOwner);
 
 protected:
     /** @brief Handles hover updates. */
diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp
index cb59b3d7d..7a5aa073a 100644
--- a/cockatrice/src/game_graphics/game_view.cpp
+++ b/cockatrice/src/game_graphics/game_view.cpp
@@ -2,12 +2,14 @@
 
 #include "../client/settings/cache_settings.h"
 #include "../client/settings/shortcuts_settings.h"
+#include "../interface/theme_manager.h"
 #include "game_scene.h"
 
 #include <QAction>
 #include <QBrush>
 #include <QColor>
 #include <QEvent>
+#include <QFont>
 #include <QGraphicsScene>
 #include <QGridLayout>
 #include <QLabel>
@@ -24,6 +26,21 @@
 #include <libcockatrice/utility/qt_utils.h>
 #include <qnamespace.h>
 
+namespace
+{
+QFont deckOverlayFont(int pixelSize, bool bold)
+{
+    // The drag/total counters and the tally columns are in-game overlays, not
+    // deck list text: keep the monospace family the stylesheets used to set so
+    // digit widths stay stable as counts tick and `white-space: pre` lines up.
+    QFont font(QStringLiteral("monospace"));
+    font.setStyleHint(QFont::Monospace);
+    font.setPixelSize(pixelSize);
+    font.setBold(bold);
+    return font;
+}
+} // namespace
+
 // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings.
 // This subclass disables that behavior so dragCountLabel can appear above it.
 class SelectionRubberBand : public QRubberBand
@@ -48,6 +65,7 @@ protected:
 
 GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0)
 {
+    setObjectName("gameView");
     setBackgroundBrush(QBrush(QColor(0, 0, 0)));
     setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing);
     setViewportUpdateMode(BoundingRectViewportUpdate);
@@ -75,15 +93,14 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
     rubberBand = new SelectionRubberBand(QRubberBand::Rectangle, this);
 
     const QString baseProperties = "color: white; "
-                                   "font-family: monospace; "
                                    "background-color: rgba(0, 0, 0, 160); "
                                    "border-radius: 3px; "
                                    "padding: 1px 2px; "
                                    "white-space: pre;";
 
-    const QString dragCountLabelStyle = baseProperties + "font-size: 14px; font-weight: bold;";
-    const QString totalCountLabelStyle = baseProperties + "font-size: 16px; font-weight: bold;";
-    const QString subtypeTallyLabelStyle = baseProperties + "font-size: 12px;";
+    const QString dragCountLabelStyle = baseProperties;
+    const QString totalCountLabelStyle = baseProperties;
+    const QString subtypeTallyLabelStyle = baseProperties;
 
     dragCountLabel = new QLabel(this);
     dragCountLabel->setStyleSheet(dragCountLabelStyle);
@@ -100,6 +117,27 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
     tallyLayout->setContentsMargins(2, 2, 2, 2);
     tallyLayout->setSpacing(2);
     tallyContainer->hide();
+
+    applyDeckOverlayFonts();
+}
+
+void GameView::applyDeckOverlayFonts()
+{
+    dragCountLabel->setFont(deckOverlayFont(14, true));
+    totalCountLabel->setFont(deckOverlayFont(16, true));
+    tallyContainer->setFont(deckOverlayFont(12, false));
+    for (int i = 0; i < tallyLayout->count(); ++i) {
+        if (auto *label = qobject_cast<QLabel *>(tallyLayout->itemAt(i)->widget())) {
+            // Count column (odd positions) keeps the bold emphasis.
+            const bool count = i % 2 == 1;
+            label->setFont(deckOverlayFont(count ? 14 : 12, count));
+        }
+    }
+
+    // The container keeps the size computed from the previous fonts, so force
+    // rebuildTallyLabels() to re-measure it instead of reusing cachedTallyRows.
+    cachedTallyRows.clear();
+    updateTotalSelectionCount();
 }
 
 void GameView::resizeEvent(QResizeEvent *event)
@@ -219,9 +257,8 @@ QSize GameView::rebuildTallyLabels(const QList<TallyRow> &entries)
 {
     clearTallyLabels();
 
-    const QString nameStyle = QStringLiteral("color: white; font-size: 12px; background: transparent;");
-    const QString countStyle =
-        QStringLiteral("color: white; font-size: 14px; font-weight: bold; background: transparent;");
+    const QString nameStyle = QStringLiteral("color: white; background: transparent;");
+    const QString countStyle = QStringLiteral("color: white; background: transparent;");
 
     int totalHeight = 0;
     int maxNameWidth = 0;
@@ -231,11 +268,13 @@ QSize GameView::rebuildTallyLabels(const QList<TallyRow> &entries)
     for (const TallyRow &entry : entries) {
         auto *nameLabel = new QLabel(entry.name, tallyContainer);
         nameLabel->setStyleSheet(nameStyle);
+        nameLabel->setFont(deckOverlayFont(12, false));
         nameLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
         tallyLayout->addWidget(nameLabel, row, 0);
 
         auto *countLabel = new QLabel(entry.value, tallyContainer);
         countLabel->setStyleSheet(countStyle);
+        countLabel->setFont(deckOverlayFont(14, true));
         countLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
         tallyLayout->addWidget(countLabel, row, 1);
 
diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game_graphics/game_view.h
index e57267734..99a73a0a8 100644
--- a/cockatrice/src/game_graphics/game_view.h
+++ b/cockatrice/src/game_graphics/game_view.h
@@ -50,6 +50,7 @@ private slots:
     void refreshShortcuts();
     void updateTotalSelectionCount(const QSize &viewSize = QSize());
     void setFocusDisabled(bool disabled);
+    void applyDeckOverlayFonts();
 public slots:
     void updateSceneRect(const QRectF &rect);
 
diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp
index 9320c1295..b9ea2d554 100644
--- a/cockatrice/src/game_graphics/hand_counter.cpp
+++ b/cockatrice/src/game_graphics/hand_counter.cpp
@@ -1,7 +1,5 @@
 #include "hand_counter.h"
 
-#include "../game/board/card_list.h"
-#include "../game/zones/card_zone_logic.h"
 #include "../interface/pixel_map_generator.h"
 
 #include <QGraphicsSceneMouseEvent>
@@ -14,6 +12,8 @@
 #include <QString>
 #include <QStringLiteral>
 #include <QTransform>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <qnamespace.h>
 
 class QGraphicsItem;
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
index 4a9750fca..d526766af 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -3,17 +3,9 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
-#include "../../client/translation.h"
-#include "../../game/abstract_game.h"
-#include "../../game/board/card_list.h"
-#include "../../game/game_state.h"
-#include "../../game/phase.h"
-#include "../../game/player/player_event_handler.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/player/player_manager.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../../interface/card_localization.h"
+#include "../../interface/theme_icon.h"
+#include "../../interface/theme_manager.h"
 #include "../../interface/widgets/server/chat_view/chat_view.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
@@ -22,8 +14,22 @@
 #include <QColor>
 #include <QDebug>
 #include <QList>
+#include <QPalette>
+#include <QPixmap>
 #include <QSharedPointer>
 #include <QStringList>
+#include <QTextDocument>
+#include <QUrl>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/phase.h>
+#include <libcockatrice/game/player/player_event_handler.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/translation.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
 #include <libcockatrice/settings/chat_settings.h>
@@ -120,6 +126,7 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
 void MessageLogWidget::containerProcessingDone()
 {
     currentContext = MessageContext_None;
+    contextJudgeName.clear();
     messageSuffix = messagePrefix = QString();
 }
 
@@ -283,7 +290,7 @@ void MessageLogWidget::logDestroyCard(PlayerLogic *player, QString cardName)
 }
 
 void MessageLogWidget::logMoveCard(PlayerLogic *player,
-                                   CardItem *card,
+                                   CardState *card,
                                    CardZoneLogic *startZone,
                                    int oldX,
                                    CardZoneLogic *targetZone,
@@ -605,6 +612,20 @@ void MessageLogWidget::logReverseTurn(PlayerLogic *player, bool reversed)
                                 .arg(reversed ? tr("reversed") : tr("normal")));
 }
 
+void MessageLogWidget::logTurnOrderChanged(QStringList playerNames, bool randomized)
+{
+    QStringList sanitizedNames;
+    for (const QString &name : playerNames) {
+        sanitizedNames.append(sanitizeHtml(name));
+    }
+    const QString order = sanitizedNames.join(" -> ");
+    if (randomized) {
+        appendHtmlServerMessage(tr("Randomized turn order: %1.").arg(order));
+    } else {
+        appendHtmlServerMessage(tr("New turn order set: %1.").arg(order));
+    }
+}
+
 void MessageLogWidget::logRollDie(PlayerLogic *player, int sides, const QList<uint> &rolls)
 {
     if (rolls.length() == 1) {
@@ -662,7 +683,7 @@ void MessageLogWidget::logSetActivePlayer(PlayerLogic *player)
                QString(tr("%1's turn.")).arg(player->getPlayerInfo()->getName()) + "</b></font><br>");
 }
 
-void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation)
+void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardState *card, QString newAnnotation)
 {
     appendHtmlServerMessage(
         QString(tr("%1 sets annotation of %2 to %3."))
@@ -706,7 +727,7 @@ void MessageLogWidget::logSetCounter(PlayerLogic *player, QString counterName, i
                                 .arg(value - oldValue));
 }
 
-void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap)
+void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardState *card, bool doesntUntap)
 {
     QString str;
     if (doesntUntap) {
@@ -717,7 +738,7 @@ void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bo
     appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName())));
 }
 
-void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString newPT)
+void MessageLogWidget::logSetPT(PlayerLogic *player, CardState *card, QString newPT)
 {
     if (currentContext == MessageContext_MoveCard) {
         return;
@@ -755,7 +776,7 @@ void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked)
     }
 }
 
-void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool tapped)
+void MessageLogWidget::logSetTapped(PlayerLogic *player, CardState *card, bool tapped)
 {
     if (currentContext == MessageContext_MoveCard) {
         return;
@@ -841,8 +862,27 @@ void MessageLogWidget::logUndoDrawFailed(PlayerLogic *player)
 
 void MessageLogWidget::setContextJudgeName(QString name)
 {
-    messagePrefix = QString("<span style=\"color:black\">");
-    messageSuffix = QString("</span> [<img height=12 src=\"theme:icons/scales\"> %1]").arg(sanitizeHtml(name));
+    contextJudgeName = std::move(name);
+    refreshJudgeSuffix();
+}
+
+void MessageLogWidget::refreshJudgeSuffix()
+{
+    const QPixmap pixmap = loadThemedIcon(QStringLiteral("icons/scales")).pixmap(QSize(24, 24));
+    if (!pixmap.isNull()) {
+        // Rich text cannot resolve `currentColor`; register a palette-rendered
+        // image so already-appended judge tags repaint on a theme switch.
+        document()->addResource(QTextDocument::ImageResource, QUrl(QStringLiteral("cockatrice:scales")), pixmap);
+        document()->markContentsDirty(0, document()->characterCount());
+    }
+
+    if (contextJudgeName.isEmpty()) {
+        return;
+    }
+
+    messagePrefix = QStringLiteral("<span style=\"color:%1\">").arg(palette().color(QPalette::WindowText).name());
+    messageSuffix =
+        QStringLiteral("</span> [<img height=12 src=\"cockatrice:scales\"> %1]").arg(sanitizeHtml(contextJudgeName));
 }
 
 void MessageLogWidget::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor)
@@ -891,4 +931,6 @@ void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEve
 MessageLogWidget::MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent)
     : ChatView(_tabSupervisor, _game, true, parent), currentContext(MessageContext_None)
 {
+    connect(themeManager, &ThemeManager::paletteChanged, this, &MessageLogWidget::refreshJudgeSuffix);
+    connect(themeManager, &ThemeManager::themeChanged, this, &MessageLogWidget::refreshJudgeSuffix);
 }
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
index 6800ba8ed..3ec5ff93c 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.h
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -14,6 +14,7 @@
 #include <qtmetamacros.h>
 #include <sys/types.h>
 
+class CardState;
 class AbstractGame;
 class CardItem;
 class GameEventContext;
@@ -38,8 +39,10 @@ private:
 
     MessageContext currentContext;
     QString messagePrefix, messageSuffix;
+    QString contextJudgeName;
 
     static QPair<QString, QString> getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange);
+    void refreshJudgeSuffix();
 
 public:
     void connectToPlayerEventHandler(PlayerEventHandler *player);
@@ -76,7 +79,7 @@ public slots:
     void logLeaveSpectator(QString name, QString reason);
     void logNotReadyStart(PlayerLogic *player);
     void logMoveCard(PlayerLogic *player,
-                     CardItem *card,
+                     CardState *card,
                      CardZoneLogic *startZone,
                      int oldX,
                      CardZoneLogic *targetZone,
@@ -93,17 +96,18 @@ public slots:
                         int amount,
                         bool isLentToAnotherPlayer);
     void logReverseTurn(PlayerLogic *player, bool reversed);
+    void logTurnOrderChanged(QStringList playerNames, bool randomized);
     void logRollDie(PlayerLogic *player, int sides, const QList<uint> &rolls);
     void logSay(PlayerLogic *player, QString message);
     void logSetActivePhase(int phase);
     void logSetActivePlayer(PlayerLogic *player);
-    void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation);
+    void logSetAnnotation(PlayerLogic *player, CardState *card, QString newAnnotation);
     void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue);
     void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue);
-    void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap);
-    void logSetPT(PlayerLogic *player, CardItem *card, QString newPT);
+    void logSetDoesntUntap(PlayerLogic *player, CardState *card, bool doesntUntap);
+    void logSetPT(PlayerLogic *player, CardState *card, QString newPT);
     void logSetSideboardLock(PlayerLogic *player, bool locked);
-    void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped);
+    void logSetTapped(PlayerLogic *player, CardState *card, bool tapped);
     void logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end);
     void logSpectatorSay(const ServerInfo_User &spectator, QString message);
     void logUnattachCard(PlayerLogic *player, QString cardName);
diff --git a/cockatrice/src/game_graphics/phases_toolbar.cpp b/cockatrice/src/game_graphics/phases_toolbar.cpp
index d0a3f74fd..bc05e8901 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.cpp
+++ b/cockatrice/src/game_graphics/phases_toolbar.cpp
@@ -14,11 +14,6 @@
 #include <QTransform>
 #include <QtGlobal>
 #include <google/protobuf/stubs/port.h>
-#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/utility/zone_names.h>
 #include <qnamespace.h>
 #include <qnumeric.h>
 
@@ -120,9 +115,9 @@ PhasesToolbar::PhasesToolbar(QGraphicsItem *parent)
     : QGraphicsItem(parent), width(100), height(100), ySpacing(1), symbolSize(8)
 {
     auto *aUntapAll = new QAction(this);
-    connect(aUntapAll, &QAction::triggered, this, &PhasesToolbar::actUntapAll);
+    connect(aUntapAll, &QAction::triggered, this, &PhasesToolbar::untapAllRequested);
     auto *aDrawCard = new QAction(this);
-    connect(aDrawCard, &QAction::triggered, this, &PhasesToolbar::actDrawCard);
+    connect(aDrawCard, &QAction::triggered, this, &PhasesToolbar::drawCardRequested);
 
     PhaseButton *untapButton = new PhaseButton("untap", this, aUntapAll);
     PhaseButton *upkeepButton = new PhaseButton("upkeep", this);
@@ -144,7 +139,7 @@ PhasesToolbar::PhasesToolbar(QGraphicsItem *parent)
     }
 
     nextTurnButton = new PhaseButton("nextturn", this, nullptr, false);
-    connect(nextTurnButton, &PhaseButton::clicked, this, &PhasesToolbar::actNextTurn);
+    connect(nextTurnButton, &PhaseButton::clicked, this, &PhasesToolbar::nextTurnRequested);
 
     rearrangeButtons();
 
@@ -265,31 +260,5 @@ void PhasesToolbar::phaseButtonClicked()
         button->triggerDoubleClickAction();
     }
 
-    Command_SetActivePhase cmd;
-    cmd.set_phase(static_cast<google::protobuf::uint32>(buttonList.indexOf(button)));
-
-    emit sendGameCommand(cmd, -1);
-}
-
-void PhasesToolbar::actNextTurn()
-{
-    emit sendGameCommand(Command_NextTurn(), -1);
-}
-
-void PhasesToolbar::actUntapAll()
-{
-    Command_SetCardAttr cmd;
-    cmd.set_zone(ZoneNames::TABLE);
-    cmd.set_attribute(AttrTapped);
-    cmd.set_attr_value("0");
-
-    emit sendGameCommand(cmd, -1);
-}
-
-void PhasesToolbar::actDrawCard()
-{
-    Command_DrawCards cmd;
-    cmd.set_number(1);
-
-    emit sendGameCommand(cmd, -1);
+    emit setActivePhaseRequested(buttonList.indexOf(button));
 }
diff --git a/cockatrice/src/game_graphics/phases_toolbar.h b/cockatrice/src/game_graphics/phases_toolbar.h
index 376775284..0565f1351 100644
--- a/cockatrice/src/game_graphics/phases_toolbar.h
+++ b/cockatrice/src/game_graphics/phases_toolbar.h
@@ -17,14 +17,6 @@
 class QAction;
 class QTimer;
 
-namespace google
-{
-namespace protobuf
-{
-class Message;
-}
-} // namespace google
-
 class PhaseButton : public QObject, public QGraphicsItem
 {
     Q_OBJECT
@@ -95,11 +87,16 @@ public slots:
     void triggerPhaseAction(int phase);
 private slots:
     void phaseButtonClicked();
-    void actNextTurn();
-    void actUntapAll();
-    void actDrawCard();
 signals:
-    void sendGameCommand(const ::google::protobuf::Message &command, int playerId);
+    /** @name Intent signals
+     *  The view reports what the user asked for; GameEventHandler builds the commands.
+     *  @{
+     */
+    void setActivePhaseRequested(int phase);
+    void nextTurnRequested();
+    void untapAllRequested();
+    void drawCardRequested();
+    /** @} */
 
 protected:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) override;
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
index 137ec2ed1..9f00c0cba 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
@@ -3,16 +3,8 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/card_counter_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/card_zone_logic.h"
 #include "../../board/card_item.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../../game_scene.h"
-#include "../card_menu_action_type.h"
 #include "../player_graphics_item.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_querier.h"
@@ -35,6 +27,14 @@
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/player/card_menu_action_type.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <qnamespace.h>
 #include <utility>
@@ -67,7 +67,7 @@ static QAction *makeAction(QObject *parent, Slot &&slot, bool checkable = false,
     return a;
 }
 
-CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _shortcutsActive)
+CardMenu::CardMenu(PlayerGraphicsItem *_player, CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)
 {
     const QList<PlayerLogic *> &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
@@ -86,7 +86,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
     auto *gameScene = player->getGameScene();
 
     // Single selection resolver used by all lambdas — called at trigger time
-    auto sel = [gameScene]() { return gameScene->selectedCards(); };
+    auto sel = [gameScene]() { return gameScene->selectedCardStates(); };
 
     // Unified dispatcher for card menu actions
     auto invoke = [actions, sel](CardMenuActionType type) {
@@ -108,18 +108,18 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _sho
     aHide = makeAction(this, [actions, sel]() { actions->actHide(sel()); });
     aReduceLifeByPower = makeAction(this, [actions, sel]() { actions->actReduceLifeByPower(sel()); });
 
-    // Actions that use activeCard, not selection — direct connection
+    // Actions bound to the card this menu was opened for, not to the current selection
     aAttach = new QAction(this);
     aDrawArrow = new QAction(this);
     aSelectAll = new QAction(this);
     aSelectRow = new QAction(this);
     aSelectColumn = new QAction(this);
 
-    connect(aAttach, &QAction::triggered, actions, &PlayerActions::actAttach);
-    connect(aDrawArrow, &QAction::triggered, actions, &PlayerActions::actDrawArrow);
-    connect(aSelectAll, &QAction::triggered, actions, &PlayerActions::actSelectAll);
-    connect(aSelectRow, &QAction::triggered, actions, &PlayerActions::actSelectRow);
-    connect(aSelectColumn, &QAction::triggered, actions, &PlayerActions::actSelectColumn);
+    connect(aAttach, &QAction::triggered, this, &CardMenu::attachCard);
+    connect(aDrawArrow, &QAction::triggered, this, &CardMenu::drawArrow);
+    connect(aSelectAll, &QAction::triggered, this, [this, gameScene]() { gameScene->selectAllInZone(card); });
+    connect(aSelectRow, &QAction::triggered, this, [this, gameScene]() { gameScene->selectSameRow(card); });
+    connect(aSelectColumn, &QAction::triggered, this, [this, gameScene]() { gameScene->selectSameColumn(card); });
 
     aRevealToAll = new QAction(this);
 
@@ -337,7 +337,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
     initContextualPlayersMenu(revealMenu, aRevealToAll);
 
     connect(revealMenu, &QMenu::triggered, this, [this](QAction *action) {
-        player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCards(), action);
+        player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCardStates(), action);
     });
 
     addSeparator();
@@ -441,6 +441,7 @@ void CardMenu::addRelatedCardActions()
     if (relatedCards.isEmpty()) {
         return;
     }
+    auto *playerActions = player->getLogic()->getPlayerActions();
 
     addSeparator();
     int index = 0;
@@ -484,9 +485,10 @@ void CardMenu::addRelatedCardActions()
         }
 
         auto *createRelated = new QAction(text, this);
-        createRelated->setData(QVariant(index++));
-        connect(createRelated, &QAction::triggered, player->getLogic()->getPlayerActions(),
-                &PlayerActions::actCreateRelatedCard);
+        const int relatedIndex = index++;
+        connect(createRelated, &QAction::triggered, this, [this, playerActions, relatedIndex] {
+            playerActions->actCreateRelatedCard(card->getState(), relatedIndex);
+        });
         addAction(createRelated);
     }
 
@@ -495,12 +497,26 @@ void CardMenu::addRelatedCardActions()
             createRelatedCards->setShortcuts(
                 SettingsCache::instance().shortcuts().getShortcut("Player/aCreateRelatedTokens"));
         }
-        connect(createRelatedCards, &QAction::triggered, player->getLogic()->getPlayerActions(),
-                &PlayerActions::actCreateAllRelatedCards);
+        connect(createRelatedCards, &QAction::triggered, this,
+                [this, playerActions] { playerActions->actCreateAllRelatedCards(card->getState()); });
         addAction(createRelatedCards);
     }
 }
 
+void CardMenu::attachCard()
+{
+    if (card) {
+        card->drawAttachArrow();
+    }
+}
+
+void CardMenu::drawArrow()
+{
+    if (card) {
+        card->drawArrow(Qt::red);
+    }
+}
+
 void CardMenu::retranslateUi()
 {
     aSelectAll->setText(tr("&Select All"));
diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h
index 337d77b3e..2c80483b1 100644
--- a/cockatrice/src/game_graphics/player/menu/card_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.h
@@ -27,7 +27,7 @@ signals:
     void cardInfoRequested(const CardRef &cardRef);
 
 public:
-    explicit CardMenu(PlayerGraphicsItem *player, const CardItem *card, bool shortcutsActive);
+    explicit CardMenu(PlayerGraphicsItem *player, CardItem *card, bool shortcutsActive);
     void removePlayer(PlayerLogic *playerToRemove);
     void createTableMenu(bool canModifyCard);
     void createStackMenu(bool canModifyCard);
@@ -53,11 +53,13 @@ public:
 
 private:
     PlayerGraphicsItem *player;
-    const CardItem *card;
+    CardItem *card;
     QList<QPair<QString, int>> playersInfo;
     bool shortcutsActive;
 
     void addRelatedCardActions();
+    void attachCard();
+    void drawArrow();
     void retranslateUi();
     void initContextualPlayersMenu(QMenu *menu, QAction *allPlayersAction);
     void setShortcutsActive();
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
index e16ebc112..87a0d1540 100644
--- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -1,13 +1,13 @@
 #include "custom_zone_menu.h"
 
-#include "../../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QList>
 #include <QVariant>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
 {
diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
index 580d2642e..001a4d0cf 100644
--- a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
@@ -2,13 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/pile_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -19,6 +13,12 @@
 #include <QObject>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 
 class QWidget;
diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
index 141542cb4..e992f3ff5 100644
--- a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
@@ -2,14 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/board/card_list.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/hand_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -20,6 +13,13 @@
 #include <QObject>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 
 class QWidget;
diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.cpp b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
index aa389006e..5f90c3760 100644
--- a/cockatrice/src/game_graphics/player/menu/library_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
@@ -2,14 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/board/card_list.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
-#include "../../../game/zones/pile_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/abstract_game.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -23,6 +16,13 @@
 #include <QObject>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 
 class QWidget;
 
diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.cpp b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
index 2991100ec..b81c4619b 100644
--- a/cockatrice/src/game_graphics/player/menu/move_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
@@ -2,13 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
-#include "../card_menu_action_type.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <libcockatrice/game/player/card_menu_action_type.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 {
@@ -30,7 +30,7 @@ MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 
     auto invoke = [player](CardMenuActionType type) {
         return [type, player]() {
-            player->getLogic()->getPlayerActions()->cardMenuAction(player->getGameScene()->selectedCards(), type);
+            player->getLogic()->getPlayerActions()->cardMenuAction(player->getGameScene()->selectedCardStates(), type);
         };
     };
 
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 44b184cfe..582586ac2 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -2,10 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_logic.h"
-#include "../../../game/player/player_manager.h"
 #include "../../../game_graphics/zones/hand_zone.h"
 #include "../../../game_graphics/zones/pile_zone.h"
 #include "../../../game_graphics/zones/table_zone.h"
@@ -26,6 +22,10 @@
 
 #include <QMenu>
 #include <QString>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
 
 PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_player)
 {
@@ -87,22 +87,24 @@ void PlayerMenu::setMenusForGraphicItems()
     }
 }
 
-QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
+QMenu *PlayerMenu::updateCardMenu(CardState *card)
 {
     if (!card) {
         emit cardMenuUpdated(nullptr);
         return nullptr;
     }
 
+    auto *cardItem = qobject_cast<CardItem *>(card->parent());
+
     // If is spectator (as spectators don't need card menus), return
     // only update the menu if the card is actually selected
     if ((player->getLogic()->getGame()->getPlayerManager()->isSpectator() &&
          !player->getLogic()->getGame()->getPlayerManager()->isJudge()) ||
-        player->getLogic()->getGame()->getActiveCard() != card) {
+        cardItem == nullptr || player->getGameScene()->getActiveCard() != cardItem) {
         return nullptr;
     }
 
-    CardMenu *menu = new CardMenu(player, card, shortcutsActive);
+    CardMenu *menu = new CardMenu(player, cardItem, shortcutsActive);
     connect(menu, &CardMenu::cardInfoRequested, this, &PlayerMenu::cardInfoRequested);
     emit cardMenuUpdated(menu);
 
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
index 97dd2fc56..e21a689de 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.h
@@ -14,7 +14,7 @@
 #include <qtmetamacros.h>
 #include <utility>
 
-class CardItem;
+class CardState;
 class CardMenu;
 class PlayerGraphicsItem;
 class AbstractPlayerComponent;
@@ -43,7 +43,7 @@ signals:
 
 public slots:
     void setMenusForGraphicItems();
-    QMenu *updateCardMenu(const CardItem *card);
+    QMenu *updateCardMenu(CardState *card);
 
 private slots:
     void refreshShortcuts();
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
index b4f852b43..e6c65fcfb 100644
--- a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
@@ -2,12 +2,12 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
 {
@@ -15,34 +15,35 @@ PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness"))
 
     aIncP = new QAction(this);
     connect(aIncP, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCardStates()); });
     aDecP = new QAction(this);
     connect(aDecP, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCardStates()); });
     aIncT = new QAction(this);
     connect(aIncT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCardStates()); });
     aDecT = new QAction(this);
     connect(aDecT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCardStates()); });
     aIncPT = new QAction(this);
     connect(aIncPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCardStates()); });
     aDecPT = new QAction(this);
     connect(aDecPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCardStates()); });
     aFlowP = new QAction(this);
     connect(aFlowP, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCardStates()); });
     aFlowT = new QAction(this);
     connect(aFlowT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCardStates()); });
     aSetPT = new QAction(this);
-    connect(aSetPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCards()); });
+    connect(aSetPT, &QAction::triggered, playerActions, [player, playerActions] {
+        playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCardStates());
+    });
     aResetPT = new QAction(this);
     connect(aResetPT, &QAction::triggered, playerActions,
-            [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCards()); });
+            [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCardStates()); });
 
     addAction(aIncP);
     addAction(aDecP);
diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
index 98514280f..415d4a2ef 100644
--- a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
@@ -1,10 +1,6 @@
 #include "rfg_menu.h"
 
-#include "../../../game/player/player_info.h"
-#include "../../../game/zones/pile_zone_logic.h"
 #include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
@@ -12,6 +8,10 @@
 #include <QMenu>
 #include <QString>
 #include <QVariant>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 #include <libcockatrice/utility/zone_names.h>
 
 class QWidget;
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
index d467c6469..486508da9 100644
--- a/cockatrice/src/game_graphics/player/menu/say_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
@@ -1,14 +1,14 @@
 #include "say_menu.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QKeySequence>
 #include <QList>
 #include <QString>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/settings/message_settings.h>
 
 SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
index 1eef3604f..e601a0e09 100644
--- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
@@ -2,13 +2,13 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../player_graphics_item.h"
 
 #include <QAction>
 #include <QKeySequence>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu)
 {
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
index 7c18b3f4c..3b8affff5 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
@@ -2,9 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/player/player_info.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../game_scene.h"
 #include "../player_graphics_item.h"
 #include "libcockatrice/card/card_info.h"
@@ -14,6 +11,9 @@
 #include <QSet>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 
 UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {
@@ -44,7 +44,7 @@ UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu
         aIncrementAllCardCounters = new QAction(this);
         connect(aIncrementAllCardCounters, &QAction::triggered, playerActions, [this]() {
             player->getLogic()->getPlayerActions()->actIncrementAllCardCounters(
-                player->getGameScene()->selectedCards());
+                player->getGameScene()->selectedCardStates());
         });
 
         createPredefinedTokenMenu = new QMenu(QString());
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp
index 74f5de601..a5baa8ca8 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.cpp
+++ b/cockatrice/src/game_graphics/player/player_dialogs.cpp
@@ -2,11 +2,10 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../client/settings/card_counter_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
 #include "../../interface/widgets/utility/get_text_with_max.h"
 #include "../board/abstract_counter.h"
 #include "../board/card_item.h"
+#include "../dialogs/dlg_annotation.h"
 #include "../dialogs/dlg_create_token.h"
 #include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
@@ -17,6 +16,8 @@
 #include <QInputDialog>
 #include <QLineEdit>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/utility/string_limits.h>
 
 PlayerDialogs::PlayerDialogs(PlayerGraphicsItem *_player, PlayerActions *_playerActions)
@@ -34,7 +35,7 @@ PlayerDialogs::PlayerDialogs(PlayerGraphicsItem *_player, PlayerActions *_player
             &PlayerDialogs::onShuffleBottomDialogRequested);
 
     connect(playerActions, &PlayerActions::requestMulliganDialog, this, &PlayerDialogs::onMulliganDialogRequested);
-
+    connect(playerActions, &PlayerActions::startingHandSizeChosen, this, &PlayerDialogs::onStartingHandSizeChosen);
     connect(playerActions, &PlayerActions::requestDrawCardsDialog, this, &PlayerDialogs::onDrawCardsDialogRequested);
 
     connect(playerActions, &PlayerActions::requestMoveTopCardsToDialog, this,
@@ -126,6 +127,11 @@ void PlayerDialogs::onMulliganDialogRequested(int startSize, int handSize, int d
     }
 }
 
+void PlayerDialogs::onStartingHandSizeChosen(int number)
+{
+    SettingsCache::instance().userInterface().setStartingHandSize(number);
+}
+
 void PlayerDialogs::onDrawCardsDialogRequested(int defaultNumberTopCards, int deckSize)
 {
     bool ok;
@@ -196,7 +202,7 @@ void PlayerDialogs::onRollDieDialogRequested()
     playerActions->actRollDie(dlg.getDieSideCount(), dlg.getDiceToRollCount());
 }
 
-void PlayerDialogs::onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard,
+void PlayerDialogs::onCreateRelatedFromRelationDialogRequested(const CardState *sourceCard,
                                                                const CardRelation *cardRelation)
 {
     if (sourceCard == nullptr || cardRelation == nullptr) {
@@ -251,14 +257,14 @@ void PlayerDialogs::onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopC
     number -= 1; // indexes start at 0
 
     if (ok) {
-        playerActions->actMoveCardXCardsFromTop(player->getGameScene()->selectedCards(), number);
+        playerActions->actMoveCardXCardsFromTop(player->getGameScene()->selectedCardStates(), number);
     }
 }
 
 void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT)
 {
     bool ok;
-    auto cards = player->getGameScene()->selectedCards();
+    auto cards = player->getGameScene()->selectedCardStates();
     emit requestDialogSemaphore(true);
     QString pt = getTextWithMax(dialogParent(), tr("Change power/toughness"), tr("Change stats to:"), QLineEdit::Normal,
                                 oldPT, &ok);
@@ -273,7 +279,7 @@ void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT)
 
 void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation)
 {
-    auto cards = player->getGameScene()->selectedCards();
+    auto cards = player->getGameScene()->selectedCardStates();
     emit requestDialogSemaphore(true);
     AnnotationDialog *dialog = new AnnotationDialog(dialogParent());
     dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput);
@@ -291,7 +297,7 @@ void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation)
 
 void PlayerDialogs::onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg)
 {
-    auto cards = player->getGameScene()->selectedCards();
+    auto cards = player->getGameScene()->selectedCardStates();
     emit requestDialogSemaphore(true);
 
     auto &cardCounterSettings = SettingsCache::instance().cardCounters();
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h
index 86d7282a2..4ac443f3c 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.h
+++ b/cockatrice/src/game_graphics/player/player_dialogs.h
@@ -17,6 +17,7 @@
 
 class CardItem;
 class CardRelation;
+class CardState;
 class PlayerActions;
 class QWidget;
 struct MoveTopCardsUntilOptions;
@@ -52,12 +53,13 @@ public slots:
                                             bool faceDown);
     void onDrawBottomCardsDialogRequested(int defaultNumberBottomCards, int maxCards);
     void onRollDieDialogRequested();
-    void onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard, const CardRelation *cardRelation);
+    void onCreateRelatedFromRelationDialogRequested(const CardState *sourceCard, const CardRelation *cardRelation);
     void onCreateTokenDialogRequested(const QStringList &predefinedTokens);
     void onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopCardsToPlaceBelow, int deckSize);
     void onSetPTDialogRequested(const QString &oldPT);
     void onSetAnnotationDialogRequested(const QString &oldAnnotation);
     void onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg);
+    void onStartingHandSizeChosen(int number);
 
 private:
     PlayerGraphicsItem *player;
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
index 419816087..0805dbb5b 100644
--- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
@@ -1,15 +1,6 @@
 #include "player_graphics_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/counter_state.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/hand_zone_logic.h"
-#include "../../game/zones/pile_zone_logic.h"
-#include "../../game/zones/stack_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../interface/widgets/cards/art_crop_attribution.h"
 #include "../../interface/widgets/cards/card_art_utils.h"
@@ -45,6 +36,15 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/playmat_resolver.h>
+#include <libcockatrice/game/board/counter_state.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
+#include <libcockatrice/game/zones/stack_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <qnamespace.h>
 #include <qnumeric.h>
@@ -177,6 +177,22 @@ void PlayerGraphicsItem::initializeZones()
 
 void PlayerGraphicsItem::onCustomZoneAdded(QString customZoneName)
 {
+    // Custom zones have no board view, but their cards still need a graphics owner.
+    // Without one, PileZone::onCardAdded never runs and cards moved from the table
+    // or hand into a custom zone stay drawn at their old spot. Give them a hidden
+    // pile zone so added cards are reparented to (0, 0) and hidden.
+    CardZoneLogic *logic = player->getZone(customZoneName);
+    if (auto *pileLogic = qobject_cast<PileZoneLogic *>(logic)) {
+        auto *hiddenZone = new PileZone(pileLogic, this);
+        hiddenZone->setVisible(false);
+        hiddenZone->setPos(0, 0);
+        zoneGraphicsItems.insert(customZoneName, hiddenZone);
+        // Hide any cards that arrived before the graphics item existed.
+        for (CardState *state : pileLogic->getCards()) {
+            hiddenZone->onCardAdded(state);
+        }
+        return;
+    }
     zoneGraphicsItems.insert(customZoneName, nullptr); // Custom zone view goes here, if we ever implement it.
 }
 
diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp
index 7b358010f..6895e7db8 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.cpp
+++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp
@@ -1,6 +1,7 @@
 #include "player_list_widget.h"
 
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_icon.h"
 #include "../../interface/widgets/server/user/user_context_menu.h"
 #include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "user_level.h"
@@ -67,13 +68,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor,
                                    QWidget *parent)
     : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false)
 {
-    readyIcon = themePixmap(QStringLiteral("icons/ready_start"));
-    notReadyIcon = themePixmap(QStringLiteral("icons/not_ready_start"));
-    concededIcon = themePixmap(QStringLiteral("icons/conceded"));
-    playerIcon = loadColorAdjustedPixmap("theme:icons/player");
-    judgeIcon = loadColorAdjustedPixmap("theme:icons/scales");
-    spectatorIcon = loadColorAdjustedPixmap("theme:icons/spectator");
-    lockIcon = themePixmap(QStringLiteral("icons/lock"));
+    readyIcon = loadThemedIcon(QStringLiteral("icons/ready_start"));
+    notReadyIcon = loadThemedIcon(QStringLiteral("icons/not_ready_start"));
+    concededIcon = loadThemedIcon(QStringLiteral("icons/conceded"));
+    playerIcon = loadThemedIcon(QStringLiteral("icons/player"));
+    judgeIcon = loadThemedIcon(QStringLiteral("icons/scales"));
+    spectatorIcon = loadThemedIcon(QStringLiteral("icons/spectator"));
+    lockIcon = loadThemedIcon(QStringLiteral("icons/lock"));
 
     if (tabSupervisor) {
         itemDelegate = new PlayerListItemDelegate(this);
diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp
index 24734cd42..0d10ba4ab 100644
--- a/cockatrice/src/game_graphics/player/player_target.cpp
+++ b/cockatrice/src/game_graphics/player/player_target.cpp
@@ -1,9 +1,8 @@
 #include "player_target.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_manager.h"
 #include "../board/abstract_counter.h"
 #include "../board/abstract_graphics_item.h"
 #include "../board/arrow_target.h"
@@ -30,6 +29,8 @@
 #include <QTransform>
 #include <QtGlobal>
 #include <QtMath>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <qnamespace.h>
 #include <qnumeric.h>
@@ -76,7 +77,7 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*
 
     QRectF translatedRect = path.controlPointRect();
     QSize translatedSize = translatedRect.size().toSize();
-    QFont font("Serif");
+    QFont font = themeManager->cardTextFont();
     font.setWeight(QFont::Bold);
     font.setPixelSize(qMax(qRound(translatedSize.height() / 1.3), 9));
     painter->setFont(font);
@@ -226,7 +227,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
         name = name.mid(0, 10) + "...";
     }
 
-    QFont font;
+    QFont font = themeManager->appFont(AppFont::CardText);
     font.setPixelSize(qMax(qRound(translatedNameRect.height() / 1.5), 9));
     painter->setFont(font);
     painter->setPen(Qt::white);
diff --git a/cockatrice/src/game_graphics/pq_cockatrice_event_player.cpp b/cockatrice/src/game_graphics/pq_cockatrice_event_player.cpp
new file mode 100644
index 000000000..c6376ef75
--- /dev/null
+++ b/cockatrice/src/game_graphics/pq_cockatrice_event_player.cpp
@@ -0,0 +1,628 @@
+#include "pq_cockatrice_event_player.h"
+
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "board/card_item.h"
+#include "game_scene.h"
+#include "game_view.h"
+#include "zones/card_zone.h"
+
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QAction>
+#include <QApplication>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QLoggingCategory>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QTreeWidget>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+
+Q_LOGGING_CATEGORY(PQ_COCKATRICE_EVENT_PLAYER, "cockatrice.guiTest.eventPlayer")
+
+namespace
+{
+/**
+ * Strips Qt's mnemonic markers so a test can name a menu entry by the label the
+ * user sees ("Turn Over" rather than "T&urn Over").
+ */
+QString normalizeActionText(const QString &text)
+{
+    QString normalized = text;
+    normalized.remove('&');
+    return normalized.simplified();
+}
+
+/**
+ * Maps a printable character onto the key a US keyboard would report for it, so
+ * typing produces the same QKeyEvents a recording would.
+ */
+Qt::Key keyForCharacter(QChar character)
+{
+    if (character.isLetter()) {
+        return static_cast<Qt::Key>(Qt::Key_A + (character.toUpper().unicode() - 'A'));
+    }
+    if (character.isDigit()) {
+        return static_cast<Qt::Key>(Qt::Key_0 + (character.unicode() - '0'));
+    }
+    switch (character.unicode()) {
+        case ' ':
+            return Qt::Key_Space;
+        case '\n':
+            return Qt::Key_Return;
+        case '\t':
+            return Qt::Key_Tab;
+        case '-':
+            return Qt::Key_Minus;
+        case '_':
+            return Qt::Key_Underscore;
+        case '/':
+            return Qt::Key_Slash;
+        case ',':
+            return Qt::Key_Comma;
+        case '.':
+            return Qt::Key_Period;
+        case '\'':
+            return Qt::Key_Apostrophe;
+        case ';':
+            return Qt::Key_Semicolon;
+        case ':':
+            return Qt::Key_Colon;
+        case '"':
+            return Qt::Key_QuoteDbl;
+        case '&':
+            return Qt::Key_Ampersand;
+        case '(':
+            return Qt::Key_ParenLeft;
+        case ')':
+            return Qt::Key_ParenRight;
+        case '[':
+            return Qt::Key_BracketLeft;
+        case ']':
+            return Qt::Key_BracketRight;
+        default:
+            return Qt::Key_unknown;
+    }
+}
+
+/** Depth-first search for the first model index whose label matches @p text. */
+QModelIndex findModelIndexByText(const QAbstractItemModel *model, const QString &text, const QModelIndex &parent = {})
+{
+    for (int row = 0; row < model->rowCount(parent); ++row) {
+        const QModelIndex index = model->index(row, 0, parent);
+        if (index.data(Qt::DisplayRole).toString() == text) {
+            return index;
+        }
+        const QModelIndex child = findModelIndexByText(model, text, index);
+        if (child.isValid()) {
+            return child;
+        }
+    }
+    return {};
+}
+
+bool needsShift(QChar character)
+{
+    if (character.isUpper()) {
+        return true;
+    }
+    return QStringLiteral("_:\"&()").contains(character);
+}
+} // namespace
+
+pqCockatriceEventPlayer::pqCockatriceEventPlayer(QObject *parent) : pqWidgetEventPlayer(parent)
+{
+}
+
+bool pqCockatriceEventPlayer::playEvent(QObject *object, const QString &command, const QString &arguments, bool &error)
+{
+    // A known command that fails is a handled-but-failed event: QtTesting logs
+    // "Unhandled event" when playEvent returns false, so report through `error`
+    // (the contract playExpectProperty already follows) and still return true.
+    const auto run = [&error](bool ok) {
+        if (!ok) {
+            error = true;
+        }
+        return true;
+    };
+
+    if (command == "clickCard") {
+        return run(playClickCard(object, arguments));
+    } else if (command == "flipCard") {
+        return run(playFlipCard(object, arguments));
+    } else if (command == "cardAction") {
+        return run(playCardAction(object, arguments));
+    } else if (command == "moveCard") {
+        return run(playMoveCard(object, arguments));
+    } else if (command == "drawArrow") {
+        return run(playDrawArrow(object, arguments));
+    } else if (command == "createToken") {
+        return run(playCreateToken(object, arguments));
+    } else if (command == "selectItem") {
+        return run(playSelectItem(object, arguments));
+    } else if (command == "typeText") {
+        return run(playTypeText(object, arguments));
+    } else if (command == "expectProperty") {
+        return playExpectProperty(object, arguments, error);
+    }
+    return false;
+}
+
+QGraphicsItem *
+pqCockatriceEventPlayer::findCardInScene(QGraphicsScene *scene, const QString &cardName, const QString &zoneName)
+{
+    for (QGraphicsItem *gi : scene->items()) {
+        if (gi->type() != typeCard) {
+            continue;
+        }
+        auto *card = static_cast<CardItem *>(gi);
+        if (!card->getZone() || card->getZone()->getName() != zoneName) {
+            continue;
+        }
+        QString actualName = card->getName();
+        if (actualName == cardName || actualName.endsWith(" " + cardName)) {
+            return card;
+        }
+    }
+    return nullptr;
+}
+
+QGraphicsItem *pqCockatriceEventPlayer::findZoneInScene(QGraphicsScene *scene, const QString &zoneName)
+{
+    for (QGraphicsItem *gi : scene->items()) {
+        if (gi->type() != typeZone) {
+            continue;
+        }
+        auto *zone = static_cast<CardZone *>(gi);
+        if (zone->getLogic() && zone->getLogic()->getName() == zoneName) {
+            return zone;
+        }
+    }
+    return nullptr;
+}
+
+QAction *pqCockatriceEventPlayer::findActionInMenu(QMenu *menu, const QString &actionText)
+{
+    if (!menu || actionText.isEmpty()) {
+        return nullptr;
+    }
+    for (QAction *action : menu->actions()) {
+        if (action->isSeparator()) {
+            continue;
+        }
+        if (normalizeActionText(action->text()).contains(actionText, Qt::CaseInsensitive)) {
+            return action;
+        }
+        if (QMenu *subMenu = action->menu()) {
+            if (QAction *found = findActionInMenu(subMenu, actionText)) {
+                return found;
+            }
+        }
+    }
+    return nullptr;
+}
+
+QMenu *pqCockatriceEventPlayer::visiblePopupMenu()
+{
+    for (QWidget *w : QApplication::topLevelWidgets()) {
+        auto *menu = qobject_cast<QMenu *>(w);
+        if (menu && menu->isVisible()) {
+            return menu;
+        }
+    }
+    return nullptr;
+}
+
+QPoint pqCockatriceEventPlayer::viewportPoint(QGraphicsView *view, const QGraphicsItem *item)
+{
+    return view->mapFromScene(item->sceneBoundingRect().center());
+}
+void pqCockatriceEventPlayer::sendMouseEvent(QGraphicsView *view,
+                                             QEvent::Type type,
+                                             const QPoint &pos,
+                                             Qt::MouseButton button,
+                                             Qt::MouseButtons buttons)
+{
+    QMouseEvent event(type, pos, view->viewport()->mapToGlobal(pos), button, buttons, Qt::NoModifier);
+    qApp->notify(view->viewport(), &event);
+}
+
+bool pqCockatriceEventPlayer::playClickCard(QObject *object, const QString &arguments)
+{
+    auto *gv = qobject_cast<QGraphicsView *>(object);
+    if (!gv) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "clickCard: target widget is not a QGraphicsView";
+        return false;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 2) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "clickCard: arguments must be 'cardName,zoneName', got:" << arguments;
+        return false;
+    }
+
+    QGraphicsScene *scene = gv->scene();
+    if (!scene) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "clickCard: no scene on the QGraphicsView";
+        return false;
+    }
+
+    auto *target = findCardInScene(scene, parts[0].trimmed(), parts[1].trimmed());
+    if (!target) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "clickCard: card" << parts[0].trimmed() << "not found in zone" << parts[1].trimmed();
+        return false;
+    }
+
+    const QPoint pos = viewportPoint(gv, target);
+    // A double click is the play gesture from hand: press/release, then the
+    // double-click event and its release, exactly as a recording produces it.
+    sendMouseEvent(gv, QEvent::MouseButtonPress, pos, Qt::LeftButton, Qt::LeftButton);
+    sendMouseEvent(gv, QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton);
+    sendMouseEvent(gv, QEvent::MouseButtonDblClick, pos, Qt::LeftButton, Qt::LeftButton);
+    sendMouseEvent(gv, QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton);
+
+    return true;
+}
+
+bool pqCockatriceEventPlayer::playFlipCard(QObject *object, const QString &arguments)
+{
+    auto *gv = qobject_cast<QGraphicsView *>(object);
+    if (!gv) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "flipCard: target widget is not a QGraphicsView";
+        return false;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 2) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "flipCard: arguments must be 'cardName,zoneName', got:" << arguments;
+        return false;
+    }
+
+    QGraphicsScene *scene = gv->scene();
+    if (!scene) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "flipCard: no scene";
+        return false;
+    }
+
+    auto *card = qgraphicsitem_cast<CardItem *>(findCardInScene(scene, parts[0].trimmed(), parts[1].trimmed()));
+    if (!card) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "flipCard: card" << parts[0].trimmed() << "not found in zone" << parts[1].trimmed();
+        return false;
+    }
+
+    return invokeCardMenuAction("flipCard", gv, card, QStringLiteral("Turn Over"));
+}
+
+bool pqCockatriceEventPlayer::playCardAction(QObject *object, const QString &arguments)
+{
+    auto *gv = qobject_cast<QGraphicsView *>(object);
+    if (!gv) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "cardAction: target widget is not a QGraphicsView";
+        return false;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 3) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "cardAction: arguments must be 'cardName,zoneName,actionText', got:" << arguments;
+        return false;
+    }
+
+    QGraphicsScene *scene = gv->scene();
+    if (!scene) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "cardAction: no scene";
+        return false;
+    }
+
+    auto *card = qgraphicsitem_cast<CardItem *>(findCardInScene(scene, parts[0].trimmed(), parts[1].trimmed()));
+    if (!card) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "cardAction: card" << parts[0].trimmed() << "not found in zone" << parts[1].trimmed();
+        return false;
+    }
+
+    return invokeCardMenuAction("cardAction", gv, card, parts.mid(2).join(',').trimmed());
+}
+
+bool pqCockatriceEventPlayer::invokeCardMenuAction(const char *command,
+                                                   QGraphicsView *view,
+                                                   CardItem *card,
+                                                   const QString &actionText)
+{
+    const QPoint pos = viewportPoint(view, card);
+    sendMouseEvent(view, QEvent::MouseButtonPress, pos, Qt::RightButton, Qt::RightButton);
+    sendMouseEvent(view, QEvent::MouseButtonRelease, pos, Qt::RightButton, Qt::NoButton);
+    qApp->processEvents();
+
+    QMenu *menu = visiblePopupMenu();
+    if (!menu) {
+        qCWarning(PQ_COCKATRICE_EVENT_PLAYER) << command << ": no popup menu appeared after right-click";
+        return false;
+    }
+
+    QAction *action = findActionInMenu(menu, actionText);
+    if (!action) {
+        qCWarning(PQ_COCKATRICE_EVENT_PLAYER) << command << ": no context menu action matching" << actionText;
+        menu->close();
+        return false;
+    }
+
+    action->trigger();
+    menu->close();
+    qApp->processEvents();
+    return true;
+}
+
+bool pqCockatriceEventPlayer::playMoveCard(QObject *object, const QString &arguments)
+{
+    auto *gv = qobject_cast<QGraphicsView *>(object);
+    if (!gv) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: target widget is not a QGraphicsView";
+        return false;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 3) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "moveCard: arguments must be 'cardName,srcZoneName,dstZoneName', got:" << arguments;
+        return false;
+    }
+
+    const QString cardName = parts[0].trimmed();
+    const QString srcZoneName = parts[1].trimmed();
+    const QString dstZoneName = parts[2].trimmed();
+
+    QGraphicsScene *scene = gv->scene();
+    if (!scene) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: no scene";
+        return false;
+    }
+
+    auto *card = findCardInScene(scene, cardName, srcZoneName);
+    if (!card) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: card" << cardName << "not found in zone" << srcZoneName;
+        return false;
+    }
+
+    auto *dstZone = findZoneInScene(scene, dstZoneName);
+    if (!dstZone) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: destination zone" << dstZoneName << "not found";
+        return false;
+    }
+
+    const QPoint srcPos = viewportPoint(gv, card);
+    const QPoint dstPos = viewportPoint(gv, dstZone);
+
+    // A drag has to travel past Qt's start distance before the scene turns it
+    // into a card drag item, otherwise the move is interpreted as a click.
+    const int dragDistance = 2 * QApplication::startDragDistance() + 10;
+    const QPoint pastDragStart = srcPos + QPoint(dragDistance, 0);
+
+    sendMouseEvent(gv, QEvent::MouseButtonPress, srcPos, Qt::LeftButton, Qt::LeftButton);
+    sendMouseEvent(gv, QEvent::MouseMove, pastDragStart, Qt::LeftButton, Qt::LeftButton);
+    qApp->processEvents();
+    sendMouseEvent(gv, QEvent::MouseMove, dstPos, Qt::LeftButton, Qt::LeftButton);
+    qApp->processEvents();
+    sendMouseEvent(gv, QEvent::MouseButtonRelease, dstPos, Qt::LeftButton, Qt::NoButton);
+    qApp->processEvents();
+
+    return true;
+}
+
+bool pqCockatriceEventPlayer::playDrawArrow(QObject *object, const QString &arguments)
+{
+    auto *gv = qobject_cast<QGraphicsView *>(object);
+    if (!gv) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "drawArrow: target widget is not a QGraphicsView";
+        return false;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 4) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "drawArrow: arguments must be 'srcCard,srcZone,dstCard,dstZone', got:" << arguments;
+        return false;
+    }
+
+    const QString srcCardName = parts[0].trimmed();
+    const QString srcZoneName = parts[1].trimmed();
+    const QString dstCardName = parts[2].trimmed();
+    const QString dstZoneName = parts[3].trimmed();
+
+    QGraphicsScene *scene = gv->scene();
+    if (!scene) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "drawArrow: no scene";
+        return false;
+    }
+
+    auto *srcCard = findCardInScene(scene, srcCardName, srcZoneName);
+    if (!srcCard) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "drawArrow: source card" << srcCardName << "not found in zone" << srcZoneName;
+        return false;
+    }
+
+    auto *dstCard = findCardInScene(scene, dstCardName, dstZoneName);
+    if (!dstCard) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "drawArrow: dest card" << dstCardName << "not found in zone" << dstZoneName;
+        return false;
+    }
+
+    const QPoint srcPos = viewportPoint(gv, srcCard);
+    const QPoint dstPos = viewportPoint(gv, dstCard);
+
+    const int dragDistance = 2 * QApplication::startDragDistance() + 10;
+    const QPoint pastDragStart = srcPos + QPoint(dragDistance, 0);
+
+    sendMouseEvent(gv, QEvent::MouseButtonPress, srcPos, Qt::RightButton, Qt::RightButton);
+    sendMouseEvent(gv, QEvent::MouseMove, pastDragStart, Qt::RightButton, Qt::RightButton);
+    qApp->processEvents();
+    sendMouseEvent(gv, QEvent::MouseMove, dstPos, Qt::RightButton, Qt::RightButton);
+    sendMouseEvent(gv, QEvent::MouseButtonRelease, dstPos, Qt::RightButton, Qt::NoButton);
+    qApp->processEvents();
+
+    return true;
+}
+
+bool pqCockatriceEventPlayer::playCreateToken(QObject *object, const QString &arguments)
+{
+    auto *gv = qobject_cast<QGraphicsView *>(object);
+    if (!gv) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: target widget is not a QGraphicsView";
+        return false;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 3) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: arguments must be 'name,color,pt', got:" << arguments;
+        return false;
+    }
+
+    QString tokenName = parts[0].trimmed();
+    QString tokenColor = parts[1].trimmed();
+    QString tokenPt = parts[2].trimmed();
+
+    TabGame *tabGame = nullptr;
+    QWidget *w = gv;
+    while (w) {
+        tabGame = qobject_cast<TabGame *>(w);
+        if (tabGame) {
+            break;
+        }
+        w = w->parentWidget();
+    }
+    if (!tabGame) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: TabGame not found";
+        return false;
+    }
+
+    AbstractGame *game = tabGame->getGame();
+    if (!game) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: no game";
+        return false;
+    }
+
+    int activePlayerId = game->getGameState()->getActivePlayer();
+    PlayerLogic *player = game->getPlayerManager()->getActiveLocalPlayer(activePlayerId);
+    if (!player) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: no active local player";
+        return false;
+    }
+
+    TokenInfo info;
+    info.name = tokenName;
+    info.color = tokenColor;
+    info.pt = tokenPt;
+    info.destroy = true;
+    info.faceDown = false;
+
+    player->getPlayerActions()->actCreateToken(info);
+
+    for (int i = 0; i < 10; ++i) {
+        qApp->processEvents();
+    }
+
+    return true;
+}
+
+bool pqCockatriceEventPlayer::playSelectItem(QObject *object, const QString &arguments)
+{
+    const QString text = arguments.trimmed();
+    if (text.isEmpty()) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: needs the label of the item to select";
+        return false;
+    }
+
+    if (auto *tree = qobject_cast<QTreeWidget *>(object)) {
+        QTreeWidgetItemIterator item(tree);
+        while (*item) {
+            if ((*item)->text(0) == text) {
+                tree->setCurrentItem(*item);
+                qApp->processEvents();
+                return true;
+            }
+            ++item;
+        }
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: no tree item labelled" << text;
+        return false;
+    }
+
+    if (auto *view = qobject_cast<QAbstractItemView *>(object)) {
+        const QModelIndex index = findModelIndexByText(view->model(), text);
+        if (!index.isValid()) {
+            qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: no item labelled" << text;
+            return false;
+        }
+        view->setCurrentIndex(index);
+        qApp->processEvents();
+        return true;
+    }
+
+    qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: target is neither a tree widget nor an item view";
+    return false;
+}
+
+bool pqCockatriceEventPlayer::playTypeText(QObject *object, const QString &arguments)
+{
+    auto *widget = qobject_cast<QWidget *>(object);
+    if (!widget) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "typeText: target is not a QWidget";
+        return false;
+    }
+
+    for (const QChar character : arguments) {
+        const Qt::Key key = keyForCharacter(character);
+        const Qt::KeyboardModifiers modifiers = needsShift(character) ? Qt::ShiftModifier : Qt::NoModifier;
+        QKeyEvent press(QEvent::KeyPress, key, modifiers, QString(character));
+        QKeyEvent release(QEvent::KeyRelease, key, modifiers, QString(character));
+        qApp->notify(widget, &press);
+        qApp->notify(widget, &release);
+    }
+    qApp->processEvents();
+
+    return true;
+}
+
+bool pqCockatriceEventPlayer::playExpectProperty(QObject *object, const QString &arguments, bool &error)
+{
+    if (!object) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "expectProperty: no target object";
+        error = true;
+        return true;
+    }
+
+    QStringList parts = arguments.split(',');
+    if (parts.size() < 2) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "expectProperty: arguments must be 'propertyName,expectedValue', got:" << arguments;
+        error = true;
+        return true;
+    }
+
+    const QString propertyName = parts[0].trimmed();
+    const QString expected = parts.mid(1).join(',');
+
+    const QVariant actual = object->property(propertyName.toUtf8().constData());
+    if (!actual.isValid()) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER)
+            << "expectProperty:" << object->objectName() << "has no property" << propertyName;
+        error = true;
+        return true;
+    }
+
+    if (actual.toString() != expected) {
+        qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "expectProperty:" << object->objectName() << propertyName << "is"
+                                               << actual.toString() << "but the test expected" << expected;
+        error = true;
+        return true;
+    }
+
+    return true;
+}
diff --git a/cockatrice/src/game_graphics/pq_cockatrice_event_player.h b/cockatrice/src/game_graphics/pq_cockatrice_event_player.h
new file mode 100644
index 000000000..89d88af77
--- /dev/null
+++ b/cockatrice/src/game_graphics/pq_cockatrice_event_player.h
@@ -0,0 +1,91 @@
+#ifndef PQ_COCKATRICE_EVENT_PLAYER_H
+#define PQ_COCKATRICE_EVENT_PLAYER_H
+
+#include "pqWidgetEventPlayer.h"
+
+#include <QModelIndex>
+
+class CardItem;
+class QAction;
+class QGraphicsItem;
+class QGraphicsScene;
+class QGraphicsView;
+class QMenu;
+
+/**
+ * Custom event player for Cockatrice game interactions.
+ *
+ * Card commands are resolution independent: the card is looked up in the
+ * QGraphicsScene by name and zone, then mouse events are sent at the card's
+ * current viewport position. That keeps recordings usable across screen sizes
+ * and window geometries.
+ *
+ * Commands:
+ *   clickCard "cardName,zoneName"
+ *       left press/release + double click — plays a card from hand, taps a
+ *       permanent, opens the deck view entry, depending on the zone
+ *   flipCard "cardName,zoneName"
+ *       right-click → "Turn Over" (shorthand for cardAction)
+ *   cardAction "cardName,zoneName,actionText"
+ *       right-click the card and trigger the first context menu action whose
+ *       label contains actionText; submenus are searched as well, so
+ *       "Add counter (A)" works
+ *   moveCard "cardName,srcZoneName,dstZoneName"
+ *       left-drag the card onto the destination zone — plays a card, moves it
+ *       to the graveyard/exile, puts it back into hand, ...
+ *   drawArrow "srcCard,srcZone,dstCard,dstZone"
+ *       right-drag an arrow from one card to another
+ *   createToken "name,color,pt"
+ *       create a token through the active local player, as the table context
+ *       menu's "Create token" dialog would
+ *   selectItem "item text"
+ *       selects the first item of a tree/list widget whose label matches, for
+ *       navigating the settings navigation tree or similar label-driven views
+ *   typeText "some text"
+ *       types the text into the widget one key event at a time — use it for
+ *       deck lists and search boxes instead of one event per character
+ *   expectProperty "propertyName,expectedValue"
+ *       assertion: playback fails unless object->property(propertyName)
+ *       equals expectedValue — for example "count,2" on the tab widget
+ */
+class pqCockatriceEventPlayer : public pqWidgetEventPlayer
+{
+    Q_OBJECT
+    typedef pqWidgetEventPlayer Superclass;
+
+public:
+    explicit pqCockatriceEventPlayer(QObject *parent = nullptr);
+
+    using Superclass::playEvent;
+
+    bool playEvent(QObject *object, const QString &command, const QString &arguments, bool &error) override;
+
+private:
+    bool playClickCard(QObject *object, const QString &arguments);
+    bool playFlipCard(QObject *object, const QString &arguments);
+    bool playCardAction(QObject *object, const QString &arguments);
+    bool playMoveCard(QObject *object, const QString &arguments);
+    bool playDrawArrow(QObject *object, const QString &arguments);
+    bool playCreateToken(QObject *object, const QString &arguments);
+    bool playSelectItem(QObject *object, const QString &arguments);
+    bool playTypeText(QObject *object, const QString &arguments);
+    bool playExpectProperty(QObject *object, const QString &arguments, bool &error);
+
+    /** @brief Triggers the context menu entry @p actionText after right-clicking @p card. */
+    bool invokeCardMenuAction(const char *command, QGraphicsView *view, CardItem *card, const QString &actionText);
+
+    static QGraphicsItem *findCardInScene(QGraphicsScene *scene, const QString &cardName, const QString &zoneName);
+    static QGraphicsItem *findZoneInScene(QGraphicsScene *scene, const QString &zoneName);
+    static QAction *findActionInMenu(QMenu *menu, const QString &actionText);
+    static QMenu *visiblePopupMenu();
+
+    /** @brief Viewport position of the item's centre, as the mouse events have to be sent. */
+    static QPoint viewportPoint(QGraphicsView *view, const QGraphicsItem *item);
+    static void sendMouseEvent(QGraphicsView *view,
+                               QEvent::Type type,
+                               const QPoint &pos,
+                               Qt::MouseButton button,
+                               Qt::MouseButtons buttons);
+};
+
+#endif // PQ_COCKATRICE_EVENT_PLAYER_H
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.cpp b/cockatrice/src/game_graphics/tally/stats_tally.cpp
index 28e280c02..2bce9fdfd 100644
--- a/cockatrice/src/game_graphics/tally/stats_tally.cpp
+++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp
@@ -16,7 +16,7 @@ static int sumPowers(const QList<CardItem *> &cards)
     // calculate total power;
     int total = 0;
     for (auto card : cards) {
-        QVariantList parsed = CardItem::parsePT(card->getPT());
+        QVariantList parsed = CardState::parsePT(card->getPT());
         if (!parsed.isEmpty()) {
             int power = parsed.first().toInt(); // toInt will default to 0 if it's not an int
             total += qMax(power, 0);
@@ -44,7 +44,7 @@ static int sumToughness(const QList<CardItem *> &cards)
 {
     int total = 0;
     for (auto card : cards) {
-        QVariantList parsed = CardItem::parsePT(card->getPT());
+        QVariantList parsed = CardState::parsePT(card->getPT());
         if (parsed.size() == 2) {
             int toughness = parsed.at(1).toInt(); // toInt will default to 0 if it's not an int
             total += qMax(toughness, 0);
diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp
index d09bb588c..fd3b5849f 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/card_zone.cpp
@@ -1,13 +1,13 @@
 #include "card_zone.h"
 
-#include "../../game/board/card_list.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../board/abstract_graphics_item.h"
 #include "../board/card_item.h"
 
 #include <QAction>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <qnamespace.h>
 
 class QGraphicsItem;
@@ -18,23 +18,60 @@ CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent)
     : AbstractGraphicsItem(parent), menu(nullptr), doubleClickAction(0), logic(_logic)
 {
     connect(logic, &CardZoneLogic::retranslateUi, this, &CardZone::retranslateUi);
+    // Invalidation is connected before any consumer so a handler that reads cardItems()
+    // during the same signal emission always sees a stale flag and rebuilds.
+    connect(logic, &CardZoneLogic::cardAdded, this, &CardZone::invalidateItems);
+    connect(logic, &CardZoneLogic::cardCountChanged, this, &CardZone::invalidateItems);
+    connect(logic, &CardZoneLogic::reorganizeCards, this, &CardZone::invalidateItems);
     connect(logic, &CardZoneLogic::cardAdded, this, &CardZone::onCardAdded);
+    connect(logic, &CardZoneLogic::createCardRequested, this, &CardZone::onCreateCardRequested);
     connect(logic, &CardZoneLogic::setGraphicsVisibility, this, [this](bool v) { this->setVisible(v); });
     connect(logic, &CardZoneLogic::updateGraphics, this, [this]() { update(); });
     connect(logic, &CardZoneLogic::reorganizeCards, this, &CardZone::reorganizeCards);
 }
 
-void CardZone::onCardAdded(CardItem *addedCard)
+void CardZone::invalidateItems()
 {
-    addedCard->setParentItem(this);
-    addedCard->setVisible(true);
-    addedCard->update();
+    itemsDirty = true;
+}
+
+const QList<CardItem *> &CardZone::cardItems() const
+{
+    if (itemsDirty) {
+        items.clear();
+        for (auto *cardState : getLogic()->getCards()) {
+            if (auto *cardItem = qobject_cast<CardItem *>(cardState->parent())) {
+                items.append(cardItem);
+            }
+        }
+        itemsDirty = false;
+    }
+    return items;
+}
+
+void CardZone::onCardAdded(CardState *addedCard)
+{
+    auto *addedItem = addedCard == nullptr ? nullptr : qobject_cast<CardItem *>(addedCard->parent());
+    if (addedItem == nullptr) {
+        return;
+    }
+    addedItem->setParentItem(this);
+    addedItem->setVisible(true);
+    addedItem->update();
+}
+
+void CardZone::onCreateCardRequested(const ServerInfo_Card &cardInfo, bool reorganize)
+{
+    CardRef cardRef = {QString::fromStdString(cardInfo.name()), QString::fromStdString(cardInfo.provider_id())};
+    auto *card = new CardItem(getLogic()->getPlayer(), nullptr, cardRef, cardInfo.id());
+    card->processCardInfo(cardInfo);
+    getLogic()->addCard(card->getState(), reorganize, cardInfo.x(), cardInfo.y());
 }
 
 void CardZone::retranslateUi()
 {
-    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
-        getLogic()->getCards()[i]->retranslateUi();
+    for (auto *card : cardItems()) {
+        card->retranslateUi();
     }
 }
 
diff --git a/cockatrice/src/game_graphics/zones/card_zone.h b/cockatrice/src/game_graphics/zones/card_zone.h
index def3eee14..ea77cb057 100644
--- a/cockatrice/src/game_graphics/zones/card_zone.h
+++ b/cockatrice/src/game_graphics/zones/card_zone.h
@@ -16,13 +16,17 @@
 
 class CardDragItem;
 class CardItem;
+class CardState;
 class CardZoneLogic;
 class QAction;
 class QGraphicsItem;
 class QMenu;
 class QPoint;
+class ServerInfo_Card;
 template <typename T> class QList;
 
+class CardItem;
+
 inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone");
 
 /**
@@ -55,7 +59,9 @@ public slots:
      * Virtual so subclasses (e.g. SelectZone) can override parenting behavior — the Qt signal
      * connection in CardZone's constructor dispatches through the vtable.
      */
-    virtual void onCardAdded(CardItem *addedCard);
+    virtual void onCardAdded(CardState *addedCard);
+    /** @brief Builds the card item for @p cardInfo and hands it to this zone's logic. */
+    void onCreateCardRequested(const ServerInfo_Card &cardInfo, bool reorganize);
 
 public:
     enum
@@ -76,6 +82,15 @@ public:
         return logic;
     }
 
+    /**
+     * @brief The CardItems backing getLogic()->getCards(), in zone order.
+     *
+     * Game logic talks about cards as states; this is the graphics side's view of the same list.
+     * It is rebuilt on demand after any content change, so views never reach into the logic's
+     * container themselves and never observe a stale one.
+     */
+    [[nodiscard]] const QList<CardItem *> &cardItems() const;
+
     void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0)
     {
         menu = _menu;
@@ -83,7 +98,12 @@ public:
     }
 
 private:
+    /** @brief Marks the cached card items stale. Connected to every content-changing signal. */
+    void invalidateItems();
+
     CardZoneLogic *logic;
+    mutable QList<CardItem *> items;
+    mutable bool itemsDirty = true;
 };
 
 #endif
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp
index 3e527c081..31758c455 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp
@@ -1,11 +1,6 @@
 #include "hand_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/hand_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
@@ -18,7 +13,11 @@
 #include <QPointF>
 #include <QRectF>
 #include <QString>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <string>
 
@@ -48,8 +47,8 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
     QPoint point = dropPoint + scenePos().toPoint();
     int x = -1;
     if (SettingsCache::instance().userInterface().getHorizontalHand()) {
-        for (x = 0; x < getLogic()->getCards().size(); x++) {
-            if (point.x() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().x()) {
+        for (x = 0; x < cardItems().size(); x++) {
+            if (point.x() < cardItems().at(x)->scenePos().x()) {
                 break;
             }
         }
@@ -58,19 +57,13 @@ void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
         x = calcDropIndexFromY(dropPoint.y(), !sameZone);
     }
 
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-    cmd.set_x(x);
-    cmd.set_y(-1);
-
-    for (int i = 0; i < dragItems.size(); ++i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+    QList<CardMoveRequest> cards;
+    cards.reserve(dragItems.size());
+    for (const CardDragItem *item : dragItems) {
+        cards.append(CardMoveRequest{item->getId()});
     }
 
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+    getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), x, -1, cards);
 }
 
 QRectF HandZone::boundingRect() const
@@ -90,23 +83,23 @@ void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
 
 void HandZone::reorganizeCards()
 {
-    if (!getLogic()->getCards().isEmpty()) {
-        const int cardCount = getLogic()->getCards().size();
+    if (!cardItems().isEmpty()) {
+        const int cardCount = cardItems().size();
         if (SettingsCache::instance().userInterface().getHorizontalHand()) {
             bool leftJustified = SettingsCache::instance().userInterface().getLeftJustified();
-            qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width();
+            qreal cardWidth = cardItems().at(0)->boundingRect().width();
             const int xPadding = leftJustified ? cardWidth * 1.4 : 5;
             qreal totalWidth =
                 leftJustified ? boundingRect().width() - (1 * xPadding) - 5 : boundingRect().width() - 2 * xPadding;
 
             if (cardCount == 1) {
-                CardItem *c = getLogic()->getCards().at(0);
+                CardItem *c = cardItems().at(0);
                 qreal xPosition = leftJustified ? xPadding : xPadding + (totalWidth - cardWidth) / 2;
                 c->setPos(xPosition, 5);
                 c->setRealZValue(0);
             } else {
                 for (int i = 0; i < cardCount; i++) {
-                    CardItem *c = getLogic()->getCards().at(i);
+                    CardItem *c = cardItems().at(i);
                     // If the total width of the cards is smaller than the available width,
                     // the cards do not need to overlap and are displayed in the center of the area.
                     if (cardWidth * cardCount > totalWidth) {
@@ -131,7 +124,7 @@ void HandZone::reorganizeCards()
 
 void HandZone::sortHand(const QList<CardList::SortOption> &options)
 {
-    if (getLogic()->getCards().isEmpty()) {
+    if (cardItems().isEmpty()) {
         return;
     }
 
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.h b/cockatrice/src/game_graphics/zones/hand_zone.h
index 5c91d684d..ed8f1e8d5 100644
--- a/cockatrice/src/game_graphics/zones/hand_zone.h
+++ b/cockatrice/src/game_graphics/zones/hand_zone.h
@@ -7,10 +7,10 @@
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
 #include <QtGlobal>
+#include <libcockatrice/game/board/card_list.h>
 #include <qtmetamacros.h>
 
 class HandZoneLogic;
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp
index 77a87a4af..08af241b6 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp
@@ -1,12 +1,6 @@
 #include "pile_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/pile_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../card_dimensions.h"
@@ -24,7 +18,12 @@
 #include <QString>
 #include <QTransform>
 #include <QtGlobal>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/pile_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <qnamespace.h>
 #include <string>
@@ -67,36 +66,35 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
 {
     painter->drawPath(shape());
 
-    if (!getLogic()->getCards().isEmpty()) {
-        getLogic()->getCards().at(0)->paintPicture(painter, getLogic()->getCards().at(0)->getTranslatedSize(painter),
-                                                   90);
+    if (!cardItems().isEmpty()) {
+        cardItems().at(0)->paintPicture(painter, cardItems().at(0)->getTranslatedSize(painter), 90);
     }
 
     painter->translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F);
     painter->rotate(-90);
     painter->translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F);
-    paintNumberEllipse(getLogic()->getCards().size(), 28, Qt::white, -1, -1, painter);
+    paintNumberEllipse(cardItems().size(), 28, Qt::white, -1, -1, painter);
 }
 
 void PileZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneLogic *startZone, const QPoint &)
 {
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-    cmd.set_x(0);
-    cmd.set_y(0);
-
-    for (int i = 0; i < dragItems.size(); ++i) {
-        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
-        cardToMove->set_card_id(dragItems[i]->getId());
-        if (dragItems[i]->isForceFaceDown()) {
-            cardToMove->set_face_down(true);
-        }
+    QList<CardMoveRequest> cards;
+    cards.reserve(dragItems.size());
+    for (const CardDragItem *item : dragItems) {
+        cards.append(CardMoveRequest{item->getId(), item->isForceFaceDown()});
     }
 
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+    getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), 0, 0, cards);
+}
+
+void PileZone::onCardAdded(CardState *addedCard)
+{
+    CardZone::onCardAdded(addedCard);
+    auto *addedItem = addedCard == nullptr ? nullptr : qobject_cast<CardItem *>(addedCard->parent());
+    if (addedItem) {
+        addedItem->setPos(0, 0);
+        addedItem->setVisible(false);
+    }
 }
 
 void PileZone::reorganizeCards()
@@ -126,15 +124,14 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         return;
     }
 
-    if (getLogic()->getCards().isEmpty()) {
+    if (cardItems().isEmpty()) {
         return;
     }
 
     bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
     bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
-    CardItem *card = bottomCard ? getLogic()->getCards().last() : getLogic()->getCards().first();
-    const int cardid =
-        getLogic()->contentsKnown() ? card->getId() : (bottomCard ? getLogic()->getCards().size() - 1 : 0);
+    CardItem *card = bottomCard ? cardItems().last() : cardItems().first();
+    const int cardid = getLogic()->contentsKnown() ? card->getId() : (bottomCard ? cardItems().size() - 1 : 0);
     CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), forceFaceDown);
     drag->grabMouse();
     setCursor(Qt::OpenHandCursor);
@@ -147,8 +144,8 @@ void PileZone::mouseReleaseEvent(QGraphicsSceneMouseEvent * /*event*/)
 
 void PileZone::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
-    if (!getLogic()->getCards().isEmpty()) {
-        getLogic()->getCards()[0]->processHoverEvent();
+    if (!cardItems().isEmpty()) {
+        cardItems()[0]->processHoverEvent();
     }
     QGraphicsItem::hoverEnterEvent(event);
 }
diff --git a/cockatrice/src/game_graphics/zones/pile_zone.h b/cockatrice/src/game_graphics/zones/pile_zone.h
index b2d8d0cd2..fa510ad52 100644
--- a/cockatrice/src/game_graphics/zones/pile_zone.h
+++ b/cockatrice/src/game_graphics/zones/pile_zone.h
@@ -33,6 +33,7 @@ public:
     [[nodiscard]] QPainterPath shape() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void reorganizeCards() override;
+    void onCardAdded(CardState *addedCard) override;
     void
     handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) override;
 
diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp
index d69ec32f5..ccac9decc 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/select_zone.cpp
@@ -1,8 +1,6 @@
 #include "select_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
-#include "../../game/zones/card_zone_logic.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 
@@ -17,6 +15,8 @@
 #include <QTransform>
 #include <QtGlobal>
 #include <QtMath>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <qnamespace.h>
 #include <qnumeric.h>
@@ -85,7 +85,7 @@ SelectZone *SelectZone::findOwningSelectZone(const QGraphicsItem *card)
 
 SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) const
 {
-    const auto &cards = getLogic()->getCards();
+    const auto &cards = cardItems();
     if (cards.isEmpty()) {
         return {0, boundingRect().height(), 0.0, 0.0, minOffset};
     }
@@ -97,7 +97,7 @@ SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) cons
 
 int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset) const
 {
-    const auto &cards = getLogic()->getCards();
+    const auto &cards = cardItems();
     if (cards.isEmpty()) {
         return 0;
     }
@@ -115,7 +115,7 @@ void SelectZone::restoreStaleEscapedCards()
     if (!cardClipContainer) {
         return;
     }
-    for (auto *card : getLogic()->getCards()) {
+    for (auto *card : cardItems()) {
         // A card parented to the zone (instead of the clip container) should
         // only occur while it is actively hovered. If hover cleanup was
         // missed, reparent it back so clipping resumes.
@@ -127,7 +127,7 @@ void SelectZone::restoreStaleEscapedCards()
 
 void SelectZone::layoutCardsVertically(const StackLayoutParams &params)
 {
-    const auto &cards = getLogic()->getCards();
+    const auto &cards = cardItems();
     if (cards.isEmpty() || params.cardCount <= 0) {
         return;
     }
@@ -162,9 +162,9 @@ SelectZone::~SelectZone()
     if (cardClipContainer) {
         // Reparent any hover-escaped cards back to the clip container so Qt's
         // parent-child tree is consistent for destruction. setParentItem() does
-        // not invalidate getLogic()->getCards() (it modifies the graphics tree,
-        // not the zone's logical card list).
-        for (auto *card : getLogic()->getCards()) {
+        // not invalidate cardItems() — it only moves the item in the graphics
+        // tree, it never changes the zone's contents.
+        for (auto *card : cardItems()) {
             if (card && card->parentItem() == this) {
                 card->setParentItem(cardClipContainer);
             }
@@ -172,12 +172,13 @@ SelectZone::~SelectZone()
     }
 }
 
-void SelectZone::onCardAdded(CardItem *addedCard)
+void SelectZone::onCardAdded(CardState *addedCard)
 {
-    if (cardClipContainer && addedCard) {
-        addedCard->setParentItem(cardClipContainer);
-        addedCard->setVisible(true);
-        addedCard->update();
+    auto *addedItem = addedCard == nullptr ? nullptr : qobject_cast<CardItem *>(addedCard->parent());
+    if (cardClipContainer && addedItem) {
+        addedItem->setParentItem(cardClipContainer);
+        addedItem->setVisible(true);
+        addedItem->update();
     } else {
         CardZone::onCardAdded(addedCard);
     }
@@ -247,7 +248,7 @@ void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         }
 
         QRectF selectionRect = QRectF(selectionOrigin, pos).normalized();
-        for (auto card : getLogic()->getCards()) {
+        for (auto card : cardItems()) {
             if (card->getAttachedTo() && card->getAttachedTo()->getZone() != getLogic()) {
                 continue;
             }
diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h
index 8a56949e3..8c81f0dbf 100644
--- a/cockatrice/src/game_graphics/zones/select_zone.h
+++ b/cockatrice/src/game_graphics/zones/select_zone.h
@@ -35,7 +35,7 @@ public:
 
     SelectZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr);
     ~SelectZone() override;
-    void onCardAdded(CardItem *addedCard) override;
+    void onCardAdded(CardState *addedCard) override;
 
     /**
      * @brief Temporarily reparents a card from the clip container to this zone so hover scaling is visible beyond clip
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp
index de1ff8ba9..d46a4bd94 100644
--- a/cockatrice/src/game_graphics/zones/stack_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp
@@ -1,11 +1,5 @@
 #include "stack_zone.h"
 
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/stack_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
@@ -19,7 +13,12 @@
 #include <QPoint>
 #include <QRectF>
 #include <QString>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/stack_zone_logic.h>
 #include <qnumeric.h>
 #include <string>
 
@@ -73,31 +72,21 @@ void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
     int index = calcDropIndexFromY(dropPoint.y(), !sameZone, MIN_CARD_VISIBLE);
     if (sameZone) {
         // Same-zone no-op: don't move a card onto itself
-        const auto &cards = getLogic()->getCards();
+        const auto &cards = cardItems();
         if (!cards.isEmpty() && cards.at(index)->getId() == dragItems.at(0)->getId()) {
             return;
         }
     }
 
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-    cmd.set_x(index);
-    cmd.set_y(0);
-
+    QList<CardMoveRequest> cards;
+    cards.reserve(dragItems.size());
     for (const CardDragItem *item : dragItems) {
         if (item) {
-            auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
-            cardToMove->set_card_id(item->getId());
-            if (item->isForceFaceDown()) {
-                cardToMove->set_face_down(true);
-            }
+            cards.append(CardMoveRequest{item->getId(), item->isForceFaceDown()});
         }
     }
 
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+    getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), index, 0, cards);
 }
 
 void StackZone::setHeight(qreal newHeight)
@@ -113,7 +102,7 @@ void StackZone::setHeight(qreal newHeight)
 
 void StackZone::reorganizeCards()
 {
-    if (!getLogic()->getCards().isEmpty()) {
+    if (!cardItems().isEmpty()) {
         const auto params = buildStackParams(MIN_CARD_VISIBLE);
         layoutCardsVertically(params);
     }
diff --git a/cockatrice/src/game_graphics/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp
index b704b79e0..0dffab353 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/table_zone.cpp
@@ -1,12 +1,6 @@
 #include "table_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/table_zone_logic.h"
 #include "../../interface/theme_manager.h"
 #include "../board/abstract_card_item.h"
 #include "../board/card_drag_item.h"
@@ -32,8 +26,12 @@
 #include <algorithm>
 #include <iterator>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <string>
@@ -62,7 +60,8 @@ TableZone::TableZone(TableZoneLogic *_logic, bool _mirrored, QGraphicsItem *pare
 
     updateBg();
 
-    height = MARGIN_TOP + MARGIN_BOTTOM + TABLEROWS * CardDimensions::HEIGHT + (TABLEROWS - 1) * PADDING_Y;
+    height = MARGIN_TOP + MARGIN_BOTTOM + TableZoneLogic::ROW_COUNT * CardDimensions::HEIGHT +
+             (TableZoneLogic::ROW_COUNT - 1) * PADDING_Y;
     width = MIN_WIDTH;
     currentMinimumWidth = width;
 
@@ -208,29 +207,20 @@ void TableZone::handleDropEventByGrid(const QList<CardDragItem *> &dragItems,
                                       CardZoneLogic *startZone,
                                       const QPoint &gridPoint)
 {
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-    cmd.set_x(gridPoint.x());
-    cmd.set_y(gridPoint.y());
-
-    for (const auto &item : dragItems) {
-        CardToMove *ctm = cmd.mutable_cards_to_move()->add_card();
-        ctm->set_card_id(item->getId());
-        if (item->isForceFaceDown()) {
-            ctm->set_face_down(true);
-        }
+    QList<CardMoveRequest> cards;
+    cards.reserve(dragItems.size());
+    for (const CardDragItem *item : dragItems) {
+        CardMoveRequest card{item->getId(), item->isForceFaceDown()};
         if (startZone->getName() != getLogic()->getName() && !item->isForceFaceDown()) {
-            const auto &card = item->getItem()->getCard();
-            if (card) {
-                ctm->set_pt(card.getInfo().getPowTough().toStdString());
+            const auto &cardInfo = item->getItem()->getCard();
+            if (cardInfo) {
+                card.pt = cardInfo.getInfo().getPowTough();
             }
         }
+        cards.append(card);
     }
 
-    startZone->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+    startZone->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), gridPoint.x(), gridPoint.y(), cards);
 }
 
 void TableZone::reorganizeCards()
@@ -238,8 +228,8 @@ void TableZone::reorganizeCards()
     // Calculate card stack widths so mapping functions work properly
     computeCardStackWidths();
 
-    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
-        QPoint gridPoint = getLogic()->getCards()[i]->getGridPos();
+    for (int i = 0; i < cardItems().size(); ++i) {
+        QPoint gridPoint = cardItems()[i]->getGridPos();
         if (gridPoint.x() == -1) {
             continue;
         }
@@ -248,21 +238,24 @@ void TableZone::reorganizeCards()
         qreal x = mapPoint.x();
         qreal y = mapPoint.y();
 
-        int numberAttachedCards = getLogic()->getCards()[i]->getAttachedCards().size();
+        int numberAttachedCards = cardItems()[i]->getAttachedCards().size();
         qreal actualX = x + numberAttachedCards * STACKED_CARD_OFFSET_X;
         qreal actualY = y;
         if (numberAttachedCards) {
             actualY += 15;
         }
 
-        getLogic()->getCards()[i]->setPos(actualX, actualY);
-        getLogic()->getCards()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY));
+        cardItems()[i]->setPos(actualX, actualY);
+        cardItems()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY));
 
-        QListIterator<CardItem *> attachedCardIterator(getLogic()->getCards()[i]->getAttachedCards());
+        QListIterator<CardState *> attachedCardIterator(cardItems()[i]->getAttachedCards());
         int j = 0;
         while (attachedCardIterator.hasNext()) {
             ++j;
-            CardItem *attachedCard = attachedCardIterator.next();
+            CardItem *attachedCard = qobject_cast<CardItem *>(attachedCardIterator.next()->parent());
+            if (attachedCard == nullptr) {
+                continue;
+            }
             qreal childX = actualX - j * STACKED_CARD_OFFSET_X;
             qreal childY = y + 5;
             attachedCard->setPos(childX, childY);
@@ -276,35 +269,18 @@ void TableZone::reorganizeCards()
 
 void TableZone::toggleTapped()
 {
-    QList<QGraphicsItem *> selectedItemsRaw = scene()->selectedItems();
-    QList<QGraphicsItem *> selectedItems;
-
-    auto isCardOnTable = [](const QGraphicsItem *item) {
-        if (auto card = qgraphicsitem_cast<const CardItem *>(item)) {
-            return card->getZone()->getName() == ZoneNames::TABLE;
-        }
-        return false;
-    };
-
-    std::copy_if(selectedItemsRaw.begin(), selectedItemsRaw.end(), std::back_inserter(selectedItems), isCardOnTable);
-
-    bool tapAll = std::any_of(selectedItems.begin(), selectedItems.end(), [](const QGraphicsItem *item) {
-        return !qgraphicsitem_cast<const CardItem *>(item)->getTapped();
-    });
-    QList<const ::google::protobuf::Message *> cmdList;
-    for (const auto &selectedItem : selectedItems) {
-        CardItem *temp = qgraphicsitem_cast<CardItem *>(selectedItem);
-        if (temp->getTapped() != tapAll) {
-            Command_SetCardAttr *cmd = new Command_SetCardAttr;
-            cmd->set_zone(getLogic()->getName().toStdString());
-            cmd->set_card_id(temp->getId());
-            cmd->set_attribute(AttrTapped);
-            cmd->set_attr_value(tapAll ? "1" : "0");
-            cmdList.append(cmd);
+    QList<CardState *> selectedCards;
+    for (auto *item : scene()->selectedItems()) {
+        auto *card = qgraphicsitem_cast<CardItem *>(item);
+        if (card && card->getZone()->getName() == ZoneNames::TABLE) {
+            selectedCards.append(card->getState());
         }
     }
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(
-        getLogic()->getPlayer()->getPlayerActions()->prepareGameCommand(cmdList));
+
+    const bool tapAll = std::any_of(selectedCards.begin(), selectedCards.end(),
+                                    [](const CardState *card) { return !card->getTapped(); });
+
+    getLogic()->getPlayer()->getPlayerActions()->actToggleTapped(getLogic()->getName(), selectedCards, tapAll);
 }
 
 void TableZone::resizeToContents()
@@ -312,9 +288,9 @@ void TableZone::resizeToContents()
     int xMax = 0;
 
     // Find rightmost card position, which includes the left margin amount.
-    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
-        if (getLogic()->getCards()[i]->pos().x() > xMax) {
-            xMax = (int)getLogic()->getCards()[i]->pos().x();
+    for (int i = 0; i < cardItems().size(); ++i) {
+        if (cardItems()[i]->pos().x() > xMax) {
+            xMax = (int)cardItems()[i]->pos().x();
         }
     }
 
@@ -335,9 +311,9 @@ void TableZone::resizeToContents()
 
 CardItem *TableZone::getCardFromGrid(const QPoint &gridPoint) const
 {
-    for (int i = 0; i < getLogic()->getCards().size(); i++) {
-        if (getLogic()->getCards().at(i)->getGridPoint() == gridPoint) {
-            return getLogic()->getCards().at(i);
+    for (int i = 0; i < cardItems().size(); i++) {
+        if (cardItems().at(i)->getGridPoint() == gridPoint) {
+            return cardItems().at(i);
         }
     }
     return 0;
@@ -354,8 +330,8 @@ void TableZone::computeCardStackWidths()
     // Each card stack is three grid points worth of card locations.
     // First pass: compute the number of cards at each card stack.
     QMap<int, int> cardStackCount;
-    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
-        const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos();
+    for (int i = 0; i < cardItems().size(); ++i) {
+        const QPoint &gridPoint = cardItems()[i]->getGridPos();
         if (gridPoint.x() == -1) {
             continue;
         }
@@ -366,8 +342,8 @@ void TableZone::computeCardStackWidths()
 
     // Second pass: compute the width at each card stack.
     cardStackWidth.clear();
-    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
-        const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos();
+    for (int i = 0; i < cardItems().size(); ++i) {
+        const QPoint &gridPoint = cardItems()[i]->getGridPos();
         if (gridPoint.x() == -1) {
             continue;
         }
@@ -375,8 +351,8 @@ void TableZone::computeCardStackWidths()
         const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y());
         const int stackCount = cardStackCount.value(key, 0);
         if (stackCount == 1) {
-            cardStackWidth.insert(key, CardDimensions::WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() *
-                                                                   STACKED_CARD_OFFSET_X);
+            cardStackWidth.insert(key, CardDimensions::WIDTH +
+                                           cardItems()[i]->getAttachedCards().size() * STACKED_CARD_OFFSET_X);
         } else {
             cardStackWidth.insert(key, CardDimensions::WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X);
         }
@@ -397,7 +373,7 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const
     }
 
     if (isInverted()) {
-        gridPoint.setY(TABLEROWS - 1 - gridPoint.y());
+        gridPoint.setY(TableZoneLogic::ROW_COUNT - 1 - gridPoint.y());
     }
 
     // Start with margin plus stacked card offset
@@ -423,10 +399,10 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
     const int gridPointHeight = CardDimensions::HEIGHT + PADDING_Y;
     int gridPointY = (y + PADDING_Y / 2) / gridPointHeight;
 
-    gridPointY = clampValidTableRow(gridPointY);
+    gridPointY = TableZoneLogic::clampValidTableRow(gridPointY);
 
     if (isInverted()) {
-        gridPointY = TABLEROWS - 1 - gridPointY;
+        gridPointY = TableZoneLogic::ROW_COUNT - 1 - gridPointY;
     }
 
     // Calculating the x-coordinate of the grid space requires adding up the
@@ -471,22 +447,3 @@ QPointF TableZone::closestGridPoint(const QPointF &point)
     }
     return mapFromGrid(gridPoint);
 }
-
-int TableZone::clampValidTableRow(const int row)
-{
-    if (row < 0) {
-        return 0;
-    }
-    if (row >= TABLEROWS) {
-        return TABLEROWS - 1;
-    }
-    return row;
-}
-
-int TableZone::tableRowToGridY(int tableRow)
-{
-    if (tableRow > 2) {
-        tableRow = 1;
-    }
-    return clampValidTableRow(2 - tableRow);
-}
diff --git a/cockatrice/src/game_graphics/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h
index ccd1d8e81..8aa4936ad 100644
--- a/cockatrice/src/game_graphics/zones/table_zone.h
+++ b/cockatrice/src/game_graphics/zones/table_zone.h
@@ -17,6 +17,7 @@
 #include <QPoint>
 #include <QPointF>
 #include <QtGlobal>
+#include <libcockatrice/game/zones/table_zone_logic.h>
 #include <qtmetamacros.h>
 
 class CardDragItem;
@@ -25,7 +26,6 @@ class CardZoneLogic;
 class QColor;
 class QGraphicsItem;
 class QPainter;
-class TableZoneLogic;
 template <typename T> class QList;
 
 /**
@@ -42,8 +42,6 @@ signals:
     void sizeChanged();
 
 private:
-    static const int TABLEROWS = 3;
-
     /*
     Margins between table edges and cards, paddings between cards
     */
@@ -181,15 +179,6 @@ public:
 
     QPointF closestGridPoint(const QPointF &point) override;
 
-    static int clampValidTableRow(const int row);
-
-    /**
-     * Converts a card's logical table row (0=creatures, 1=noncreatures, 2=lands)
-     * to the corresponding grid Y coordinate. Cards with tableRow > 2 (e.g.,
-     * instants/sorceries) default to the noncreatures row.
-     */
-    static int tableRowToGridY(int tableRow);
-
     /**
        Resizes the TableZone in case CardItems are within or
        outside of the TableZone constraints.
diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp
index a2aa124dc..be2e471d4 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone.cpp
@@ -1,11 +1,6 @@
 #include "view_zone.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_info.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../card_dimensions.h"
@@ -26,8 +21,11 @@
 #include <QtMath>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
-#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
@@ -42,21 +40,23 @@ class QGraphicsItem;
 ZoneViewZone::ZoneViewZone(ZoneViewZoneLogic *_logic, QGraphicsItem *parent)
     : SelectZone(_logic, parent), bRect(QRectF()), minRows(0), groupBy(CardList::NoSort), sortBy(CardList::NoSort)
 {
-    if (!(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getRevealZone() &&
-          !qobject_cast<ZoneViewZoneLogic *>(getLogic())->getWriteableRevealZone())) {
-        qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->getViews().append(this);
+    auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(getLogic());
+    if (!(viewLogic->getRevealZone() && !viewLogic->getWriteableRevealZone())) {
+        viewLogic->getOriginalZone()->getViews().append(viewLogic);
     }
     connect(_logic, &ZoneViewZoneLogic::closeView, this, &ZoneViewZone::close);
 }
 
 void ZoneViewZone::addToViews()
 {
-    qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->getViews().append(this);
+    auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(getLogic());
+    viewLogic->getOriginalZone()->getViews().append(viewLogic);
 }
 
 void ZoneViewZone::removeFromViews()
 {
-    qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->getViews().removeOne(this);
+    auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(getLogic());
+    viewLogic->getOriginalZone()->getViews().removeOne(viewLogic);
 }
 
 /**
@@ -66,9 +66,9 @@ void ZoneViewZone::removeFromViews()
 void ZoneViewZone::close()
 {
     emit closed();
-    if (!(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getRevealZone() &&
-          !qobject_cast<ZoneViewZoneLogic *>(getLogic())->getWriteableRevealZone())) {
-        qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->getViews().removeOne(this);
+    auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(getLogic());
+    if (!(viewLogic->getRevealZone() && !viewLogic->getWriteableRevealZone())) {
+        viewLogic->getOriginalZone()->getViews().removeOne(viewLogic);
     }
     deleteLater();
 }
@@ -95,28 +95,27 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
             auto copy = new CardItem(getLogic()->getPlayer(), this, cardRef, card->id());
             copy->setFaceDown(card->face_down());
 
-            getLogic()->addCard(copy, false, i);
+            getLogic()->addCard(copy->getState(), false, i);
         }
         reorganizeCards();
     } else if (!qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->contentsKnown()) {
-        Command_DumpZone cmd;
-        cmd.set_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-        cmd.set_zone_name(getLogic()->getName().toStdString());
-        cmd.set_number_cards(numberCards);
-        cmd.set_is_reversed(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getIsReversed());
-
-        PendingCommand *pend = getLogic()->getPlayer()->getPlayerActions()->prepareGameCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &ZoneViewZone::zoneDumpReceived);
-        getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(pend);
+        auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(getLogic());
+        PendingCommand *pend = viewLogic->prepareZoneDump();
+        if (pend != nullptr) {
+            // A local game answers synchronously, so the handler has to be connected before the
+            // command is sent or the response would be delivered to nobody.
+            connect(pend, &PendingCommand::finished, this, &ZoneViewZone::zoneDumpReceived);
+            viewLogic->sendZoneDump(pend);
+        }
     } else {
         const CardList &c = qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->getCards();
         int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size());
         for (int i = 0; i < number; i++) {
-            CardItem *card = c.at(i);
+            CardState *card = c.at(i);
             auto copy = new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId());
             copy->setFaceDown(card->getFaceDown());
 
-            getLogic()->addCard(copy, false, i);
+            getLogic()->addCard(copy->getState(), false, i);
         }
         reorganizeCards();
     }
@@ -132,7 +131,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
         auto cardProviderId = QString::fromStdString(cardInfo.provider_id());
         auto card = new CardItem(getLogic()->getPlayer(), this, {cardName, cardProviderId}, cardInfo.id(), getLogic());
         card->setFaceDown(cardInfo.face_down());
-        getLogic()->rawInsertCard(card, i);
+        getLogic()->rawInsertCard(card->getState(), i);
     }
 
     qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
@@ -146,11 +145,11 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
 void ZoneViewZone::reorganizeCards()
 {
     // filter cards
-    CardList cardsToDisplay = CardList(getLogic()->getCards().getContentsKnown());
-    for (auto card : getLogic()->getCards()) {
+    CardList cardsToDisplay = CardList(getLogic()->contentsKnown());
+    for (auto card : cardItems()) {
         if (filterString.check(card->getCard().getCardPtr())) {
             card->show();
-            cardsToDisplay.append(card);
+            cardsToDisplay.append(card->getState());
         } else {
             card->hide();
         }
@@ -218,7 +217,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
         const auto extractor = CardList::getExtractorFor(pileOption);
 
         for (int i = 0; i < cardCount; i++) {
-            CardItem *c = cards.at(i);
+            CardState *c = cards.at(i);
+            CardItem *cItem = qobject_cast<CardItem *>(c->parent());
             QString columnProp = extractor(c);
 
             if (i) { // if not the first card
@@ -233,8 +233,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
             lastColumnProp = columnProp;
             qreal x = col * CardDimensions::WIDTH_F;
             qreal y = row * CardDimensions::HEIGHT_F / 3;
-            c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
-            c->setRealZValue(i);
+            cItem->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
+            cItem->setRealZValue(i);
             longestRow = qMax(row, longestRow);
         }
 
@@ -259,11 +259,11 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
         qCDebug(ViewZoneLog) << "reorganizeCards: rows=" << rows << "cols=" << cols;
 
         for (int i = 0; i < cardCount; i++) {
-            CardItem *c = cards.at(i);
+            auto *cItem = qobject_cast<CardItem *>(cards.at(i)->parent());
             qreal x = (i / rows) * CardDimensions::WIDTH_F;
             qreal y = (i % rows) * CardDimensions::HEIGHT_F / 3;
-            c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
-            c->setRealZValue(i);
+            cItem->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
+            cItem->setRealZValue(i);
         }
 
         return GridSize{rows, qMax(cols, 1)};
@@ -301,24 +301,13 @@ void ZoneViewZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
                                    CardZoneLogic *startZone,
                                    const QPoint & /*dropPoint*/)
 {
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-    cmd.set_x(0);
-    cmd.set_y(0);
-    cmd.set_is_reversed(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getIsReversed());
-
+    QList<CardMoveRequest> cards;
+    cards.reserve(dragItems.size());
     for (int i = 0; i < dragItems.size(); ++i) {
-        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
-        cardToMove->set_card_id(dragItems[i]->getId());
-        if (dragItems[i]->isForceFaceDown()) {
-            cardToMove->set_face_down(true);
-        }
+        cards.append(CardMoveRequest{dragItems[i]->getId(), dragItems[i]->isForceFaceDown()});
     }
 
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+    getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), 0, 0, cards);
 }
 
 void ZoneViewZone::setGeometry(const QRectF &rect)
diff --git a/cockatrice/src/game_graphics/zones/view_zone.h b/cockatrice/src/game_graphics/zones/view_zone.h
index 4032da760..f91b24834 100644
--- a/cockatrice/src/game_graphics/zones/view_zone.h
+++ b/cockatrice/src/game_graphics/zones/view_zone.h
@@ -7,7 +7,6 @@
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
@@ -17,6 +16,7 @@
 #include <QSizeF>
 #include <QString>
 #include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/game/board/card_list.h>
 #include <qnamespace.h>
 #include <qtmetamacros.h>
 
diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
index 8c82d6401..3c6cf9d02 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
@@ -1,14 +1,9 @@
 #include "view_zone_widget.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../client/translation.h"
 #include "../../filters/syntax_help.h"
-#include "../../game/board/card_list.h"
-#include "../../game/player/player_actions.h"
-#include "../../game/player/player_logic.h"
-#include "../../game/zones/card_zone_logic.h"
-#include "../../game/zones/view_zone_logic.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_icon.h"
 #include "../card_dimensions.h"
 #include "../z_values.h"
 #include "libcockatrice/utility/macros.h"
@@ -45,7 +40,12 @@
 #include <QVariant>
 #include <QWidget>
 #include <QtGlobal>
-#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
+#include <libcockatrice/game/board/card_list.h>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/translation.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <qnamespace.h>
@@ -94,8 +94,8 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
         searchEdit.setFocusPolicy(Qt::ClickFocus);
         searchEdit.setPlaceholderText(tr("Search by card name (or search expressions)"));
         searchEdit.setClearButtonEnabled(true);
-        searchEdit.addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
-        auto help = searchEdit.addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
+        searchEdit.addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
+        auto help = searchEdit.addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
 
         connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(&searchEdit); });
 
@@ -178,9 +178,10 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
 
     vbox->addItem(zoneHBox);
 
-    zone = new ZoneViewZone(new ZoneViewZoneLogic(player, _origZone, numberCards, _revealZone, _writeableRevealZone,
-                                                  _isReversed, zoneContainer),
-                            zoneContainer);
+    zone =
+        new ZoneViewZone(new ZoneViewZoneLogic(player, _origZone, numberCards, _revealZone, _writeableRevealZone,
+                                               _isReversed, &SettingsCache::instance().userInterface(), zoneContainer),
+                         zoneContainer);
     connect(zone, &ZoneViewZone::wheelEventReceived, scrollBarProxy, &ScrollableGraphicsProxyWidget::recieveWheelEvent);
 
     retranslateUi();
@@ -570,7 +571,7 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
     // manually call zone->close in order to remove it from the origZones views
     zone->close();
     if (shuffleCheckBox.isChecked()) {
-        player->getPlayerActions()->sendGameCommand(Command_Shuffle());
+        player->getPlayerActions()->actShuffle();
     }
     zoneDeleted();
     event->accept();
diff --git a/cockatrice/src/installer_close_server.cpp b/cockatrice/src/installer_close_server.cpp
new file mode 100644
index 000000000..26f0b2c87
--- /dev/null
+++ b/cockatrice/src/installer_close_server.cpp
@@ -0,0 +1,81 @@
+#include "installer_close_server.h"
+
+#include <QCoreApplication>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QTimer>
+#include <libcockatrice/utility/installer_close_protocol.h>
+#include <libcockatrice/utility/local_server_name.h>
+
+namespace
+{
+/// The one line the probe writes, from the header both ends include. A QByteArray view of
+/// the shared literal, so the client cannot drift from the probe's copy.
+const QByteArray CLOSE_COMMAND = QByteArray::fromRawData(INSTALLER_CLOSE_COMMAND, sizeof(INSTALLER_CLOSE_COMMAND) - 1);
+
+/// How long a connection that never sends the command may stay open. The probe writes and
+/// closes at once, so this only reaps a stray client; it must not run while a close request
+/// is being handled, which is why it is a timer on the socket and not a disconnected slot.
+constexpr int STRAY_CONNECTION_MILLISECONDS = 5000;
+} // namespace
+
+InstallerCloseServer::InstallerCloseServer(QObject *parent) : QObject(parent)
+{
+}
+
+QString InstallerCloseServer::socketNameForUser(qint64 processId, const QString &userName)
+{
+    return QStringLiteral("CockatriceInstallerClose-%1-%2").arg(processId).arg(userName);
+}
+
+QString InstallerCloseServer::socketName(qint64 processId)
+{
+    // The same scoping helper the single-instance socket uses, so the probe only has to
+    // reproduce one rule (USER, then USERNAME, then the home directory name).
+    return scopedLocalServerName(QStringLiteral("CockatriceInstallerClose-%1").arg(processId));
+}
+
+bool InstallerCloseServer::listen()
+{
+    if (server != nullptr) {
+        return server->isListening();
+    }
+    name = socketName(QCoreApplication::applicationPid());
+    server = new QLocalServer(this);
+    // A crashed instance can leave a Unix socket file behind; on Windows this is a no-op.
+    QLocalServer::removeServer(name);
+    if (!server->listen(name)) {
+        delete server;
+        server = nullptr;
+        return false;
+    }
+
+    connect(server, &QLocalServer::newConnection, this, [this]() {
+        while (QLocalSocket *socket = server->nextPendingConnection()) {
+            // No disconnected -> deleteLater() slot: the close request can spin a nested
+            // event loop, the probe disconnects while it runs, and a deferred delete would
+            // then free the socket from inside its own readyRead emission. The reaper covers
+            // a client that never sends the line; the handler below deletes after the emit.
+            auto *reaper = new QTimer(socket);
+            reaper->setSingleShot(true);
+            connect(reaper, &QTimer::timeout, socket, &QObject::deleteLater);
+            reaper->start(STRAY_CONNECTION_MILLISECONDS);
+            connect(socket, &QLocalSocket::readyRead, this, [this, socket, reaper]() {
+                if (!socket->canReadLine()) {
+                    return;
+                }
+                if (socket->readLine() != CLOSE_COMMAND) {
+                    return;
+                }
+                // Stop the reaper before the emit: the receiver may close the window and run
+                // a nested event loop for as long as the user takes, and the reaper must not
+                // free the socket from inside that loop while this handler still holds it.
+                reaper->stop();
+                emit closeRequested();
+                socket->disconnectFromServer();
+                socket->deleteLater();
+            });
+        }
+    });
+    return true;
+}
diff --git a/cockatrice/src/installer_close_server.h b/cockatrice/src/installer_close_server.h
new file mode 100644
index 000000000..847c35523
--- /dev/null
+++ b/cockatrice/src/installer_close_server.h
@@ -0,0 +1,50 @@
+#ifndef COCKATRICE_INSTALLER_CLOSE_SERVER_H
+#define COCKATRICE_INSTALLER_CLOSE_SERVER_H
+
+#include <QObject>
+#include <QString>
+
+class QLocalServer;
+
+/**
+ * @brief Listens for the installer's request to close this instance gracefully.
+ *
+ * The Windows installer cannot reach an instance whose window is hidden in the notification
+ * area with WM_CLOSE, and it must not kill a process that may hold an unsaved deck. It
+ * connects to this local socket instead and writes one line; the instance then closes the
+ * same way its own close button does - saving settings and answering its own confirmation,
+ * never bypassing it.
+ *
+ * The socket name carries the process id, so every instance has its own and an installer
+ * that found several can ask each one. It is built by installerCloseSocketName() in
+ * tools/installer-holder-probe/installer_close_name.h; the two must stay identical.
+ */
+class InstallerCloseServer : public QObject
+{
+    Q_OBJECT
+public:
+    explicit InstallerCloseServer(QObject *parent = nullptr);
+
+    /**
+     * @brief Starts listening. A failure is not fatal: the installer falls back to
+     *        WM_CLOSE, which is what older clients answer.
+     */
+    bool listen();
+
+    /// The socket name this process listens on. The installer's probe builds the same
+    /// string from the process id and the account name.
+    static QString socketName(qint64 processId);
+
+    /// The name for an explicit account, exposed so the probe's name helper and this one
+    /// can be tested against each other.
+    static QString socketNameForUser(qint64 processId, const QString &userName);
+
+signals:
+    void closeRequested();
+
+private:
+    QLocalServer *server = nullptr;
+    QString name;
+};
+
+#endif // COCKATRICE_INSTALLER_CLOSE_SERVER_H
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
index 4f77c7096..2d35538d2 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@@ -238,6 +238,7 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
     });
 
     card.emitPixmapUpdated();
+    emit getInstance().pixmapLoaded(card);
 }
 
 void CardPictureLoader::deleteAllLocalOverrides(const ExactCard &card)
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
index c6d91570b..0c73e5d59 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
@@ -146,6 +146,14 @@ signals:
     /** @brief Emitted after the worker has finished clearing the network and redirect caches. */
     void networkCacheCleared();
 
+    /**
+     * @brief Emitted once an image has been loaded and put into the pixmap cache.
+     *
+     * Views that paint cards from the loader without owning a widget per card can
+     * listen to this to repaint the rows whose picture just became available.
+     */
+    void pixmapLoaded(const ExactCard &card);
+
 private slots:
     /**
      * @brief Triggered when the user changes the picture download settings.
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
index 3b26c8033..a731d067a 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
@@ -11,6 +11,7 @@
 #include <QSharedPointer>
 #include <QTimer>
 #include <QUrl>
+#include <QtGlobal>
 
 class ExactCard;
 
@@ -38,32 +39,94 @@ void CardPictureLoaderStatusBar::cleanOldEntries()
     if (!loadLog || !loadLog->popup) {
         return;
     }
-    for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
-         loadLog->popup->findChildren<CardPictureLoaderRequestStatusDisplayWidget *>()) {
+
+    const QDateTime now = QDateTime::currentDateTime();
+    // Removing an entry mutates the log, so walk a copy of it.
+    const QList<CardPictureLoaderRequestStatusDisplayWidget *> entries = logEntries;
+    for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : entries) {
         statusDisplayWidget->queryElapsedSeconds();
-        if (statusDisplayWidget->getFinished() &&
-            QDateTime::fromString(statusDisplayWidget->getStartTime()).secsTo(QDateTime::currentDateTime()) > 10) {
-            loadLog->removeSettingsWidget(statusDisplayWidget);
-            progressBar->setMaximum(progressBar->maximum() - 1);
-            progressBar->setValue(progressBar->value() - 1);
+        if (!statusDisplayWidget->getFinished()) {
+            continue;
+        }
+        if (QDateTime::fromString(statusDisplayWidget->getStartTime()).secsTo(now) > LOG_ENTRY_LIFETIME_SECS) {
+            removeLogEntry(statusDisplayWidget);
         }
     }
 }
 
 void CardPictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName)
 {
-    loadLog->addSettingsWidget(new CardPictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName));
+    if (logEntries.size() >= MAX_LOG_ENTRIES) {
+        trimLog();
+    }
+
+    auto *entry = new CardPictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName);
+    loadLog->addSettingsWidget(entry);
+    logEntries.append(entry);
+    entriesByUrl.insert(entry->getUrl(), entry);
     progressBar->setMaximum(progressBar->maximum() + 1);
 }
 
 void CardPictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url)
 {
-    progressBar->setValue(progressBar->value() + 1);
-    for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget :
-         loadLog->popup->findChildren<CardPictureLoaderRequestStatusDisplayWidget *>()) {
-        if (statusDisplayWidget->getUrl() == url.toString()) {
-            statusDisplayWidget->queryElapsedSeconds();
-            statusDisplayWidget->setFinished();
+    const QList<CardPictureLoaderRequestStatusDisplayWidget *> entries = entriesByUrl.values(url.toString());
+    if (entries.isEmpty()) {
+        // The entry may already have been dropped from the log; the download
+        // itself still succeeded, there is just nothing left to mark.
+        return;
+    }
+
+    int finishedEntries = 0;
+    for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : entries) {
+        if (statusDisplayWidget->getFinished()) {
+            continue;
+        }
+        statusDisplayWidget->queryElapsedSeconds();
+        statusDisplayWidget->setFinished();
+        ++finishedEntries;
+    }
+
+    // The bar counts the entries currently in the log, so only entries that are
+    // still listed move it.
+    progressBar->setValue(progressBar->value() + finishedEntries);
+}
+
+void CardPictureLoaderStatusBar::trimLog()
+{
+    if (logEntries.isEmpty()) {
+        return;
+    }
+
+    // Prefer evicting an entry that has already finished; only fall back to an
+    // in-flight request when the whole log is still pending.
+    CardPictureLoaderRequestStatusDisplayWidget *toRemove = nullptr;
+    for (CardPictureLoaderRequestStatusDisplayWidget *entry : logEntries) {
+        if (entry->getFinished()) {
+            toRemove = entry;
+            break;
         }
     }
-}
\ No newline at end of file
+
+    removeLogEntry(toRemove != nullptr ? toRemove : logEntries.constFirst());
+}
+
+void CardPictureLoaderStatusBar::removeLogEntry(CardPictureLoaderRequestStatusDisplayWidget *entry)
+{
+    if (entry == nullptr) {
+        return;
+    }
+
+    logEntries.removeOne(entry);
+    entriesByUrl.remove(entry->getUrl(), entry);
+
+    // The progress bar's maximum counts the entries currently in the log and
+    // its value the finished ones, so dropping an entry moves both counters back.
+    // Move the value first: a maximum of 0 turns the bar into a busy indicator and
+    // resets its value.
+    if (entry->getFinished()) {
+        progressBar->setValue(qMax(0, progressBar->value() - 1));
+    }
+    progressBar->setMaximum(qMax(0, progressBar->maximum() - 1));
+
+    loadLog->removeSettingsWidget(entry);
+}
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
index 2ba386c42..7f614e28f 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h
@@ -1,10 +1,13 @@
 #ifndef PICTURE_LOADER_STATUS_BAR_H
 #define PICTURE_LOADER_STATUS_BAR_H
 
+#include <QList>
+#include <QMultiHash>
 #include <QString>
 #include <QWidget>
 #include <qtmetamacros.h>
 
+class CardPictureLoaderRequestStatusDisplayWidget;
 class ExactCard;
 class QHBoxLayout;
 class QProgressBar;
@@ -21,11 +24,20 @@ class SettingsButtonWidget;
  * - Shows overall progress of image downloads.
  * - Maintains a log of individual requests via a popup (SettingsButtonWidget).
  * - Cleans up finished request entries automatically after a delay.
+ *
+ * The log is a diagnostic view, not a queue: it keeps at most MAX_LOG_ENTRIES
+ * entries and indexes them by URL, so a burst of requests stays O(1) per event
+ * instead of scanning every entry the popup holds.
  */
 class CardPictureLoaderStatusBar : public QWidget
 {
     Q_OBJECT
 public:
+    /** Entries kept in the log; older ones are evicted as new requests arrive. */
+    static constexpr int MAX_LOG_ENTRIES = 50;
+    /** Seconds a finished entry stays in the log before it is cleaned up. */
+    static constexpr int LOG_ENTRY_LIFETIME_SECS = 10;
+
     /**
      * @brief Constructs a status bar with progress bar and log button.
      * @param parent Parent widget
@@ -55,10 +67,28 @@ public slots:
     void cleanOldEntries();
 
 private:
+    /**
+     * @brief Evicts the oldest finished entry (or the oldest entry if none finished)
+     *        until the log fits within MAX_LOG_ENTRIES.
+     */
+    void trimLog();
+
+    /**
+     * @brief Removes one entry from the log, its URL index and the popup, and keeps
+     *        the progress bar counters in step with the entries that remain.
+     * @param entry Entry to remove
+     */
+    void removeLogEntry(CardPictureLoaderRequestStatusDisplayWidget *entry);
+
     QHBoxLayout *layout;           ///< Horizontal layout containing progress bar and log button
     QProgressBar *progressBar;     ///< Progress bar showing overall download progress
     SettingsButtonWidget *loadLog; ///< Popup log showing individual request statuses
     QTimer *cleaner;               ///< Timer for periodically cleaning old log entries
+    QList<CardPictureLoaderRequestStatusDisplayWidget *> logEntries; ///< Logged requests, oldest first
+    // A URL can back several live entries: a request parked for a deferred retry is re-queued while
+    // its first entry is still pending, so a completion must finish every entry for that URL.
+    QMultiHash<QString, CardPictureLoaderRequestStatusDisplayWidget *>
+        entriesByUrl; ///< Log entries indexed by their URL for O(1) completion lookup
 };
 
 #endif // PICTURE_LOADER_STATUS_BAR_H
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp
index d413a6c04..c8fa2a6f8 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp
@@ -1,5 +1,6 @@
 #include "deck_loader.h"
 
+#include "../theme_manager.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h"
@@ -38,6 +39,7 @@
 #include <QTextTableFormat>
 #include <QVector>
 #include <QtConcurrentRun>
+#include <algorithm>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/import/card_name_normalizer.h>
@@ -371,8 +373,12 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out,
         saveToStream_DeckHeader(out, deckList);
     }
 
-    // loop zones
-    for (auto zoneNode : deckList.getZoneNodes()) {
+    // Plain deck readers expect the main deck before the sideboard. Reorder a
+    // copy so native saves and the relative order of other zones stay intact.
+    auto zones = deckList.getZoneNodes();
+    std::stable_partition(zones.begin(), zones.end(),
+                          [](const auto *zone) { return zone->getName() == DECK_ZONE_MAIN; });
+    for (auto zoneNode : zones) {
         saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
 
         // end of zone
@@ -579,6 +585,8 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode
     if (!cards.isEmpty()) {
         QTextBlockFormat blockFormat;
         QTextCharFormat charFormat;
+        // Family comes from the DeckList theme role; sizes/weights unchanged.
+        charFormat.setFontFamilies({themeManager->deckListFont().family()});
         charFormat.setFontPointSize(11);
         charFormat.setFontWeight(QFont::Bold);
         cursor->insertBlock(blockFormat, charFormat);
@@ -592,6 +600,7 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode
             const AbstractDecklistCardNode *card = cards[i];
 
             QTextCharFormat cellCharFormat;
+            cellCharFormat.setFontFamilies({themeManager->deckListFont().family()});
             cellCharFormat.setFontPointSize(9);
 
             QTextTableCell cell = table->cellAt(i, 0);
@@ -613,6 +622,7 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode
 
         QTextBlockFormat blockFormat;
         QTextCharFormat charFormat;
+        charFormat.setFontFamilies({themeManager->deckListFont().family()});
         charFormat.setFontPointSize(14);
         charFormat.setFontWeight(QFont::Bold);
 
@@ -640,14 +650,18 @@ void DeckLoader::printDeckList(QPrinter *printer, const DeckList &deckList)
 {
     QTextDocument doc;
 
-    QFont font("Serif");
-    font.setStyleHint(QFont::Serif);
+    // Family comes from the DeckList theme role; the print sizes/weights below stay unchanged.
+    // Print output is a one-shot snapshot and intentionally does not subscribe
+    // to fontsChanged (there is no live view to repaint); reprinting picks up
+    // the current role font.
+    QFont font = themeManager->deckListFont();
     doc.setDefaultFont(font);
 
     QTextCursor cursor(&doc);
 
     QTextBlockFormat headerBlockFormat;
     QTextCharFormat headerCharFormat;
+    headerCharFormat.setFontFamilies({themeManager->deckListFont().family()});
     headerCharFormat.setFontPointSize(16);
     headerCharFormat.setFontWeight(QFont::Bold);
 
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h
index 16402b14b..39a12bed4 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.h
+++ b/cockatrice/src/interface/deck_loader/deck_loader.h
@@ -7,13 +7,14 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "deck_file_format.h"
-#include "loaded_deck.h"
-
 #include <QLoggingCategory>
 #include <QObject>
+#include <QPrinter>
 #include <QString>
 #include <QStringList>
+#include <QTextCursor>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <optional>
 #include <qtmetamacros.h>
 
diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp
index 0d8390015..8cc574cb0 100644
--- a/cockatrice/src/interface/intents/intent_login.cpp
+++ b/cockatrice/src/interface/intents/intent_login.cpp
@@ -27,9 +27,9 @@ void IntentGetLoginCredentials::onPreconditionSatisfied()
     ServersSettings &servers = SettingsCache::instance().servers();
     const int index = servers.findServerIndex(context->hostname, context->port);
 
-    if (index >= 0) {
-        context->username = servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
-        context->password = servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
+    if (const auto server = servers.getServer(index)) {
+        context->username = server->username;
+        context->password = server->password;
         emitFinished();
     } else {
         emitFailed(tr("No saved credentials for this server"));
@@ -69,9 +69,8 @@ void IntentGetLoginCredentials::onPreconditionNotSatisfied()
         // it with the raw hostname when addNewServer updates the entry in place.
         QString saveName = context->hostname;
         const int existingIndex = servers.findServerIndex(context->hostname, context->port);
-        if (existingIndex >= 0) {
-            saveName =
-                servers.getValue(QString("saveName%1").arg(existingIndex), "server", "server_details").toString();
+        if (const auto existing = servers.getServer(existingIndex)) {
+            saveName = existing->saveName;
             if (saveName.isEmpty()) {
                 saveName = context->hostname;
             }
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.cpp b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
index 5b673d106..20704a551 100644
--- a/cockatrice/src/interface/intents/intent_open_local_deck.cpp
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
@@ -1,14 +1,14 @@
 #include "intent_open_local_deck.h"
 
-#include "../deck_loader/deck_file_format.h"
 #include "../deck_loader/deck_loader.h"
-#include "../deck_loader/loaded_deck.h"
 #include "../widgets/tabs/tab_supervisor.h"
 #include "intent_wait_for_database_load.h"
 #include "libcockatrice/card/database/card_database.h"
 #include "libcockatrice/card/database/card_database_loader.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <optional>
 
 IntentOpenLocalDeck::IntentOpenLocalDeck(TabSupervisor *_tabSupervisor, const QString &_file)
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.h b/cockatrice/src/interface/intents/intent_open_shared_deck.h
index afce2370f..2d9dc5528 100644
--- a/cockatrice/src/interface/intents/intent_open_shared_deck.h
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.h
@@ -1,7 +1,6 @@
 #ifndef COCKATRICE_INTENT_OPEN_SHARED_DECK_H
 #define COCKATRICE_INTENT_OPEN_SHARED_DECK_H
 
-#include "../deck_loader/loaded_deck.h"
 #include "contexts/context_open_deck.h"
 #include "intent.h"
 
@@ -9,6 +8,7 @@
 #include <QMap>
 #include <QScopedPointer>
 #include <QString>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <memory>
 #include <qtmetamacros.h>
 
diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp
index 1e482a4f1..e0b7bb2fb 100644
--- a/cockatrice/src/interface/intents/url_parser.cpp
+++ b/cockatrice/src/interface/intents/url_parser.cpp
@@ -418,12 +418,10 @@ void IntentUrlParser::restoreToPreviousServer(const PendingIntentChain &chain)
 
         ServersSettings &servers = SettingsCache::instance().servers();
         const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort);
-        if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) {
-            const QString username =
-                servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
-            const QString password =
-                servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
-            client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password);
+        const auto server = servers.getServer(index);
+        if (server && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) {
+            client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), server->username,
+                                    server->password);
             return;
         }
         client->disconnectFromServer();
@@ -438,11 +436,9 @@ void IntentUrlParser::restoreToPreviousServer(const PendingIntentChain &chain)
     // when credentials are saved, otherwise stay offline.
     ServersSettings &servers = SettingsCache::instance().servers();
     const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort);
-    if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) {
-        const QString username =
-            servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
-        const QString password =
-            servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
-        client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password);
+    const auto server = servers.getServer(index);
+    if (server && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) {
+        client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), server->username,
+                                server->password);
     }
 }
diff --git a/cockatrice/src/interface/palette_editor/color_button.cpp b/cockatrice/src/interface/palette_editor/color_button.cpp
index a7db23d31..ae9bd6297 100644
--- a/cockatrice/src/interface/palette_editor/color_button.cpp
+++ b/cockatrice/src/interface/palette_editor/color_button.cpp
@@ -1,5 +1,7 @@
 #include "color_button.h"
 
+#include "../theme_manager.h"
+
 #include <QBrush>
 #include <QColorDialog>
 #include <QFont>
@@ -21,6 +23,7 @@ ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
     setCursor(Qt::PointingHandCursor);
     setToolTip(tr("Click to pick a color"));
     connect(this, &QToolButton::clicked, this, &ColorButton::pickColor);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &ColorButton::updateSwatch);
 }
 
 void ColorButton::setColor(const QColor &c)
@@ -73,7 +76,8 @@ void ColorButton::updateSwatch()
     // Hex label — black or white for contrast
     int luma = 0.299 * color.red() + 0.587 * color.green() + 0.114 * color.blue();
     painter.setPen((luma > 128 && color.alpha() > 80) ? QColor(0, 0, 0, 180) : QColor(255, 255, 255, 200));
-    QFont f = font();
+    // Family comes from the InterfaceDefault theme role; the 8px size stays caller-side.
+    QFont f = themeManager->appFont(AppFont::InterfaceDefault);
     f.setPixelSize(8);
     painter.setFont(f);
     painter.drawText(rect(), Qt::AlignCenter, color.name().toUpper());
diff --git a/cockatrice/src/interface/palette_editor/font_grid_widget.cpp b/cockatrice/src/interface/palette_editor/font_grid_widget.cpp
new file mode 100644
index 000000000..44ad59551
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/font_grid_widget.cpp
@@ -0,0 +1,136 @@
+#include "font_grid_widget.h"
+
+#include "../theme_manager.h"
+
+#include <QApplication>
+#include <QFont>
+#include <QFontComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QMetaEnum>
+#include <QSpinBox>
+#include <QtGlobal>
+
+static constexpr int MIN_FONT_SIZE = 6;
+static constexpr int MAX_FONT_SIZE = 72;
+static constexpr int FALLBACK_FONT_SIZE = 10;
+
+static const QMap<AppFont::Role, const char *> APP_FONT_DESCRIPTIONS = {
+    {AppFont::InterfaceDefault, QT_TR_NOOP("Default font for menus, dialogs and widgets")},
+    {AppFont::ChatLog, QT_TR_NOOP("Font for chat messages and logs")},
+    {AppFont::CardText, QT_TR_NOOP("Font for text rendered on cards")},
+    {AppFont::DeckList, QT_TR_NOOP("Font for deck lists and the deck editor")},
+};
+
+static QString roleDisplayName(AppFont::Role role)
+{
+    switch (role) {
+        case AppFont::InterfaceDefault:
+            return FontGridWidget::tr("Interface default");
+        case AppFont::ChatLog:
+            return FontGridWidget::tr("Chat log");
+        case AppFont::CardText:
+            return FontGridWidget::tr("Card text");
+        case AppFont::DeckList:
+            return FontGridWidget::tr("Deck list");
+        default:
+            return QString();
+    }
+}
+
+FontGridWidget::FontGridWidget(QWidget *parent) : QWidget(parent)
+{
+    auto *grid = new QGridLayout(this);
+    grid->setSpacing(3);
+    grid->setContentsMargins(12, 8, 12, 8);
+    grid->setColumnStretch(0, 0);
+    grid->setColumnStretch(1, 1);
+    grid->setColumnStretch(2, 0);
+
+    QMetaEnum fontEnum = QMetaEnum::fromType<AppFont::Role>();
+    for (int i = 0; i < fontEnum.keyCount(); ++i) {
+        auto role = static_cast<AppFont::Role>(fontEnum.value(i));
+
+        auto *label = new QLabel(this);
+        grid->addWidget(label, i, 0);
+
+        auto *familyCombo = new QFontComboBox(this);
+        grid->addWidget(familyCombo, i, 1);
+        connect(familyCombo, &QFontComboBox::currentFontChanged, this, [this] { emit fontsChanged(); });
+
+        auto *sizeSpin = new QSpinBox(this);
+        sizeSpin->setRange(MIN_FONT_SIZE, MAX_FONT_SIZE);
+        grid->addWidget(sizeSpin, i, 2);
+        connect(sizeSpin, &QSpinBox::valueChanged, this, [this] { emit fontsChanged(); });
+
+        label->setBuddy(familyCombo);
+
+        fontRows[role] = {label, familyCombo, sizeSpin};
+    }
+
+    retranslateUi();
+}
+
+void FontGridWidget::loadFonts(const FontConfig &cfg)
+{
+    // Suppress fontsChanged while materializing fallback rows so the initial
+    // load never reads as a user edit (mirrors paletteGrid blocking).
+    blockSignals(true);
+    QMetaEnum fontEnum = QMetaEnum::fromType<AppFont::Role>();
+    for (int i = 0; i < fontEnum.keyCount(); ++i) {
+        auto role = static_cast<AppFont::Role>(fontEnum.value(i));
+        const FontRow &row = fontRows[role];
+
+        // Roles absent from the file resolve the same way the runtime does: an unset
+        // role falls back to the config's InterfaceDefault, and only then to the
+        // startup font. appFont() would return the live preview instead, so Reset and
+        // a first load must not measure against it.
+        const QFont fallback = cfg.fonts.value(AppFont::InterfaceDefault, themeManager->defaultAppFont(role));
+        const QFont font = cfg.fonts.value(role, fallback);
+        row.familyCombo->setCurrentFont(font);
+
+        int size = font.pointSize();
+        if (size <= 0) {
+            size = qApp->font().pointSize();
+        }
+        if (size <= 0) {
+            size = FALLBACK_FONT_SIZE;
+        }
+        row.sizeSpin->setValue(qBound(MIN_FONT_SIZE, size, MAX_FONT_SIZE));
+    }
+    blockSignals(false);
+}
+
+FontConfig FontGridWidget::currentFontConfig() const
+{
+    FontConfig cfg;
+    QMetaEnum fontEnum = QMetaEnum::fromType<AppFont::Role>();
+    for (int i = 0; i < fontEnum.keyCount(); ++i) {
+        auto role = static_cast<AppFont::Role>(fontEnum.value(i));
+        const FontRow &row = fontRows.value(role);
+
+        // Canonical family + point size only: a fresh QFont carries default
+        // (non-bold, non-italic) weight/style, so nothing combo-side leaks in.
+        QFont font(row.familyCombo->currentFont().family());
+        font.setPointSize(row.sizeSpin->value());
+        cfg.fonts[role] = font;
+    }
+    return cfg;
+}
+
+void FontGridWidget::retranslateUi()
+{
+    QMetaEnum fontEnum = QMetaEnum::fromType<AppFont::Role>();
+    for (int i = 0; i < fontEnum.keyCount(); ++i) {
+        auto role = static_cast<AppFont::Role>(fontEnum.value(i));
+        const FontRow &row = fontRows.value(role);
+
+        row.label->setText(roleDisplayName(role));
+        row.label->setToolTip(tr(APP_FONT_DESCRIPTIONS.value(role, "")));
+        row.familyCombo->setToolTip(tr(APP_FONT_DESCRIPTIONS.value(role, "")));
+        row.familyCombo->setAccessibleName(roleDisplayName(role));
+        row.sizeSpin->setToolTip(tr("Point size for %1").arg(roleDisplayName(role)));
+        row.sizeSpin->setAccessibleName(tr("Point size for %1").arg(roleDisplayName(role)));
+        row.sizeSpin->setSuffix(tr(" pt"));
+    }
+}
diff --git a/cockatrice/src/interface/palette_editor/font_grid_widget.h b/cockatrice/src/interface/palette_editor/font_grid_widget.h
new file mode 100644
index 000000000..8c80306d3
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/font_grid_widget.h
@@ -0,0 +1,43 @@
+#ifndef COCKATRICE_FONT_GRID_WIDGET_H
+#define COCKATRICE_FONT_GRID_WIDGET_H
+
+#include "../theme_config.h"
+
+#include <QMap>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QFontComboBox;
+class QGridLayout;
+class QLabel;
+class QSpinBox;
+
+// Per-role font editors — one (family, point size) row per AppFont::Role.
+// Owns the load/read round-trip for FontConfig but has no file I/O, mirroring
+// PaletteGridWidget. Only family and point size are edited; weight and italic
+// stay caller-side concerns and are stripped when reading back.
+class FontGridWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit FontGridWidget(QWidget *parent = nullptr);
+
+    void loadFonts(const FontConfig &cfg);
+    FontConfig currentFontConfig() const;
+    void retranslateUi();
+
+signals:
+    void fontsChanged();
+
+private:
+    struct FontRow
+    {
+        QLabel *label = nullptr;
+        QFontComboBox *familyCombo = nullptr;
+        QSpinBox *sizeSpin = nullptr;
+    };
+
+    QMap<AppFont::Role, FontRow> fontRows;
+};
+
+#endif // COCKATRICE_FONT_GRID_WIDGET_H
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
index b6271291d..5bcfbb251 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
@@ -2,6 +2,7 @@
 
 #include "../theme_config.h"
 #include "../theme_manager.h"
+#include "font_grid_widget.h"
 #include "palette_generator.h"
 #include "palette_grid_widget.h"
 #include "quick_setup_panel.h"
@@ -41,6 +42,7 @@ PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QSt
 
     // Load both scheme configs upfront so switching is instant
     loadSchemes();
+    loadFonts();
 
     loadedScheme = themeManager->isDarkMode(themeDirPath) ? "Dark" : "Light";
 
@@ -125,6 +127,33 @@ void PaletteEditorDialog::setupUi()
     paletteGrid->setVisible(false);
     root->addWidget(paletteGrid, 1);
 
+    // Font section — sibling to the palette grid, sharing its collapsible
+    // advanced area pattern. Fonts are shared per theme, not split by scheme.
+    fontToggleButton = new QPushButton(this);
+    fontToggleButton->setCheckable(true);
+    fontToggleButton->setChecked(false);
+    fontToggleButton->setFlat(true);
+    fontToggleButton->setStyleSheet("QPushButton { text-align: left; padding: 5px 12px; font-weight: bold; }"
+                                    "QPushButton:checked { }");
+    root->addWidget(fontToggleButton);
+
+    fontSeparator = makeSeparator();
+    fontSeparator->setVisible(false);
+    root->addWidget(fontSeparator);
+
+    fontSection = new QWidget;
+    auto *fontSectionLayout = new QVBoxLayout(fontSection);
+    fontSectionLayout->setContentsMargins(0, 0, 0, 0);
+    fontSectionLayout->setSpacing(0);
+    fontNoteLabel = new QLabel(fontSection);
+    fontNoteLabel->setContentsMargins(12, 4, 12, 0);
+    fontNoteLabel->setWordWrap(true);
+    fontSectionLayout->addWidget(fontNoteLabel);
+    fontGrid = new FontGridWidget(fontSection);
+    fontSectionLayout->addWidget(fontGrid);
+    fontSection->setVisible(false);
+    root->addWidget(fontSection);
+
     // Footer
     root->addWidget(makeSeparator());
     footer = new QWidget;
@@ -157,6 +186,10 @@ void PaletteEditorDialog::setupUi()
     connect(autoApplyTimer, &QTimer::timeout, this, &PaletteEditorDialog::onApply);
     connect(quickSetupPanel, &QuickSetupPanel::valueChanged, this, &PaletteEditorDialog::onGenerateFromAccent);
     connect(paletteGrid, &PaletteGridWidget::paletteChanged, this, [this] { autoApplyTimer->start(); });
+    connect(fontGrid, &FontGridWidget::fontsChanged, this, [this] {
+        fontsDirty = true;
+        autoApplyTimer->start();
+    });
     connect(revertButton, &QPushButton::clicked, this, &PaletteEditorDialog::onRevertToDefault);
     connect(resetBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onReset);
     connect(saveBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onSave);
@@ -166,15 +199,32 @@ void PaletteEditorDialog::setupUi()
         paletteGridToggleButton->setText(open ? tr("▼  Edit Palette") : tr("▶  Edit Palette"));
         paletteGridSeparator->setVisible(open);
         paletteGrid->setVisible(open);
-
-        if (open) {
-            setMinimumHeight(680);
-            resize(width(), 680);
-        } else {
-            setMinimumHeight(220);
-            adjustSize(); // shrinks to fit just the visible content
-        }
+        updateAdvancedHeight();
     });
+    connect(fontToggleButton, &QPushButton::toggled, this, [this](bool open) {
+        fontToggleButton->setText(open ? tr("▼  Edit Fonts") : tr("▶  Edit Fonts"));
+        fontSeparator->setVisible(open);
+        fontSection->setVisible(open);
+        updateAdvancedHeight();
+    });
+}
+
+void PaletteEditorDialog::updateAdvancedHeight()
+{
+    int height = 220;
+    if (paletteGridToggleButton->isChecked()) {
+        height += 460;
+    }
+    if (fontToggleButton->isChecked()) {
+        height += 200;
+    }
+    setMinimumHeight(height);
+
+    if (paletteGrid->isVisible() || fontSection->isVisible()) {
+        resize(width(), height);
+    } else {
+        adjustSize(); // shrinks to fit just the visible content
+    }
 }
 
 void PaletteEditorDialog::retranslateUi()
@@ -189,12 +239,16 @@ void PaletteEditorDialog::retranslateUi()
     editingLabel->setText(tr("Editing:"));
     paletteGridToggleButton->setText(tr("▶  Edit Palette"));
     paletteGridToggleButton->setToolTip(tr("Show or hide the per-role colour grid for manual tweaks"));
+    fontToggleButton->setText(fontSection->isVisible() ? tr("▼  Edit Fonts") : tr("▶  Edit Fonts"));
+    fontToggleButton->setToolTip(tr("Show or hide the per-purpose font settings for this theme"));
+    fontNoteLabel->setText(tr("Fonts belong to theme %1 (shared by Light and Dark schemes)").arg(themeName));
+    fontGrid->retranslateUi();
     revertButton->setText(tr("↺  Revert to theme default"));
 
     resetBtn->setText(tr("Reset"));
     saveBtn->setText(tr("Save"));
-    resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette"));
-    saveBtn->setToolTip(tr("Write palette-%1.toml and reload the theme").arg(loadedScheme.toLower()));
+    resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette and fonts"));
+    saveBtn->setToolTip(tr("Write palette-%1.toml and fonts.toml, then reload the theme").arg(loadedScheme.toLower()));
 
     if (saveDir.isEmpty() || !ThemeManager::isDirReallyWritable(saveDir)) {
         saveBtn->setEnabled(false);
@@ -228,6 +282,13 @@ void PaletteEditorDialog::loadSchemes()
     }
 }
 
+void PaletteEditorDialog::loadFonts()
+{
+    savedFontConfig = ThemeManager::loadDefaultFontConfig(themeDirPath, themeName);
+    fontGrid->loadFonts(savedFontConfig);
+    fontsDirty = false;
+}
+
 void PaletteEditorDialog::seedAccentFromScheme(const QString &scheme)
 {
     QColor seed = workingConfig.value(scheme).colors.value(QPalette::Active).value(QPalette::Highlight);
@@ -258,6 +319,9 @@ void PaletteEditorDialog::onGenerateFromAccent(const QColor &accent, int intensi
 void PaletteEditorDialog::onApply()
 {
     themeManager->previewPalette(paletteGrid->currentPaletteConfig(), loadedScheme);
+    if (fontsDirty) {
+        themeManager->previewFonts(fontGrid->currentFontConfig());
+    }
 }
 
 void PaletteEditorDialog::onSave()
@@ -308,6 +372,20 @@ void PaletteEditorDialog::onSave()
         savedConfig[it.key()] = it.value();
     }
 
+    // Persist the shared per-theme fonts when they changed.
+    if (fontsDirty) {
+        const FontConfig fontCfg = fontGrid->currentFontConfig();
+        if (fontCfg != savedFontConfig) {
+            if (!ThemeManager::saveFontConfig(saveDir, fontCfg)) {
+                QMessageBox::warning(this, tr("Save failed"),
+                                     tr("Could not write %1 to:\n%2").arg(FontConfig::fileName(), saveDir));
+                return;
+            }
+            savedFontConfig = fontCfg;
+        }
+        fontsDirty = false;
+    }
+
     themeManager->reloadCurrentTheme();
     accept();
 }
@@ -316,6 +394,12 @@ void PaletteEditorDialog::onReset()
 {
     workingConfig[loadedScheme] = savedConfig[loadedScheme];
     paletteGrid->loadPalette(savedConfig[loadedScheme]);
+    // Restore the live theme before re-reading the grid: loadFonts resolves
+    // unset roles, and the preview has currentFonts pointing at the edited
+    // config until the theme is reloaded.
+    themeManager->reloadCurrentTheme();
+    fontGrid->loadFonts(savedFontConfig);
+    fontsDirty = false;
     seedAccentFromScheme(loadedScheme);
 }
 
@@ -350,6 +434,27 @@ void PaletteEditorDialog::onRevertToDefault()
     workingConfig[loadedScheme] = def;
     paletteGrid->loadPalette(def);
     seedAccentFromScheme(loadedScheme);
+
+    // Revert the shared per-theme fonts the same way: delete the user-written
+    // fonts.toml so the theme falls back to its shipped default, then reflect
+    // the resolved fonts in the editor.
+    QFile::remove(QDir(saveDir).absoluteFilePath(FontConfig::fileName()));
+
+    // Reload the live theme so the font revert takes effect immediately.
+    themeManager->reloadCurrentTheme();
+
+    const FontConfig fontDef = ThemeManager::loadDefaultFontConfig(themeDirPath, themeName);
+    savedFontConfig = fontDef;
+    fontGrid->loadFonts(fontDef);
+    fontsDirty = false;
+}
+
+void PaletteEditorDialog::reject()
+{
+    // Discard any unsaved live preview (palette and fonts) so closing without
+    // Save restores the active theme instead of leaking the preview globally.
+    themeManager->reloadCurrentTheme();
+    QDialog::reject();
 }
 
 void PaletteEditorDialog::changeEvent(QEvent *e)
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
index e29a70cb0..5e47536b5 100644
--- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
@@ -15,6 +15,7 @@ class QComboBox;
 class QDialogButtonBox;
 class QPushButton;
 class PaletteGridWidget;
+class FontGridWidget;
 class QuickSetupPanel;
 class QFrame;
 class QWidget;
@@ -25,6 +26,7 @@ class PaletteEditorDialog : public QDialog
 public:
     explicit PaletteEditorDialog(const QString &themeDirPath, const QString &themeName, QWidget *parent = nullptr);
     void loadSchemes();
+    void reject() override;
 
 private slots:
     void onSave();
@@ -38,8 +40,10 @@ private:
     void setupUi();
     void retranslateUi();
     void refreshChromePalettes();
+    void updateAdvancedHeight();
     void loadScheme(const QString &scheme); // snapshot current, switch, load
     void seedAccentFromScheme(const QString &scheme);
+    void loadFonts(); // shared per theme, not split by light/dark
 
     // Sub-widgets
     QWidget *header;
@@ -49,6 +53,11 @@ private:
     PaletteGridWidget *paletteGrid = nullptr;
     QPushButton *paletteGridToggleButton = nullptr;
     QFrame *paletteGridSeparator = nullptr;
+    FontGridWidget *fontGrid = nullptr;
+    QPushButton *fontToggleButton = nullptr;
+    QFrame *fontSeparator = nullptr;
+    QWidget *fontSection = nullptr;
+    QLabel *fontNoteLabel = nullptr;
     QWidget *footer;
     QComboBox *schemeComboBox = nullptr;
     QDialogButtonBox *buttonBox = nullptr;
@@ -68,10 +77,18 @@ private:
     QMap<QString, PaletteConfig> workingConfig;
     QMap<QString, PaletteConfig> savedConfig;
 
+    // Fonts are shared per theme (fonts.toml, not split by light/dark), so a
+    // single saved config suffices; the live edits are read from fontGrid.
+    FontConfig savedFontConfig;
+    // Set only by user-driven fontsChanged after the initial load completes.
+    // Gates both previewFonts and the fonts.toml write so a palette-only Save
+    // never materializes fallback fonts to disk.
+    bool fontsDirty = false;
+
     QTimer *autoApplyTimer = nullptr;
 
 protected:
     void changeEvent(QEvent *e) override;
 };
 
-#endif // COCKATRICE_PALETTE_EDITOR_DIALOG_H
\ No newline at end of file
+#endif // COCKATRICE_PALETTE_EDITOR_DIALOG_H
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
index 463c4038d..392f01d0d 100644
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
@@ -76,6 +76,18 @@ PaletteGridWidget::PaletteGridWidget(QWidget *parent) : QWidget(parent)
 
     layout = QtUtils::makeLayout<QVBoxLayout>(this);
     layout->addWidget(scroll);
+
+    connect(themeManager, &ThemeManager::fontsChanged, this, &PaletteGridWidget::applyInterfaceDefaultFont);
+}
+
+void PaletteGridWidget::applyInterfaceDefaultFont()
+{
+    // The editor's own chrome follows the InterfaceDefault theme role; bold stays caller-side.
+    for (auto *label : headerLabels) {
+        QFont headerFont = themeManager->appFont(AppFont::InterfaceDefault);
+        headerFont.setBold(true);
+        label->setFont(headerFont);
+    }
 }
 
 void PaletteGridWidget::buildGrid(QWidget *host)
@@ -101,7 +113,8 @@ void PaletteGridWidget::buildGrid(QWidget *host)
         auto *label = new QLabel(groupHeaders[col], host);
         label->setAlignment(Qt::AlignCenter);
         label->setToolTip(groupTips[col]);
-        label->setFont(QtUtils::boldFont(label->font()));
+        // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+        label->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault)));
         label->setAutoFillBackground(true);
         label->setContentsMargins(4, 4, 4, 4);
         grid->addWidget(label, 0, col + 1);
@@ -146,7 +159,7 @@ void PaletteGridWidget::buildGrid(QWidget *host)
 
     auto *appHeader = new QLabel(tr("App colors"), host);
     appHeader->setToolTip(tr("Application-specific colors layered on top of the Qt palette"));
-    appHeader->setFont(QtUtils::boldFont(appHeader->font()));
+    appHeader->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault)));
     appHeader->setAutoFillBackground(true);
     appHeader->setContentsMargins(4, 4, 4, 4);
     grid->addWidget(appHeader, appHeaderRow, 0, 1, 4);
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
index f1ff41ec2..7c527a064 100644
--- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
@@ -34,6 +34,10 @@ private:
     void changeEvent(QEvent *e);
     void refreshChromePalettes();
 
+private slots:
+    void applyInterfaceDefaultFont();
+
+private:
     QMap<QPalette::ColorGroup, QMap<QPalette::ColorRole, ColorButton *>> colorButtons;
     QMap<AppColor::Role, ColorButton *> appColorButtons;
     QScrollArea *scroll;
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
index 04f98dcc3..00eac3253 100644
--- a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
@@ -1,5 +1,6 @@
 #include "quick_setup_panel.h"
 
+#include "../theme_manager.h"
 #include "color_button.h"
 
 #include <QApplication>
@@ -28,10 +29,15 @@ QuickSetupPanel::QuickSetupPanel(QWidget *parent) : QWidget(parent)
 
     labelLow = new QLabel(this);
     labelHigh = new QLabel(this);
-    QFont small = labelLow->font();
-    small.setPointSizeF(small.pointSizeF() * 0.82);
-    labelLow->setFont(small);
-    labelHigh->setFont(small);
+    // Family comes from the InterfaceDefault theme role; the *0.82 size stays caller-side.
+    auto applySmallFont = [this]() {
+        QFont small = themeManager->appFont(AppFont::InterfaceDefault);
+        small.setPointSizeF(small.pointSizeF() * 0.82);
+        labelLow->setFont(small);
+        labelHigh->setFont(small);
+    };
+    applySmallFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, applySmallFont);
     QPalette dimmed = labelLow->palette();
     dimmed.setColor(QPalette::WindowText, qApp->palette().color(QPalette::Mid));
     labelLow->setPalette(dimmed);
diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp
index 2f5c4b6dd..037293af9 100644
--- a/cockatrice/src/interface/pixel_map_generator.cpp
+++ b/cockatrice/src/interface/pixel_map_generator.cpp
@@ -1,6 +1,7 @@
 #include "pixel_map_generator.h"
 
 #include "libcockatrice/network/server/remote/user_level.h"
+#include "theme_icon.h"
 #include "theme_manager.h"
 
 #include <QApplication>
@@ -15,7 +16,6 @@
 #include <QDomNodeList>
 #include <QFile>
 #include <QIODevice>
-#include <QImage>
 #include <QImageReader>
 #include <QLatin1Char>
 #include <QLatin1String>
@@ -436,33 +436,19 @@ QIcon UserLevelPixmapGenerator::generateIconWithColorOverride(int height,
 
 QMap<QString, QIcon> UserLevelPixmapGenerator::iconCache;
 
-QPixmap LockPixmapGenerator::generatePixmap(int height)
-{
-
-    int key = height;
-    if (pmCache.contains(key)) {
-        return pmCache.value(key);
-    }
-
-    QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/lock")),
-                                  QSize(height, height), true);
-    pmCache.insert(key, pixmap);
-    return pixmap;
-}
-
-QMap<int, QPixmap> LockPixmapGenerator::pmCache;
-
 QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded)
 {
-    QString key = QString::number(expanded) + ":" + QString::number(height);
+    const QString key = QString::number(expanded) + ":" + QString::number(height);
     if (pmCache.contains(key)) {
         return pmCache.value(key);
     }
 
-    QString name = expanded ? "dropdown_expanded" : "dropdown_collapsed";
-    QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/") + name),
-                                  QSize(height, height), true);
-
+    // Render through the themed icon engine: it keeps the glyph's aspect ratio,
+    // follows the palette, and renders at the device pixel ratio instead of
+    // handing a DPR-1 bitmap to a label that would upscale and blur it on a 2x
+    // display.
+    const QString prefix = QStringLiteral("icons/") + (expanded ? "dropdown_expanded" : "dropdown_collapsed");
+    const QPixmap pixmap = loadThemedIcon(prefix).pixmap(QSize(height, height), qApp->devicePixelRatio());
     pmCache.insert(key, pixmap);
     return pixmap;
 }
@@ -520,30 +506,11 @@ QPixmap ManaSymbolPixmapGenerator::generatePixmap(const QString &symbol, const Q
 QHash<QString, QPixmap> ManaSymbolPixmapGenerator::masterCache;
 QHash<QString, QPixmap> ManaSymbolPixmapGenerator::scaledCache;
 
-QPixmap loadColorAdjustedPixmap(const QString &name)
-{
-    // Prefer an authored scheme-qualified variant when one exists for this asset.
-    const QString variant = themeManager->schemeVariantPath(QStringView(name).mid(QStringLiteral("theme:").size()));
-    if (!variant.isEmpty()) {
-        return QPixmap(QStringLiteral("theme:") + variant);
-    }
-
-    // Legacy fallback: runtime-invert for dark mode when no authored variant.
-    if (qApp->palette().windowText().color().lightness() > 200) {
-        QImage img(name);
-        img.invertPixels();
-        QPixmap result;
-        result.convertFromImage(img);
-        return result;
-    } else {
-        return QPixmap(name);
-    }
-}
-
 QPixmap themePixmap(QStringView prefix)
 {
     const QString resolved = themeManager->assetPath(prefix);
-    return QPixmap(QStringLiteral("theme:") + resolved);
+    const QPixmap sentinel = loadSentinelSvgPixmap(resolved);
+    return sentinel.isNull() ? QPixmap(QStringLiteral("theme:") + resolved) : sentinel;
 }
 
 void clearPixmapGeneratorCaches()
@@ -553,7 +520,6 @@ void clearPixmapGeneratorCaches()
     PingPixmapGenerator::clear();
     CountryPixmapGenerator::clear();
     UserLevelPixmapGenerator::clear();
-    LockPixmapGenerator::clear();
     DropdownIconPixmapGenerator::clear();
     ManaSymbolPixmapGenerator::clear();
 }
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index 7c01bb332..951f4231b 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -106,19 +106,6 @@ public:
     }
 };
 
-class LockPixmapGenerator
-{
-private:
-    static QMap<int, QPixmap> pmCache;
-
-public:
-    static QPixmap generatePixmap(int height);
-    static void clear()
-    {
-        pmCache.clear();
-    }
-};
-
 class DropdownIconPixmapGenerator
 {
 private:
@@ -160,13 +147,11 @@ public:
     }
 };
 
-QPixmap loadColorAdjustedPixmap(const QString &name);
-
-// Loads a "theme:" asset (with no file extension in prefix), preferring the
+// Returns a "theme:" asset (with no file extension in prefix), preferring the
 // scheme-qualified variant (prefix-dark / prefix-light, resolved via
-// ThemeManager::assetPath) and falling back to the plain asset. Callers load
-// the returned path directly. Use for scheme-sensitive pixmaps like
-// backgrounds, the card back, and the app logo.
+// ThemeManager::assetPath) and falling back to the plain asset. Token-driven
+// SVGs resolve their `currentColor` sentinel from the palette. Use for
+// scheme-sensitive pixmaps like backgrounds, the card back, and the app logo.
 QPixmap themePixmap(QStringView prefix);
 
 // Clears every PixmapGenerator's static cache so scheme variants are
diff --git a/cockatrice/src/interface/recording.cpp b/cockatrice/src/interface/recording.cpp
new file mode 100644
index 000000000..2b11255f9
--- /dev/null
+++ b/cockatrice/src/interface/recording.cpp
@@ -0,0 +1,102 @@
+#include "recording.h"
+
+#include "pqEventTypes.h"
+
+#include <QFile>
+#include <QTextStream>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+
+XMLEventObserver::XMLEventObserver(QObject *parent) : pqEventObserver(parent)
+{
+}
+
+XMLEventObserver::~XMLEventObserver() = default;
+
+void XMLEventObserver::setStream(QTextStream *stream)
+{
+    if (xmlStream) {
+        xmlStream->writeEndElement();
+        xmlStream->writeEndDocument();
+        xmlStream.reset();
+    }
+    if (Stream) {
+        *Stream << xmlString;
+    }
+    xmlString.clear();
+    pqEventObserver::setStream(stream);
+    if (Stream) {
+        xmlStream.reset(new QXmlStreamWriter(&xmlString));
+        xmlStream->setAutoFormatting(true);
+        xmlStream->writeStartDocument();
+        xmlStream->writeStartElement(QStringLiteral("events"));
+    }
+}
+
+void XMLEventObserver::onRecordEvent(const QString &widget,
+                                     const QString &command,
+                                     const QString &arguments,
+                                     const int &eventType)
+{
+    if (!xmlStream) {
+        return;
+    }
+
+    xmlStream->writeStartElement(QStringLiteral("event"));
+    xmlStream->writeAttribute(QStringLiteral("widget"), widget);
+    if (eventType == pqEventTypes::ACTION_EVENT) {
+        xmlStream->writeAttribute(QStringLiteral("command"), command);
+    } else { // pqEventTypes::CHECK_EVENT
+        xmlStream->writeAttribute(QStringLiteral("property"), command);
+    }
+    xmlStream->writeAttribute(QStringLiteral("arguments"), arguments);
+    xmlStream->writeEndElement();
+}
+
+XMLEventSource::XMLEventSource(QObject *parent) : pqEventSource(parent)
+{
+}
+
+XMLEventSource::~XMLEventSource() = default;
+
+void XMLEventSource::setContent(const QString &xmlFileName)
+{
+    xmlStream.reset();
+
+    QFile xml(xmlFileName);
+    if (!xml.open(QIODevice::ReadOnly)) {
+        qCWarning(RecordingLog) << "Could not read test file" << xmlFileName;
+        return;
+    }
+
+    xmlStream.reset(new QXmlStreamReader(xml.readAll()));
+}
+
+int XMLEventSource::getNextEvent(QString &widget, QString &command, QString &arguments, int &eventType)
+{
+    if (!xmlStream) {
+        return DONE;
+    }
+
+    while (!xmlStream->atEnd()) {
+        if (xmlStream->readNext() != QXmlStreamReader::StartElement || xmlStream->name() != QStringLiteral("event")) {
+            continue;
+        }
+
+        const QXmlStreamAttributes attributes = xmlStream->attributes();
+        eventType = pqEventTypes::ACTION_EVENT;
+        widget = attributes.value(QStringLiteral("widget")).toString();
+        command = attributes.value(QStringLiteral("command")).toString();
+        if (command.isEmpty()) {
+            // A recorded check event carries a property instead of a command.
+            command = attributes.value(QStringLiteral("property")).toString();
+        }
+        arguments = attributes.value(QStringLiteral("arguments")).toString();
+        return SUCCESS;
+    }
+
+    if (xmlStream->hasError()) {
+        qCWarning(RecordingLog) << "Malformed test file:" << xmlStream->errorString();
+    }
+    return DONE;
+}
diff --git a/cockatrice/src/interface/recording.h b/cockatrice/src/interface/recording.h
new file mode 100644
index 000000000..a5d813ea9
--- /dev/null
+++ b/cockatrice/src/interface/recording.h
@@ -0,0 +1,54 @@
+#ifndef COCKATRICE_RECORDING_H
+#define COCKATRICE_RECORDING_H
+
+#include "pqEventObserver.h"
+#include "pqEventSource.h"
+
+#include <QLoggingCategory>
+#include <QScopedPointer>
+
+inline Q_LOGGING_CATEGORY(RecordingLog, "recording");
+
+class QXmlStreamReader;
+class QXmlStreamWriter;
+
+/**
+ * @brief Writes a session recording as an XML test file.
+ *
+ * The events are buffered in memory and flushed to the stream when recording
+ * ends, because the stream is handed over once the file name is known.
+ */
+class XMLEventObserver : public pqEventObserver
+{
+    QScopedPointer<QXmlStreamWriter> xmlStream;
+    QString xmlString;
+
+public:
+    explicit XMLEventObserver(QObject *parent);
+    ~XMLEventObserver() override;
+
+protected:
+    void setStream(QTextStream *stream) override;
+    void onRecordEvent(const QString &widget,
+                       const QString &command,
+                       const QString &arguments,
+                       const int &eventType) override;
+};
+
+/**
+ * @brief Plays the events of an XML test file back, one at a time.
+ */
+class XMLEventSource : public pqEventSource
+{
+    QScopedPointer<QXmlStreamReader> xmlStream;
+
+public:
+    explicit XMLEventSource(QObject *parent);
+    ~XMLEventSource() override;
+
+protected:
+    void setContent(const QString &xmlFileName) override;
+    int getNextEvent(QString &widget, QString &command, QString &arguments, int &eventType) override;
+};
+
+#endif // COCKATRICE_RECORDING_H
diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp
index 652e322c8..54143d7d3 100644
--- a/cockatrice/src/interface/theme_config.cpp
+++ b/cockatrice/src/interface/theme_config.cpp
@@ -304,4 +304,150 @@ QPalette PaletteConfig::apply(QPalette base) const
     }
 
     return base;
-}
\ No newline at end of file
+}
+
+bool FontConfig::hasFonts() const
+{
+    return !fonts.isEmpty();
+}
+
+QString FontConfig::toToml() const
+{
+    QMetaEnum roleEnum = QMetaEnum::fromType<AppFont::Role>();
+
+    QString entries;
+
+    for (auto it = fonts.cbegin(); it != fonts.cend(); ++it) {
+        const char *roleName = roleEnum.valueToKey(it.key());
+
+        if (!roleName) {
+            continue;
+        }
+
+        QString family = it.value().family().trimmed();
+        int pointSize = it.value().pointSize();
+
+        if (family.isEmpty() || pointSize <= 0) {
+            continue;
+        }
+
+        entries += QString("%1 = \"%2, %3\"\n").arg(QString(roleName), -20).arg(family).arg(pointSize);
+    }
+
+    if (entries.isEmpty()) {
+        return {};
+    }
+
+    return "[Fonts]\n" + entries + "\n";
+}
+
+QString FontConfig::fileName()
+{
+    return "fonts.toml";
+}
+
+FontConfig FontConfig::fromFile(const QString &filePath)
+{
+    FontConfig cfg;
+
+    QFile f(filePath);
+
+    if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return cfg;
+    }
+
+    QMetaEnum roleEnum = QMetaEnum::fromType<AppFont::Role>();
+
+    QString currentSection;
+
+    QTextStream in(&f);
+
+    while (!in.atEnd()) {
+        QString line = in.readLine().trimmed();
+
+        if (line.isEmpty() || line.startsWith('#') || line.startsWith(';')) {
+            continue;
+        }
+
+        if (line.startsWith('[') && line.endsWith(']')) {
+            currentSection = line.mid(1, line.length() - 2).trimmed();
+            continue;
+        }
+
+        if (currentSection.compare("Fonts", Qt::CaseInsensitive) != 0) {
+            continue;
+        }
+
+        int eq = line.indexOf('=');
+
+        if (eq < 0) {
+            continue;
+        }
+
+        QString key = line.left(eq).trimmed();
+        QString value = line.mid(eq + 1).trimmed();
+
+        // Strip inline comments if preceded by whitespace
+        for (int i = 1; i < value.size(); ++i) {
+            if ((value[i] == '#' || value[i] == ';') && value[i - 1].isSpace()) {
+                value = value.left(i).trimmed();
+                break;
+            }
+        }
+
+        // Strip surrounding quotes, if any
+        if (value.size() >= 2 &&
+            ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith('\'') && value.endsWith('\'')))) {
+            value = value.mid(1, value.size() - 2).trimmed();
+        }
+
+        int comma = value.lastIndexOf(',');
+
+        if (comma < 0) {
+            continue;
+        }
+
+        QString family = value.left(comma).trimmed();
+
+        // Tolerate a partially-quoted family, e.g. "Inter", 10
+        if (family.size() >= 2 &&
+            ((family.startsWith('"') && family.endsWith('"')) || (family.startsWith('\'') && family.endsWith('\'')))) {
+            family = family.mid(1, family.size() - 2).trimmed();
+        }
+
+        bool ok = false;
+        int pointSize = value.mid(comma + 1).trimmed().toInt(&ok);
+
+        if (!ok || family.isEmpty() || pointSize <= 0) {
+            continue;
+        }
+
+        if (key.startsWith("AppFont::")) {
+            key = key.mid(QStringLiteral("AppFont::").size());
+        }
+
+        int roleInt = roleEnum.keyToValue(key.toUtf8().constData());
+
+        if (roleInt < 0) {
+            continue;
+        }
+
+        // Canonical family + point size only: a fresh QFont carries default
+        // (non-bold, non-italic) weight/style, so nothing caller-side leaks in.
+        // No validation against installed fonts; Qt substitution applies.
+        QFont font(family);
+        font.setPointSize(pointSize);
+        cfg.fonts[static_cast<AppFont::Role>(roleInt)] = font;
+    }
+
+    return cfg;
+}
+
+FontConfig FontConfig::fromThemeDir(const QString &themeDirPath)
+{
+    if (themeDirPath.isEmpty()) {
+        return {};
+    }
+
+    return fromFile(QDir(themeDirPath).absoluteFilePath(fileName()));
+}
diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h
index 8b91613f5..84601a2bf 100644
--- a/cockatrice/src/interface/theme_config.h
+++ b/cockatrice/src/interface/theme_config.h
@@ -2,6 +2,7 @@
 #define COCKATRICE_THEME_CONFIG_H
 
 #include <QColor>
+#include <QFont>
 #include <QMap>
 #include <QPalette>
 #include <QSharedPointer>
@@ -23,6 +24,23 @@ enum Role
 Q_ENUM_NS(Role)
 } // namespace AppColor
 
+// Application-specific font roles, one configurable family + point size per
+// purpose. Stored in a shared fonts.toml under a [Fonts] section (one file per
+// theme, not split by light/dark). Only family and point size are stored;
+// weight/italic are stripped on load and stay caller-side concerns.
+namespace AppFont
+{
+Q_NAMESPACE
+enum Role
+{
+    InterfaceDefault,
+    ChatLog,
+    CardText,
+    DeckList,
+};
+Q_ENUM_NS(Role)
+} // namespace AppFont
+
 struct ThemeConfig
 {
     QString colorScheme;
@@ -60,4 +78,33 @@ struct PaletteConfig
     QPalette apply(QPalette base) const;
 };
 
-#endif // COCKATRICE_THEME_CONFIG_H
\ No newline at end of file
+/** @brief Per-purpose font configuration, stored as family + point size only.
+ *
+ * Serialized to a shared fonts.toml file with a [Fonts] section, e.g.
+ * @code
+ * [Fonts]
+ * InterfaceDefault = "Inter, 10"
+ * @endcode
+ */
+struct FontConfig
+{
+    QMap<AppFont::Role, QFont> fonts;
+
+    bool operator==(const FontConfig &rhs) const
+    {
+        return fonts == rhs.fonts;
+    }
+    bool operator!=(const FontConfig &rhs) const
+    {
+        return !(*this == rhs);
+    }
+    bool hasFonts() const;
+    QString toToml() const;
+
+    static QString fileName();
+
+    static FontConfig fromFile(const QString &filePath);
+    static FontConfig fromThemeDir(const QString &themeDirPath);
+};
+
+#endif // COCKATRICE_THEME_CONFIG_H
diff --git a/cockatrice/src/interface/theme_icon.cpp b/cockatrice/src/interface/theme_icon.cpp
new file mode 100644
index 000000000..161c436ca
--- /dev/null
+++ b/cockatrice/src/interface/theme_icon.cpp
@@ -0,0 +1,300 @@
+#include "theme_icon.h"
+
+#include "libcockatrice/utility/svg_recolor.h"
+#include "theme_manager.h"
+
+#include <QApplication>
+#include <QByteArray>
+#include <QColor>
+#include <QFile>
+#include <QHash>
+#include <QIODevice>
+#include <QIconEngine>
+#include <QImageReader>
+#include <QObject>
+#include <QPaintDevice>
+#include <QPainter>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
+#include <QString>
+#include <QStringLiteral>
+#include <QStyle>
+#include <QSvgRenderer>
+#include <QtGlobal>
+#include <utility>
+
+namespace
+{
+/**
+ * @brief Palette color that replaces `currentColor`, following the icon mode.
+ */
+QByteArray sentinelColor(QIcon::Mode mode, QPalette::ColorRole role)
+{
+    const QPalette::ColorGroup group = mode == QIcon::Disabled ? QPalette::Disabled : QPalette::Active;
+    const QPalette::ColorRole effective =
+        mode == QIcon::Selected && role == QPalette::WindowText ? QPalette::HighlightedText : role;
+    return qApp->palette().color(group, effective).name(QColor::HexRgb).toLatin1();
+}
+
+/**
+ * @brief Reads an SVG through the `theme:` search path.
+ */
+QByteArray readSvg(const QString &resolvedPath)
+{
+    QFile file(QStringLiteral("theme:") + resolvedPath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return {};
+    }
+    return file.readAll();
+}
+
+/**
+ * @brief Renders SVG bytes, scaled to @p size when one is given.
+ *
+ * An empty size means the asset's intrinsic size; @p devicePixelRatio only
+ * applies in that case so HiDPI callers still get a crisp glyph.
+ */
+QPixmap renderSvg(const QByteArray &data, const QSize &size, qreal devicePixelRatio)
+{
+    QSvgRenderer renderer(data);
+    if (!renderer.isValid()) {
+        return {};
+    }
+
+    QSize renderSize = size;
+    if (renderSize.isEmpty()) {
+        renderSize = renderer.defaultSize();
+        renderSize =
+            QSize(qRound(renderSize.width() * devicePixelRatio), qRound(renderSize.height() * devicePixelRatio));
+    }
+    if (!renderSize.isValid() || renderSize.isEmpty()) {
+        return {};
+    }
+
+    QPixmap pixmap(renderSize);
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    renderer.render(&painter);
+    return pixmap;
+}
+
+bool hasSentinel(const QByteArray &svg)
+{
+    return !svg.isEmpty() && QString::fromUtf8(svg).contains(QStringLiteral("currentColor"), Qt::CaseInsensitive);
+}
+
+QString cacheKey(const QString &path, const QByteArray &variant, const QSize &size, qreal devicePixelRatio)
+{
+    return path + QLatin1Char('|') + QString::fromLatin1(variant) + QLatin1Char('|') + QString::number(size.width()) +
+           QLatin1Char('x') + QString::number(size.height()) + QLatin1Char('@') + QString::number(devicePixelRatio);
+}
+
+/**
+ * @brief QIcon engine rendering a `theme:` SVG with `currentColor` resolved on demand.
+ *
+ * Qt's SVG renderer has no ambient color, so the sentinel is substituted from
+ * the current palette on every pixmap request. Asset resolution, the file bytes
+ * and the intrinsic size are cached until the theme changes: a repaint then
+ * does no file I/O at all. The render cache is keyed by resolved path and pixel
+ * size plus a variant: the palette color for sentinel SVGs, the icon mode for
+ * assets that carry their own colors. A palette change therefore produces new
+ * keys instead of reusing art built under the previous palette, and the
+ * non-sentinel path (raster overrides, plain SVGs) is cached like any other.
+ */
+class ThemeSvgIconEngine final : public QObject, public QIconEngine
+{
+public:
+    ThemeSvgIconEngine(QString _prefix, QPalette::ColorRole _role) : prefix(std::move(_prefix)), role(_role)
+    {
+        if (themeManager) {
+            // A theme switch changes the resolved asset (scheme-qualified
+            // variants, raster overrides) and a palette change invalidates
+            // every cached colour, so both drop the caches instead of
+            // re-reading theme.cfg and the assets on every repaint.
+            connect(themeManager, &ThemeManager::themeChanged, this, &ThemeSvgIconEngine::invalidate);
+            connect(themeManager, &ThemeManager::paletteChanged, this, &ThemeSvgIconEngine::invalidate);
+        }
+    }
+
+    QIconEngine *clone() const override
+    {
+        return new ThemeSvgIconEngine(prefix, role);
+    }
+
+    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State) override
+    {
+        const qreal devicePixelRatio = painter->device() ? painter->device()->devicePixelRatioF() : 1.0;
+        const QSize logicalSize = fitToSize(rect.size());
+        if (logicalSize.isEmpty()) {
+            return;
+        }
+        const QSize pixelSize(qRound(logicalSize.width() * devicePixelRatio),
+                              qRound(logicalSize.height() * devicePixelRatio));
+        const QPixmap pixmap = render(pixelSize, devicePixelRatio, mode);
+        if (!pixmap.isNull()) {
+            // QRect::center() would floor and drop the last row/column of a
+            // 16x16 glyph; the center has to be fractional so glyphs stay
+            // unshifted and unsclipped in item views.
+            const QSizeF contentSize = pixmap.deviceIndependentSize();
+            const QRectF targetRect(
+                QRectF(rect).center() - QPointF(contentSize.width() / 2.0, contentSize.height() / 2.0), contentSize);
+            painter->drawPixmap(targetRect, pixmap, QRectF(pixmap.rect()));
+        }
+    }
+
+    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State) override
+    {
+        return render(fitToSize(size), 1.0, mode);
+    }
+
+    QPixmap scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State, qreal scale) override
+    {
+        const QSize logicalSize = fitToSize(size);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+        const QSize pixelSize(qRound(logicalSize.width() * scale), qRound(logicalSize.height() * scale));
+#else
+        // Qt < 6.8 passes the device-dependent size to the engine.
+        const QSize pixelSize = logicalSize;
+#endif
+        return render(pixelSize, scale, mode);
+    }
+
+    QSize actualSize(const QSize &size, QIcon::Mode, QIcon::State) override
+    {
+        return fitToSize(size);
+    }
+
+private:
+    void invalidate()
+    {
+        hasResolvedAsset = false;
+        hasIntrinsicSize = false;
+        cache.clear();
+    }
+
+    void ensureResolved() const
+    {
+        if (hasResolvedAsset && (!themeManager || themeManager->getCurrentThemePath() == resolvedThemePath)) {
+            return;
+        }
+        resolvedThemePath = themeManager ? themeManager->getCurrentThemePath() : QString();
+        resolvedPath = themeManager ? themeManager->assetPath(prefix) : QString();
+        resolvedAssetIsSvg = resolvedPath.endsWith(QStringLiteral(".svg"), Qt::CaseInsensitive);
+        resolvedSvg = resolvedAssetIsSvg ? readSvg(resolvedPath) : QByteArray();
+        resolvedHasSentinel = hasSentinel(resolvedSvg);
+        hasResolvedAsset = true;
+        hasIntrinsicSize = false;
+    }
+
+    QSize intrinsicSize() const
+    {
+        ensureResolved();
+        if (!hasIntrinsicSize) {
+            if (resolvedAssetIsSvg) {
+                QSvgRenderer renderer(resolvedSvg);
+                intrinsicSizeCache = renderer.isValid() ? renderer.defaultSize() : QSize();
+            } else {
+                // A theme may override a glyph with a raster; take its real
+                // aspect ratio instead of assuming the 24x24 SVG default, so
+                // actualSize() and the rendered pixmap agree.
+                QImageReader reader(QStringLiteral("theme:") + resolvedPath);
+                intrinsicSizeCache = reader.size();
+            }
+            if (intrinsicSizeCache.isEmpty()) {
+                intrinsicSizeCache = QSize(24, 24);
+            }
+            hasIntrinsicSize = true;
+        }
+        return intrinsicSizeCache;
+    }
+
+    QSize fitToSize(const QSize &size) const
+    {
+        if (size.isEmpty()) {
+            return size;
+        }
+        return intrinsicSize().scaled(size, Qt::KeepAspectRatio);
+    }
+
+    QPixmap fromAsset(const QSize &pixelSize, QIcon::Mode mode) const
+    {
+        QPixmap pixmap(QStringLiteral("theme:") + resolvedPath);
+        if (!pixelSize.isEmpty() && pixmap.size() != pixelSize) {
+            pixmap = pixmap.scaled(pixelSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        }
+        if (mode == QIcon::Disabled && !pixmap.isNull()) {
+            pixmap = QApplication::style()->generatedIconPixmap(QIcon::Disabled, pixmap, nullptr);
+        }
+        return pixmap;
+    }
+
+    QPixmap render(const QSize &pixelSize, qreal devicePixelRatio, QIcon::Mode mode) const
+    {
+        ensureResolved();
+
+        // Same cache for both paths: sentinel art varies by palette color, art
+        // with its own colors varies by mode (Disabled is generated). A color
+        // variant is never a bare digit, so the two key spaces cannot collide.
+        const QByteArray variant =
+            resolvedHasSentinel ? sentinelColor(mode, role) : QByteArray::number(static_cast<int>(mode));
+        const QString key = cacheKey(resolvedPath, variant, pixelSize, devicePixelRatio);
+        const auto cached = cache.constFind(key);
+        if (cached != cache.constEnd()) {
+            return cached.value();
+        }
+
+        QPixmap pixmap;
+        if (resolvedHasSentinel) {
+            pixmap = renderSvg(resolveSvgColorSentinel(resolvedSvg, variant), pixelSize, devicePixelRatio);
+        } else {
+            // Authored art carries its own colors: use Qt's normal loader so
+            // raster overrides and non-SVG assets keep working.
+            pixmap = fromAsset(pixelSize, mode);
+        }
+        if (!pixmap.isNull()) {
+            // Set the ratio before caching: assigning it to a cached pixmap
+            // afterwards detaches (deep-copies) it on every paint.
+            pixmap.setDevicePixelRatio(devicePixelRatio);
+        }
+        if (cache.size() >= 64) {
+            cache.clear();
+        }
+        cache.insert(key, pixmap);
+        return pixmap;
+    }
+
+    QString prefix;
+    QPalette::ColorRole role;
+    mutable QHash<QString, QPixmap> cache;
+    mutable QString resolvedPath;
+    mutable QString resolvedThemePath;
+    mutable QByteArray resolvedSvg;
+    mutable QSize intrinsicSizeCache;
+    mutable bool resolvedAssetIsSvg = false;
+    mutable bool resolvedHasSentinel = false;
+    mutable bool hasResolvedAsset = false;
+    mutable bool hasIntrinsicSize = false;
+};
+} // namespace
+
+QIcon loadThemedIcon(QStringView prefix, QPalette::ColorRole role)
+{
+    return QIcon(new ThemeSvgIconEngine(prefix.toString(), role));
+}
+
+QPixmap loadSentinelSvgPixmap(const QString &resolvedPath, QPalette::ColorRole role, const QSize &size)
+{
+    if (!resolvedPath.endsWith(QStringLiteral(".svg"), Qt::CaseInsensitive)) {
+        return {};
+    }
+
+    const QByteArray svg = readSvg(resolvedPath);
+    if (!hasSentinel(svg)) {
+        return {};
+    }
+
+    const QByteArray color = qApp->palette().color(role).name(QColor::HexRgb).toLatin1();
+    return renderSvg(resolveSvgColorSentinel(svg, color), size, 1.0);
+}
diff --git a/cockatrice/src/interface/theme_icon.h b/cockatrice/src/interface/theme_icon.h
new file mode 100644
index 000000000..e26015ea1
--- /dev/null
+++ b/cockatrice/src/interface/theme_icon.h
@@ -0,0 +1,50 @@
+/**
+ * @file theme_icon.h
+ * @ingroup Interface
+ */
+
+#ifndef THEME_ICON_H
+#define THEME_ICON_H
+
+#include <QIcon>
+#include <QPalette>
+#include <QPixmap>
+#include <QSize>
+#include <QString>
+#include <QStringView>
+
+/**
+ * @brief Builds a palette-aware icon from a `theme:` asset.
+ *
+ * SVG glyphs may use the `currentColor` sentinel. A plain QPixmap snapshot
+ * cannot follow palette changes, so this returns a QIcon whose engine resolves
+ * the sentinel from the current palette every time it is asked for a pixmap.
+ * Icons therefore stay legible when the user switches between light and dark
+ * themes without recreating any actions or buttons.
+ *
+ * @param prefix Asset prefix relative to the `theme:` search path, with no file
+ *               extension (for example `icons/search`), matching themePixmap().
+ * @param role Palette role whose color replaces the sentinel. Selected glyphs
+ *             use HighlightedText unless a role other than WindowText is given.
+ * @return An icon that follows the application palette.
+ */
+QIcon loadThemedIcon(QStringView prefix, QPalette::ColorRole role = QPalette::WindowText);
+
+/**
+ * @brief Renders a resolved theme SVG when it carries the `currentColor` sentinel.
+ *
+ * Non-SVG assets and SVGs without the sentinel return a null pixmap so callers
+ * can fall back to their usual loading path (including legacy inversion).
+ *
+ * @param resolvedPath Asset path relative to the `theme:` search path, as
+ *                     returned by ThemeManager::assetPath (includes extension).
+ * @param role Palette role whose color replaces the sentinel.
+ * @param size Pixel size to render at; an empty size uses the SVG's intrinsic size.
+ * @return The recolored pixmap, or a null pixmap when the asset is not a
+ *         sentinel-carrying SVG.
+ */
+QPixmap loadSentinelSvgPixmap(const QString &resolvedPath,
+                              QPalette::ColorRole role = QPalette::WindowText,
+                              const QSize &size = {});
+
+#endif // THEME_ICON_H
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index 893cdc795..f120af8e4 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -12,6 +12,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFlags>
+#include <QFontDatabase>
 #include <QGuiApplication>
 #include <QIODevice>
 #include <QLatin1Char>
@@ -127,8 +128,10 @@ static QString usableDefaultStyle(const QString &style)
 ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
 {
     defaultStyleName = usableDefaultStyle(qApp->style()->objectName());
-    // Capture the untouched application palette before any theme is applied.
+    // Capture the untouched application palette and font before any theme is
+    // applied.
     defaultPalette = qApp->palette();
+    defaultFont = qApp->font();
     ensureThemeDirectoryExists();
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
     connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, [this] {
@@ -440,6 +443,46 @@ PaletteConfig ThemeManager::loadDefaultPaletteConfig(const QString &themeDirPath
     return cfg;
 }
 
+FontConfig ThemeManager::loadFontConfig(const QString &themeDirPath)
+{
+    if (themeDirPath.isEmpty()) {
+        return {};
+    }
+    return FontConfig::fromThemeDir(themeDirPath);
+}
+
+FontConfig ThemeManager::loadDefaultFontConfig(const QString &themeDirPath, const QString &themeName)
+{
+    FontConfig cfg = FontConfig::fromThemeDir(themeDirPath);
+    if (!cfg.hasFonts()) {
+        // The shipped fonts.toml may live in the system theme directory rather
+        // than the resolved (user) theme directory, so built-in themes still
+        // get their curated fonts.
+        cfg = FontConfig::fromThemeDir(QDir(systemThemesBasePath()).absoluteFilePath(themeName));
+    }
+    return cfg;
+}
+
+bool ThemeManager::saveFontConfig(const QString &themeDirPath, const FontConfig &cfg)
+{
+    if (themeDirPath.isEmpty()) {
+        return false;
+    }
+
+    QDir dir(themeDirPath);
+    if (!dir.exists()) {
+        dir.mkpath(".");
+    }
+
+    QFile f(dir.absoluteFilePath(FontConfig::fileName()));
+    if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+        return false;
+    }
+
+    QTextStream(&f) << cfg.toToml();
+    return true;
+}
+
 bool ThemeManager::commitPalette(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg)
 {
     if (!savePaletteConfig(themeDirPath, colorScheme, cfg)) {
@@ -488,6 +531,24 @@ void ThemeManager::previewPalette(const PaletteConfig &cfg, const QString &schem
     applyStyleAndPalette(themeName, themeCfg, cfg, scheme);
 }
 
+void ThemeManager::previewFonts(const FontConfig &cfg)
+{
+    currentFonts = cfg;
+
+    // QApplication::setFont already sends a font change to every widget, so a
+    // repolish pass is not needed for fonts (unlike the palette path).
+    const auto it = cfg.fonts.constFind(AppFont::InterfaceDefault);
+    if (it != cfg.fonts.constEnd()) {
+        qApp->setFont(it.value());
+    } else {
+        // A config without InterfaceDefault means "no override": restore the
+        // startup font instead of leaving the last preview applied.
+        qApp->setFont(defaultFont);
+    }
+
+    emit fontsChanged();
+}
+
 void ThemeManager::applyStyleAndPalette(const QString &themeName,
                                         const ThemeConfig &themeCfg,
                                         const PaletteConfig &palCfg,
@@ -591,6 +652,56 @@ QColor ThemeManager::appColor(AppColor::Role role) const
     return accent;
 }
 
+QFont ThemeManager::appFont(AppFont::Role role) const
+{
+    const auto it = currentFonts.fonts.constFind(role);
+    if (it != currentFonts.fonts.constEnd()) {
+        return it.value();
+    }
+
+    // Role fallbacks preserve the pre-theme defaults when no fonts.toml is
+    // present: an unset role resolves to the application font. Surfaces that
+    // hardcoded a different family ask for it explicitly: counter painters
+    // through cardTextFont(), the deck view headers and printed deck list
+    // through deckListFont(), the report dialogs through
+    // report_utils::reportLogFont(). Only the family basis is fixed there;
+    // sizes stay caller-side.
+    return qApp->font();
+}
+
+bool ThemeManager::hasAppFont(AppFont::Role role) const
+{
+    return currentFonts.fonts.contains(role);
+}
+
+QFont ThemeManager::cardTextFont() const
+{
+    if (hasAppFont(AppFont::CardText)) {
+        return appFont(AppFont::CardText);
+    }
+    QFont serifFont(QStringLiteral("Serif"));
+    serifFont.setStyleHint(QFont::Serif);
+    return serifFont;
+}
+
+QFont ThemeManager::deckListFont() const
+{
+    if (hasAppFont(AppFont::DeckList)) {
+        return appFont(AppFont::DeckList);
+    }
+    QFont serifFont(QStringLiteral("Serif"));
+    serifFont.setStyleHint(QFont::Serif);
+    return serifFont;
+}
+
+QFont ThemeManager::defaultAppFont(AppFont::Role /*role*/) const
+{
+    // No per-role scaling and no preview: an unset role resolves to the font
+    // captured at startup, which is what the theme falls back to once the
+    // editor closes.
+    return defaultFont;
+}
+
 void ThemeManager::themeChangedSlot()
 {
     QString themeName = SettingsCache::instance().getThemeName();
@@ -642,6 +753,19 @@ void ThemeManager::themeChangedSlot()
 
     applyStyleAndPalette(themeName, themeCfg, palette, activeScheme);
 
+    // ── Load fonts: shared per theme, no light/dark split ───────────────────
+    FontConfig fonts = loadDefaultFontConfig(dirPath, themeName);
+    currentFonts = fonts;
+    const auto fontIt = currentFonts.fonts.constFind(AppFont::InterfaceDefault);
+    if (fontIt != currentFonts.fonts.constEnd()) {
+        qApp->setFont(fontIt.value());
+    } else {
+        // No theme font: restore the pristine application font captured at
+        // startup, so a reverted preview cannot leak into the live theme.
+        qApp->setFont(defaultFont);
+    }
+    emit fontsChanged();
+
     QStringList resources;
     if (!dirPath.isEmpty()) {
         resources << dir.absolutePath();
diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h
index c1ab65685..ffe1043b5 100644
--- a/cockatrice/src/interface/theme_manager.h
+++ b/cockatrice/src/interface/theme_manager.h
@@ -11,6 +11,7 @@
 
 #include <QBrush>
 #include <QColor>
+#include <QFont>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QObject>
@@ -47,10 +48,15 @@ private:
     // palette is applied. Used as the base when a theme supplies no palette, so
     // switching away from a custom palette restores the original colours.
     QPalette defaultPalette;
+    // Pristine application font captured at startup, before any theme font is
+    // applied. Restored when a theme (or a preview) supplies no InterfaceDefault
+    // font, so switching away from a themed font cannot leave it behind.
+    QFont defaultFont;
     QString currentThemePath;
     std::array<QBrush, Role::MaxRole + 1> brushes;
     QStringMap availableThemes;
     QMap<AppColor::Role, QColor> currentAppColors;
+    FontConfig currentFonts;
     /*
       Internal cache for multiple backgrounds
     */
@@ -105,6 +111,9 @@ public:
     // Load/save per-scheme palette colors
     static PaletteConfig loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme);
     static bool savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg);
+    // Load/save shared per-theme fonts (fonts.toml, not split by scheme)
+    static FontConfig loadFontConfig(const QString &themeDirPath);
+    static bool saveFontConfig(const QString &themeDirPath, const FontConfig &cfg);
     // Resolve prefix to a scheme-qualified "theme:" path. Existence is probed
     // internally across the formats themes may ship (.png/.jpg/.svg), so
     // callers load the returned path directly. Prefers "<prefix>-<dark|light>"
@@ -123,6 +132,9 @@ public:
     // theme directory when it is absent from the resolved (user) directory.
     static PaletteConfig
     loadDefaultPaletteConfig(const QString &themeDirPath, const QString &themeName, const QString &colorScheme);
+    // Load the theme's shipped default fonts, falling back to the system theme
+    // directory when fonts.toml is absent from the resolved (user) directory.
+    static FontConfig loadDefaultFontConfig(const QString &themeDirPath, const QString &themeName);
     /** @brief Writes cfg to disk as the theme's palette-<scheme>.toml and updates the
      *         theme's stored colour scheme to match. Shared by PaletteEditorDialog::onSave
      *         and FirstRunWizard's theme step so the two "generate + keep" paths can't drift. */
@@ -132,10 +144,31 @@ public:
 
     void reloadCurrentTheme();
     void previewPalette(const PaletteConfig &cfg, const QString &scheme);
+    void previewFonts(const FontConfig &cfg);
 
     // Resolves an application color role: the theme's stored [AppColors] value
     // when present, otherwise a palette-accent-derived fallback.
     QColor appColor(AppColor::Role role) const;
+    /** @brief Resolves an application font role: the theme's stored [Fonts]
+     *         value when present, otherwise the application font. Roles that
+     *         had a historical hardcoded family ask for it through
+     *         cardTextFont() and deckListFont() instead. */
+    QFont appFont(AppFont::Role role) const;
+    /** @brief Whether the active theme defines this role in fonts.toml. */
+    bool hasAppFont(AppFont::Role role) const;
+    /** @brief The CardText role with its historical Serif fallback. Used by the
+     *         counter painters, which were Serif before the role existed. */
+    QFont cardTextFont() const;
+    /** @brief The DeckList role with its historical Serif fallback. Used by the
+     *         two surfaces that hardcoded Serif before the role existed (the
+     *         deck view zone headers and the printed deck list); every other
+     *         DeckList reader falls back to the application font. */
+    QFont deckListFont() const;
+    /** @brief Resolves an application font role against the startup font only,
+     *         ignoring any previewed config in currentFonts. Editors that show
+     *         "what this role resolves to" must use this, because appFont()
+     *         reflects a live preview while the editor is open. */
+    QFont defaultAppFont(AppFont::Role role) const;
 
     QBrush &getBgBrush(Role zone);
     QBrush getExtraBgBrush(Role zone, int zoneId = 0);
@@ -144,6 +177,7 @@ protected slots:
 signals:
     void themeChanged();
     void paletteChanged();
+    void fontsChanged();
 };
 
 extern ThemeManager *themeManager;
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
index c4b347047..8475a0ed9 100644
--- a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
@@ -1,5 +1,6 @@
 #include "art_crop_attribution.h"
 
+#include "../../theme_manager.h"
 #include "libcockatrice/card/printing/printing_info.h"
 
 #include <QColor>
@@ -35,7 +36,10 @@ QRectF paintArtAttribution(QPainter &painter,
 
     painter.save();
 
+    // Family comes from the CardText theme role; the incoming painter size
+    // stays the basis for the scale factor exactly as before.
     QFont font = painter.font();
+    font.setFamily(themeManager->appFont(AppFont::CardText).family());
     font.setPointSizeF(qMax(6.0, font.pointSizeF() * scale));
     painter.setFont(font);
 
diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
index ebf79282e..a7e633ad2 100644
--- a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
@@ -2,6 +2,8 @@
 
 #include "libcockatrice/card/card_info.h"
 
+#include <QRect>
+#include <QSize>
 #include <QTransform>
 #include <libcockatrice/card/printing/exact_card.h>
 #include <qnamespace.h>
@@ -18,4 +20,23 @@ QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card)
     transform.rotate(90);
     return art.transformed(transform, Qt::SmoothTransformation);
 }
-} // namespace CardArtUtils
\ No newline at end of file
+
+QPixmap cropCardArt(const QPixmap &art, const ExactCard &card)
+{
+    if (art.isNull()) {
+        return {};
+    }
+
+    const QPixmap source = rotateSidewaysLayoutArt(art, card);
+    const bool landscape = card.getInfo().getUiAttributes().landscapeOrientation;
+    const QSize size = source.size();
+    const int marginX = size.width() * 0.07;
+    // Landscape name boxes extend below 5% of the upright image. Remove the
+    // whole box here, rather than relying on the banner's narrow viewport to
+    // hide it: the same saved offset is also used by the taller profile popup.
+    const int topMargin = size.height() * (landscape ? 0.15 : 0.11);
+    const int bottomMargin = size.height() * 0.45;
+    const QRect crop(marginX, topMargin, size.width() - 2 * marginX, size.height() - topMargin - bottomMargin);
+    return source.copy(crop.intersected(source.rect()));
+}
+} // namespace CardArtUtils
diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.h b/cockatrice/src/interface/widgets/cards/card_art_utils.h
index 5c331a12c..ac3b82380 100644
--- a/cockatrice/src/interface/widgets/cards/card_art_utils.h
+++ b/cockatrice/src/interface/widgets/cards/card_art_utils.h
@@ -20,6 +20,13 @@ namespace CardArtUtils
  * @return @p art rotated 90° clockwise for sideways-layout cards, else @p art.
  */
 QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card);
+
+/**
+ * Return the upright artwork used by banner previews, user rows and profile
+ * popups. The crop excludes conventional name and rules boxes before callers apply
+ * their saved pan and zoom, so a taller popup cannot expose the card frame.
+ */
+QPixmap cropCardArt(const QPixmap &art, const ExactCard &card);
 } // namespace CardArtUtils
 
-#endif // CARD_ART_UTILS_H
\ No newline at end of file
+#endif // CARD_ART_UTILS_H
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 3c1e1b77f..8f02ebcde 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -43,11 +43,6 @@
 #include <qlogging.h>
 #include <qnamespace.h>
 
-static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
-// static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457;
-static constexpr qreal ASPECT_RATIO = MTG_CARD_ASPECT_RATIO;
-
-static constexpr int BASE_WIDTH = 200;
 static constexpr int BASE_HEIGHT = 200;
 
 static constexpr int ENLARGED_PIXMAP_OFFSET = 10;
@@ -162,12 +157,11 @@ void CardInfoPictureWidget::resizeEvent(QResizeEvent *event)
  */
 void CardInfoPictureWidget::setScaleFactor(const int scale)
 {
-    const int newWidth = BASE_WIDTH * scale / 100;
-    const int newHeight = static_cast<int>(newWidth * ASPECT_RATIO);
+    const QSize newSize = sizeForScaleFactor(scale);
 
     scaleFactor = scale;
 
-    setFixedSize(newWidth, newHeight);
+    setFixedSize(newSize);
     updatePixmap();
 
     emit cardScaleFactorChanged(scale);
@@ -266,8 +260,13 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
  */
 QSize CardInfoPictureWidget::sizeHint() const
 {
-    return {static_cast<int>(BASE_WIDTH * scaleFactor / 100.0),
-            static_cast<int>(BASE_WIDTH * scaleFactor / 100.0 * ASPECT_RATIO)};
+    return sizeForScaleFactor(scaleFactor);
+}
+
+QSize CardInfoPictureWidget::sizeForScaleFactor(int scaleFactor)
+{
+    const int width = BASE_WIDTH * scaleFactor / 100;
+    return {width, static_cast<int>(width * ASPECT_RATIO)};
 }
 
 /**
@@ -491,7 +490,14 @@ void CardInfoPictureWidget::showEnlargedPixmap()
     enlargedPixmapWidget->setCardPixmap(exactCard, enlargedSize);
 
     const QPoint cursorPos = QCursor::pos();
-    const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
+    QScreen *screen = QGuiApplication::screenAt(cursorPos);
+    if (!screen) {
+        screen = QGuiApplication::primaryScreen();
+    }
+    if (!screen) {
+        return;
+    }
+    const QRect screenGeometry = screen->geometry();
     const QSize widgetSize = enlargedPixmapWidget->size();
 
     int newX = cursorPos.x() + ENLARGED_PIXMAP_OFFSET;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
index 8d2d63736..0eb731d92 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -28,6 +28,11 @@ class CardInfoPictureWidget : public QWidget
     Q_OBJECT
 
 public:
+    /// Width of a card picture at 100 % scale, in pixels.
+    static constexpr int BASE_WIDTH = 200;
+    /// Height / width of a card picture.
+    static constexpr qreal ASPECT_RATIO = 1.396;
+
     explicit CardInfoPictureWidget(QWidget *parent = nullptr,
                                    bool hoverToZoomEnabled = false,
                                    bool raiseOnEnter = false);
@@ -37,6 +42,12 @@ public:
     }
     [[nodiscard]] QSize sizeHint() const override;
 
+    /**
+     * @brief The size a card picture has at @p scaleFactor percent.
+     * @param scaleFactor Percentage of BASE_WIDTH, as set by the card size slider.
+     */
+    [[nodiscard]] static QSize sizeForScaleFactor(int scaleFactor);
+
 public slots:
     void setCard(const ExactCard &card);
     void setScaleFactor(int scale); // New slot for scaling
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
index 04fe9ab69..56fe0bda4 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
@@ -1,5 +1,7 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
+#include "../../theme_manager.h"
+
 #include <QBrush>
 #include <QChar>
 #include <QFont>
@@ -43,6 +45,7 @@ CardInfoPictureWithTextOverlayWidget::CardInfoPictureWithTextOverlayWidget(QWidg
       fontSize(fontSize), textAlignment(alignment), highlighted(false)
 {
     this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &CardInfoPictureWithTextOverlayWidget::applyCardTextFont);
 }
 
 /**
@@ -97,6 +100,13 @@ void CardInfoPictureWithTextOverlayWidget::setTextAlignment(const Qt::Alignment
     update();
 }
 
+void CardInfoPictureWithTextOverlayWidget::applyCardTextFont()
+{
+    // The overlay paint reads the CardText role font at paint time, so a
+    // theme font change only needs a repaint here.
+    update();
+}
+
 void CardInfoPictureWithTextOverlayWidget::setHighlighted(bool _highlighted)
 {
     if (highlighted == _highlighted) {
@@ -168,8 +178,10 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event)
         return;
     }
 
-    // Calculate the optimal font size
-    QFont font = painter.font();
+    // Calculate the optimal font size. The family comes from the CardText
+    // theme role; the fontSize member stays the starting size and the
+    // shrink-to-fit logic below is unchanged.
+    QFont font = themeManager->appFont(AppFont::CardText);
     int optimalFontSize = fontSize; // Start with the user-defined font size
     const QFontMetrics baseMetrics(font);
     int textWidth = pixmapRect.width();
@@ -284,7 +296,7 @@ QSize CardInfoPictureWithTextOverlayWidget::minimumSizeHint() const
     const QSize pixmapSize = pixmap.isNull() ? QSize(0, 0) : pixmap.size();
 
     // Get the font metrics for the overlay text
-    QFont font;
+    QFont font = themeManager->appFont(AppFont::CardText);
     font.setPointSize(fontSize);
     const QFontMetrics fontMetrics(font);
 
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
index 6c547dc13..41019f543 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h
@@ -47,6 +47,9 @@ protected:
     void mousePressEvent(QMouseEvent *event) override;
     [[nodiscard]] QSize minimumSizeHint() const override;
 
+private slots:
+    void applyCardTextFont();
+
 private:
     void drawOutlinedText(QPainter &painter,
                           const QRect &textRect,
diff --git a/cockatrice/src/interface/widgets/cards/card_picture_delegate.cpp b/cockatrice/src/interface/widgets/cards/card_picture_delegate.cpp
new file mode 100644
index 000000000..781c767ef
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/card_picture_delegate.cpp
@@ -0,0 +1,83 @@
+#include "card_picture_delegate.h"
+
+#include "../../../client/settings/cache_settings.h"
+#include "../../card_picture_loader/card_picture_loader.h"
+#include "card_art_utils.h"
+#include "card_database_visual_display_model.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/settings/cards_display_settings.h"
+
+#include <QPainter>
+#include <QPainterPath>
+#include <QPixmap>
+#include <QRect>
+#include <QStyleOptionViewItem>
+#include <libcockatrice/card/printing/printing_info.h>
+
+CardPictureDelegate::CardPictureDelegate(CardDatabaseVisualDisplayModel *_model, QObject *parent)
+    : QStyledItemDelegate(parent), model(_model)
+{
+}
+
+void CardPictureDelegate::setCardSize(const QSize &size)
+{
+    if (cardSize == size) {
+        return;
+    }
+
+    cardSize = size;
+}
+
+void CardPictureDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    if (model == nullptr) {
+        return;
+    }
+
+    const ExactCard card = model->cardAt(index.row());
+    if (!card) {
+        return;
+    }
+
+    // The grid cell is the card plus SPACING; give the picture the rest.
+    const int inset = SPACING / 2;
+    const QRect cardArea = option.rect.adjusted(inset, inset, -inset, -inset);
+
+    QPixmap pixmap;
+    CardPictureLoader::getCardBackLoadingInProgressPixmap(pixmap, cardArea.size());
+    CardPictureLoader::getPixmap(pixmap, card, cardArea.size());
+
+    if (pixmap.isNull()) {
+        return;
+    }
+
+    if (SettingsCache::instance().cardsDisplay().getAutoRotateSidewaysLayoutCards()) {
+        pixmap = CardArtUtils::rotateSidewaysLayoutArt(pixmap, card);
+    }
+
+    // Fit the picture into the cell and center it, like CardInfoPictureWidget does.
+    const QSize pictureSize = pixmap.deviceIndependentSize().toSize().scaled(cardArea.size(), Qt::KeepAspectRatio);
+    const QRect pictureRect(cardArea.center().x() - pictureSize.width() / 2,
+                            cardArea.center().y() - pictureSize.height() / 2, pictureSize.width(),
+                            pictureSize.height());
+
+    const qreal radius = SettingsCache::instance().cardsDisplay().getRoundCardCorners()
+                             ? 0.05 * static_cast<qreal>(pictureRect.width())
+                             : 0.0;
+
+    painter->save();
+    painter->setRenderHint(QPainter::Antialiasing);
+    painter->setRenderHint(QPainter::SmoothPixmapTransform);
+    QPainterPath shape;
+    shape.addRoundedRect(pictureRect, radius, radius);
+    painter->setClipPath(shape);
+    // Source rect is in device pixels, target in logical ones: drawPixmap scales
+    // between them without the device pixel ratio being applied twice.
+    painter->drawPixmap(pictureRect, pixmap, QRectF(pixmap.rect()));
+    painter->restore();
+}
+
+QSize CardPictureDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex & /*index*/) const
+{
+    return cardSize + QSize(SPACING, SPACING);
+}
diff --git a/cockatrice/src/interface/widgets/cards/card_picture_delegate.h b/cockatrice/src/interface/widgets/cards/card_picture_delegate.h
new file mode 100644
index 000000000..31e673624
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/card_picture_delegate.h
@@ -0,0 +1,45 @@
+/**
+ * @file card_picture_delegate.h
+ * @ingroup CardWidgets
+ * @brief Paints a card picture for a visual card grid item.
+ */
+
+#ifndef CARD_PICTURE_DELEGATE_H
+#define CARD_PICTURE_DELEGATE_H
+
+#include <QSize>
+#include <QStyledItemDelegate>
+#include <qtmetamacros.h>
+
+class CardDatabaseVisualDisplayModel;
+
+/**
+ * @brief Draws the card of a CardDatabaseVisualDisplayModel row as a picture.
+ *
+ * The delegate only paints rows the view asks for, so a grid of the whole card
+ * database stays cheap: no widget per card and no pixmap loaded for items that
+ * are off screen. Card images come from CardPictureLoader, which caches them and
+ * loads missing ones asynchronously.
+ */
+class CardPictureDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+
+public:
+    /// Gap left around a card picture inside its grid cell, in pixels.
+    static constexpr int SPACING = 4;
+
+    explicit CardPictureDelegate(CardDatabaseVisualDisplayModel *_model, QObject *parent = nullptr);
+
+    /// The picture size inside a grid cell. The cell is this size plus SPACING.
+    void setCardSize(const QSize &size);
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    [[nodiscard]] QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+
+private:
+    CardDatabaseVisualDisplayModel *model;
+    QSize cardSize;
+};
+
+#endif // CARD_PICTURE_DELEGATE_H
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
index ab1840591..ac1ab9cb1 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@@ -2,6 +2,7 @@
 
 #include "../general/layout_containers/flow_widget.h"
 
+#include <QAbstractScrollArea>
 #include <QEvent>
 #include <QFlags>
 #include <QHBoxLayout>
@@ -33,8 +34,8 @@ CardSizeWidget::CardSizeWidget(QWidget *parent, FlowWidget *_flowWidget, int def
     cardSizeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     cardSizeSlider = new QSlider(Qt::Horizontal, this);
-    cardSizeSlider->setRange(50, 250);      ///< Slider range for card size adjustment.
-    cardSizeSlider->setValue(defaultValue); ///< Initial slider value.
+    cardSizeSlider->setRange(MIN_CARD_SIZE, MAX_CARD_SIZE); ///< Slider range for card size adjustment.
+    cardSizeSlider->setValue(defaultValue);                 ///< Initial slider value.
 
     cardSizeLayout->addWidget(cardSizeLabel);
     cardSizeLayout->addWidget(cardSizeSlider);
@@ -73,13 +74,26 @@ QSlider *CardSizeWidget::getSlider() const
 
 void CardSizeWidget::enableCtrlScrollResize(QWidget *host)
 {
-    host->installEventFilter(this);
-
-    const auto scrollAreas = host->findChildren<QScrollArea *>();
-    for (QScrollArea *scrollArea : scrollAreas) {
-        if (QWidget *content = scrollArea->widget()) {
-            content->installEventFilter(this);
+    const auto watchScrollArea = [this](QAbstractScrollArea *scrollArea) {
+        if (scrollArea == nullptr) {
+            return;
         }
+        if (QWidget *viewport = scrollArea->viewport()) {
+            viewport->installEventFilter(this);
+        }
+        if (auto *contentScrollArea = qobject_cast<QScrollArea *>(scrollArea)) {
+            if (QWidget *content = contentScrollArea->widget()) {
+                content->installEventFilter(this);
+            }
+        }
+    };
+
+    host->installEventFilter(this);
+    watchScrollArea(qobject_cast<QAbstractScrollArea *>(host));
+
+    const auto scrollAreas = host->findChildren<QAbstractScrollArea *>();
+    for (QAbstractScrollArea *scrollArea : scrollAreas) {
+        watchScrollArea(scrollArea);
     }
 }
 
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h
index 7de97a5e9..fced90d33 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h
@@ -24,6 +24,10 @@ class CardSizeWidget : public QWidget
     Q_OBJECT
 
 public:
+    /// Range of the card size slider, as a percentage of the base card width.
+    static constexpr int MIN_CARD_SIZE = 50;
+    static constexpr int MAX_CARD_SIZE = 250;
+
     explicit CardSizeWidget(QWidget *parent, FlowWidget *flowWidget = nullptr, int defaultValue = 100);
     [[nodiscard]] QSlider *getSlider() const;
 
@@ -31,8 +35,9 @@ public:
      * @brief Resizes the cards when the user Ctrl + scrolls over @p host or any of its descendants.
      *
      * Installs this widget as an event filter on the given host widget. If the host contains a
-     * scroll area the filter is also installed on the scroll area's content widget, so the resize
-     * intercepts the wheel event before the scroll area would scroll the view.
+     * scroll area the filter is also installed on the scroll area's content widget, and on the
+     * viewport of every scroll area base (QListView, QTableView, ...), so the resize intercepts
+     * the wheel event before the scroll area would scroll the view.
      */
     void enableCtrlScrollResize(QWidget *host);
 
diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
index d7eef6c18..3ec2053b1 100644
--- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp
@@ -69,6 +69,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
     updateZoneCardCount();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition);
+    connect(deckListModel, &QAbstractItemModel::layoutChanged, this, &DeckCardZoneDisplayWidget::displayCards);
     if (selectionModel) {
         connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
                 &DeckCardZoneDisplayWidget::onSelectionChanged);
@@ -174,6 +175,9 @@ void DeckCardZoneDisplayWidget::displayCards()
 
     for (const QPersistentModelIndex &persistent : rows) {
         constructAppropriateWidget(persistent);
+        // Reuse existing widgets when a model sort moves their persistent rows.
+        // This preserves collapsed groups and card selection during live edits.
+        cardGroupLayout->insertWidget(persistent.row(), indexToWidgetMap.value(persistent));
     }
 }
 
diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
index 730043d95..c8571ab08 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
@@ -1,6 +1,6 @@
 #include "abstract_analytics_panel_widget.h"
 
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../general/display/banner_widget.h"
 #include "deck_list_statistics_analyzer.h"
 
@@ -28,7 +28,7 @@ AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, Deck
 
     // config button
     configureButton = new QPushButton(this);
-    configureButton->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
+    configureButton->setIcon(loadThemedIcon(QStringLiteral("icons/settings")));
     configureButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
     connect(configureButton, &QPushButton::clicked, this, &AbstractAnalyticsPanelWidget::applyConfigFromDialog);
     bannerAndSettingsLayout->addWidget(configureButton, 0);
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
index 85dba6468..df2a645f1 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -1,5 +1,6 @@
 #include "resizable_panel.h"
 
+#include "../interface/theme_manager.h"
 #include "abstract_analytics_panel_widget.h"
 #include "libcockatrice/utility/qt_utils.h"
 
@@ -12,6 +13,7 @@
 #include <QDropEvent>
 #include <QEvent>
 #include <QFlags>
+#include <QFont>
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QMimeData>
@@ -93,9 +95,17 @@ ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWid
 
     dragButton->setStyleSheet(QString("QPushButton { "
                                       "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:1 %2); "
-                                      "border: none; color: %3; font-size: 10px; }"
+                                      "border: none; color: %3; }"
                                       "QPushButton:hover { background: %4; }")
                                   .arg(mid.name(), dark.name(), placeholderText.name(), midLight.name()));
+    // Family comes from the InterfaceDefault theme role; the 10px size stays caller-side.
+    auto applyDragFont = [this]() {
+        QFont dragFont = themeManager->appFont(AppFont::InterfaceDefault);
+        dragFont.setPixelSize(10);
+        dragButton->setFont(dragFont);
+    };
+    applyDragFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyDragFont);
 
     resizeHandle->setStyleSheet(QString("QWidget { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
                                         "stop:0 %1, stop:1 %2); }")
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
index 7ed398535..f25e6c0ff 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
@@ -3,7 +3,7 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/syntax_help.h"
 #include "../../key_signals.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../utility/custom_line_edit.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
@@ -40,8 +40,8 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
     searchEdit->setObjectName("searchEdit");
     searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
     searchEdit->setClearButtonEnabled(true);
-    searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
-    auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
+    searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
+    auto help = searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
 
     setFocusProxy(searchEdit);
     setFocusPolicy(Qt::ClickFocus);
@@ -83,13 +83,13 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
             &DeckEditorDatabaseDisplayWidget::onRelatedCardClicked);
 
     aAddCard = new QAction(QString(), this);
-    aAddCard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green")));
+    aAddCard->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_right")));
     connect(aAddCard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
     auto *tbAddCard = new QToolButton(this);
     tbAddCard->setDefaultAction(aAddCard);
 
     aAddCardToSideboard = new QAction(QString(), this);
-    aAddCardToSideboard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_blue")));
+    aAddCardToSideboard->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_right_sideboard")));
     connect(aAddCardToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
     auto *tbAddCardToSideboard = new QToolButton(this);
     tbAddCardToSideboard->setDefaultAction(aAddCardToSideboard);
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
index 37dd57459..47d2a1aae 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
@@ -3,7 +3,7 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../key_signals.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../playmat/playmat_settings_dialog.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "../tabs/abstract_tab_deck_editor.h"
@@ -49,6 +49,7 @@
 #include <QPushButton>
 #include <QSet>
 #include <QSharedPointer>
+#include <QSignalBlocker>
 #include <QSize>
 #include <QSizePolicy>
 #include <QSplitter>
@@ -187,10 +188,17 @@ void DeckEditorDeckDockWidget::createDeckDock()
     formatLabel = new QLabel(this);
 
     formatComboBox = new QComboBox(this);
+    formatComboBox->setObjectName("deckFormatComboBox");
     formatComboBox->addItem(tr("Loading Database..."));
     formatComboBox->setEnabled(false); // Disable until loaded
 
     commanderBracketWidget = new CommanderBracketWidget(this);
+    connect(formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
+        formatComboBox->setPlaceholderText(QString());
+        formatComboBox->setToolTip(QString());
+        deckStateManager->setFormat(index >= 0 ? formatComboBox->itemData(index).toString() : QString());
+        commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
+    });
 
     commentsLabel = new QLabel();
     commentsLabel->setObjectName("commentsLabel");
@@ -240,25 +248,25 @@ void DeckEditorDeckDockWidget::createDeckDock()
             &DeckEditorDeckDockWidget::applyActiveGroupCriteria);
 
     aIncrement = new QAction(QString(), this);
-    aIncrement->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    aIncrement->setIcon(loadThemedIcon(QStringLiteral("icons/increment")));
     connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrementSelection);
     auto *tbIncrement = new QToolButton(this);
     tbIncrement->setDefaultAction(aIncrement);
 
     aDecrement = new QAction(QString(), this);
-    aDecrement->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    aDecrement->setIcon(loadThemedIcon(QStringLiteral("icons/decrement")));
     connect(aDecrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actDecrementSelection);
     auto *tbDecrement = new QToolButton(this);
     tbDecrement->setDefaultAction(aDecrement);
 
     aRemoveCard = new QAction(QString(), this);
-    aRemoveCard->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    aRemoveCard->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     connect(aRemoveCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actRemoveCard);
     auto *tbRemoveCard = new QToolButton(this);
     tbRemoveCard->setDefaultAction(aRemoveCard);
 
     aSwapCard = new QAction(QString(), this);
-    aSwapCard->setIcon(themePixmap(QStringLiteral("icons/swap")));
+    aSwapCard->setIcon(loadThemedIcon(QStringLiteral("icons/swap")));
     connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapSelection);
     auto *tbSwapCard = new QToolButton(this);
     tbSwapCard->setDefaultAction(aSwapCard);
@@ -355,6 +363,9 @@ void DeckEditorDeckDockWidget::initializeFormats()
 {
     QStringList allFormats = CardDatabaseManager::query()->getAllFormatsWithCount().keys();
 
+    // Rebuilding the list is a view update, not a user edit. In particular,
+    // clear() emits currentIndexChanged(-1), which must not clear the deck.
+    const QSignalBlocker blocker(formatComboBox);
     formatComboBox->clear(); // Remove "Loading Database..."
     formatComboBox->setEnabled(true);
 
@@ -364,28 +375,25 @@ void DeckEditorDeckDockWidget::initializeFormats()
         formatComboBox->addItem(formatName, formatName); // store the raw key in itemData
     }
 
-    QString format = deckStateManager->getMetadata().gameFormat;
-    if (!format.isEmpty()) {
-        formatComboBox->setCurrentIndex(formatComboBox->findData(format));
-    } else {
-        // Ensure no selection is visible initially
-        formatComboBox->setCurrentIndex(-1);
-    }
-    connect(formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
-        QString formatKey;
-        if (index >= 0) {
-            formatKey = formatComboBox->itemData(index).toString();
-            deckStateManager->setFormat(formatKey);
-        } else {
-            deckStateManager->setFormat(""); // clear format if deselected
-        }
-
-        commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
-    });
+    syncFormatSelection();
 
     commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
 }
 
+void DeckEditorDeckDockWidget::syncFormatSelection()
+{
+    if (!formatComboBox->isEnabled()) {
+        return;
+    }
+    const QSignalBlocker blocker(formatComboBox);
+    const QString format = deckStateManager->getMetadata().gameFormat;
+    const int index = format.isEmpty() ? -1 : formatComboBox->findData(format);
+    const QString unavailable = index < 0 && !format.isEmpty() ? tr("Unavailable: %1").arg(format) : QString();
+    formatComboBox->setPlaceholderText(unavailable);
+    formatComboBox->setToolTip(unavailable);
+    formatComboBox->setCurrentIndex(index);
+}
+
 ExactCard DeckEditorDeckDockWidget::getCurrentCard()
 {
     QModelIndex current = deckView->selectionModel()->currentIndex();
@@ -596,9 +604,7 @@ void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel()
     updatePlaymatLabel();
     updateHash();
 
-    formatComboBox->blockSignals(true);
-    formatComboBox->setCurrentIndex(formatComboBox->findData(deckStateManager->getMetadata().gameFormat));
-    formatComboBox->blockSignals(false);
+    syncFormatSelection();
 
     commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
 
@@ -762,18 +768,6 @@ void DeckEditorDeckDockWidget::actSwapSelection()
     update();
 }
 
-void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString zoneName)
-{
-    if (!card) {
-        return;
-    }
-    if (card.getInfo().getIsToken()) {
-        zoneName = DECK_ZONE_TOKENS;
-    }
-
-    deckStateManager->decrementCard(card, zoneName);
-}
-
 void DeckEditorDeckDockWidget::actDecrementSelection()
 {
     auto selectedRows = getSelectedCardNodeSourceIndices();
@@ -1054,6 +1048,7 @@ void DeckEditorDeckDockWidget::retranslateUi()
     commentsLabel->setText(tr("&Comments:"));
     activeGroupCriteriaLabel->setText(tr("Group by:"));
     formatLabel->setText(tr("Format:"));
+    syncFormatSelection();
     commanderBracketWidget->retranslateUi();
 
     hashLabel1->setText(tr("Hash:"));
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
index 97ab8823e..02910e390 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
@@ -70,7 +70,6 @@ public slots:
     void syncDisplayWidgetsToModel();
     void actAddCard(const ExactCard &card, const QString &zoneName);
     void actIncrementSelection();
-    void actDecrementCard(const ExactCard &card, QString zoneName);
     void actDecrementSelection();
     void actSwapCard(const ExactCard &card, const QString &zoneName);
     void actSwapSelection();
@@ -111,6 +110,7 @@ private:
     DeckListModel *getModel() const;
     [[nodiscard]] QModelIndexList getSelectedCardNodeSourceIndices() const;
     void offsetCountAtIndex(const QModelIndex &idx, bool isIncrement);
+    void syncFormatSelection();
 
     void addMoveToZoneMenu(QMenu *menu, const QModelIndex &sourceCardIndex, const QString &currentBoardName);
     void addChangeBoardMenu(QMenu *menu, const QString &zoneName);
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
index adeb5c3e1..8122d1847 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
@@ -5,7 +5,7 @@
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
 #include "../../key_signals.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../tabs/abstract_tab_deck_editor.h"
 #include "libcockatrice/filters/filter_card.h"
 
@@ -64,11 +64,11 @@ void DeckEditorFilterDockWidget::createFiltersDock()
     connect(filterBuilder, &FilterBuilder::add, filterModel, &FilterTreeModel::addFilter);
 
     aClearFilterOne = new QAction(QString(), this);
-    aClearFilterOne->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    aClearFilterOne->setIcon(loadThemedIcon(QStringLiteral("icons/decrement")));
     connect(aClearFilterOne, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterOne);
 
     aClearFilterAll = new QAction(QString(), this);
-    aClearFilterAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
+    aClearFilterAll->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch")));
     connect(aClearFilterAll, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterAll);
 
     auto *filterDelOne = new QToolButton();
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
index 209dc7273..a1914e1b5 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
@@ -1,6 +1,6 @@
 #include "deck_list_history_manager_widget.h"
 
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "deck_state_manager.h"
 #include "libcockatrice/deck_list/deck_list_history_manager.h"
@@ -32,7 +32,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de
     layout = new QHBoxLayout(this);
 
     aUndo = new QAction(QString(), this);
-    aUndo->setIcon(themePixmap(QStringLiteral("icons/arrow_undo")));
+    aUndo->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_undo")));
     aUndo->setShortcut(QKeySequence::Undo);
     aUndo->setShortcutContext(Qt::ApplicationShortcut);
     connect(aUndo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doUndo);
@@ -41,7 +41,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de
     undoButton->setDefaultAction(aUndo);
 
     aRedo = new QAction(QString(), this);
-    aRedo->setIcon(themePixmap(QStringLiteral("icons/arrow_redo")));
+    aRedo->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_redo")));
     aRedo->setShortcut(QKeySequence::Redo);
     aRedo->setShortcutContext(Qt::ApplicationShortcut);
     connect(aRedo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doRedo);
@@ -53,7 +53,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de
     layout->addWidget(redoButton);
 
     historyButton = new SettingsButtonWidget(this);
-    historyButton->setButtonIcon(themePixmap(QStringLiteral("icons/arrow_history")));
+    historyButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/arrow_history")));
 
     historyLabel = new QLabel(this);
 
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
index 1e1aefe58..a9c9cad7a 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
@@ -1,5 +1,7 @@
 #include "deck_list_style_proxy.h"
 
+#include "../../theme_manager.h"
+
 #include <QBrush>
 #include <QColor>
 #include <QFont>
@@ -8,6 +10,16 @@
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <qnamespace.h>
 
+DeckListStyleProxy::DeckListStyleProxy(QObject *parent) : QIdentityProxyModel(parent)
+{
+    // FontRole data reads the DeckList role live; rebroadcast so attached
+    // views re-query instead of waiting for an incidental repaint.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+        emit layoutAboutToBeChanged();
+        emit layoutChanged();
+    });
+}
+
 QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
 {
     QModelIndex src = mapToSource(index);
@@ -20,7 +32,8 @@ QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
     bool isCard = src.data(DeckRoles::IsCardRole).toBool();
 
     if (role == Qt::FontRole && !isCard) {
-        QFont f;
+        // Family comes from the DeckList theme role; bold stays caller-side.
+        QFont f = themeManager->appFont(AppFont::DeckList);
         f.setBold(true);
         return f;
     }
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
index e4d1de4f4..3149da6de 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
@@ -8,7 +8,7 @@ class DeckListStyleProxy : public QIdentityProxyModel
 {
     Q_OBJECT
 public:
-    using QIdentityProxyModel::QIdentityProxyModel;
+    explicit DeckListStyleProxy(QObject *parent = nullptr);
 
     [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
 };
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
index d4715c8d5..cbf9dd3c4 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
@@ -1,7 +1,6 @@
 #include "deck_state_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "deck_list_model.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_querier.h"
@@ -18,6 +17,7 @@
 #include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_history_manager.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <qnamespace.h>
@@ -211,15 +211,15 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone
         return {};
     }
 
-    QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName;
+    QString targetZone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName;
 
     CardSetPtr set = card.getPrinting().getSet();
     QString setName = set ? set->getCorrectedShortName() : "";
 
     QString reason =
-        tr("Added (%1): %2 (%3) %4").arg(zone, card.getName(), setName, card.getPrinting().getProperty("num"));
+        tr("Added (%1): %2 (%3) %4").arg(targetZone, card.getName(), setName, card.getPrinting().getProperty("num"));
 
-    QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); });
+    QModelIndex idx = modifyDeck(reason, [&card, &targetZone](auto model) { return model->addCard(card, targetZone); });
 
     if (idx.isValid()) {
         emit focusIndexChanged(idx, true);
@@ -234,10 +234,22 @@ QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString
         return {};
     }
 
+    QString targetZone = zoneName;
+
     QString providerId = card.getPrinting().getUuid();
     QString collectorNumber = card.getPrinting().getProperty("num");
 
-    QModelIndex idx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    QModelIndex idx = deckListModel->findCard(card.getName(), targetZone, providerId, collectorNumber);
+
+    // Tokens are usually added to the token zone, but it is possible for imported/hand-edited
+    // decks to contain them in the main or sideboards. This is why we only try to remove the
+    // token from the token zone if it does not exist in the given zone, allowing us to still
+    // remove it from there.
+    if (!idx.isValid() && card.getInfo().getIsToken() && targetZone != DECK_ZONE_TOKENS) {
+        targetZone = DECK_ZONE_TOKENS;
+        idx = deckListModel->findCard(card.getName(), targetZone, providerId, collectorNumber);
+    }
+
     if (!idx.isValid()) {
         return {};
     }
@@ -249,7 +261,7 @@ QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString
     }
 
     // old index is no longer safe since rows could have been removed
-    QModelIndex newIdx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    QModelIndex newIdx = deckListModel->findCard(card.getName(), targetZone, providerId, collectorNumber);
     if (newIdx.isValid()) {
         emit focusIndexChanged(newIdx, true);
     }
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
index 98876947b..0612147eb 100644
--- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_DECK_STATE_MANAGER_H
 #define COCKATRICE_DECK_STATE_MANAGER_H
 
-#include "../../deck_loader/loaded_deck.h"
+#include "deck_list_model.h"
 
 #include <QModelIndex>
 #include <QObject>
@@ -10,6 +10,7 @@
 #include <QStringList>
 #include <functional>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <qtmetamacros.h>
 
 class DeckListHistoryManager;
@@ -187,17 +188,18 @@ public:
     ///@}
 
     /**
-     * @brief Adds the given card to the given zone.
+     * @brief Adds the given card to the given zone. Tokens always go to DECK_ZONE_TOKENS, ignoring the given zone.
      * Saves the operation to history if successful.
      *
      * @param card The card to add
-     * @param zoneName The zone to add the card to
+     * @param zoneName The zone to add the card to if the card is not a token
      * @return The index of the added card
      */
     QModelIndex addCard(const ExactCard &card, const QString &zoneName);
 
     /**
      * @brief Removes 1 copy of the given card from the given zone.
+     * If the card is a token and is not in the given zone, then it is removed from DECK_ZONE_TOKENS instead.
      * Saves the operation to history if successful.
      *
      * @param card The card to remove
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index 43b40bf30..daee5f1f9 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@@ -1,7 +1,7 @@
 #include "dlg_connect.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../server/handle_public_servers.h"
 #include "../server/user/user_info_connection.h"
 #include "libcockatrice/utility/macros.h"
@@ -33,11 +33,12 @@ class QWidget;
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("connectDialog");
     previousHostButton = new QRadioButton(tr("Known Hosts"), this);
     previousHosts = new QComboBox(this);
 
     btnDeleteServer = new QPushButton(this);
-    btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    btnDeleteServer->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     btnDeleteServer->setToolTip(tr("Delete the currently selected saved server"));
     btnDeleteServer->setFixedWidth(30);
 
@@ -45,7 +46,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 
     hps = new HandlePublicServers(this);
     btnRefreshServers = new QPushButton(this);
-    btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync")));
+    btnRefreshServers->setIcon(loadThemedIcon(QStringLiteral("icons/sync")));
     btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers"));
     btnRefreshServers->setFixedWidth(30);
 
@@ -85,6 +86,11 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
     passwordLabel->setBuddy(passwordEdit);
     passwordEdit->setEchoMode(QLineEdit::Password);
 
+    hostEdit->setObjectName("connectHostEdit");
+    portEdit->setObjectName("connectPortEdit");
+    playernameEdit->setObjectName("connectPlayernameEdit");
+    passwordEdit->setObjectName("connectPasswordEdit");
+
     savePasswordCheckBox = new QCheckBox(tr("&Save password"));
 
     autoConnectCheckBox = new QCheckBox(tr("A&uto connect"));
@@ -115,7 +121,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
     updateDisplayInfo(previousHosts->currentText());
 
     btnForgotPassword = new QPushButton(this);
-    btnForgotPassword->setIcon(themePixmap(QStringLiteral("icons/forgot_password")));
+    btnForgotPassword->setIcon(loadThemedIcon(QStringLiteral("icons/forgot_password")));
     btnForgotPassword->setToolTip(tr("Reset Password"));
     btnForgotPassword->setFixedWidth(30);
     connect(btnForgotPassword, &QPushButton::released, this, &DlgConnect::actForgotPassword);
@@ -290,14 +296,22 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
     playernameEdit->setFocus();
     savePasswordCheckBox->setChecked(savePasswordStatus);
     storedVerifier.clear();
+    savedVerifier.clear();
 
     if (savePasswordStatus) {
         const QString stored = _data.at(4);
         if (stored.startsWith("$")) {
             storedVerifier = stored;
+            savedVerifier = stored;
+            passwordEdit->clear();
+            passwordEdit->setPlaceholderText(tr("Password saved"));
         } else {
             passwordEdit->setText(stored);
+            passwordEdit->setPlaceholderText(QString());
         }
+    } else {
+        passwordEdit->clear();
+        passwordEdit->setPlaceholderText(QString());
     }
 
     if (!_data.at(6).isEmpty()) {
@@ -323,7 +337,9 @@ void DlgConnect::newHostSelected(bool state)
         portEdit->setDisabled(false);
         playernameEdit->clear();
         passwordEdit->clear();
+        passwordEdit->setPlaceholderText(QString());
         storedVerifier.clear();
+        savedVerifier.clear();
         saveEdit->clear();
         saveEdit->setPlaceholderText(tr("Unique Server Name"));
         saveEdit->setDisabled(false);
@@ -339,9 +355,19 @@ void DlgConnect::passwordSaved(QT_STATE_CHANGED_T state)
     Q_UNUSED(state);
     if (savePasswordCheckBox->isChecked()) {
         autoConnectCheckBox->setEnabled(true);
+        // Re-ticking keeps a password the user has started typing; otherwise restore the saved
+        // login this dialog was opened with, so unticking and changing your mind is harmless.
+        if (passwordEdit->text().isEmpty()) {
+            storedVerifier = savedVerifier;
+            passwordEdit->setPlaceholderText(savedVerifier.isEmpty() ? QString() : tr("Password saved"));
+        }
     } else {
         autoConnectCheckBox->setChecked(false);
         autoConnectCheckBox->setEnabled(false);
+        // Unticking means the password typed below is sent for this connection: stop sending the
+        // saved verifier instead, and stop claiming a password is saved.
+        storedVerifier.clear();
+        passwordEdit->setPlaceholderText(QString());
     }
 }
 
@@ -349,10 +375,11 @@ void DlgConnect::actOk()
 {
     ServersSettings &servers = SettingsCache::instance().servers();
 
-    // Never write a newly typed plaintext password to disk when a verifier is already stored:
-    // the typed value is used for this connection and a fresh verifier is persisted after a
-    // successful login. Without a stored verifier we keep the previous (plaintext legacy) behavior.
-    const QString passwordToSave = storedVerifier.isEmpty() ? passwordEdit->text() : storedVerifier;
+    // Never write a newly typed plaintext password to disk when a verifier is available: the
+    // typed value is used for this connection and a fresh verifier is persisted after a
+    // successful login. Without any verifier we keep the previous (plaintext legacy) behavior.
+    const QString verifierToSave = storedVerifier.isEmpty() ? savedVerifier : storedVerifier;
+    const QString passwordToSave = verifierToSave.isEmpty() ? passwordEdit->text() : verifierToSave;
 
     if (newHostButton->isChecked()) {
         if (saveEdit->text().isEmpty()) {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
index bef5f136e..dad3623f5 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
@@ -98,6 +98,10 @@ private:
     QPushButton *btnConnect, *btnForgotPassword, *btnRefreshServers, *btnDeleteServer;
     QMap<QString, std::pair<QString, UserConnection_Information>> savedHostList;
     HandlePublicServers *hps;
+    //! \brief Saved "$scrypt$..." verifier as loaded for the selected profile, kept so that
+    //! re-ticking "Save password" after unticking restores it.
+    QString savedVerifier;
+    //! \brief Verifier in effect for this connection: empty while "Save password" is unticked.
     QString storedVerifier;
     const QString placeHolderText = tr("Downloading...");
 };
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
index 31841b9cd..5659b3388 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
@@ -1,7 +1,6 @@
 #include "dlg_convert_deck_to_cod_format.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -12,6 +11,7 @@
 #include <QMessageBox>
 #include <QObject>
 #include <QVBoxLayout>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
index 104b695e6..ada4237f7 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -116,14 +116,17 @@ void DlgCreateGame::sharedCtor()
 
     shareDecklistsOnLoadCheckBox = new QCheckBox(tr("Open decklists in lobby"));
 
+    shufflePlayersCheckBox = new QCheckBox(tr("Randomize turn order (seats) on each game start"));
+
     createGameAsJudgeCheckBox = new QCheckBox(tr("Create game as judge"));
 
     auto *gameSetupOptionsLayout = new QGridLayout;
     gameSetupOptionsLayout->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupOptionsLayout->addWidget(startingLifeTotalEdit, 0, 1);
-    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0);
+    gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0, 1, 2);
+    gameSetupOptionsLayout->addWidget(shufflePlayersCheckBox, 2, 0, 1, 2);
     if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
-        gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 2, 0);
+        gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 3, 0, 1, 2);
     } else {
         createGameAsJudgeCheckBox->setChecked(false);
         createGameAsJudgeCheckBox->setHidden(true);
@@ -184,6 +187,7 @@ DlgCreateGame::DlgCreateGame(TabRoom *_room, const QMap<int, QString> &_gameType
     createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().game().getCreateGameAsSpectator());
     startingLifeTotalEdit->setValue(SettingsCache::instance().game().getDefaultStartingLifeTotal());
     shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().game().getShareDecklistsOnLoad());
+    shufflePlayersCheckBox->setChecked(SettingsCache::instance().game().getShufflePlayers());
 
     if (!rememberGameSettings->isChecked()) {
         actReset();
@@ -217,6 +221,7 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
     createGameAsSpectatorCheckBox->setEnabled(false);
     startingLifeTotalEdit->setEnabled(false);
     shareDecklistsOnLoadCheckBox->setEnabled(false);
+    shufflePlayersCheckBox->setEnabled(false);
 
     descriptionEdit->setText(QString::fromStdString(gameInfo.description()));
     maxPlayersEdit->setValue(gameInfo.max_players());
@@ -227,6 +232,7 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
     spectatorsCanTalkCheckBox->setChecked(gameInfo.spectators_can_chat());
     spectatorsSeeEverythingCheckBox->setChecked(gameInfo.spectators_omniscient());
     shareDecklistsOnLoadCheckBox->setChecked(gameInfo.share_decklists_on_load());
+    shufflePlayersCheckBox->setChecked(gameInfo.shuffle_players());
 
     QSet<int> types;
     for (int i = 0; i < gameInfo.game_types_size(); ++i) {
@@ -264,6 +270,7 @@ void DlgCreateGame::actReset()
 
     startingLifeTotalEdit->setValue(20);
     shareDecklistsOnLoadCheckBox->setChecked(false);
+    shufflePlayersCheckBox->setChecked(false);
     createGameAsJudgeCheckBox->setChecked(false);
 
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
@@ -294,6 +301,7 @@ void DlgCreateGame::actOK()
     cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked());
     cmd.set_starting_life_total(startingLifeTotalEdit->value());
     cmd.set_share_decklists_on_load(shareDecklistsOnLoadCheckBox->isChecked());
+    cmd.set_shuffle_players(shufflePlayersCheckBox->isChecked());
 
     auto _gameTypes = QString();
     QMapIterator<int, QRadioButton *> gameTypeCheckBoxIterator(gameTypeCheckBoxes);
@@ -318,6 +326,7 @@ void DlgCreateGame::actOK()
         SettingsCache::instance().game().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
         SettingsCache::instance().game().setDefaultStartingLifeTotal(startingLifeTotalEdit->value());
         SettingsCache::instance().game().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked());
+        SettingsCache::instance().game().setShufflePlayers(shufflePlayersCheckBox->isChecked());
         SettingsCache::instance().game().setGameTypes(_gameTypes);
     }
     PendingCommand *pend = room->prepareRoomCommand(cmd);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
index 71b09997c..58356c9b6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
@@ -51,6 +51,7 @@ private:
     QCheckBox *spectatorsAllowedCheckBox, *spectatorsNeedPasswordCheckBox, *spectatorsCanTalkCheckBox,
         *spectatorsSeeEverythingCheckBox, *createGameAsJudgeCheckBox, *createGameAsSpectatorCheckBox;
     QCheckBox *shareDecklistsOnLoadCheckBox;
+    QCheckBox *shufflePlayersCheckBox;
     QDialogButtonBox *buttonBox;
     QPushButton *clearButton;
     QCheckBox *rememberGameSettings;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index cbf61a394..b06481c4b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -1,6 +1,6 @@
 #include "dlg_edit_tokens.h"
 
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
 #include "card_database_display_model.h"
 #include "libcockatrice/card/card_info.h"
@@ -40,6 +40,7 @@ class QWidget;
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
+    setObjectName("editTokensDialog");
     nameLabel = new QLabel(tr("&Name:"));
     nameEdit = new QLineEdit;
     nameEdit->setMaxLength(MAX_NAME_LENGTH);
@@ -107,10 +108,10 @@ DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nul
             &DlgEditTokens::tokenSelectionChanged);
 
     QAction *aAddToken = new QAction(tr("Add token"), this);
-    aAddToken->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    aAddToken->setIcon(loadThemedIcon(QStringLiteral("icons/increment")));
     connect(aAddToken, &QAction::triggered, this, &DlgEditTokens::actAddToken);
     QAction *aRemoveToken = new QAction(tr("Remove token"), this);
-    aRemoveToken->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    aRemoveToken->setIcon(loadThemedIcon(QStringLiteral("icons/decrement")));
     connect(aRemoveToken, &QAction::triggered, this, &DlgEditTokens::actRemoveToken);
 
     auto *databaseToolBar = new QToolBar;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
index 2c0fd3f6f..c1d0676ca 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
@@ -28,12 +28,16 @@ class QWidget;
  */
 AbstractDlgDeckTextEdit::AbstractDlgDeckTextEdit(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("dlgDeckTextEdit");
+
     contentsEdit = new QPlainTextEdit;
+    contentsEdit->setObjectName("contentsEdit");
 
     refreshButton = new QPushButton(tr("&Refresh"));
     connect(refreshButton, &QPushButton::clicked, this, &AbstractDlgDeckTextEdit::actRefresh);
 
     auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    buttonBox->setObjectName("buttonBox");
     buttonBox->addButton(refreshButton, QDialogButtonBox::ActionRole);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &AbstractDlgDeckTextEdit::actOK);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &AbstractDlgDeckTextEdit::reject);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
index f3cbb7b62..6cf6021b0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
@@ -10,8 +10,10 @@
 
 #include "libcockatrice/deck_list/deck_list.h"
 
+#include <QCheckBox>
 #include <QDialog>
 #include <QString>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <qtmetamacros.h>
 
 class QPlainTextEdit;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
index 1c1ada302..04b0db2e3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
@@ -22,6 +22,7 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QString>
+#include <QStringList>
 #include <QTextStream>
 #include <QUrl>
 #include <QVBoxLayout>
@@ -33,6 +34,7 @@
 
 class QWidget;
 
+static const QStringList SUPPORTED_PROVIDERS = {"Archidekt", "Deckstats", "ManaBox", "Moxfield", "TappedOut"};
 DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent)
 {
     nam = NetworkManagerFactory::create(this);
@@ -41,6 +43,7 @@ DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent
     setLayout(layout);
 
     instructionLabel = new QLabel(this);
+    instructionLabel->setWordWrap(true);
     layout->addWidget(instructionLabel);
 
     urlEdit = new QLineEdit(this);
@@ -64,8 +67,8 @@ DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent
 
 void DlgLoadDeckFromWebsite::retranslateUi()
 {
-    instructionLabel->setText(tr("Paste a link to a decklist site here to import it.\n(Archidekt, Deckstats, Moxfield, "
-                                 "and TappedOut are supported.)"));
+    instructionLabel->setText(tr("Paste a link to a decklist site here to import it.") + "\n" +
+                              tr("Supported services: %1").arg(SUPPORTED_PROVIDERS.join(", ")));
 }
 
 bool DlgLoadDeckFromWebsite::testValidUrl()
@@ -84,8 +87,8 @@ void DlgLoadDeckFromWebsite::accept()
         if (!jsonParser && info.provider != DeckProvider::Deckstats && info.provider != DeckProvider::TappedOut) {
             qCWarning(DlgLoadDeckFromWebsiteLog) << "No parser found for provider";
             QMessageBox::warning(this, tr("Load Deck from Website"),
-                                 tr("No parser available for this deck provider.\n (Archidekt, Deckstats, Moxfield, "
-                                    "and TappedOut are supported.)"));
+                                 tr("No parser available for this deck provider.") + "\n" +
+                                     tr("Supported services: %1").arg(SUPPORTED_PROVIDERS.join(", ")));
             QDialog::reject();
             return;
         }
@@ -152,6 +155,7 @@ void DlgLoadDeckFromWebsite::accept()
                                 "https://archidekt.com/decks/9999999\n"
                                 "https://deckstats.net/decks/99999/9999999-your-deck-name/en\n"
                                 "https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz\n"
+                                "https://manabox.app/decks/XYZxxa-YZ99Yyyx_yzXzzz\n"
                                 "https://tappedout.net/mtg-decks/your-deck-name/"));
         QDialog::reject();
     }
@@ -164,7 +168,9 @@ QSharedPointer<IJsonDeckParser> DlgLoadDeckFromWebsite::createParserForProvider(
             return QSharedPointer<IJsonDeckParser>(new ArchidektJsonParser());
         case DeckProvider::Moxfield:
             return QSharedPointer<IJsonDeckParser>(new MoxfieldJsonParser());
+        case DeckProvider::Manabox:
+            return QSharedPointer<IJsonDeckParser>(new ManaboxJsonParser());
         default:
             return QSharedPointer<IJsonDeckParser>(nullptr);
     }
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
index 858deb751..3ebb5c093 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
@@ -16,8 +16,11 @@ class QWidget;
 
 DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("localGameDialog");
+
     numberPlayersLabel = new QLabel(tr("Players:"), this);
     numberPlayersEdit = new QSpinBox(this);
+    numberPlayersEdit->setObjectName("numberPlayersEdit");
     numberPlayersEdit->setMinimum(1);
     numberPlayersEdit->setMaximum(8);
     numberPlayersEdit->setValue(1);
@@ -28,10 +31,12 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
     generalGrid->addWidget(numberPlayersLabel, 0, 0);
     generalGrid->addWidget(numberPlayersEdit, 0, 1);
     generalGroupBox = new QGroupBox(tr("General"), this);
+    generalGroupBox->setObjectName("generalGroupBox");
     generalGroupBox->setLayout(generalGrid);
 
     startingLifeTotalLabel = new QLabel(tr("Starting life total:"), this);
     startingLifeTotalEdit = new QSpinBox(this);
+    startingLifeTotalEdit->setObjectName("startingLifeTotalEdit");
     startingLifeTotalEdit->setMinimum(-999999999);
     startingLifeTotalEdit->setMaximum(999999999);
     startingLifeTotalEdit->setValue(20);
@@ -42,11 +47,14 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent)
     gameSetupGrid->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupGrid->addWidget(startingLifeTotalEdit, 0, 1);
     gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"), this);
+    gameSetupOptionsGroupBox->setObjectName("gameSetupOptionsGroupBox");
     gameSetupOptionsGroupBox->setLayout(gameSetupGrid);
 
     rememberSettingsCheckBox = new QCheckBox(tr("Remember settings"), this);
+    rememberSettingsCheckBox->setObjectName("rememberSettingsCheckBox");
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    buttonBox->setObjectName("buttonBox");
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgLocalGameOptions::actOK);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgLocalGameOptions::reject);
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index dbfe38e26..c6e640a9f 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -1,7 +1,7 @@
 #include "dlg_manage_sets.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 #include "libcockatrice/card/database/card_database.h"
@@ -48,6 +48,7 @@
 
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
+    setObjectName("manageSetsWindow");
     setOrderIsSorted = false;
 
     // left toolbar
@@ -57,28 +58,28 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     aTop = new QAction(QString(), this);
-    aTop->setIcon(themePixmap(QStringLiteral("icons/arrow_top_green")));
+    aTop->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_to_top")));
     aTop->setToolTip(tr("Move selected set to the top"));
     aTop->setEnabled(false);
     connect(aTop, &QAction::triggered, this, &WndSets::actTop);
     setsEditToolBar->addAction(aTop);
 
     aUp = new QAction(QString(), this);
-    aUp->setIcon(themePixmap(QStringLiteral("icons/arrow_up_green")));
+    aUp->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_up")));
     aUp->setToolTip(tr("Move selected set up"));
     aUp->setEnabled(false);
     connect(aUp, &QAction::triggered, this, &WndSets::actUp);
     setsEditToolBar->addAction(aUp);
 
     aDown = new QAction(QString(), this);
-    aDown->setIcon(themePixmap(QStringLiteral("icons/arrow_down_green")));
+    aDown->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_down")));
     aDown->setToolTip(tr("Move selected set down"));
     aDown->setEnabled(false);
     connect(aDown, &QAction::triggered, this, &WndSets::actDown);
     setsEditToolBar->addAction(aDown);
 
     aBottom = new QAction(QString(), this);
-    aBottom->setIcon(themePixmap(QStringLiteral("icons/arrow_bottom_green")));
+    aBottom->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_to_bottom")));
     aBottom->setToolTip(tr("Move selected set to the bottom"));
     aBottom->setEnabled(false);
     connect(aBottom, &QAction::triggered, this, &WndSets::actBottom);
@@ -88,7 +89,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     searchField = new LineEditUnfocusable;
     searchField->setObjectName("searchEdit");
     searchField->setPlaceholderText(tr("Search by set name, code, type, or release date"));
-    searchField->addAction(themePixmap(QStringLiteral("icons/search")), LineEditUnfocusable::LeadingPosition);
+    searchField->addAction(loadThemedIcon(QStringLiteral("icons/search")), LineEditUnfocusable::LeadingPosition);
     searchField->setClearButtonEnabled(true);
     setFocusProxy(searchField);
 
@@ -221,6 +222,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 
 WndSets::~WndSets()
 {
+    disconnect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState);
 }
 
 void WndSets::closeEvent(QCloseEvent * /*ev*/)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
index 2a2758ba5..a7387a068 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
@@ -1,11 +1,13 @@
 #include "dlg_my_reports.h"
 
+#include "../interface/theme_manager.h"
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 #include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
 
 #include <QAbstractItemView>
+#include <QFont>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
@@ -24,7 +26,6 @@
 #include <libcockatrice/protocol/pb/response_report_details.pb.h>
 #include <libcockatrice/protocol/pb/response_report_my_list.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/qt_utils.h>
 #include <qnamespace.h>
 #include <string>
 
@@ -69,7 +70,8 @@ DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent)
     auto *chatGroup = new QGroupBox(tr("Chat Log Context"));
     chatLogEdit = new QTextEdit;
     chatLogEdit->setReadOnly(true);
-    chatLogEdit->setFont(QtUtils::monospaceFont());
+    applyChatLogFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &DlgMyReports::applyChatLogFont);
     auto *chatLayout = new QVBoxLayout(chatGroup);
     chatLayout->setContentsMargins(4, 4, 4, 4);
     chatLayout->addWidget(chatLogEdit);
@@ -122,6 +124,11 @@ DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent)
     refreshList();
 }
 
+void DlgMyReports::applyChatLogFont()
+{
+    chatLogEdit->setFont(report_utils::reportLogFont());
+}
+
 void DlgMyReports::refreshList()
 {
     selectedReportIdBeforeRefresh = selectedReportId;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
index dc9f90d2d..90772f051 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
@@ -29,6 +29,7 @@ private slots:
     void reportDetailsResponse(const Response &response);
     void addComment();
     void addCommentResponse(const Response &response);
+    void applyChatLogFont();
 
 private:
     void loadReportDetails(const ServerInfo_Report &report);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
index 9e32e87d1..09afee32d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@@ -1,7 +1,7 @@
 #include "dlg_register.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../server/handle_public_servers.h"
 #include "../server/user/user_info_connection.h"
 
@@ -34,7 +34,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     previousHosts = new QComboBox(this);
 
     btnDeleteServer = new QPushButton(this);
-    btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    btnDeleteServer->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     btnDeleteServer->setToolTip(tr("Delete the currently selected saved server"));
     btnDeleteServer->setFixedWidth(30);
 
@@ -42,7 +42,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 
     hps = new HandlePublicServers(this);
     btnRefreshServers = new QPushButton(this);
-    btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync")));
+    btnRefreshServers->setIcon(loadThemedIcon(QStringLiteral("icons/sync")));
     btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers"));
     btnRefreshServers->setFixedWidth(30);
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
index 3ef45020b..c7c32469b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
@@ -1,10 +1,13 @@
 #include "dlg_report_user.h"
 
+#include "../interface/theme_manager.h"
+#include "../utility/report_utils.h"
 #include "abstract_client.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
+#include <QFont>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
@@ -91,7 +94,8 @@ DlgReportUser::DlgReportUser(AbstractClient *_client,
     auto *chatLayout = new QVBoxLayout(chatGroup);
     chatLogEdit = new QTextEdit;
     chatLogEdit->setReadOnly(true);
-    chatLogEdit->setFont(QtUtils::monospaceFont());
+    applyChatLogFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &DlgReportUser::applyChatLogFont);
     if (!_autoChatLog.isEmpty()) {
         chatLogEdit->setPlainText(_autoChatLog);
     } else {
@@ -120,6 +124,11 @@ DlgReportUser::DlgReportUser(AbstractClient *_client,
     layout->addWidget(buttonBox);
 }
 
+void DlgReportUser::applyChatLogFont()
+{
+    chatLogEdit->setFont(report_utils::reportLogFont());
+}
+
 void DlgReportUser::actSubmit()
 {
     const QString description = descriptionEdit->toPlainText().trimmed();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
index c7fce055d..0f2fa5080 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
@@ -27,6 +27,7 @@ public:
 private slots:
     void actSubmit();
     void reportResponse(const Response &response);
+    void applyChatLogFont();
 
 private:
     static QString categoryLabel(const QString &key);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index ab870a2c8..3602e67c6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -73,6 +73,8 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     resize(calculateDialogSize(hostSize, available.size(), minimum));
     setSizeGripEnabled(true);
 
+    setObjectName("settingsDialog");
+
     connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::updateLanguage);
 
     settingsView = new SettingsView(this);
@@ -82,6 +84,7 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     buttonBox->addStretch();
     okButton = new QPushButton;
     okButton->setDefault(true);
+    okButton->setObjectName("settingsOkButton");
     connect(okButton, &QPushButton::clicked, this, &DlgSettings::close);
     buttonBox->addWidget(okButton);
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
index d29aee27f..49bacd081 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
@@ -2,6 +2,7 @@
 
 #include "../deck_share/shared_deck_preview_widget.h"
 #include "../general/layout_containers/flow_widget.h"
+#include "../interface/theme_manager.h"
 
 #include <QAbstractButton>
 #include <QDateTime>
@@ -35,9 +36,14 @@ DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent,
     // QLabels render AutoText and markup would otherwise be shown as rich text.
     auto *titleLabel =
         new QLabel(tr("Share: %1").arg((shareName.isEmpty() ? tr("Untitled") : shareName).toHtmlEscaped()), this);
-    QFont titleFont = QtUtils::boldFont(titleLabel->font());
-    titleFont.setPointSize(titleFont.pointSize() + 2);
-    titleLabel->setFont(titleFont);
+    // Family comes from the InterfaceDefault theme role; the +2 size and bold stay caller-side.
+    auto applyTitleFont = [titleLabel]() {
+        QFont titleFont = QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault));
+        titleFont.setPointSize(titleFont.pointSize() + 2);
+        titleLabel->setFont(titleFont);
+    };
+    applyTitleFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyTitleFont);
     mainLayout->addWidget(titleLabel);
 
     if (!serverText.isEmpty()) {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
index 511ff1c7d..c1df0c963 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
@@ -28,6 +28,7 @@
 
 DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("tipOfTheDayDialog");
     successfulInit = false;
     QString xmlPath = "theme:tips/tips_of_the_day.xml";
     tipDatabase = new TipsOfTheDay(xmlPath, this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.cpp
new file mode 100644
index 000000000..8814f89db
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.cpp
@@ -0,0 +1,136 @@
+#include "dlg_turn_order.h"
+
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+DlgTurnOrder::DlgTurnOrder(const QStringList &_playerNames, QWidget *parent)
+    : QDialog(parent), randomizeRequested(false)
+{
+    listWidget = new QListWidget(this);
+    listWidget->addItems(_playerNames);
+    listWidget->setCurrentRow(0);
+    connect(listWidget, &QListWidget::currentRowChanged, this, &DlgTurnOrder::selectionChanged);
+
+    moveUpButton = new QPushButton(this);
+    connect(moveUpButton, &QPushButton::clicked, this, &DlgTurnOrder::actMoveUp);
+    moveDownButton = new QPushButton(this);
+    connect(moveDownButton, &QPushButton::clicked, this, &DlgTurnOrder::actMoveDown);
+    randomizeButton = new QPushButton(this);
+    connect(randomizeButton, &QPushButton::clicked, this, &DlgTurnOrder::actRandomize);
+
+    // Shown in place of the list while the server is asked to randomize: the
+    // order is chosen server side, so there is nothing to preview here.
+    hintLabel = new QLabel(this);
+    hintLabel->setWordWrap(true);
+    hintLabel->setAlignment(Qt::AlignCenter);
+
+    auto *buttonColumn = new QVBoxLayout;
+    buttonColumn->addWidget(moveUpButton);
+    buttonColumn->addWidget(moveDownButton);
+    buttonColumn->addWidget(randomizeButton);
+    buttonColumn->addStretch();
+
+    auto *listLayout = new QHBoxLayout;
+    listLayout->addWidget(listWidget);
+    listLayout->addWidget(hintLabel, 1);
+    listLayout->addLayout(buttonColumn);
+
+    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgTurnOrder::actOk);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgTurnOrder::reject);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(listLayout);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    updateButtons();
+
+    updateMode();
+    setMinimumWidth(300);
+}
+
+void DlgTurnOrder::retranslateUi()
+{
+    setWindowTitle(tr("Set turn order"));
+    moveUpButton->setText(tr("Move up"));
+    moveDownButton->setText(tr("Move down"));
+    randomizeButton->setText(randomizeRequested ? tr("Set order manually") : tr("Randomize"));
+    hintLabel->setText(tr("The server will randomize the turn order."));
+}
+
+QStringList DlgTurnOrder::order() const
+{
+    QStringList playerNames;
+    for (int i = 0; i < listWidget->count(); ++i) {
+        playerNames.append(listWidget->item(i)->text());
+    }
+    return playerNames;
+}
+
+void DlgTurnOrder::moveSelected(int delta)
+{
+    const int row = listWidget->currentRow();
+    const int newRow = row + delta;
+    if (row < 0 || newRow < 0 || newRow >= listWidget->count()) {
+        return;
+    }
+
+    QListWidgetItem *item = listWidget->takeItem(row);
+    listWidget->insertItem(newRow, item);
+    listWidget->setCurrentRow(newRow);
+    updateButtons();
+}
+
+void DlgTurnOrder::updateMode()
+{
+    listWidget->setVisible(!randomizeRequested);
+    hintLabel->setVisible(randomizeRequested);
+    moveUpButton->setVisible(!randomizeRequested);
+    moveDownButton->setVisible(!randomizeRequested);
+    retranslateUi();
+}
+
+void DlgTurnOrder::updateButtons()
+{
+    const int row = listWidget->currentRow();
+    const int count = listWidget->count();
+    const bool manualOrder = !randomizeRequested;
+    moveUpButton->setEnabled(manualOrder && row > 0);
+    moveDownButton->setEnabled(manualOrder && row >= 0 && row < count - 1);
+}
+
+void DlgTurnOrder::actMoveUp()
+{
+    moveSelected(-1);
+}
+
+void DlgTurnOrder::actMoveDown()
+{
+    moveSelected(1);
+}
+
+void DlgTurnOrder::actRandomize()
+{
+    // Randomizing is a request to the server, not a local shuffle: showing a
+    // preview would let the host re-open the dialog until the order looks
+    // favourable for them.
+    randomizeRequested = !randomizeRequested;
+    updateMode();
+    updateButtons();
+}
+
+void DlgTurnOrder::actOk()
+{
+    accept();
+}
+
+void DlgTurnOrder::selectionChanged()
+{
+    updateButtons();
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.h b/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.h
new file mode 100644
index 000000000..44d8203b9
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.h
@@ -0,0 +1,51 @@
+/**
+ * @file dlg_turn_order.h
+ * @ingroup GameDialogs
+ */
+//! \todo Document this file.
+
+#ifndef DLG_TURN_ORDER_H
+#define DLG_TURN_ORDER_H
+
+#include <QDialog>
+#include <QStringList>
+
+class QLabel;
+class QListWidget;
+class QPushButton;
+
+class DlgTurnOrder : public QDialog
+{
+    Q_OBJECT
+private:
+    QListWidget *listWidget;
+    QLabel *hintLabel;
+    QPushButton *moveUpButton;
+    QPushButton *moveDownButton;
+    QPushButton *randomizeButton;
+    bool randomizeRequested;
+
+    void moveSelected(int delta);
+    void updateMode();
+    void updateButtons();
+
+private slots:
+    void actMoveUp();
+    void actMoveDown();
+    void actRandomize();
+    void actOk();
+    void selectionChanged();
+
+public:
+    explicit DlgTurnOrder(const QStringList &_playerNames, QWidget *parent = nullptr);
+
+    void retranslateUi();
+
+    [[nodiscard]] bool isRandomizeRequested() const
+    {
+        return randomizeRequested;
+    }
+    [[nodiscard]] QStringList order() const;
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
index ca55c7b41..11dcd7e27 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@@ -42,6 +42,7 @@ static const QString UPDATE_INSTALLER_OVERRIDE = "Cockatrice-Update-Override.exe
 
 DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("updateDialog");
 
     // Handle layout
     statusLabel = new QLabel(this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index d55e800a1..e75cf352a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -18,6 +18,7 @@ class QWidget;
 
 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("viewLogDialog");
     logArea = new QPlainTextEdit;
     logArea->setReadOnly(true);
 
diff --git a/cockatrice/src/interface/widgets/dialogs/settings_view.cpp b/cockatrice/src/interface/widgets/dialogs/settings_view.cpp
index d22a8d0b3..b1a80c86b 100644
--- a/cockatrice/src/interface/widgets/dialogs/settings_view.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/settings_view.cpp
@@ -6,7 +6,8 @@
 #include "settings_view.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
+#include "../interface/theme_manager.h"
 #include "../settings_page/abstract_settings_page.h"
 #include "../settings_page/appearance_settings_page.h"
 #include "../settings_page/deck_editor_settings_page.h"
@@ -119,6 +120,8 @@ QWidget *fromWidgetId(WidgetId id)
 
 SettingsView::SettingsView(QWidget *parent) : QWidget(parent), currentTabIndex(0), searchActive(false)
 {
+    setObjectName("settingsView");
+
     setupUi();
 
     connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &SettingsView::retranslateUi);
@@ -132,15 +135,17 @@ void SettingsView::setupUi()
     // Search bar
     searchEdit = new QLineEdit;
     searchEdit->setClearButtonEnabled(true);
-    searchEdit->addAction(themePixmap(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
+    searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
     searchEdit->installEventFilter(this);
     connect(searchEdit, &QLineEdit::textChanged, this, &SettingsView::onSearchTextChanged);
+    searchEdit->setObjectName("settingsSearchEdit");
 
     auto *searchLayout = new QHBoxLayout;
     searchLayout->addWidget(searchEdit);
 
     // Pages stacked widget
     pagesWidget = new QStackedWidget;
+    pagesWidget->setObjectName("pagesWidget");
 
     auto *generalPage = new GeneralSettingsPage;
     auto *appearancePage = new AppearanceSettingsPage;
@@ -199,12 +204,17 @@ void SettingsView::setupUi()
         searchDelegate->setPageIcons(icons);
         searchResultsView->viewport()->update();
     });
+    // The search delegate reads the InterfaceDefault role at paint time, so a
+    // font change only needs a repaint, mirroring the theme change above.
+    connect(themeManager, &ThemeManager::fontsChanged, searchResultsView,
+            [this] { searchResultsView->viewport()->update(); });
 
     // Build search index after pages are created
     buildSearchIndex();
 
     // Pages container (stacked widget + search results overlay)
     pagesContainer = new QWidget;
+    pagesContainer->setObjectName("pagesContainer");
     auto *containerLayout = new QStackedLayout;
     containerLayout->setStackingMode(QStackedLayout::StackAll);
     containerLayout->addWidget(pagesWidget);
@@ -244,6 +254,7 @@ void SettingsView::setupUi()
 void SettingsView::setupNavTree()
 {
     navTree = new QTreeWidget;
+    navTree->setObjectName("navTree");
     navTree->setHeaderHidden(true);
     navTree->setRootIsDecorated(true);
     navTree->setIconSize(QSize(24, 24));
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
index baf46bbba..5cb62db0f 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
@@ -1,9 +1,11 @@
 #include "banner_widget.h"
 
 #include "../../../pixel_map_generator.h"
+#include "../../../theme_manager.h"
 
 #include <QBrush>
 #include <QColor>
+#include <QFont>
 #include <QHBoxLayout>
 #include <QLinearGradient>
 #include <QPainter>
@@ -28,7 +30,9 @@ BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation
     if (transparency > 50) {
         textColor = " color: white;";
     }
-    bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold;" + textColor);
+    bannerLabel->setStyleSheet(textColor);
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &BannerWidget::applyInterfaceDefaultFont);
 
     layout->addWidget(iconLabel);
     layout->addWidget(bannerLabel);
@@ -56,6 +60,16 @@ void BannerWidget::setText(const QString &text) const
     bannerLabel->setText(text);
 }
 
+void BannerWidget::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 24px size and
+    // bold weight previously carried by the stylesheet stay caller-side.
+    QFont bannerFont = themeManager->appFont(AppFont::InterfaceDefault);
+    bannerFont.setPixelSize(24);
+    bannerFont.setWeight(QFont::Bold);
+    bannerLabel->setFont(bannerFont);
+}
+
 void BannerWidget::setClickable(bool _clickable)
 {
     clickable = _clickable;
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h
index 06556089b..d46250bdb 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h
@@ -48,6 +48,7 @@ signals:
 private slots:
     void toggleBuddyVisibility() const;
     void updateDropdownIconState() const;
+    void applyInterfaceDefaultFont();
 };
 
 #endif // BANNER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
index 484ac861d..6bb1dcd62 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
@@ -1,5 +1,7 @@
 #include "bar_chart_widget.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QBrush>
 #include <QFlags>
 #include <QFont>
@@ -19,6 +21,10 @@
 BarChartWidget::BarChartWidget(QWidget *parent) : QWidget(parent)
 {
     setMouseTracking(true);
+
+    // Labels read the InterfaceDefault role at paint time, so a font change
+    // only needs a repaint.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); });
 }
 
 void BarChartWidget::setBars(const QVector<BarData> &newBars)
@@ -146,7 +152,8 @@ void BarChartWidget::paintEvent(QPaintEvent *)
 
         // draw label below bar
         QRect labelRect(left + i * (barWidth + spacing), bottom, barWidth, LABEL_H);
-        QFont f = p.font();
+        // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+        QFont f = themeManager->appFont(AppFont::InterfaceDefault);
         f.setBold(true);
         p.setFont(f);
         p.setPen(Qt::black);
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
index 5a3130964..359d56772 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
@@ -1,5 +1,7 @@
 #include "segmented_bar_widget.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QBrush>
 #include <QFont>
 #include <QLinearGradient>
@@ -22,6 +24,10 @@ SegmentedBarWidget::SegmentedBarWidget(QString label, QVector<Segment> segments,
     setMinimumWidth(36);
     setMaximumWidth(50);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+
+    // The label reads the InterfaceDefault role at paint time, so a font
+    // change only needs a repaint.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); });
 }
 
 QSize SegmentedBarWidget::sizeHint() const
@@ -95,7 +101,8 @@ void SegmentedBarWidget::paintEvent(QPaintEvent *)
 
     // draw label
     QRect labelRect(0, h - LABEL_H, w, LABEL_H);
-    QFont f = p.font();
+    // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+    QFont f = themeManager->appFont(AppFont::InterfaceDefault);
     f.setBold(true);
     p.setFont(f);
     p.setPen(Qt::black);
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
index 0609eb16a..598c70fe2 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp
@@ -1,5 +1,7 @@
 #include "dynamic_font_size_label.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QFont>
 #include <QFontMetricsF>
 #include <QObject>
@@ -28,9 +30,13 @@ void DynamicFontSizeLabel::paintEvent(QPaintEvent *event)
     // QElapsedTimer timer;
     // timer.start();
 
-    QFont newFont = font();
+    // Family follows the InterfaceDefault theme role; the fitted point size
+    // stays computed from the widget geometry as before.
+    QFont newFont = themeManager->appFont(AppFont::InterfaceDefault);
     float fontSize = getWidgetMaximumFontSize(this, this->text());
     newFont.setPointSizeF(fontSize);
+    // Preserve the caller's bold emphasis, which the role font does not carry.
+    newFont.setBold(font().bold());
     setFont(newFont);
     // qDebug() << "Font size set to" << fontSize;
 
@@ -40,7 +46,10 @@ void DynamicFontSizeLabel::paintEvent(QPaintEvent *event)
 
 float DynamicFontSizeLabel::getWidgetMaximumFontSize(QWidget *widget, const QString &text)
 {
-    QFont font = widget->font();
+    // Measure with the InterfaceDefault family so the fit matches the painted font.
+    QFont font = themeManager->appFont(AppFont::InterfaceDefault);
+    font.setBold(widget->font().bold());
+    font.setPointSizeF(widget->font().pointSizeF());
     const QRect widgetRect = widget->contentsRect();
     const float widgetWidth = widgetRect.width();
     const float widgetHeight = widgetRect.height();
diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
index 25e8ca48f..9b5f5bdda 100644
--- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
+++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
@@ -1,5 +1,6 @@
 #include "dynamic_font_size_push_button.h"
 
+#include "../../interface/theme_manager.h"
 #include "dynamic_font_size_label.h"
 
 #include <QBrush>
@@ -20,10 +21,12 @@ void DynamicFontSizePushButton::paintEvent(QPaintEvent *event)
     // Call the base class paintEvent to preserve any other painting behavior
     QPushButton::paintEvent(event);
 
-    // Adjust the font size dynamically based on the text
-    QFont newFont = font();
+    // Adjust the font size dynamically based on the text. Family follows the
+    // InterfaceDefault theme role; the fitted size stays computed as before.
+    QFont newFont = themeManager->appFont(AppFont::InterfaceDefault);
     float fontSize = DynamicFontSizeLabel::getWidgetMaximumFontSize(this, this->text());
     newFont.setPointSizeF(fontSize);
+    newFont.setBold(font().bold());
     setFont(newFont);
 
     // Get painter for custom painting
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
index 7f23827bc..a2ac7912d 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
@@ -1,6 +1,9 @@
 #include "home_styled_button.h"
 
+#include "../../theme_manager.h"
+
 #include <QBrush>
+#include <QFont>
 #include <QFontMetrics>
 #include <QPainter>
 #include <QPainterPath>
@@ -18,9 +21,21 @@ class QWidget;
 HomeStyledButton::HomeStyledButton(const QString &text, QPair<QColor, QColor> _gradientColors, QWidget *parent)
     : QPushButton(text, parent), gradientColors(_gradientColors)
 {
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setMinimumHeight(25);
+    // Keep the font/style-derived height even when the home page has ample space.
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setStyleSheet(generateButtonStylesheet(gradientColors));
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &HomeStyledButton::applyInterfaceDefaultFont);
+}
+
+void HomeStyledButton::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 34px size and
+    // bold weight previously carried by the stylesheet stay caller-side.
+    QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault);
+    buttonFont.setPixelSize(34);
+    buttonFont.setWeight(QFont::Bold);
+    setFont(buttonFont);
 }
 
 void HomeStyledButton::updateStylesheet(const QPair<QColor, QColor> &colors)
@@ -50,9 +65,6 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
 
     return QString(R"(
         QPushButton {
-            font-size: 34px;
-            font-weight: bold;
-            font-family: sans-serif, "Segoe UI", "Helvetica Neue";
             padding: 30px;
             color: white;
             border: 2px solid %1;
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h
index 55ac5550f..5756db5a1 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.h
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.h
@@ -24,6 +24,9 @@ public:
 public slots:
     void paintEvent(QPaintEvent *event) override;
 
+private slots:
+    void applyInterfaceDefaultFont();
+
 private:
     QPair<QColor, QColor> gradientColors;
 };
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index 7555d1f45..db4501efc 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -2,9 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
 #include "../../theme_config.h"
 #include "../../theme_manager.h"
@@ -29,10 +27,11 @@
 #include <QFlags>
 #include <QFont>
 #include <QFontMetrics>
-#include <QGridLayout>
+#include <QFrame>
 #include <QGroupBox>
 #include <QImage>
 #include <QLabel>
+#include <QLayout>
 #include <QLinearGradient>
 #include <QList>
 #include <QMap>
@@ -46,9 +45,9 @@
 #include <QRect>
 #include <QRectF>
 #include <QRgb>
+#include <QScrollArea>
 #include <QSharedPointer>
 #include <QSize>
-#include <QSizePolicy>
 #include <QString>
 #include <QStringLiteral>
 #include <QTimer>
@@ -57,9 +56,12 @@
 #include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/utility/qt_utils.h>
 #include <optional>
 #include <qlogging.h>
 #include <qnamespace.h>
@@ -68,20 +70,26 @@
 HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     : QWidget(parent), tabSupervisor(_tabSupervisor), background(themePixmap(QStringLiteral("backgrounds/home")))
 {
-    layout = new QGridLayout(this);
+    setObjectName("homeWidget");
 
     backgroundSourceCard = new CardInfoPictureArtCropWidget(this);
 
     gradientColors = determineButtonColor();
 
-    layout->addWidget(createButtons(), 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
+    // The launcher keeps its natural size on a large display and stays centred in the
+    // viewport. On a small window it scrolls, instead of its combined minimum height
+    // becoming the minimum height of the entire application.
+    auto *scrollArea = QtUtils::makeScrollArea(this, Qt::ScrollBarAsNeeded, Qt::ScrollBarAsNeeded);
+    scrollArea->setObjectName("homeActionsScrollArea");
+    scrollArea->setFrameShape(QFrame::NoFrame);
+    scrollArea->setWidgetResizable(false);
+    scrollArea->setAlignment(Qt::AlignCenter);
+    // The home background is painted by this widget, so let it show through the viewport.
+    scrollArea->viewport()->setAutoFillBackground(false);
+    scrollArea->setWidget(createButtons());
 
-    layout->setRowStretch(0, 1);
-    layout->setRowStretch(2, 1);
-    layout->setColumnStretch(0, 1);
-    layout->setColumnStretch(2, 1);
-
-    setLayout(layout);
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(scrollArea);
 
     cardChangeTimer = new QTimer(this);
     connect(cardChangeTimer, &QTimer::timeout, this, &HomeWidget::updateRandomCard);
@@ -287,22 +295,25 @@ void HomeWidget::updateButtonsToBackgroundColor()
 QGroupBox *HomeWidget::createButtons()
 {
     QGroupBox *box = new QGroupBox(this);
-    box->setStyleSheet(R"(
-    QGroupBox {
-        font-size: 20px;
-        color: white;         /* Title text color */
-        background: transparent;
-    }
-
-    QGroupBox::title {
-        color: white;
-        subcontrol-origin: margin;
-        subcontrol-position: top center;  /* or top left / right */
-    }
-)");
-    box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    box->setObjectName("homeButtonsBox");
+    // The box only stacks the logo and the actions: no frame, and no background of its
+    // own, so the home background art stays visible. It never shows a title. The rule is
+    // load-bearing: QScrollArea::setWidget() turns autoFillBackground on for its widget.
+    box->setStyleSheet("QGroupBox { background: transparent; border: none; }");
+    // Family comes from the InterfaceDefault theme role; the 20px size stays caller-side.
+    auto applyBoxFont = [box]() {
+        QFont boxFont = themeManager->appFont(AppFont::InterfaceDefault);
+        boxFont.setPixelSize(20);
+        box->setFont(boxFont);
+    };
+    applyBoxFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, applyBoxFont);
     QVBoxLayout *boxLayout = new QVBoxLayout;
     boxLayout->setAlignment(Qt::AlignHCenter);
+    // The scroll area is not resizable, so the box has to size itself: SetFixedSize keeps
+    // it at its content size and re-fixes it whenever the labels or fonts change, which is
+    // what makes the scroll area's scroll bars follow the content.
+    boxLayout->setSizeConstraint(QLayout::SetFixedSize);
 
     logoLabel = new QLabel;
     logoLabel->setAlignment(Qt::AlignCenter);
@@ -311,27 +322,34 @@ QGroupBox *HomeWidget::createButtons()
     boxLayout->addSpacing(25);
 
     connectButton = new HomeStyledButton(QString(), gradientColors);
+    connectButton->setObjectName("homeConnectButton");
     boxLayout->addWidget(connectButton);
 
     visualDeckEditorButton = new HomeStyledButton(QString(), gradientColors);
+    visualDeckEditorButton->setObjectName("homeCreateNewDeckButton");
     connect(visualDeckEditorButton, &QPushButton::clicked, tabSupervisor,
             [this] { tabSupervisor->openDeckInNewTab(LoadedDeck()); });
     boxLayout->addWidget(visualDeckEditorButton);
     visualDeckStorageButton = new HomeStyledButton(QString(), gradientColors);
+    visualDeckStorageButton->setObjectName("homeBrowseDecksButton");
     connect(visualDeckStorageButton, &QPushButton::clicked, tabSupervisor,
             [this] { tabSupervisor->actTabVisualDeckStorage(true); });
     boxLayout->addWidget(visualDeckStorageButton);
     visualDatabaseDisplayButton = new HomeStyledButton(QString(), gradientColors);
+    visualDatabaseDisplayButton->setObjectName("homeBrowseCardDatabaseButton");
     connect(visualDatabaseDisplayButton, &QPushButton::clicked, tabSupervisor,
             &TabSupervisor::addVisualDatabaseDisplayTab);
     boxLayout->addWidget(visualDatabaseDisplayButton);
     edhrecButton = new HomeStyledButton(QString(), gradientColors);
+    edhrecButton->setObjectName("homeBrowseEdhrecButton");
     connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab);
     boxLayout->addWidget(edhrecButton);
     archidektButton = new HomeStyledButton(QString(), gradientColors);
+    archidektButton->setObjectName("homeBrowseArchidektButton");
     connect(archidektButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addArchidektTab);
     boxLayout->addWidget(archidektButton);
     replayButton = new HomeStyledButton(QString(), gradientColors);
+    replayButton->setObjectName("homeViewReplaysButton");
     connect(replayButton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->actTabReplays(true); });
     boxLayout->addWidget(replayButton);
     if (qobject_cast<MainWindow *>(tabSupervisor->parentWidget())) {
@@ -463,7 +481,9 @@ void HomeWidget::paintEvent(QPaintEvent *event)
     constexpr int margin = 15;
     constexpr qreal attributionMargin = 4.0;
 
-    QFont attributionFont = painter.font();
+    // Family comes from the InterfaceDefault theme role; the 14px sizes and
+    // bold weights stay caller-side as before.
+    QFont attributionFont = themeManager->appFont(AppFont::InterfaceDefault);
     attributionFont.setPointSize(14);
     attributionFont.setBold(true);
     painter.setFont(attributionFont);
@@ -476,7 +496,7 @@ void HomeWidget::paintEvent(QPaintEvent *event)
 
     // Card name bubble above the attribution (when enabled).
     if (!cardName.isEmpty() && SettingsCache::instance().appearance().getHomeTabDisplayCardName()) {
-        QFont font = painter.font();
+        QFont font = themeManager->appFont(AppFont::InterfaceDefault);
         font.setPointSize(14);
         font.setBold(true);
         painter.setFont(font);
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index aa4745c82..fec1db950 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -16,7 +16,6 @@
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <qtmetamacros.h>
 
-class QGridLayout;
 class QLabel;
 class CardInfoPictureArtCropWidget;
 class ExactCard;
@@ -46,7 +45,6 @@ public slots:
     void updateConnectButton(const ClientStatus status);
 
 private:
-    QGridLayout *layout;
     QTimer *cardChangeTimer;
     TabSupervisor *tabSupervisor;
     QPixmap background;
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
index c4298d6b6..e69687c54 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
@@ -1,5 +1,6 @@
 #include "first_run_wizard.h"
 
+#include "../interface/theme_manager.h"
 #include "first_run_wizard_page.h"
 #include "pages/account_setup_page.h"
 #include "pages/card_database_setup_page.h"
@@ -32,9 +33,8 @@ FirstRunWizard::FirstRunWizard(QWidget *parent) : QDialog(parent)
     bannerHost = new BannerHost(this);
 
     titleLabel = new QLabel(this);
-    QFont titleFont = QtUtils::boldFont(titleLabel->font());
-    titleFont.setPointSizeF(titleFont.pointSizeF() * 1.4);
-    titleLabel->setFont(titleFont);
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &FirstRunWizard::applyInterfaceDefaultFont);
 
     subtitleLabel = new QLabel(this);
     subtitleLabel->setWordWrap(true);
@@ -154,6 +154,16 @@ void FirstRunWizard::updateChrome()
     }
 }
 
+void FirstRunWizard::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the *1.4 size
+    // multiplier and bold weight stay caller-side as before.
+    QFont titleFont = themeManager->appFont(AppFont::InterfaceDefault);
+    titleFont.setPointSizeF(titleFont.pointSizeF() * 1.4);
+    titleFont.setBold(true);
+    titleLabel->setFont(titleFont);
+}
+
 void FirstRunWizard::goNext()
 {
     FirstRunWizardPage *page = pages[currentIndex];
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
index 812985a9f..a5fa3b4bd 100644
--- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
@@ -55,6 +55,7 @@ private slots:
     void goBack();
     void skip();
     void updateChrome();
+    void applyInterfaceDefaultFont();
 
 private:
     void addPage(FirstRunWizardPage *page);
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
index 71d2fa409..b2d5ab1e0 100644
--- a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
@@ -5,6 +5,7 @@
 #include "../../settings_page/general_settings_page.h"
 #include "../first_run_wizard_page.h"
 #include "libcockatrice/settings/personal_settings.h"
+#include "libcockatrice/utility/translation_loader.h"
 
 #include <QApplication>
 #include <QChar>
@@ -30,7 +31,7 @@ WelcomePage::WelcomePage(QWidget *parent) : FirstRunWizardPage(parent)
     languageLabel = new QLabel(this);
     langCombo = new QComboBox(this);
     for (const QString &code : GeneralSettingsPage::findQmFiles()) {
-        langCombo->addItem(GeneralSettingsPage::languageName(code), code);
+        langCombo->addItem(TranslationLoader::languageDisplayName(code), code);
     }
 
     QString current = SettingsCache::instance().personal().getLang();
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
index bad88ddbb..13a43bd47 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
@@ -1,5 +1,6 @@
 #include "all_zones_card_amount_widget.h"
 
+#include "../../theme_manager.h"
 #include "../general/display/shadow_background_label.h"
 #include "card_amount_widget.h"
 #include "libcockatrice/card/card_info.h"
@@ -67,6 +68,7 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
     buttonBoxSideboard->setVisible(!isToken);
 
     connect(cardSizeSlider, &QSlider::valueChanged, this, &AllZonesCardAmountWidget::adjustFontSize);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &AllZonesCardAmountWidget::applyCardTextFont);
 
     QTimer::singleShot(10, this, [this]() { adjustFontSize(this->cardSizeSlider->value()); });
 
@@ -90,8 +92,9 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage)
     int newFontSize = minFontSize + (scalePercentage - basePercentage) * (maxFontSize - minFontSize) / 225;
     newFontSize = std::clamp(newFontSize, minFontSize, maxFontSize);
 
-    // Update the font labels
-    QFont zoneLabelFont = zoneLabelMainboard->font();
+    // Update the font labels. The family comes from the CardText theme
+    // role; the slider-driven point size stays as before.
+    QFont zoneLabelFont = themeManager->appFont(AppFont::CardText);
     zoneLabelFont.setPointSize(newFontSize);
     zoneLabelMainboard->setFont(zoneLabelFont);
     zoneLabelSideboard->setFont(zoneLabelFont);
@@ -101,6 +104,11 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage)
     repaint();
 }
 
+void AllZonesCardAmountWidget::applyCardTextFont()
+{
+    adjustFontSize(cardSizeSlider->value());
+}
+
 void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount)
 {
     buttonBoxMainboard->setAmount(mainboardAmount);
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
index cefabe293..3213cf16b 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
@@ -36,6 +36,9 @@ public slots:
     void adjustFontSize(int scalePercentage);
     void setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount);
 
+private slots:
+    void applyCardTextFont();
+
 private:
     QVBoxLayout *layout;
     QSlider *cardSizeSlider;
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
index eae49d7ef..7f25ea1f4 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -1,5 +1,6 @@
 #include "card_amount_widget.h"
 
+#include "../../theme_manager.h"
 #include "../deck_editor/deck_state_manager.h"
 #include "../general/display/dynamic_font_size_push_button.h"
 #include "deck_list_model.h"
@@ -77,6 +78,7 @@ CardAmountWidget::CardAmountWidget(QWidget *parent,
 
     // Connect slider for dynamic font size adjustment
     connect(cardSizeSlider, &QSlider::valueChanged, this, &CardAmountWidget::adjustFontSize);
+    connect(themeManager, &ThemeManager::fontsChanged, this, &CardAmountWidget::applyCardTextFont);
 }
 
 int CardAmountWidget::getAmount()
@@ -138,8 +140,9 @@ void CardAmountWidget::adjustFontSize(int scalePercentage)
     int newFontSize = minFontSize + (scalePercentage - basePercentage) * (maxFontSize - minFontSize) / 225;
     newFontSize = std::clamp(newFontSize, minFontSize, maxFontSize);
 
-    // Update the font for card count label
-    QFont cardCountFont = cardCountInZone->font();
+    // Update the font for card count label. The family comes from the
+    // CardText theme role; the slider-driven point size stays as before.
+    QFont cardCountFont = themeManager->appFont(AppFont::CardText);
     cardCountFont.setPointSize(newFontSize);
     cardCountInZone->setFont(cardCountFont);
 
@@ -150,6 +153,11 @@ void CardAmountWidget::adjustFontSize(int scalePercentage)
     repaint();
 }
 
+void CardAmountWidget::applyCardTextFont()
+{
+    adjustFontSize(cardSizeSlider->value());
+}
+
 /**
  * @brief Updates the card count display in the widget.
  */
diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
index 6f5889fc7..cef872157 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@@ -67,6 +67,7 @@ private slots:
     void removePrintingSideboard();
     void removePrintingTokensboard();
     void adjustFontSize(int scalePercentage);
+    void applyCardTextFont();
 };
 
 #endif // CARD_AMOUNT_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
index 94acdbdce..a5177a6bc 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@@ -2,6 +2,8 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../card_picture_loader/card_picture_loader.h"
+#include "../../theme_icon.h"
+#include "../../theme_manager.h"
 #include "../cards/card_info_picture_widget.h"
 #include "../tabs/abstract_tab_deck_editor.h"
 #include "all_zones_card_amount_widget.h"
@@ -12,16 +14,19 @@
 
 #include <QAction>
 #include <QApplication>
+#include <QColor>
 #include <QDebug>
 #include <QFileDialog>
 #include <QGuiApplication>
 #include <QImage>
-#include <QImageReader>
 #include <QLabel>
 #include <QList>
 #include <QMenu>
 #include <QMessageBox>
 #include <QMouseEvent>
+#include <QPainter>
+#include <QPalette>
+#include <QPen>
 #include <QPixmap>
 #include <QPixmapCache>
 #include <QPoint>
@@ -36,7 +41,6 @@
 #include <QVBoxLayout>
 #include <QVariant>
 #include <QtGlobal>
-#include <QtMath>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/card_override_settings.h>
@@ -120,6 +124,12 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa
     mainLayout->addWidget(cardInfoPicture);
 
     initializePinBadge();
+    auto refreshPinBadge = [this] {
+        initializePinBadge();
+        updatePinBadgeVisibility();
+    };
+    connect(themeManager, &ThemeManager::paletteChanged, this, refreshPinBadge);
+    connect(themeManager, &ThemeManager::themeChanged, this, refreshPinBadge);
 
     // Parent the preview to this overlay so it is destroyed with it (Qt::ToolTip keeps
     // it a frameless, non-activating top-level window despite the parent).
@@ -401,10 +411,55 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point)
 }
 
 /**
- * @brief Initializes the pin badge overlay and loads its icon with DPI-aware rasterization.
+ * @brief Composes the pin badge: the glyph over a rounded palette backdrop.
  *
- * The icon is rasterized once using the label's device pixel ratio so it stays crisp on HiDPI
- * displays. The resulting pixmap is cached on the QLabel and simply shown/hidden when needed.
+ * The badge floats on card art rather than on a palette surface, so a bare glyph
+ * colored WindowText is not enough: a thin dark stroke disappears on dark art in a
+ * light palette, and a thin light stroke disappears on light art in a dark palette.
+ * A Window-filled rounded rect with a WindowText outline gives the glyph a solid
+ * backing, and the outline guarantees the badge edge contrasts with the art even when
+ * the fill matches it. Both roles follow the palette, like the glyph.
+ *
+ * @param logicalSize The badge's size in logical pixels.
+ * @param devicePixelRatio The label's device pixel ratio, applied to the pixmap so it
+ *                         stays crisp on HiDPI displays.
+ * @param palette The palette the glyph's WindowText resolves against.
+ */
+static QPixmap composePinBadgePixmap(const QSize &logicalSize, qreal devicePixelRatio, const QPalette &palette)
+{
+    // Inset the glyph so the backdrop reads as a badge around it, not as a border.
+    const int inset = qRound(logicalSize.width() * 0.16);
+    const QSize glyphSize = logicalSize - QSize(inset * 2, inset * 2);
+    const QPixmap glyph = loadThemedIcon(QStringLiteral("icons/pin")).pixmap(glyphSize, devicePixelRatio);
+    if (glyph.isNull()) {
+        // Let the caller fall back to the textual badge instead of drawing an empty panel.
+        return QPixmap();
+    }
+
+    QPixmap badge(logicalSize * devicePixelRatio);
+    badge.setDevicePixelRatio(devicePixelRatio);
+    badge.fill(Qt::transparent);
+
+    QPainter painter(&badge);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    // Half-pixel inset keeps the 1.5px outline inside the pixmap instead of clipping it.
+    const QRectF box(QPointF(0.5, 0.5), QSizeF(logicalSize) - QSizeF(1, 1));
+    painter.setPen(QPen(palette.color(QPalette::WindowText), 1.5));
+    painter.setBrush(palette.color(QPalette::Window));
+    painter.drawRoundedRect(box, 8, 8);
+    painter.drawPixmap(QPointF(inset, inset), glyph);
+
+    return badge;
+}
+
+/**
+ * @brief Initializes the pin badge overlay and loads a DPI-aware icon pixmap.
+ *
+ * The glyph is drawn onto a rounded palette backdrop so the badge stays readable on
+ * card art, and it is rasterized at the label's device pixel ratio so it stays crisp on
+ * HiDPI displays. It is re-rendered when the palette or theme changes so the badge
+ * follows the surrounding UI instead of freezing at its first colors.
  * If the SVG cannot be read, a textual fallback badge is created instead.
  */
 void PrintingSelectorCardOverlayWidget::initializePinBadge()
@@ -420,24 +475,13 @@ void PrintingSelectorCardOverlayWidget::initializePinBadge()
     }
 
     bool pinLoaded = false;
-    QImageReader pinReader(QStringLiteral("theme:icons/pin"));
-
-    if (pinReader.canRead()) {
-        // Rasterize a 64×64 logical icon so it has a consistent size regardless of card scaling.
-        const QSize targetSize(64, 64);
-        const qreal dpr = pinBadge->devicePixelRatioF();
-        const QSize rasterSize(qMax(1, qCeil(targetSize.width() * dpr)), qMax(1, qCeil(targetSize.height() * dpr)));
-        pinReader.setScaledSize(rasterSize);
-        const QImage pinImage = pinReader.read();
-        if (!pinImage.isNull()) {
-            // Tag the pixmap with the same DPR so Qt renders it at the correct physical size.
-            QPixmap pinPix = QPixmap::fromImage(pinImage);
-            pinPix.setDevicePixelRatio(dpr);
-            pinBadge->setPixmap(pinPix);
-            pinBadge->setFixedSize(targetSize);
-            pinBadge->setStyleSheet(QStringLiteral("background: transparent;"));
-            pinLoaded = true;
-        }
+    const QSize targetSize(64, 64);
+    const QPixmap pinPix = composePinBadgePixmap(targetSize, pinBadge->devicePixelRatioF(), pinBadge->palette());
+    if (!pinPix.isNull()) {
+        pinBadge->setPixmap(pinPix);
+        pinBadge->setFixedSize(targetSize);
+        pinBadge->setStyleSheet(QStringLiteral("background: transparent;"));
+        pinLoaded = true;
     }
 
     if (!pinLoaded) {
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
index 7f9ad66c8..225c3e21d 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
@@ -1,5 +1,8 @@
 #include "printing_selector_placeholder_widget.h"
 
+#include "../interface/theme_manager.h"
+
+#include <QFont>
 #include <QLabel>
 #include <QSizePolicy>
 #include <QVBoxLayout>
@@ -30,10 +33,12 @@ PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *pa
     textLabel->setStyleSheet(R"(
         QLabel {
             color: palette(mid);
-            font-size: 14px;
             padding: 10px;
         }
     )");
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &PrintingSelectorPlaceholderWidget::applyInterfaceDefaultFont);
 
     mainLayout->addWidget(imageLabel);
     mainLayout->addWidget(textLabel);
@@ -44,4 +49,12 @@ PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *pa
 void PrintingSelectorPlaceholderWidget::retranslateUi()
 {
     textLabel->setText(tr("Select a card to view its available printings"));
+}
+
+void PrintingSelectorPlaceholderWidget::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 14px size stays caller-side.
+    QFont placeholderFont = themeManager->appFont(AppFont::InterfaceDefault);
+    placeholderFont.setPixelSize(14);
+    textLabel->setFont(placeholderFont);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
index 6702d325a..9e6e47bcb 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
@@ -14,6 +14,9 @@ class PrintingSelectorPlaceholderWidget : public QWidget
 public:
     explicit PrintingSelectorPlaceholderWidget(QWidget *parent = nullptr);
 
+private slots:
+    void applyInterfaceDefaultFont();
+
 private:
     QVBoxLayout *mainLayout;
     QLabel *imageLabel;
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
index ea0d2db5a..c6a6d989f 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -1,12 +1,12 @@
 #include "settings_button_widget.h"
 
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "settings_popup_widget.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QMouseEvent>
-#include <QPixmap>
 #include <QPoint>
 #include <QPointF>
 #include <QRect>
@@ -21,7 +21,7 @@
 SettingsButtonWidget::SettingsButtonWidget(QWidget *parent)
     : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(nullptr))
 {
-    button->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
+    button->setIcon(loadThemedIcon(QStringLiteral("icons/settings")));
     button->setCheckable(true);
     button->setFixedSize(32, 32);
     connect(button, &QToolButton::clicked, this, &SettingsButtonWidget::togglePopup);
@@ -49,9 +49,9 @@ void SettingsButtonWidget::removeSettingsWidget(QWidget *toRemove) const
     popup->removeSettingsWidget(toRemove);
 }
 
-void SettingsButtonWidget::setButtonIcon(QPixmap iconMap)
+void SettingsButtonWidget::setButtonIcon(const QIcon &icon)
 {
-    button->setIcon(iconMap);
+    button->setIcon(icon);
 }
 
 void SettingsButtonWidget::setButtonText(const QString &text)
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
index 015300bf8..56d542d37 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
@@ -13,7 +13,7 @@
 #include <qtmetamacros.h>
 
 class QHBoxLayout;
-class QPixmap;
+class QIcon;
 class QToolButton;
 class SettingsPopupWidget;
 
@@ -28,7 +28,7 @@ public:
 
     void addSettingsWidget(QWidget *toAdd) const;
     void removeSettingsWidget(QWidget *toRemove) const;
-    void setButtonIcon(QPixmap iconMap);
+    void setButtonIcon(const QIcon &icon);
     void setButtonText(const QString &buttonText);
     void setCompact(bool compact);
     bool isCompact() const
diff --git a/cockatrice/src/interface/widgets/replay/replay_event_index.cpp b/cockatrice/src/interface/widgets/replay/replay_event_index.cpp
new file mode 100644
index 000000000..d21671b5a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_event_index.cpp
@@ -0,0 +1,876 @@
+#include "replay_event_index.h"
+
+#include "libcockatrice/protocol/get_pb_extension.h"
+#include "libcockatrice/protocol/pb/card_attributes.pb.h"
+#include "libcockatrice/protocol/pb/context_concede.pb.h"
+#include "libcockatrice/protocol/pb/context_connection_state_changed.pb.h"
+#include "libcockatrice/protocol/pb/context_deck_select.pb.h"
+#include "libcockatrice/protocol/pb/context_mulligan.pb.h"
+#include "libcockatrice/protocol/pb/context_ready_start.pb.h"
+#include "libcockatrice/protocol/pb/context_set_sideboard_lock.pb.h"
+#include "libcockatrice/protocol/pb/context_undo_draw.pb.h"
+#include "libcockatrice/protocol/pb/event_attach_card.pb.h"
+#include "libcockatrice/protocol/pb/event_change_zone_properties.pb.h"
+#include "libcockatrice/protocol/pb/event_create_counter.pb.h"
+#include "libcockatrice/protocol/pb/event_create_token.pb.h"
+#include "libcockatrice/protocol/pb/event_del_counter.pb.h"
+#include "libcockatrice/protocol/pb/event_destroy_card.pb.h"
+#include "libcockatrice/protocol/pb/event_draw_cards.pb.h"
+#include "libcockatrice/protocol/pb/event_dump_zone.pb.h"
+#include "libcockatrice/protocol/pb/event_flip_card.pb.h"
+#include "libcockatrice/protocol/pb/event_game_closed.pb.h"
+#include "libcockatrice/protocol/pb/event_game_host_changed.pb.h"
+#include "libcockatrice/protocol/pb/event_game_log_notice.pb.h"
+#include "libcockatrice/protocol/pb/event_game_say.pb.h"
+#include "libcockatrice/protocol/pb/event_game_state_changed.pb.h"
+#include "libcockatrice/protocol/pb/event_join.pb.h"
+#include "libcockatrice/protocol/pb/event_kicked.pb.h"
+#include "libcockatrice/protocol/pb/event_leave.pb.h"
+#include "libcockatrice/protocol/pb/event_move_card.pb.h"
+#include "libcockatrice/protocol/pb/event_player_properties_changed.pb.h"
+#include "libcockatrice/protocol/pb/event_reveal_cards.pb.h"
+#include "libcockatrice/protocol/pb/event_reverse_turn.pb.h"
+#include "libcockatrice/protocol/pb/event_roll_die.pb.h"
+#include "libcockatrice/protocol/pb/event_set_active_phase.pb.h"
+#include "libcockatrice/protocol/pb/event_set_active_player.pb.h"
+#include "libcockatrice/protocol/pb/event_set_card_attr.pb.h"
+#include "libcockatrice/protocol/pb/event_set_card_counter.pb.h"
+#include "libcockatrice/protocol/pb/event_set_counter.pb.h"
+#include "libcockatrice/protocol/pb/event_shuffle.pb.h"
+#include "libcockatrice/protocol/pb/game_event.pb.h"
+#include "libcockatrice/protocol/pb/game_event_container.pb.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
+#include "libcockatrice/protocol/pb/game_replay.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_player.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h"
+#include "libcockatrice/utility/zone_names.h"
+
+#include <QCoreApplication>
+#include <QHash>
+#include <QStringList>
+#include <QtGlobal>
+#include <algorithm>
+#include <libcockatrice/game/phase.h>
+
+namespace
+{
+struct PendingDetail
+{
+    QString text;
+    QString badge;
+    ReplayEventKind kind = ReplayEventKind::Action;
+    QString actor;
+};
+
+QString formatTime(int timeMs)
+{
+    const int totalSeconds = qMax(0, timeMs) / 1000;
+    const int hours = totalSeconds / 3600;
+    const int minutes = (totalSeconds / 60) % 60;
+    const int seconds = totalSeconds % 60;
+
+    if (hours > 0) {
+        return QStringLiteral("%1:%2:%3")
+            .arg(hours)
+            .arg(minutes, 2, 10, QLatin1Char('0'))
+            .arg(seconds, 2, 10, QLatin1Char('0'));
+    }
+
+    return QStringLiteral("%1:%2").arg(minutes, 2, 10, QLatin1Char('0')).arg(seconds, 2, 10, QLatin1Char('0'));
+}
+
+class ReplayEventIndexBuilder
+{
+    Q_DECLARE_TR_FUNCTIONS(ReplayEventIndex)
+
+public:
+    ReplayEventIndexBuilder(const GameReplay *replay, const QList<int> &timeline) : replay(replay), timeline(timeline)
+    {
+    }
+
+    QList<ReplayEventEntry> build()
+    {
+        QList<ReplayEventEntry> entries;
+
+        for (int i = 0; i < replay->event_list_size(); ++i) {
+            const GameEventContainer &container = replay->event_list(i);
+            const QList<PendingDetail> details = describeContainer(container);
+            if (details.isEmpty()) {
+                continue;
+            }
+
+            ReplayEventEntry entry;
+            entry.eventIndex = i;
+            entry.timeMs = timeline.value(i, static_cast<int>(container.seconds_elapsed()) * 1000);
+            entry.timeLabel = formatTime(entry.timeMs);
+            entry.kind = details.first().kind;
+            entry.badge = details.first().badge;
+            if (details.size() > 1) {
+                entry.badge += QStringLiteral(" +%1").arg(details.size() - 1);
+            }
+
+            const QString sharedActor = details.first().actor;
+            const bool mixedActors = std::any_of(details.cbegin(), details.cend(), [&sharedActor](const auto &detail) {
+                return detail.actor != sharedActor;
+            });
+
+            QStringList detailTexts;
+            for (const PendingDetail &detail : details) {
+                if (mixedActors && !detail.actor.isEmpty()) {
+                    detailTexts.append(tr("%1: %2").arg(detail.actor, detail.text));
+                } else {
+                    detailTexts.append(detail.text);
+                }
+            }
+            entry.actor = mixedActors ? QString() : sharedActor;
+            entry.detail = detailTexts.join(QStringLiteral("  •  "));
+
+            entries.append(entry);
+        }
+
+        return entries;
+    }
+
+private:
+    const GameReplay *replay;
+    const QList<int> &timeline;
+
+    QHash<int, QString> playerNames;
+    QHash<int, bool> spectators;
+    QHash<QString, QString> cardNames;
+    QHash<QString, QString> counterNames;
+
+    int activePlayerId = -1;
+    bool gameStarted = false;
+    bool sawGameState = false;
+
+    static QString cardKey(int playerId, const QString &zone, int cardId)
+    {
+        return QStringLiteral("%1/%2/%3").arg(playerId).arg(zone).arg(cardId);
+    }
+
+    static QString counterKey(int playerId, int counterId)
+    {
+        return QStringLiteral("%1/%2").arg(playerId).arg(counterId);
+    }
+
+    QString playerName(int playerId) const
+    {
+        if (playerId < 0) {
+            return tr("Game");
+        }
+        return playerNames.value(playerId, tr("Player %1").arg(playerId));
+    }
+
+    QString actorName(int playerId) const
+    {
+        if (playerId < 0) {
+            return QString();
+        }
+        return playerNames.value(playerId, tr("Player %1").arg(playerId));
+    }
+
+    bool isSpectator(int playerId) const
+    {
+        return spectators.value(playerId, false);
+    }
+
+    void rememberPlayer(const ServerInfo_PlayerProperties &properties)
+    {
+        const int playerId = properties.player_id();
+        if (playerId < 0) {
+            return;
+        }
+
+        const QString name = QString::fromStdString(properties.user_info().name());
+        if (!name.isEmpty()) {
+            playerNames.insert(playerId, name);
+        }
+        spectators.insert(playerId, properties.spectator());
+    }
+
+    void rememberCard(int playerId, const QString &zone, int cardId, const QString &name)
+    {
+        if (cardId >= 0 && !name.isEmpty()) {
+            cardNames.insert(cardKey(playerId, zone, cardId), name);
+        }
+    }
+
+    void forgetCard(int playerId, const QString &zone, int cardId)
+    {
+        if (cardId >= 0) {
+            cardNames.remove(cardKey(playerId, zone, cardId));
+        }
+    }
+
+    QString cardName(int playerId, const QString &zone, int cardId) const
+    {
+        if (cardId < 0) {
+            return QString();
+        }
+        return cardNames.value(cardKey(playerId, zone, cardId));
+    }
+
+    void rememberCounter(int playerId, const ServerInfo_Counter &counter)
+    {
+        const QString name = QString::fromStdString(counter.name());
+        if (!name.isEmpty()) {
+            counterNames.insert(counterKey(playerId, counter.id()), name);
+        }
+    }
+
+    QString counterName(int playerId, int counterId) const
+    {
+        return counterNames.value(counterKey(playerId, counterId));
+    }
+
+    QString zoneName(const QString &zone) const
+    {
+        if (zone == ZoneNames::TABLE) {
+            return tr("battlefield");
+        }
+        if (zone == ZoneNames::GRAVE) {
+            return tr("graveyard");
+        }
+        if (zone == ZoneNames::EXILE) {
+            return tr("exile");
+        }
+        if (zone == ZoneNames::HAND) {
+            return tr("hand");
+        }
+        if (zone == ZoneNames::DECK) {
+            return tr("library");
+        }
+        if (zone == ZoneNames::SIDEBOARD) {
+            return tr("sideboard");
+        }
+        if (zone == ZoneNames::STACK) {
+            return tr("stack");
+        }
+        return zone;
+    }
+
+    QString zonePhrase(int playerId, const QString &zone, int actorId) const
+    {
+        if (zone == ZoneNames::TABLE) {
+            return tr("the battlefield");
+        }
+        if (zone == ZoneNames::EXILE) {
+            return tr("exile");
+        }
+        if (zone == ZoneNames::STACK) {
+            return tr("the stack");
+        }
+
+        const QString name = zoneName(zone);
+        if (playerId < 0 || playerId == actorId) {
+            return tr("their %1").arg(name);
+        }
+        return tr("%1's %2").arg(playerName(playerId), name);
+    }
+
+    QString formatCardList(const QStringList &names, int total) const
+    {
+        // Keep repeats: each entry is a drawn/revealed card, so the list length must agree with the count.
+        QStringList listedNames;
+        for (const QString &name : names) {
+            if (!name.isEmpty()) {
+                listedNames.append(name);
+            }
+        }
+
+        if (listedNames.isEmpty()) {
+            if (total <= 0) {
+                return tr("no cards");
+            }
+            return total == 1 ? tr("1 card") : tr("%1 cards").arg(total);
+        }
+
+        if (total < listedNames.size()) {
+            total = listedNames.size();
+        }
+
+        if (listedNames.size() > 3) {
+            return tr("%1 and %2 more").arg(listedNames.mid(0, 3).join(QStringLiteral(", "))).arg(total - 3);
+        }
+        if (total > listedNames.size()) {
+            return tr("%1 and %2 more").arg(listedNames.join(QStringLiteral(", "))).arg(total - listedNames.size());
+        }
+
+        return listedNames.join(QStringLiteral(", "));
+    }
+
+    void updateGameState(const Event_GameStateChanged &event)
+    {
+        for (int i = 0; i < event.player_list_size(); ++i) {
+            const ServerInfo_Player &player = event.player_list(i);
+            const int playerId = player.properties().player_id();
+            rememberPlayer(player.properties());
+
+            for (int j = 0; j < player.zone_list_size(); ++j) {
+                const ServerInfo_Zone &zone = player.zone_list(j);
+                for (int k = 0; k < zone.card_list_size(); ++k) {
+                    const ServerInfo_Card &card = zone.card_list(k);
+                    rememberCard(playerId, QString::fromStdString(zone.name()), card.id(),
+                                 QString::fromStdString(card.name()));
+                }
+            }
+
+            for (int j = 0; j < player.counter_list_size(); ++j) {
+                rememberCounter(playerId, player.counter_list(j));
+            }
+        }
+
+        if (event.has_active_player_id()) {
+            activePlayerId = event.active_player_id();
+        }
+        if (event.has_game_started()) {
+            gameStarted = event.game_started();
+        }
+    }
+
+    QString describeMoveCard(const Event_MoveCard &event, int actorId, const GameEventContext &context)
+    {
+        const int startPlayerId = event.start_player_id() >= 0 ? event.start_player_id() : actorId;
+        const int targetPlayerId = event.target_player_id() >= 0 ? event.target_player_id() : startPlayerId;
+        const QString startZone = QString::fromStdString(event.start_zone());
+        const QString targetZone = event.has_target_zone() ? QString::fromStdString(event.target_zone()) : startZone;
+
+        QString name;
+        if (event.has_card_name()) {
+            name = QString::fromStdString(event.card_name());
+        }
+        if (name.isEmpty()) {
+            name = cardName(startPlayerId, startZone, event.card_id());
+        }
+
+        const bool knownName = !name.isEmpty();
+        if (name.isEmpty()) {
+            name = event.face_down() ? tr("a face-down card") : tr("a card");
+        }
+
+        const int newCardId = event.has_new_card_id() ? event.new_card_id() : event.card_id();
+        forgetCard(startPlayerId, startZone, event.card_id());
+        if (knownName) {
+            rememberCard(targetPlayerId, targetZone, newCardId, name);
+        }
+
+        if (startZone == targetZone) {
+            return tr("moved %1 within %2.").arg(name, zonePhrase(targetPlayerId, targetZone, actorId));
+        }
+        if (context.HasExtension(Context_UndoDraw::ext)) {
+            return tr("returned %1 to %2.").arg(name, zonePhrase(targetPlayerId, targetZone, actorId));
+        }
+
+        return tr("moved %1 from %2 to %3.")
+            .arg(name, zonePhrase(startPlayerId, startZone, actorId), zonePhrase(targetPlayerId, targetZone, actorId));
+    }
+
+    QString describeSetCardAttribute(const Event_SetCardAttr &event, int actorId)
+    {
+        const QString zone = QString::fromStdString(event.zone_name());
+        QString name;
+        if (event.has_card_id()) {
+            name = cardName(actorId, zone, event.card_id());
+        }
+        if (name.isEmpty()) {
+            name = event.has_card_id() ? tr("a card") : tr("all cards");
+        }
+
+        const QString value = QString::fromStdString(event.attr_value());
+        switch (event.attribute()) {
+            case AttrTapped:
+                return value == QLatin1String("1") ? tr("tapped %1.").arg(name) : tr("untapped %1.").arg(name);
+            case AttrAttacking:
+                return value == QLatin1String("1") ? tr("%1 is now attacking.").arg(name)
+                                                   : tr("%1 is no longer attacking.").arg(name);
+            case AttrFaceDown:
+                return value == QLatin1String("1") ? tr("turned %1 face down.").arg(name)
+                                                   : tr("turned %1 face up.").arg(name);
+            case AttrColor:
+                return tr("changed %1's color to %2.").arg(name, value);
+            case AttrPT:
+                return tr("set %1's power/toughness to %2.").arg(name, value);
+            case AttrAnnotation:
+                return value.isEmpty() ? tr("cleared %1's annotation.").arg(name)
+                                       : tr("annotated %1: %2").arg(name, value);
+            case AttrDoesntUntap:
+                return value == QLatin1String("1") ? tr("%1 will no longer untap.").arg(name)
+                                                   : tr("%1 will untap normally again.").arg(name);
+        }
+
+        return tr("changed %1.").arg(name);
+    }
+
+    QString badgeForCardAttribute(CardAttribute attribute) const
+    {
+        switch (attribute) {
+            case AttrTapped:
+                return tr("TAP");
+            case AttrAttacking:
+                return tr("ATTACK");
+            case AttrFaceDown:
+                return tr("FLIP");
+            case AttrColor:
+                return tr("COLOR");
+            case AttrPT:
+                return tr("PT");
+            case AttrAnnotation:
+                return tr("NOTE");
+            case AttrDoesntUntap:
+                return tr("TAP");
+        }
+        return tr("CARD");
+    }
+
+    QString describeLeaveReason(Event_Leave::LeaveReason reason) const
+    {
+        switch (reason) {
+            case Event_Leave::USER_KICKED:
+                return tr("kicked by game host or moderator");
+            case Event_Leave::USER_LEFT:
+                return tr("left the game");
+            case Event_Leave::USER_DISCONNECTED:
+                return tr("disconnected");
+            case Event_Leave::OTHER:
+            default:
+                return tr("reason unknown");
+        }
+    }
+
+    void addDetail(QList<PendingDetail> &details,
+                   const QString &text,
+                   const QString &badge,
+                   ReplayEventKind kind,
+                   int actorId,
+                   bool forcedByJudge) const
+    {
+        if (text.isEmpty()) {
+            return;
+        }
+
+        const QString finalText = forcedByJudge ? tr("%1 (judge)").arg(text) : text;
+        details.append(PendingDetail{.text = finalText, .badge = badge, .kind = kind, .actor = actorName(actorId)});
+    }
+
+    QList<PendingDetail> describeContainer(const GameEventContainer &container)
+    {
+        QList<PendingDetail> details;
+        const GameEventContext &context = container.context();
+        const bool forcedByJudge = container.has_forced_by_judge();
+        const auto contextType = static_cast<GameEventContext::ContextType>(getPbExtension(context));
+
+        for (int i = 0; i < container.event_list_size(); ++i) {
+            const GameEvent &event = container.event_list(i);
+            const int eventPlayerId = event.player_id();
+            const auto eventType = static_cast<GameEvent::GameEventType>(getPbExtension(event));
+
+            switch (eventType) {
+                case GameEvent::GAME_STATE_CHANGED: {
+                    const Event_GameStateChanged &state = event.GetExtension(Event_GameStateChanged::ext);
+                    const bool wasStarted = gameStarted;
+                    updateGameState(state);
+                    if (state.game_started() && !wasStarted) {
+                        addDetail(details, tr("Game started."), tr("GAME"), ReplayEventKind::System, -1, forcedByJudge);
+                    } else if (!sawGameState) {
+                        addDetail(details, tr("Game state loaded."), tr("GAME"), ReplayEventKind::System, -1,
+                                  forcedByJudge);
+                    }
+                    sawGameState = true;
+                    break;
+                }
+                case GameEvent::PLAYER_PROPERTIES_CHANGED: {
+                    const Event_PlayerPropertiesChanged &propertiesEvent =
+                        event.GetExtension(Event_PlayerPropertiesChanged::ext);
+                    const bool hasProperties = propertiesEvent.has_player_properties();
+                    const ServerInfo_PlayerProperties &properties = propertiesEvent.player_properties();
+                    // The server only fills in the field that changed, so player_id is absent from these events
+                    // unless they are about a specific player; fall back to the event's own player id.
+                    const bool describesPlayer = hasProperties && properties.has_player_id();
+                    const int playerId = describesPlayer ? properties.player_id() : eventPlayerId;
+                    if (describesPlayer) {
+                        rememberPlayer(properties);
+                    }
+
+                    switch (contextType) {
+                        case GameEventContext::READY_START:
+                            addDetail(details,
+                                      properties.ready_start() ? tr("is ready to start.") : tr("is no longer ready."),
+                                      tr("READY"), ReplayEventKind::System, playerId, forcedByJudge);
+                            break;
+                        case GameEventContext::CONCEDE:
+                            addDetail(details, tr("conceded the game."), tr("CONCEDE"), ReplayEventKind::System,
+                                      playerId, forcedByJudge);
+                            break;
+                        case GameEventContext::UNCONCEDE:
+                            addDetail(details, tr("unconceded the game."), tr("CONCEDE"), ReplayEventKind::System,
+                                      playerId, forcedByJudge);
+                            break;
+                        case GameEventContext::DECK_SELECT: {
+                            const Context_DeckSelect &deckSelect = context.GetExtension(Context_DeckSelect::ext);
+                            const int sideboardSize = deckSelect.sideboard_size();
+                            addDetail(details,
+                                      sideboardSize >= 0
+                                          ? tr("selected a deck with %1 sideboard cards.").arg(sideboardSize)
+                                          : tr("selected a deck."),
+                                      tr("DECK"), ReplayEventKind::System, playerId, forcedByJudge);
+                            break;
+                        }
+                        case GameEventContext::MULLIGAN: {
+                            const Context_Mulligan &mulligan = context.GetExtension(Context_Mulligan::ext);
+                            addDetail(details,
+                                      mulligan.number() > 0 ? tr("took a mulligan (%1).").arg(mulligan.number())
+                                                            : tr("took a mulligan."),
+                                      tr("MULLIGAN"), ReplayEventKind::System, playerId, forcedByJudge);
+                            break;
+                        }
+                        case GameEventContext::SET_SIDEBOARD_LOCK:
+                            addDetail(details,
+                                      properties.sideboard_locked() ? tr("locked their sideboard.")
+                                                                    : tr("unlocked their sideboard."),
+                                      tr("SIDEBOARD"), ReplayEventKind::System, playerId, forcedByJudge);
+                            break;
+                        case GameEventContext::CONNECTION_STATE_CHANGED:
+                            addDetail(details,
+                                      properties.ping_seconds() != -1 ? tr("reconnected to the game.")
+                                                                      : tr("lost connection to the game."),
+                                      tr("CONNECTION"), ReplayEventKind::System, playerId, forcedByJudge);
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                }
+                case GameEvent::JOIN: {
+                    const Event_Join &join = event.GetExtension(Event_Join::ext);
+                    if (join.has_player_properties()) {
+                        rememberPlayer(join.player_properties());
+                    }
+                    const int playerId = join.player_properties().player_id() >= 0
+                                             ? join.player_properties().player_id()
+                                             : eventPlayerId;
+                    addDetail(details, isSpectator(playerId) ? tr("joined as a spectator.") : tr("joined the game."),
+                              tr("JOIN"), ReplayEventKind::System, playerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::LEAVE: {
+                    const Event_Leave &leave = event.GetExtension(Event_Leave::ext);
+                    const QString reason = describeLeaveReason(leave.reason());
+                    if (eventPlayerId < 0) {
+                        addDetail(details, tr("A player left the game (%1).").arg(reason), tr("LEAVE"),
+                                  ReplayEventKind::System, -1, forcedByJudge);
+                    } else {
+                        addDetail(details,
+                                  isSpectator(eventPlayerId) ? tr("stopped spectating (%1).").arg(reason)
+                                                             : tr("left the game (%1).").arg(reason),
+                                  tr("LEAVE"), ReplayEventKind::System, eventPlayerId, forcedByJudge);
+                    }
+                    break;
+                }
+                case GameEvent::KICKED:
+                    addDetail(details,
+                              eventPlayerId >= 0 ? tr("was kicked from the game.")
+                                                 : tr("A player was kicked from the game."),
+                              tr("KICK"), ReplayEventKind::System, eventPlayerId, forcedByJudge);
+                    break;
+                case GameEvent::GAME_CLOSED:
+                    addDetail(details, tr("Game closed."), tr("GAME"), ReplayEventKind::System, -1, forcedByJudge);
+                    break;
+                case GameEvent::GAME_HOST_CHANGED:
+                    addDetail(details, eventPlayerId >= 0 ? tr("is now the game host.") : tr("The game host changed."),
+                              tr("HOST"), ReplayEventKind::System, eventPlayerId, forcedByJudge);
+                    break;
+                case GameEvent::GAME_SAY: {
+                    const Event_GameSay &say = event.GetExtension(Event_GameSay::ext);
+                    addDetail(details, QString::fromStdString(say.message()), tr("CHAT"), ReplayEventKind::Chat,
+                              eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::SET_ACTIVE_PLAYER: {
+                    const Event_SetActivePlayer &setActivePlayer = event.GetExtension(Event_SetActivePlayer::ext);
+                    activePlayerId = setActivePlayer.active_player_id();
+                    if (activePlayerId >= 0) {
+                        addDetail(details, tr("begins their turn."), tr("TURN"), ReplayEventKind::Turn, activePlayerId,
+                                  forcedByJudge);
+                    }
+                    break;
+                }
+                case GameEvent::SET_ACTIVE_PHASE: {
+                    const Event_SetActivePhase &setActivePhase = event.GetExtension(Event_SetActivePhase::ext);
+                    if (setActivePhase.phase() >= 0) {
+                        const QString phaseName = Phases::getPhase(setActivePhase.phase()).getName();
+                        addDetail(details, tr("entered the %1 phase.").arg(phaseName), tr("PHASE"),
+                                  ReplayEventKind::Phase, activePlayerId >= 0 ? activePlayerId : eventPlayerId,
+                                  forcedByJudge);
+                    }
+                    break;
+                }
+                case GameEvent::REVERSE_TURN: {
+                    const Event_ReverseTurn &reverseTurn = event.GetExtension(Event_ReverseTurn::ext);
+                    addDetail(details,
+                              reverseTurn.reversed() ? tr("reversed the turn order.") : tr("restored the turn order."),
+                              tr("TURN"), ReplayEventKind::Turn, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::MOVE_CARD: {
+                    const Event_MoveCard &moveCard = event.GetExtension(Event_MoveCard::ext);
+                    const QString text = describeMoveCard(moveCard, eventPlayerId, context);
+                    const QString startZone = QString::fromStdString(moveCard.start_zone());
+                    const QString targetZone = QString::fromStdString(moveCard.target_zone());
+                    QString badge = tr("MOVE");
+                    if (context.HasExtension(Context_UndoDraw::ext)) {
+                        badge = tr("UNDO");
+                    } else if (startZone == ZoneNames::STACK) {
+                        badge = tr("RESOLVE");
+                    } else if (startZone == ZoneNames::HAND && targetZone == ZoneNames::TABLE) {
+                        badge = tr("PLAY");
+                    }
+                    addDetail(details, text, badge, ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::DRAW_CARDS: {
+                    const Event_DrawCards &drawCards = event.GetExtension(Event_DrawCards::ext);
+                    QStringList names;
+                    for (int j = 0; j < drawCards.cards_size(); ++j) {
+                        const ServerInfo_Card &card = drawCards.cards(j);
+                        const QString name = QString::fromStdString(card.name());
+                        names.append(name);
+                        rememberCard(eventPlayerId, ZoneNames::HAND, card.id(), name);
+                    }
+                    if (drawCards.number() > 0) {
+                        addDetail(details, tr("drew %1.").arg(formatCardList(names, drawCards.number())), tr("DRAW"),
+                                  ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    }
+                    break;
+                }
+                case GameEvent::REVEAL_CARDS: {
+                    const Event_RevealCards &revealCards = event.GetExtension(Event_RevealCards::ext);
+                    const QString zone = QString::fromStdString(revealCards.zone_name());
+                    QStringList names;
+                    for (int j = 0; j < revealCards.cards_size(); ++j) {
+                        const ServerInfo_Card &card = revealCards.cards(j);
+                        const QString name = QString::fromStdString(card.name());
+                        names.append(name);
+                        rememberCard(eventPlayerId, zone, card.id(), name);
+                    }
+                    const int total =
+                        revealCards.number_of_cards() > 0 ? revealCards.number_of_cards() : revealCards.cards_size();
+                    QString text =
+                        tr("revealed %1 from %2.")
+                            .arg(formatCardList(names, total), zonePhrase(eventPlayerId, zone, eventPlayerId));
+                    if (revealCards.other_player_id() >= 0 && revealCards.other_player_id() != eventPlayerId) {
+                        text = tr("revealed %1 from %2 to %3.")
+                                   .arg(formatCardList(names, total), zonePhrase(eventPlayerId, zone, eventPlayerId),
+                                        playerName(revealCards.other_player_id()));
+                    }
+                    addDetail(details, text, tr("REVEAL"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::SHUFFLE: {
+                    const Event_Shuffle &shuffle = event.GetExtension(Event_Shuffle::ext);
+                    addDetail(
+                        details,
+                        tr("shuffled %1.")
+                            .arg(zonePhrase(eventPlayerId, QString::fromStdString(shuffle.zone_name()), eventPlayerId)),
+                        tr("SHUFFLE"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::ROLL_DIE: {
+                    const Event_RollDie &rollDie = event.GetExtension(Event_RollDie::ext);
+                    QStringList rolls;
+                    for (int j = 0; j < rollDie.values_size(); ++j) {
+                        rolls.append(QString::number(rollDie.values(j)));
+                    }
+                    if (rolls.isEmpty() && rollDie.value() > 0) {
+                        rolls.append(QString::number(rollDie.value()));
+                    }
+                    const QString sides = rollDie.sides() > 0 ? QString::number(rollDie.sides()) : QStringLiteral("?");
+                    addDetail(details, tr("rolled a d%1: %2.").arg(sides, rolls.join(QStringLiteral(", "))), tr("DICE"),
+                              ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::FLIP_CARD: {
+                    const Event_FlipCard &flipCard = event.GetExtension(Event_FlipCard::ext);
+                    const QString zone = QString::fromStdString(flipCard.zone_name());
+                    if (flipCard.has_card_name()) {
+                        rememberCard(eventPlayerId, zone, flipCard.card_id(),
+                                     QString::fromStdString(flipCard.card_name()));
+                    }
+                    QString name = flipCard.has_card_name() ? QString::fromStdString(flipCard.card_name())
+                                                            : cardName(eventPlayerId, zone, flipCard.card_id());
+                    if (name.isEmpty()) {
+                        name = tr("a card");
+                    }
+                    addDetail(details,
+                              flipCard.face_down() ? tr("flipped %1 face down.").arg(name)
+                                                   : tr("flipped %1 face up.").arg(name),
+                              tr("FLIP"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::DESTROY_CARD: {
+                    const Event_DestroyCard &destroyCard = event.GetExtension(Event_DestroyCard::ext);
+                    const QString zone = QString::fromStdString(destroyCard.zone_name());
+                    const QString name = cardName(eventPlayerId, zone, destroyCard.card_id());
+                    forgetCard(eventPlayerId, zone, destroyCard.card_id());
+                    addDetail(details, tr("destroyed %1.").arg(name.isEmpty() ? tr("a card") : name), tr("DESTROY"),
+                              ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::ATTACH_CARD: {
+                    const Event_AttachCard &attachCard = event.GetExtension(Event_AttachCard::ext);
+                    const QString startZone = QString::fromStdString(attachCard.start_zone());
+                    const QString source = cardName(eventPlayerId, startZone, attachCard.card_id());
+                    const QString sourceText = source.isEmpty() ? tr("a card") : source;
+                    // An unattach event carries no target at all, so the target fields default to player 0 / no zone
+                    // / card 0; only a present target_player_id means the card was attached to something.
+                    if (!attachCard.has_target_player_id()) {
+                        addDetail(details, tr("unattached %1.").arg(sourceText), tr("ATTACH"), ReplayEventKind::Action,
+                                  eventPlayerId, forcedByJudge);
+                        break;
+                    }
+                    const QString targetZone = QString::fromStdString(attachCard.target_zone());
+                    const int targetPlayerId =
+                        attachCard.target_player_id() >= 0 ? attachCard.target_player_id() : eventPlayerId;
+                    const QString target = cardName(targetPlayerId, targetZone, attachCard.target_card_id());
+                    addDetail(details,
+                              tr("attached %1 to %2.").arg(sourceText, target.isEmpty() ? tr("a card") : target),
+                              tr("ATTACH"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::CREATE_TOKEN: {
+                    const Event_CreateToken &createToken = event.GetExtension(Event_CreateToken::ext);
+                    const QString name = QString::fromStdString(createToken.card_name());
+                    rememberCard(eventPlayerId, QString::fromStdString(createToken.zone_name()), createToken.card_id(),
+                                 name);
+                    const QString pt = QString::fromStdString(createToken.pt());
+                    addDetail(
+                        details,
+                        tr("created a token: %1%2.")
+                            .arg(name.isEmpty() ? tr("token") : name, pt.isEmpty() ? QString() : tr(" (%1)").arg(pt)),
+                        tr("TOKEN"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::SET_CARD_ATTR: {
+                    const Event_SetCardAttr &setCardAttr = event.GetExtension(Event_SetCardAttr::ext);
+                    addDetail(details, describeSetCardAttribute(setCardAttr, eventPlayerId),
+                              badgeForCardAttribute(setCardAttr.attribute()), ReplayEventKind::Action, eventPlayerId,
+                              forcedByJudge);
+                    break;
+                }
+                case GameEvent::SET_CARD_COUNTER: {
+                    const Event_SetCardCounter &setCardCounter = event.GetExtension(Event_SetCardCounter::ext);
+                    const QString name = cardName(eventPlayerId, QString::fromStdString(setCardCounter.zone_name()),
+                                                  setCardCounter.card_id());
+                    addDetail(
+                        details,
+                        tr("set a counter on %1 to %2.")
+                            .arg(name.isEmpty() ? tr("a card") : name, QString::number(setCardCounter.counter_value())),
+                        tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::CREATE_COUNTER: {
+                    const Event_CreateCounter &createCounter = event.GetExtension(Event_CreateCounter::ext);
+                    const ServerInfo_Counter &counter = createCounter.counter_info();
+                    rememberCounter(eventPlayerId, counter);
+                    const QString name = QString::fromStdString(counter.name());
+                    addDetail(details,
+                              tr("created the %1 counter (%2).")
+                                  .arg(name.isEmpty() ? tr("new") : name, QString::number(counter.count())),
+                              tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::SET_COUNTER: {
+                    const Event_SetCounter &setCounter = event.GetExtension(Event_SetCounter::ext);
+                    const QString name = counterName(eventPlayerId, setCounter.counter_id());
+                    addDetail(details,
+                              tr("set %1 to %2.")
+                                  .arg(name.isEmpty() ? tr("a counter") : tr("the %1 counter").arg(name),
+                                       QString::number(setCounter.value())),
+                              tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::DEL_COUNTER: {
+                    const Event_DelCounter &delCounter = event.GetExtension(Event_DelCounter::ext);
+                    const QString name = counterName(eventPlayerId, delCounter.counter_id());
+                    counterNames.remove(counterKey(eventPlayerId, delCounter.counter_id()));
+                    addDetail(details,
+                              tr("removed %1.").arg(name.isEmpty() ? tr("a counter") : tr("the %1 counter").arg(name)),
+                              tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::DUMP_ZONE: {
+                    const Event_DumpZone &dumpZone = event.GetExtension(Event_DumpZone::ext);
+                    const QString zoneOwnerPhrase = zonePhrase(
+                        dumpZone.zone_owner_id(), QString::fromStdString(dumpZone.zone_name()), eventPlayerId);
+                    if (dumpZone.number_cards() < 0) {
+                        addDetail(details, tr("looked at %1.").arg(zoneOwnerPhrase), tr("LOOK"),
+                                  ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    } else {
+                        addDetail(details,
+                                  tr("looked at %1 from %2.")
+                                      .arg(formatCardList(QStringList(), dumpZone.number_cards()), zoneOwnerPhrase),
+                                  tr("LOOK"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    }
+                    break;
+                }
+                case GameEvent::CHANGE_ZONE_PROPERTIES: {
+                    const Event_ChangeZoneProperties &changeZone = event.GetExtension(Event_ChangeZoneProperties::ext);
+                    const QString zone = QString::fromStdString(changeZone.zone_name());
+                    QStringList changes;
+                    if (changeZone.always_reveal_top_card()) {
+                        changes.append(tr("top card revealed to all"));
+                    }
+                    if (changeZone.always_look_at_top_card()) {
+                        changes.append(tr("top card visible to its owner"));
+                    }
+                    addDetail(
+                        details,
+                        changes.isEmpty()
+                            ? tr("changed the properties of %1.").arg(zonePhrase(eventPlayerId, zone, eventPlayerId))
+                            : tr("changed %1: %2.")
+                                  .arg(zonePhrase(eventPlayerId, zone, eventPlayerId),
+                                       changes.join(QStringLiteral(", "))),
+                        tr("ZONE"), ReplayEventKind::Action, eventPlayerId, forcedByJudge);
+                    break;
+                }
+                case GameEvent::GAME_LOG_NOTICE: {
+                    const Event_GameLogNotice &notice = event.GetExtension(Event_GameLogNotice::ext);
+                    switch (notice.notice_type()) {
+                        case Event_GameLogNotice::UNDO_DRAW_FAILED:
+                            addDetail(details, tr("failed to undo a draw."), tr("NOTICE"), ReplayEventKind::System,
+                                      eventPlayerId, forcedByJudge);
+                            break;
+                        default:
+                            addDetail(details, tr("A game notice was logged."), tr("NOTICE"), ReplayEventKind::System,
+                                      -1, forcedByJudge);
+                            break;
+                    }
+                    break;
+                }
+                case GameEvent::CREATE_ARROW:
+                case GameEvent::DELETE_ARROW:
+                    // Arrows are transient visual annotations and would make the history very noisy.
+                    break;
+                default:
+                    addDetail(details, tr("Unrecognized game event."), tr("EVENT"), ReplayEventKind::Action,
+                              eventPlayerId, forcedByJudge);
+                    break;
+            }
+        }
+
+        return details;
+    }
+};
+} // namespace
+
+QList<ReplayEventEntry> buildReplayEventEntries(const GameReplay *replay, const QList<int> &timeline)
+{
+    if (!replay) {
+        return {};
+    }
+
+    return ReplayEventIndexBuilder(replay, timeline).build();
+}
diff --git a/cockatrice/src/interface/widgets/replay/replay_event_index.h b/cockatrice/src/interface/widgets/replay/replay_event_index.h
new file mode 100644
index 000000000..40f72a965
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_event_index.h
@@ -0,0 +1,43 @@
+#ifndef COCKATRICE_REPLAY_EVENT_INDEX_H
+#define COCKATRICE_REPLAY_EVENT_INDEX_H
+
+#include <QList>
+#include <QString>
+
+class GameReplay;
+
+enum class ReplayEventKind
+{
+    Action,
+    Turn,
+    Phase,
+    Chat,
+    System
+};
+
+/**
+ * @brief One user-visible entry in the replay history sidebar.
+ *
+ * The event index refers to the corresponding GameEventContainer in the replay. It is used to seek the replay to that
+ * container.
+ */
+struct ReplayEventEntry
+{
+    int eventIndex = -1;
+    int timeMs = 0;
+    QString timeLabel;
+    QString actor;
+    QString badge;
+    QString detail;
+    ReplayEventKind kind = ReplayEventKind::Action;
+};
+
+/**
+ * @brief Builds a compact, human-readable index of the events in a replay.
+ *
+ * The returned entries copy all the data they need, so the caller does not need to keep the replay object alive after
+ * this function returns.
+ */
+QList<ReplayEventEntry> buildReplayEventEntries(const GameReplay *replay, const QList<int> &timeline);
+
+#endif // COCKATRICE_REPLAY_EVENT_INDEX_H
diff --git a/cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp b/cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp
new file mode 100644
index 000000000..b5fab2794
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp
@@ -0,0 +1,284 @@
+#include "replay_event_sidebar.h"
+
+#include "replay_event_index.h"
+
+#include <QAbstractItemView>
+#include <QFontMetrics>
+#include <QFrame>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPainter>
+#include <QPalette>
+#include <QStyle>
+#include <QStyledItemDelegate>
+#include <QVBoxLayout>
+#include <algorithm>
+#include <libcockatrice/utility/qt_utils.h>
+
+namespace
+{
+enum ItemDataRole
+{
+    EventIndexRole = Qt::UserRole + 1,
+    TimeLabelRole,
+    KindRole,
+    ActorRole,
+    BadgeRole,
+    DetailRole
+};
+
+QColor accentForKind(ReplayEventKind kind, const QPalette &palette)
+{
+    switch (kind) {
+        case ReplayEventKind::Turn:
+            return QColor(0x4c, 0xaf, 0x50);
+        case ReplayEventKind::Phase:
+            return QColor(0x42, 0xa5, 0xf5);
+        case ReplayEventKind::Chat:
+            return QColor(0xff, 0xb3, 0x00);
+        case ReplayEventKind::System:
+            return palette.mid().color();
+        case ReplayEventKind::Action:
+        default:
+            return palette.highlight().color();
+    }
+}
+
+class ReplayEventDelegate : public QStyledItemDelegate
+{
+public:
+    explicit ReplayEventDelegate(QObject *parent) : QStyledItemDelegate(parent)
+    {
+    }
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
+    {
+        painter->save();
+        painter->setRenderHint(QPainter::Antialiasing, true);
+
+        const QPalette &palette = option.palette;
+        const bool selected = option.state.testFlag(QStyle::State_Selected);
+        const bool hovered = option.state.testFlag(QStyle::State_MouseOver);
+        const auto kind = static_cast<ReplayEventKind>(index.data(KindRole).toInt());
+        const QColor accent = accentForKind(kind, palette);
+
+        const QRect card = option.rect.adjusted(4, 2, -4, -2);
+        QColor cardBackground = selected ? palette.highlight().color() : palette.base().color();
+        if (!selected && hovered) {
+            cardBackground = palette.alternateBase().color();
+        }
+
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(cardBackground);
+        painter->drawRoundedRect(card, 6, 6);
+
+        QColor borderColor = selected ? palette.highlightedText().color() : palette.mid().color();
+        borderColor.setAlpha(selected ? 100 : 130);
+        painter->setBrush(Qt::NoBrush);
+        painter->setPen(QPen(borderColor, 1));
+        painter->drawRoundedRect(card.adjusted(0, 0, -1, -1), 6, 6);
+
+        QColor accentColor = accent;
+        if (selected) {
+            accentColor = palette.highlightedText().color();
+            accentColor.setAlpha(210);
+        }
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(accentColor);
+        painter->drawRoundedRect(QRect(card.left() + 7, card.top() + 7, 3, card.height() - 14), 1.5, 1.5);
+
+        const QColor textColor = selected ? palette.highlightedText().color() : palette.text().color();
+        QColor mutedColor = textColor;
+        mutedColor.setAlpha(170);
+
+        QFont timeFont = option.font;
+        timeFont.setBold(true);
+        timeFont.setPointSizeF(qMax(7.0, timeFont.pointSizeF() * 0.9));
+
+        QFont actorFont = option.font;
+        actorFont.setBold(true);
+
+        QFont badgeFont = option.font;
+        badgeFont.setBold(true);
+        badgeFont.setPointSizeF(qMax(6.5, badgeFont.pointSizeF() * 0.72));
+
+        QFont detailFont = option.font;
+        detailFont.setPointSizeF(qMax(7.0, detailFont.pointSizeF() * 0.95));
+
+        const QFontMetrics timeMetrics(timeFont);
+        const QFontMetrics actorMetrics(actorFont);
+        const QFontMetrics badgeMetrics(badgeFont);
+        const QFontMetrics detailMetrics(detailFont);
+
+        const int contentLeft = card.left() + 15;
+        const int contentRight = card.right() - 10;
+        const int topRowTop = card.top() + 6;
+        const int topRowHeight = qMax(timeMetrics.height(), badgeMetrics.height()) + 2;
+
+        const QString timeText = index.data(TimeLabelRole).toString();
+        const QString actorText = index.data(ActorRole).toString();
+        const QString badgeText = index.data(BadgeRole).toString();
+        const QString detailText = index.data(DetailRole).toString();
+
+        const int timeWidth = timeMetrics.horizontalAdvance(timeText);
+        painter->setFont(timeFont);
+        painter->setPen(mutedColor);
+        painter->drawText(QRect(contentLeft, topRowTop, timeWidth + 2, topRowHeight), Qt::AlignLeft | Qt::AlignVCenter,
+                          timeText);
+
+        int actorRight = contentRight;
+        if (!badgeText.isEmpty()) {
+            const int badgeWidth = badgeMetrics.horizontalAdvance(badgeText) + 10;
+            const int badgeHeight = badgeMetrics.height() + 2;
+            const QRect badgeRect(contentRight - badgeWidth, topRowTop + (topRowHeight - badgeHeight) / 2, badgeWidth,
+                                  badgeHeight);
+
+            QColor badgeBackground = accentColor;
+            badgeBackground.setAlpha(selected ? 45 : 32);
+            painter->setPen(Qt::NoPen);
+            painter->setBrush(badgeBackground);
+            painter->drawRoundedRect(badgeRect, 3, 3);
+
+            painter->setFont(badgeFont);
+            painter->setPen(accentColor);
+            painter->drawText(badgeRect, Qt::AlignCenter, badgeText);
+
+            actorRight = badgeRect.left() - 8;
+        }
+
+        const int actorLeft = contentLeft + timeWidth + 10;
+        if (actorRight > actorLeft) {
+            const QString elidedActor =
+                actorMetrics.elidedText(actorText, Qt::ElideRight, qMax(0, actorRight - actorLeft));
+            painter->setFont(actorFont);
+            painter->setPen(textColor);
+            painter->drawText(QRect(actorLeft, topRowTop, actorRight - actorLeft, topRowHeight),
+                              Qt::AlignLeft | Qt::AlignVCenter, elidedActor);
+        }
+
+        const int detailTop = topRowTop + topRowHeight + 2;
+        const int detailHeight = qMax(detailMetrics.height(), card.bottom() - detailTop);
+        const QString elidedDetail =
+            detailMetrics.elidedText(detailText, Qt::ElideRight, qMax(0, contentRight - contentLeft));
+        painter->setFont(detailFont);
+        painter->setPen(textColor);
+        painter->drawText(QRect(contentLeft, detailTop, contentRight - contentLeft, detailHeight),
+                          Qt::AlignLeft | Qt::AlignVCenter, elidedDetail);
+
+        painter->restore();
+    }
+
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const override
+    {
+        const QFontMetrics metrics(option.font);
+        return {0, qMax(58, metrics.height() * 3 + 10)};
+    }
+};
+} // namespace
+
+ReplayEventSidebar::ReplayEventSidebar(QWidget *parent, const GameReplay *replay, const QList<int> &timeline)
+    : QWidget(parent), eventList(new QListWidget(this)), emptyLabel(new QLabel(this))
+{
+    setObjectName("replayEventSidebar");
+
+    eventList->setObjectName("replayEventList");
+    eventList->setItemDelegate(new ReplayEventDelegate(eventList));
+    eventList->setFrameShape(QFrame::NoFrame);
+    eventList->setFocusPolicy(Qt::NoFocus);
+    eventList->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    eventList->setSelectionMode(QAbstractItemView::SingleSelection);
+    eventList->setMouseTracking(true);
+    eventList->setUniformItemSizes(true);
+    eventList->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+
+    emptyLabel->setAlignment(Qt::AlignCenter);
+    emptyLabel->setWordWrap(true);
+    emptyLabel->setMargin(16);
+    emptyLabel->setForegroundRole(QPalette::PlaceholderText);
+
+    auto *layout = QtUtils::makeLayout<QVBoxLayout>(this);
+    layout->addWidget(eventList);
+    layout->addWidget(emptyLabel);
+
+    const QList<ReplayEventEntry> entries = buildReplayEventEntries(replay, timeline);
+    eventIndices.reserve(entries.size());
+
+    for (const ReplayEventEntry &entry : entries) {
+        auto *item = new QListWidgetItem(eventList);
+        item->setData(EventIndexRole, entry.eventIndex);
+        item->setData(TimeLabelRole, entry.timeLabel);
+        item->setData(KindRole, static_cast<int>(entry.kind));
+        item->setData(ActorRole, entry.actor);
+        item->setData(BadgeRole, entry.badge);
+        item->setData(DetailRole, entry.detail);
+        const QString tooltip = entry.actor.isEmpty()
+                                    ? tr("%1\n%2").arg(entry.timeLabel, entry.detail)
+                                    : tr("%1 · %2\n%3").arg(entry.timeLabel, entry.actor, entry.detail);
+        item->setToolTip(tooltip);
+        item->setData(Qt::AccessibleTextRole, entry.actor.isEmpty()
+                                                  ? tr("%1: %2").arg(entry.timeLabel, entry.detail)
+                                                  : tr("%1, %2: %3").arg(entry.timeLabel, entry.actor, entry.detail));
+        eventIndices.append(entry.eventIndex);
+    }
+
+    const bool hasEvents = !entries.isEmpty();
+    eventList->setVisible(hasEvents);
+    emptyLabel->setVisible(!hasEvents);
+    emptyLabel->setText(tr("No game events in this replay."));
+
+    connect(eventList, &QListWidget::itemClicked, this, [this](QListWidgetItem *item) {
+        if (!item) {
+            return;
+        }
+
+        setCurrentRow(eventList->row(item));
+        emit eventSelected(item->data(EventIndexRole).toInt());
+    });
+
+    if (hasEvents) {
+        setCurrentRow(-1);
+    }
+}
+
+void ReplayEventSidebar::setCurrentEvent(int eventIndex)
+{
+    if (eventIndices.isEmpty()) {
+        setCurrentRow(-1);
+        return;
+    }
+
+    // The rows hold a subset of the replay's events, in playback order, so the last row at or before eventIndex is the
+    // one the game state has reached. An eventIndex of -1 (nothing replayed yet) selects no row.
+    const auto it = std::upper_bound(eventIndices.cbegin(), eventIndices.cend(), eventIndex);
+    const int row = static_cast<int>(it - eventIndices.cbegin()) - 1;
+    setCurrentRow(row);
+}
+
+void ReplayEventSidebar::setCurrentRow(int row)
+{
+    if (row < 0 || row >= eventList->count()) {
+        row = -1;
+    }
+
+    if (row >= 0) {
+        // The view's current index also moves on mouse press and can be deselected by a ctrl-click,
+        // so the cached row alone cannot tell whether the view is already in the desired state.
+        const QListWidgetItem *item = eventList->item(row);
+        if (row == eventList->currentRow() && item && item->isSelected()) {
+            return;
+        }
+    } else if (row == currentRow) {
+        return;
+    }
+
+    currentRow = row;
+    eventList->setCurrentRow(currentRow);
+
+    if (currentRow >= 0) {
+        QListWidgetItem *item = eventList->item(currentRow);
+        if (!eventList->viewport()->rect().contains(eventList->visualItemRect(item))) {
+            eventList->scrollToItem(item, QAbstractItemView::PositionAtCenter);
+        }
+    }
+}
diff --git a/cockatrice/src/interface/widgets/replay/replay_event_sidebar.h b/cockatrice/src/interface/widgets/replay/replay_event_sidebar.h
new file mode 100644
index 000000000..ee163356e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_event_sidebar.h
@@ -0,0 +1,50 @@
+#ifndef COCKATRICE_REPLAY_EVENT_SIDEBAR_H
+#define COCKATRICE_REPLAY_EVENT_SIDEBAR_H
+
+#include <QList>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class GameReplay;
+class QLabel;
+class QListWidget;
+
+/**
+ * @brief A scrollable list of replay events that can be used to seek the replay.
+ *
+ * The sidebar copies the event data it needs at construction time. It does not keep a reference to the replay or to
+ * the replay manager.
+ */
+class ReplayEventSidebar : public QWidget
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @param parent The parent widget
+     * @param replay The replay to build the event list from
+     * @param timeline Event index to time in milliseconds, as used by ReplayManager
+     */
+    ReplayEventSidebar(QWidget *parent, const GameReplay *replay, const QList<int> &timeline);
+
+public slots:
+    /**
+     * @brief Highlights the row of the event the game state has reached.
+     *
+     * @param eventIndex Index into the replay's event list, or -1 when nothing has been replayed yet
+     */
+    void setCurrentEvent(int eventIndex);
+
+signals:
+    void eventSelected(int eventIndex);
+
+private:
+    void setCurrentRow(int row);
+
+    QListWidget *eventList;
+    QLabel *emptyLabel;
+    QList<int> eventIndices; ///< Replay event index of each row, ascending
+    int currentRow = -1;
+};
+
+#endif // COCKATRICE_REPLAY_EVENT_SIDEBAR_H
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
index f3f1da2c4..b01d7f9d6 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
@@ -1,13 +1,13 @@
 #include "replay_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/player/event_processing_options.h"
 #include "libcockatrice/protocol/pb/game_event.pb.h"
 #include "libcockatrice/protocol/pb/game_event_container.pb.h"
 #include "libcockatrice/protocol/pb/game_replay.pb.h"
 
 #include <QTimer>
 #include <algorithm>
+#include <libcockatrice/game/player/event_processing_options.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <qnumeric.h>
@@ -57,7 +57,7 @@ ReplayManager::ReplayManager(QObject *parent, GameReplay *replay)
 
     rewindBufferingTimer = new QTimer(this);
     rewindBufferingTimer->setSingleShot(true);
-    connect(rewindBufferingTimer, &QTimer::timeout, this, &ReplayManager::processRewind);
+    connect(rewindBufferingTimer, &QTimer::timeout, this, [this] { processRewind(); });
 }
 
 ReplayManager::~ReplayManager()
@@ -65,7 +65,7 @@ ReplayManager::~ReplayManager()
     delete replay;
 }
 
-void ReplayManager::skipToTime(int newTime, bool doRewindBuffering)
+void ReplayManager::skipToTime(int newTime, bool doRewindBuffering, bool includeEventsAtTime)
 {
     // check boundary conditions
     if (newTime < 0) {
@@ -75,15 +75,17 @@ void ReplayManager::skipToTime(int newTime, bool doRewindBuffering)
         newTime = maxTime;
     }
 
-    newTime -= newTime % TIMER_INTERVAL_MS; // Time should always be a multiple of the interval
+    if (!includeEventsAtTime) {
+        newTime -= newTime % TIMER_INTERVAL_MS; // Time should always be a multiple of the interval
+    }
 
     const bool isBackwardsSkip = newTime < currentProcessedTime;
     currentVisualTime = newTime;
 
     if (isBackwardsSkip) {
-        handleBackwardsSkip(doRewindBuffering);
+        handleBackwardsSkip(doRewindBuffering, includeEventsAtTime);
     } else {
-        processNewEvents(FORWARD_SKIP);
+        processNewEvents(FORWARD_SKIP, includeEventsAtTime);
     }
 
     timeChanged(currentVisualTime);
@@ -95,7 +97,7 @@ void ReplayManager::skipToTime(int newTime, bool doRewindBuffering)
  * @param doRewindBuffering When true, if multiple backward skips are made in quick succession, only a single rewind
  * is processed at the end. When false, the backwards skip will always cause an immediate rewind.
  */
-void ReplayManager::handleBackwardsSkip(bool doRewindBuffering)
+void ReplayManager::handleBackwardsSkip(bool doRewindBuffering, bool includeEventsAtTime)
 {
     if (doRewindBuffering) {
         // We use a one-shot timer to implement the rewind buffering.
@@ -105,11 +107,11 @@ void ReplayManager::handleBackwardsSkip(bool doRewindBuffering)
         rewindBufferingTimer->start(SettingsCache::instance().userInterface().getRewindBufferingMs());
     } else {
         // otherwise, process the rewind immediately
-        processRewind();
+        processRewind(includeEventsAtTime);
     }
 }
 
-void ReplayManager::processRewind()
+void ReplayManager::processRewind(bool includeEventsAtTime)
 {
     // stop any queued-up rewinds
     rewindBufferingTimer->stop();
@@ -117,7 +119,7 @@ void ReplayManager::processRewind()
     // process the rewind
     currentEvent = 0;
     emit rewound();
-    processNewEvents(BACKWARD_SKIP);
+    processNewEvents(BACKWARD_SKIP, includeEventsAtTime);
 }
 
 void ReplayManager::replayTimerTimeout()
@@ -134,11 +136,13 @@ void ReplayManager::replayTimerTimeout()
 }
 
 /** @brief Processes all unprocessed events up to the current time. */
-void ReplayManager::processNewEvents(PlaybackMode playbackMode)
+void ReplayManager::processNewEvents(PlaybackMode playbackMode, bool includeEventsAtTime)
 {
     currentProcessedTime = currentVisualTime;
 
-    while (currentEvent < replayTimeline.size() && replayTimeline[currentEvent] < currentProcessedTime) {
+    while (currentEvent < replayTimeline.size() &&
+           (replayTimeline[currentEvent] < currentProcessedTime ||
+            (includeEventsAtTime && replayTimeline[currentEvent] == currentProcessedTime))) {
         EventProcessingOptions options;
 
         // backwards skip => always skip reveal windows
@@ -236,6 +240,24 @@ void ReplayManager::setTime(int time)
     skipToTime(time, false);
 }
 
+void ReplayManager::setTimeToEvent(int eventIndex)
+{
+    if (eventIndex < 0 || eventIndex >= replayTimeline.size()) {
+        return;
+    }
+
+    // Flush a pending buffered rewind before seeking, otherwise its timer fires after this seek and rebuilds the
+    // replay state from an outdated currentVisualTime, dropping the event we seek to. Stopping the timer instead
+    // of processing it is not enough: playback ticks advance currentProcessedTime without rewinding currentEvent,
+    // so the board could still be ahead of the target.
+    if (rewindBufferingTimer->isActive()) {
+        processRewind();
+    }
+
+    // Unlike a timeline seek, jumping to an event should apply that event immediately.
+    skipToTime(replayTimeline.at(eventIndex), false, true);
+}
+
 void ReplayManager::skipByAmount(int amount)
 {
     skipToTime(currentVisualTime + amount, amount < 0);
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h
index 3b33deada..e3745778e 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.h
@@ -1,11 +1,10 @@
 #ifndef COCKATRICE_REPLAY_MANAGER_H
 #define COCKATRICE_REPLAY_MANAGER_H
 
-#include "../../../game/player/event_processing_options.h"
-
 #include <QList>
 #include <QObject>
 #include <QtGlobal>
+#include <libcockatrice/game/player/event_processing_options.h>
 #include <qtmetamacros.h>
 
 class GameReplay;
@@ -41,10 +40,10 @@ class ReplayManager : public QObject
                                   ///< to rewind buffering
     int currentEvent = 0;         ///< current event's index
 
-    void skipToTime(int newTime, bool doRewindBuffering);
-    void handleBackwardsSkip(bool doRewindBuffering);
-    void processRewind();
-    void processNewEvents(PlaybackMode playbackMode);
+    void skipToTime(int newTime, bool doRewindBuffering, bool includeEventsAtTime = false);
+    void handleBackwardsSkip(bool doRewindBuffering, bool includeEventsAtTime = false);
+    void processRewind(bool includeEventsAtTime = false);
+    void processNewEvents(PlaybackMode playbackMode, bool includeEventsAtTime = false);
     void handleSkipEmptySection();
 
 private slots:
@@ -67,6 +66,16 @@ public:
         return replayTimeline;
     }
 
+    /**
+     * @brief Index of the last event the game state has processed.
+     *
+     * @return The event index, or -1 while no event has been replayed yet
+     */
+    [[nodiscard]] int getLastProcessedEventIndex() const
+    {
+        return currentEvent - 1;
+    }
+
     void setTimeScaleFactor(qreal _timeScaleFactor);
     void setSkipEmptySections(bool value);
 
@@ -74,6 +83,7 @@ public slots:
     void startReplay();
     void stopReplay();
     void setTime(int time);
+    void setTimeToEvent(int eventIndex);
     void skipByAmount(int amount); // use a negative amount to skip backwards
 
 signals:
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
index 07b4e72ce..e911bc0f9 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
@@ -19,6 +19,11 @@
 
 class GameReplay;
 
+int ReplayWidget::getLastProcessedEventIndex() const
+{
+    return replayManager->getLastProcessedEventIndex();
+}
+
 ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay)
     : QWidget(parent), replayPlayButton(nullptr), replayFastForwardButton(nullptr), aReplaySkipForward(nullptr),
       aReplaySkipBackward(nullptr), aReplaySkipForwardBig(nullptr), aReplaySkipBackwardBig(nullptr)
@@ -28,6 +33,7 @@ ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay)
     connect(replayManager, &ReplayManager::eventReplayed, this, &ReplayWidget::eventReplayed);
     connect(replayManager, &ReplayManager::replayFinished, this, &ReplayWidget::replayFinished);
     connect(replayManager, &ReplayManager::rewound, this, &ReplayWidget::rewound);
+    connect(replayManager, &ReplayManager::timeChanged, this, &ReplayWidget::timeChanged);
 
     // timeline widget
     timelineWidget = new ReplayTimelineWidget;
@@ -96,6 +102,16 @@ ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay)
     refreshShortcuts();
 }
 
+const QList<int> &ReplayWidget::getReplayTimeline() const
+{
+    return replayManager->getReplayTimeline();
+}
+
+void ReplayWidget::seekToEvent(int eventIndex)
+{
+    replayManager->setTimeToEvent(eventIndex);
+}
+
 void ReplayWidget::replayFinished()
 {
     replayPlayButton->setChecked(false);
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.h b/cockatrice/src/interface/widgets/replay/replay_widget.h
index 74aace570..cbb676288 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.h
@@ -8,9 +8,9 @@
 #ifndef REPLAY_WIDGET_H
 #define REPLAY_WIDGET_H
 
-#include "../../../game/player/event_processing_options.h"
-
+#include <QList>
 #include <QWidget>
+#include <libcockatrice/game/player/event_processing_options.h>
 #include <qtmetamacros.h>
 
 class ReplayManager;
@@ -36,8 +36,19 @@ public:
      */
     ReplayWidget(QWidget *parent, GameReplay *replay);
 
+    [[nodiscard]] const QList<int> &getReplayTimeline() const;
+
+    /**
+     * @brief Index of the last replay event the game state has processed, or -1 before the first event.
+     */
+    [[nodiscard]] int getLastProcessedEventIndex() const;
+
+public slots:
+    void seekToEvent(int eventIndex);
+
 signals:
     void rewound();
+    void timeChanged(int time);
     void eventReplayed(const GameEventContainer &cont, EventProcessingOptions options);
 
 private:
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
index 037a4a1e5..c57f65352 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -4,6 +4,7 @@
 #include "../../client/sound_engine.h"
 #include "../../interface/card_localization.h"
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_manager.h"
 #include "../../tabs/tab_supervisor.h"
 #include "../user/user_context_menu.h"
 #include "../user/user_list_manager.h"
@@ -63,6 +64,9 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho
 
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ChatView::adjustColorsToPalette);
 
+    applyChatFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &ChatView::applyChatFont);
+
     userContextMenu = new UserContextMenu(tabSupervisor, this, game);
     connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
 
@@ -108,6 +112,16 @@ void ChatView::adjustColorsToPalette()
     QTimer::singleShot(0, this, &ChatView::refreshBlockColors);
 }
 
+void ChatView::applyChatFont()
+{
+    // Family comes from the ChatLog theme role; the message char formats carry
+    // no family of their own, so they (and new content) follow the widget and
+    // document default fonts. Weights/italics stay caller-side as before.
+    const QFont chatFont = themeManager->appFont(AppFont::ChatLog);
+    setFont(chatFont);
+    document()->setDefaultFont(chatFont);
+}
+
 void ChatView::refreshBlockColors()
 {
     QTextDocument *doc = document();
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
index 3fa7224e5..a2e2f33dd 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
@@ -111,6 +111,7 @@ private slots:
     void openLink(const QUrl &link);
     void actMessageClicked();
     void adjustColorsToPalette();
+    void applyChatFont();
     void refreshBlockColors();
     void onScrollBarRangeChanged();
     void onScrollBarValueChanged(int value);
diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 2702a527d..468095adb 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@@ -1,7 +1,7 @@
 #include "game_selector.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
 #include "../interface/widgets/dialogs/dlg_filter_games.h"
 #include "../interface/widgets/tabs/tab_room.h"
@@ -130,10 +130,10 @@ GameSelector::GameSelector(AbstractClient *_client,
     }
 
     filterButton = new QPushButton;
-    filterButton->setIcon(themePixmap(QStringLiteral("icons/search")));
+    filterButton->setIcon(loadThemedIcon(QStringLiteral("icons/search")));
     connect(filterButton, &QPushButton::clicked, this, &GameSelector::actSetFilter);
     clearFilterButton = new QPushButton;
-    clearFilterButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
+    clearFilterButton->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch")));
     bool filtersSetToDefault = showFilters && gameListProxyModel->areFilterParametersSetToDefaults();
     clearFilterButton->setEnabled(!filtersSetToDefault);
     connect(clearFilterButton, &QPushButton::clicked, this, &GameSelector::actClearFilter);
@@ -266,9 +266,13 @@ void GameSelector::actCreate()
         return;
     }
 
-    DlgCreateGame dlg(room, room->getGameTypes(), this);
-    dlg.exec();
-    updateTitle();
+    // Heap-allocate the dialog: if this selector (or its room tab) is destroyed while the
+    // dialog is open, e.g. on server disconnect, Qt deletes its children. A stack-allocated
+    // child would then be deleted by Qt and crash.
+    auto *dlg = new DlgCreateGame(room, room->getGameTypes(), this);
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
+    connect(dlg, &QDialog::finished, this, &GameSelector::updateTitle);
+    dlg->open();
 }
 
 void GameSelector::checkResponse(const Response &response)
@@ -362,8 +366,9 @@ void GameSelector::customContextMenu(const QPoint &point)
         const ServerInfo_Game &gameInfo = gameListModel->getGame(index.data(Qt::UserRole).toInt());
         const QMap<int, QString> &gameTypes = gameListModel->getGameTypes().value(gameInfo.room_id());
 
-        DlgCreateGame dlg(gameInfo, gameTypes, this);
-        dlg.exec();
+        auto *dlg = new DlgCreateGame(gameInfo, gameTypes, this);
+        dlg->setAttribute(Qt::WA_DeleteOnClose);
+        dlg->open();
     });
 
     QAction copyLink(tr("Cop&y game link"));
diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp
index 315d51d9e..d33526bd1 100644
--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@@ -1,6 +1,7 @@
 #include "games_model.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../theme_icon.h"
 #include "../interface/pixel_map_generator.h"
 #include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "user/user_list_proxy.h"
@@ -85,7 +86,8 @@ const QString GamesModel::getGameCreatedString(const int secs)
 }
 
 GamesModel::GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent)
-    : QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes)
+    : QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes),
+      lockIcon(loadThemedIcon(QStringLiteral("icons/lock")))
 {
 }
 
@@ -185,10 +187,15 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
                     if (gameentry.share_decklists_on_load()) {
                         result.append(tr("open decklists"));
                     }
+                    if (gameentry.shuffle_players()) {
+                        result.append(tr("random turn order"));
+                    }
                     return result.join(", ");
                 }
                 case Qt::DecorationRole: {
-                    return gameentry.with_password() ? QIcon(LockPixmapGenerator::generatePixmap(13)) : QVariant();
+                    // One engine per model: it is palette- and theme-aware and
+                    // invalidates itself, so a repaint must not build a new one.
+                    return gameentry.with_password() ? lockIcon : QVariant();
                     case Qt::TextAlignmentRole:
                         return Qt::AlignLeft;
                     default:
diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h
index 9bf54b83a..62862417d 100644
--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ b/cockatrice/src/interface/widgets/server/games_model.h
@@ -5,6 +5,7 @@
 #include "game_type_map.h"
 
 #include <QAbstractTableModel>
+#include <QIcon>
 #include <QList>
 #include <QMap>
 #include <QModelIndex>
@@ -32,6 +33,7 @@ private:
     QList<ServerInfo_Game> gameList;  /**< List of games currently displayed. */
     QMap<int, QString> rooms;         /**< Map of room IDs to room names. */
     QMap<int, GameTypeMap> gameTypes; /**< Map of room IDs to available game types. */
+    QIcon lockIcon;                   /**< Themed lock for password-protected games. */
 
     static const int NUM_COLS = 8; /**< Number of columns in the table. */
 
diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
index c131c3cbf..c1db6138d 100644
--- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
@@ -1,6 +1,6 @@
 #include "remote_replay_list_tree_widget.h"
 
-#include "../../../pixel_map_generator.h"
+#include "../../../theme_icon.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 #include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
 
@@ -50,7 +50,7 @@ RemoteReplayList_TreeModel::RemoteReplayList_TreeModel(AbstractClient *_client,
     QFileIconProvider fip;
     dirIcon = fip.icon(QFileIconProvider::Folder);
     fileIcon = fip.icon(QFileIconProvider::File);
-    lockIcon = themePixmap(QStringLiteral("icons/lock"));
+    lockIcon = loadThemedIcon(QStringLiteral("icons/lock"));
 }
 
 RemoteReplayList_TreeModel::~RemoteReplayList_TreeModel()
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
index d84bd5804..6e8fd771a 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
@@ -12,7 +12,6 @@
 #include <QChar>
 #include <QMetaObject>
 #include <QPointer>
-#include <QRect>
 #include <QSize>
 #include <QStringList>
 #include <libcockatrice/card/database/card_database_manager.h>
@@ -66,27 +65,6 @@ void UserCardArtProvider::requestCardArt(const QString &userName, const QString
     processQueue();
 }
 
-QPixmap UserCardArtProvider::cropCardArt(const QPixmap &fullRes, const ExactCard &card)
-{
-    QPixmap source = fullRes;
-
-    // Sideways-layout cards (plane, siege/battle, split) store their landscape
-    // artwork rotated 90° inside a portrait frame. Rotate it upright first so
-    // the crop below lands on the horizontal art, mirroring the way
-    // CardInfoPictureWidget displays these cards.
-    const bool landscape = card.getInfo().getUiAttributes().landscapeOrientation;
-    source = CardArtUtils::rotateSidewaysLayoutArt(source, card);
-
-    const QSize sz = source.size();
-    const int marginX = sz.width() * 0.07;
-    const int topMargin = landscape ? sz.height() * 0.05 : sz.height() * 0.11;
-    const int bottomMargin = landscape ? sz.height() * 0.42 : sz.height() * 0.45;
-
-    const QRect artRect(marginX, topMargin, sz.width() - 2 * marginX, sz.height() - topMargin - bottomMargin);
-
-    return source.copy(artRect.intersected(source.rect()));
-}
-
 void UserCardArtProvider::insertIntoCache(const QString &key, const QPixmap &pixmap)
 {
     if (pixmap.isNull()) {
@@ -134,7 +112,7 @@ void UserCardArtProvider::processQueue()
 
         // Synchronous hit (already loaded/on disk)
         if (!fullRes.isNull()) {
-            insertIntoCache(key, cropCardArt(fullRes, card));
+            insertIntoCache(key, CardArtUtils::cropCardArt(fullRes, card));
             pending.remove(key);
 
             emit cardArtUpdated(userName);
@@ -158,7 +136,7 @@ void UserCardArtProvider::processQueue()
                             CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
 
                             if (!fullRes.isNull()) {
-                                self->insertIntoCache(key, self->cropCardArt(fullRes, card));
+                                self->insertIntoCache(key, CardArtUtils::cropCardArt(fullRes, card));
                             }
 
                             self->pending.remove(key);
@@ -172,4 +150,4 @@ void UserCardArtProvider::processQueue()
         // Stop here. We'll continue when the async load finishes.
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
index ce9225b00..a7844ca88 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
@@ -10,8 +10,6 @@
 #include <QString>
 #include <qtmetamacros.h>
 
-class ExactCard;
-
 class UserCardArtProvider : public QObject
 {
     Q_OBJECT
@@ -21,7 +19,6 @@ public:
 
     void requestCardArt(const QString &userName, const QString &cardName, const QString &providerId);
     const QMap<QString, QPixmap> &cache() const;
-    static QPixmap cropCardArt(const QPixmap &fullRes, const ExactCard &card);
 
 signals:
     void cardArtUpdated(const QString &userName);
diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
index f8b57cfc2..67fb57e78 100644
--- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
@@ -2,6 +2,7 @@
 
 #include "../../../card_picture_loader/card_picture_loader.h"
 #include "../../cards/art_crop_attribution.h"
+#include "../../cards/card_art_utils.h"
 #include "../../utility/completer_utils.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
@@ -10,7 +11,6 @@
 #include "libcockatrice/card/printing/exact_card.h"
 #include "libcockatrice/card/printing/printing_info.h"
 #include "libcockatrice/card/set/card_set.h"
-#include "user_card_art_provider.h"
 #include "user_list_painter.h"
 
 #include <QBrush>
@@ -580,7 +580,7 @@ void UserCardArtSettingsDialog::reloadPreview()
         return;
     }
 
-    currentPixmap = UserCardArtProvider::cropCardArt(fullRes, card);
+    currentPixmap = CardArtUtils::cropCardArt(fullRes, card);
     preview->setPixmap(currentPixmap);
     preview->setParams(currentParams);
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
index 0b5523f67..447e63673 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@@ -1,8 +1,5 @@
 #include "user_context_menu.h"
 
-#include "../../../../game/abstract_game.h"
-#include "../../../../game/game_event_handler.h"
-#include "../../../../game/game_meta_info.h"
 #include "../../dialogs/dlg_report_user.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
 #include "../chat_view/chat_view.h"
@@ -37,6 +34,9 @@
 #include <QTableWidget>
 #include <QTableWidgetItem>
 #include <QWidget>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_meta_info.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
diff --git a/cockatrice/src/interface/widgets/server/user/user_games_model.cpp b/cockatrice/src/interface/widgets/server/user/user_games_model.cpp
new file mode 100644
index 000000000..b7c728c45
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_games_model.cpp
@@ -0,0 +1,149 @@
+#include "user_games_model.h"
+
+#include <QVariant>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
+#include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
+#include <utility>
+
+UserGamesModel::UserGamesModel(AbstractClient *_client, int requestTimeoutMs, QObject *parent)
+    : QAbstractListModel(parent), client(_client)
+{
+    timeout.setSingleShot(true);
+    timeout.setInterval(requestTimeoutMs);
+    connect(&timeout, &QTimer::timeout, this, [this] {
+        invalidateRequest();
+        setState(State::Error);
+    });
+    connected = client->getStatus() == StatusLoggedIn;
+    connect(client, &AbstractClient::statusChanged, this, [this](ClientStatus status) {
+        // AbstractClient::setStatus emits this signal while holding the (non-recursive)
+        // status mutex, which getStatus() would try to lock again. Track the emitted
+        // value here, and read this cache from canRefresh() for the same reason.
+        connected = status == StatusLoggedIn;
+        if (!connected) {
+            invalidateRequest();
+            replaceGames({});
+            setState(online ? State::Disconnected : State::Offline);
+        } else if (online) {
+            refresh();
+        }
+    });
+    connect(client, &QObject::destroyed, this, [this] {
+        client = nullptr;
+        connected = false;
+        invalidateRequest();
+        replaceGames({});
+        setState(online ? State::Disconnected : State::Offline);
+    });
+}
+
+int UserGamesModel::rowCount(const QModelIndex &parent) const
+{
+    return parent.isValid() ? 0 : games.size();
+}
+
+QVariant UserGamesModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.model() != this || index.column() != 0 || index.row() < 0 ||
+        index.row() >= games.size() || role != GameRole) {
+        return {};
+    }
+    return QVariant::fromValue(games.at(index.row()));
+}
+
+void UserGamesModel::setUser(const QString &name, bool isOnline)
+{
+    userName = name;
+    online = isOnline;
+    refresh();
+}
+
+UserGamesModel::State UserGamesModel::getState() const
+{
+    return state;
+}
+
+bool UserGamesModel::canRefresh() const
+{
+    return online && !userName.isEmpty() && client && connected && state != State::Loading;
+}
+
+void UserGamesModel::invalidateRequest()
+{
+    ++requestGeneration;
+    // The client owns pending commands. Detach our interest without deleting
+    // an object that may already have moved to the client's thread.
+    disconnect(responseConnection);
+    responseConnection = {};
+    timeout.stop();
+}
+
+void UserGamesModel::replaceGames(QList<ServerInfo_Game> replacement)
+{
+    beginResetModel();
+    games = std::move(replacement);
+    endResetModel();
+}
+
+void UserGamesModel::setState(State newState)
+{
+    state = newState;
+    emit stateChanged();
+}
+
+void UserGamesModel::refresh()
+{
+    invalidateRequest();
+    const quint64 request = requestGeneration;
+    replaceGames({});
+    if (!online || userName.isEmpty()) {
+        setState(State::Offline);
+        return;
+    }
+    if (!client || !connected) {
+        setState(State::Disconnected);
+        return;
+    }
+
+    setState(State::Loading);
+    // State listeners may select another user or disconnect the client.
+    if (request != requestGeneration) {
+        return;
+    }
+
+    Command_GetGamesOfUser command;
+    command.set_user_name(userName.toStdString());
+    PendingCommand *pending = client->prepareSessionCommand(command);
+    responseConnection = connect(pending, &PendingCommand::finished, this,
+                                 [this, request](const Response &response) { finishRequest(response, request); });
+    timeout.start();
+    client->sendCommand(pending);
+}
+
+void UserGamesModel::finishRequest(const Response &response, quint64 request)
+{
+    if (request != requestGeneration) {
+        return;
+    }
+    invalidateRequest();
+    const quint64 completion = requestGeneration;
+    if (response.response_code() != Response::RespOk || !response.HasExtension(Response_GetGamesOfUser::ext)) {
+        setState(State::Error);
+        return;
+    }
+
+    const auto &result = response.GetExtension(Response_GetGamesOfUser::ext);
+    QList<ServerInfo_Game> replacement;
+    replacement.reserve(result.game_list_size());
+    for (const auto &game : result.game_list()) {
+        replacement.append(game);
+    }
+    replaceGames(std::move(replacement));
+    if (completion != requestGeneration) {
+        return;
+    }
+    setState(games.isEmpty() ? State::Empty : State::Ready);
+}
diff --git a/cockatrice/src/interface/widgets/server/user/user_games_model.h b/cockatrice/src/interface/widgets/server/user/user_games_model.h
new file mode 100644
index 000000000..b8ad71a67
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_games_model.h
@@ -0,0 +1,63 @@
+#ifndef COCKATRICE_USER_GAMES_MODEL_H
+#define COCKATRICE_USER_GAMES_MODEL_H
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QPointer>
+#include <QString>
+#include <QTimer>
+#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+
+class AbstractClient;
+class Response;
+
+/** Current user's games and the lifetime of the request that supplies them. */
+class UserGamesModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum class State
+    {
+        Offline,
+        Disconnected,
+        Loading,
+        Ready,
+        Empty,
+        Error
+    };
+    static constexpr int DefaultRequestTimeoutMs = 15000;
+    static constexpr int GameRole = Qt::UserRole + 10;
+
+    explicit UserGamesModel(AbstractClient *client,
+                            int requestTimeoutMs = DefaultRequestTimeoutMs,
+                            QObject *parent = nullptr);
+    int rowCount(const QModelIndex &parent = {}) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    void setUser(const QString &name, bool isOnline);
+    void refresh();
+    State getState() const;
+    bool canRefresh() const;
+
+signals:
+    void stateChanged();
+
+private:
+    void invalidateRequest();
+    void replaceGames(QList<ServerInfo_Game> replacement);
+    void finishRequest(const Response &response, quint64 request);
+    void setState(State newState);
+
+    QPointer<AbstractClient> client;
+    QString userName;
+    bool online = false;
+    bool connected = false;
+    State state = State::Offline;
+    QList<ServerInfo_Game> games;
+    quint64 requestGeneration = 0;
+    QMetaObject::Connection responseConnection;
+    QTimer timeout;
+};
+
+#endif // COCKATRICE_USER_GAMES_MODEL_H
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
index 4feb73538..997001c50 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
@@ -1,6 +1,7 @@
 #include "user_info_box.h"
 
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_manager.h"
 #include "../../interface/widgets/dialogs/dlg_edit_avatar.h"
 #include "../../interface/widgets/dialogs/dlg_edit_password.h"
 #include "../../interface/widgets/dialogs/dlg_edit_user.h"
@@ -32,7 +33,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/passwordhasher.h>
 #include <libcockatrice/utility/qt_utils.h>
 #include <string>
 #include <sys/types.h>
@@ -40,10 +40,8 @@
 UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags), client(_client), editable(_editable)
 {
-    QFont nameFont = nameLabel.font();
-    nameFont.setBold(true);
-    nameFont.setPointSizeF(nameFont.pointSizeF() * 1.5);
-    nameLabel.setFont(nameFont);
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &UserInfoBox::applyInterfaceDefaultFont);
 
     auto *userIconAndNameLayout = new QHBoxLayout;
     userIconAndNameLayout->addWidget(&userLevelIcon, 0, Qt::AlignCenter);
@@ -92,6 +90,16 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *paren
     retranslateUi();
 }
 
+void UserInfoBox::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the *1.5 size
+    // multiplier and bold weight stay caller-side as before.
+    QFont nameFont = themeManager->appFont(AppFont::InterfaceDefault);
+    nameFont.setBold(true);
+    nameFont.setPointSizeF(nameFont.pointSizeF() * 1.5);
+    nameLabel.setFont(nameFont);
+}
+
 void UserInfoBox::retranslateUi()
 {
     realNameLabel1.setText(tr("Real Name:"));
@@ -299,17 +307,7 @@ void UserInfoBox::actPassword()
 
 void UserInfoBox::changePassword(const QString &oldPassword, const QString &newPassword)
 {
-    Command_AccountPassword cmd;
-    cmd.set_old_password(oldPassword.toStdString());
-    if (client->getServerSupportsChallengeResponse()) {
-        cmd.set_hashed_new_password(PasswordHasher::generatePasswordVerifier(newPassword).toStdString());
-    } else if (client->getServerSupportsPasswordHash()) {
-        auto passwordSalt = PasswordHasher::generateRandomSalt();
-        QString hashedPassword = PasswordHasher::computeHash(newPassword, passwordSalt);
-        cmd.set_hashed_new_password(hashedPassword.toStdString());
-    } else {
-        cmd.set_new_password(newPassword.toStdString());
-    }
+    const Command_AccountPassword cmd = client->makeAccountPasswordCommand(oldPassword, newPassword);
 
     PendingCommand *pend = client->prepareSessionCommand(cmd);
     connect(pend, &PendingCommand::finished, this, &UserInfoBox::processPasswordResponse);
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.h b/cockatrice/src/interface/widgets/server/user/user_info_box.h
index 6bc571a37..98919b027 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h
@@ -48,6 +48,7 @@ private slots:
     void processEditResponse(const Response &r);
     void processPasswordResponse(const Response &r);
     void processAvatarResponse(const Response &r);
+    void applyInterfaceDefaultFont();
 
     void actEdit();
     void actEditInternal(const Response &r);
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
index d23ac63ba..2e864824c 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
@@ -29,19 +29,10 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
 
     ServersSettings &servers = SettingsCache::instance().servers();
 
-    int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
-
-    for (int i = 0; i < size; i++) {
-        QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
-        QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
-        QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
-        QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
-        QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
-        bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
-        QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
-
-        UserConnection_Information userInfo(_saveName, serverName, portNum, userName, pass, savePass, _site);
-        serverList.insert(_saveName, std::make_pair(serverName, userInfo));
+    for (const auto &entry : servers.getServers()) {
+        UserConnection_Information userInfo(entry.saveName, entry.host, entry.port, entry.username, entry.password,
+                                            entry.savePassword, entry.site);
+        serverList.insert(entry.saveName, std::make_pair(entry.host, userInfo));
     }
 
     return serverList;
@@ -53,28 +44,18 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
 
     ServersSettings &servers = SettingsCache::instance().servers();
 
-    int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
-    for (int i = 0; i < size; i++) {
-        QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
-
-        if (find != _saveName) {
+    for (const auto &entry : servers.getServers()) {
+        if (find != entry.saveName) {
             continue;
         }
 
-        QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
-        QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
-        QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
-        QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
-        bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
-        QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
-
-        _server.append(_saveName);
-        _server.append(serverName);
-        _server.append(portNum);
-        _server.append(userName);
-        _server.append(pass);
-        _server.append(savePass ? "1" : "0");
-        _server.append(_site);
+        _server.append(entry.saveName);
+        _server.append(entry.host);
+        _server.append(entry.port);
+        _server.append(entry.username);
+        _server.append(entry.password);
+        _server.append(entry.savePassword ? "1" : "0");
+        _server.append(entry.site);
         break;
     }
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
index efb3b2e31..4b4887bc4 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
@@ -6,10 +6,9 @@
 #include "../../interface/widgets/tabs/tab_supervisor.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
 #include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
 #include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "libcockatrice/protocol/pb/session_commands.pb.h"
+#include "user_games_model.h"
 #include "user_level.h"
 #include "user_list_painter.h"
 
@@ -34,6 +33,7 @@
 #include <QPainter>
 #include <QPainterPath>
 #include <QPen>
+#include <QPersistentModelIndex>
 #include <QPoint>
 #include <QPushButton>
 #include <QRect>
@@ -41,8 +41,6 @@
 #include <QSharedPointer>
 #include <QSize>
 #include <QSizePolicy>
-#include <QStandardItem>
-#include <QStandardItemModel>
 #include <QStringLiteral>
 #include <QStyle>
 #include <QStyleOptionViewItem>
@@ -52,8 +50,6 @@
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
-#include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/qt_utils.h>
 #include <qnumeric.h>
@@ -142,7 +138,8 @@ public:
         p->drawEllipse(QRectF(rect.left() + 9, rect.top() + (rect.height() - 8) / 2.0, 8, 8));
 
         // Game title (bold, elided)
-        QFont tf = option.font;
+        // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+        QFont tf = themeManager->appFont(AppFont::InterfaceDefault);
         tf.setBold(true);
         p->setFont(tf);
         p->setPen(pal.color(QPalette::Text));
@@ -154,7 +151,7 @@ public:
 
         // Player count
         const bool full = game.player_count() >= game.max_players();
-        p->setFont(option.font);
+        p->setFont(themeManager->appFont(AppFont::InterfaceDefault));
         p->setPen(full ? QColor(249, 115, 22) : pal.color(QPalette::Disabled, QPalette::Text));
         p->drawText(QRect(rect.right() - countW - 4, rect.top(), countW, rect.height()),
                     Qt::AlignVCenter | Qt::AlignRight,
@@ -323,7 +320,8 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *)
     const int tx = ax + AvatarSize + AvatarToTextGap;
     const int tw = rect.width() - tx - 8;
 
-    QFont nf = font();
+    // Family comes from the InterfaceDefault theme role; the *1.12 size and bold stay caller-side.
+    QFont nf = themeManager->appFont(AppFont::InterfaceDefault);
     nf.setBold(true);
     nf.setPointSizeF(nf.pointSizeF() * 1.12);
     p.setFont(nf);
@@ -352,7 +350,7 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *)
     }
 
     if (!badge.text.isEmpty()) {
-        QFont bf = font();
+        QFont bf = themeManager->appFont(AppFont::InterfaceDefault);
         bf.setPointSizeF(bf.pointSizeF() * 0.70);
         bf.setBold(true);
         p.setFont(bf);
@@ -369,7 +367,8 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *)
 
     // The painter font at this point depends on whether a badge was drawn
     // (badge font vs username font), so pin an explicit font for the pill.
-    p.setFont(font());
+    // Family follows the InterfaceDefault theme role like the rest of the popup chrome.
+    p.setFont(themeManager->appFont(AppFont::InterfaceDefault));
 
     // Only show the attribution when there is actually art on screen: on a
     // cache miss cardArt is null and the pill would float over the plain
@@ -398,6 +397,7 @@ UserInfoPopup::UserInfoPopup(TabSupervisor *_ts,
     // Restyle the popup chrome when the theme or its color scheme changes.
     if (themeManager) {
         connect(themeManager, &ThemeManager::themeChanged, this, &UserInfoPopup::applyTheme);
+        connect(themeManager, &ThemeManager::fontsChanged, this, &UserInfoPopup::applyTheme);
     }
 }
 
@@ -427,6 +427,7 @@ void UserInfoPopup::buildUi()
     refreshBtn = new QPushButton(QStringLiteral("↻"), this);
     refreshBtn->setFixedSize(20, 20);
     refreshBtn->setFlat(true);
+    refreshBtn->setToolTip(tr("Refresh games"));
     connect(refreshBtn, &QPushButton::clicked, this, &UserInfoPopup::refreshGames);
     gh->addWidget(refreshBtn);
     root->addLayout(gh);
@@ -437,7 +438,8 @@ void UserInfoPopup::buildUi()
     root->addWidget(gamesStatus);
 
     // Games list
-    gamesModel = new QStandardItemModel(this);
+    gamesModel = new UserGamesModel(client, UserGamesModel::DefaultRequestTimeoutMs, this);
+    connect(gamesModel, &UserGamesModel::stateChanged, this, &UserInfoPopup::updateGamesDisplay);
     gamesView = new QListView(this);
     gamesView->setModel(gamesModel);
     gamesView->setItemDelegate(new PopupGameDelegate(gamesView));
@@ -475,15 +477,24 @@ void UserInfoPopup::applyTheme()
 
     separator->setStyleSheet(QStringLiteral("color:%1; margin: 0 8px;").arg(colorStr(theme.border)));
 
-    gamesLabel->setStyleSheet(QStringLiteral("color:%1; font-size:11px; font-weight:bold; background:transparent;")
-                                  .arg(colorStr(theme.subText)));
+    gamesLabel->setStyleSheet(QStringLiteral("color:%1; background:transparent;").arg(colorStr(theme.subText)));
+    QFont gamesLabelFont = themeManager->appFont(AppFont::InterfaceDefault);
+    gamesLabelFont.setPixelSize(11);
+    gamesLabelFont.setWeight(QFont::Bold);
+    gamesLabel->setFont(gamesLabelFont);
 
-    refreshBtn->setStyleSheet(QStringLiteral("QPushButton{color:%1;border:none;font-size:14px;background:transparent;}"
+    refreshBtn->setStyleSheet(QStringLiteral("QPushButton{color:%1;border:none;background:transparent;}"
                                              "QPushButton:hover{color:%2;}")
                                   .arg(colorStr(theme.subText), colorStr(theme.text)));
+    QFont refreshFont = themeManager->appFont(AppFont::InterfaceDefault);
+    refreshFont.setPixelSize(14);
+    refreshBtn->setFont(refreshFont);
 
-    gamesStatus->setStyleSheet(QStringLiteral("color:%1; font-size:11px; padding:10px; background:transparent;")
-                                   .arg(colorStr(theme.statusText)));
+    gamesStatus->setStyleSheet(
+        QStringLiteral("color:%1; padding:10px; background:transparent;").arg(colorStr(theme.statusText)));
+    QFont statusFont = themeManager->appFont(AppFont::InterfaceDefault);
+    statusFont.setPixelSize(11);
+    gamesStatus->setFont(statusFont);
 
     gamesView->setStyleSheet(QStringLiteral("QListView{background:%1;border:none;}"
                                             "QListView::item:selected{background:%2;}")
@@ -491,9 +502,12 @@ void UserInfoPopup::applyTheme()
 
     closeBtn->setStyleSheet(
         QStringLiteral("QPushButton{background:%1;color:%2;"
-                       "border:none;border-radius:11px;font-size:10px;}"
+                       "border:none;border-radius:11px;}"
                        "QPushButton:hover{color:%3;background:%4;}")
             .arg(colorStr(theme.closeBg), colorStr(theme.subText), colorStr(theme.text), colorStr(theme.closeHover)));
+    QFont closeFont = themeManager->appFont(AppFont::InterfaceDefault);
+    closeFont.setPixelSize(10);
+    closeBtn->setFont(closeFont);
 
     header->update();
 }
@@ -508,13 +522,17 @@ static QPushButton *makeBtn(const QString &label, const QString &tip, QWidget *p
     b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     b->setStyleSheet(QStringLiteral("QPushButton{"
                                     "  background:%1;color:%2;border:1px solid %3;"
-                                    "  border-radius:4px;font-size:11px;padding:0 4px;"
+                                    "  border-radius:4px;padding:0 4px;"
                                     "}"
                                     "QPushButton:hover{background:%4;color:%5;}"
                                     "QPushButton:pressed{background:%6;}"
                                     "QPushButton:disabled{color:%7;border-color:%3;}")
                          .arg(colorStr(t.buttonBg), colorStr(t.text), colorStr(t.buttonBorder), colorStr(t.buttonHover),
                               colorStr(t.text), colorStr(t.buttonPressed), colorStr(t.buttonDisabled)));
+    // Family comes from the InterfaceDefault theme role; the 11px size stays caller-side.
+    QFont btnFont = themeManager->appFont(AppFont::InterfaceDefault);
+    btnFont.setPixelSize(11);
+    b->setFont(btnFont);
     return b;
 }
 
@@ -645,13 +663,21 @@ void UserInfoPopup::rebuildActionButtons(const ServerInfo_User &userInfo, bool o
 
 void UserInfoPopup::updateActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored)
 {
-    rebuildActionButtons(userInfo, online, isBuddy, isIgnored);
-    adjustSize();
+    currentUserInfo = userInfo;
+    currentBuddy = isBuddy;
+    currentIgnored = isIgnored;
+    if (currentOnline != online) {
+        setOnline(online);
+    } else {
+        refreshHeader();
+        rebuildActionButtons(userInfo, online, isBuddy, isIgnored);
+        adjustSize();
+    }
 }
 
 void UserInfoPopup::onGamesContextMenu(const QPoint &pos)
 {
-    const QModelIndex idx = gamesView->indexAt(pos);
+    const QPersistentModelIndex idx = gamesView->indexAt(pos);
     if (!idx.isValid()) {
         return;
     }
@@ -679,7 +705,7 @@ void UserInfoPopup::onGamesContextMenu(const QPoint &pos)
     }
 
     const QAction *chosen = menu.exec(gamesView->viewport()->mapToGlobal(pos));
-    if (!chosen) {
+    if (!chosen || !idx.isValid()) {
         return;
     }
 
@@ -716,6 +742,8 @@ void UserInfoPopup::showForUser(const QString &userName,
     currentUser = userName;
     currentUserInfo = userInfo;
     currentOnline = online;
+    currentBuddy = isBuddy;
+    currentIgnored = isIgnored;
 
     // Header
     refreshHeader();
@@ -723,88 +751,71 @@ void UserInfoPopup::showForUser(const QString &userName,
     // Actions
     rebuildActionButtons(userInfo, online, isBuddy, isIgnored);
 
-    // Games list reset
-    gamesModel->clear();
-    gamesView->hide();
-    gamesStatus->setText(tr("Loading games…"));
-    gamesStatus->show();
-
     // Close button, top right corner, above everything
     closeBtn->move(PopupWidth - closeBtn->width() - 6, 6);
     closeBtn->raise();
 
+    gamesModel->setUser(currentUser, currentOnline);
     adjustSize();
-    fetchGames();
 }
 
 // ── Games fetch ───────────────────────────────────────────────────────────────
 
 void UserInfoPopup::fetchGames()
 {
-    if (!client || currentUser.isEmpty()) {
-        return;
-    }
-
-    Command_GetGamesOfUser cmd;
-    cmd.set_user_name(currentUser.toStdString());
-
-    const QString snapshot = currentUser;
-    PendingCommand *pend = client->prepareSessionCommand(cmd);
-    connect(pend, &PendingCommand::finished, this,
-            [this, snapshot](const Response &r) { onGamesReceived(r, snapshot); });
-    client->sendCommand(pend);
+    gamesModel->refresh();
 }
 
-void UserInfoPopup::onGamesReceived(const Response &r, const QString &forUser)
+void UserInfoPopup::setOnline(bool online)
 {
-    if (forUser != currentUser) {
-        return; // stale response, different user showing now
-    }
-
-    gamesModel->clear();
-
-    if (r.response_code() != Response::RespOk) {
-        gamesStatus->setText(tr("Could not load games."));
-        gamesStatus->show();
-        gamesView->hide();
+    if (currentOnline == online) {
         return;
     }
+    currentOnline = online;
+    refreshHeader();
+    rebuildActionButtons(currentUserInfo, online, currentBuddy, currentIgnored);
+    gamesModel->setUser(currentUser, online);
+}
 
-    const auto &resp = r.GetExtension(Response_GetGamesOfUser::ext);
-    if (resp.game_list_size() == 0) {
-        gamesStatus->setText(tr("No active games."));
-        gamesStatus->show();
-        gamesView->hide();
-        return;
+void UserInfoPopup::updateGamesDisplay()
+{
+    refreshBtn->setEnabled(gamesModel->canRefresh());
+    const auto state = gamesModel->getState();
+    const bool ready = state == UserGamesModel::State::Ready;
+    gamesView->setVisible(ready);
+    gamesStatus->setVisible(!ready);
+
+    switch (state) {
+        case UserGamesModel::State::Offline:
+            gamesStatus->setText(tr("User is offline."));
+            break;
+        case UserGamesModel::State::Disconnected:
+            gamesStatus->setText(tr("Not connected to the server."));
+            break;
+        case UserGamesModel::State::Loading:
+            gamesStatus->setText(tr("Loading games…"));
+            break;
+        case UserGamesModel::State::Empty:
+            gamesStatus->setText(tr("No active games."));
+            break;
+        case UserGamesModel::State::Error:
+            gamesStatus->setText(tr("Could not load games."));
+            break;
+        case UserGamesModel::State::Ready: {
+            // Fit exactly to the number of visible rows, scroll when more than 5.
+            constexpr int rowH = 38; // must match PopupGameDelegate::sizeHint
+            constexpr int maxRows = 5;
+            const int count = gamesModel->rowCount();
+            gamesView->setFixedHeight(qMin(count, maxRows) * rowH + 2);
+            gamesView->setVerticalScrollBarPolicy(count > maxRows ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
+            break;
+        }
     }
-
-    for (int i = 0; i < resp.game_list_size(); ++i) {
-        auto *item = new QStandardItem;
-        item->setData(QVariant::fromValue(resp.game_list(i)), PopupRoles::GameData);
-        item->setEditable(false);
-        gamesModel->appendRow(item);
-    }
-
-    gamesStatus->hide();
-    gamesView->show();
-
-    // Fit exactly to the number of visible rows, scroll when more than 5
-    constexpr int rowH = 38; // must match PopupGameDelegate::sizeHint
-    constexpr int maxRows = 5;
-    const int count = gamesModel->rowCount();
-    const int visible = qMin(count, maxRows);
-    gamesView->setFixedHeight(visible * rowH + 2);
-    gamesView->setVerticalScrollBarPolicy(count > maxRows ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
-
     adjustSize();
 }
 
 void UserInfoPopup::refreshGames()
 {
-    gamesModel->clear();
-    gamesView->hide();
-    gamesStatus->setText(tr("Loading games…"));
-    gamesStatus->show();
     fetchGames();
 }
 
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
index f2a91d025..1af4ad0e1 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_USER_INFO_POPUP_H
 #define COCKATRICE_USER_INFO_POPUP_H
 
+#include "user_games_model.h"
 #include "user_list_painter.h"
 
 #include <QColor>
@@ -21,15 +22,13 @@ class QPushButton;
 class TabSupervisor;
 class QListView;
 class QPoint;
-class QStandardItemModel;
-class Response;
 template <class Key, class T> class QMap;
 
 // ── Roles ─────────────────────────────────────────────────────────────────────
 
 namespace PopupRoles
 {
-constexpr int GameData = Qt::UserRole + 10;
+constexpr int GameData = UserGamesModel::GameRole;
 }
 
 // Popup theme
@@ -143,6 +142,7 @@ public:
     void
     showForUser(const QString &userName, const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored);
     void fetchGames();
+    void setOnline(bool online);
 
     [[nodiscard]] QString getCurrentUser() const
     {
@@ -199,7 +199,7 @@ protected:
 
 private slots:
     void refreshGames();
-    void onGamesReceived(const Response &r, const QString &forUser);
+    void updateGamesDisplay();
     void onGamesContextMenu(const QPoint &pos);
 
 private:
@@ -218,6 +218,8 @@ private:
     QString currentUser;
     ServerInfo_User currentUserInfo;
     bool currentOnline = false;
+    bool currentBuddy = false;
+    bool currentIgnored = false;
     std::function<bool(const QString &userName)> gameInviteAvailable;
 
     UserInfoHeaderWidget *header;
@@ -225,7 +227,7 @@ private:
     QLabel *gamesLabel;
     QFrame *separator;
     QListView *gamesView;
-    QStandardItemModel *gamesModel;
+    UserGamesModel *gamesModel;
     QLabel *gamesStatus;
     QPushButton *closeBtn;
     QPushButton *refreshBtn;
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
index 08eaaaff7..acb91351b 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
@@ -1,6 +1,7 @@
 #include "user_list_painter.h"
 
 #include "../../interface/pixel_map_generator.h"
+#include "../../interface/theme_manager.h"
 #include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 
 #include <QAbstractScrollArea>
@@ -292,7 +293,9 @@ void UserListPainter::drawUserName(QPainter *painter,
                                    bool online,
                                    const Style &style)
 {
-    QFont nameFont = option.font;
+    Q_UNUSED(option);
+    // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+    QFont nameFont = themeManager->appFont(AppFont::InterfaceDefault);
     nameFont.setBold(true);
     painter->setFont(nameFont);
 
@@ -351,7 +354,9 @@ void UserListPainter::drawBadges(QPainter *painter,
         return;
     }
 
-    QFont badgeFont = option.font;
+    Q_UNUSED(option);
+    // Family comes from the InterfaceDefault theme role; the *0.68 size and bold stay caller-side.
+    QFont badgeFont = themeManager->appFont(AppFont::InterfaceDefault);
     badgeFont.setPointSizeF(badgeFont.pointSizeF() * 0.68);
     badgeFont.setBold(true);
     painter->setFont(badgeFont);
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
index a20b39b82..943b4d5de 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -519,6 +519,19 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
             userTree->viewport()->update();
             userTree->update();
         });
+        // Divider headers store their font on the item, so re-apply the role
+        // family here; the painter reads the role live and needs only the
+        // repaint below.
+        connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+            QFont dividerFont = themeManager->appFont(AppFont::InterfaceDefault);
+            dividerFont.setBold(true);
+            for (auto it = sectionItems.constBegin(); it != sectionItems.constEnd(); ++it) {
+                it.value()->setFont(0, dividerFont);
+                it.value()->setSizeHint(0, QSize(0, QFontMetrics(dividerFont).height() + 16));
+            }
+            userTree->viewport()->update();
+            userTree->update();
+        });
     }
 
     QVBoxLayout *vbox = new QVBoxLayout;
@@ -617,7 +630,14 @@ void UserListWidget::bind(UserListManager *mgr)
     connect(manager, &UserListManager::addedToIgnoreList, this, refreshCurrentPopup);
     connect(manager, &UserListManager::removedFromIgnoreList, this, refreshIfPopupOpen);
     connect(manager, &UserListManager::userJoinedOnline, this, refreshCurrentPopup);
-    connect(manager, &UserListManager::userLeftOnline, this, refreshIfPopupOpen);
+    connect(manager, &UserListManager::userLeftOnline, this, [this, refreshIfPopupOpen](const QString &name) {
+        // The online row may already have been removed; the pinned popup must
+        // still invalidate its games request and display the offline state.
+        if (userInfoPopup && userInfoPopup->getCurrentUser() == name) {
+            userInfoPopup->setOnline(false);
+        }
+        refreshIfPopupOpen(name);
+    });
 
     rebuild();
 }
@@ -1492,7 +1512,7 @@ QTreeWidgetItem *UserListWidget::createSectionItem(Section section)
     // They act as collapsible section headers once they have focus.
     divider->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 
-    QFont font = userTree->font();
+    QFont font = themeManager->appFont(AppFont::InterfaceDefault);
     font.setBold(true);
     divider->setFont(0, font);
     // A little taller than a plain text row so the header reads as a section
diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
index 31178ba4c..e90603858 100644
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
@@ -1,13 +1,14 @@
 #include "deck_editor_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../dialogs/path_safety_warning.h"
 #include "update/card_spoiler/spoiler_background_updater.h"
 
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QAction>
+#include <QCoreApplication>
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>
@@ -61,7 +62,7 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
     connect(mpSpoilerPathButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::spoilerPathButtonClicked);
 
     updateNowButton = new QPushButton;
-    updateNowButton->setFixedWidth(150);
+    updateNowButton->setMinimumWidth(150);
     connect(updateNowButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::updateSpoilers);
 
     // Update the GUI depending on if the box is ticked or not
@@ -79,19 +80,19 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
     }
 
     aAdd = new QAction(this);
-    aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    aAdd->setIcon(loadThemedIcon(QStringLiteral("icons/increment")));
     connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL);
 
     aEdit = new QAction(this);
-    aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil")));
+    aEdit->setIcon(loadThemedIcon(QStringLiteral("icons/pencil")));
     connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL);
 
     aRemove = new QAction(this);
-    aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    aRemove->setIcon(loadThemedIcon(QStringLiteral("icons/decrement")));
     connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL);
 
     aRateLimit = new QAction(this);
-    aRateLimit->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
+    aRateLimit->setIcon(loadThemedIcon(QStringLiteral("icons/settings")));
     connect(aRateLimit, &QAction::triggered, this, &DeckEditorSettingsPage::actAdjustRateLimit);
 
     auto *urlToolBar = new QToolBar;
@@ -120,12 +121,19 @@ DeckEditorSettingsPage::DeckEditorSettingsPage()
     lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0);
     lpSpoilerGrid->addWidget(updateNowButton, 2, 1);
     lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop);
+    infoOnSpoilersLabel.setWordWrap(true);
 
     // On a change to the checkbox, hide/un-hide the other fields
     connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance().downloads(),
             &DownloadSettings::setDownloadSpoilerStatus);
     connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled);
 
+    // The updater is application-owned and outlives this page, so a Settings page
+    // reopened mid-update must observe the operation that is still running.
+    if (auto *runningUpdater = SpoilerBackgroundUpdater::current()) {
+        observeSpoilerUpdater(runningUpdater);
+    }
+
     mpGeneralGroupBox = new QGroupBox;
     mpGeneralGroupBox->setLayout(lpGeneralGrid);
 
@@ -328,20 +336,60 @@ void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const
 
 void DeckEditorSettingsPage::updateSpoilers()
 {
-    // Disable the button so the user can only press it once at a time
-    updateNowButton->setDisabled(true);
-    updateNowButton->setText(tr("Updating..."));
+    if (spoilerUpdater) {
+        return;
+    }
+    // Application ownership lets either operation finish after settings closes.
+    // When disabled, the same button retries file removal and the local reload.
+    SpoilerBackgroundUpdater *sbu;
+    if (SettingsCache::instance().downloads().getDownloadSpoilersStatus()) {
+        sbu = new SpoilerBackgroundUpdater(QCoreApplication::instance(), true);
+        // Only an updater this page creates is retired by deleteLater: observation
+        // may attach to the stack-allocated launch updater, which must not be deleted.
+        connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, sbu, &QObject::deleteLater);
+    } else {
+        // deleteSpoilerFile() wires its own deleteLater.
+        sbu = SpoilerBackgroundUpdater::deleteSpoilerFile();
+    }
+    observeSpoilerUpdater(sbu);
+}
 
-    // Create a new SBU that will act as if the client was just reloaded
-    auto *sbu = new SpoilerBackgroundUpdater();
-    connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, this, &DeckEditorSettingsPage::unlockSettings);
-    connect(sbu, &SpoilerBackgroundUpdater::spoilersUpdatedSuccessfully, this, &DeckEditorSettingsPage::unlockSettings);
+void DeckEditorSettingsPage::observeSpoilerUpdater(SpoilerBackgroundUpdater *sbu)
+{
+    spoilerUpdater = sbu;
+    unlockSettings();
+    connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, this, [this, sbu] {
+        if (spoilerUpdater == sbu) {
+            spoilerUpdater.clear();
+            unlockSettings();
+        }
+    });
+    connect(sbu, &SpoilerBackgroundUpdater::spoilerUpdateFailed, this, [this, sbu](const QString &message) {
+        if (spoilerUpdater != sbu) {
+            return;
+        }
+        auto *notice = new QMessageBox(QMessageBox::Warning, tr("Spoiler update"), message, QMessageBox::Ok, this);
+        notice->setTextFormat(Qt::PlainText);
+        notice->setAttribute(Qt::WA_DeleteOnClose);
+        notice->open();
+    });
 }
 
 void DeckEditorSettingsPage::unlockSettings()
 {
-    updateNowButton->setDisabled(false);
-    updateNowButton->setText(tr("Update Spoilers"));
+    updateNowButton->setEnabled(!spoilerUpdater);
+    updateNowButton->setText(spoilerUpdater ? tr("Updating...")
+                             : SettingsCache::instance().downloads().getDownloadSpoilersStatus()
+                                 ? tr("Update Spoilers")
+                                 : tr("Reload Card Database"));
+    lastUpdatedLabel.setText(tr("Last Change") + ": " + getLastUpdateTime());
+    infoOnSpoilersLabel.setText(
+        SettingsCache::instance().downloads().getDownloadSpoilersStatus()
+            ? tr("Spoilers download automatically on launch") + "\n" +
+                  tr("Press the button to manually update without relaunching") + "\n\n" +
+                  tr("Updates continue if you close settings")
+            : tr("Spoilers are off. Reload Card Database removes any downloaded spoiler file and reloads your "
+                 "card data."));
 }
 
 QString DeckEditorSettingsPage::getLastUpdateTime()
@@ -379,12 +427,17 @@ void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput)
     mpSpoilerSavePathLineEdit->setEnabled(anInput);
     mpSpoilerPathButton->setEnabled(anInput);
     lastUpdatedLabel.setEnabled(anInput);
-    updateNowButton->setEnabled(anInput);
-    infoOnSpoilersLabel.setEnabled(anInput);
+    // The hint explains the button in both states, especially the disabled-state
+    // Reload Card Database action, so keep it readable while spoilers are off.
+    infoOnSpoilersLabel.setEnabled(true);
 
-    if (!anInput) {
-        SpoilerBackgroundUpdater::deleteSpoilerFile();
+    // Only react to the user disabling the setting. The constructor calls this to
+    // initialize the controls, and a leftover spoiler file is recovered through the
+    // Reload Card Database button rather than an unrequested reload on page open.
+    if (!anInput && sender() == &mcDownloadSpoilersCheckBox) {
+        observeSpoilerUpdater(SpoilerBackgroundUpdater::deleteSpoilerFile());
     }
+    unlockSettings();
 }
 
 void DeckEditorSettingsPage::retranslateUi()
@@ -394,13 +447,10 @@ void DeckEditorSettingsPage::retranslateUi()
     mcDownloadSpoilersCheckBox.setText(tr("Download Spoilers Automatically"));
     mcSpoilerSaveLabel.setText(tr("Spoiler Location:"));
     lastUpdatedLabel.setText(tr("Last Change") + ": " + getLastUpdateTime());
-    infoOnSpoilersLabel.setText(tr("Spoilers download automatically on launch") + "\n" +
-                                tr("Press the button to manually update without relaunching") + "\n\n" +
-                                tr("Do not close settings until manual update is complete"));
     picDownloadCheckBox.setText(tr("Download card pictures on the fly"));
     urlLinkLabel.setText(QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_PIC_URL).arg(tr("How to add a custom URL")));
     resetDownloadURLs.setText(tr("Reset Download URLs"));
-    updateNowButton->setText(tr("Update Spoilers"));
+    unlockSettings();
     aAdd->setText(tr("Add New URL"));
     aEdit->setText(tr("Edit URL"));
     aRemove->setText(tr("Remove URL"));
diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
index 47f840191..8e33e697d 100644
--- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
@@ -5,6 +5,7 @@
 
 #include <QCheckBox>
 #include <QLabel>
+#include <QPointer>
 #include <QPushButton>
 #include <QString>
 #include <qtmetamacros.h>
@@ -15,6 +16,7 @@ class QLineEdit;
 class QListWidget;
 class QListWidgetItem;
 class QModelIndex;
+class SpoilerBackgroundUpdater;
 
 class DeckEditorSettingsPage : public AbstractSettingsPage
 {
@@ -54,6 +56,7 @@ private:
     QLabel infoOnSpoilersLabel;
     QPushButton *mpSpoilerPathButton;
     QPushButton *updateNowButton;
+    QPointer<SpoilerBackgroundUpdater> spoilerUpdater;
 
     /** @brief Adds a list item for the given URL, storing the raw URL alongside its displayed label. */
     QListWidgetItem *addUrlItem(const QString &url);
@@ -66,6 +69,8 @@ private:
 
     /** @brief Refreshes the displayed label of every URL item after limits or settings change. */
     void refreshUrlItems();
+
+    void observeSpoilerUpdater(SpoilerBackgroundUpdater *updater);
 };
 
 #endif // COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
index 2b885237b..7b89b744d 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
@@ -8,7 +8,6 @@
 #include "update/client/release_channel.h"
 
 #include <QByteArray>
-#include <QCoreApplication>
 #include <QDate>
 #include <QDebug>
 #include <QFile>
@@ -22,7 +21,6 @@
 #include <QPushButton>
 #include <QSharedPointer>
 #include <QSizePolicy>
-#include <QTranslator>
 #include <QVBoxLayout>
 #include <QVariant>
 #include <QVariantList>
@@ -51,18 +49,24 @@ enum startupCardUpdateCheckBehaviorIndex
 GeneralSettingsPage::GeneralSettingsPage()
 {
     // language settings
-    QStringList languageCodes = findQmFiles();
-    for (const QString &code : languageCodes) {
-        QString langName = languageName(code);
-        languageBox.addItem(langName, code);
+    for (const QString &code : findQmFiles()) {
+        languageBox.addItem(TranslationLoader::languageDisplayName(code), code);
     }
 
-    QString setLanguage = QCoreApplication::translate("i18n", DEFAULT_LANG_NAME);
-    int index = languageBox.findText(setLanguage, Qt::MatchExactly);
-    if (index == -1) {
-        qWarning() << "could not find language" << setLanguage;
-    } else {
+    // Select the language the client runs with: its own entry, the base language for a variant without a
+    // file of its own (de_CH -> de), and the default language for an unset setting, which names no file.
+    const QString configuredLanguage = SettingsCache::instance().personal().getLang();
+    int index = languageBox.findData(configuredLanguage);
+    if (index < 0) {
+        index = languageBox.findData(configuredLanguage.section('_', 0, 0));
+    }
+    if (index < 0) {
+        index = languageBox.findData(TranslationLoader::defaultLanguageCode());
+    }
+    if (index >= 0) {
         languageBox.setCurrentIndex(index);
+    } else {
+        qCWarning(GeneralSettingsPageLog) << "could not find language" << configuredLanguage;
     }
 
     advertiseTranslationPageLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
@@ -96,12 +100,12 @@ GeneralSettingsPage::GeneralSettingsPage()
     auto *languageGrid = new QGridLayout;
     languageGrid->addWidget(&languageLabel, 0, 0);
     languageGrid->addWidget(&languageBox, 0, 1);
-    languageGrid->addWidget(&cardLanguageLabel, 1, 0);
-    languageGrid->addWidget(&cardLanguageBox, 1, 1);
-    languageGrid->addWidget(&cardLanguageNoteLabel, 2, 1);
-    languageGrid->addWidget(&cardSearchLanguageLabel, 3, 0);
-    languageGrid->addWidget(&cardSearchLanguageBox, 3, 1);
-    languageGrid->addWidget(&advertiseTranslationPageLabel, 4, 1, Qt::AlignRight);
+    languageGrid->addWidget(&advertiseTranslationPageLabel, 1, 1, Qt::AlignRight);
+    languageGrid->addWidget(&cardLanguageLabel, 2, 0);
+    languageGrid->addWidget(&cardLanguageBox, 2, 1);
+    languageGrid->addWidget(&cardLanguageNoteLabel, 3, 1);
+    languageGrid->addWidget(&cardSearchLanguageLabel, 4, 0);
+    languageGrid->addWidget(&cardSearchLanguageBox, 4, 1);
 
     cardLanguageNoteLabel.setWordWrap(true);
     cardLanguageNoteLabel.setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
@@ -384,18 +388,6 @@ QStringList GeneralSettingsPage::findQmFiles()
                                                  TranslationLoader::applicationTranslationPaths(translationPath));
 }
 
-QString GeneralSettingsPage::languageName(const QString &lang)
-{
-    QTranslator qTranslator;
-
-    // Only the language name is needed here, so the file is loaded without logging a line per
-    // language: findQmFiles() asked for languages whose files exist in the first place.
-    TranslationLoader::loadFrom(qTranslator, translationPrefix + "_" + lang,
-                                TranslationLoader::applicationTranslationPaths(translationPath));
-
-    return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
-}
-
 void GeneralSettingsPage::deckPathButtonClicked()
 {
     QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), deckPathEdit->text());
@@ -576,7 +568,7 @@ void GeneralSettingsPage::retranslateUi()
     const auto &settings = SettingsCache::instance();
 
     languageGroupBox->setTitle(tr("Language settings"));
-    languageLabel.setText(tr("Language:"));
+    languageLabel.setText(tr("Interface language:"));
     cardLanguageBox.setItemText(0, tr("English"));
     cardLanguageLabel.setText(tr("Card text & images language:"));
     cardLanguageNoteLabel.setText(
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
index 20564c968..9451db434 100644
--- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
@@ -26,7 +26,6 @@ public:
     void retranslateUi() override;
 
     static QStringList findQmFiles();
-    static QString languageName(const QString &lang);
 
 signals:
     /// Request to re-import the card database with the newly selected card language
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
index 6128a7830..09dd9e9b0 100644
--- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
@@ -1,7 +1,7 @@
 #include "messages_settings_page.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
 #include "libcockatrice/utility/macros.h"
 
@@ -146,15 +146,15 @@ MessagesSettingsPage::MessagesSettingsPage()
     }
 
     aAdd = new QAction(this);
-    aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    aAdd->setIcon(loadThemedIcon(QStringLiteral("icons/increment")));
     connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd);
 
     aEdit = new QAction(this);
-    aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil")));
+    aEdit->setIcon(loadThemedIcon(QStringLiteral("icons/pencil")));
     connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit);
 
     aRemove = new QAction(this);
-    aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    aRemove->setIcon(loadThemedIcon(QStringLiteral("icons/decrement")));
     connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove);
 
     auto *messageToolBar = new QToolBar;
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
index bf35b7557..67354c9d7 100644
--- a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
@@ -5,6 +5,7 @@
  */
 #include "settings_search_delegate.h"
 
+#include "../interface/theme_manager.h"
 #include "settings_search_model.h"
 
 #include <QBrush>
@@ -88,7 +89,8 @@ void SettingsSearchDelegate::paint(QPainter *painter,
     QRect textRect = contentRect.adjusted(iconOffset, 0, 0, 0);
 
     // Breadcrumb: "Page > Group"
-    QFont breadcrumbFont = option.font;
+    // Family comes from the InterfaceDefault theme role; the -1 size and bold stay caller-side.
+    QFont breadcrumbFont = themeManager->appFont(AppFont::InterfaceDefault);
     breadcrumbFont.setPointSize(breadcrumbFont.pointSize() - 1);
     breadcrumbFont.setBold(true);
 
@@ -113,7 +115,7 @@ void SettingsSearchDelegate::paint(QPainter *painter,
     yPos += 20;
 
     // Setting label
-    QFont labelFont = option.font;
+    QFont labelFont = themeManager->appFont(AppFont::InterfaceDefault);
     labelFont.setPointSize(labelFont.pointSize() + 1);
     labelFont.setBold(isSelected);
 
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
index a77c0c2c3..83c2ec585 100644
--- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
@@ -3,7 +3,7 @@
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcut_treeview.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 #include "../interface/widgets/utility/sequence_edit.h"
 
@@ -58,8 +58,8 @@ ShortcutSettingsPage::ShortcutSettingsPage()
     btnResetAll = new QPushButton(this);
     btnClearAll = new QPushButton(this);
 
-    btnResetAll->setIcon(themePixmap(QStringLiteral("icons/update")));
-    btnClearAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
+    btnResetAll->setIcon(loadThemedIcon(QStringLiteral("icons/reload")));
+    btnClearAll->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch")));
 
     // layout
     auto *_editLayout = new QGridLayout;
diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
index 4044f03db..1e80b2715 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -11,9 +11,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "../cards/card_info_frame_widget.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
@@ -55,6 +53,8 @@
 #include <QUrl>
 #include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
index 3abf3f9aa..46d2466c6 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
@@ -2,7 +2,6 @@
 
 #include "../../../../../../client/settings/cache_settings.h"
 #include "../../../../../deck_loader/card_node_function.h"
-#include "../../../../../deck_loader/loaded_deck.h"
 #include "../../../../cards/deck_card_zone_display_widget.h"
 #include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
 #include "../../../../visual_deck_editor/visual_deck_editor_widget.h"
@@ -30,6 +29,7 @@
 #include <QVariant>
 #include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 #include <qlogging.h>
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
index 97383534f..3720aeb55 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
@@ -1,5 +1,6 @@
 #include "archidekt_deck_preview_image_display_widget.h"
 
+#include "../../../../../theme_manager.h"
 #include "../../../../general/display/shadow_background_label.h"
 
 #include <QFont>
@@ -17,13 +18,9 @@ ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(Q
     bottomLeftLabel = new ShadowBackgroundLabel(this, "");
     bottomRightLabel = new ShadowBackgroundLabel(this, "");
 
-    QFont f;
-    f.setBold(true);
-    f.setPointSize(16);
-    topLeftLabel->setFont(f);
-    topRightLabel->setFont(f);
-    bottomLeftLabel->setFont(f);
-    bottomRightLabel->setFont(f);
+    applyCardTextFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &ArchidektDeckPreviewImageDisplayWidget::applyCardTextFont);
 
     // Raise so labels appear above image
     topLeftLabel->raise();
@@ -32,6 +29,18 @@ ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(Q
     bottomRightLabel->raise();
 }
 
+void ArchidektDeckPreviewImageDisplayWidget::applyCardTextFont()
+{
+    // Family comes from the CardText theme role; size and weight stay caller-side as before.
+    QFont f = themeManager->appFont(AppFont::CardText);
+    f.setBold(true);
+    f.setPointSize(16);
+    topLeftLabel->setFont(f);
+    topRightLabel->setFont(f);
+    bottomLeftLabel->setFont(f);
+    bottomRightLabel->setFont(f);
+}
+
 void ArchidektDeckPreviewImageDisplayWidget::setAspectRatio(float ratio)
 {
     aspectRatio = ratio;
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
index 991f27b6a..41585e851 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h
@@ -60,6 +60,9 @@ protected:
      */
     void resizeEvent(QResizeEvent *event) override;
 
+private slots:
+    void applyCardTextFont();
+
 private:
     float aspectRatio = 1.0f; ///< Aspect ratio to maintain for the preview image
 };
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
index d157f75cb..ae3a9baef 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
@@ -1,7 +1,7 @@
 #include "tab_archidekt.h"
 
 #include "../../../../../client/settings/cache_settings.h"
-#include "../../../../pixel_map_generator.h"
+#include "../../../../theme_icon.h"
 #include "../../../cards/additional_info/mana_symbol_widget.h"
 #include "../../../cards/card_size_widget.h"
 #include "../../../quick_settings/settings_button_widget.h"
@@ -25,6 +25,7 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonParseError>
 #include <QJsonValueRef>
 #include <QLabel>
 #include <QLayoutItem>
@@ -60,8 +61,6 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
 {
     // Initialize network
     networkManager = NetworkManagerFactory::create(this);
-    networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
-    connect(networkManager, &QNetworkAccessManager::finished, this, &TabArchidekt::processApiJson);
 
     // Initialize debounce timer
     searchDebounceTimer = new QTimer(this);
@@ -77,6 +76,48 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
     getTopDecks();
 }
 
+TabArchidekt::~TabArchidekt()
+{
+    cancelRequest();
+}
+
+void TabArchidekt::cancelRequest()
+{
+    const QPointer<QNetworkReply> previousReply = activeReply;
+    activeReply = nullptr;
+    isLoadingMore = false;
+    if (previousReply) {
+        disconnect(previousReply, nullptr, this, nullptr);
+        previousReply->abort();
+        previousReply->deleteLater();
+    }
+}
+
+void TabArchidekt::startRequest(QUrl url, RequestKind kind, int page)
+{
+    cancelRequest();
+    requestUrl = url;
+    requestKind = kind;
+    requestedPage = page;
+    isLoadingMore = true;
+    retryButton->hide();
+    requestStatusLabel->setText(kind == RequestKind::Deck ? tr("Loading deck…") : tr("Loading decks…"));
+    requestStatusLabel->show();
+
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    auto *reply = networkManager->get(request);
+    activeReply = reply;
+    connect(reply, &QNetworkReply::finished, this, [this, reply]() { processApiJson(reply); });
+}
+
+void TabArchidekt::showRequestError(const QString &error)
+{
+    requestStatusLabel->setText(tr("Unable to load decks: %1").arg(error));
+    requestStatusLabel->show();
+    retryButton->show();
+}
+
 void TabArchidekt::initializeUi()
 {
     // Main container
@@ -194,6 +235,18 @@ void TabArchidekt::initializeUi()
 
     mainLayout->addWidget(primaryToolbar);
     mainLayout->addWidget(secondaryToolbar);
+
+    auto *requestStatusRow = new QHBoxLayout;
+    requestStatusLabel = new QLabel(container);
+    requestStatusLabel->setTextFormat(Qt::PlainText);
+    requestStatusLabel->setWordWrap(true);
+    retryButton = new QPushButton(tr("Retry"), container);
+    retryButton->hide();
+    connect(retryButton, &QPushButton::clicked, this,
+            [this]() { startRequest(requestUrl, requestKind, requestedPage); });
+    requestStatusRow->addWidget(requestStatusLabel, 1);
+    requestStatusRow->addWidget(retryButton);
+    mainLayout->addLayout(requestStatusRow);
     mainLayout->addWidget(scrollArea);
 
     setCentralWidget(container);
@@ -220,16 +273,16 @@ void TabArchidekt::setupFilterWidgets()
     // Advanced filters (in secondary toolbar)
 
     // EDH Bracket
-    auto *bracketLabel = new QLabel(tr("Bracket:"), secondaryToolbar);
+    bracketLabel = new QLabel(secondaryToolbar);
     edhBracketCombo = new QComboBox(secondaryToolbar);
-    edhBracketCombo->addItem(tr("Any"));
+    edhBracketCombo->addItem(QString());
     edhBracketCombo->addItems({"1", "2", "3", "4", "5"});
     edhBracketCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
     // Format filter (collapsible)
     formatButton = new SettingsButtonWidget(secondaryToolbar);
     formatButton->setButtonText(tr("Formats"));
-    formatButton->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced")));
+    formatButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scales")));
 
     QWidget *formatContainer = new QWidget(secondaryToolbar);
     QGridLayout *formatLayout = new QGridLayout(formatContainer);
@@ -276,7 +329,6 @@ void TabArchidekt::setupFilterWidgets()
     sizeLayout->setContentsMargins(4, 4, 4, 4);
 
     minDeckSizeSpin = new QSpinBox(sizeContainer);
-    minDeckSizeSpin->setSpecialValueText(tr("Any"));
     minDeckSizeSpin->setRange(0, 200);
     minDeckSizeSpin->setValue(0);
 
@@ -284,7 +336,8 @@ void TabArchidekt::setupFilterWidgets()
     minDeckSizeLogicCombo->addItems({"Exact", "≥", "≤"});
     minDeckSizeLogicCombo->setCurrentIndex(1);
 
-    sizeLayout->addWidget(new QLabel(tr("Cards:"), sizeContainer));
+    cardsLabel = new QLabel(sizeContainer);
+    sizeLayout->addWidget(cardsLabel);
     sizeLayout->addWidget(minDeckSizeSpin);
     sizeLayout->addWidget(minDeckSizeLogicCombo);
 
@@ -341,9 +394,9 @@ void TabArchidekt::connectSignals()
     });
 
     // Format filters trigger search
-    connect(edhBracketCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
+    connect(edhBracketCombo, &QComboBox::currentIndexChanged, this, &TabArchidekt::doSearch);
     connect(minDeckSizeSpin, qOverload<int>(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
-    connect(minDeckSizeLogicCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
+    connect(minDeckSizeLogicCombo, &QComboBox::currentIndexChanged, this, &TabArchidekt::doSearch);
 
     // Allow Enter key in text fields to trigger search
     connect(nameField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
@@ -393,10 +446,18 @@ void TabArchidekt::retranslateUi()
     commandersField->setPlaceholderText(tr("Commander..."));
     deckTagNameField->setPlaceholderText(tr("Tag..."));
 
+    bracketLabel->setText(tr("Bracket:"));
+    // Index 0 is the "Any" placeholder added in setupFilterWidgets()
+    edhBracketCombo->setItemText(0, tr("Any"));
+
     formatButton->setButtonText(tr("Formats"));
     deckSizeButton->setButtonText(tr("Deck Size"));
+    cardsLabel->setText(tr("Cards:"));
+    minDeckSizeSpin->setSpecialValueText(tr("Any"));
+    minDeckSizeLogicCombo->setItemText(0, tr("Exact"));
 
     searchButton->setText(tr("Search"));
+    retryButton->setText(tr("Retry"));
 
     settingsButton->setToolTip(tr("Display Settings"));
 }
@@ -484,13 +545,17 @@ QString TabArchidekt::buildSearchUrl()
         query.addQueryItem("size", QString::number(minDeckSizeSpin->value()));
 
         QString logic = "GTE";
-        QString selected = minDeckSizeLogicCombo->currentText();
-        if (selected == "≥") {
-            logic = "GTE";
-        } else if (selected == "≤") {
-            logic = "LTE";
-        } else {
-            logic = "";
+        // Index order matches setupFilterWidgets(): 0 = Exact, 1 = ≥, 2 = ≤
+        switch (minDeckSizeLogicCombo->currentIndex()) {
+            case 1:
+                logic = "GTE";
+                break;
+            case 2:
+                logic = "LTE";
+                break;
+            default:
+                logic = "";
+                break;
         }
 
         if (!logic.isEmpty()) {
@@ -506,82 +571,95 @@ QString TabArchidekt::buildSearchUrl()
 
 void TabArchidekt::doSearch()
 {
-    // Reset to first page on new search
-    currentPage = 1;
-    // We're searching, so we'll be in list mode
-    isListMode = true;
     // Don't debounce - only called by explicit user actions now
     doSearchImmediate();
 }
 
 void TabArchidekt::doSearchImmediate()
 {
-    QString url = buildSearchUrl();
-    QNetworkRequest req{QUrl(url)};
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(req);
+    searchDebounceTimer->stop();
+    currentPage = 1;
+    startRequest(QUrl(buildSearchUrl()), RequestKind::Search);
 }
 
 void TabArchidekt::loadNextPage()
 {
-    if (isLoadingMore) {
+    if (activeReply || !isListMode || !listingsWidget || nextPageUrl.isEmpty()) {
         return;
     }
 
-    isLoadingMore = true;
-    currentPage++;
-
-    QString url = buildSearchUrl();
-    QNetworkRequest req{QUrl(url)};
-    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(req);
+    // Continue the accepted search, even if the user has edited filters without submitting them.
+    // Advance currentPage only after this response has been accepted, so failures can retry it.
+    startRequest(nextPageUrl, RequestKind::NextPage, currentPage + 1);
 }
 
 void TabArchidekt::actNavigatePage(QString url)
 {
-    QNetworkRequest request{QUrl(url)};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(request);
+    searchDebounceTimer->stop();
+    startRequest(QUrl(url), RequestKind::Deck);
 }
 
 void TabArchidekt::getTopDecks()
 {
-    currentPage = 1;
-    QNetworkRequest request{QUrl(buildSearchUrl())};
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    networkManager->get(request);
+    doSearchImmediate();
 }
 
 void TabArchidekt::processApiJson(QNetworkReply *reply)
 {
-    if (reply->error() != QNetworkReply::NoError) {
-        isLoadingMore = false;
+    if (reply != activeReply) {
         reply->deleteLater();
         return;
     }
+    activeReply = nullptr;
+    isLoadingMore = false;
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError) {
+        showRequestError(reply->errorString());
+        return;
+    }
 
     QByteArray responseData = reply->readAll();
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData);
+    QJsonParseError parseError;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData, &parseError);
 
-    if (!jsonDoc.isObject()) {
-        isLoadingMore = false;
-        reply->deleteLater();
+    if (parseError.error != QJsonParseError::NoError || !jsonDoc.isObject()) {
+        showRequestError(tr("Invalid response from Archidekt."));
         return;
     }
 
     QJsonObject jsonObj = jsonDoc.object();
-    QString responseUrl = reply->url().toString();
-
-    if (responseUrl.startsWith("https://archidekt.com/api/decks/v3/")) {
+    if (requestKind != RequestKind::Deck) {
+        if (!jsonObj.value("results").isArray() ||
+            (!jsonObj.value("next").isNull() && !jsonObj.value("next").isString())) {
+            showRequestError(tr("Invalid deck listing from Archidekt."));
+            return;
+        }
+        for (const auto &value : jsonObj.value("results").toArray()) {
+            if (!value.isObject() || value.toObject().value("id").toInt() <= 0) {
+                showRequestError(tr("Invalid deck listing from Archidekt."));
+                return;
+            }
+        }
+        currentPage = requestedPage;
+        const QString next = jsonObj.value("next").toString();
+        nextPageUrl = next.isEmpty() ? QUrl() : reply->url().resolved(QUrl(next));
+        // An empty or self-repeating page cannot make forward progress.
+        if (jsonObj.value("results").toArray().isEmpty() || nextPageUrl == reply->url()) {
+            nextPageUrl.clear();
+        }
+        requestStatusLabel->setText(
+            currentPage == 1 && jsonObj.value("results").toArray().isEmpty() ? tr("No decks found.") : QString());
+        requestStatusLabel->setVisible(!requestStatusLabel->text().isEmpty());
         processTopDecksResponse(jsonObj);
-    } else if (responseUrl.startsWith("https://archidekt.com/api/decks/")) {
-        processDeckResponse(jsonObj);
     } else {
-        prettyPrintJson(jsonObj, 4);
+        if (jsonObj.value("id").toInt() <= 0 || !jsonObj.value("cards").isArray()) {
+            showRequestError(tr("Invalid deck from Archidekt."));
+            return;
+        }
+        requestStatusLabel->hide();
+        processDeckResponse(jsonObj);
     }
-
-    isLoadingMore = false;
-    reply->deleteLater();
 }
 
 void TabArchidekt::processTopDecksResponse(QJsonObject reply)
@@ -589,8 +667,12 @@ void TabArchidekt::processTopDecksResponse(QJsonObject reply)
     ArchidektDeckListingApiResponse deckData;
     deckData.fromJson(reply);
 
+    // An accepted listing restores list mode; a failed deck navigation leaves the listing usable.
+    isListMode = true;
+
     // New search → clear everything
-    if (currentPage == 1) {
+    if (requestKind == RequestKind::Search) {
+        listingsWidget = nullptr;
         QtUtils::clearLayoutRec(resultsLayout, QtUtils::DeletePolicy::Immediate);
 
         listingsWidget = new ArchidektApiResponseDeckListingsDisplayWidget(resultsContainer, deckData, cardSizeSlider);
@@ -615,8 +697,10 @@ void TabArchidekt::processDeckResponse(QJsonObject reply)
 
     // We're in single deck mode - disable infinite scroll
     isListMode = false;
+    nextPageUrl.clear();
 
     // Clear existing results for single deck view
+    listingsWidget = nullptr;
     QtUtils::clearLayoutRec(resultsLayout, QtUtils::DeletePolicy::Immediate);
 
     auto display = new ArchidektApiResponseDeckDisplayWidget(resultsContainer, deckData, cardSizeSlider);
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
index 015b8590b..81c9502df 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
@@ -8,8 +8,10 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QList>
+#include <QPointer>
 #include <QSet>
 #include <QString>
+#include <QUrl>
 #include <QVector>
 #include <qtmetamacros.h>
 
@@ -55,6 +57,7 @@ public:
      * connects signals and slots, and triggers an initial fetch of top decks.
      */
     explicit TabArchidekt(TabSupervisor *_tabSupervisor);
+    ~TabArchidekt() override;
 
     /**
      * @brief Update all UI text to reflect the current language or translation
@@ -190,6 +193,17 @@ protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
+    enum class RequestKind
+    {
+        Search,
+        NextPage,
+        Deck
+    };
+
+    void startRequest(QUrl url, RequestKind kind, int page = 1);
+    void cancelRequest();
+    void showRequestError(const QString &error);
+
     /**
      * @brief Initialize the main UI layout and toolbars
      *
@@ -236,7 +250,14 @@ private:
     int currentPage;                       ///< Current page number for infinite scroll
     bool isLoadingMore;                    ///< Flag to prevent multiple simultaneous page loads
     bool isListMode;
-    ArchidektApiResponseDeckListingsDisplayWidget *listingsWidget = nullptr;
+    QPointer<QNetworkReply> activeReply;
+    RequestKind requestKind = RequestKind::Search;
+    QUrl requestUrl;
+    QUrl nextPageUrl;
+    int requestedPage = 1;
+    QPointer<ArchidektApiResponseDeckListingsDisplayWidget> listingsWidget;
+    QLabel *requestStatusLabel;
+    QPushButton *retryButton;
 
     // ---------------------------------------------------------------------
     // Layout Containers
@@ -287,9 +308,11 @@ private:
 
     SettingsButtonWidget *formatButton; ///< Collapsible button for format filters
     QVector<QCheckBox *> formatChecks;  ///< Individual checkboxes for each format
+    QLabel *bracketLabel;               ///< Label for EDH bracket selection
     QComboBox *edhBracketCombo;         ///< Dropdown for EDH bracket selection
 
     SettingsButtonWidget *deckSizeButton; ///< Collapsible button for deck size filter
+    QLabel *cardsLabel;                   ///< Label for deck size selection
     QSpinBox *minDeckSizeSpin;            ///< Spinner to select minimum deck size
     QComboBox *minDeckSizeLogicCombo;     ///< Combo box for size comparison logic
 
@@ -300,4 +323,4 @@ private:
     CardInfoPtr cardToQuery; ///< Optional pre-selected card for initial filtering
 };
 
-#endif // COCKATRICE_TAB_ARCHIDEKT_H
\ No newline at end of file
+#endif // COCKATRICE_TAB_ARCHIDEKT_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
index 8e0448faa..7b60ed23c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
@@ -26,6 +26,11 @@ quint64 CommanderBracketService::estimateBracket(const DeckList &deck, QObject *
     return CommanderSpellbookApiAccessor::instance().estimateBracket(deck, requester);
 }
 
+void CommanderBracketService::cancelEstimate(quint64 requestId)
+{
+    CommanderSpellbookApiAccessor::instance().cancelEstimate(requestId);
+}
+
 void CommanderBracketService::onEstimateBracketFinished(CommanderSpellbookApiAccessor::RequestId id,
                                                         QObject *requester,
                                                         const EstimateBracketResult &result)
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
index 22962cc95..00debce86 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
@@ -30,6 +30,7 @@ public:
     static CommanderBracketService &instance();
 
     quint64 estimateBracket(const DeckList &deck, QObject *requester);
+    void cancelEstimate(quint64 requestId);
 
 signals:
     void estimateFinished(quint64 requestId, QObject *requester, const CommanderBracketEstimate &estimate);
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
index 5279165af..a0e3f2491 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
@@ -1,7 +1,7 @@
 #include "commander_bracket_widget.h"
 
 #include "../../../../../client/settings/cache_settings.h"
-#include "../../../../pixel_map_generator.h"
+#include "../../../../theme_icon.h"
 #include "commander_bracket_service.h"
 #include "libcockatrice/deck_list/deck_list.h"
 
@@ -28,9 +28,18 @@ template <class T> class QSharedPointer;
 
 CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent)
 {
+    autoEstimateTimer = new QTimer(this);
+    autoEstimateTimer->setSingleShot(true);
+    connect(autoEstimateTimer, &QTimer::timeout, this, [this]() {
+        if (SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled() ==
+            commanderSpellbookIntegrationEnabledIndexAutomatic) {
+            requestBracketEstimate();
+        }
+    });
     bracketLabel = new QLabel(tr("Bracket:"), this);
 
     bracketValueLabel = new QLabel(this);
+    bracketValueLabel->setTextFormat(Qt::PlainText);
     bracketValueLabel->setText("-");
     bracketValueLabel->setObjectName("bracketValueLabel");
 
@@ -40,7 +49,7 @@ CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent
     bracketInfoButton->setEnabled(false);
 
     bracketRefreshButton = new QToolButton(this);
-    bracketRefreshButton->setIcon(themePixmap(QStringLiteral("icons/reload")));
+    bracketRefreshButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload")));
     bracketRefreshButton->setAutoRaise(true);
 
     connect(bracketRefreshButton, &QToolButton::clicked, this, &CommanderBracketWidget::requestBracketEstimate);
@@ -65,18 +74,38 @@ CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent
             this, &CommanderBracketWidget::maybeAutoEstimateBracket);
     connect(&SettingsCache::instance().deckEditor(),
             &DeckEditorSettings::commanderSpellbookIntegrationUseOfficialBracketNamesChanged, this,
-            &CommanderBracketWidget::maybeAutoEstimateBracket);
+            &CommanderBracketWidget::displayEstimate);
 
     setVisible(false);
 }
 
+CommanderBracketWidget::~CommanderBracketWidget()
+{
+    cancelEstimate();
+}
+
+void CommanderBracketWidget::cancelEstimate()
+{
+    autoEstimateTimer->stop();
+    const quint64 canceledRequest = requestId;
+    requestId = 0;
+    CommanderBracketService::instance().cancelEstimate(canceledRequest);
+    bracketRefreshButton->setEnabled(true);
+    if (canceledRequest) {
+        bracketValueLabel->setText("-");
+        bracketValueLabel->setToolTip({});
+    }
+}
+
 void CommanderBracketWidget::setDeck(const QSharedPointer<DeckList> &_deck)
 {
+    cancelEstimate();
     deck = _deck;
-    requestId = 0; // invalidate any in-flight estimate for the previous deck
+    hasEstimate = false;
 
     // Reset the displayed bracket
     bracketValueLabel->setText("-");
+    bracketValueLabel->setToolTip({});
     bracketInfoButton->setToolTip({});
     bracketInfoButton->setEnabled(false);
     bracketRefreshButton->setEnabled(true);
@@ -144,7 +173,7 @@ bool CommanderBracketWidget::promptCommanderSpellbookIntegration()
     dialog.exec();
 
     // Persist naming choice (if not disabled)
-    if (clickedButton != disableBtn) {
+    if (clickedButton == enableBtn || clickedButton == automaticBtn) {
         bool useOfficial = namingCombo->currentIndex() == 1;
         SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationUseOfficialBracketNames(useOfficial);
     }
@@ -176,9 +205,20 @@ void CommanderBracketWidget::updateBracketVisibility(bool visible)
 
 void CommanderBracketWidget::requestBracketEstimate()
 {
+    const int mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled();
+    if (!deck || deck->getGameFormat().compare("commander", Qt::CaseInsensitive) != 0 || requestId ||
+        (mode != commanderSpellbookIntegrationEnabledIndexEnabled &&
+         mode != commanderSpellbookIntegrationEnabledIndexAutomatic)) {
+        return;
+    }
+
+    autoEstimateTimer->stop();
+    hasEstimate = false;
     bracketRefreshButton->setEnabled(false);
     bracketInfoButton->setEnabled(false);
+    bracketInfoButton->setToolTip({});
     bracketValueLabel->setText(tr("Calculating…"));
+    bracketValueLabel->setToolTip({});
 
     requestId = CommanderBracketService::instance().estimateBracket(*deck, this);
 }
@@ -191,22 +231,35 @@ void CommanderBracketWidget::onEstimateBracketFinished(quint64 id,
         return;
     }
 
+    requestId = 0;
+    hasEstimate = true;
+    lastEstimate = result;
+    displayEstimate();
+    bracketRefreshButton->setEnabled(true);
+}
+
+void CommanderBracketWidget::displayEstimate()
+{
+    if (!hasEstimate) {
+        bracketInfoButton->setToolTip(tr("Why this bracket?"));
+        return;
+    }
+
     BracketExplainer explainer;
-    lastBracketExplanation = explainer.explain(result.rawResult);
+    lastBracketExplanation = explainer.explain(lastEstimate.rawResult);
 
     // Display bracket
     bracketValueLabel->setText(
         SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationUseOfficialBracketNames()
-            ? result.officialName
-            : result.displayName);
-    bracketRefreshButton->setEnabled(true);
+            ? lastEstimate.officialName
+            : lastEstimate.displayName);
 
     // Build tooltip
     QString tooltip;
     for (const auto &section : lastBracketExplanation.sections) {
-        tooltip += "<b>" + section.title + "</b><br>";
+        tooltip += "<b>" + section.title.toHtmlEscaped() + "</b><br>";
         for (const auto &line : section.bulletPoints) {
-            tooltip += "• " + line + "<br>";
+            tooltip += "• " + line.toHtmlEscaped() + "<br>";
         }
         tooltip += "<br>";
     }
@@ -215,13 +268,17 @@ void CommanderBracketWidget::onEstimateBracketFinished(quint64 id,
     bracketInfoButton->setEnabled(!tooltip.isEmpty());
 }
 
-void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *requester, const QString & /*error*/)
+void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *requester, const QString &error)
 {
     if (requester != this || id != requestId) {
         return;
     }
 
+    requestId = 0;
+    hasEstimate = false;
     bracketValueLabel->setText("-");
+    bracketValueLabel->setToolTip(
+        QStringLiteral("<qt>%1</qt>").arg(tr("Unable to estimate bracket: %1").arg(error).toHtmlEscaped()));
     bracketRefreshButton->setEnabled(true);
     bracketInfoButton->setToolTip({});
     bracketInfoButton->setEnabled(false);
@@ -229,6 +286,15 @@ void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *request
 
 void CommanderBracketWidget::maybeAutoEstimateBracket()
 {
+    if (prompting) {
+        return;
+    }
+    autoEstimateTimer->stop();
+    if (!deck) {
+        cancelEstimate();
+        updateBracketVisibility(false);
+        return;
+    }
     const QString formatKey = deck->getGameFormat();
 
     const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0);
@@ -236,17 +302,20 @@ void CommanderBracketWidget::maybeAutoEstimateBracket()
     int mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled();
 
     if (!isCommander || mode == commanderSpellbookIntegrationEnabledIndexDisabled) {
+        cancelEstimate();
         updateBracketVisibility(false);
         return;
     }
 
     if (mode == commanderSpellbookIntegrationEnabledIndexUnprompted) {
-        if (prompting) {
-            return;
-        }
+        const auto promptedDeck = deck;
         prompting = true;
         const bool accepted = promptCommanderSpellbookIntegration();
         prompting = false;
+        if (deck != promptedDeck || !deck || deck->getGameFormat().compare("commander", Qt::CaseInsensitive) != 0) {
+            maybeAutoEstimateBracket();
+            return;
+        }
         if (!accepted) {
             updateBracketVisibility(false);
             return;
@@ -261,17 +330,17 @@ void CommanderBracketWidget::maybeAutoEstimateBracket()
     }
 
     // Avoid firing if we already have a result or a request in flight
-    if (!bracketRefreshButton->isEnabled()) {
+    if (requestId || hasEstimate) {
         return;
     }
 
     // Defer to avoid races during init / model rebuild
-    QTimer::singleShot(0, this, &CommanderBracketWidget::requestBracketEstimate);
+    autoEstimateTimer->start(0);
 }
 
 void CommanderBracketWidget::retranslateUi()
 {
     bracketLabel->setText(tr("Bracket:"));
-    bracketInfoButton->setToolTip(tr("Why this bracket?"));
+    displayEstimate();
     bracketRefreshButton->setToolTip(tr("Recalculate bracket"));
 }
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
index f5b2b7958..0ef1eedee 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_COMMANDER_BRACKET_WIDGET_H
 #define COCKATRICE_COMMANDER_BRACKET_WIDGET_H
 
+#include "commander_bracket_service.h"
 #include "commander_spellbook_bracket_explainer.h"
 
 #include <QSharedPointer>
@@ -11,6 +12,7 @@
 
 class QLabel;
 class QToolButton;
+class QTimer;
 struct CommanderBracketEstimate;
 class DeckList;
 class QObject;
@@ -22,6 +24,7 @@ class CommanderBracketWidget : public QWidget
 
 public:
     explicit CommanderBracketWidget(QWidget *parent = nullptr);
+    ~CommanderBracketWidget() override;
 
     void setDeck(const QSharedPointer<DeckList> &_deck);
     void retranslateUi();
@@ -35,10 +38,15 @@ private slots:
 private:
     bool promptCommanderSpellbookIntegration();
     void updateBracketVisibility(bool visible);
+    void cancelEstimate();
+    void displayEstimate();
 
     QSharedPointer<DeckList> deck;
     bool prompting = false;
     quint64 requestId = 0;
+    QTimer *autoEstimateTimer;
+    bool hasEstimate = false;
+    CommanderBracketEstimate lastEstimate;
 
     QLabel *bracketLabel;
     QLabel *bracketValueLabel;
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
index bd8d9379d..8456e2e21 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
@@ -9,9 +9,10 @@
 #include <QJsonParseError>
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QPointer>
 #include <QStringLiteral>
 #include <QUrl>
-#include <QVariant>
+#include <libcockatrice/network/network_manager.h>
 #include <version_string.h>
 
 class DeckList;
@@ -24,13 +25,18 @@ CommanderSpellbookApiAccessor &CommanderSpellbookApiAccessor::instance()
     return instance;
 }
 
-CommanderSpellbookApiAccessor::CommanderSpellbookApiAccessor(QObject *parent) : QObject(parent)
+CommanderSpellbookApiAccessor::CommanderSpellbookApiAccessor(QObject *parent)
+    : QObject(parent), network(NetworkManagerFactory::create(this))
 {
 }
 
 CommanderSpellbookApiAccessor::RequestId CommanderSpellbookApiAccessor::estimateBracket(const DeckList &deck,
                                                                                         QObject *requester)
 {
+    if (!requester) {
+        return 0;
+    }
+
     CommanderSpellbookDeckRequest deckRequest = CommanderSpellbookDeckRequest::fromDeckList(deck);
 
     QJsonDocument doc(deckRequest.toJson());
@@ -40,30 +46,39 @@ CommanderSpellbookApiAccessor::RequestId CommanderSpellbookApiAccessor::estimate
     req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
-    QNetworkReply *reply = network.post(req, body);
+    QNetworkReply *reply = network->post(req, body);
 
     const RequestId id = nextRequestId++;
 
-    reply->setProperty("requestId", QVariant::fromValue(id));
-    reply->setProperty("requester", QVariant::fromValue(requester));
-
-    connect(reply, &QNetworkReply::finished, this, [this, reply]() { onEstimateReplyFinished(reply); });
+    pendingRequests.insert(id, reply);
+    const QPointer<QObject> guardedRequester(requester);
+    connect(requester, &QObject::destroyed, reply, [this, id]() { cancelEstimate(id); });
+    connect(reply, &QNetworkReply::finished, this, [this, reply, id, guardedRequester]() {
+        if (pendingRequests.take(id) != reply) {
+            return;
+        }
+        reply->deleteLater();
+        if (guardedRequester) {
+            onEstimateReplyFinished(reply, id, guardedRequester);
+        }
+    });
 
     return id;
 }
 
-void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply)
+void CommanderSpellbookApiAccessor::cancelEstimate(RequestId id)
 {
-    reply->deleteLater();
-
-    const RequestId id = reply->property("requestId").toULongLong();
-    QObject *requester = reply->property("requester").value<QObject *>();
-
-    if (!requester) {
-        // Requester died — silently drop
+    const QPointer<QNetworkReply> reply = pendingRequests.take(id);
+    if (!reply) {
         return;
     }
+    disconnect(reply, nullptr, this, nullptr);
+    reply->abort();
+    reply->deleteLater();
+}
 
+void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply, RequestId id, QObject *requester)
+{
     if (reply->error() != QNetworkReply::NoError) {
         emit estimateBracketError(id, requester, reply->errorString());
         return;
@@ -78,6 +93,10 @@ void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply
     }
 
     EstimateBracketResult result = EstimateBracketResult::fromJson(doc.object());
+    if (result.bracketTag.trimmed().isEmpty()) {
+        emit estimateBracketError(id, requester, QStringLiteral("Missing bracket in response"));
+        return;
+    }
 
     emit estimateBracketFinished(id, requester, result);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
index 98e7e3710..a1b2936bb 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
@@ -1,14 +1,16 @@
 #ifndef COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
 #define COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
 
-#include <QNetworkAccessManager>
+#include <QHash>
 #include <QObject>
+#include <QPointer>
 #include <QString>
 #include <QtGlobal>
 #include <qtmetamacros.h>
 
 class DeckList;
 class QNetworkReply;
+class QNetworkAccessManager;
 struct EstimateBracketResult;
 
 class CommanderSpellbookApiAccessor final : public QObject
@@ -21,6 +23,7 @@ public:
     using RequestId = quint64;
 
     RequestId estimateBracket(const DeckList &deck, QObject *requester);
+    void cancelEstimate(RequestId id);
 
 signals:
     void estimateBracketFinished(RequestId id, QObject *requester, const EstimateBracketResult &result);
@@ -31,9 +34,10 @@ private:
     explicit CommanderSpellbookApiAccessor(QObject *parent = nullptr);
     Q_DISABLE_COPY_MOVE(CommanderSpellbookApiAccessor)
 
-    void onEstimateReplyFinished(QNetworkReply *reply);
+    void onEstimateReplyFinished(QNetworkReply *reply, RequestId id, QObject *requester);
 
-    QNetworkAccessManager network;
+    QNetworkAccessManager *network;
+    QHash<RequestId, QPointer<QNetworkReply>> pendingRequests;
     RequestId nextRequestId = 1;
 };
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
index 407f53e99..be490ce37 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
@@ -3,11 +3,14 @@
 #include "../../../../../client/settings/cache_settings.h"
 
 #include <QByteArray>
+#include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QJsonParseError>
 #include <QMap>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
+#include <QSet>
 #include <QString>
 #include <QStringLiteral>
 #include <QUrl>
@@ -22,6 +25,14 @@ HandleCommanderBrackets::HandleCommanderBrackets(QObject *parent)
 {
 }
 
+HandleCommanderBrackets::~HandleCommanderBrackets()
+{
+    if (reply) {
+        disconnect(reply, nullptr, this, nullptr);
+        reply->abort();
+    }
+}
+
 void HandleCommanderBrackets::downloadBracketDefinitions()
 {
     if (reply) {
@@ -35,31 +46,49 @@ void HandleCommanderBrackets::downloadBracketDefinitions()
 
 void HandleCommanderBrackets::actFinishParsingDownloadedData()
 {
-    reply = qobject_cast<QNetworkReply *>(sender());
+    auto *finishedReply = qobject_cast<QNetworkReply *>(sender());
+    if (!finishedReply || finishedReply != reply) {
+        return;
+    }
 
-    if (reply->error() != QNetworkReply::NoError) {
-        emit sigBracketDefinitionsDownloadFailed(reply->error());
+    // Clear the active request before notifying listeners, which may immediately retry.
+    reply = nullptr;
+    finishedReply->deleteLater();
 
-        reply->deleteLater();
+    if (finishedReply->error() != QNetworkReply::NoError) {
+        emit sigBracketDefinitionsDownloadFailed(finishedReply->error());
         return;
     }
 
     QJsonParseError parseError;
 
-    auto document = QJsonDocument::fromJson(reply->readAll(), &parseError);
+    auto document = QJsonDocument::fromJson(finishedReply->readAll(), &parseError);
 
-    if (parseError.error != QJsonParseError::NoError) {
+    if (parseError.error != QJsonParseError::NoError || !document.isObject() ||
+        !document.object().value("brackets").isArray() || document.object().value("brackets").toArray().isEmpty()) {
         emit sigBracketDefinitionsDownloadFailed(QNetworkReply::UnknownContentError);
-
-        reply->deleteLater();
         return;
     }
 
+    // Validate the complete replacement before touching the last usable definitions.
+    // Tags are QSettings group names, so path separators must not create nested groups.
+    QSet<QString> tags;
+    for (const auto &value : document.object().value("brackets").toArray()) {
+        const auto definition = value.toObject();
+        const auto tag = definition.value("tag").toString();
+        if (!value.isObject() || tag.trimmed().isEmpty() || tag.contains('/') || tag.contains('\\') ||
+            tags.contains(tag) || definition.value("officialName").toString().trimmed().isEmpty() ||
+            definition.value("displayName").toString().trimmed().isEmpty() ||
+            !definition.value("explanation").isString()) {
+            emit sigBracketDefinitionsDownloadFailed(QNetworkReply::UnknownContentError);
+            return;
+        }
+        tags.insert(tag);
+    }
+
     updateBracketDefinitions(document.toVariant().toMap());
 
     emit sigBracketDefinitionsDownloaded();
-
-    reply->deleteLater();
 }
 
 void HandleCommanderBrackets::updateBracketDefinitions(const QVariantMap &jsonMap)
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
index 39bddba05..99b15832c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
@@ -3,6 +3,7 @@
 
 #include <QNetworkReply>
 #include <QObject>
+#include <QPointer>
 #include <QVariantMap>
 #include <qtmetamacros.h>
 
@@ -14,6 +15,7 @@ class HandleCommanderBrackets : public QObject
 
 public:
     explicit HandleCommanderBrackets(QObject *parent = nullptr);
+    ~HandleCommanderBrackets() override;
 
     void downloadBracketDefinitions();
 
@@ -28,7 +30,7 @@ private:
     void updateBracketDefinitions(const QVariantMap &jsonMap);
 
     QNetworkAccessManager *nam;
-    QNetworkReply *reply;
+    QPointer<QNetworkReply> reply;
 };
 
 #endif // COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
index b2ddace01..2b76de973 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
@@ -1,5 +1,6 @@
 #include "edhrec_api_response_card_details_display_widget.h"
 
+#include "../../../../../../theme_manager.h"
 #include "../../../../../cards/card_info_picture_widget.h"
 #include "../../../../../cards/card_size_widget.h"
 #include "../../../../../general/display/background_plate_widget.h"
@@ -9,6 +10,7 @@
 #include "edhrec_api_response_card_synergy_display_widget.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QFont>
 #include <QLabel>
 #include <QMouseEvent>
 #include <QObject>
@@ -32,7 +34,9 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
     nameLabel = new QLabel(this);
     nameLabel->setText(toDisplay.name);
     nameLabel->setAlignment(Qt::AlignHCenter);
-    nameLabel->setStyleSheet("font-size: 20px; font-weight: bold");
+    applyCardTextFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &EdhrecApiResponseCardDetailsDisplayWidget::applyCardTextFont);
 
     inclusionDisplayWidget = new EdhrecApiResponseCardInclusionDisplayWidget(this, toDisplay);
 
@@ -86,3 +90,14 @@ void EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation()
 {
     emit requestUrl(toDisplay.url);
 }
+
+void EdhrecApiResponseCardDetailsDisplayWidget::applyCardTextFont()
+{
+    // Family comes from the CardText theme role; the 20px size and bold
+    // weight previously carried by the stylesheet stay caller-side. Pixel
+    // size, not point size: the stylesheet said 20px, and 20pt is ~27px.
+    QFont cardFont = themeManager->appFont(AppFont::CardText);
+    cardFont.setPixelSize(20);
+    cardFont.setWeight(QFont::Bold);
+    nameLabel->setFont(cardFont);
+}
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
index d738f4685..8a3c8fba4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
@@ -30,6 +30,9 @@ public slots:
 signals:
     void requestUrl(QString url);
 
+private slots:
+    void applyCardTextFont();
+
 private:
     EdhrecApiResponseCardDetails toDisplay;
     QVBoxLayout *layout;
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
index 2ff22f2b3..df0319f88 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
@@ -1,5 +1,6 @@
 #include "edhrec_api_response_commander_details_display_widget.h"
 
+#include "../../../../../../theme_manager.h"
 #include "../../../../../cards/card_info_picture_widget.h"
 #include "../../../../../cards/card_size_widget.h"
 #include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
@@ -8,6 +9,7 @@
 #include "edhrec_commander_api_response_navigation_widget.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QFont>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QObject>
@@ -48,15 +50,16 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
     commanderName = new QLabel(this);
     commanderName->setText(commanderDetails.getName());
     commanderName->setAlignment(Qt::AlignCenter);
-    commanderName->setStyleSheet("font-size: 28px; font-weight: bold");
 
     label = new QLabel(this);
     label->setAlignment(Qt::AlignCenter);
-    label->setStyleSheet("font-size: 16px");
 
     salt = new QLabel(this);
     salt->setAlignment(Qt::AlignCenter);
-    salt->setStyleSheet("font-size: 16px");
+
+    applyCardTextFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &EdhrecCommanderResponseCommanderDetailsDisplayWidget::applyCardTextFont);
 
     cardPricesDisplayWidget = new EdhrecApiResponseCardPricesDisplayWidget(this, commanderDetails.getPrices());
 
@@ -83,3 +86,19 @@ void EdhrecCommanderResponseCommanderDetailsDisplayWidget::retranslateUi()
     label->setText(commanderDetails.getLabel());
     salt->setText(tr("Salt: ") + QString::number(commanderDetails.getSalt()));
 }
+
+void EdhrecCommanderResponseCommanderDetailsDisplayWidget::applyCardTextFont()
+{
+    // Family comes from the CardText theme role; the sizes and the bold
+    // weight previously carried by the stylesheets stay caller-side. Pixel
+    // sizes, not point sizes: the stylesheets said 28px and 16px.
+    QFont nameFont = themeManager->appFont(AppFont::CardText);
+    nameFont.setPixelSize(28);
+    nameFont.setWeight(QFont::Bold);
+    commanderName->setFont(nameFont);
+
+    QFont detailsFont = themeManager->appFont(AppFont::CardText);
+    detailsFont.setPixelSize(16);
+    label->setFont(detailsFont);
+    salt->setFont(detailsFont);
+}
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
index 197263512..99e6b3d43 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h
@@ -30,6 +30,9 @@ public:
         QString baseUrl);
     void retranslateUi();
 
+private slots:
+    void applyCardTextFont();
+
 private:
     EdhrecCommanderApiResponseCommanderDetails commanderDetails;
     QHBoxLayout *layout;
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
index b26a7e574..749476619 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
@@ -1,6 +1,9 @@
 #include "edhrec_commander_api_response_bracket_navigation_widget.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QChar>
+#include <QFont>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
@@ -25,7 +28,7 @@ EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBra
         QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1);
         QPushButton *optionButton = new QPushButton(label, this);
         optionButton->setMinimumHeight(84);
-        optionButton->setStyleSheet("font-size: 24px");
+        optionButton->setStyleSheet(QString());
         gameChangerButtons[option] = optionButton;
         layout->addWidget(optionButton, 2, i);
         connect(optionButton, &QPushButton::clicked, this, [=, this]() {
@@ -35,6 +38,10 @@ EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBra
         });
     }
 
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &EdhrecCommanderApiResponseBracketNavigationWidget::applyInterfaceDefaultFont);
+
     updateOptionButtonSelection(gameChangerButtons, "");
 
     retranslateUi();
@@ -94,8 +101,18 @@ void EdhrecCommanderApiResponseBracketNavigationWidget::updateOptionButtonSelect
     const QString &selectedKey)
 {
     for (auto it = buttons.begin(); it != buttons.end(); ++it) {
-        it.value()->setStyleSheet(it.key() == selectedKey
-                                      ? "background-color: lightblue; font-weight: bold; font-size: 24px;"
-                                      : "font-size: 24px");
+        const bool selected = (it.key() == selectedKey);
+        it.value()->setStyleSheet(selected ? QStringLiteral("background-color: lightblue;") : QString());
+        QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault);
+        buttonFont.setPixelSize(24);
+        buttonFont.setWeight(selected ? QFont::Bold : QFont::Normal);
+        it.value()->setFont(buttonFont);
     }
+}
+
+void EdhrecCommanderApiResponseBracketNavigationWidget::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 24px size stays
+    // caller-side and the selected button keeps its bold emphasis.
+    updateOptionButtonSelection(gameChangerButtons, selectedGameChanger);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
index a741b6696..aa4e61ff1 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
@@ -37,6 +37,9 @@ private:
     QMap<QString, QPushButton *> gameChangerButtons;
 
     void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
+
+private slots:
+    void applyInterfaceDefaultFont();
 };
 
 #endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
index 48704d010..27cd1c51f 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
@@ -1,6 +1,9 @@
 #include "edhrec_commander_api_response_budget_navigation_widget.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QChar>
+#include <QFont>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
@@ -25,7 +28,7 @@ EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudg
         QString label = option.isEmpty() ? "Any" : option.at(0).toUpper() + option.mid(1);
         QPushButton *btn = new QPushButton(label, this);
         btn->setMinimumHeight(84);
-        btn->setStyleSheet("font-size: 24px");
+        btn->setStyleSheet(QString());
         budgetButtons[option] = btn;
         layout->addWidget(btn, 4, i);
         connect(btn, &QPushButton::clicked, this, [=, this]() {
@@ -35,6 +38,10 @@ EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudg
         });
     }
 
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &EdhrecCommanderApiResponseBudgetNavigationWidget::applyInterfaceDefaultFont);
+
     updateOptionButtonSelection(budgetButtons, "");
 
     retranslateUi();
@@ -96,8 +103,18 @@ void EdhrecCommanderApiResponseBudgetNavigationWidget::updateOptionButtonSelecti
     const QString &selectedKey)
 {
     for (auto it = buttons.begin(); it != buttons.end(); ++it) {
-        it.value()->setStyleSheet(it.key() == selectedKey
-                                      ? "background-color: lightblue; font-weight: bold; font-size: 24px;"
-                                      : "font-size: 24px");
+        const bool selected = (it.key() == selectedKey);
+        it.value()->setStyleSheet(selected ? QStringLiteral("background-color: lightblue;") : QString());
+        QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault);
+        buttonFont.setPixelSize(24);
+        buttonFont.setWeight(selected ? QFont::Bold : QFont::Normal);
+        it.value()->setFont(buttonFont);
     }
+}
+
+void EdhrecCommanderApiResponseBudgetNavigationWidget::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 24px size stays
+    // caller-side and the selected button keeps its bold emphasis.
+    updateOptionButtonSelection(budgetButtons, selectedBudget);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
index 8013d1d6b..d727225a5 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
@@ -37,6 +37,9 @@ private:
     QMap<QString, QPushButton *> budgetButtons;
 
     void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
+
+private slots:
+    void applyInterfaceDefaultFont();
 };
 
 #endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
index 220dcfbda..57070a5e1 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
@@ -1,9 +1,11 @@
 #include "edhrec_commander_api_response_navigation_widget.h"
 
+#include "../../interface/theme_manager.h"
 #include "../../tab_edhrec_main.h"
 #include "edhrec_commander_api_response_bracket_navigation_widget.h"
 #include "edhrec_commander_api_response_budget_navigation_widget.h"
 
+#include <QFont>
 #include <QGridLayout>
 #include <QObject>
 #include <QPushButton>
@@ -30,10 +32,14 @@ EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigation
 
     comboPushButton = new QPushButton(this);
     comboPushButton->setMinimumHeight(84);
-    comboPushButton->setStyleSheet("font-size: 24px");
+    comboPushButton->setStyleSheet(QString());
     averageDeckPushButton = new QPushButton(this);
     averageDeckPushButton->setMinimumHeight(84);
-    averageDeckPushButton->setStyleSheet("font-size: 24px");
+    averageDeckPushButton->setStyleSheet(QString());
+
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &EdhrecCommanderApiResponseNavigationWidget::applyInterfaceDefaultFont);
 
     layout->addWidget(comboPushButton, 0, 0, 1, 1);
     layout->addWidget(averageDeckPushButton, 0, 1, 1, 1);
@@ -61,6 +67,15 @@ void EdhrecCommanderApiResponseNavigationWidget::retranslateUi()
     averageDeckPushButton->setText(tr("Average Deck"));
 }
 
+void EdhrecCommanderApiResponseNavigationWidget::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 24px size stays caller-side.
+    QFont navFont = themeManager->appFont(AppFont::InterfaceDefault);
+    navFont.setPixelSize(24);
+    comboPushButton->setFont(navFont);
+    averageDeckPushButton->setFont(navFont);
+}
+
 QString EdhrecCommanderApiResponseNavigationWidget::addNavigationOptionsToUrl(QString baseUrl)
 {
     if (!bracketNavigationWidget->getSelectedGameChanger().isEmpty()) {
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
index 737558625..456228554 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h
@@ -35,6 +35,9 @@ public slots:
 signals:
     void requestUrl(QString url);
 
+private slots:
+    void applyInterfaceDefaultFont();
+
 private:
     QGridLayout *layout;
 
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
index 741a1e85f..c8822930e 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
@@ -1,7 +1,6 @@
 #include "tab_edhrec_main.h"
 
 #include "../../../../../client/settings/cache_settings.h"
-#include "../../../../deck_loader/loaded_deck.h"
 #include "../../../cards/card_size_widget.h"
 #include "../../../quick_settings/settings_button_widget.h"
 #include "../../../utility/completer_utils.h"
@@ -28,6 +27,7 @@
 #include <QRegularExpression>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/database/card_database_querier.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
 #include <libcockatrice/models/database/card_database_display_model.h>
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
index 1fc2854ce..f18aa82b9 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
@@ -18,6 +18,7 @@
 #include <QHBoxLayout>
 #include <QLineEdit>
 #include <QList>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QSharedPointer>
 #include <QTableView>
@@ -29,7 +30,9 @@
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
+#include <libcockatrice/protocol/pb/response_clear_blacklisted_banners.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/utility/qt_utils.h>
 #include <string>
 
 class QObject;
@@ -172,6 +175,7 @@ void TabCardArtRules::setupUi()
     addBtn = new QPushButton;
     removeBtn = new QPushButton;
     refreshBtn = new QPushButton;
+    clearBannedArtBtn = new QPushButton;
 
     modeBox->addItems({"ALLOW", "DENY"});
 
@@ -188,10 +192,14 @@ void TabCardArtRules::setupUi()
     form->addRow(tr("Mode:"), modeBox);
     form->addRow(tr("Reason:"), reasonEdit);
 
+    // The bulk clear acts on every user, so keep it visibly apart from the
+    // rules this tab edits.
     auto *buttons = new QHBoxLayout;
     buttons->addWidget(addBtn);
     buttons->addWidget(removeBtn);
     buttons->addWidget(refreshBtn);
+    buttons->addStretch();
+    buttons->addWidget(clearBannedArtBtn);
 
     auto *layout = new QVBoxLayout;
     layout->addLayout(form);
@@ -207,6 +215,8 @@ void TabCardArtRules::setupUi()
 
     connect(refreshBtn, &QPushButton::clicked, this, &TabCardArtRules::refresh);
 
+    connect(clearBannedArtBtn, &QPushButton::clicked, this, &TabCardArtRules::clearBlacklistedBanners);
+
     retranslateUi();
 }
 
@@ -263,6 +273,7 @@ void TabCardArtRules::retranslateUi()
     addBtn->setText(tr("Add rule"));
     removeBtn->setText(tr("Remove rule"));
     refreshBtn->setText(tr("Refresh"));
+    clearBannedArtBtn->setText(tr("Clear blacklisted banners"));
 }
 
 void TabCardArtRules::refresh()
@@ -299,4 +310,47 @@ void TabCardArtRules::removeSelected()
     client->sendCommand(client->prepareModeratorCommand(cmd));
 
     refresh();
-}
\ No newline at end of file
+}
+
+void TabCardArtRules::clearBlacklistedBanners()
+{
+    if (!QtUtils::confirm(this, tr("Clear blacklisted banners"),
+                          tr("Remove the banner card from every user whose current banner matches a DENY rule?\n\n"
+                             "Users who are online keep showing their banner until they log in again."),
+                          QMessageBox::No)) {
+        return;
+    }
+
+    Command_ClearBlacklistedBanners cmd;
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabCardArtRules::clearBlacklistedBannersResponse);
+    client->sendCommand(pend);
+}
+
+void TabCardArtRules::clearBlacklistedBannersResponse(const Response &r)
+{
+    switch (r.response_code()) {
+        case Response::RespOk:
+            break;
+        case Response::RespFunctionNotAllowed:
+            QMessageBox::warning(this, tr("Not supported"),
+                                 tr("This server does not support clearing blacklisted banners. It may be running an "
+                                    "older version."));
+            return;
+        case Response::RespInternalError:
+            QMessageBox::critical(this, tr("Error"),
+                                  tr("The server could not clear blacklisted banners because of a database error."));
+            return;
+        default:
+            QMessageBox::critical(this, tr("Error"),
+                                  tr("The server rejected the request: %1")
+                                      .arg(QString::fromStdString(Response_ResponseCode_Name(r.response_code()))));
+            return;
+    }
+
+    const auto &resp = r.GetExtension(Response_ClearBlacklistedBanners::ext);
+    QMessageBox::information(this, tr("Banners cleared"),
+                             tr("%n banner card(s) cleared.\n\n"
+                                "Users who are online keep showing their banner until they log in again.",
+                                "number of banners cleared", resp.cleared_count()));
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
index f34300179..1e0155ab7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
@@ -78,6 +78,8 @@ private slots:
     void addRule();
     void removeSelected();
     void refresh();
+    void clearBlacklistedBanners();
+    void clearBlacklistedBannersResponse(const Response &r);
 
 private:
     AbstractClient *client;
@@ -97,6 +99,7 @@ private:
     QPushButton *addBtn;
     QPushButton *removeBtn;
     QPushButton *refreshBtn;
+    QPushButton *clearBannedArtBtn;
 
     QTableView *table;
     CardArtRulesModel *tableModel;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
index 7ca179cea..e88b2aad6 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@@ -131,10 +131,16 @@ void TabDeckEditor::loadLayout()
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
 
     auto layoutState = layouts.getDeckEditorLayoutState();
-    if (layoutState.isNull()) {
-        restartLayout();
-    } else {
-        restoreState(layoutState);
+    // Start with every current dock placed. Saved layouts from older versions
+    // cannot describe docks introduced later; restoreState leaves those docks
+    // in their existing positions while restoring the saved docks, including
+    // their visibility and floating state.
+    restartLayout();
+    if (!layoutState.isEmpty()) {
+        if (!restoreState(layoutState)) {
+            // A corrupt or incompatible state must not leave a partial layout.
+            restartLayout();
+        }
         restoreGeometry(layouts.getDeckEditorGeometry());
     }
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
index 9db1952f1..8af9d5e6e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -1,10 +1,8 @@
 #include "tab_deck_storage.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "../deck_share/deck_share_utils.h"
 #include "../deck_share/share_bar_widget.h"
@@ -49,7 +47,9 @@
 #include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>
@@ -187,19 +187,19 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     // Left side actions
     aOpenLocalDeck = new QAction(this);
-    aOpenLocalDeck->setIcon(themePixmap(QStringLiteral("icons/pencil")));
+    aOpenLocalDeck->setIcon(loadThemedIcon(QStringLiteral("icons/pencil")));
     connect(aOpenLocalDeck, &QAction::triggered, this, &TabDeckStorage::actOpenLocalDeck);
     aRenameLocal = new QAction(this);
-    aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename")));
+    aRenameLocal->setIcon(loadThemedIcon(QStringLiteral("icons/rename")));
     connect(aRenameLocal, &QAction::triggered, this, &TabDeckStorage::actRenameLocal);
     aUpload = new QAction(this);
-    aUpload->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green")));
+    aUpload->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_right")));
     connect(aUpload, &QAction::triggered, this, &TabDeckStorage::actUpload);
     aNewLocalFolder = new QAction(this);
     aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewLocalFolder, &QAction::triggered, this, &TabDeckStorage::actNewLocalFolder);
     aDeleteLocalDeck = new QAction(this);
-    aDeleteLocalDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    aDeleteLocalDeck->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     connect(aDeleteLocalDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteLocalDeck);
 
     aOpenDecksFolder = new QAction(this);
@@ -208,24 +208,24 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     // Right side actions
     aOpenRemoteDeck = new QAction(this);
-    aOpenRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/pencil")));
+    aOpenRemoteDeck->setIcon(loadThemedIcon(QStringLiteral("icons/pencil")));
     connect(aOpenRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actOpenRemoteDeck);
     aDownload = new QAction(this);
-    aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green")));
+    aDownload->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_left")));
     connect(aDownload, &QAction::triggered, this, &TabDeckStorage::actDownload);
     aNewFolder = new QAction(this);
     aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewFolder, &QAction::triggered, this, &TabDeckStorage::actNewFolder);
     aDeleteRemoteDeck = new QAction(this);
-    aDeleteRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    aDeleteRemoteDeck->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     connect(aDeleteRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteRemoteDeck);
 
     aShareDecks = new QAction(this);
-    aShareDecks->setIcon(themePixmap(QStringLiteral("icons/share")));
+    aShareDecks->setIcon(loadThemedIcon(QStringLiteral("icons/share")));
     connect(aShareDecks, &QAction::triggered, this, &TabDeckStorage::actShareDecks);
 
     aPublishDeck = new QAction(this);
-    aPublishDeck->setIcon(QPixmap("theme:icons/lock"));
+    aPublishDeck->setIcon(loadThemedIcon(QStringLiteral("icons/lock")));
     connect(aPublishDeck, &QAction::triggered, this, &TabDeckStorage::actPublishDeck);
 
     // Add actions to toolbars
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
index d641a1ea5..024cd46f0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
@@ -6,6 +6,7 @@
 
 #include "tab_developer.h"
 
+#include "../interface/theme_manager.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 
 #include <QAbstractItemView>
@@ -100,6 +101,20 @@ TabDeveloper::TabDeveloper(TabSupervisor *_tabSupervisor, AbstractClient *_clien
     central->setLayout(mainLayout);
     setCentralWidget(central);
 
+    // Separator rows store their font on the item; re-apply the role family on
+    // font changes (value cells keep the default font and need only a repaint).
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] {
+        QFont separatorFont = themeManager->appFont(AppFont::InterfaceDefault);
+        separatorFont.setBold(true);
+        for (int row = 0; row < statsTable->rowCount(); ++row) {
+            auto *labelItem = statsTable->item(row, 0);
+            if (labelItem && !(labelItem->flags() & Qt::ItemIsSelectable)) {
+                labelItem->setFont(separatorFont);
+            }
+        }
+        statsTable->viewport()->update();
+    });
+
     retranslateUi();
 }
 
@@ -155,7 +170,8 @@ void TabDeveloper::appendSeparatorRow(const QString &sectionTitle)
     const int row = statsTable->rowCount();
     statsTable->insertRow(row);
     auto *labelItem = new QTableWidgetItem(sectionTitle);
-    auto font = labelItem->font();
+    // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+    QFont font = themeManager->appFont(AppFont::InterfaceDefault);
     font.setBold(true);
     labelItem->setFont(font);
     labelItem->setFlags(labelItem->flags() & ~Qt::ItemIsSelectable);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index 11813cdf4..01d021907 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -2,16 +2,10 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/game_event_handler.h"
-#include "../../../game/game_meta_info.h"
-#include "../../../game/game_state.h"
-#include "../../../game/player/player_info.h"
-#include "../../../game/player/player_manager.h"
+#include "../../../database/interface/settings_card_preference_provider.h"
 #include "../../../game_graphics/board/abstract_card_item.h"
-#include "../game/game.h"
-#include "../game/player/player_logic.h"
-#include "../game/replay.h"
+#include "../game_graphics/board/arrow_item.h"
+#include "../game_graphics/board/card_item.h"
 #include "../game_graphics/deckview/deck_view_container.h"
 #include "../game_graphics/deckview/tabbed_deck_view_container.h"
 #include "../game_graphics/game_scene.h"
@@ -26,12 +20,14 @@
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
 #include "../interface/widgets/dialogs/dlg_invite_to_game.h"
+#include "../interface/widgets/dialogs/dlg_turn_order.h"
 #include "../interface/widgets/server/game_link.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
 #include "../interface/widgets/utility/completer_utils.h"
 #include "../interface/widgets/utility/line_edit_completer.h"
 #include "../main.h"
 #include "../menus/tearoff_menu.h"
+#include "../replay/replay_event_sidebar.h"
 #include "../replay/replay_widget.h"
 #include "../utility/visibility_change_listener.h"
 #include "card/card_completer_proxy_model.h"
@@ -71,6 +67,15 @@
 #include <QWidget>
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_meta_info.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/player/player_info.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/replay.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
@@ -94,10 +99,12 @@ class Message;
 } // namespace google
 
 TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
-    : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
+    : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr), replayDock(nullptr), historyDock(nullptr)
 {
+    setObjectName("TabGame");
     // THIS CTOR IS USED ON REPLAY
-    game = new Replay(this, _replay, tabSupervisor->getIsLocalGame());
+    game = new Replay(this, _replay, tabSupervisor->getIsLocalGame(), &SettingsCache::instance().userInterface(),
+                      new SettingsCardPreferenceProvider(this));
 
     createCardInfoDock(true);
     createPlayerListDock(true);
@@ -109,9 +116,11 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
+    addDockWidget(Qt::LeftDockWidgetArea, historyDock);
     addDockWidget(Qt::BottomDockWidgetArea, replayDock);
 
     mainWidget = new QStackedWidget(this);
+    mainWidget->setObjectName("mainWidget");
     mainWidget->addWidget(deckViewContainerWidget);
     mainWidget->addWidget(gamePlayAreaWidget);
     setCentralWidget(mainWidget);
@@ -140,8 +149,10 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
                  const QMap<int, QString> &_roomGameTypes)
     : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager())
 {
+    setObjectName("TabGame");
     // THIS CTOR IS USED ON GAMES
-    game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes);
+    game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes,
+                    &SettingsCache::instance().userInterface(), new SettingsCardPreferenceProvider(this));
 
     createCardInfoDock();
     createPlayerListDock();
@@ -149,12 +160,14 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     createPlayAreaWidget();
     createDeckViewContainerWidget();
     replayDock = nullptr;
+    historyDock = nullptr;
 
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
 
     mainWidget = new QStackedWidget(this);
+    mainWidget->setObjectName("mainWidget");
     mainWidget->addWidget(deckViewContainerWidget);
     mainWidget->addWidget(gamePlayAreaWidget);
     mainWidget->setContentsMargins(0, 0, 0, 0);
@@ -186,6 +199,7 @@ void TabGame::connectToGameState()
 {
     connect(game->getGameState(), &GameState::gameStarted, this, &TabGame::startGame);
     connect(game->getGameState(), &GameState::gameStopped, this, &TabGame::stopGame);
+    connect(game->getGameState(), &GameState::hostChanged, this, &TabGame::updateTurnOrderAction);
     connect(game->getGameState(), &GameState::activePhaseChanged, this, &TabGame::setActivePhase);
     connect(game->getGameState(), &GameState::activePlayerChanged, this, &TabGame::setActivePlayer);
 }
@@ -254,6 +268,8 @@ void TabGame::connectMessageLogToGameEventHandler()
 
     connect(game->getGameEventHandler(), &GameEventHandler::logTurnReversed, messageLog,
             &MessageLogWidget::logReverseTurn);
+    connect(game->getGameEventHandler(), &GameEventHandler::logTurnOrderChanged, messageLog,
+            &MessageLogWidget::logTurnOrderChanged);
 
     connect(game->getGameEventHandler(), &GameEventHandler::logConcede, messageLog, &MessageLogWidget::logConcede);
     connect(game->getGameEventHandler(), &GameEventHandler::logUnconcede, messageLog, &MessageLogWidget::logUnconcede);
@@ -340,6 +356,9 @@ void TabGame::retranslateUi()
     }
     cardInfoDock->setWindowTitle(tr("Card Info") + (cardInfoDock->isWindow() ? tabText : QString()));
     messageLayoutDock->setWindowTitle(tr("Messages") + (messageLayoutDock->isWindow() ? tabText : QString()));
+    if (historyDock) {
+        historyDock->setWindowTitle(tr("Game History") + (historyDock->isWindow() ? tabText : QString()));
+    }
     if (replayDock) {
         replayDock->setWindowTitle(tr("Replay Timeline") + (replayDock->isWindow() ? tabText : QString()));
     }
@@ -364,6 +383,9 @@ void TabGame::retranslateUi()
     if (aReverseTurn) {
         aReverseTurn->setText(tr("Reverse turn order"));
     }
+    if (aTurnOrder) {
+        aTurnOrder->setText(tr("&Set turn order..."));
+    }
     if (aRemoveLocalArrows) {
         aRemoveLocalArrows->setText(tr("&Remove all local arrows"));
     }
@@ -413,6 +435,9 @@ void TabGame::retranslateUi()
     dockToActions[messageLayoutDock].menu->setTitle(tr("Messages"));
     dockToActions[playerListDock].menu->setTitle(tr("Player List"));
 
+    if (historyDock) {
+        dockToActions[historyDock].menu->setTitle(tr("Game History"));
+    }
     if (replayDock) {
         dockToActions[replayDock].menu->setTitle(tr("Replay Timeline"));
     }
@@ -545,8 +570,10 @@ void TabGame::adminLockChanged(bool lock)
 
 void TabGame::actGameInfo()
 {
-    DlgCreateGame dlg(game->getGameMetaInfo()->proto(), game->getGameMetaInfo()->getRoomGameTypes(), this);
-    dlg.exec();
+    // Heap-allocated so that destroying this tab while the dialog is open cannot delete a stack object.
+    auto *dlg = new DlgCreateGame(game->getGameMetaInfo()->proto(), game->getGameMetaInfo()->getRoomGameTypes(), this);
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
+    dlg->open();
 }
 
 void TabGame::actCopyGameLink()
@@ -620,6 +647,73 @@ void TabGame::actConcede()
     }
 }
 
+void TabGame::actTurnOrder()
+{
+    if (!canSetTurnOrder()) {
+        return;
+    }
+
+    QStringList playerNames;
+    const QList<int> seatOrder = game->getGameState()->getSeatOrder();
+    const auto &players = game->getPlayerManager()->getPlayers();
+    if (!seatOrder.isEmpty()) {
+        for (int playerId : seatOrder) {
+            if (PlayerLogic *player = players.value(playerId, nullptr)) {
+                playerNames.append(player->getPlayerInfo()->getName());
+            }
+        }
+        // Include any players missing from the tracked order rather than dropping them.
+        for (auto it = players.constBegin(); it != players.constEnd(); ++it) {
+            const QString name = it.value()->getPlayerInfo()->getName();
+            if (!playerNames.contains(name)) {
+                playerNames.append(name);
+            }
+        }
+    } else {
+        for (PlayerLogic *player : players) {
+            playerNames.append(player->getPlayerInfo()->getName());
+        }
+    }
+
+    DlgTurnOrder dlg(playerNames, this);
+    if (dlg.exec() != QDialog::Accepted) {
+        return;
+    }
+
+    game->getGameEventHandler()->handleSetPlayerOrder(dlg.order(), dlg.isRandomizeRequested());
+}
+
+/**
+ * Whether the local user may change the seating order: only while the game has
+ * not started, and only as the host or a moderator - the server allows both
+ * (Server_AbstractParticipant::cmdSetPlayerOrder).
+ */
+bool TabGame::canSetTurnOrder() const
+{
+    if (game->getGameMetaInfo()->started()) {
+        return false;
+    }
+    if (game->isHost()) {
+        return true;
+    }
+    const ServerInfo_User *userInfo = tabSupervisor->getUserInfo();
+    return userInfo != nullptr && (userInfo->user_level() & ServerInfo_User::IsModerator);
+}
+
+/**
+ * Shows the turn order action only when it can actually change anything: the
+ * player must be allowed to set the order and the game must not have started.
+ * Called whenever either condition may have changed (game start/stop, host
+ * change).
+ */
+void TabGame::updateTurnOrderAction()
+{
+    if (aTurnOrder == nullptr) {
+        return;
+    }
+    aTurnOrder->setVisible(canSetTurnOrder());
+}
+
 /**
  * Confirms the leave game and sends the leave game command, if applicable.
  *
@@ -831,6 +925,15 @@ void TabGame::processPlayerLeave(PlayerLogic *leavingPlayer)
         }
     }
 
+    // A shuffled local player has their seat changed, so the deck view container
+    // keyed by their previous id must be cleaned up alongside the leaving player.
+    int leavingPlayerId = leavingPlayer->getPlayerInfo()->getId();
+    if (deckViewContainers.contains(leavingPlayerId)) {
+        TabbedDeckViewContainer *deckView = deckViewContainers.take(leavingPlayerId);
+        deckViewContainerLayout->removeWidget(deckView);
+        deckView->deleteLater();
+    }
+
     scene->removePlayer(leavingPlayer);
 }
 
@@ -939,6 +1042,7 @@ void TabGame::startGame(bool _resuming)
         aConcede->setText(tr("&Concede"));
         aConcede->setEnabled(true);
     }
+    updateTurnOrderAction();
 }
 
 void TabGame::stopGame()
@@ -961,6 +1065,7 @@ void TabGame::stopGame()
         aConcede->setText(tr("&Concede"));
         aConcede->setEnabled(false);
     }
+    updateTurnOrderAction();
 }
 
 void TabGame::closeGame()
@@ -1085,6 +1190,9 @@ void TabGame::createMenuItems()
     connect(aNextTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleNextTurn);
     aReverseTurn = new QAction(this);
     connect(aReverseTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleReverseTurn);
+    aTurnOrder = new QAction(this);
+    connect(aTurnOrder, &QAction::triggered, this, &TabGame::actTurnOrder);
+    updateTurnOrderAction();
     aRemoveLocalArrows = new QAction(this);
     connect(aRemoveLocalArrows, &QAction::triggered, this, &TabGame::actRemoveLocalArrows);
     aRotateViewCW = new QAction(this);
@@ -1113,6 +1221,7 @@ void TabGame::createMenuItems()
     connect(aFocusChat, &QAction::triggered, sayEdit, qOverload<>(&LineEditCompleter::setFocus));
 
     phasesMenu = new TearOffMenu(this);
+    phasesMenu->setObjectName("phasesMenu");
 
     for (int i = 0; i < phasesToolbar->phaseCount(); ++i) {
         auto *temp = new QAction(QString(), this);
@@ -1123,13 +1232,18 @@ void TabGame::createMenuItems()
 
     phasesMenu->addSeparator();
     phasesMenu->addAction(aNextPhase);
+    aNextPhase->setObjectName("aNextPhase");
     phasesMenu->addAction(aNextPhaseAction);
+    aNextPhaseAction->setObjectName("aNextPhaseAction");
 
     gameMenu = new QMenu(this);
+    gameMenu->setObjectName("gameMenu");
     playersSeparator = gameMenu->addSeparator();
     gameMenu->addMenu(phasesMenu);
     gameMenu->addAction(aNextTurn);
+    aNextTurn->setObjectName("aNextTurn");
     gameMenu->addAction(aReverseTurn);
+    gameMenu->addAction(aTurnOrder);
     gameMenu->addSeparator();
     gameMenu->addAction(aRemoveLocalArrows);
     gameMenu->addAction(aRotateViewCW);
@@ -1158,6 +1272,7 @@ void TabGame::createReplayMenuItems()
     aNextPhaseAction = nullptr;
     aNextTurn = nullptr;
     aReverseTurn = nullptr;
+    aTurnOrder = nullptr;
     aRemoveLocalArrows = nullptr;
     aRotateViewCW = nullptr;
     aRotateViewCCW = nullptr;
@@ -1187,6 +1302,10 @@ void TabGame::createViewMenuItems()
     registerDockWidget(viewMenu, messageLayoutDock, {250, 200});
     registerDockWidget(viewMenu, playerListDock, {250, 50});
 
+    if (historyDock) {
+        registerDockWidget(viewMenu, historyDock, {280, 400});
+    }
+
     if (replayDock) {
         registerDockWidget(viewMenu, replayDock, {900, 100});
     }
@@ -1256,6 +1375,12 @@ void TabGame::actResetLayout()
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
 
+    if (historyDock) {
+        historyDock->setVisible(true);
+        historyDock->setFloating(false);
+        addDockWidget(Qt::LeftDockWidgetArea, historyDock);
+    }
+
     if (replayDock) {
         replayDock->setVisible(true);
         replayDock->setFloating(false);
@@ -1264,6 +1389,9 @@ void TabGame::actResetLayout()
         cardInfoDock->resize(250, 360);
         messageLayoutDock->resize(250, 200);
         playerListDock->resize(250, 50);
+        if (historyDock) {
+            historyDock->resize(280, 400);
+        }
         replayDock->resize(900, 100);
     } else {
         cardInfoDock->resize(250, 360);
@@ -1276,12 +1404,19 @@ void TabGame::createPlayAreaWidget(bool bReplay)
 {
     phasesToolbar = new PhasesToolbar;
     if (!bReplay) {
-        connect(phasesToolbar, &PhasesToolbar::sendGameCommand, game->getGameEventHandler(),
-                qOverload<const ::google::protobuf::Message &, int>(&GameEventHandler::sendGameCommand));
+        connect(phasesToolbar, &PhasesToolbar::setActivePhaseRequested, game->getGameEventHandler(),
+                &GameEventHandler::handleActivePhaseChanged);
+        connect(phasesToolbar, &PhasesToolbar::nextTurnRequested, game->getGameEventHandler(),
+                &GameEventHandler::handleNextTurn);
+        connect(phasesToolbar, &PhasesToolbar::untapAllRequested, game->getGameEventHandler(),
+                &GameEventHandler::handleUntapAll);
+        connect(phasesToolbar, &PhasesToolbar::drawCardRequested, game->getGameEventHandler(),
+                &GameEventHandler::handleDrawCard);
     }
     scene = new GameScene(phasesToolbar, this);
     connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange);
     connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange);
+    connect(game->getGameState(), &GameState::seatOrderChanged, scene, &GameScene::rearrange);
     connect(scene, &GameScene::arrowDeletionRequested, game->getGameEventHandler(),
             &GameEventHandler::handleArrowDeletion);
     connect(game->getGameEventHandler(), &GameEventHandler::arrowDeleted, scene, &GameScene::deleteArrow);
@@ -1311,6 +1446,22 @@ void TabGame::createReplayDock(GameReplay *replay)
             [this](const auto &event, auto options) {
                 game->getGameEventHandler()->processGameEventContainer(event, nullptr, options);
             });
+
+    auto *historySidebar = new ReplayEventSidebar(nullptr, replay, replayWidget->getReplayTimeline());
+    historyDock = new QDockWidget(this);
+    historyDock->setObjectName("historyDock");
+    historyDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable |
+                             QDockWidget::DockWidgetMovable);
+    historyDock->setWidget(historySidebar);
+    historyDock->setFloating(false);
+
+    connect(historySidebar, &ReplayEventSidebar::eventSelected, replayWidget, &ReplayWidget::seekToEvent);
+    // The sidebar highlights events rather than times, so ask the manager which event the game state has reached.
+    connect(replayWidget, &ReplayWidget::timeChanged, historySidebar,
+            [this, historySidebar] { historySidebar->setCurrentEvent(replayWidget->getLastProcessedEventIndex()); });
+
+    // No event has been replayed yet when the sidebar is connected, so apply the initial state explicitly.
+    historySidebar->setCurrentEvent(replayWidget->getLastProcessedEventIndex());
 }
 
 void TabGame::createDeckViewContainerWidget(bool bReplay)
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
index 7bc52202f..142c02999 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@@ -50,6 +50,7 @@ class AbstractClient;
 class GameView;
 class GameScene;
 class ReplayWidget;
+class ReplayEventSidebar;
 class CardInfoFrameWidget;
 class QLabel;
 class QPushButton;
@@ -89,12 +90,13 @@ private:
     QMap<int, TabbedDeckViewContainer *> deckViewContainers;
     QVBoxLayout *deckViewContainerLayout;
     QWidget *gamePlayAreaWidget, *deckViewContainerWidget;
-    QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock;
+    QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock, *historyDock;
     QAction *playersSeparator;
     QMenu *gameMenu, *viewMenu;
     TearOffMenu *phasesMenu;
     QAction *aGameInfo, *aConcede, *aCopyGameLink, *aLeaveGame, *aNextPhase, *aNextPhaseAction, *aNextTurn,
-        *aReverseTurn, *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, *aResetReplayLayout;
+        *aReverseTurn, *aTurnOrder, *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout,
+        *aResetReplayLayout;
     QAction *aFocusChat;
     QAction *aInviteToGame = nullptr;
     QList<QAction *> phaseActions;
@@ -129,6 +131,7 @@ private:
 
     PlayerLogic *setActivePlayer(int id);
     void setActivePhase(int phase);
+    bool canSetTurnOrder() const;
     void createMenuItems();
     void createReplayMenuItems();
     void createViewMenuItems();
@@ -162,6 +165,8 @@ private slots:
     void actInviteToGame();
     void actConcede();
     void actCopyGameLink();
+    void actTurnOrder();
+    void updateTurnOrderAction();
     void actRemoveLocalArrows();
     void actRotateViewCW();
     void actRotateViewCCW();
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
index af9994fdd..3ad16aa91 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
@@ -6,6 +6,7 @@ class TabSupervisor;
 
 TabHome::TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
 {
+    setObjectName("TabHome");
     homeWidget = new HomeWidget(this, tabSupervisor);
     setCentralWidget(homeWidget);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
index 67e076983..9509f48ec 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
@@ -13,6 +13,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QScrollBar>
 #include <QSharedPointer>
 #include <QSizePolicy>
 #include <QSpinBox>
@@ -21,6 +22,7 @@
 #include <QTableWidgetItem>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
@@ -31,6 +33,17 @@
 
 class TabSupervisor;
 
+namespace
+{
+/** @brief Identifies the newest row of a page well enough to recognise a repeated page. */
+QString pageStartKey(const Response_ViewLogHistory &response)
+{
+    const ServerInfo_ChatMessage &first = response.log_message(0);
+    return QString::fromStdString(first.time()) + QChar(0x1f) + QString::fromStdString(first.sender_name()) +
+           QChar(0x1f) + QString::fromStdString(first.message());
+}
+} // namespace
+
 TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands)
     : Tab(_tabSupervisor), client(_client), canUseDeveloperCommands(_canUseDeveloperCommands)
 {
@@ -52,12 +65,20 @@ TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _can
     chatTable->setHorizontalHeaderLabels(
         QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";"));
 
-    QTabWidget *tabManager = new QTabWidget();
+    tabManager = new QTabWidget();
     tabManager->addTab(roomTable, tr("Room Logs"));
     tabManager->addTab(gameTable, tr("Game Logs"));
     tabManager->addTab(chatTable, tr("Chat Logs"));
     setCentralWidget(tabManager);
 
+    connect(roomTable->verticalScrollBar(), &QScrollBar::valueChanged, this, &TabLog::checkFetchMore);
+    connect(gameTable->verticalScrollBar(), &QScrollBar::valueChanged, this, &TabLog::checkFetchMore);
+    connect(chatTable->verticalScrollBar(), &QScrollBar::valueChanged, this, &TabLog::checkFetchMore);
+    // A tab that gains only a few rows has nothing to scroll, so its scrollbar never fires:
+    // switching to it would leave its next page unfetched until the moderator scrolled
+    // another tab. Re-check on every tab switch so the visible table can continue the browse.
+    connect(tabManager, &QTabWidget::currentChanged, this, &TabLog::checkFetchMore);
+
     createDock();
     restartLayout();
     clearClicked();
@@ -74,12 +95,9 @@ void TabLog::retranslateUi()
 
 void TabLog::getClicked()
 {
-    if (findUsername->text().isEmpty() && findIPAddress->text().isEmpty() && findGameName->text().isEmpty() &&
-        findGameID->text().isEmpty() && findMessage->text().isEmpty()) {
-        QMessageBox::critical(this, tr("Error"), tr("You must select at least one filter."));
-        return;
-    }
-
+    // Empty filters are a valid browse: room/game history going back from
+    // today, paginated. Only require a date range + location, both of which
+    // get sensible defaults below so a bare "Get" just works.
     if (!lastHour->isChecked() && !today->isChecked() && !pastDays->isChecked()) {
         pastDays->setChecked(true);
         pastXDays->setValue(20);
@@ -99,39 +117,71 @@ void TabLog::getClicked()
     }
 
     if (maximumResults->value() == 0) {
-        maximumResults->setValue(1000);
+        maximumResults->setValue(200);
     }
+    pageSize = qBound(1, maximumResults->value(), 1000);
 
-    int dateRange = 0;
-    if (lastHour->isChecked()) {
-        dateRange = 1;
-    }
-
-    if (today->isChecked()) {
-        dateRange = 24;
-    }
-
-    if (pastDays->isChecked()) {
-        dateRange = pastXDays->value() * 24;
-    }
-
-    Command_ViewLogHistory cmd;
-    cmd.set_user_name(findUsername->text().toStdString());
-    cmd.set_ip_address(findIPAddress->text().toStdString());
-    cmd.set_game_name(findGameName->text().toStdString());
-    cmd.set_game_id(findGameID->text().toStdString());
-    cmd.set_message(findMessage->text().toStdString());
+    // Build the command once, here, and let every page copy it: rebuilding it from the
+    // widgets per page would run page 2+ against filters edited after Get was clicked,
+    // appending rows selected by a different query under the first page's results.
+    currentQuery.Clear();
+    currentQuery.set_user_name(findUsername->text().toStdString());
+    currentQuery.set_ip_address(findIPAddress->text().toStdString());
+    currentQuery.set_game_name(findGameName->text().toStdString());
+    currentQuery.set_game_id(findGameID->text().toStdString());
+    currentQuery.set_message(findMessage->text().toStdString());
     if (mainRoom->isChecked()) {
-        cmd.add_log_location("room");
-    };
+        currentQuery.add_log_location("room");
+    }
     if (gameRoom->isChecked()) {
-        cmd.add_log_location("game");
-    };
+        currentQuery.add_log_location("game");
+    }
     if (privateChat->isChecked()) {
-        cmd.add_log_location("chat");
-    };
-    cmd.set_date_range(dateRange);
-    cmd.set_maximum_results(maximumResults->value());
+        currentQuery.add_log_location("chat");
+    }
+    currentQuery.set_date_range(dateRangeForSelection());
+    currentQuery.set_maximum_results(pageSize);
+    hasCurrentQuery = true;
+    snapshotBefore.clear();
+    lastPageStartKey.clear();
+
+    // Fresh search: reset pagination state and clear previous pages.
+    currentOffset = 0;
+    roomCounter = 0;
+    gameCounter = 0;
+    chatCounter = 0;
+    roomTable->setRowCount(0);
+    gameTable->setRowCount(0);
+    chatTable->setRowCount(0);
+
+    fetchPage(0);
+}
+
+int TabLog::dateRangeForSelection() const
+{
+    if (lastHour->isChecked()) {
+        return 1;
+    }
+    if (today->isChecked()) {
+        return 24;
+    }
+    if (pastDays->isChecked()) {
+        return pastXDays->value() * 24;
+    }
+    return 0;
+}
+
+void TabLog::fetchPage(int offset)
+{
+    if (isFetching || !hasCurrentQuery) {
+        return;
+    }
+
+    Command_ViewLogHistory cmd = currentQuery;
+    cmd.set_offset(offset);
+    if (!snapshotBefore.isEmpty()) {
+        cmd.set_before_time(snapshotBefore.toStdString());
+    }
 
     PendingCommand *pend;
     if (canUseDeveloperCommands) {
@@ -141,10 +191,42 @@ void TabLog::getClicked()
         pend = client->prepareModeratorCommand(cmd);
     }
 
+    isFetching = true;
+    getButton->setEnabled(false);
+
     connect(pend, &PendingCommand::finished, this, &TabLog::viewLogHistory_processResponse);
     client->sendCommand(pend);
 }
 
+void TabLog::checkFetchMore()
+{
+    if (isFetching || !hasMoreResults) {
+        return;
+    }
+
+    // Only the table the moderator is looking at may pull the next page. Checking all
+    // three would make an empty or hidden table nearBottom by definition (maximum() and
+    // value() are both zero), so a room-only browse chained page after page without any
+    // scrolling - pulling the whole range with a growing OFFSET scan per page, and
+    // looping forever against a server that ignores `offset`.
+    auto *table = qobject_cast<QTableWidget *>(tabManager->currentWidget());
+    if (table == nullptr || table->rowCount() == 0) {
+        return;
+    }
+
+    // ScrollPerItem (the default) counts rows, not pixels: `value` is the top visible row
+    // and `maximum` the last one that can be scrolled to. Prefetch half a page ahead so
+    // scrolling never visibly stalls, without the fixed 300-row threshold firing the next
+    // page the moment a page loads.
+    const QScrollBar *bar = table->verticalScrollBar();
+    const int prefetchRows = qMax(1, pageSize / 2);
+    if (bar->maximum() - bar->value() > prefetchRows) {
+        return;
+    }
+
+    fetchPage(currentOffset);
+}
+
 void TabLog::clearClicked()
 {
     findUsername->clear();
@@ -166,6 +248,10 @@ void TabLog::clearClicked()
     pastDays->setAutoExclusive(true);
     today->setAutoExclusive(true);
     lastHour->setAutoExclusive(true);
+    currentOffset = 0;
+    hasMoreResults = false;
+    hasCurrentQuery = false;
+    snapshotBefore.clear();
 }
 
 void TabLog::createDock()
@@ -209,14 +295,15 @@ void TabLog::createDock()
     pastXDays = new QSpinBox;
     pastXDays->setMaximum(20);
 
-    labelMaximum = new QLabel(tr("Maximum Results: "));
+    labelMaximum = new QLabel(tr("Results per page: "));
     maximumResults = new QSpinBox;
     maximumResults->setMaximum(1000);
+    maximumResults->setToolTip(tr("Page size for smooth scrolling: more rows load automatically as you scroll."));
 
-    labelDescription = new QLabel(tr(
-        "At least one filter is required.\nThe more information you put in, the more specific your results will be."));
+    labelDescription = new QLabel(tr("Leave filters empty to browse recent room and game messages.\n"
+                                     "More rows load automatically as you scroll."));
 
-    getButton = new QPushButton(tr("Get User Logs"));
+    getButton = new QPushButton(tr("Get Logs"));
     getButton->setAutoDefault(true);
     connect(getButton, &QPushButton::clicked, this, &TabLog::getClicked);
 
@@ -262,7 +349,7 @@ void TabLog::createDock()
     maxResultsGrid->addWidget(labelMaximum, 0, 0);
     maxResultsGrid->addWidget(maximumResults, 0, 1);
 
-    maxResultsGroupBox = new QGroupBox(tr("Maximum Results"));
+    maxResultsGroupBox = new QGroupBox(tr("Results per page"));
     maxResultsGroupBox->setLayout(maxResultsGrid);
 
     descriptionGrid = new QGridLayout;
@@ -295,84 +382,134 @@ void TabLog::createDock()
     searchDock->setWidget(searchDockContents);
 }
 
+void TabLog::appendChatMessage(QTableWidget *table,
+                               int &counter,
+                               const QString &time,
+                               const QString &senderName,
+                               const QString &senderIp,
+                               const QString &messageText,
+                               const QString &targetId,
+                               const QString &targetName,
+                               const QString &channel)
+{
+    table->insertRow(counter);
+    table->setItem(counter, 0, new QTableWidgetItem(time));
+    table->setItem(counter, 1, new QTableWidgetItem(senderName));
+    table->setItem(counter, 2, new QTableWidgetItem(senderIp));
+    table->setItem(counter, 3, new QTableWidgetItem(messageText));
+    table->setItem(counter, 4, new QTableWidgetItem(targetId));
+    table->setItem(counter, 5, new QTableWidgetItem(targetName));
+    if (table->columnCount() > 6) {
+        table->setItem(counter, 6, new QTableWidgetItem(channel));
+    }
+    ++counter;
+}
+
 void TabLog::viewLogHistory_processResponse(const Response &resp)
 {
     const Response_ViewLogHistory &response = resp.GetExtension(Response_ViewLogHistory::ext);
+    const bool isFirstPage = (currentOffset == 0);
+    isFetching = false;
+    getButton->setEnabled(true);
+
     if (resp.response_code() != Response::RespOk) {
         QMessageBox::critical(static_cast<QWidget *>(parent()), tr("Message History"),
                               tr("Failed to collect message history information."));
         return;
     }
 
-    if (response.log_message_size() == 0) {
+    if (isFirstPage && response.log_message_size() == 0) {
         QMessageBox::information(static_cast<QWidget *>(parent()), tr("Message History"),
                                  tr("There are no messages for the selected filters."));
+        hasMoreResults = false;
         return;
     }
 
-    int roomCounter = 0, gameCounter = 0, chatCounter = 0;
-    roomTable->setRowCount(roomCounter);
-    gameTable->setRowCount(gameCounter);
-    chatTable->setRowCount(chatCounter);
+    const QString thisPageStart = response.log_message_size() > 0 ? pageStartKey(response) : QString();
+
+    if (isFirstPage) {
+        // Rows come newest first, so the first one fixes the snapshot every later page is
+        // bounded by. Without it, each message logged between two page fetches pushes the
+        // window down by one and repeats a row the moderator already has.
+        snapshotBefore = QString::fromStdString(response.log_message(0).time());
+    } else if (!response.has_has_more() && !thisPageStart.isEmpty() && thisPageStart == lastPageStartKey) {
+        // A server that predates `offset` ignores it and returns the same page again. It
+        // also predates `has_more`, so the full-page heuristic below can never prove
+        // exhaustion and every scroll would append the same rows forever. The identical
+        // first row is the proof; stop instead of looping.
+        hasMoreResults = false;
+        return;
+    }
+    lastPageStartKey = thisPageStart;
 
     for (int i = 0; i < response.log_message_size(); ++i) {
         ServerInfo_ChatMessage message = response.log_message(i);
         const QString targetType = QString::fromStdString(message.target_type());
         if (targetType == "room" || targetType == "room_channel") {
-            roomTable->insertRow(roomCounter);
-            roomTable->setItem(roomCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
-            roomTable->setItem(roomCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
-            roomTable->setItem(roomCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
-            roomTable->setItem(roomCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
-            roomTable->setItem(roomCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
-            roomTable->setItem(roomCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
-            roomTable->setItem(roomCounter, 6, new QTableWidgetItem(QString::fromStdString(message.channel())));
-            ++roomCounter;
+            appendChatMessage(roomTable, roomCounter, QString::fromStdString(message.time()),
+                              QString::fromStdString(message.sender_name()),
+                              QString::fromStdString(message.sender_ip()), QString::fromStdString(message.message()),
+                              QString::fromStdString(message.target_id()),
+                              QString::fromStdString(message.target_name()), QString::fromStdString(message.channel()));
         }
 
         if (targetType == "game") {
-            gameTable->insertRow(gameCounter);
-            gameTable->setItem(gameCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
-            gameTable->setItem(gameCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
-            gameTable->setItem(gameCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
-            gameTable->setItem(gameCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
-            gameTable->setItem(gameCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
-            gameTable->setItem(gameCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
-            ++gameCounter;
+            appendChatMessage(gameTable, gameCounter, QString::fromStdString(message.time()),
+                              QString::fromStdString(message.sender_name()),
+                              QString::fromStdString(message.sender_ip()), QString::fromStdString(message.message()),
+                              QString::fromStdString(message.target_id()),
+                              QString::fromStdString(message.target_name()));
         }
 
         if (targetType == "chat") {
-            chatTable->insertRow(chatCounter);
-            chatTable->setItem(chatCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time())));
-            chatTable->setItem(chatCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name())));
-            chatTable->setItem(chatCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip())));
-            chatTable->setItem(chatCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message())));
-            chatTable->setItem(chatCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id())));
-            chatTable->setItem(chatCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name())));
-            ++chatCounter;
+            appendChatMessage(chatTable, chatCounter, QString::fromStdString(message.time()),
+                              QString::fromStdString(message.sender_name()),
+                              QString::fromStdString(message.sender_ip()), QString::fromStdString(message.message()),
+                              QString::fromStdString(message.target_id()),
+                              QString::fromStdString(message.target_name()));
         }
     }
 
+    currentOffset += response.log_message_size();
+    if (response.has_has_more()) {
+        hasMoreResults = response.has_more();
+    } else {
+        // Legacy server without has_more: a full page implies more may exist.
+        hasMoreResults = (response.log_message_size() >= pageSize);
+    }
+
     if (roomCounter) {
         roomTable->show();
-        roomTable->resizeColumnsToContents();
+        if (isFirstPage) {
+            roomTable->resizeColumnsToContents();
+        }
     } else {
         roomTable->hide();
     }
 
     if (gameCounter) {
-        gameTable->resizeColumnsToContents();
+        if (isFirstPage) {
+            gameTable->resizeColumnsToContents();
+        }
         gameTable->show();
     } else {
         gameTable->hide();
     }
 
     if (chatCounter) {
-        chatTable->resizeColumnsToContents();
+        if (isFirstPage) {
+            chatTable->resizeColumnsToContents();
+        }
         chatTable->show();
     } else {
         chatTable->hide();
     }
+
+    // The new rows may already fill less than a viewport (or the user is
+    // still parked at the bottom), so chain the next page without waiting
+    // for another scroll event. The prefetch stays invisible: rows simply
+    // keep appearing as you scroll.
+    checkFetchMore();
 }
 
 void TabLog::restartLayout()
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h
index fc8ef1ea0..f2f5842c5 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h
@@ -10,6 +10,7 @@
 #include "tab.h"
 
 #include <QString>
+#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <qtmetamacros.h>
 
 class AbstractClient;
@@ -25,6 +26,7 @@ class QWidget;
 class QGridLayout;
 class QVBoxLayout;
 class QTableWidget;
+class QTabWidget;
 class Response;
 class TabSupervisor;
 
@@ -48,8 +50,37 @@ private:
         *buttonGroupBox;
     QVBoxLayout *mainLayout;
     QTableWidget *roomTable, *gameTable, *chatTable;
+    QTabWidget *tabManager = nullptr;
+
+    //! The filters of the search in flight, captured when Get was clicked so that
+    //! later pages cannot pick up edits the moderator made after starting it.
+    Command_ViewLogHistory currentQuery;
+    bool hasCurrentQuery = false;
+    //! Newest `log_time` of the first page, sent back as the upper bound of every
+    //! later page so messages logged in the meantime do not shift the window.
+    QString snapshotBefore;
+    //! Identity of the previous page's first row, used to spot a server that ignores
+    //! `offset` and hands back the same page forever.
+    QString lastPageStartKey;
+    int currentOffset = 0;
+    int pageSize = 200;
+    int roomCounter = 0, gameCounter = 0, chatCounter = 0;
+    bool isFetching = false;
+    bool hasMoreResults = false;
 
     void createDock();
+    [[nodiscard]] int dateRangeForSelection() const;
+    void fetchPage(int offset);
+    void appendChatMessage(QTableWidget *table,
+                           int &counter,
+                           const QString &time,
+                           const QString &senderName,
+                           const QString &senderIp,
+                           const QString &messageText,
+                           const QString &targetId,
+                           const QString &targetName,
+                           const QString &channel = QString());
+    void checkFetchMore();
 signals:
 
 private slots:
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
index 09a640540..be1adeef8 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
@@ -30,12 +30,14 @@
 #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
 #include <libcockatrice/protocol/pb/response_moderator_last_logins.pb.h>
 #include <libcockatrice/protocol/pb/response_remove_user_avatar.pb.h>
+#include <libcockatrice/protocol/pb/response_remove_user_banner.pb.h>
 #include <libcockatrice/protocol/pb/response_report_user_info.pb.h>
 #include <libcockatrice/protocol/pb/response_reset_user_password.pb.h>
 #include <libcockatrice/protocol/pb/response_user_alts.pb.h>
 #include <libcockatrice/protocol/pb/response_user_sessions.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/utility/qt_utils.h>
 #include <qnamespace.h>
 #include <string>
 
@@ -85,12 +87,16 @@ TabModeration::TabModeration(TabSupervisor *_tabSupervisor, AbstractClient *_cli
     removeAvatarButton = new QPushButton;
     connect(removeAvatarButton, &QPushButton::clicked, this, &TabModeration::removeAvatar);
 
+    removeBannerButton = new QPushButton;
+    connect(removeBannerButton, &QPushButton::clicked, this, &TabModeration::removeBanner);
+
     auto *topBar = new QHBoxLayout;
     topBar->addWidget(searchEdit);
     topBar->addWidget(investigateButton);
     topBar->addStretch();
     topBar->addWidget(resetPasswordButton);
     topBar->addWidget(removeAvatarButton);
+    topBar->addWidget(removeBannerButton);
 
     userInfoGroup = new QGroupBox;
     userInfoNameLabel = new QLabel;
@@ -186,6 +192,7 @@ void TabModeration::retranslateUi()
     investigateButton->setText(tr("Investigate"));
     resetPasswordButton->setText(tr("Reset Password"));
     removeAvatarButton->setText(tr("Remove Avatar"));
+    removeBannerButton->setText(tr("Remove Banner"));
     refreshStaffButton->setText(tr("Refresh"));
 
     userInfoGroup->setTitle(tr("User Info"));
@@ -227,6 +234,7 @@ void TabModeration::clearUserData()
     sessionsTable->setRowCount(0);
     resetPasswordButton->setEnabled(false);
     removeAvatarButton->setEnabled(false);
+    removeBannerButton->setEnabled(false);
 }
 
 void TabModeration::investigate(const QString &userName)
@@ -247,6 +255,7 @@ void TabModeration::investigateUser()
     currentUser = userName;
     resetPasswordButton->setEnabled(true);
     removeAvatarButton->setEnabled(true);
+    removeBannerButton->setEnabled(true);
     altsTable->setRowCount(0);
     sessionsTable->setRowCount(0);
     requestUserInfo(userName);
@@ -414,13 +423,11 @@ void TabModeration::resetPassword()
         return;
     }
 
-    QMessageBox::StandardButton choice =
-        QMessageBox::warning(this, tr("Reset Password"),
-                             tr("Reset the password of %1? A temporary password will be generated and shown to you. "
-                                "The user must change it on their first login.")
-                                 .arg(currentUser),
-                             QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel);
-    if (choice != QMessageBox::Ok) {
+    if (!QtUtils::confirm(this, tr("Reset Password"),
+                          tr("Reset the password of %1? A temporary password will be generated and shown to you. "
+                             "The user must change it on their first login.")
+                              .arg(currentUser),
+                          QMessageBox::No)) {
         return;
     }
 
@@ -451,11 +458,9 @@ void TabModeration::removeAvatar()
         return;
     }
 
-    QMessageBox::StandardButton choice =
-        QMessageBox::warning(this, tr("Remove Avatar"),
-                             tr("Remove the avatar of %1? The user will have to upload a new one.").arg(currentUser),
-                             QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel);
-    if (choice != QMessageBox::Ok) {
+    if (!QtUtils::confirm(this, tr("Remove Avatar"),
+                          tr("Remove the avatar of %1? The user will have to upload a new one.").arg(currentUser),
+                          QMessageBox::No)) {
         return;
     }
 
@@ -477,3 +482,67 @@ void TabModeration::removeAvatarResponse(const Response &response)
     QMessageBox::information(this, tr("Avatar removed"),
                              tr("The avatar of %1 has been removed.").arg(QString::fromStdString(resp.user_name())));
 }
+
+void TabModeration::removeBanner()
+{
+    if (currentUser.isEmpty()) {
+        return;
+    }
+
+    if (!QtUtils::confirm(this, tr("Remove Banner"),
+                          tr("Remove the banner card of %1? The user will have to choose a new one.\n\n"
+                             "Other players stop seeing the banner the next time %1 logs in.")
+                              .arg(currentUser),
+                          QMessageBox::No)) {
+        return;
+    }
+
+    Command_RemoveUserBanner cmd;
+    cmd.set_user_name(currentUser.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::removeBannerResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::removeBannerResponse(const Response &response)
+{
+    const QString target = currentUser.isEmpty() ? tr("this user") : currentUser;
+
+    switch (response.response_code()) {
+        case Response::RespOk:
+            break;
+        case Response::RespNameNotFound:
+            QMessageBox::warning(this, tr("User not found"),
+                                 tr("The server does not know a user named %1.").arg(target));
+            return;
+        case Response::RespFunctionNotAllowed:
+            QMessageBox::warning(this, tr("Not supported"),
+                                 tr("This server does not support removing banner cards. It may be running an older "
+                                    "version."));
+            return;
+        case Response::RespInternalError:
+            QMessageBox::critical(
+                this, tr("Error"),
+                tr("The server could not clear the banner card of %1 because of a database error.").arg(target));
+            return;
+        default:
+            QMessageBox::critical(
+                this, tr("Error"),
+                tr("The server rejected the request for %1: %2")
+                    .arg(target, QString::fromStdString(Response_ResponseCode_Name(response.response_code()))));
+            return;
+    }
+
+    const Response_RemoveUserBanner &resp = response.GetExtension(Response_RemoveUserBanner::ext);
+    const QString removedUser = resp.user_name().empty() ? target : QString::fromStdString(resp.user_name());
+    if (!resp.had_banner()) {
+        QMessageBox::information(this, tr("No banner set"),
+                                 tr("%1 has no banner card set, so there was nothing to remove.").arg(removedUser));
+        return;
+    }
+
+    QMessageBox::information(this, tr("Banner removed"),
+                             tr("The banner card of %1 has been removed.\n\n"
+                                "Other players stop seeing it the next time %1 logs in.")
+                                 .arg(removedUser));
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.h b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
index e352e90bb..ce23b5a7a 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_moderation.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
@@ -20,7 +20,7 @@ class TabSupervisor;
 /**
  * Staff investigation tool. Lets moderators look up a user's account data,
  * alternate accounts, login sessions, and staff login activity, and offers
- * the password-reset and remove-avatar actions.
+ * the password-reset, remove-avatar, and remove-banner actions.
  */
 class TabModeration : public Tab
 {
@@ -44,6 +44,8 @@ private slots:
     void resetPasswordResponse(const Response &response);
     void removeAvatar();
     void removeAvatarResponse(const Response &response);
+    void removeBanner();
+    void removeBannerResponse(const Response &response);
 
 private:
     void requestUserInfo(const QString &userName);
@@ -60,6 +62,7 @@ private:
     QPushButton *investigateButton;
     QPushButton *resetPasswordButton;
     QPushButton *removeAvatarButton;
+    QPushButton *removeBannerButton;
 
     QGroupBox *userInfoGroup;
     QLabel *userInfoNameLabel;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
index 9c28abd0b..dfde08f8e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
@@ -2,9 +2,10 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
+#include "../../theme_icon.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
+#include "../interface/theme_manager.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "../visual_deck_storage/deck_preview/public_deck_preview_widget.h"
 #include "../visual_deck_storage/remote_public_decks_model.h"
@@ -28,6 +29,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <functional>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_download_public.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
@@ -45,15 +47,25 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c
     cardSize = SettingsCache::instance().cardsDisplay().getVisualDeckStorageCardSize();
 
     titleLabel = new QLabel(tr("Public decks of %1").arg(userName.toHtmlEscaped()), this);
-    titleLabel->setFont(QtUtils::boldFont(titleLabel->font()));
+    // Family comes from the InterfaceDefault theme role; bold stays caller-side.
+    auto applyTitleFont = [this]() {
+        titleLabel->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault)));
+    };
+    applyTitleFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this, applyTitleFont] {
+        applyTitleFont();
+        // Preview cells paint with the live role font; repaint the grid so the
+        // new family shows without waiting for a scroll or hover.
+        flowWidget->update();
+    });
 
     auto *headerLayout = new QHBoxLayout;
     headerLayout->addWidget(titleLabel);
     headerLayout->addStretch(1);
 
     // Filter/toolbar row, matching the Visual Deck Storage: color identity filter
-    // first, the search bar stretching in the middle, and the quick settings
-    // cogwheel at the end. The card size slider lives inside the cogwheel popup.
+    // first, the search bar stretching in the middle, and the quick-settings button
+    // at the end. The card size slider lives inside its popup.
     emptyLabel = new QLabel(tr("This user has not published any decks."), this);
     emptyLabel->setAlignment(Qt::AlignCenter);
     emptyLabel->setVisible(false);
@@ -68,7 +80,7 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c
     colorIdentityFilter = new DeckPreviewColorIdentityFilterWidget(this);
     searchWidget = new VisualDeckStorageSearchWidget(this);
     refreshButton = new QToolButton(this);
-    refreshButton->setIcon(QPixmap("theme:icons/reload"));
+    refreshButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload")));
     refreshButton->setFixedSize(32, 32);
     quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this);
     quickSettingsWidget->setPublicDecksMode(true);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
index d37bff3d8..bd2a69017 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
@@ -1,7 +1,7 @@
 #include "tab_replays.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
 #include "libcockatrice/protocol/pb/commands.pb.h"
 #include "libcockatrice/protocol/pb/serverinfo_replay.pb.h"
@@ -145,17 +145,17 @@ QGroupBox *TabReplays::createLeftLayout()
 
     // Left side actions
     aOpenLocalReplay = new QAction(this);
-    aOpenLocalReplay->setIcon(themePixmap(QStringLiteral("icons/view")));
+    aOpenLocalReplay->setIcon(loadThemedIcon(QStringLiteral("icons/view")));
     connect(aOpenLocalReplay, &QAction::triggered, this, &TabReplays::actOpenLocalReplay);
     connect(localDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenLocalReplay);
     aRenameLocal = new QAction(this);
-    aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename")));
+    aRenameLocal->setIcon(loadThemedIcon(QStringLiteral("icons/rename")));
     connect(aRenameLocal, &QAction::triggered, this, &TabReplays::actRenameLocal);
     aNewLocalFolder = new QAction(this);
     aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewLocalFolder, &QAction::triggered, this, &TabReplays::actNewLocalFolder);
     aDeleteLocalReplay = new QAction(this);
-    aDeleteLocalReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    aDeleteLocalReplay->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     connect(aDeleteLocalReplay, &QAction::triggered, this, &TabReplays::actDeleteLocalReplay);
 
     aOpenReplaysFolder = new QAction(this);
@@ -207,24 +207,24 @@ QGroupBox *TabReplays::createRightLayout()
 
     // Right side actions
     aOpenRemoteReplay = new QAction(this);
-    aOpenRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/view")));
+    aOpenRemoteReplay->setIcon(loadThemedIcon(QStringLiteral("icons/view")));
     connect(aOpenRemoteReplay, &QAction::triggered, this, &TabReplays::actOpenRemoteReplay);
     connect(serverDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenRemoteReplay);
     aDownload = new QAction(this);
-    aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green")));
+    aDownload->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_left")));
     connect(aDownload, &QAction::triggered, this, &TabReplays::actDownload);
     aKeep = new QAction(this);
-    aKeep->setIcon(themePixmap(QStringLiteral("icons/lock")));
+    aKeep->setIcon(loadThemedIcon(QStringLiteral("icons/lock")));
     connect(aKeep, &QAction::triggered, this, &TabReplays::actKeepRemoteReplay);
     aDeleteRemoteReplay = new QAction(this);
-    aDeleteRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    aDeleteRemoteReplay->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row")));
     connect(aDeleteRemoteReplay, &QAction::triggered, this, &TabReplays::actDeleteRemoteReplay);
     aGetReplayCode = new QAction(this);
-    aGetReplayCode->setIcon(themePixmap(QStringLiteral("icons/share")));
+    aGetReplayCode->setIcon(loadThemedIcon(QStringLiteral("icons/share")));
     connect(aGetReplayCode, &QAction::triggered, this, &TabReplays::actGetReplayCode);
 
     aSubmitReplayCode = new QAction(this);
-    aSubmitReplayCode->setIcon(themePixmap(QStringLiteral("icons/search")));
+    aSubmitReplayCode->setIcon(loadThemedIcon(QStringLiteral("icons/search")));
     connect(aSubmitReplayCode, &QAction::triggered, this, &TabReplays::actSubmitReplayCode);
 
     // Add actions to toolbars
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.cpp b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
index 988c3e7d9..7986286b3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_report.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
@@ -1,5 +1,6 @@
 #include "tab_report.h"
 
+#include "../interface/theme_manager.h"
 #include "../server/user/user_context_menu.h"
 #include "../utility/report_utils.h"
 #include "abstract_client.h"
@@ -12,6 +13,7 @@
 #include <QComboBox>
 #include <QDateTime>
 #include <QDebug>
+#include <QFont>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
@@ -137,7 +139,8 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
     chatGroup = new QGroupBox;
     chatLogEdit = new QTextEdit;
     chatLogEdit->setReadOnly(true);
-    chatLogEdit->setFont(QtUtils::monospaceFont());
+    applyChatLogFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this, &TabReport::applyChatLogFont);
     auto *chatLayout = new QVBoxLayout(chatGroup);
     chatLayout->setContentsMargins(4, 4, 4, 4);
     chatLayout->addWidget(chatLogEdit);
@@ -269,6 +272,11 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T
     refreshList();
 }
 
+void TabReport::applyChatLogFont()
+{
+    chatLogEdit->setFont(report_utils::reportLogFont());
+}
+
 void TabReport::retranslateUi()
 {
     userContextMenu->retranslateUi();
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.h b/cockatrice/src/interface/widgets/tabs/tab_report.h
index 32ebe1a3f..43e778f4b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_report.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.h
@@ -62,6 +62,7 @@ private slots:
     void statsResponse(const Response &response);
     void reopenReport();
     void reopenResponse(const Response &response);
+    void applyChatLogFont();
 
 private:
     int selectedReportId() const;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
index f63b77445..329732c64 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@@ -2,7 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../interface/widgets/dialogs/dlg_settings.h"
 #include "../interface/widgets/server/chat_view/chat_view.h"
 #include "../interface/widgets/server/game_link.h"
@@ -198,7 +198,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     connect(aOpenChatSettings, &QAction::triggered, this, &TabRoom::actOpenChatSettings);
 
     auto *chatSettingsButton = new QToolButton;
-    chatSettingsButton->setIcon(themePixmap(QStringLiteral("icons/settings")));
+    chatSettingsButton->setIcon(loadThemedIcon(QStringLiteral("icons/settings")));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index 8ec76aaf0..45c320852 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -2,15 +2,12 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../game/abstract_game.h"
-#include "../../../game/game_event_handler.h"
-#include "../../../game/game_meta_info.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../intents/contexts/context_connect_to_server.h"
 #include "../../intents/contexts/context_join_game.h"
 #include "../../intents/contexts/context_join_room.h"
 #include "../../intents/intent.h"
 #include "../../intents/intent_join_server_game.h"
+#include "../../theme_icon.h"
 #include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/server/game_link.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
@@ -51,8 +48,6 @@
 #include <QDebug>
 #include <QFlag>
 #include <QIcon>
-#include <QListIterator>
-#include <QMapIterator>
 #include <QMenu>
 #include <QMessageBox>
 #include <QMessageLogger>
@@ -60,11 +55,16 @@
 #include <QPainter>
 #include <QRect>
 #include <QSharedPointer>
+#include <QStackedWidget>
 #include <QStringLiteral>
 #include <QStyle>
 #include <QStyleOption>
 #include <QSystemTrayIcon>
 #include <QTabBar>
+#include <libcockatrice/deck_list/loaded_deck.h>
+#include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_meta_info.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -159,6 +159,15 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
       tabReplays(nullptr), tabAdmin(nullptr), tabCardArtRules(nullptr), tabLog(nullptr), tabReport(nullptr),
       tabModeration(nullptr), tabDeveloper(nullptr), isLocalGame(false)
 {
+    setObjectName("tabSupervisor");
+
+    // QTabWidget keeps tab pages in an internal stacked widget. Give it a stable
+    // name so the GUI tests can address the pages by a readable path
+    // (tabSupervisor/stackedWidget/<TabName>).
+    if (auto *stackedWidget = findChild<QStackedWidget *>()) {
+        stackedWidget->setObjectName("stackedWidget");
+    }
+
     setElideMode(Qt::ElideRight);
     setMovable(true);
     setIconSize(QSize(15, 15));
@@ -292,49 +301,11 @@ void TabSupervisor::retranslateUi()
     aTabDeveloper->setText(tr("Developer"));
 
     // tabs
-    QList<Tab *> tabs;
-    tabs.append(tabHome);
-    tabs.append(tabServer);
-    tabs.append(tabReplays);
-    tabs.append(tabDeckStorage);
-    tabs.append(tabAdmin);
-    tabs.append(tabAccount);
-    tabs.append(tabLog);
-    tabs.append(tabReport);
-    tabs.append(tabModeration);
-    tabs.append(tabCardArtRules);
-    tabs.append(tabDeveloper);
-    QMapIterator<int, TabRoom *> roomIterator(roomTabs);
-    while (roomIterator.hasNext()) {
-        tabs.append(roomIterator.next().value());
-    }
-    QMapIterator<int, TabGame *> gameIterator(gameTabs);
-    while (gameIterator.hasNext()) {
-        tabs.append(gameIterator.next().value());
-    }
-    QMapIterator<QString, TabPublicDecks *> publicDecksIterator(publicDecksTabs);
-    while (publicDecksIterator.hasNext()) {
-        tabs.append(publicDecksIterator.next().value());
-    }
-    QListIterator<TabGame *> replayIterator(replayTabs);
-    while (replayIterator.hasNext()) {
-        tabs.append(replayIterator.next());
-    }
-    QListIterator<AbstractTabDeckEditor *> deckEditorIterator(deckEditorTabs);
-    while (deckEditorIterator.hasNext()) {
-        tabs.append(deckEditorIterator.next());
-    }
-    QMapIterator<QString, TabMessage *> messageIterator(messageTabs);
-    while (messageIterator.hasNext()) {
-        tabs.append(messageIterator.next().value());
-    }
-
-    for (auto &tab : tabs) {
-        if (tab) {
-            int idx = indexOf(tab);
+    for (int i = 0; i < count(); ++i) {
+        if (auto *tab = qobject_cast<Tab *>(widget(i))) {
             QString tabText = tab->getTabText();
-            setTabText(idx, sanitizeTabName(tabText));
-            setTabToolTip(idx, sanitizeHtml(tabText));
+            setTabText(i, sanitizeTabName(tabText));
+            setTabToolTip(i, sanitizeHtml(tabText));
             tab->retranslateUi();
         }
     }
@@ -502,6 +473,9 @@ void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager
     auto closeSide = static_cast<QTabBar::ButtonPosition>(
         tabBar()->style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, tabBar()));
     auto *closeButton = new CloseButton(tab);
+    // No object name: the tab bar index shifts when tabs move or close, so an
+    // index-derived name would go stale (or collide). Callers find the button
+    // through the tab widget instead.
     if (manager) {
         // If managed, all close requests should go through the menu action
         connect(closeButton, &CloseButton::clicked, this, [manager] { checkAndTrigger(manager, false); });
@@ -1387,7 +1361,7 @@ void TabSupervisor::tabUserEvent(bool globalEvent)
     auto *tab = static_cast<Tab *>(sender());
     if (tab != currentWidget()) {
         tab->setContentsChanged(true);
-        setTabIcon(indexOf(tab), themePixmap(QStringLiteral("icons/tab_changed")));
+        setTabIcon(indexOf(tab), loadThemedIcon(QStringLiteral("icons/tab_changed")));
     }
     if (globalEvent && SettingsCache::instance().userInterface().getNotificationsEnabled()) {
         QApplication::alert(this);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
index f4b007072..26d29463b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
@@ -23,9 +23,10 @@ TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor
 
 void TabVisualDatabaseDisplay::retranslateUi()
 {
+    visualDatabaseDisplayWidget->retranslateUi();
 }
 
 void TabVisualDatabaseDisplay::openEdhrecTab(const CardInfoPtr &info, bool isCommander) const
 {
     getTabSupervisor()->addEdhrecTab(info, isCommander);
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
index be7255dc3..84bf026f7 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
@@ -2,7 +2,6 @@
 
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../client/settings/shortcuts_settings.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../deck_editor/deck_editor_card_database_dock_widget.h"
 #include "../../deck_editor/deck_editor_card_info_dock_widget.h"
 #include "../../deck_editor/deck_editor_deck_dock_widget.h"
@@ -21,7 +20,6 @@
 #include "tab_deck_editor_visual_tab_widget.h"
 
 #include <QAction>
-#include <QApplication>
 #include <QByteArray>
 #include <QDebug>
 #include <QDockWidget>
@@ -44,6 +42,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <functional>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>
@@ -61,8 +60,8 @@ TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : Abstra
 {
     setObjectName("TabDeckEditorVisual");
 
-    createCentralFrame();
     createMenus();
+    createCentralFrame();
 
     installEventFilter(this);
 
@@ -105,7 +104,6 @@ void TabDeckEditorVisual::createCentralFrame()
 
     centralFrame->addWidget(tabContainer);
     setCentralWidget(centralWidget);
-    setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
 }
 
 /** @brief Updates the visual deck, analytics, and sample hand after a deck change. */
@@ -262,17 +260,25 @@ void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event,
     }
 }
 
+/** @brief Get a zone name corresponding to keyboard modifiers. */
+static QString zoneForClickModifiers(const Qt::KeyboardModifiers &modifiers)
+{
+    if (modifiers.testFlag(Qt::ControlModifier)) {
+        return DECK_ZONE_SIDE;
+    } else if (modifiers.testFlag(Qt::ShiftModifier)) {
+        return DECK_ZONE_MAYBEBOARD;
+    } else {
+        return DECK_ZONE_MAIN;
+    }
+}
+
 /** @brief Handles clicks on cards in the database display. */
 void TabDeckEditorVisual::processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card)
 {
     if (event->button() == Qt::LeftButton) {
-        if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
-            addCard(card, DECK_ZONE_SIDE);
-        } else {
-            addCard(card, DECK_ZONE_MAIN);
-        }
+        addCard(card, zoneForClickModifiers(event->modifiers()));
     } else if (event->button() == Qt::RightButton) {
-        decrementCard(card, DECK_ZONE_MAIN);
+        decrementCard(card, zoneForClickModifiers(event->modifiers()));
     } else if (event->button() == Qt::MiddleButton) {
         deckDockWidget->actRemoveCard();
     }
diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
index 74c149b2d..ece9881b4 100644
--- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
@@ -1,9 +1,7 @@
 #include "tab_deck_storage_visual.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/deck_color_identity.h"
 #include "../../deck_share/deck_share_utils.h"
 #include "../../deck_share/share_bar_widget.h"
@@ -17,7 +15,9 @@
 #include <QWidget>
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
index a629df43c..0090e9d65 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
@@ -1,5 +1,6 @@
 #include "card_completer_delegate.h"
 
+#include "../../interface/theme_manager.h"
 #include "../../pixel_map_generator.h"
 #include "../cards/additional_info/mana_cost_widget.h"
 #include "libcockatrice/card/database/card_database_querier.h"
@@ -182,7 +183,7 @@ void CardCompleterDelegate::drawManaSymbol(QPainter *p, QPoint centre, const QSt
     p->setBrush(Qt::NoBrush);
     p->drawEllipse(pip.adjusted(1, 1, -1, -1));
 
-    QFont f = QtUtils::boldFont(p->font());
+    QFont f = QtUtils::boldFont(themeManager->appFont(AppFont::CardText));
     f.setPixelSize(qMax(radius - 1, 7));
 
     p->setFont(f);
@@ -429,7 +430,7 @@ void CardCompleterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
         const QRect nameRect = showInfoBand ? QRect(textLeft, rect.top() + 2, textWidth, 20)
                                             : QRect(textLeft, rect.top() + 2, textWidth, rect.height() - 4);
 
-        QFont f = option.font;
+        QFont f = themeManager->appFont(AppFont::CardText);
         f.setPixelSize(13);
         f.setBold(true);
 
@@ -451,7 +452,7 @@ void CardCompleterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
     if (showInfoBand) {
         const QRect infoRect(textLeft, rect.top() + 22, textWidth, rect.height() - 24);
 
-        QFont f = option.font;
+        QFont f = themeManager->appFont(AppFont::CardText);
         f.setPixelSize(10);
 
         painter->setFont(f);
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
index 8f1941412..1a17bb8be 100644
--- a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
@@ -1,5 +1,6 @@
 #include "card_completer_styler.h"
 
+#include "../../interface/theme_manager.h"
 #include "../cards/card_info_picture_enlarged_widget.h"
 #include "card_completer_delegate.h"
 #include "libcockatrice/card/database/card_database_querier.h"
@@ -73,6 +74,10 @@ CardCompleterStyler::CardCompleterStyler(QCompleter *completer, QObject *parent)
 
     popup->viewport()->setMouseTracking(true);
 
+    // The delegate reads the CardText role at paint time, so a font change
+    // only needs a repaint of the popup.
+    connect(themeManager, &ThemeManager::fontsChanged, popup, [popup] { popup->viewport()->update(); });
+
     popup->installEventFilter(this);
     popup->viewport()->installEventFilter(this);
 
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.cpp b/cockatrice/src/interface/widgets/utility/report_utils.cpp
index d7fc083c6..df2400b14 100644
--- a/cockatrice/src/interface/widgets/utility/report_utils.cpp
+++ b/cockatrice/src/interface/widgets/utility/report_utils.cpp
@@ -1,5 +1,6 @@
 #include "report_utils.h"
 
+#include "../../theme_manager.h"
 #include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
 
 #include <QApplication>
@@ -7,6 +8,7 @@
 #include <QChar>
 #include <QColor>
 #include <QDateTime>
+#include <QFontDatabase>
 #include <QPalette>
 #include <QSharedPointer>
 #include <QTableWidget>
@@ -19,6 +21,20 @@
 namespace report_utils
 {
 
+QFont reportLogFont()
+{
+    if (themeManager->hasAppFont(AppFont::ChatLog)) {
+        return themeManager->appFont(AppFont::ChatLog);
+    }
+    QFont monoFont(QStringLiteral("monospace"));
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    return monoFont;
+}
+
 namespace
 {
 QColor reportStatusColor(const QString &status)
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.h b/cockatrice/src/interface/widgets/utility/report_utils.h
index 679989486..32cc19eac 100644
--- a/cockatrice/src/interface/widgets/utility/report_utils.h
+++ b/cockatrice/src/interface/widgets/utility/report_utils.h
@@ -1,6 +1,7 @@
 #ifndef REPORT_UTILS_H
 #define REPORT_UTILS_H
 
+#include <QFont>
 #include <QString>
 #include <QtGlobal>
 
@@ -11,6 +12,12 @@ class ServerInfo_Report;
 namespace report_utils
 {
 
+/** @brief Font for the report chat-log views: the theme's ChatLog role when it
+ *         sets one, otherwise the monospace font these views used before the
+ *         role existed. Shared by the three report surfaces so they cannot
+ *         drift apart. */
+QFont reportLogFont();
+
 QString formatReportCategory(const QString &category);
 QString formatReportTime(qint64 secondsSinceEpoch);
 
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
index 44e6581e9..b09e6da1e 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
@@ -2,7 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 
 #include <QChar>
 #include <QEvent>
@@ -24,8 +24,8 @@ SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWid
     defaultButton = new QPushButton("", this);
 
     lineEdit->setMinimumWidth(70);
-    clearButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
-    defaultButton->setIcon(themePixmap(QStringLiteral("icons/update")));
+    clearButton->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch")));
+    defaultButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload")));
 
     auto *layout = QtUtils::makeLayout<QHBoxLayout>(this, 1);
     layout->addWidget(lineEdit);
diff --git a/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.cpp b/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.cpp
new file mode 100644
index 000000000..a8262c75a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.cpp
@@ -0,0 +1,206 @@
+#include "card_database_visual_view.h"
+
+#include "../../card_picture_loader/card_picture_loader.h"
+#include "../cards/card_info_picture_widget.h"
+#include "../cards/card_picture_delegate.h"
+#include "../cards/card_size_widget.h"
+#include "card_database_visual_display_model.h"
+#include "libcockatrice/card/printing/exact_card.h"
+
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QCursor>
+#include <QEvent>
+#include <QFrame>
+#include <QModelIndex>
+#include <QMouseEvent>
+#include <QScrollBar>
+#include <QSize>
+#include <QWheelEvent>
+#include <QWidget>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+CardDatabaseVisualView::CardDatabaseVisualView(CardDatabaseVisualDisplayModel *_model, QWidget *parent)
+    : QListView(parent), model(_model)
+{
+    auto *cardDelegate = new CardPictureDelegate(model, this);
+    setItemDelegate(cardDelegate);
+    setModel(model);
+
+    setViewMode(QListView::IconMode);
+    setFlow(QListView::LeftToRight);
+    setWrapping(true);
+    setResizeMode(QListView::Adjust);
+    setMovement(QListView::Static);
+    setUniformItemSizes(true);
+    setLayoutMode(QListView::SinglePass);
+    setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setFrameShape(QFrame::NoFrame);
+    setWordWrap(false);
+
+    // QListView hands the delegate's item height to the scroll bar as its single
+    // step under ScrollPerPixel, so one wheel notch would jump wheelScrollLines()
+    // whole card rows. Give the bar a text line instead; the wheel handler below
+    // scales that line to the grid. A positive step also stops Qt from taking the
+    // item height back on the next layout.
+    verticalScrollBar()->setSingleStep(qMax(1, fontMetrics().height()));
+
+    // The grid is a read-only surface: clicks are actions on a card, not a
+    // selection, and they must not steal focus from the search field.
+    setSelectionMode(QAbstractItemView::NoSelection);
+    setEditTriggers(QAbstractItemView::NoEditTriggers);
+    setFocusPolicy(Qt::NoFocus);
+
+    // Hover drives the card preview.
+    setMouseTracking(true);
+    viewport()->setMouseTracking(true);
+
+    connect(&CardPictureLoader::getInstance(), &CardPictureLoader::pixmapLoaded, this,
+            [this] { viewport()->update(); });
+
+    // A new search result starts at the top, like the widget-per-card grid did.
+    connect(model, &QAbstractItemModel::modelReset, this, [this] {
+        verticalScrollBar()->setValue(0);
+        // The rows under a stationary cursor changed with the reset: re-resolve the
+        // hover so the preview follows the grid, as enterEvent did per card widget.
+        hoveredRow = -1;
+        updateHoveredRow(viewport()->mapFromGlobal(QCursor::pos()));
+    });
+
+    setCardSizeFactor(cardSizeFactor);
+}
+
+void CardDatabaseVisualView::setCardSizeFactor(int factor)
+{
+    cardSizeFactor = qBound(CardSizeWidget::MIN_CARD_SIZE, factor, CardSizeWidget::MAX_CARD_SIZE);
+
+    const QSize cardSize = CardInfoPictureWidget::sizeForScaleFactor(cardSizeFactor);
+    if (auto *cardDelegate = qobject_cast<CardPictureDelegate *>(itemDelegate())) {
+        cardDelegate->setCardSize(cardSize);
+    }
+    // The delegate's sizeHint does not emit sizeHintChanged, so the grid size is what
+    // makes a resize take effect. Keep the two in step.
+    setGridSize(cardSize + QSize(CardPictureDelegate::SPACING, CardPictureDelegate::SPACING));
+}
+
+void CardDatabaseVisualView::mousePressEvent(QMouseEvent *event)
+{
+    const QModelIndex index = indexAt(event->pos());
+    if (index.isValid() && model != nullptr) {
+        const ExactCard card = model->cardAt(index.row());
+        if (card) {
+            emit cardClicked(event, card);
+            event->accept();
+            return;
+        }
+    }
+
+    QListView::mousePressEvent(event);
+}
+
+void CardDatabaseVisualView::mouseMoveEvent(QMouseEvent *event)
+{
+    QListView::mouseMoveEvent(event);
+    updateHoveredRow(event->pos());
+}
+
+bool CardDatabaseVisualView::viewportEvent(QEvent *event)
+{
+    // A per-card widget reported its hover from enterEvent, which also fires when the
+    // grid changes under a stationary cursor. A QListView only reports moves, so
+    // re-resolve the hover on enter and clear it on leave.
+    if (event->type() == QEvent::Enter) {
+        updateHoveredRow(viewport()->mapFromGlobal(QCursor::pos()));
+    } else if (event->type() == QEvent::Leave) {
+        hoveredRow = -1;
+    }
+
+    return QListView::viewportEvent(event);
+}
+
+void CardDatabaseVisualView::wheelEvent(QWheelEvent *event)
+{
+    // Ctrl+wheel is the card-size gesture and is filtered out before it reaches
+    // the view; any other modifier keeps QAbstractSlider's own page scrolling.
+    if (event->modifiers() != Qt::NoModifier) {
+        QListView::wheelEvent(event);
+        return;
+    }
+
+    // macOS uses transient (overlay) scroll bars that hide themselves
+    // once they fade out, so we need to use the range to determine if we ignore the wheel when there is nothing to
+    // scroll. This lets an enclosing scroll area take over.
+    QScrollBar *bar = verticalScrollBar();
+    if (bar->maximum() <= bar->minimum()) {
+        event->ignore();
+        return;
+    }
+
+    // Touchpads and high-resolution wheels already report pixels: follow them.
+    if (!event->pixelDelta().isNull()) {
+        bar->setValue(bar->value() - event->pixelDelta().y());
+        event->accept();
+        return;
+    }
+
+    if (event->angleDelta().y() == 0) {
+        QListView::wheelEvent(event);
+        return;
+    }
+
+    // Accumulate wheel deltas smaller than a notch, like QAbstractSlider does, so
+    // a fine-grained wheel still moves.
+    wheelRemainder += static_cast<qreal>(event->angleDelta().y()) / 120.0;
+    const int notches = static_cast<int>(wheelRemainder);
+    if (notches == 0) {
+        event->accept();
+        return;
+    }
+    wheelRemainder -= notches;
+
+    const int pixels = -notches * wheelStep();
+    bar->setValue(qBound(bar->minimum(), bar->value() + pixels, bar->maximum()));
+    event->accept();
+}
+
+int CardDatabaseVisualView::wheelStep() const
+{
+    // A card row is far too coarse for one wheel line, and a text line is too
+    // fine, so a line is an eighth of the grid cell. A notch then moves about a
+    // third of a card row at any card size, and the OS line count still applies.
+    const int lineHeight = qMax(1, gridSize().height() / 8);
+    return qMax(1, QApplication::wheelScrollLines()) * lineHeight;
+}
+
+void CardDatabaseVisualView::updateHoveredRow(const QPoint &position)
+{
+    // indexAt() also answers for points outside the viewport, so a cursor parked
+    // below the grid (on the size slider, say) would resolve to the row just under
+    // the visible area. Only a point inside the viewport can hover a card.
+    if (model == nullptr || !viewport()->rect().contains(position)) {
+        return;
+    }
+
+    const QModelIndex index = indexAt(position);
+    const int row = index.isValid() ? index.row() : -1;
+    if (row == hoveredRow) {
+        return;
+    }
+
+    hoveredRow = row;
+    if (row >= 0) {
+        const ExactCard card = model->cardAt(row);
+        if (card) {
+            emit cardHovered(card);
+        }
+    }
+}
+
+void CardDatabaseVisualView::leaveEvent(QEvent *event)
+{
+    hoveredRow = -1;
+    QListView::leaveEvent(event);
+}
diff --git a/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.h b/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.h
new file mode 100644
index 000000000..5f004484d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.h
@@ -0,0 +1,67 @@
+/**
+ * @file card_database_visual_view.h
+ * @ingroup VisualCardDatabaseWidgets
+ * @brief Icon-mode view of the card database, one card picture per item.
+ */
+
+#ifndef CARD_DATABASE_VISUAL_VIEW_H
+#define CARD_DATABASE_VISUAL_VIEW_H
+
+#include <QListView>
+#include <QSize>
+#include <qtmetamacros.h>
+
+class CardDatabaseVisualDisplayModel;
+class ExactCard;
+class QEvent;
+class QMouseEvent;
+class QPoint;
+class QWheelEvent;
+
+/**
+ * @brief A wrapping grid of card pictures.
+ *
+ * The view virtualizes painting: it only asks the delegate for the items that are
+ * on screen, so the whole card database can sit in the model without a widget (or
+ * pixmap) per card. Clicks and hover are reported with the exact card under the
+ * cursor, which is what the deck editor needs to add, decrement or preview a card.
+ */
+class CardDatabaseVisualView : public QListView
+{
+    Q_OBJECT
+
+public:
+    explicit CardDatabaseVisualView(CardDatabaseVisualDisplayModel *_model, QWidget *parent = nullptr);
+
+    /**
+     * @brief Sets the card size as a percentage of the base card width.
+     * @param factor Percentage in the range of the card size slider.
+     */
+    void setCardSizeFactor(int factor);
+
+signals:
+    /** @brief A card was pressed. The event is valid for the duration of the emission. */
+    void cardClicked(QMouseEvent *event, const ExactCard &card);
+    /** @brief The cursor moved onto a different card. */
+    void cardHovered(const ExactCard &card);
+
+protected:
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void leaveEvent(QEvent *event) override;
+    bool viewportEvent(QEvent *event) override;
+    void wheelEvent(QWheelEvent *event) override;
+
+private:
+    void updateHoveredRow(const QPoint &position);
+    /// Pixels one wheel notch moves, scaled to the grid and the OS line count.
+    [[nodiscard]] int wheelStep() const;
+
+    CardDatabaseVisualDisplayModel *model;
+    /// Fraction of a line left over from a wheel event smaller than one notch.
+    qreal wheelRemainder = 0.0;
+    int cardSizeFactor = 100;
+    int hoveredRow = -1;
+};
+
+#endif // CARD_DATABASE_VISUAL_VIEW_H
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
index 464d62e4a..46330ac46 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
@@ -15,9 +15,23 @@
 #include <QtGlobal>
 #include <libcockatrice/filters/filter_tree.h>
 
+namespace
+{
+
+/** @brief Remove the filters that apply to the given color and attribute from the given model. */
+static void removeFilters(FilterTreeModel *filterModel, QChar color, CardFilter::Attr attr)
+{
+    for (const CardFilter *filter : filterModel->getFiltersOfType(attr)) {
+        if (filter->term() == color) {
+            filterModel->removeFilter(filter);
+        }
+    }
+}
+} // namespace
+
 /**
- * This widget provides a graphical control element for the CardFilter::Attr::AttrColor filters applied to the filter
- * model.
+ * This widget provides a graphical control element for the CardFilter::Attr::AttrColor and
+ * CardFilter::Attr::AttrColorIdentity filters applied to the filter model.
  * @param parent The Qt Widget that this widget will parent to
  * @param _filterModel The filter model that this widget will manipulate
  */
@@ -59,11 +73,25 @@ void VisualDatabaseDisplayColorFilterWidget::retranslateUi()
     modeComboBox->blockSignals(true);
     modeComboBox->clear();
 
-    modeComboBox->addItem(tr("Exact match"), QVariant::fromValue(FilterMode::ExactMatch));
     modeComboBox->addItem(tr("Includes"), QVariant::fromValue(FilterMode::Includes));
+    modeComboBox->addItem(tr("Excludes"), QVariant::fromValue(FilterMode::Excludes));
     modeComboBox->addItem(tr("Include / Exclude"), QVariant::fromValue(FilterMode::IncludeExclude));
+    modeComboBox->addItem(tr("Exact match"), QVariant::fromValue(FilterMode::ExactMatch));
+    modeComboBox->addItem(tr("Color identity"), QVariant::fromValue(FilterMode::ColorIdentity));
+
+    modeComboBox->setItemData(0, tr("Cards containing any of the selected colors"), Qt::ToolTipRole);
+    modeComboBox->setItemData(1, tr("Cards containing none of the selected colors"), Qt::ToolTipRole);
+    modeComboBox->setItemData(2, tr("Cards containing any of the selected colors and none of the unselected colors"),
+                              Qt::ToolTipRole);
+    modeComboBox->setItemData(3, tr("Cards being exactly of the selected colors"), Qt::ToolTipRole);
+    modeComboBox->setItemData(4, tr("Cards whose color identity fits within the selected colors"), Qt::ToolTipRole);
+
+    if (currentMode == FilterMode::Custom) {
+        addCustomFilterModeItem();
+    }
 
     modeComboBox->setToolTip(tr("How selected and unselected colors are combined in the filter"));
+    modeComboBox->setAccessibleName(tr("Color filter mode"));
 
     // Restore current mode
     const int index = modeComboBox->findData(QVariant::fromValue(currentMode));
@@ -74,6 +102,28 @@ void VisualDatabaseDisplayColorFilterWidget::retranslateUi()
     modeComboBox->blockSignals(false);
 }
 
+void VisualDatabaseDisplayColorFilterWidget::setFilterMode(FilterMode filterMode)
+{
+    int index = modeComboBox->findData(QVariant::fromValue(filterMode));
+
+    if (index < 0 && filterMode == FilterMode::Custom) {
+        index = modeComboBox->count();
+        addCustomFilterModeItem();
+    }
+
+    if (index >= 0) {
+        modeComboBox->setCurrentIndex(index);
+    }
+}
+
+void VisualDatabaseDisplayColorFilterWidget::addCustomFilterModeItem()
+{
+    int customIndex = modeComboBox->count();
+    modeComboBox->addItem(tr("Custom"), QVariant::fromValue(FilterMode::Custom));
+    modeComboBox->setItemData(customIndex, tr("Cards matching an unknown combination of color filters"),
+                              Qt::ToolTipRole);
+}
+
 void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, bool active)
 {
     if (active) {
@@ -85,74 +135,24 @@ void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, boo
 
 void VisualDatabaseDisplayColorFilterWidget::addFilter(QChar color)
 {
-    QString colorString = color;
-    QString typeStr;
+    FilterModeInfo info = getFilterModeInfo(currentMode);
 
-    // Remove previous filters
+    removeFilters(filterModel, color, info.attr);
 
-    QList<const CardFilter *> allColorFilters = filterModel->getFiltersOfType(CardFilter::Attr::AttrColor);
-    QList<const CardFilter *> matchingFilters;
-
-    for (const CardFilter *filter : allColorFilters) {
-        if (filter->term() == color) {
-            matchingFilters.append(filter);
-        }
-    }
-
-    for (const CardFilter *filter : matchingFilters) {
-        filterModel->removeFilter(filter);
-    }
-
-    // Add actual filter
-
-    switch (currentMode) {
-        case FilterMode::ExactMatch:
-            filterModel->addFilter(new CardFilter(colorString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrColor));
-            break;
-
-        case FilterMode::Includes:
-            filterModel->addFilter(new CardFilter(colorString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrColor));
-            break;
-
-        case FilterMode::IncludeExclude:
-            filterModel->addFilter(new CardFilter(colorString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrColor));
-            break;
+    if (info.includeType != CardFilter::Type::TypeEnd) {
+        filterModel->addFilter(new CardFilter(color, info.includeType, info.attr));
     }
 }
 
 void VisualDatabaseDisplayColorFilterWidget::removeFilter(QChar color)
 {
-    QString colorString = color;
+    FilterModeInfo info = getFilterModeInfo(currentMode);
 
-    // Remove inclusion filters
-    QList<const CardFilter *> allColorFilters = filterModel->getFiltersOfType(CardFilter::Attr::AttrColor);
-    QList<const CardFilter *> matchingFilters;
+    removeFilters(filterModel, color, info.attr);
 
-    for (const CardFilter *filter : allColorFilters) {
-        if (filter->term() == color) {
-            matchingFilters.append(filter);
-        }
-    }
-
-    for (const CardFilter *filter : matchingFilters) {
-        filterModel->removeFilter(filter);
-    }
-
-    // Add exclusion filters if the mode demands it
-    switch (currentMode) {
-        case FilterMode::ExactMatch:
-            filterModel->addFilter(
-                new CardFilter(colorString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor));
-            break;
-
-        case FilterMode::IncludeExclude:
-            filterModel->addFilter(
-                new CardFilter(colorString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor));
-            break;
-
-        case FilterMode::Includes:
-            // No exclusion in Includes mode
-            break;
+    // Add exclusion filters if the mode demands it.
+    if (info.excludeType != CardFilter::Type::TypeEnd) {
+        filterModel->addFilter(new CardFilter(color, info.excludeType, info.attr));
     }
 }
 
@@ -169,6 +169,7 @@ void VisualDatabaseDisplayColorFilterWidget::updateFilterMode()
     filterModel->filterTree()->blockSignals(true);
 
     filterModel->clearFiltersOfType(CardFilter::Attr::AttrColor);
+    filterModel->clearFiltersOfType(CardFilter::Attr::AttrColorIdentity);
 
     const QList<ManaSymbolWidget *> manaSymbolWidgets = findChildren<ManaSymbolWidget *>();
 
@@ -211,52 +212,53 @@ QList<QChar> VisualDatabaseDisplayColorFilterWidget::getActiveColors()
 
 void VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel()
 {
-    QList<const CardFilter *> allColorFilters = filterModel->getFiltersOfType(CardFilter::Attr::AttrColor);
+    QList<const CardFilter *> filters;
+    filters.append(filterModel->getFiltersOfType(CardFilter::Attr::AttrColor));
+    filters.append(filterModel->getFiltersOfType(CardFilter::Attr::AttrColorIdentity));
 
-    QList<ManaSymbolWidget *> manaSymbolWidgets = findChildren<ManaSymbolWidget *>();
+    // Re-derive the mode from the filters in the model, so that a loaded filter set selects the mode that
+    // produced it (or Custom when none could have).
+    currentMode = deriveFilterMode(filters, currentMode);
 
-    for (ManaSymbolWidget *manaSymbolWidget : manaSymbolWidgets) {
+    // Update the combobox. Add a Custom item only if we have a custom filter mode.
+    int customIndex = modeComboBox->findData(QVariant::fromValue(FilterMode::Custom));
+    modeComboBox->blockSignals(true);
+    if (currentMode == FilterMode::Custom) {
+        if (customIndex < 0) {
+            customIndex = modeComboBox->count();
+            addCustomFilterModeItem();
+        }
+        modeComboBox->setCurrentIndex(customIndex);
+    } else {
+        if (customIndex >= 0) {
+            modeComboBox->removeItem(customIndex);
+        }
+        int index = modeComboBox->findData(QVariant::fromValue(currentMode));
+        if (index >= 0) {
+            modeComboBox->setCurrentIndex(index);
+        }
+    }
+    modeComboBox->blockSignals(false);
+
+    // Update the mana symbol widgets by looking for the current mode's include or exclude filters.
+    const FilterModeInfo modeInfo = getFilterModeInfo(currentMode);
+
+    const bool useExclude =
+        modeInfo.includeType == CardFilter::Type::TypeEnd && modeInfo.excludeType != CardFilter::Type::TypeEnd;
+    const CardFilter::Type filterType = useExclude ? modeInfo.excludeType : modeInfo.includeType;
+
+    filters = filterModel->getFiltersOfType(modeInfo.attr);
+
+    for (ManaSymbolWidget *manaSymbolWidget : findChildren<ManaSymbolWidget *>()) {
         bool found = false;
-        for (const CardFilter *filter : allColorFilters) {
-            if (manaSymbolWidget->getSymbolChar() == filter->term()) {
-                switch (currentMode) {
-                    case FilterMode::ExactMatch:
-                        switch (filter->type()) {
-                            case CardFilter::Type::TypeAnd:
-                                setManaSymbolActive(filter->term().at(0), true);
-                                break;
-                            default:
-                                setManaSymbolActive(filter->term().at(0), false);
-                                break;
-                        }
-                        break;
-                    case FilterMode::Includes:
-                        switch (filter->type()) {
-                            case CardFilter::Type::TypeOr:
-                                setManaSymbolActive(filter->term().at(0), true);
-                                break;
-                            default:
-                                setManaSymbolActive(filter->term().at(0), false);
-                                break;
-                        }
-                        break;
-                    case FilterMode::IncludeExclude:
-                        switch (filter->type()) {
-                            case CardFilter::Type::TypeOr:
-                                setManaSymbolActive(filter->term().at(0), true);
-                                break;
-                            default:
-                                setManaSymbolActive(filter->term().at(0), false);
-                                break;
-                        }
-                        break;
-                }
+        for (const CardFilter *filter : filters) {
+            if (filter->type() == filterType && manaSymbolWidget->getSymbolChar() == filter->term()) {
                 found = true;
+                break;
             }
         }
 
-        if (!found) {
-            setManaSymbolActive(manaSymbolWidget->getSymbolChar(), false);
-        }
+        manaSymbolWidget->setColorActive(useExclude ? !found : found);
+        manaSymbolWidget->setDisabled(currentMode == FilterMode::Custom);
     }
 }
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
index 184f1f96c..561c92d09 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h
@@ -10,8 +10,8 @@
 #include <QByteArray>
 #include <QChar>
 #include <QList>
-#include <QMetaType>
 #include <QWidget>
+#include <libcockatrice/filters/filter_mode.h>
 #include <libcockatrice/utility/debouncer.h>
 #include <qtmetamacros.h>
 
@@ -38,15 +38,6 @@ private:
     int circleDiameter;
 };
 
-enum class FilterMode
-{
-    ExactMatch,    // Only selected colors are included, all others are excluded.
-    Includes,      // Include selected colors (OR condition).
-    IncludeExclude // Include selected colors (OR) and exclude unselected colors (AND NOT).
-};
-
-Q_DECLARE_METATYPE(FilterMode)
-
 class VisualDatabaseDisplayColorFilterWidget : public QWidget
 {
     Q_OBJECT
@@ -54,11 +45,13 @@ class VisualDatabaseDisplayColorFilterWidget : public QWidget
 public:
     explicit VisualDatabaseDisplayColorFilterWidget(QWidget *parent, FilterTreeModel *filterModel);
     void retranslateUi();
+    void setFilterMode(FilterMode filterMode);
 
 signals:
     void filterModeChanged(FilterMode filterMode);
 
 private slots:
+    void addCustomFilterModeItem();
     void handleColorToggled(QChar color, bool active);
     void addFilter(QChar color);
     void removeFilter(QChar color);
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
index 5063cce14..ecb949b67 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
@@ -1,6 +1,6 @@
 #include "visual_database_display_filter_toolbar_widget.h"
 
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../deck_editor/card_database_view.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "card_database_display_model.h"
@@ -45,13 +45,13 @@ VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidg
     sortGroupBox = new QGroupBox(this);
     filterGroupBox = new QGroupBox(this);
 
-    auto scalePixmap = [](const QString &fileName) { return QIcon(QPixmap(fileName)).pixmap({20, 20}); };
+    auto scalePixmap = [](const QString &prefix) { return loadThemedIcon(prefix).pixmap({20, 20}); };
 
     sortByLabel = new QLabel(this);
-    sortByLabel->setPixmap(scalePixmap("theme:icons/sort_arrow_down"));
+    sortByLabel->setPixmap(scalePixmap("icons/sort_arrow_down"));
 
     filterByLabel = new QLabel(this);
-    filterByLabel->setPixmap(scalePixmap("theme:icons/filter"));
+    filterByLabel->setPixmap(scalePixmap("icons/filter"));
 
     sortColumnCombo = new QComboBox(this);
     sortColumnCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
@@ -89,22 +89,22 @@ VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidg
     });
 
     quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
-    quickFilterSaveLoadWidget->setButtonIcon(themePixmap(QStringLiteral("icons/floppy_disk")));
+    quickFilterSaveLoadWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/floppy_disk")));
 
     quickFilterNameWidget = new SettingsButtonWidget(this);
-    quickFilterNameWidget->setButtonIcon(themePixmap(QStringLiteral("icons/pen_to_square")));
+    quickFilterNameWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/pen_to_square")));
 
     quickFilterMainTypeWidget = new SettingsButtonWidget(this);
-    quickFilterMainTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/circle_half_stroke")));
+    quickFilterMainTypeWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/circle_half_stroke")));
 
     quickFilterSubTypeWidget = new SettingsButtonWidget(this);
-    quickFilterSubTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/dragon")));
+    quickFilterSubTypeWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/dragon")));
 
     quickFilterSetWidget = new SettingsButtonWidget(this);
-    quickFilterSetWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scroll")));
+    quickFilterSetWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scroll")));
 
     quickFilterFormatLegalityWidget = new SettingsButtonWidget(this);
-    quickFilterFormatLegalityWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced")));
+    quickFilterFormatLegalityWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scales")));
 
     retranslateUi();
 }
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
index ecf59cfc0..6d9b28619 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
@@ -4,7 +4,7 @@
 #include "../../../filters/filter_tree_model.h"
 #include "../../../filters/syntax_help.h"
 #include "../../key_signals.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../cards/card_info_picture_widget.h"
 #include "../cards/card_info_picture_with_text_overlay_widget.h"
 #include "../cards/card_size_widget.h"
@@ -13,32 +13,23 @@
 #include "../utility/custom_line_edit.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
+#include "card_database_visual_display_model.h"
+#include "card_database_visual_view.h"
 #include "deck_list_model.h"
 #include "libcockatrice/card/card_localization.h"
 #include "libcockatrice/card/database/card_database_loader.h"
 #include "libcockatrice/card/database/card_database_querier.h"
 #include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
 #include "libcockatrice/filters/filter_card.h"
 #include "libcockatrice/filters/filter_tree.h"
 #include "visual_database_display_color_filter_widget.h"
 #include "visual_database_display_filter_toolbar_widget.h"
 
-#include <QAbstractItemModel>
 #include <QAction>
-#include <QDebug>
 #include <QIcon>
 #include <QLabel>
 #include <QLineEdit>
-#include <QList>
-#include <QMessageLogger>
-#include <QModelIndex>
-#include <QPair>
-#include <QPersistentModelIndex>
 #include <QPushButton>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QSharedPointer>
 #include <QSizePolicy>
 #include <QSlider>
 #include <QStringLiteral>
@@ -48,14 +39,11 @@
 #include <QVBoxLayout>
 #include <QVariant>
 #include <QtGlobal>
-#include <algorithm>
-#include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
-#include <utility>
 
 class QMouseEvent;
 
@@ -64,11 +52,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
                                                          DeckListModel *deckListModel)
     : QWidget(parent)
 {
-    debounceTimer = new QTimer(this);
-    debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout
-
-    connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
-
     // Create display model
     databaseDisplayModel = new CardDatabaseDisplayModel(this);
     databaseDisplayModel->setObjectName("databaseDisplayModel");
@@ -86,37 +69,26 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
             applyCardSearchLanguage);
 
-    cards = new QList<ExactCard>;
-    connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this,
-            &VisualDatabaseDisplayWidget::modelDirty);
-
     // Set up main layout and widgets
     setMinimumSize(0, 0);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     mainLayout = QtUtils::makeLayout<QVBoxLayout>(this, 0, 1);
     setLayout(mainLayout);
 
-    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
-    cardSizeWidget = new CardSizeWidget(this, flowWidget,
-                                        SettingsCache::instance().cardsDisplay().getVisualDatabaseDisplayCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
-            &CardsDisplaySettings::setVisualDatabaseDisplayCardSize);
-    cardSizeWidget->enableCtrlScrollResize(flowWidget);
-
     searchContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
 
     searchEdit = new SearchLineEdit();
     searchEdit->setObjectName("searchEdit");
     searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
     searchEdit->setClearButtonEnabled(true);
-    searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
-    auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
+    searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
+    auto help = searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
     connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
 
     setFocusProxy(searchEdit);
     setFocusPolicy(Qt::ClickFocus);
 
-    displayModeButton = new QPushButton(tr("Visual"), this);
+    displayModeButton = new QPushButton(this);
     displayModeButton->setCheckable(true); // Toggle button
 
     connect(displayModeButton, &QPushButton::toggled, this, &VisualDatabaseDisplayWidget::onDisplayModeChanged);
@@ -159,16 +131,36 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     connect(databaseView, &CardDatabaseView::relatedCardClicked, this,
             &VisualDatabaseDisplayWidget::onRelatedCardClicked);
 
+    // The visual grid is a real view on a flattened model: one row per displayed
+    // card picture, painted on demand.
+    visualDisplayModel = new CardDatabaseVisualDisplayModel(databaseDisplayModel, CardDatabaseManager::query(), this);
+
+    cardView = new CardDatabaseVisualView(visualDisplayModel, this);
+    cardView->setObjectName("visualCardView");
+    connect(cardView, &CardDatabaseVisualView::cardClicked, this,
+            &VisualDatabaseDisplayWidget::cardClickedDatabaseDisplay);
+    connect(cardView, &CardDatabaseVisualView::cardHovered, this,
+            &VisualDatabaseDisplayWidget::cardHoveredDatabaseDisplay);
+
+    const int cardSize = SettingsCache::instance().cardsDisplay().getVisualDatabaseDisplayCardSize();
+    cardSizeWidget = new CardSizeWidget(this, nullptr, cardSize);
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setVisualDatabaseDisplayCardSize);
+    connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, cardView, &CardDatabaseVisualView::setCardSizeFactor);
+    cardView->setCardSizeFactor(cardSize);
+    cardSizeWidget->enableCtrlScrollResize(cardView);
+
     colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
 
     filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this, deckListModel);
 
     clearFilterWidget = new QToolButton();
     clearFilterWidget->setFixedSize(32, 32);
-    clearFilterWidget->setIcon(themePixmap(QStringLiteral("icons/delete")));
+    clearFilterWidget->setIcon(loadThemedIcon(QStringLiteral("icons/delete")));
     connect(clearFilterWidget, &QToolButton::clicked, this, [this] {
         filterModel->blockSignals(true);
         filterModel->filterTree()->blockSignals(true);
+        colorFilterWidget->setFilterMode(FilterMode::Includes);
         filterModel->clear();
         filterModel->blockSignals(false);
         filterModel->filterTree()->blockSignals(false);
@@ -190,8 +182,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
         databaseLoadIndicator->setVisible(false);
     }
 
-    QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
-    connect(scrollBar, &QScrollBar::valueChanged, [this](int /*value*/) { loadCurrentPage(); });
     retranslateUi();
 }
 
@@ -210,7 +200,7 @@ void VisualDatabaseDisplayWidget::initialize()
 
     mainLayout->addWidget(databaseView);
 
-    mainLayout->addWidget(flowWidget);
+    mainLayout->addWidget(cardView);
 
     mainLayout->addWidget(cardSizeWidget);
 
@@ -241,8 +231,6 @@ void VisualDatabaseDisplayWidget::initializeFilters()
 
         databaseDisplayModel->setFilterTree(filterModel->filterTree());
 
-        QTimer::singleShot(5000, this, [this] { loadCurrentPage(); });
-
         retranslateUi();
     });
 }
@@ -262,6 +250,10 @@ void VisualDatabaseDisplayWidget::retranslateUi()
 {
     databaseLoadIndicator->setText(tr("Loading database ..."));
     clearFilterWidget->setToolTip(tr("Clear all filters"));
+    searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
+    updateDisplayModeButton();
+    colorFilterWidget->retranslateUi();
+    filterContainer->retranslateUi();
 }
 
 void VisualDatabaseDisplayWidget::highlightAllSearchEdit()
@@ -269,72 +261,41 @@ void VisualDatabaseDisplayWidget::highlightAllSearchEdit()
     searchEdit->setSelection(0, searchEdit->text().length());
 }
 
-void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event)
+void VisualDatabaseDisplayWidget::updateDisplayModeButton()
 {
-    QWidget::resizeEvent(event);
-    loadCurrentPage();
+    displayModeButton->setText(displayModeButton->isChecked() ? tr("Table") : tr("Visual"));
 }
 
 void VisualDatabaseDisplayWidget::onDisplayModeChanged(bool checked)
 {
+    updateDisplayModeButton();
     if (checked) {
         // Table mode
-        displayModeButton->setText(tr("Table"));
-        flowWidget->setVisible(false);
+        cardView->setVisible(false);
         cardSizeWidget->setVisible(false);
         databaseView->setItemDelegate(new QStyledItemDelegate(databaseView));
         databaseView->setVisible(true);
     } else {
         // Visual mode
-        displayModeButton->setText(tr("Visual"));
-        flowWidget->setVisible(true);
+        cardView->setVisible(true);
         cardSizeWidget->setVisible(true);
         databaseView->setVisible(false);
-        populateCards();
     }
 }
 
-void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card)
-{
-    emit cardClickedDatabaseDisplay(event, card);
-}
-
-void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard)
-{
-    emit cardHoveredDatabaseDisplay(hoveredCard);
-}
-
-void VisualDatabaseDisplayWidget::addCardToDisplay(const ExactCard &cardToAdd)
-{
-    cards->append(cardToAdd);
-    auto *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false);
-    display->setScaleFactor(cardSizeWidget->getSlider()->value());
-    display->setCard(cardToAdd);
-    flowWidget->addWidget(display);
-    connect(display, &CardInfoPictureWithTextOverlayWidget::cardClicked, this, &VisualDatabaseDisplayWidget::onClick);
-    connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover);
-    connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor);
-}
-
 bool VisualDatabaseDisplayWidget::isVisualDisplayMode() const
 {
     return !displayModeButton->isChecked();
 }
 
+QStringList VisualDatabaseDisplayWidget::collectSetFilterTerms() const
+{
+    return filterModel->getFilterTermsOfType(CardFilter::AttrSet);
+}
+
 void VisualDatabaseDisplayWidget::onSearchModelChanged()
 {
-    if (flowWidget->isVisible()) {
-        // Clear the current page and prepare for new data
-        flowWidget->clearLayout(); // Clear existing cards
-        cards->clear();            // Clear the card list
-        // Reset scrollbar position to the top after loading new cards
-        QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
-        scrollBar->setValue(0); // Reset scrollbar to top
-
-        currentPage = 0;
-        loadCurrentPage();
-        qCDebug(VisualDatabaseDisplayLog) << "Search model changed";
-    }
+    visualDisplayModel->setSetFilterTerms(collectSetFilterTerms());
 }
 
 void VisualDatabaseDisplayWidget::onSelectedCardChanged(const QString &cardName)
@@ -360,113 +321,3 @@ void VisualDatabaseDisplayWidget::onRelatedCardClicked(const QString &relatedCar
     ExactCard exactCard = CardDatabaseManager::query()->guessCard({relatedCard});
     emit cardInfoRequested(exactCard);
 }
-
-bool VisualDatabaseDisplayWidget::nearEndOfPage() const
-{
-    if (!flowWidget->isVisible()) {
-        return false;
-    }
-
-    QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
-    if (scrollBar->value() + scrollBar->pageStep() * 2 < scrollBar->maximum()) {
-        return false; // there is at least two pages of space to scroll remaining
-    }
-
-    return true;
-}
-
-void VisualDatabaseDisplayWidget::loadCurrentPage()
-{
-    // Ensure only the initial page is loaded
-    if (currentPage == 0) {
-        if (!initialLoadScheduled) {
-            initialLoadScheduled = true;
-            qCDebug(VisualDatabaseDisplayLog) << "Loading the first page";
-            // Defer the first page so the tab switch stays responsive. The card
-            // grid builds one event loop turn later. This also applies to
-            // search-driven reloads, which reset currentPage back to 0.
-            QTimer::singleShot(0, this, [this] {
-                initialLoadScheduled = false;
-                populateCards();
-            });
-        }
-    } else if (nearEndOfPage()) {
-        // If not the first page, just load the next page and append to the flow widget
-        loadNextPage();
-    }
-}
-
-void VisualDatabaseDisplayWidget::populateCards()
-{
-    cards->clear();
-    loadNextPage();
-}
-
-void VisualDatabaseDisplayWidget::loadNextPage()
-{
-    // Calculate the start and end indices for the next page
-    int rowCount = databaseDisplayModel->rowCount();
-    int start = currentPage * cardsPerPage;
-    int end = qMin(start + cardsPerPage, rowCount);
-
-    // Load more cards if we are at the end of the current list and can fetch more
-    if (end >= rowCount && databaseDisplayModel->canFetchMore(QModelIndex())) {
-        databaseDisplayModel->fetchMore(QModelIndex());
-    }
-
-    // Load the next page of cards and add them to the flow widget
-    flowWidget->setUpdatesEnabled(false);
-    loadPage(start, end);
-    flowWidget->setUpdatesEnabled(true);
-}
-
-void VisualDatabaseDisplayWidget::loadPage(int start, int end)
-{
-    QList<const CardFilter *> setFilters = filterModel->getFiltersOfType(CardFilter::AttrSet);
-    for (int row = start; row < end; ++row) {
-        qCDebug(VisualDatabaseDisplayLog) << "Adding " << row;
-        QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn);
-        QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole);
-        qCDebug(VisualDatabaseDisplayLog) << name.toString();
-
-        if (CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(name.toString())) {
-            if (!setFilters.empty()) {
-                const auto &setMap = info->getSets();
-                for (const CardFilter *setFilter : setFilters) {
-                    const auto it = setMap.constFind(setFilter->term());
-                    if (it != setMap.constEnd()) {
-                        for (const PrintingInfo &printing : it.value()) {
-                            addCardToDisplay(ExactCard(info, printing));
-                        }
-                    }
-                }
-            } else {
-                addCardToDisplay(CardDatabaseManager::query()->getPreferredCard(info));
-            }
-        } else {
-            qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!";
-        }
-    }
-    currentPage++;
-}
-
-void VisualDatabaseDisplayWidget::modelDirty() const
-{
-    debounceTimer->start(debounceTime);
-}
-
-void VisualDatabaseDisplayWidget::sortCardList(const QStringList &properties,
-                                               Qt::SortOrder order = Qt::AscendingOrder) const
-{
-    CardInfoComparator comparator(properties, order);
-    std::sort(cards->begin(), cards->end(), [comparator](const ExactCard &a, const ExactCard &b) {
-        return comparator(a.getCardPtr(), b.getCardPtr());
-    });
-}
-
-void VisualDatabaseDisplayWidget::databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
-{
-    (void)topLeft;
-    (void)bottomRight;
-    qCDebug(VisualDatabaseDisplayLog) << "Database Data changed";
-}
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
index 9771e55c1..6148670a3 100644
--- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
@@ -9,8 +9,6 @@
 
 #include "libcockatrice/card/card_info.h"
 
-#include <QLoggingCategory>
-#include <QMouseEvent>
 #include <QString>
 #include <QStringList>
 #include <QWidget>
@@ -21,26 +19,21 @@
 class CardDatabaseDisplayModel;
 class CardDatabaseModel;
 class CardDatabaseView;
+class CardDatabaseVisualDisplayModel;
+class CardDatabaseVisualView;
 class CardSizeWidget;
-class DeckList;
 class DeckListModel;
 class ExactCard;
 class FilterTreeModel;
 class FlowWidget;
-class OverlapControlWidget;
 class QLabel;
-class QModelIndex;
+class QMouseEvent;
 class QPushButton;
-class QScrollArea;
-class QTimer;
 class QToolButton;
 class QVBoxLayout;
 class SearchLineEdit;
 class VisualDatabaseDisplayColorFilterWidget;
 class VisualDatabaseDisplayFilterToolbarWidget;
-template <typename T> class QList;
-
-inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display");
 
 class VisualDatabaseDisplayWidget : public QWidget
 {
@@ -52,14 +45,6 @@ public:
                                          DeckListModel *deckListModel = nullptr);
     void retranslateUi();
 
-    void adjustCardsPerPage();
-    void populateCards();
-    void loadPage(int start, int end);
-    void loadNextPage();
-    void loadCurrentPage();
-    void sortCardList(const QStringList &properties, Qt::SortOrder order) const;
-    void setDeckList(const DeckList &new_deck_list_model);
-
     /**
      * @brief Sets the callback used to create a custom zone from the add-to-zone menu.
      * The callback returns the name of the created zone, or an empty string if creation was cancelled.
@@ -87,6 +72,13 @@ public:
     bool isVisualDisplayMode() const;
 
 public slots:
+    /**
+     * @brief Pushes the active set filters to the visual grid.
+     *
+     * The grid's rows follow the display model's filter and sort signals on their
+     * own; this only forwards the set filters, which decide which printings the
+     * grid shows.
+     */
     void onSearchModelChanged();
 
 signals:
@@ -101,11 +93,6 @@ signals:
 
 protected slots:
     void initialize();
-    void onClick(QMouseEvent *event, const ExactCard &card);
-    void onHover(const ExactCard &hoveredCard);
-    void addCardToDisplay(const ExactCard &cardToAdd);
-    void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-    void modelDirty() const;
     void onDisplayModeChanged(bool checked);
 
     void onSelectedCardChanged(const QString &cardName);
@@ -125,30 +112,21 @@ private:
     QToolButton *clearFilterWidget;
     VisualDatabaseDisplayFilterToolbarWidget *filterContainer;
     CardDatabaseDisplayModel *databaseDisplayModel;
+    CardDatabaseVisualDisplayModel *visualDisplayModel;
     CardDatabaseView *databaseView;
+    CardDatabaseVisualView *cardView;
     std::function<QString()> newZoneCreator;
-    QList<ExactCard> *cards;
     QVBoxLayout *mainLayout;
-    QScrollArea *scrollArea;
-    FlowWidget *flowWidget;
-    QWidget *overlapCategories;
-    QVBoxLayout *overlapCategoriesLayout;
-    OverlapControlWidget *overlapControlWidget;
     CardSizeWidget *cardSizeWidget;
-    QTimer *debounceTimer;
 
-    int debounceTime = 300; // in Ms
-    int currentPage = 0;    // Current page index
-    int cardsPerPage = 100; // Number of cards per page
     bool filtersInitialized = false;
-    bool initialLoadScheduled = false;
 
     void initializeFilters();
     void highlightAllSearchEdit();
-    bool nearEndOfPage() const;
+    void updateDisplayModeButton();
+    [[nodiscard]] QStringList collectSetFilterTerms() const;
 
 protected:
-    void resizeEvent(QResizeEvent *event) override;
     void showEvent(QShowEvent *event) override;
 };
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
index 63ef07835..f0c054c3a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
@@ -1,6 +1,6 @@
 #include "visual_deck_display_options_widget.h"
 
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../deck_editor/deck_editor_deck_dock_widget.h"
 #include "../quick_settings/settings_button_widget.h"
 #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h"
@@ -65,7 +65,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
     sortByLabel = new QLabel(this);
 
     sortCriteriaButton = new SettingsButtonWidget(this);
-    sortCriteriaButton->setButtonIcon(themePixmap(QStringLiteral("icons/sort_arrow_down")));
+    sortCriteriaButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/sort_arrow_down")));
 
     sortLabel = new QLabel(sortCriteriaButton);
     sortLabel->setWordWrap(true);
@@ -119,11 +119,11 @@ void VisualDeckDisplayOptionsWidget::updateDisplayTypeButton()
     switch (currentDisplayType) {
         case DisplayType::Flat:
             displayTypeButton->setButtonText(tr("Toggle Layout: Flat"));
-            displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scroll")));
+            displayTypeButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scroll")));
             break;
         case DisplayType::Overlap:
             displayTypeButton->setButtonText(tr("Toggle Layout: Overlap"));
-            displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scales")));
+            displayTypeButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scales")));
             break;
     }
 }
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
index 76c3d0908..d3c087bc6 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
@@ -1,5 +1,8 @@
 #include "visual_deck_editor_placeholder_widget.h"
 
+#include "../interface/theme_manager.h"
+
+#include <QFont>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <qnamespace.h>
@@ -28,10 +31,12 @@ VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *pa
     textLabel->setStyleSheet(R"(
         QLabel {
             color: palette(mid);
-            font-size: 14px;
             padding: 10px;
         }
     )");
+    applyInterfaceDefaultFont();
+    connect(themeManager, &ThemeManager::fontsChanged, this,
+            &VisualDeckEditorPlaceholderWidget::applyInterfaceDefaultFont);
 
     mainLayout->addWidget(imageLabel);
     mainLayout->addWidget(textLabel);
@@ -42,4 +47,12 @@ VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *pa
 void VisualDeckEditorPlaceholderWidget::retranslateUi()
 {
     textLabel->setText(tr("Add cards using the search bar or database tab to have them appear here"));
+}
+
+void VisualDeckEditorPlaceholderWidget::applyInterfaceDefaultFont()
+{
+    // Family comes from the InterfaceDefault theme role; the 14px size stays caller-side.
+    QFont placeholderFont = themeManager->appFont(AppFont::InterfaceDefault);
+    placeholderFont.setPixelSize(14);
+    textLabel->setFont(placeholderFont);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
index 84a3142d8..794be671e 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
@@ -15,6 +15,9 @@ public:
     explicit VisualDeckEditorPlaceholderWidget(QWidget *parent = nullptr);
     void retranslateUi();
 
+private slots:
+    void applyInterfaceDefaultFont();
+
 private:
     QVBoxLayout *mainLayout;
     QLabel *imageLabel;
diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
index 506ffa2b4..0e0b5e4b4 100644
--- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
@@ -1,7 +1,7 @@
 #include "visual_deck_editor_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "../cards/card_size_widget.h"
 #include "../cards/deck_card_zone_display_widget.h"
 #include "../general/layout_containers/flow_widget.h"
@@ -144,7 +144,7 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
 
     // Search button functionality
     searchPushButton = new CompactPushButton(searchContainer);
-    searchPushButton->setButtonIcon(themePixmap(QStringLiteral("icons/search")));
+    searchPushButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/search")));
     connect(searchPushButton, &QPushButton::clicked, this, [this] { addCardFromSearch(); });
 
     searchLayout->addWidget(searchPushButton);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
index 4e6e7cc05..cebe92495 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
@@ -1,9 +1,7 @@
 #include "deck_preview_deck_tags_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../general/layout_containers/flow_widget.h"
 #include "deck_preview_tag_addition_widget.h"
 #include "deck_preview_tag_dialog.h"
@@ -14,7 +12,10 @@
 #include <QDir>
 #include <QDirIterator>
 #include <QHBoxLayout>
+#include <QPointer>
 #include <QSizePolicy>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 #include <optional>
@@ -117,8 +118,13 @@ void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
 
 void DeckPreviewDeckTagsDisplayWidget::execTagDialog(const QStringList &knownTags)
 {
+    QPointer<DeckPreviewDeckTagsDisplayWidget> self(this);
     DeckPreviewTagDialog dialog(knownTags, currentTags);
     if (dialog.exec() == QDialog::Accepted) {
+        // Guard against the widget being destroyed during dialog.exec()'s nested event loop.
+        if (!self) {
+            return;
+        }
         QStringList updatedTags = dialog.getActiveTags();
         if (updatedTags != currentTags) {
             setTags(updatedTags);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
index 82ed6191c..30e99f401 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
@@ -1,5 +1,7 @@
 #include "deck_preview_tag_addition_widget.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QBrush>
 #include <QColor>
 #include <QFlags>
@@ -26,6 +28,10 @@ DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QSt
 
     // Adjust widget size
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    // The tag text reads the InterfaceDefault role at paint time, so a font
+    // change only needs a repaint.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); });
 }
 
 QSize DeckPreviewTagAdditionWidget::sizeHint() const
@@ -65,8 +71,9 @@ void DeckPreviewTagAdditionWidget::paintEvent(QPaintEvent *event)
     painter.setPen(borderPen);
     painter.drawRect(rect().adjusted(0, 0, -1, -1)); // Adjust for pen width
 
-    // Calculate font size based on widget height
-    QFont font = painter.font();
+    // Calculate font size based on widget height. Family comes from the
+    // InterfaceDefault theme role; the height-derived size stays as before.
+    QFont font = themeManager->appFont(AppFont::InterfaceDefault);
     int fontSize = std::max(10, height() / 2); // Ensure a minimum font size of 10
     font.setPointSize(fontSize);
     painter.setFont(font);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
index e62570241..34809da2e 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
@@ -1,5 +1,7 @@
 #include "deck_preview_tag_display_widget.h"
 
+#include "../../interface/theme_manager.h"
+
 #include <QBrush>
 #include <QColor>
 #include <QFlags>
@@ -41,6 +43,10 @@ DeckPreviewTagDisplayWidget::DeckPreviewTagDisplayWidget(QWidget *parent, const
     // Adjust widget size
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
+    // The tag text reads the InterfaceDefault role at paint time, so a font
+    // change only needs a repaint.
+    connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); });
+
     // Connect close button to the remove signal
     // connect(closeButton, &QPushButton::clicked, this, &DeckPreviewTagDisplayWidget::tagClosed);
 }
@@ -117,8 +123,9 @@ void DeckPreviewTagDisplayWidget::paintEvent(QPaintEvent *event)
     painter.setPen(borderPen);
     painter.drawRect(rect().adjusted(0, 0, -1, -1));
 
-    // Calculate font size based on widget height
-    QFont font = painter.font();
+    // Calculate font size based on widget height. Family comes from the
+    // InterfaceDefault theme role; the height-derived size stays as before.
+    QFont font = themeManager->appFont(AppFont::InterfaceDefault);
     int fontSize = std::max(10, height() / 2); // Ensure a minimum font size of 10
     font.setPointSize(fontSize);
     painter.setFont(font);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
index 220c55788..f2002d4e4 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@@ -3,7 +3,6 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "../visual_deck_storage_model.h"
@@ -45,6 +44,7 @@
 #include <compare>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <qnamespace.h>
 #include <utility>
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
index e84631e52..3611a8c1f 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
@@ -1,8 +1,6 @@
 #include "visual_deck_storage_model.h"
 
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "libcockatrice/deck_list/deck_list.h"
 
@@ -21,6 +19,8 @@
 #include <QtConcurrentRun>
 #include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/utility/card_ref.h>
 #include <optional>
 #include <utility>
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
index 57eaebacf..f9af6f318 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
@@ -13,7 +13,6 @@
 #ifndef VISUAL_DECK_STORAGE_MODEL_H
 #define VISUAL_DECK_STORAGE_MODEL_H
 
-#include "../../deck_loader/loaded_deck.h"
 #include "libcockatrice/utility/card_ref.h"
 
 #include <QAbstractListModel>
@@ -24,6 +23,9 @@
 #include <QString>
 #include <QStringList>
 #include <QVector>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
+#include <optional>
 #include <qnamespace.h>
 #include <qtmetamacros.h>
 
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
index f2669f55d..10a3bf33a 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
@@ -1,7 +1,7 @@
 #include "visual_deck_storage_search_widget.h"
 
 #include "../../../filters/syntax_help.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 
 #include <QAction>
 #include <QHBoxLayout>
@@ -27,9 +27,9 @@ VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(QWidget *parent) :
     searchBar = new QLineEdit(this);
     searchBar->setPlaceholderText(tr("Search by filename (or search expression)"));
     searchBar->setClearButtonEnabled(true);
-    searchBar->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
+    searchBar->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
 
-    auto help = searchBar->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
+    auto help = searchBar->addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
     connect(help, &QAction::triggered, this, [this] { createDeckSearchSyntaxHelpWindow(searchBar); });
 
     layout->addWidget(searchBar);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
index abe3327af..c93e496ec 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
@@ -1,7 +1,6 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../filters/deck_filter_string.h"
 #include "visual_deck_storage_model.h"
 
@@ -16,6 +15,7 @@
 #include <algorithm>
 #include <compare>
 #include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
 VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QObject *parent)
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index efcf19e58..bbf68adb9 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
@@ -1,7 +1,7 @@
 #include "visual_deck_storage_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../pixel_map_generator.h"
+#include "../../theme_icon.h"
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "deck_preview/deck_preview_widget.h"
 #include "libcockatrice/card/database/card_database.h"
@@ -62,12 +62,12 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     searchWidget = new VisualDeckStorageSearchWidget(this);
 
     refreshButton = new QToolButton(this);
-    refreshButton->setIcon(themePixmap(QStringLiteral("icons/reload")));
+    refreshButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload")));
     refreshButton->setFixedSize(32, 32);
     connect(refreshButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::refreshIfPossible);
 
     shareButton = new QToolButton(this);
-    shareButton->setIcon(themePixmap(QStringLiteral("icons/share")));
+    shareButton->setIcon(loadThemedIcon(QStringLiteral("icons/share")));
     shareButton->setFixedSize(32, 32);
     shareButton->setVisible(false);
     connect(shareButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::shareRequested);
@@ -184,7 +184,9 @@ void VisualDeckStorageWidget::resizeEvent(QResizeEvent *event)
 
 void VisualDeckStorageWidget::retranslateUi()
 {
-    databaseLoadIndicator->setText(tr("Loading database ..."));
+    if (databaseLoadIndicator) {
+        databaseLoadIndicator->setText(tr("Loading database ..."));
+    }
 
     refreshButton->setToolTip(tr("Refresh loaded files"));
     shareButton->setToolTip(tr("Select decks to share"));
@@ -279,6 +281,14 @@ void VisualDeckStorageWidget::createRootFolderWidget()
     folderWidget =
         new VisualDeckStorageFolderDisplayWidget(this, this, QString(), false, quickSettingsWidget->getShowFolders());
 
+    // QScrollArea::setWidget() deletes the widget it currently holds. If that is still the
+    // database load indicator, take it back first so the label stays alive for retranslateUi().
+    if (databaseLoadIndicator && scrollArea->widget() == databaseLoadIndicator) {
+        scrollArea->takeWidget();
+        databaseLoadIndicator->setParent(this);
+        databaseLoadIndicator->setVisible(false);
+    }
+
     scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
     scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
     scrollArea->widget()->adjustSize();
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
index b512dd87c..19d16f107 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
@@ -6,6 +6,7 @@
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
+#include <QPointer>
 #include <QSet>
 #include <QString>
 #include <QStringList>
@@ -87,7 +88,7 @@ private:
     QVBoxLayout *layout;
     QWidget *searchAndSortContainer;
     QHBoxLayout *searchAndSortLayout;
-    QLabel *databaseLoadIndicator;
+    QPointer<QLabel> databaseLoadIndicator;
     VisualDeckStorageSortWidget *sortWidget;
     VisualDeckStorageSearchWidget *searchWidget;
     DeckPreviewColorIdentityFilterWidget *deckPreviewColorIdentityFilterWidget;
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index a3446e42b..715505926 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -50,11 +50,20 @@
 #include "latency_tracker.h"
 #include "logger.h"
 #include "pixel_map_generator.h"
+#include "theme_icon.h"
 #include "version_string.h"
 #include "widgets/dialogs/dlg_connect.h"
 #include "widgets/server/handle_public_servers.h"
 #include "widgets/settings_page/abstract_settings_page.h"
 #include "widgets/tabs/api/commander_spellbook/handle_commander_brackets.h"
+#ifdef WITH_GUI_TEST
+#include "../game_graphics/pq_cockatrice_event_player.h"
+#include "pqEventObserver.h"
+#include "pqEventSource.h"
+#include "pqEventTypes.h"
+#include "pqTestUtility.h"
+#include "recording.h"
+#endif
 
 #include <QAction>
 #include <QApplication>
@@ -254,7 +263,11 @@ void MainWindow::actWatchReplay()
 
 void MainWindow::localGameEnded()
 {
-    delete localServer;
+    // Defer deletion so the LocalClients (already scheduled with deleteLater() in TabSupervisor::stop)
+    // and any queued commands are processed before the server and its interfaces are destroyed.
+    if (localServer) {
+        localServer->deleteLater();
+    }
     localServer = nullptr;
 
     aConnect->setEnabled(true);
@@ -306,6 +319,7 @@ void MainWindow::actAbout()
     mb.setIconPixmap(
         themePixmap(QStringLiteral("cockatrice")).scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
     mb.setTextInteractionFlags(Qt::TextBrowserInteraction);
+    mb.setObjectName("aboutDialog");
     mb.exec();
 }
 
@@ -344,6 +358,24 @@ void MainWindow::actOpenSettingsFolder()
     QtUtils::openPathInFileManager(dir);
 }
 
+#ifdef WITH_GUI_TEST
+void MainWindow::actRecord()
+{
+    QString filename = QFileDialog::getSaveFileName(this, tr("Test File Name"), QString(), tr("XML Files (*.xml)"));
+    if (!filename.isEmpty()) {
+        testUtility->recordTests(filename);
+    }
+}
+
+void MainWindow::actPlayRecording()
+{
+    QString filename = QFileDialog::getOpenFileName(this, tr("Test File Name"), QString(), tr("XML Files (*.xml)"));
+    if (!filename.isEmpty()) {
+        testUtility->playTests(filename);
+    }
+}
+#endif
+
 void MainWindow::retranslateUi()
 {
     connectionController->refreshWindowTitle();
@@ -356,10 +388,10 @@ void MainWindow::retranslateUi()
     aRegister->setText(tr("&Register to server..."));
     aForgotPassword->setText(tr("&Restore password..."));
     aSettings->setText(tr("&Settings..."));
-    aSettings->setIcon(themePixmap(QStringLiteral("icons/settings")));
+    aSettings->setIcon(loadThemedIcon(QStringLiteral("icons/settings")));
     settingsButton->setToolTip(tr("Settings"));
     settingsButton->setAccessibleName(tr("Settings"));
-    settingsButton->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
+    settingsButton->setIcon(loadThemedIcon(QStringLiteral("icons/settings")));
     aExit->setText(tr("&Exit"));
 
 #if defined(__APPLE__) /* For OSX */
@@ -388,6 +420,10 @@ void MainWindow::retranslateUi()
     aViewLog->setText(tr("View &Debug Log"));
     aOpenSettingsFolder->setText(tr("Open Settings Folder"));
     aFirstRunWizard->setText(tr("Re-run Onboarding Wizard..."));
+#ifdef WITH_GUI_TEST
+    aRecord->setText(tr("&Record Test..."));
+    aPlayRecording->setText(tr("&Play Test..."));
+#endif
 
     aShow->setText(tr("Show/Hide"));
 
@@ -397,24 +433,33 @@ void MainWindow::retranslateUi()
 void MainWindow::createActions()
 {
     aConnect = new QAction(this);
+    aConnect->setObjectName("actionConnect");
     connect(aConnect, &QAction::triggered, this, &MainWindow::actConnect);
     aDisconnect = new QAction(this);
+    aDisconnect->setObjectName("actionDisconnect");
     aDisconnect->setEnabled(false);
     connect(aDisconnect, &QAction::triggered, this, &MainWindow::actDisconnect);
     aSinglePlayer = new QAction(this);
+    aSinglePlayer->setObjectName("actionSinglePlayer");
     connect(aSinglePlayer, &QAction::triggered, this, &MainWindow::actSinglePlayer);
     aWatchReplay = new QAction(this);
+    aWatchReplay->setObjectName("actionWatchReplay");
     connect(aWatchReplay, &QAction::triggered, this, &MainWindow::actWatchReplay);
     aFullScreen = new QAction(this);
+    aFullScreen->setObjectName("actionFullScreen");
     aFullScreen->setCheckable(true);
     connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen);
     aRegister = new QAction(this);
+    aRegister->setObjectName("actionRegister");
     connect(aRegister, &QAction::triggered, connectionController, &ConnectionController::registerToServer);
     aForgotPassword = new QAction(this);
+    aForgotPassword->setObjectName("actionForgotPassword");
     connect(aForgotPassword, &QAction::triggered, connectionController, &ConnectionController::forgotPasswordRequest);
     aSettings = new QAction(this);
+    aSettings->setObjectName("actionSettings");
     connect(aSettings, &QAction::triggered, this, &MainWindow::actSettings);
     aExit = new QAction(this);
+    aExit->setObjectName("actionExit");
     connect(aExit, &QAction::triggered, this, &MainWindow::actExit);
 
     aManageSets = new QAction(QString(), this);
@@ -451,6 +496,12 @@ void MainWindow::createActions()
     connect(aOpenSettingsFolder, &QAction::triggered, this, &MainWindow::actOpenSettingsFolder);
     aFirstRunWizard = new QAction(this);
     connect(aFirstRunWizard, &QAction::triggered, this, [this] { runFirstRunWizard(); });
+#ifdef WITH_GUI_TEST
+    aRecord = new QAction(this);
+    connect(aRecord, &QAction::triggered, this, &MainWindow::actRecord);
+    aPlayRecording = new QAction(this);
+    connect(aPlayRecording, &QAction::triggered, this, &MainWindow::actPlayRecording);
+#endif
 
     aShow = new QAction(this);
     connect(aShow, &QAction::triggered, this, &MainWindow::actShow);
@@ -491,7 +542,9 @@ void MainWindow::createActions()
 
 void MainWindow::createMenus()
 {
+    menuBar()->setObjectName("menubar");
     cockatriceMenu = menuBar()->addMenu(QString());
+    cockatriceMenu->setObjectName("cockatriceMenu");
     cockatriceMenu->addAction(aConnect);
     cockatriceMenu->addAction(aDisconnect);
     cockatriceMenu->addAction(aRegister);
@@ -507,6 +560,7 @@ void MainWindow::createMenus()
     cockatriceMenu->addAction(aExit);
 
     dbMenu = menuBar()->addMenu(QString());
+    dbMenu->setObjectName("dbMenu");
     dbMenu->addAction(aManageSets);
     dbMenu->addAction(aEditTokens);
     dbMenu->addSeparator();
@@ -517,8 +571,10 @@ void MainWindow::createMenus()
     dbMenu->addAction(aReloadCardDatabase);
 
     tabsMenu = menuBar()->addMenu(QString());
+    tabsMenu->setObjectName("tabsMenu");
 
     helpMenu = menuBar()->addMenu(QString());
+    helpMenu->setObjectName("helpMenu");
     helpMenu->addAction(aAbout);
     helpMenu->addAction(aTips);
     helpMenu->addSeparator();
@@ -531,12 +587,19 @@ void MainWindow::createMenus()
     helpMenu->addAction(aOpenSettingsFolder);
     helpMenu->addSeparator();
     helpMenu->addAction(aFirstRunWizard);
+#ifdef WITH_GUI_TEST
+    helpMenu->addSeparator();
+    helpMenu->addAction(aRecord);
+    helpMenu->addAction(aPlayRecording);
+#endif
 }
 
 MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false),
+    : QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false), noConnect(false),
       cardUpdateProcess(nullptr), logviewDialog(nullptr)
 {
+    setObjectName("MainWindow");
+
     connect(&SettingsCache::instance().cacheStorage(), &CacheStorageSettings::pixmapCacheSizeChanged, this,
             &MainWindow::pixmapCacheSizeChanged);
     pixmapCacheSizeChanged(SettingsCache::instance().cacheStorage().getPixmapCacheSize());
@@ -622,6 +685,14 @@ MainWindow::MainWindow(QWidget *parent)
     // run startup check async
     QTimer::singleShot(0, this, &MainWindow::startupConfigCheck);
     QTimer::singleShot(0, this, &MainWindow::applyStartupDestination);
+
+#ifdef WITH_GUI_TEST
+    testUtility = new pqTestUtility(this);
+    testUtility->setRecordWithDialog(true);
+    testUtility->addEventObserver("xml", new XMLEventObserver(this));
+    testUtility->addEventSource("xml", new XMLEventSource(this));
+    testUtility->eventPlayer()->addWidgetEventPlayer(new pqCockatriceEventPlayer(this));
+#endif
 }
 
 void MainWindow::startupConfigCheck()
@@ -776,6 +847,11 @@ void MainWindow::runFirstRunWizard(bool firstRun)
  */
 void MainWindow::applyStartupDestination()
 {
+    if (noConnect) {
+        qCInfo(WindowMainStartupAutoconnectLog) << "Startup destination suppressed (--no-connect)";
+        return;
+    }
+
     // An explicit command-line connect takes precedence over the startup destination.
     if (!connectTo.isEmpty()) {
         return;
@@ -923,11 +999,28 @@ void MainWindow::actShow()
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-    // workaround Qt bug where closeEvent gets called twice
-    if (bClosingDown) {
-        return;
+    switch (shutdownState) {
+        case ShutdownState::Accepted:
+            // A duplicate close for a shutdown that already went through (Qt delivers the event
+            // twice on some platforms). Accepting it again keeps the quit that is already under
+            // way; ignoring it would cancel it.
+            event->accept();
+            return;
+        case ShutdownState::Confirming:
+            // A second close request arrived while one of our own confirmations is up. Another
+            // program asking us to close - an installer replacing our files, for one - looks
+            // exactly like this, and accepting it would be destructive: close() hides this
+            // window, hides the dialog with it, and leaves the process running inside the nested
+            // loop that dialog opened. Nothing can reach that loop afterwards, so the process
+            // stays alive with no window and every later close request is accepted into the same
+            // dead end. Refuse this one and leave the question in front of the user; the shutdown
+            // that is already running finishes as soon as they answer it.
+            event->ignore();
+            return;
+        case ShutdownState::Idle:
+            break;
     }
-    bClosingDown = true;
+    shutdownState = ShutdownState::Confirming;
 
     if (cardUpdateProcess && cardUpdateProcess->state() != QProcess::NotRunning) {
         const QString runningFor = cardUpdateStatusBar ? cardUpdateStatusBar->statusText() : QString();
@@ -939,19 +1032,20 @@ void MainWindow::closeEvent(QCloseEvent *event)
                                           .arg(runningFor);
         if (!QtUtils::confirm(this, tr("Are you sure?"), message, QMessageBox::No)) {
             event->ignore();
-            bClosingDown = false;
+            shutdownState = ShutdownState::Idle;
             return;
         }
     }
 
     if (!tabSupervisor->close()) {
         event->ignore();
-        bClosingDown = false;
+        shutdownState = ShutdownState::Idle;
         return;
     }
     tip->close();
 
     event->accept();
+    shutdownState = ShutdownState::Accepted;
     SettingsCache::instance().layouts().setMainWindowGeometry(saveGeometry());
     tabSupervisor->deleteLater();
 }
@@ -962,12 +1056,36 @@ bool MainWindow::closeForUpdate()
     // closeEvent() is blocked on a user prompt). close() would hit the re-entrancy guard and return
     // true without any shutdown having happened, so report faithfully instead: the caller must keep
     // the process alive until the user resolves whatever is blocking the close.
-    if (bClosingDown) {
+    if (shutdownState != ShutdownState::Idle) {
         return false;
     }
     return close();
 }
 
+void MainWindow::requestInstallerClose()
+{
+    // The same shutdown the in-app updater asks for: close the window, flush settings and let
+    // the tabs answer their own prompts. Never a forced quit - ending a process that has not
+    // agreed is the installer's separate force-close answer, not this one.
+    if (closeForUpdate()) {
+        QTimer::singleShot(0, qApp, [] { QCoreApplication::exit(0); });
+        return;
+    }
+    // A confirmation is already up, or a shutdown is in progress. Bring it forward: an
+    // installer prompt behind a hidden confirmation is the deadlock this request exists to
+    // break, and the user has to be able to answer it. showWindowIfHidden() also clears
+    // Qt::WindowMinimized, which raise() alone does not: a minimized window can keep the
+    // confirmation behind the installer.
+    showWindowIfHidden();
+    if (QWidget *modal = QApplication::activeModalWidget()) {
+        modal->raise();
+        modal->activateWindow();
+    }
+    raise();
+    activateWindow();
+    QApplication::alert(this, 0);
+}
+
 void MainWindow::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::LanguageChange) {
@@ -1003,6 +1121,10 @@ void MainWindow::handleCockatriceLink(const QString &url)
 
 void MainWindow::attemptStartupAutoConnect()
 {
+    if (noConnect) {
+        qCInfo(WindowMainStartupAutoconnectLog) << "Auto-connect suppressed (--no-connect)";
+        return;
+    }
     if (startupAutoConnectAttempted || skipStartupAutoConnect) {
         return;
     }
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index bcf709cb1..48d093a38 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -48,6 +48,7 @@
 class QAction;
 class QToolButton;
 class QWidget;
+class pqTestUtility;
 struct LocalGameOptions;
 
 inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");
@@ -104,6 +105,11 @@ private slots:
     void actUpdate();
     void actViewLog();
     void actOpenSettingsFolder();
+#ifdef WITH_GUI_TEST
+    void actRecord();
+    void actPlayRecording();
+#endif
+
     void actShow();
     void showWindowIfHidden();
     void onUrlChainFinished(bool connected);
@@ -185,6 +191,9 @@ private:
         *aReloadCardDatabase;
     QAction *aTips, *aUpdate, *aCheckCardUpdates, *aCheckCardUpdatesBackground, *aFirstRunWizard, *aStatusBar,
         *aViewLog, *aOpenSettingsFolder;
+#ifdef WITH_GUI_TEST
+    QAction *aRecord, *aPlayRecording;
+#endif
 
     TabSupervisor *tabSupervisor;
     IntentUrlParser *urlParser;
@@ -194,10 +203,21 @@ private:
     LagMonitor lagMonitor;                        ///< watches the main thread for event loop stalls
     LatencyStatusWidget *latencyStatus = nullptr; ///< status bar widget with live round-trip stats and history graph
     bool bHasActivated, askedForDbUpdater;
-    bool bClosingDown = false; ///< guards closeEvent() against re-entrancy
+    /**
+     * How far a shutdown that was asked for has got. A close request that arrives while one is
+     * already asking the user something must not be accepted - see closeEvent().
+     */
+    enum class ShutdownState
+    {
+        Idle,       ///< no shutdown has been asked for
+        Confirming, ///< asking about a card database update, open games or an unsaved deck
+        Accepted,   ///< the close was accepted and the window is hiding
+    };
+    ShutdownState shutdownState = ShutdownState::Idle;
     bool skipStartupAutoConnect = false;
     bool startupAutoConnectAttempted = false;
     bool firstRunWizardActive = false;
+    bool noConnect = false; ///< --no-connect: skip every startup connection
     QProcess *cardUpdateProcess;
     QByteArray cardUpdateOutputBuffer;
     QByteArray cardUpdateErrorOutput;  ///< diagnostic output collected from the updater's stderr
@@ -209,6 +229,9 @@ private:
     GameReplay *replay;
     DlgTipOfTheDay *tip;
     QUrl connectTo;
+#ifdef WITH_GUI_TEST
+    pqTestUtility *testUtility;
+#endif
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
@@ -216,6 +239,16 @@ public:
     {
         connectTo = QUrl(QString("cockatrice://%1").arg(url));
     }
+    /**
+     * @brief Suppresses every startup connection: --connect, auto-connect and the
+     *        configured startup destination. Used by the GUI test harness so a
+     *        playback run never dials out.
+     */
+    void setNoConnect(bool value)
+    {
+        noConnect = value;
+    }
+
     // When set, the window's own startup connection (--connect or auto-connect
     // on first activation) is skipped. Used for activation launches: the intent
     // chain triggered by a cockatrice:// URL owns the connection, and letting
@@ -245,6 +278,24 @@ public:
      */
     bool closeForUpdate();
 
+    /**
+     * @brief Closes this instance because the installer asked it to over its local socket.
+     *
+     * The request reaches an instance hidden in the notification area or sitting on its own
+     * confirmation, which is exactly where a WM_CLOSE from the installer does not. The close
+     * is still the ordinary one: a clean client exits, one with unsaved work raises the same
+     * confirmation the close button does, and a confirmation already up is brought to the
+     * front instead of being left behind the installer.
+     */
+    void requestInstallerClose();
+
+#ifdef WITH_GUI_TEST
+    pqTestUtility *getTestUtility() const
+    {
+        return testUtility;
+    }
+#endif
+
 protected:
     void closeEvent(QCloseEvent *event) override;
     void changeEvent(QEvent *event) override;
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 7b8648d69..b4dc0610f 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -26,6 +26,7 @@
 #include "client/sound_engine.h"
 #include "client/url_scheme_event_filter.h"
 #include "database/interface/settings_card_preference_provider.h"
+#include "installer_close_server.h"
 #include "interface/intents/intent.h"
 #include "interface/intents/intent_open_local_deck.h"
 #include "interface/logger.h"
@@ -38,6 +39,10 @@
 #include "single_instance_manager.h"
 #include "version_string.h"
 
+#ifdef WITH_GUI_TEST
+#include "pqTestUtility.h"
+#endif
+
 #include <QApplication>
 #include <QByteArray>
 #include <QByteArrayView>
@@ -61,10 +66,12 @@
 #include <QString>
 #include <QStringList>
 #include <QStringLiteral>
+#include <QThread>
 #include <QTranslator>
 #include <QUrl>
 #include <QtGlobal>
 #include <algorithm>
+#include <cstdlib>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/rng/rng_sfmt.h>
 #include <libcockatrice/settings/card_database_settings.h>
@@ -342,9 +349,16 @@ int main(int argc, char *argv[])
     parser.addOptions(
         {{{"c", "connect"}, QCoreApplication::translate("main", "Connect on startup"), "user:pass@host:port"},
          {{"d", "debug-output"}, QCoreApplication::translate("main", "Debug to file")},
-         {"simulate-crash",
-          QCoreApplication::translate("main",
-                                      "Show the crash-report dialog (saves a mock file when no DSN is configured)")}});
+         {"simulate-crash", QCoreApplication::translate(
+                                "main", "Show the crash-report dialog (saves a mock file when no DSN is configured)")},
+         {"no-connect", QCoreApplication::translate("main", "Do not connect to any server on startup")}
+#ifdef WITH_GUI_TEST
+         ,
+         {{"t", "test"},
+          QCoreApplication::translate("main", "Play back a QtTesting XML test file and exit"),
+          "test-file.xml"}
+#endif
+        });
 
     parser.process(app);
 
@@ -431,6 +445,15 @@ int main(int argc, char *argv[])
 
     MainWindow ui;
 
+    // The installer asks a running instance to close over this socket, which reaches a
+    // hidden window and one sitting on its own confirmation. Failure is not fatal: the
+    // installer falls back to WM_CLOSE for clients that have no socket.
+    InstallerCloseServer installerClose;
+    if (installerClose.listen()) {
+        QObject::connect(&installerClose, &InstallerCloseServer::closeRequested, &ui,
+                         &MainWindow::requestInstallerClose);
+    }
+
     // A URL launch must own the connection: the intent chain triggered by the
     // URL connects to the server named in the URL, so the window's own startup
     // auto-connect must not race against it (two connectToServer calls tear
@@ -473,6 +496,9 @@ int main(int argc, char *argv[])
     if (parser.isSet("connect")) {
         ui.setConnectTo(parser.value("connect"));
     }
+    if (parser.isSet("no-connect")) {
+        ui.setNoConnect(true);
+    }
     qCInfo(MainLog) << "MainWindow constructor finished";
 
     ui.setWindowIcon(themePixmap(QStringLiteral("cockatrice")));
@@ -513,6 +539,27 @@ int main(int argc, char *argv[])
         handleActivation(file);
     }
 
+#ifdef WITH_GUI_TEST
+    if (parser.isSet("test")) {
+        QString testFile = parser.value("test");
+        qCInfo(MainLog) << "Playing test file:" << testFile;
+        QTimer::singleShot(0, &ui, [&ui, testFile]() {
+            bool success = ui.getTestUtility()->playTests(testFile);
+            qCInfo(MainLog) << "Test playback" << (success ? "succeeded" : "FAILED");
+            qApp->exit(success ? 0 : 1);
+
+            // An event that fails while a modal dialog is open aborts the dispatcher,
+            // but the dialog's nested event loop can then keep the application alive
+            // forever. Hard-exit after a grace period so a red test always terminates.
+            auto *watchdog = QThread::create([success] {
+                QThread::sleep(10);
+                ::_Exit(success ? 0 : 1);
+            });
+            watchdog->start();
+        });
+    }
+#endif
+
     // Connect to future file/URL events from other instances
     QObject::connect(&instance, &SingleInstanceManager::filesReceived, [&handleActivation](const QStringList &files) {
         for (const QString &file : files) {
diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md b/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md
index 37b613461..04833282d 100644
--- a/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md
+++ b/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md
@@ -1,6 +1,7 @@
 @page editing_decks Editing Decks
 
- - @subpage editing_decks_classic
- - @subpage editing_decks_visual
+- @subpage editing_decks_classic
+- @subpage editing_decks_visual
 
- - @subpage editing_decks_printings
+- @subpage visual_database_display
+- @subpage editing_decks_printings
diff --git a/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md b/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
index 4aab7ad2c..fbfb8fe3c 100644
--- a/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
+++ b/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
@@ -70,4 +70,4 @@ confirm.
 
 The action will automatically import the deck from the online service without any other required user action.
 
-Currently supported services are Archidekt, Deckstats, Moxfield, and TappedOut.
\ No newline at end of file
+Currently supported services are Archidekt, Deckstats, ManaBox, Moxfield, and TappedOut.
diff --git a/doc/doxygen/pages/user_documentation/deck_management/visual_database_display.md b/doc/doxygen/pages/user_documentation/deck_management/visual_database_display.md
new file mode 100644
index 000000000..097848ab8
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/deck_management/visual_database_display.md
@@ -0,0 +1,25 @@
+@page visual_database_display Visual Database Display
+
+# Purpose
+
+The VisualDatabaseDisplay presents all the cards from the enabled sets in the CardDatabase, providing a visual way to find and add cards to your DeckList.
+
+# Using the Visual Database Display
+
+The VisualDatabaseDisplay can be opened by itself using the Tabs section in the menu bar at the top of the screen, or by selecting the "Visual Database Display" tab in the visual deck editor. When opened as a part of the visual deck editor, the VisualDatabaseDisplay can be used to add and remove cards from your deck. See @ref editing_decks_visual for more information about modifying your deck.
+
+By default the cards are displayed as a grid of pictures. However, a table view using card names can be toggled by pressing the Visual/Table button at the top right of the widget.
+
+# Filtering cards
+
+The top section of the VisualDatabaseDisplay can be used to filter cards based on various card properties, as well as specifying in which way they should be sorted. Filters can be saved and reused at a later time by using the Save/Load button at the right of this panel.
+
+# Modifying the Deck list
+
+When the VisualDatabaseDisplay is opened as part of the visual deck editor, clicking on cards adds or removes them to and from your deck.
+
+In the picture view, left-clicking on a card will add that card to the main board of your deck, while right-clicking will remove that printing of the card from the main board, if it exists. When clicking cards, modifier keys can be used to add (or remove) the card to zones other than the main board. Holding a Ctrl key on Windows and Linux or a Command key on MacOS adds/removes cards to the sideboard, while the Shift keys add/remove cards to the maybeboard.
+
+In the table view, double-clicking on a card adds that card to the main board of your deck, while right-click opens the card menu. Holding the Ctrl key on Windows and Linux or the Command key on MacOS when double-clicking adds the card to the sideboard instead.
+
+Tokens are always added to the token zone, regardless of which view is open or which modifier key is pressed.
diff --git a/external/qttesting b/external/qttesting
new file mode 160000
index 000000000..c7bb5d372
--- /dev/null
+++ b/external/qttesting
@@ -0,0 +1 @@
+Subproject commit c7bb5d372133e94c75cbdc70b04e039b864ea379
diff --git a/format.sh b/format.sh
index b4c78543b..fba76e93a 100755
--- a/format.sh
+++ b/format.sh
@@ -33,6 +33,7 @@ cmakefile="CMakeLists.txt"
 cmakedir="cmake/.*\\.cmake"
 cmakeinclude=("cmake/gtest-CMakeLists.txt.in")
 scripts="*.sh"
+scriptsrx="[^/]*\\.sh$"
 color="--"
 verbosity=0
 sep="----------"
@@ -254,7 +255,7 @@ if [[ $branch ]]; then
   if [[ $do_shell ]]; then
     shell_names=()
     for name in "${basenames[@]}"; do
-      filerx="(^|/)$scripts$"
+      filerx="(^|/)$scriptsrx"
       if [[ $name =~ $filerx ]]; then
         shell_names+=("$name")
       fi
diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt
index b3583522c..d2e6ee83a 100644
--- a/libcockatrice_card/CMakeLists.txt
+++ b/libcockatrice_card/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS
     libcockatrice/card/card_info.h
     libcockatrice/card/card_info_comparator.h
@@ -21,11 +17,9 @@ set(HEADERS
     libcockatrice/card/relation/card_relation.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
   libcockatrice_card STATIC
-  ${MOC_SOURCES}
+  ${HEADERS}
   libcockatrice/card/card_info.cpp
   libcockatrice/card/card_info_comparator.cpp
   libcockatrice/card/card_localization.cpp
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
index 388c9ab57..36f0cdeb8 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -6,6 +6,7 @@
 #include "relation/card_relation.h"
 #include "set/card_set.h"
 
+#include <QDebug>
 #include <QHashIterator>
 #include <QRegularExpression>
 #include <QSharedPointer>
@@ -19,6 +20,18 @@ const QHash<QString, QString> &CardInfo::getPropertiesHash() const
     return properties.getProperties();
 }
 
+void CardInfo::notifyChanged()
+{
+    const CardInfoPtr self = sharedFromThis();
+    Q_ASSERT_X(self, "CardInfo::notifyChanged", "every CardInfo is owned by a QSharedPointer");
+    if (!self) {
+        qCWarning(CardInfoLog) << "notifyChanged() on an unowned CardInfo" << name << "- observers stay stale";
+        return;
+    }
+
+    emit cardInfoChanged(self);
+}
+
 void CardInfo::setProperty(const QString &_name, const QString &_value)
 {
     bool changed = properties.insert(_name, _value);
@@ -26,7 +39,7 @@ void CardInfo::setProperty(const QString &_name, const QString &_value)
         return;
     }
 
-    emit cardInfoChanged(smartThis);
+    notifyChanged();
 }
 
 CardInfo::CardInfo(const QString &_name,
@@ -97,7 +110,6 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
 {
     CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, _properties, _relatedCards, _reverseRelatedCards, _sets,
                                  _uiAttributes, std::move(_localizedNames), std::move(_localizedTexts)));
-    ptr->setSmartPointer(ptr);
 
     for (const auto &printings : _sets) {
         for (const PrintingInfo &printing : printings) {
@@ -126,7 +138,6 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
     CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_propertiesBlob), _relatedCards,
                                  _reverseRelatedCards, _sets, _uiAttributes, std::move(_simpleName),
                                  std::move(_altNames), std::move(_localizedNames), std::move(_localizedTexts)));
-    ptr->setSmartPointer(ptr);
 
     if (_appendToSets) {
         for (const auto &printings : _sets) {
@@ -169,8 +180,15 @@ bool CardInfo::isLegalInFormat(const QString &format) const
 
 void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo &_info)
 {
-    if (!_set->contains(smartThis)) {
-        _set->append(smartThis);
+    const CardInfoPtr self = sharedFromThis();
+    Q_ASSERT_X(self, "CardInfo::addToSet", "every CardInfo is owned by a QSharedPointer");
+    if (!self) {
+        qCWarning(CardInfoLog) << "addToSet() on an unowned CardInfo" << name << "- the set will not list it";
+        return;
+    }
+
+    if (!_set->contains(self)) {
+        _set->append(self);
     }
     if (!setsToPrintings[_set->getShortName()].contains(_info)) {
         setsToPrintings[_set->getShortName()].append(_info);
@@ -188,7 +206,7 @@ void CardInfo::combineLegalities(const QHash<QString, QString> &props)
             properties.insert(it.key(), it.value());
         }
     }
-    emit cardInfoChanged(smartThis);
+    notifyChanged();
 }
 
 void CardInfo::refreshCachedSets()
@@ -298,6 +316,10 @@ void CardInfo::setColors(const QString &value)
 {
     setProperty(Mtg::Colors, value);
 }
+QString CardInfo::getColorIdentity() const
+{
+    return getProperty(Mtg::ColorIdentity);
+}
 QString CardInfo::getLoyalty() const
 {
     return getProperty(Mtg::Loyalty);
diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h
index eb1250a1c..075b5b264 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ b/libcockatrice_card/libcockatrice/card/card_info.h
@@ -7,6 +7,7 @@
 
 #include <QByteArray>
 #include <QChar>
+#include <QEnableSharedFromThis>
 #include <QHash>
 #include <QList>
 #include <QLoggingCategory>
@@ -50,7 +51,7 @@ Q_DECLARE_METATYPE(CardInfoPtr)
  * Each CardInfo may belong to multiple sets through its printings, and can
  * be related to other cards through defined relationships.
  */
-class CardInfo : public QObject
+class CardInfo : public QObject, public QEnableSharedFromThis<CardInfo>
 {
     Q_OBJECT
 
@@ -74,11 +75,10 @@ private:
      *  @anchor PrivateCardProperties
      */
     ///@{
-    CardInfoPtr smartThis; ///< Smart pointer to self for safe cross-references.
-    QString name;          ///< Full name of the card.
-    QString simpleName;    ///< Simplified name for fuzzy matching.
-    QString text;          ///< Text description or rules text of the card.
-    bool isToken;          ///< Whether this card is a token or not.
+    QString name;       ///< Full name of the card.
+    QString simpleName; ///< Simplified name for fuzzy matching.
+    QString text;       ///< Text description or rules text of the card.
+    bool isToken;       ///< Whether this card is a token or not.
 
     QMap<QString, QString> localizedNames; ///< Localized card names, keyed by language code.
     QMap<QString, QString> localizedTexts; ///< Localized rules text, keyed by language code.
@@ -162,13 +162,14 @@ public:
      * @param other Another CardInfo to copy.
      */
     CardInfo(const CardInfo &other)
-        : QObject(other.parent()), name(other.name), simpleName(other.simpleName), text(other.text),
-          isToken(other.isToken), localizedNames(other.localizedNames), localizedTexts(other.localizedTexts),
-          properties(other.properties), relatedCards(other.relatedCards),
+        : QObject(other.parent()), QEnableSharedFromThis<CardInfo>(), name(other.name), simpleName(other.simpleName),
+          text(other.text), isToken(other.isToken), localizedNames(other.localizedNames),
+          localizedTexts(other.localizedTexts), properties(other.properties), relatedCards(other.relatedCards),
           reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
           setsToPrintings(other.setsToPrintings), uiAttributes(other.uiAttributes), setsNames(other.setsNames),
           altNames(other.altNames)
     {
+        // The copy deliberately starts unowned: the QSharedPointer that wraps it registers the self reference.
     }
 
     /**
@@ -252,27 +253,13 @@ public:
     /**
      * @brief Clones the current CardInfo instance.
      *
-     * Uses the copy constructor and ensures the smart pointer is properly set.
+     * Uses the copy constructor; the copy is managed by its own shared pointer.
      *
      * @return Shared pointer to the cloned CardInfo.
      */
     [[nodiscard]] CardInfoPtr clone() const
     {
-        auto newCardInfo = CardInfoPtr(new CardInfo(*this));
-        newCardInfo->setSmartPointer(newCardInfo); // Set the smart pointer for the new instance
-        return newCardInfo;
-    }
-
-    /**
-     * @brief Sets the internal smart pointer to self.
-     *
-     * Used internally to allow safe cross-references among CardInfo and CardSet.
-     *
-     * @param _ptr Shared pointer pointing to this instance.
-     */
-    void setSmartPointer(CardInfoPtr _ptr)
-    {
-        smartThis = std::move(_ptr);
+        return CardInfoPtr(new CardInfo(*this));
     }
 
     /** @name Basic Properties Accessors */ //@{
@@ -295,7 +282,7 @@ public:
     void setText(const QString &_text)
     {
         text = _text;
-        emit cardInfoChanged(smartThis);
+        notifyChanged();
     }
 
     /**
@@ -358,7 +345,7 @@ public:
             return;
         }
         localizedNames.insert(lang, _localizedName);
-        emit cardInfoChanged(smartThis);
+        notifyChanged();
     }
 
     /**
@@ -373,7 +360,7 @@ public:
             return;
         }
         localizedTexts.insert(lang, _localizedText);
-        emit cardInfoChanged(smartThis);
+        notifyChanged();
     }
 
     /**
@@ -482,6 +469,7 @@ public:
     [[nodiscard]] QString getCmc() const;
     [[nodiscard]] QString getColors() const;
     void setColors(const QString &value);
+    [[nodiscard]] QString getColorIdentity() const;
     [[nodiscard]] QString getLoyalty() const;
     [[nodiscard]] QString getMainCardType() const;
     [[nodiscard]] QString getManaCost() const;
@@ -552,6 +540,14 @@ public:
     static QString simplifyName(const QString &name);
 
 private:
+    /**
+     * @brief Emits cardInfoChanged() with a strong reference to this card.
+     *
+     * A CardInfo is always owned by a QSharedPointer, so the self reference is always available; a released
+     * build that somehow finds it missing warns rather than emitting a null card.
+     */
+    void notifyChanged();
+
     /**
      * @brief Refreshes the cached, human-readable list of set names.
      *
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 946412606..ed097ef3b 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -53,13 +53,26 @@ CardDatabase::~CardDatabase()
     clear();
 }
 
+void CardDatabase::detachSetMembership()
+{
+    for (const auto &set : sets) {
+        if (set) {
+            set->clear();
+        }
+    }
+}
+
 void CardDatabase::clear()
 {
     QMutexLocker locker(clearDatabaseMutex);
 
+    // The sets hold strong card references, so empty them before dropping the cards: this breaks the
+    // CardInfo <-> CardSet cycle and spares the per-card detach over the whole database.
+    detachSetMembership();
+
     for (const auto &card : cards.values()) {
         if (card) {
-            removeCard(card);
+            unindexCard(card);
         }
     }
 
@@ -156,6 +169,23 @@ void CardDatabase::removeCard(const CardInfoPtr &card)
         return;
     }
 
+    // The set holds a strong reference back to the card, so detach it: leaving it there keeps both
+    // objects alive after the database drops the card. newInstance() appends through the first
+    // printing of every set, so detaching through that same printing mirrors the append.
+    for (const auto &printings : card->getSets()) {
+        if (printings.isEmpty()) {
+            continue;
+        }
+        if (const CardSetPtr set = printings.first().getSet()) {
+            set->removeAll(card);
+        }
+    }
+
+    unindexCard(card);
+}
+
+void CardDatabase::unindexCard(const CardInfoPtr &card)
+{
     for (auto *cardRelation : card->getRelatedCards()) {
         cardRelation->deleteLater();
     }
@@ -280,6 +310,10 @@ void CardDatabase::swapInDatabaseData(CardDatabaseData data)
         card->clearDirectRelations();
     }
 
+    // Break the CardSet <-> CardInfo cycle before replacing the containers, otherwise the previous
+    // snapshot survives the reload through the sets' strong card lists.
+    detachSetMembership();
+
     cards = std::move(data.cards);
     simpleNameCards = std::move(data.simpleNameCards);
     sets = std::move(data.sets);
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
index 9f0d67b67..5c1cb43c1 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -74,6 +74,23 @@ private:
      */
     void refreshCachedReverseRelatedCards(CardNameMap &cardMap);
 
+    /**
+     * @brief Empties every set, dropping the strong card references they hold.
+     *
+     * A card keeps a CardSetPtr through its printings while its set keeps a strong CardInfoPtr, so the
+     * two form a reference cycle. Dropping a whole snapshot has to break that cycle once, up front,
+     * instead of relying on the per-card detach in removeCard().
+     */
+    void detachSetMembership();
+
+    /**
+     * @brief Drops a card from the database indexes and notifies observers.
+     *
+     * Callers are responsible for detaching the card from its sets first.
+     * @param card Pointer to the card to unindex.
+     */
+    void unindexCard(const CardInfoPtr &card);
+
     /** @brief Mutexes for thread safety. */
     QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
                 *removeCardMutex = new QBasicMutex();
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
index 00b21f88e..7ca5ba433 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
@@ -83,7 +83,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path, CardDatabas
     auto startTime = QTime::currentTime();
     LoadStatus tempLoadStatus = NotLoaded;
     if (!path.isEmpty()) {
-        QMutexLocker locker(loadFromFileMutex);
+        QMutexLocker locker(&loadFromFileMutex);
         tempLoadStatus = loadFromFile(path, data);
     }
 
@@ -102,7 +102,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabases(bool ignoreCache)
 
 LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
 {
-    QMutexLocker locker(reloadDatabaseMutex);
+    QMutexLocker locker(&reloadDatabaseMutex);
 
     if (!database) {
         qCWarning(CardDatabaseLoadingLog) << "Loader has no database pointer";
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
index bfbaa0f51..72aeeff3e 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
@@ -177,8 +177,8 @@ private:
     ICardSetPriorityController *priorityController; /**< Controller for reconstructing set state. */
     QList<ICardDatabaseParser *> availableParsers;  /**< List of available parsers for different formats. */
 
-    QBasicMutex *loadFromFileMutex = new QBasicMutex();   /**< Mutex for single-file loading. */
-    QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */
+    QBasicMutex loadFromFileMutex;   /**< Mutex for single-file loading. */
+    QBasicMutex reloadDatabaseMutex; /**< Mutex for reloading entire database. */
 };
 
 #endif // COCKATRICE_CARD_DATABASE_LOADER_H
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
index d40c1c063..8d5735db7 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
@@ -18,6 +18,7 @@
 #include <QIODevice>
 #include <QList>
 #include <QMessageLogger>
+#include <QSaveFile>
 #include <QSharedPointer>
 #include <QStringView>
 #include <QXmlStreamAttributes>
@@ -499,7 +500,7 @@ bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats,
 {
     Q_UNUSED(_formats);
 
-    QFile file(fileName);
+    QSaveFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
         return false;
     }
@@ -539,5 +540,5 @@ bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats,
     xml.writeEndElement(); // cockatrice_carddatabase
     xml.writeEndDocument();
 
-    return true;
+    return !xml.hasError() && file.commit();
 }
diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
index 3ee1e808e..3965b80f0 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
@@ -18,6 +18,7 @@
 #include <QList>
 #include <QMap>
 #include <QMessageLogger>
+#include <QSaveFile>
 #include <QSharedPointer>
 #include <QStringList>
 #include <QStringView>
@@ -682,7 +683,7 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
                                       const QString &sourceUrl,
                                       const QString &sourceVersion)
 {
-    QFile file(fileName);
+    QSaveFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
         return false;
     }
@@ -730,5 +731,5 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
     xml.writeEndElement(); // cockatrice_carddatabase
     xml.writeEndDocument();
 
-    return true;
+    return !xml.hasError() && file.commit();
 }
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
index e2b41a811..a0f0f4578 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
@@ -27,7 +27,6 @@ CardSetPtr CardSet::newInstance(ICardSetPriorityController *_priorityController,
                                 const Priority _priority)
 {
     CardSetPtr ptr(new CardSet(_priorityController, _shortName, _longName, _setType, _releaseDate, _priority));
-    // ptr->setSmartPointer(ptr);
     return ptr;
 }
 
diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt
index e61a5702c..3e7d522c2 100644
--- a/libcockatrice_deck_list/CMakeLists.txt
+++ b/libcockatrice_deck_list/CMakeLists.txt
@@ -1,34 +1,32 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS
     libcockatrice/deck_list/tree/abstract_deck_list_card_node.h
     libcockatrice/deck_list/tree/abstract_deck_list_node.h
     libcockatrice/deck_list/tree/deck_list_card_node.h
     libcockatrice/deck_list/tree/inner_deck_list_node.h
+    libcockatrice/deck_list/deck_file_format.h
     libcockatrice/deck_list/deck_list.h
     libcockatrice/deck_list/deck_list_history_manager.h
     libcockatrice/deck_list/deck_list_node_tree.h
     libcockatrice/deck_list/deck_list_memento.h
     libcockatrice/deck_list/deck_list_plain_text_parser.h
+    libcockatrice/deck_list/loaded_deck.h
     libcockatrice/deck_list/playmat_resolver.h
     libcockatrice/deck_list/sideboard_plan.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
   libcockatrice_deck_list STATIC
-  ${MOC_SOURCES}
+  ${HEADERS}
   libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp
   libcockatrice/deck_list/tree/abstract_deck_list_node.cpp
   libcockatrice/deck_list/tree/deck_list_card_node.cpp
   libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+  libcockatrice/deck_list/deck_file_format.cpp
   libcockatrice/deck_list/deck_list.cpp
   libcockatrice/deck_list/deck_list_history_manager.cpp
   libcockatrice/deck_list/deck_list_node_tree.cpp
   libcockatrice/deck_list/deck_list_plain_text_parser.cpp
+  libcockatrice/deck_list/loaded_deck.cpp
   libcockatrice/deck_list/playmat_resolver.cpp
   libcockatrice/deck_list/sideboard_plan.cpp
 )
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.cpp
similarity index 100%
rename from cockatrice/src/interface/deck_loader/deck_file_format.cpp
rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.cpp
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.h
similarity index 100%
rename from cockatrice/src/interface/deck_loader/deck_file_format.h
rename to libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.h
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
index 821b53dff..b357b5801 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
@@ -340,7 +340,17 @@ bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards
         }
     };
 
-    forEachCard(writeToStream);
+    // Export the main deck first without changing the saved tree's zone order.
+    forEachCard([&](const auto node, const auto card) {
+        if (node->getName() == DECK_ZONE_MAIN) {
+            writeToStream(node, card);
+        }
+    });
+    forEachCard([&](const auto node, const auto card) {
+        if (node->getName() != DECK_ZONE_MAIN) {
+            writeToStream(node, card);
+        }
+    });
     return true;
 }
 
@@ -423,8 +433,23 @@ DecklistCardNode *DeckList::addCard(const QString &cardName,
                                     const QString &cardProviderId,
                                     bool formatLegal)
 {
-    auto node =
-        tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal);
+    return addCards(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal);
+}
+
+DecklistCardNode *DeckList::addCards(const QString &cardName,
+                                     int amount,
+                                     const QString &zoneName,
+                                     int position,
+                                     const QString &cardSetName,
+                                     const QString &cardSetCollectorNumber,
+                                     const QString &cardProviderId,
+                                     bool formatLegal)
+{
+    if (amount <= 0) {
+        return nullptr;
+    }
+    auto node = tree.addCard(cardName, amount, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId,
+                             formatLegal);
     refreshDeckHash();
     return node;
 }
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
index 6796e9c33..9d0f20586 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
@@ -284,6 +284,14 @@ public:
                               const QString &cardSetCollectorNumber = QString(),
                               const QString &cardProviderId = QString(),
                               const bool formatLegal = true);
+    DecklistCardNode *addCards(const QString &cardName,
+                               int amount,
+                               const QString &zoneName,
+                               int position = -1,
+                               const QString &cardSetName = QString(),
+                               const QString &cardSetCollectorNumber = QString(),
+                               const QString &cardProviderId = QString(),
+                               const bool formatLegal = true);
     ///@}
 
     /** @name Deck identity */
diff --git a/cockatrice/src/interface/deck_loader/loaded_deck.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.cpp
similarity index 100%
rename from cockatrice/src/interface/deck_loader/loaded_deck.cpp
rename to libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.cpp
diff --git a/cockatrice/src/interface/deck_loader/loaded_deck.h b/libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.h
similarity index 100%
rename from cockatrice/src/interface/deck_loader/loaded_deck.h
rename to libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.h
diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt
index 2d45b8e5b..1b4303fc9 100644
--- a/libcockatrice_filters/CMakeLists.txt
+++ b/libcockatrice_filters/CMakeLists.txt
@@ -1,15 +1,9 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_string.h
-            libcockatrice/filters/filter_tree.h
+set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_mode.h
+            libcockatrice/filters/filter_string.h libcockatrice/filters/filter_tree.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
-  libcockatrice_filters STATIC ${MOC_SOURCES} libcockatrice/filters/filter_card.cpp
+  libcockatrice_filters STATIC ${HEADERS} libcockatrice/filters/filter_card.cpp libcockatrice/filters/filter_mode.cpp
                                libcockatrice/filters/filter_string.cpp libcockatrice/filters/filter_tree.cpp
 )
 
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
index 26cddd53c..8af39c098 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
@@ -69,6 +69,8 @@ const QString CardFilter::attrName(Attr a)
             return tr("Type");
         case AttrColor:
             return tr("Color");
+        case AttrColorIdentity:
+            return tr("Color Identity");
         case AttrText:
             return tr("Text");
         case AttrSet:
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h
index e6a37ee40..bc613fc9c 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h
@@ -32,6 +32,7 @@ public:
     {
         AttrCmc = 0,
         AttrColor,
+        AttrColorIdentity,
         AttrLoyalty,
         AttrManaCost,
         AttrName,
@@ -54,7 +55,7 @@ private:
     enum Attr a;
 
 public:
-    CardFilter(QString &term, Type type, Attr attr) : trm(term), t(type), a(attr)
+    CardFilter(const QString &term, Type type, Attr attr) : trm(term), t(type), a(attr)
     {
     }
 
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_mode.cpp b/libcockatrice_filters/libcockatrice/filters/filter_mode.cpp
new file mode 100644
index 000000000..356ccf608
--- /dev/null
+++ b/libcockatrice_filters/libcockatrice/filters/filter_mode.cpp
@@ -0,0 +1,77 @@
+/**
+ * @file filter_mode.cpp
+ * @ingroup Filters
+ */
+
+#include "libcockatrice/filters/filter_mode.h"
+
+#include <QString>
+
+FilterModeInfo getFilterModeInfo(FilterMode filterMode)
+{
+    switch (filterMode) {
+        case FilterMode::Includes:
+            return {CardFilter::Type::TypeOr, CardFilter::Type::TypeEnd, CardFilter::Attr::AttrColor};
+        case FilterMode::Excludes:
+            return {CardFilter::Type::TypeAndNot, CardFilter::Type::TypeEnd, CardFilter::Attr::AttrColor};
+        case FilterMode::IncludeExclude:
+            return {CardFilter::Type::TypeOr, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor};
+        case FilterMode::ExactMatch:
+            return {CardFilter::Type::TypeAnd, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor};
+        case FilterMode::ColorIdentity:
+            return {CardFilter::Type::TypeEnd, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity};
+        case FilterMode::Custom:
+        case FilterMode::End:
+            break;
+    }
+    return {CardFilter::Type::TypeEnd, CardFilter::Type::TypeEnd, CardFilter::Attr::AttrEnd};
+}
+
+FilterMode deriveFilterMode(const QList<const CardFilter *> &filters, FilterMode currentMode)
+{
+    constexpr int modeCount = static_cast<int>(FilterMode::End);
+    bool modeImpossible[modeCount] = {};
+    const QString colors = "WUBRG";
+
+    for (int i = 0; i < modeCount; ++i) {
+        const FilterModeInfo modeInfo = getFilterModeInfo(static_cast<FilterMode>(i));
+
+        // Remove the modes that cannot create one of the filters.
+        for (const CardFilter *filter : filters) {
+            if (filter->attr() != modeInfo.attr ||
+                (filter->type() != modeInfo.includeType && filter->type() != modeInfo.excludeType)) {
+                modeImpossible[i] = true;
+                break;
+            }
+        }
+
+        // Modes that have both an include and an exclude filter should always have a filter for each color.
+        if (modeInfo.includeType != CardFilter::Type::TypeEnd && modeInfo.excludeType != CardFilter::Type::TypeEnd &&
+            !modeImpossible[i]) {
+            for (const QChar &color : colors) {
+                int count = 0;
+                for (const CardFilter *filter : filters) {
+                    count += filter->term() == color;
+                }
+                if (count != 1) {
+                    modeImpossible[i] = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    // Keep the current mode if it can produce the filters, so that a live mode is never swapped for another.
+    // Switching to and from the custom mode is always possible.
+    if (!modeImpossible[static_cast<int>(currentMode)] && currentMode != FilterMode::Custom) {
+        return currentMode;
+    }
+
+    for (int i = 0; i < modeCount; ++i) {
+        if (!modeImpossible[i] || i == static_cast<int>(FilterMode::Custom)) {
+            return static_cast<FilterMode>(i);
+        }
+    }
+
+    return FilterMode::Custom;
+}
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_mode.h b/libcockatrice_filters/libcockatrice/filters/filter_mode.h
new file mode 100644
index 000000000..f7662d662
--- /dev/null
+++ b/libcockatrice_filters/libcockatrice/filters/filter_mode.h
@@ -0,0 +1,62 @@
+/**
+ * @file filter_mode.h
+ * @ingroup Filters
+ */
+
+#ifndef LIBCOCKATRICE_FILTERS_FILTER_MODE_H
+#define LIBCOCKATRICE_FILTERS_FILTER_MODE_H
+
+#include "libcockatrice/filters/filter_card.h"
+
+#include <QChar>
+#include <QList>
+#include <QMetaType>
+
+/**
+ * @brief The way selected and unselected colors are combined into card filters.
+ */
+enum class FilterMode
+{
+    Includes = 0,   // Include selected colors (OR condition).
+    Excludes,       // Exclude selected colors (AND NOT).
+    IncludeExclude, // Include selected colors (OR) and exclude unselected colors (AND NOT).
+    ExactMatch,     // Only selected colors are included, all others are excluded.
+    ColorIdentity,  // Keep cards whose color identity is a subset of the selected colors (stored as AND NOT for each
+                    // unselected color).
+    Custom,         // The color filters do not match any of the above modes. Not included in the combo box.
+    End
+};
+
+Q_DECLARE_METATYPE(FilterMode)
+
+/**
+ * @brief The filters a single color contributes in a given mode.
+ */
+struct FilterModeInfo
+{
+    // When a color symbol is enabled, add filters of this type. Skipped if equal to CardFilter::Type::TypeEnd.
+    CardFilter::Type includeType;
+
+    // When a color symbol is disabled, add filters of this type. Skipped if equal to CardFilter::Type::TypeEnd.
+    CardFilter::Type excludeType;
+
+    // The attribute to filter for when adding the filters.
+    CardFilter::Attr attr;
+};
+
+/** @brief Return the filters the given mode contributes for one color. */
+FilterModeInfo getFilterModeInfo(FilterMode filterMode);
+
+/**
+ * @brief Determine the mode that produced the given color filters.
+ *
+ * Returns @p currentMode unchanged when that mode can still produce @p filters, so that a live mode is never
+ * replaced by an equally valid one. Otherwise returns the first mode that can produce them, falling back to
+ * FilterMode::Custom when none can.
+ *
+ * @param filters The filters on CardFilter::Attr::AttrColor and CardFilter::Attr::AttrColorIdentity.
+ * @param currentMode The mode currently selected in the UI.
+ */
+FilterMode deriveFilterMode(const QList<const CardFilter *> &filters, FilterMode currentMode);
+
+#endif // LIBCOCKATRICE_FILTERS_FILTER_MODE_H
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
index 081ada824..1bcb1646b 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
@@ -409,7 +409,7 @@ static void setupParserRules()
         const bool identity = sv.tokens[0].empty() || sv.tokens[0][0] != 'i';
         if (sv.tokens[1][0] == ':') {
             return [=](const CardData &x) {
-                const QString match = identity ? x->getColors() : x->getProperty("coloridentity");
+                const QString match = identity ? x->getColors() : x->getColorIdentity();
                 if (parts.contains("m") && match.length() < 2) {
                     return false;
                 }
@@ -427,7 +427,7 @@ static void setupParserRules()
         }
 
         return [=](const CardData &x) {
-            const QString match = identity ? x->getColors() : x->getProperty("colorIdentity");
+            const QString match = identity ? x->getColors() : x->getColorIdentity();
             if (parts.contains("m") && match.length() < 2) {
                 return false;
             }
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
index f12f87181..817c7298d 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
@@ -176,23 +176,24 @@ FilterItem::FilterItem(QString trm, FilterItemList *parent) : p(parent), term(st
     lowercaseTerm = term.toLower();
 
     switch (attr()) {
-        case CardFilter::AttrColor: {
-            QString converted = term.trimmed();
+        case CardFilter::AttrColor:
+        case CardFilter::AttrColorIdentity: {
+            QString converted = term.trimmed().toLower();
 
-            converted.replace("green", "g", Qt::CaseInsensitive);
-            converted.replace("grn", "g", Qt::CaseInsensitive);
-            converted.replace("blue", "u", Qt::CaseInsensitive);
-            converted.replace("blu", "u", Qt::CaseInsensitive);
-            converted.replace("black", "b", Qt::CaseInsensitive);
-            converted.replace("blk", "b", Qt::CaseInsensitive);
-            converted.replace("red", "r", Qt::CaseInsensitive);
-            converted.replace("white", "w", Qt::CaseInsensitive);
-            converted.replace("wht", "w", Qt::CaseInsensitive);
-            converted.replace("colorless", "c", Qt::CaseInsensitive);
-            converted.replace("colourless", "c", Qt::CaseInsensitive);
-            converted.replace("none", "c", Qt::CaseInsensitive);
+            converted.replace("green", "g");
+            converted.replace("grn", "g");
+            converted.replace("blue", "u");
+            converted.replace("blu", "u");
+            converted.replace("black", "b");
+            converted.replace("blk", "b");
+            converted.replace("red", "r");
+            converted.replace("white", "w");
+            converted.replace("wht", "w");
+            converted.replace("colorless", "c");
+            converted.replace("colourless", "c");
+            converted.replace("none", "c");
 
-            converted.replace(QString(" "), QString(""), Qt::CaseInsensitive);
+            converted.replace(QString(" "), QString(""));
 
             convertedColorTerm = converted;
             break;
@@ -358,12 +359,17 @@ bool FilterItem::acceptSubType(const CardInfoPtr &info) const
     return subType.contains(term, Qt::CaseInsensitive);
 }
 
-bool FilterItem::acceptColor(const CardInfoPtr &info) const
+/**
+ * @brief Return true when every letter of the given term appears in the given colors string.
+ * If the term is equal to "c", then only return true if the color string is empty.
+ *
+ * @param term The letters which should be included, or "c"
+ * @param colors The string to check for letters in
+ */
+static bool matchesColor(const QString &term, const QString &colors)
 {
-    const QString colors = info->getColors();
-
     // Colorless card filter
-    if (convertedColorTerm.toLower() == "c" && colors.length() < 1) {
+    if (term == "c" && colors.length() < 1) {
         return true;
     }
 
@@ -372,13 +378,23 @@ bool FilterItem::acceptColor(const CardInfoPtr &info) const
      * then we should match all of them to the card's colors
      */
     int match_count = 0;
-    for (const QChar &color : convertedColorTerm) {
+    for (const QChar &color : term) {
         if (colors.contains(color, Qt::CaseInsensitive)) {
             match_count++;
         }
     }
 
-    return match_count == convertedColorTerm.length();
+    return match_count == term.length();
+}
+
+bool FilterItem::acceptColor(const CardInfoPtr &info) const
+{
+    return matchesColor(convertedColorTerm, info->getColors());
+}
+
+bool FilterItem::acceptColorIdentity(const CardInfoPtr &info) const
+{
+    return matchesColor(convertedColorTerm, info->getColorIdentity());
 }
 
 bool FilterItem::acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const
@@ -540,6 +556,8 @@ bool FilterItem::acceptCardAttr(const CardInfoPtr &info,
             return acceptType(info);
         case CardFilter::AttrColor:
             return acceptColor(info);
+        case CardFilter::AttrColorIdentity:
+            return acceptColorIdentity(info);
         case CardFilter::AttrText:
             return acceptText(info, searchLanguage);
         case CardFilter::AttrSet:
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
index 85a57304d..f1a5803e5 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
@@ -244,6 +244,7 @@ public:
     [[nodiscard]] bool acceptMainType(const CardInfoPtr &info) const;
     [[nodiscard]] bool acceptSubType(const CardInfoPtr &info) const;
     [[nodiscard]] bool acceptColor(const CardInfoPtr &info) const;
+    [[nodiscard]] bool acceptColorIdentity(const CardInfoPtr &info) const;
     [[nodiscard]] bool acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const;
     [[nodiscard]] bool acceptSet(const CardInfoPtr &info) const;
     [[nodiscard]] bool acceptManaCost(const CardInfoPtr &info) const;
diff --git a/libcockatrice_game/CMakeLists.txt b/libcockatrice_game/CMakeLists.txt
new file mode 100644
index 000000000..ce68c5ea6
--- /dev/null
+++ b/libcockatrice_game/CMakeLists.txt
@@ -0,0 +1,77 @@
+set(HEADERS
+    libcockatrice/game/abstract_game.h
+    libcockatrice/game/board/arrow_data.h
+    libcockatrice/game/board/card_list.h
+    libcockatrice/game/board/card_state.h
+    libcockatrice/game/board/counter_state.h
+    libcockatrice/game/game.h
+    libcockatrice/game/game_event_handler.h
+    libcockatrice/game/game_meta_info.h
+    libcockatrice/game/game_state.h
+    libcockatrice/game/phase.h
+    libcockatrice/game/player/card_menu_action_type.h
+    libcockatrice/game/player/card_move_request.h
+    libcockatrice/game/player/event_processing_options.h
+    libcockatrice/game/player/move_top_cards_until_options.h
+    libcockatrice/game/player/player_actions.h
+    libcockatrice/game/player/player_event_handler.h
+    libcockatrice/game/player/player_info.h
+    libcockatrice/game/player/player_logic.h
+    libcockatrice/game/player/player_manager.h
+    libcockatrice/game/player/token_info.h
+    libcockatrice/game/replay.h
+    libcockatrice/game/translation.h
+    libcockatrice/game/zones/card_zone_algorithms.h
+    libcockatrice/game/zones/card_zone_logic.h
+    libcockatrice/game/zones/hand_zone_logic.h
+    libcockatrice/game/zones/pile_zone_logic.h
+    libcockatrice/game/zones/stack_zone_logic.h
+    libcockatrice/game/zones/table_zone_logic.h
+    libcockatrice/game/zones/view_zone_logic.h
+)
+
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
+
+add_library(
+  libcockatrice_game STATIC
+  ${MOC_SOURCES}
+  libcockatrice/game/abstract_game.cpp
+  libcockatrice/game/board/arrow_data.cpp
+  libcockatrice/game/board/card_list.cpp
+  libcockatrice/game/board/card_state.cpp
+  libcockatrice/game/board/counter_state.cpp
+  libcockatrice/game/game.cpp
+  libcockatrice/game/game_event_handler.cpp
+  libcockatrice/game/game_meta_info.cpp
+  libcockatrice/game/game_state.cpp
+  libcockatrice/game/phase.cpp
+  libcockatrice/game/player/player_actions.cpp
+  libcockatrice/game/player/player_event_handler.cpp
+  libcockatrice/game/player/player_info.cpp
+  libcockatrice/game/player/player_logic.cpp
+  libcockatrice/game/player/player_manager.cpp
+  libcockatrice/game/replay.cpp
+  libcockatrice/game/zones/card_zone_logic.cpp
+  libcockatrice/game/zones/hand_zone_logic.cpp
+  libcockatrice/game/zones/pile_zone_logic.cpp
+  libcockatrice/game/zones/stack_zone_logic.cpp
+  libcockatrice/game/zones/table_zone_logic.cpp
+  libcockatrice/game/zones/view_zone_logic.cpp
+)
+
+target_include_directories(libcockatrice_game PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(
+  libcockatrice_game
+  PUBLIC libcockatrice_card
+         libcockatrice_deck_list
+         libcockatrice_filters
+         libcockatrice_interfaces
+         libcockatrice_network
+         libcockatrice_protocol
+         libcockatrice_settings
+         libcockatrice_utility
+         ${QT_CORE_MODULE}
+         ${COCKATRICE_QT_VERSION_NAME}::Concurrent
+         ${COCKATRICE_QT_VERSION_NAME}::Gui
+)
diff --git a/cockatrice/src/game/abstract_game.cpp b/libcockatrice_game/libcockatrice/game/abstract_game.cpp
similarity index 88%
rename from cockatrice/src/game/abstract_game.cpp
rename to libcockatrice_game/libcockatrice/game/abstract_game.cpp
index efc575eff..a93f44018 100644
--- a/cockatrice/src/game/abstract_game.cpp
+++ b/libcockatrice_game/libcockatrice/game/abstract_game.cpp
@@ -18,8 +18,6 @@ AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
 {
     gameMetaInfo = new GameMetaInfo(this);
     gameEventHandler = new GameEventHandler(this);
-
-    activeCard = nullptr;
 }
 
 bool AbstractGame::isHost() const
@@ -48,12 +46,7 @@ void AbstractGame::loadReplay(const GameReplay *replay)
     gameMetaInfo->setSpectatorsOmniscient(true);
 }
 
-void AbstractGame::setActiveCard(CardItem *card)
-{
-    activeCard = card;
-}
-
-CardItem *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const
+CardState *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const
 {
     PlayerLogic *player = playerManager->getPlayer(playerId);
     if (!player) {
diff --git a/cockatrice/src/game/abstract_game.h b/libcockatrice_game/libcockatrice/game/abstract_game.h
similarity index 82%
rename from cockatrice/src/game/abstract_game.h
rename to libcockatrice_game/libcockatrice/game/abstract_game.h
index 326af8ac9..00a95a3b8 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/libcockatrice_game/libcockatrice/game/abstract_game.h
@@ -11,14 +11,14 @@
 #include <QString>
 #include <qtmetamacros.h>
 
-class CardItem;
 class AbstractClient;
+class CardState;
 class GameEventHandler;
 class GameMetaInfo;
 class GameReplay;
 class GameState;
 class PlayerManager;
-
+class CardState;
 class AbstractGame : public QObject
 {
     Q_OBJECT
@@ -30,7 +30,6 @@ public:
     GameState *gameState;
     GameEventHandler *gameEventHandler;
     PlayerManager *playerManager;
-    CardItem *activeCard;
 
     GameMetaInfo *getGameMetaInfo()
     {
@@ -58,13 +57,7 @@ public:
 
     void loadReplay(const GameReplay *replay);
 
-    CardItem *getCard(int playerId, const QString &zoneName, int cardId) const;
-
-    void setActiveCard(CardItem *card);
-    CardItem *getActiveCard() const
-    {
-        return activeCard;
-    }
+    CardState *getCard(int playerId, const QString &zoneName, int cardId) const;
 };
 
 #endif // COCKATRICE_ABSTRACT_GAME_H
diff --git a/cockatrice/src/game/board/arrow_data.cpp b/libcockatrice_game/libcockatrice/game/board/arrow_data.cpp
similarity index 100%
rename from cockatrice/src/game/board/arrow_data.cpp
rename to libcockatrice_game/libcockatrice/game/board/arrow_data.cpp
diff --git a/cockatrice/src/game/board/arrow_data.h b/libcockatrice_game/libcockatrice/game/board/arrow_data.h
similarity index 100%
rename from cockatrice/src/game/board/arrow_data.h
rename to libcockatrice_game/libcockatrice/game/board/arrow_data.h
diff --git a/cockatrice/src/game/board/card_list.cpp b/libcockatrice_game/libcockatrice/game/board/card_list.cpp
similarity index 70%
rename from cockatrice/src/game/board/card_list.cpp
rename to libcockatrice_game/libcockatrice/game/board/card_list.cpp
index 94bae67cd..361c51502 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/libcockatrice_game/libcockatrice/game/board/card_list.cpp
@@ -1,7 +1,6 @@
 #include "card_list.h"
 
-#include "../../game_graphics/board/card_item.h"
-#include "libcockatrice/card/printing/exact_card.h"
+#include "card_state.h"
 
 #include <QChar>
 #include <QDebug>
@@ -11,26 +10,26 @@
 #include <compare>
 #include <libcockatrice/card/card_info.h>
 
-CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
+CardList::CardList(bool _contentsKnown) : QList<CardState *>(), contentsKnown(_contentsKnown)
 {
 }
 
 /**
- * @brief Finds the CardItem with the given id in the list.
+ * @brief Finds the CardState with the given id in the list.
  * If contentsKnown is false, then this just returns the first element of the list.
  *
  * @param cardId The id of the card to find.
  *
- * @returns A pointer to the CardItem, or a nullptr if not found.
+ * @returns A pointer to the CardState, or a nullptr if not found.
  */
-CardItem *CardList::findCard(const int cardId) const
+CardState *CardList::findCard(const int cardId) const
 {
     if (!contentsKnown && !empty()) {
         return at(0);
     } else {
-        for (auto *cardItem : *this) {
-            if (cardItem->getId() == cardId) {
-                return cardItem;
+        for (auto *cardState : *this) {
+            if (cardState->getId() == cardId) {
+                return cardState;
             }
         }
     }
@@ -38,7 +37,7 @@ CardItem *CardList::findCard(const int cardId) const
 }
 
 /**
- * @brief sorts the list by using string comparison on properties extracted from the CardItem
+ * @brief sorts the list by using string comparison on properties extracted from the CardState
  * The cards are compared using each property in order.
  * If two cards have the same value for a property, then the next property in the list is used.
  *
@@ -51,7 +50,7 @@ void CardList::sortBy(const QList<SortOption> &option)
         return;
     }
 
-    auto comparator = [&option](CardItem *a, CardItem *b) {
+    auto comparator = [&option](CardState *a, CardState *b) {
         for (auto prop : option) {
             auto extractor = getExtractorFor(prop);
             QString t1 = extractor(a);
@@ -116,26 +115,26 @@ static QString getColorSortString(const CardInfo &c, bool appendAtEnd)
 }
 
 /**
- * @brief returns the function that extracts the given property from the CardItem.
+ * @brief returns the function that extracts the given property from the CardState.
  */
-std::function<QString(CardItem *)> CardList::getExtractorFor(SortOption option)
+std::function<QString(CardState *)> CardList::getExtractorFor(SortOption option)
 {
     switch (option) {
         case NoSort:
-            return [](CardItem *) { return ""; };
+            return [](CardState *) { return ""; };
         case SortByMainType:
-            return [](CardItem *c) { return c->getCardInfo().getMainCardType(); };
+            return [](CardState *c) { return c->getCardInfo().getMainCardType(); };
         case SortByManaValue:
             // getCmc returns the int as a string. We pad with 0's so that string comp also works on it
-            return [](CardItem *c) { return c->getCard() ? c->getCardInfo().getCmc().rightJustified(4, '0') : ""; };
+            return [](CardState *c) { return c->getCard() ? c->getCardInfo().getCmc().rightJustified(4, '0') : ""; };
         case SortByColorGrouping:
-            return [](CardItem *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), false) : ""; };
+            return [](CardState *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), false) : ""; };
         case SortByName:
-            return [](CardItem *c) { return c->getName(); };
+            return [](CardState *c) { return c->getName(); };
         case SortByType:
-            return [](CardItem *c) { return c->getCardInfo().getCardType(); };
+            return [](CardState *c) { return c->getCardInfo().getCardType(); };
         case SortByManaCost:
-            return [](CardItem *c) {
+            return [](CardState *c) {
                 if (!c->getCard()) {
                     return QString();
                 }
@@ -147,18 +146,18 @@ std::function<QString(CardItem *)> CardList::getExtractorFor(SortOption option)
                 return QString("%1%2").arg(info.getCmc(), 4, QChar('0')).arg(info.getManaCost());
             };
         case SortByColors:
-            return [](CardItem *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), true) : ""; };
+            return [](CardState *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), true) : ""; };
         case SortByPt:
             // do the same padding trick as above
             return
-                [](CardItem *c) { return c->getCard() ? c->getCardInfo().getPowTough().rightJustified(10, '0') : ""; };
+                [](CardState *c) { return c->getCard() ? c->getCardInfo().getPowTough().rightJustified(10, '0') : ""; };
         case SortBySet:
-            return [](CardItem *c) { return c->getCardInfo().getSetsNames(); };
+            return [](CardState *c) { return c->getCardInfo().getSetsNames(); };
         case SortByPrinting:
-            return [](CardItem *c) { return c->getProviderId(); };
+            return [](CardState *c) { return c->getProviderId(); };
     }
 
     // this line should never be reached
     qCWarning(CardListLog) << "cardlist.cpp: Could not find extractor for SortOption" << option;
-    return [](CardItem *) { return ""; };
+    return [](CardState *) { return ""; };
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/board/card_list.h b/libcockatrice_game/libcockatrice/game/board/card_list.h
similarity index 84%
rename from cockatrice/src/game/board/card_list.h
rename to libcockatrice_game/libcockatrice/game/board/card_list.h
index b5427df0d..b3037d0f6 100644
--- a/cockatrice/src/game/board/card_list.h
+++ b/libcockatrice_game/libcockatrice/game/board/card_list.h
@@ -14,9 +14,9 @@
 
 inline Q_LOGGING_CATEGORY(CardListLog, "card_list");
 
-class CardItem;
+class CardState;
 
-class CardList : public QList<CardItem *>
+class CardList : public QList<CardState *>
 {
 protected:
     bool contentsKnown;
@@ -43,7 +43,7 @@ public:
         SortByPrinting
     };
     explicit CardList(bool _contentsKnown);
-    CardItem *findCard(const int cardId) const;
+    CardState *findCard(const int cardId) const;
     bool getContentsKnown() const
     {
         return contentsKnown;
@@ -51,7 +51,7 @@ public:
 
     void sortBy(const QList<SortOption> &options);
 
-    static std::function<QString(CardItem *)> getExtractorFor(SortOption option);
+    static std::function<QString(CardState *)> getExtractorFor(SortOption option);
 };
 
 #endif
diff --git a/libcockatrice_game/libcockatrice/game/board/card_state.cpp b/libcockatrice_game/libcockatrice/game/board/card_state.cpp
new file mode 100644
index 000000000..7e8c079a4
--- /dev/null
+++ b/libcockatrice_game/libcockatrice/game/board/card_state.cpp
@@ -0,0 +1,240 @@
+#include "card_state.h"
+
+#include "../zones/card_zone_logic.h"
+
+#include <QSharedPointer>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_querier.h>
+
+void CardState::resetState(bool keepAnnotations)
+{
+    attacking = false;
+    counters.clear();
+    pt.clear();
+    if (!keepAnnotations) {
+        annotation.clear();
+    }
+    attachedTo = nullptr;
+    attachedCards.clear();
+    setTapped(false, false);
+    setDoesntUntap(false);
+    emit stateReset();
+}
+
+void CardState::setColor(const QString &_color)
+{
+    color = _color;
+    emit colorChanged();
+}
+
+void CardState::deleteView()
+{
+    emit viewDeleteRequested();
+}
+
+void CardState::setCardRef(const CardRef &_cardRef)
+{
+    if (cardRef == _cardRef) {
+        return;
+    }
+
+    const CardRef oldCardRef = cardRef;
+    if (exactCard) {
+        disconnect(exactCard.getCardPtr().data(), nullptr, this, nullptr);
+    }
+    cardRef = _cardRef;
+
+    emit cardRefChanged(oldCardRef, cardRef);
+    refreshCardInfo();
+}
+
+void CardState::refreshCardInfo()
+{
+    exactCard = CardDatabaseManager::query()->getCard(cardRef);
+
+    if (!exactCard && !cardRef.name.isEmpty()) {
+        CardInfo::UiAttributes attributes = {.tableRow = -1};
+        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes);
+        exactCard = ExactCard(info);
+    }
+    if (exactCard) {
+        connect(exactCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &CardState::cardPixmapUpdated);
+    }
+
+    emit cardInfoChanged();
+}
+
+void CardState::setTapped(bool _tapped, bool canAnimate)
+{
+    if (tapped == _tapped) {
+        return;
+    }
+
+    tapped = _tapped;
+    emit tappedChanged(tapped, canAnimate);
+    emit stateChanged();
+}
+
+void CardState::setFaceDown(bool _facedown)
+{
+    facedown = _facedown;
+    emit facedownChanged(facedown);
+    emit stateChanged();
+}
+
+QVariantList CardState::parsePT(const QString &pt)
+{
+    QVariantList ptList = QVariantList();
+    if (!pt.isEmpty()) {
+        int sep = pt.indexOf('/');
+        if (sep == 0) {
+            ptList.append(QVariant(pt.mid(1))); // cut off starting '/' and take full string
+        } else {
+            int start = 0;
+            for (;;) {
+                QString item = pt.mid(start, sep - start);
+                if (item.isEmpty()) {
+                    ptList.append(QVariant(QString()));
+                } else if (item[0] == '+') {
+                    ptList.append(QVariant(item.mid(1).toInt())); // add as int
+                } else if (item[0] == '-') {
+                    ptList.append(QVariant(item.toInt())); // add as int
+                } else {
+                    ptList.append(QVariant(item)); // add as qstring
+                }
+                if (sep == -1) {
+                    break;
+                }
+                start = sep + 1;
+                sep = pt.indexOf('/', start);
+            }
+        }
+    }
+    return ptList;
+}
+
+void CardState::setZone(CardZoneLogic *_zone)
+{
+    if (zone == _zone) {
+        return;
+    }
+
+    zone = _zone;
+    emit zoneChanged(this, zone);
+    emit stateChanged();
+}
+
+void CardState::setAttacking(bool _attacking)
+{
+    if (attacking == _attacking) {
+        return;
+    }
+    attacking = _attacking;
+    emit attackingChanged(_attacking);
+    emit stateChanged();
+}
+
+void CardState::insertCounter(int id, int value)
+{
+    counters.insert(id, value);
+
+    emit countersChanged(counters);
+    emit stateChanged();
+}
+
+void CardState::setCounter(int id, int value)
+{
+    if (value) {
+        counters[id] = value;
+    } else {
+        counters.remove(id);
+    }
+
+    emit countersChanged(counters);
+    emit stateChanged();
+}
+
+void CardState::clearCounters()
+{
+    counters.clear();
+    emit countersChanged(counters);
+    emit stateChanged();
+}
+
+void CardState::setAnnotation(const QString &_annotation)
+{
+    if (annotation == _annotation) {
+        return;
+    }
+    annotation = _annotation;
+    emit annotationChanged(annotation);
+    emit stateChanged();
+}
+
+void CardState::setPT(const QString &_pt)
+{
+    if (pt == _pt) {
+        return;
+    }
+    pt = _pt;
+    emit ptChanged(pt);
+    emit stateChanged();
+}
+
+void CardState::setDoesntUntap(bool _doesntUntap)
+{
+    if (doesntUntap == _doesntUntap) {
+        return;
+    }
+    doesntUntap = _doesntUntap;
+    emit doesntUntapChanged(_doesntUntap);
+    emit stateChanged();
+}
+
+void CardState::setDestroyOnZoneChange(bool _destroyOnZoneChange)
+{
+    if (destroyOnZoneChange == _destroyOnZoneChange) {
+        return;
+    }
+
+    destroyOnZoneChange = _destroyOnZoneChange;
+    emit destroyOnZoneChangeChanged(_destroyOnZoneChange);
+    emit stateChanged();
+}
+
+void CardState::setAttachedTo(CardState *_attachedTo)
+{
+    if (attachedTo == _attachedTo) {
+        return;
+    }
+
+    if (attachedTo != nullptr) {
+        attachedTo->removeAttachedCard(this);
+    }
+
+    setGridPoint(QPoint(-1, getGridPoint().y()));
+    attachedTo = _attachedTo;
+    emit attachedToChanged(_attachedTo);
+    emit stateChanged();
+
+    if (attachedTo != nullptr) {
+        // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its
+        // attached cards. The graphics item that owns this state handles the teardown in that case.
+        CardZoneLogic *parentZone = attachedTo->getZone();
+        if (parentZone == nullptr) {
+            return;
+        }
+        emit parentZone->cardAdded(this);
+        attachedTo->addAttachedCard(this);
+        if (getZone() != parentZone) {
+            parentZone->reorganizeCards();
+        }
+    } else if (getZone() != nullptr) {
+        emit getZone() -> cardAdded(this);
+    }
+
+    if (getZone() != nullptr) {
+        getZone()->reorganizeCards();
+    }
+}
diff --git a/libcockatrice_game/libcockatrice/game/board/card_state.h b/libcockatrice_game/libcockatrice/game/board/card_state.h
new file mode 100644
index 000000000..fa1e81393
--- /dev/null
+++ b/libcockatrice_game/libcockatrice/game/board/card_state.h
@@ -0,0 +1,243 @@
+#ifndef COCKATRICE_CARD_STATE_H
+#define COCKATRICE_CARD_STATE_H
+
+#include <QList>
+#include <QMap>
+#include <QObject>
+#include <QPoint>
+#include <QString>
+#include <QVariant>
+#include <libcockatrice/card/printing/exact_card.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
+
+class CardZoneLogic;
+class CardState : public QObject
+{
+    Q_OBJECT
+
+private:
+    int id = -1;
+    CardRef cardRef;
+    ExactCard exactCard;
+    bool tapped = false;
+    bool facedown = false;
+    QPoint gridPoint;
+
+    bool attacking = false;
+    QMap<int, int> counters;
+    QString annotation;
+    QString pt;
+    bool doesntUntap = false;
+    bool destroyOnZoneChange = false;
+    QString color;
+
+    CardState *attachedTo = nullptr;
+    QList<CardState *> attachedCards;
+    CardZoneLogic *zone = nullptr;
+
+signals:
+    void stateChanged();
+
+    void cardRefChanged(const CardRef &oldCardRef, const CardRef &newCardRef);
+    void cardInfoChanged();
+    void cardPixmapUpdated();
+    void tappedChanged(bool newTapped, bool canAnimate);
+    void facedownChanged(bool newFaceDown);
+    void stateReset();
+    void colorChanged();
+
+    void attackingChanged(bool newValue);
+    void countersChanged(const QMap<int, int> &newCounters);
+    void annotationChanged(const QString &newAnnotation);
+    void ptChanged(const QString &newPt);
+    void doesntUntapChanged(bool newValue);
+    void destroyOnZoneChangeChanged(bool newValue);
+    void attachedToChanged(CardState *newAttachedTo);
+    void zoneChanged(CardState *changedCard, CardZoneLogic *newZone);
+
+    void viewDeleteRequested();
+
+public:
+    explicit CardState(QObject *parent, CardZoneLogic *_zone = nullptr, const CardRef &_cardRef = {}, int _id = -1)
+        : QObject(parent), id(_id), cardRef(_cardRef), zone(_zone)
+    {
+    }
+
+    void resetState(bool keepAnnotations);
+
+    /**
+     * @brief Asks the card view owning this state to tear itself down.
+     *
+     * The state never holds a card item directly, so it cannot delete one. It asks instead and lets the view run
+     * its own teardown, which detaches attachments, drops it from the active card slot and unregisters its
+     * animations before the graphics object goes away.
+     */
+    void deleteView();
+
+    int getId() const
+    {
+        return id;
+    }
+
+    void setId(int _id)
+    {
+        id = _id;
+    }
+
+    const CardRef &getCardRef() const
+    {
+        return cardRef;
+    }
+
+    void setCardRef(const CardRef &_cardRef);
+
+    QString getName() const
+    {
+        return cardRef.name;
+    }
+
+    QString getProviderId() const
+    {
+        return cardRef.providerId;
+    }
+
+    ExactCard getCard() const
+    {
+        return exactCard;
+    }
+
+    const CardInfo &getCardInfo() const
+    {
+        return exactCard.getInfo();
+    }
+
+    void refreshCardInfo();
+
+    bool getTapped() const
+    {
+        return tapped;
+    }
+
+    void setTapped(bool _tapped, bool canAnimate = false);
+
+    bool getFaceDown() const
+    {
+        return facedown;
+    }
+
+    void setFaceDown(bool _facedown);
+
+    const QPoint &getGridPoint() const
+    {
+        return gridPoint;
+    }
+
+    void setGridPoint(const QPoint &_gridPoint)
+    {
+        gridPoint = _gridPoint;
+    }
+
+    CardZoneLogic *getZone() const
+    {
+        return zone;
+    }
+
+    void setZone(CardZoneLogic *_zone);
+
+    bool getAttacking() const
+    {
+        return attacking;
+    }
+    void setAttacking(bool _attacking);
+
+    const QMap<int, int> &getCounters() const
+    {
+        return counters;
+    }
+
+    void insertCounter(int id, int value);
+
+    void setCounter(int id, int value);
+
+    void clearCounters();
+
+    QString getAnnotation() const
+    {
+        return annotation;
+    }
+
+    void setAnnotation(const QString &_annotation);
+
+    QString getPT() const
+    {
+        return pt;
+    }
+
+    void setPT(const QString &_pt);
+
+    /**
+     * @brief Parses a string representing a p/t in order to extract the values from it.
+     *
+     * If the string contains '/', the string will be split at the '/' and each side will be parsed separately,
+     * which means the result list will have two elements.
+     *
+     * If '/' is not found, then the entire string is parsed together, which means the result list will
+     * have a single element.
+     *
+     * If either side of the split is empty, there will also only be a single element in the result list.
+     *
+     * This function will attempt to parse each substring as an int first, handling plus and minus prefixes.
+     * If successful, it will put the parsed value into the QVariant as an int.
+     * If failed, it will just put the substring into the QVariant as a QString.
+     *
+     * @param pt The p/t string
+     * @return A QVariantList that can contain one or two elements, where each QVariant can be either int or QString
+     */
+    static QVariantList parsePT(const QString &pt);
+
+    [[nodiscard]] QString getColor() const
+    {
+        return color;
+    }
+
+    void setColor(const QString &_color);
+
+    bool getDoesntUntap() const
+    {
+        return doesntUntap;
+    }
+
+    void setDoesntUntap(bool _doesntUntap);
+
+    bool getDestroyOnZoneChange() const
+    {
+        return destroyOnZoneChange;
+    }
+
+    void setDestroyOnZoneChange(bool _destroyOnZoneChange);
+
+    CardState *getAttachedTo() const
+    {
+        return attachedTo;
+    }
+
+    void setAttachedTo(CardState *_attachedTo);
+
+    void addAttachedCard(CardState *card)
+    {
+        attachedCards.append(card);
+    }
+
+    void removeAttachedCard(CardState *card)
+    {
+        attachedCards.removeOne(card);
+    }
+
+    const QList<CardState *> &getAttachedCards() const
+    {
+        return attachedCards;
+    }
+};
+
+#endif // COCKATRICE_CARD_STATE_H
diff --git a/cockatrice/src/game/board/counter_state.cpp b/libcockatrice_game/libcockatrice/game/board/counter_state.cpp
similarity index 100%
rename from cockatrice/src/game/board/counter_state.cpp
rename to libcockatrice_game/libcockatrice/game/board/counter_state.cpp
diff --git a/cockatrice/src/game/board/counter_state.h b/libcockatrice_game/libcockatrice/game/board/counter_state.h
similarity index 100%
rename from cockatrice/src/game/board/counter_state.h
rename to libcockatrice_game/libcockatrice/game/board/counter_state.h
diff --git a/cockatrice/src/game/game.cpp b/libcockatrice_game/libcockatrice/game/game.cpp
similarity index 75%
rename from cockatrice/src/game/game.cpp
rename to libcockatrice_game/libcockatrice/game/game.cpp
index 7343d052a..a1a4a31a8 100644
--- a/cockatrice/src/game/game.cpp
+++ b/libcockatrice_game/libcockatrice/game/game.cpp
@@ -16,13 +16,16 @@ Game::Game(QObject *_parent,
            bool isLocalGame,
            QList<AbstractClient *> &_clients,
            const Event_GameJoined &event,
-           const QMap<int, QString> &_roomGameTypes)
+           const QMap<int, QString> &_roomGameTypes,
+           IInterfaceSettingsProvider *interfaceSettings,
+           ICardPreferenceProvider *cardPreferences)
     : AbstractGame(_parent)
 {
     gameMetaInfo->setFromProto(event.game_info());
     gameMetaInfo->setRoomGameTypes(_roomGameTypes);
     gameState = new GameState(this, 0, event.host_id(), isLocalGame, _clients, false, event.resuming(), -1, false);
     connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged);
-    playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator());
+    playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator(), interfaceSettings,
+                                      cardPreferences);
     gameMetaInfo->setStarted(false);
 }
diff --git a/cockatrice/src/game/game.h b/libcockatrice_game/libcockatrice/game/game.h
similarity index 69%
rename from cockatrice/src/game/game.h
rename to libcockatrice_game/libcockatrice/game/game.h
index 6a309cfb2..f80b75ea5 100644
--- a/cockatrice/src/game/game.h
+++ b/libcockatrice_game/libcockatrice/game/game.h
@@ -18,6 +18,9 @@ class QString;
 template <class Key, class T> class QMap;
 template <typename T> class QList;
 
+class ICardPreferenceProvider;
+class IInterfaceSettingsProvider;
+
 class Game : public AbstractGame
 {
     Q_OBJECT
@@ -27,7 +30,9 @@ public:
          bool isLocalGame,
          QList<AbstractClient *> &_clients,
          const Event_GameJoined &event,
-         const QMap<int, QString> &_roomGameTypes);
+         const QMap<int, QString> &_roomGameTypes,
+         IInterfaceSettingsProvider *interfaceSettings = nullptr,
+         ICardPreferenceProvider *cardPreferences = nullptr);
 };
 
 #endif // COCKATRICE_GAME_H
diff --git a/cockatrice/src/game/game_event_handler.cpp b/libcockatrice_game/libcockatrice/game/game_event_handler.cpp
similarity index 80%
rename from cockatrice/src/game/game_event_handler.cpp
rename to libcockatrice_game/libcockatrice/game/game_event_handler.cpp
index 7b08af47c..7ef502400 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/libcockatrice_game/libcockatrice/game/game_event_handler.cpp
@@ -21,6 +21,7 @@
 #include <QMap>
 #include <QMapIterator>
 #include <QMessageLogger>
+#include <QSet>
 #include <QSharedPointer>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
@@ -28,12 +29,21 @@
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
+#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/command_game_say.pb.h>
 #include <libcockatrice/protocol/pb/command_leave_game.pb.h>
 #include <libcockatrice/protocol/pb/command_next_turn.pb.h>
+#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
 #include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <libcockatrice/protocol/pb/command_set_player_order.pb.h>
+#include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
+#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
+#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
+#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
@@ -42,12 +52,14 @@
 #include <libcockatrice/protocol/pb/event_join.pb.h>
 #include <libcockatrice/protocol/pb/event_kicked.pb.h>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
+#include <libcockatrice/protocol/pb/event_player_order_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_reverse_turn.pb.h>
 #include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_event_container.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/utility/zone_names.h>
 #include <string>
 #include <utility>
 
@@ -180,6 +192,9 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
                 case GameEvent::REVERSE_TURN:
                     eventReverseTurn(event.GetExtension(Event_ReverseTurn::ext), playerId, context);
                     break;
+                case GameEvent::PLAYER_ORDER_CHANGED:
+                    eventPlayerOrderChanged(event.GetExtension(Event_PlayerOrderChanged::ext), playerId, context);
+                    break;
 
                 default: {
                     PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
@@ -206,6 +221,16 @@ void GameEventHandler::handleReverseTurn()
     sendGameCommand(Command_ReverseTurn());
 }
 
+void GameEventHandler::handleSetPlayerOrder(const QList<QString> &playerNames, bool randomize)
+{
+    Command_SetPlayerOrder command;
+    command.set_randomize(randomize);
+    for (const QString &name : playerNames) {
+        command.add_player_names(name.toStdString());
+    }
+    sendGameCommand(command);
+}
+
 void GameEventHandler::handleActiveLocalPlayerConceded()
 {
     sendGameCommand(Command_Concede());
@@ -223,6 +248,89 @@ void GameEventHandler::handleActivePhaseChanged(int phase)
     sendGameCommand(cmd);
 }
 
+void GameEventHandler::handleUntapAll()
+{
+    Command_SetCardAttr cmd;
+    cmd.set_zone(ZoneNames::TABLE);
+    cmd.set_attribute(AttrTapped);
+    cmd.set_attr_value("0");
+
+    sendGameCommand(cmd);
+}
+
+void GameEventHandler::handleDrawCard()
+{
+    Command_DrawCards cmd;
+    cmd.set_number(1);
+
+    sendGameCommand(cmd);
+}
+
+PendingCommand *GameEventHandler::prepareDeckSelect(const QString &deckList)
+{
+    Command_DeckSelect cmd;
+    cmd.set_deck(deckList.toStdString());
+
+    return prepareGameCommand(cmd);
+}
+
+PendingCommand *GameEventHandler::prepareDeckSelectId(int deckId)
+{
+    Command_DeckSelect cmd;
+    cmd.set_deck_id(deckId);
+
+    return prepareGameCommand(cmd);
+}
+
+PendingCommand *GameEventHandler::prepareSetPlaymat(const PlaymatInfo &playmat)
+{
+    Command_SetPlaymat cmd;
+    auto *pp = cmd.mutable_playmat_params();
+    pp->set_card_name(playmat.card.name.toStdString());
+    pp->set_card_provider_id(playmat.card.providerId.toStdString());
+    pp->set_margin_pct_l(playmat.params.marginPctL);
+    pp->set_margin_pct_r(playmat.params.marginPctR);
+    pp->set_vertical_offset(playmat.params.verticalOffset);
+    pp->set_zoom(playmat.params.zoom);
+
+    return prepareGameCommand(cmd);
+}
+
+void GameEventHandler::sendReadyStart(bool ready, int playerId)
+{
+    Command_ReadyStart cmd;
+    cmd.set_ready(ready);
+
+    sendGameCommand(cmd, playerId);
+}
+
+void GameEventHandler::sendForceStart(int playerId)
+{
+    Command_ReadyStart cmd;
+    cmd.set_force_start(true);
+    cmd.set_ready(true);
+
+    sendGameCommand(cmd, playerId);
+}
+
+void GameEventHandler::sendSetSideboardLock(bool locked, int playerId)
+{
+    Command_SetSideboardLock cmd;
+    cmd.set_locked(locked);
+
+    sendGameCommand(cmd, playerId);
+}
+
+void GameEventHandler::sendSetSideboardPlan(const QList<MoveCard_ToZone> &plan, int playerId)
+{
+    Command_SetSideboardPlan cmd;
+    for (const auto &zone : plan) {
+        cmd.add_move_list()->CopyFrom(zone);
+    }
+
+    sendGameCommand(cmd, playerId);
+}
+
 void GameEventHandler::handleGameLeft()
 {
     sendGameCommand(Command_LeaveGame());
@@ -285,6 +393,27 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
 {
     const int playerListSize = event.player_list_size();
 
+    if (event.has_local_player_id()) {
+        game->getPlayerManager()->setLocalPlayerId(event.local_player_id());
+    }
+
+    QSet<int> authoritativePlayerIds;
+    for (int i = 0; i < playerListSize; ++i) {
+        const ServerInfo_PlayerProperties &prop = event.player_list(i).properties();
+        if (!prop.spectator()) {
+            authoritativePlayerIds.insert(prop.player_id());
+        }
+    }
+
+    // Players whose seats were shuffled away from the previous game are no longer
+    // part of the authoritative list and must be removed.
+    for (int stalePlayerId : game->getPlayerManager()->getPlayers().keys()) {
+        if (!authoritativePlayerIds.contains(stalePlayerId)) {
+            game->getPlayerManager()->removePlayer(stalePlayerId);
+            emit playerLeft(stalePlayerId);
+        }
+    }
+
     QVector<QPair<int, QPair<QString, QString>>> opponentDecksToDisplay;
 
     for (int i = 0; i < playerListSize; ++i) {
@@ -329,6 +458,19 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
 
     emit remotePlayersDecksSelected(opponentDecksToDisplay);
 
+    // The server emits player_list in seat order, so record it to lay out the
+    // table by seating rather than by player id.
+    QList<int> seatOrder;
+    for (int i = 0; i < playerListSize; ++i) {
+        const ServerInfo_PlayerProperties &prop = event.player_list(i).properties();
+        if (!prop.spectator()) {
+            seatOrder.append(prop.player_id());
+        }
+    }
+    if (!seatOrder.isEmpty()) {
+        game->getGameState()->setSeatOrder(seatOrder);
+    }
+
     game->getGameState()->setGameTime(event.seconds_elapsed());
 
     if (event.game_started() && !game->getGameMetaInfo()->started()) {
@@ -533,6 +675,33 @@ void GameEventHandler::eventReverseTurn(const Event_ReverseTurn &event,
     emit logTurnReversed(player, event.reversed());
 }
 
+void GameEventHandler::eventPlayerOrderChanged(const Event_PlayerOrderChanged &event,
+                                               int /*eventPlayerId*/,
+                                               const GameEventContext & /*context*/)
+{
+    QStringList playerNames;
+    for (const auto &name : event.player_names()) {
+        playerNames.append(QString::fromStdString(name));
+    }
+
+    // Track the seating by stable player id so the table layout and the turn
+    // order dialog follow the shuffled order instead of id order.
+    QList<int> seatOrder;
+    const auto &players = game->getPlayerManager()->getPlayers();
+    for (const QString &name : playerNames) {
+        for (auto it = players.constBegin(); it != players.constEnd(); ++it) {
+            if (it.value() && it.value()->getPlayerInfo()->getName() == name) {
+                seatOrder.append(it.key());
+                break;
+            }
+        }
+    }
+    if (!seatOrder.isEmpty()) {
+        game->getGameState()->setSeatOrder(seatOrder);
+    }
+    emit logTurnOrderChanged(playerNames, event.randomized());
+}
+
 void GameEventHandler::eventGameHostChanged(const Event_GameHostChanged & /*event*/,
                                             int eventPlayerId,
                                             const GameEventContext & /*context*/)
diff --git a/cockatrice/src/game/game_event_handler.h b/libcockatrice_game/libcockatrice/game/game_event_handler.h
similarity index 79%
rename from cockatrice/src/game/game_event_handler.h
rename to libcockatrice_game/libcockatrice/game/game_event_handler.h
index 30021d295..bfcf355b0 100644
--- a/cockatrice/src/game/game_event_handler.h
+++ b/libcockatrice_game/libcockatrice/game/game_event_handler.h
@@ -29,13 +29,14 @@
 // GameEventContext, ServerInfo_Player and ServerInfo_User are passed by value
 // to signals and slots, so the moc-generated code needs the complete types.
 #include <libcockatrice/protocol/pb/game_event_context.pb.h>
+#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/utility/playmat_params.h>
 
 class AbstractClient;
 class AbstractGame;
 class GameEventContainer;
-class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
 class Response;
@@ -50,6 +51,7 @@ class Event_GameSay;
 class Event_Kicked;
 class Event_ReverseTurn;
 class Event_Ping;
+class Event_PlayerOrderChanged;
 class ServerInfo_PlayerProperties;
 namespace google
 {
@@ -112,6 +114,16 @@ public:
     /** @brief Request reversing the current turn order. */
     void handleReverseTurn();
 
+    /**
+     * @brief Request a new seating / turn order.
+     *
+     * Only the game host (or a moderator) may do this before the game starts.
+     *
+     * @param playerNames Ordered list of player names. Ignored when randomize is true.
+     * @param randomize Ask the server to shuffle the seats instead.
+     */
+    void handleSetPlayerOrder(const QList<QString> &playerNames, bool randomize);
+
     /** @brief Concede the game for the currently active local player. */
     void handleActiveLocalPlayerConceded();
 
@@ -127,6 +139,12 @@ public:
      */
     void handleActivePhaseChanged(int phase);
 
+    /** @brief Request untapping every permanent on the table. */
+    void handleUntapAll();
+
+    /** @brief Request drawing a single card. */
+    void handleDrawCard();
+
     /** @brief Leave the current game session. */
     void handleGameLeft();
 
@@ -145,6 +163,70 @@ public:
     void handleArrowDeletion(int creatorId, int arrowId);
     void handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId);
 
+    /**
+     * @brief Prepare a deck selection from its native deck list text.
+     *
+     * The returned command is not sent yet, so the caller can connect to
+     * PendingCommand::finished before handing it to sendGameCommand().
+     *
+     * @param deckList Serialized deck list.
+     * @return The pending command awaiting the deck download response.
+     */
+    PendingCommand *prepareDeckSelect(const QString &deckList);
+
+    /**
+     * @brief Prepare a deck selection for a deck stored on the server.
+     *
+     * The returned command is not sent yet, so the caller can connect to
+     * PendingCommand::finished before handing it to sendGameCommand().
+     *
+     * @param deckId Server-side deck identifier.
+     * @return The pending command awaiting the deck download response.
+     */
+    PendingCommand *prepareDeckSelectId(int deckId);
+
+    /**
+     * @brief Build the playmat command for a player without sending it.
+     *
+     * The returned command is not sent yet, so the caller can connect to
+     * PendingCommand::finished before handing it to sendGameCommand().
+     *
+     * @param playmat Resolved playmat card and positioning parameters.
+     * @return The pending command awaiting the playmat response.
+     */
+    PendingCommand *prepareSetPlaymat(const PlaymatInfo &playmat);
+
+    /**
+     * @brief Set a player's ready state.
+     *
+     * @param ready Whether the player is ready.
+     * @param playerId Player the state applies to.
+     */
+    void sendReadyStart(bool ready, int playerId);
+
+    /**
+     * @brief Force-start the game, kicking every player who is not ready.
+     *
+     * @param playerId Player issuing the force start.
+     */
+    void sendForceStart(int playerId);
+
+    /**
+     * @brief Lock or unlock a player's sideboard.
+     *
+     * @param locked Whether the sideboard is locked.
+     * @param playerId Player the lock applies to.
+     */
+    void sendSetSideboardLock(bool locked, int playerId);
+
+    /**
+     * @brief Send a player's sideboard plan.
+     *
+     * @param plan Cards to move between zones when leaving sideboarding.
+     * @param playerId Player the plan belongs to.
+     */
+    void sendSetSideboardPlan(const QList<MoveCard_ToZone> &plan, int playerId);
+
     /** @} */
 
     /** @name Incoming event processing
@@ -245,6 +327,10 @@ public:
     /** @brief Handle a turn reversal event. */
     void eventReverseTurn(const Event_ReverseTurn &event, int eventPlayerId, const GameEventContext &context);
 
+    /** @brief Handle a change of the seating / turn order. */
+    void
+    eventPlayerOrderChanged(const Event_PlayerOrderChanged &event, int eventPlayerId, const GameEventContext &context);
+
     /** @brief Handle ping / latency updates. */
     void eventPing(const Event_Ping &event, int eventPlayerId, const GameEventContext &context);
 
@@ -372,6 +458,7 @@ signals:
     void logLeave(PlayerLogic *player, QString reason);
     void logKicked();
     void logTurnReversed(PlayerLogic *player, bool reversed);
+    void logTurnOrderChanged(QStringList playerNames, bool randomized);
     void logGameClosed();
     void logActivePlayer(PlayerLogic *activePlayer);
     void logActivePhaseChanged(int activePhase);
diff --git a/cockatrice/src/game/game_meta_info.cpp b/libcockatrice_game/libcockatrice/game/game_meta_info.cpp
similarity index 100%
rename from cockatrice/src/game/game_meta_info.cpp
rename to libcockatrice_game/libcockatrice/game/game_meta_info.cpp
diff --git a/cockatrice/src/game/game_meta_info.h b/libcockatrice_game/libcockatrice/game/game_meta_info.h
similarity index 100%
rename from cockatrice/src/game/game_meta_info.h
rename to libcockatrice_game/libcockatrice/game/game_meta_info.h
diff --git a/cockatrice/src/game/game_state.cpp b/libcockatrice_game/libcockatrice/game/game_state.cpp
similarity index 100%
rename from cockatrice/src/game/game_state.cpp
rename to libcockatrice_game/libcockatrice/game/game_state.cpp
diff --git a/cockatrice/src/game/game_state.h b/libcockatrice_game/libcockatrice/game/game_state.h
similarity index 81%
rename from cockatrice/src/game/game_state.h
rename to libcockatrice_game/libcockatrice/game/game_state.h
index 55784fb91..4d02019ce 100644
--- a/cockatrice/src/game/game_state.h
+++ b/libcockatrice_game/libcockatrice/game/game_state.h
@@ -33,7 +33,11 @@ public:
 
     void setHostId(int _hostId)
     {
+        if (hostId == _hostId) {
+            return;
+        }
         hostId = _hostId;
+        emit hostChanged(hostId);
     }
 
     QList<AbstractClient *> getClients() const
@@ -112,6 +116,19 @@ public:
         return hostId;
     }
 
+    void setSeatOrder(const QList<int> &order)
+    {
+        if (seatOrder != order) {
+            seatOrder = order;
+            emit seatOrderChanged(seatOrder);
+        }
+    }
+
+    QList<int> getSeatOrder() const
+    {
+        return seatOrder;
+    }
+
     int getSecondsElapsed() const
     {
         return secondsElapsed;
@@ -123,6 +140,8 @@ signals:
     void gameStopped();
     void activePhaseChanged(int activePhase);
     void activePlayerChanged(int playerId);
+    void hostChanged(int hostId);
+    void seatOrderChanged(const QList<int> &seatOrder);
 
 public slots:
     void incrementGameTime();
@@ -142,6 +161,9 @@ private:
     int currentPhase;
     int activePlayer;
     bool gameClosed;
+    //! Player ids in seating (turn) order, first to play first. Empty until the
+    //! server sends an order, in which case players are laid out in id order.
+    QList<int> seatOrder;
 };
 
 #endif // COCKATRICE_GAME_STATE_H
diff --git a/cockatrice/src/game/phase.cpp b/libcockatrice_game/libcockatrice/game/phase.cpp
similarity index 100%
rename from cockatrice/src/game/phase.cpp
rename to libcockatrice_game/libcockatrice/game/phase.cpp
diff --git a/cockatrice/src/game/phase.h b/libcockatrice_game/libcockatrice/game/phase.h
similarity index 100%
rename from cockatrice/src/game/phase.h
rename to libcockatrice_game/libcockatrice/game/phase.h
diff --git a/cockatrice/src/game_graphics/player/card_menu_action_type.h b/libcockatrice_game/libcockatrice/game/player/card_menu_action_type.h
similarity index 95%
rename from cockatrice/src/game_graphics/player/card_menu_action_type.h
rename to libcockatrice_game/libcockatrice/game/player/card_menu_action_type.h
index 4cae22716..e5c4cd84e 100644
--- a/cockatrice/src/game_graphics/player/card_menu_action_type.h
+++ b/libcockatrice_game/libcockatrice/game/player/card_menu_action_type.h
@@ -1,6 +1,6 @@
 /**
  * @file card_menu_action_type.h
- * @ingroup GameMenusPlayers
+ * @ingroup GameLogicPlayers
  */
 //! \todo Document this file.
 
diff --git a/libcockatrice_game/libcockatrice/game/player/card_move_request.h b/libcockatrice_game/libcockatrice/game/player/card_move_request.h
new file mode 100644
index 000000000..bed46ab60
--- /dev/null
+++ b/libcockatrice_game/libcockatrice/game/player/card_move_request.h
@@ -0,0 +1,22 @@
+/**
+ * @file card_move_request.h
+ * @ingroup GameLogicActions
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_CARD_MOVE_REQUEST_H
+#define COCKATRICE_CARD_MOVE_REQUEST_H
+
+#include <QString>
+
+/**
+ * @brief Describes one card a view wants moved, in logic terms rather than wire terms.
+ */
+struct CardMoveRequest
+{
+    int cardId = -1;
+    bool faceDown = false;
+    QString pt = {};
+};
+
+#endif // COCKATRICE_CARD_MOVE_REQUEST_H
diff --git a/cockatrice/src/game/player/event_processing_options.h b/libcockatrice_game/libcockatrice/game/player/event_processing_options.h
similarity index 100%
rename from cockatrice/src/game/player/event_processing_options.h
rename to libcockatrice_game/libcockatrice/game/player/event_processing_options.h
diff --git a/libcockatrice_game/libcockatrice/game/player/move_top_cards_until_options.h b/libcockatrice_game/libcockatrice/game/player/move_top_cards_until_options.h
new file mode 100644
index 000000000..da8028b0f
--- /dev/null
+++ b/libcockatrice_game/libcockatrice/game/player/move_top_cards_until_options.h
@@ -0,0 +1,19 @@
+/**
+ * @file move_top_cards_until_options.h
+ * @ingroup GameLogicPlayers
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_MOVE_TOP_CARDS_UNTIL_OPTIONS_H
+#define COCKATRICE_MOVE_TOP_CARDS_UNTIL_OPTIONS_H
+
+#include <QStringList>
+
+struct MoveTopCardsUntilOptions
+{
+    QStringList exprs = {};
+    int numberOfHits = 1;
+    bool autoPlay = false;
+};
+
+#endif // COCKATRICE_MOVE_TOP_CARDS_UNTIL_OPTIONS_H
diff --git a/cockatrice/src/game/player/player_actions.cpp b/libcockatrice_game/libcockatrice/game/player/player_actions.cpp
similarity index 84%
rename from cockatrice/src/game/player/player_actions.cpp
rename to libcockatrice_game/libcockatrice/game/player/player_actions.cpp
index 35682ede8..90823fec6 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/libcockatrice_game/libcockatrice/game/player/player_actions.cpp
@@ -1,13 +1,8 @@
 #include "player_actions.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/dialogs/dlg_create_token.h"
-#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
-#include "../../game_graphics/player/card_menu_action_type.h"
-#include "../../game_graphics/zones/table_zone.h"
-#include "../../interface/deck_loader/loaded_deck.h"
 #include "../abstract_game.h"
+#include "../board/arrow_data.h"
+#include "../board/card_state.h"
 #include "../board/counter_state.h"
 #include "../game_event_handler.h"
 #include "../zones/card_zone_logic.h"
@@ -31,8 +26,6 @@
 #include <QChar>
 #include <QColor>
 #include <QFlags>
-#include <QInputDialog>
-#include <QKeyEvent>
 #include <QList>
 #include <QMap>
 #include <QMapIterator>
@@ -51,10 +44,15 @@
 #include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
+#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <libcockatrice/interfaces/interface_interface_settings_provider.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
+#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_create_token.pb.h>
 #include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
+#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/command_flip_card.pb.h>
 #include <libcockatrice/protocol/pb/command_game_say.pb.h>
 #include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
@@ -64,11 +62,12 @@
 #include <libcockatrice/protocol/pb/command_roll_die.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
-#include <libcockatrice/settings/card_override_settings.h>
-#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
+#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/expression.h>
 #include <libcockatrice/utility/zone_names.h>
@@ -80,8 +79,11 @@
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;
 
-PlayerActions::PlayerActions(PlayerLogic *_player)
-    : QObject(_player), player(_player), lastTokenTableRow(0), movingCardsUntil(false)
+PlayerActions::PlayerActions(PlayerLogic *_player,
+                             IInterfaceSettingsProvider *_interfaceSettings,
+                             ICardPreferenceProvider *_cardPreferences)
+    : QObject(_player), player(_player), interfaceSettings(_interfaceSettings), cardPreferences(_cardPreferences),
+      lastTokenTableRow(0), movingCardsUntil(false)
 {
     connect(this, &PlayerActions::requestZoneViewToggle, player, &PlayerLogic::onRequestZoneViewToggle);
 
@@ -91,7 +93,27 @@ PlayerActions::PlayerActions(PlayerLogic *_player)
     connect(moveTopCardTimer, &QTimer::timeout, [this]() { actMoveTopCardToPlay(); });
 }
 
-void PlayerActions::playCard(CardItem *card, bool faceDown)
+bool PlayerActions::getPlayToStack() const
+{
+    return interfaceSettings ? interfaceSettings->getPlayToStack() : true;
+}
+
+int PlayerActions::getStartingHandSize() const
+{
+    return interfaceSettings ? interfaceSettings->getStartingHandSize() : 7;
+}
+
+bool PlayerActions::getAnnotateTokens() const
+{
+    return interfaceSettings ? interfaceSettings->getAnnotateTokens() : false;
+}
+
+QString PlayerActions::getCardPreferenceOverride(const QString &cardName) const
+{
+    return cardPreferences ? cardPreferences->getCardPreferenceOverride(cardName) : QString();
+}
+
+void PlayerActions::playCard(CardState *card, bool faceDown)
 {
     if (card == nullptr) {
         return;
@@ -112,7 +134,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = info.getUiAttributes().tableRow;
-    bool playToStack = SettingsCache::instance().userInterface().getPlayToStack();
+    bool playToStack = getPlayToStack();
     QString currentZone = card->getZone()->getName();
     if (!faceDown && currentZone == ZoneNames::STACK && tableRow == 3) {
         cmd.set_target_zone(ZoneNames::GRAVE);
@@ -125,7 +147,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
         cmd.set_y(0);
     } else {
         tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-        QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
+        QPoint gridPoint = QPoint(-1, TableZoneLogic::tableRowToGridY(tableRow));
         cardToMove->set_face_down(faceDown);
         if (!faceDown) {
             cardToMove->set_pt(info.getPowTough().toStdString());
@@ -144,7 +166,7 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
  * Like {@link PlayerActions::playCard}, but forces the card to be played to the table zone.
  * Cards with tablerow 3 (the stack) will be played to tablerow 1 (the noncreatures row).
  */
-void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
+void PlayerActions::playCardToTable(const CardState *card, bool faceDown)
 {
     if (card == nullptr) {
         return;
@@ -165,7 +187,7 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
+    QPoint gridPoint = QPoint(-1, TableZoneLogic::tableRowToGridY(tableRow));
     cardToMove->set_face_down(faceDown);
     if (!faceDown) {
         cardToMove->set_pt(info.getPowTough().toStdString());
@@ -177,6 +199,60 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
     sendGameCommand(cmd);
 }
 
+void PlayerActions::attachCards(CardState *startCard, const CardState *targetCard)
+{
+    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) {
+        return;
+    }
+
+    // move card onto table first if attaching from some other zone
+    if (startCard->getZone()->getName() != ZoneNames::TABLE) {
+        playCardToTable(startCard, false);
+    }
+
+    Command_AttachCard cmd;
+    cmd.set_start_zone(ZoneNames::TABLE);
+    cmd.set_card_id(startCard->getId());
+    cmd.set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(targetCard->getZone()->getName().toStdString());
+    cmd.set_target_card_id(targetCard->getId());
+    sendGameCommand(cmd);
+}
+
+void PlayerActions::createArrow(CardState *startCard, const ArrowData &arrow, int deleteInPhase)
+{
+    Command_CreateArrow cmd;
+    cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(arrow.color));
+    cmd.set_start_player_id(arrow.startPlayerId);
+    cmd.set_start_zone(arrow.startZone.toStdString());
+    cmd.set_start_card_id(arrow.startCardId);
+    cmd.set_target_player_id(arrow.targetPlayerId);
+
+    if (!arrow.isPlayerTargeted()) {
+        cmd.set_target_zone(arrow.targetZone.toStdString());
+        cmd.set_target_card_id(arrow.targetCardId);
+    }
+
+    // if the card is in hand then it has just been moved to the stack or table as part of drawing the arrow
+    if (arrow.startZone == ZoneNames::HAND) {
+        CardInfoPtr ci = startCard->getCard().getCardPtr();
+        bool playToStack = getPlayToStack();
+        if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
+                   (playToStack && ci->getUiAttributes().tableRow != 0 &&
+                    startCard->getZone()->getName() != ZoneNames::STACK))) {
+            cmd.set_start_zone(ZoneNames::STACK);
+        } else {
+            cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE);
+        }
+    }
+
+    if (deleteInPhase != 0) {
+        cmd.set_delete_in_phase(deleteInPhase);
+    }
+
+    sendGameCommand(cmd);
+}
+
 void PlayerActions::actViewLibrary()
 {
     emit requestZoneViewToggle(ZoneNames::DECK, -1);
@@ -355,7 +431,7 @@ void PlayerActions::actDrawCard()
 
 void PlayerActions::actRequestMulliganDialog()
 {
-    int startSize = SettingsCache::instance().userInterface().getStartingHandSize();
+    int startSize = getStartingHandSize();
     int handSize = player->getHandZone()->getCards().size();
     int deckSize = player->getDeckZone()->getCards().size() + handSize;
 
@@ -371,7 +447,7 @@ void PlayerActions::actMulligan(int number)
     }
 
     doMulligan(number);
-    SettingsCache::instance().userInterface().setStartingHandSize(number);
+    emit startingHandSizeChosen(number);
 }
 
 void PlayerActions::actMulliganSameSize()
@@ -549,7 +625,7 @@ void PlayerActions::moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOpti
     }
 }
 
-void PlayerActions::moveOneCardUntil(CardItem *card)
+void PlayerActions::moveOneCardUntil(CardState *card)
 {
     moveTopCardTimer->stop();
 
@@ -741,61 +817,6 @@ void PlayerActions::actMoveBottomCardToTop()
     sendGameCommand(cmd);
 }
 
-/**
- * Selects all cards in the given zone.
- *
- * @param zone The zone to select from
- * @param filter A predicate to filter which cards are selected. Defaults to always returning true.
- */
-static void selectCardsInZone(
-    const CardZoneLogic *zone,
-    std::function<bool(const CardItem *)> filter = [](const CardItem *) { return true; })
-{
-    if (!zone) {
-        return;
-    }
-
-    for (auto &cardItem : zone->getCards()) {
-        if (cardItem && filter(cardItem)) {
-            cardItem->setSelected(true);
-        }
-    }
-}
-
-void PlayerActions::actSelectAll()
-{
-    const CardItem *card = player->getGame()->getActiveCard();
-    if (!card) {
-        return;
-    }
-
-    selectCardsInZone(card->getZone());
-}
-
-void PlayerActions::actSelectRow()
-{
-    const CardItem *card = player->getGame()->getActiveCard();
-    if (!card) {
-        return;
-    }
-
-    auto isSameRow = [card](const CardItem *cardItem) {
-        return qAbs(card->scenePos().y() - cardItem->scenePos().y()) < 50;
-    };
-    selectCardsInZone(card->getZone(), isSameRow);
-}
-
-void PlayerActions::actSelectColumn()
-{
-    const CardItem *card = player->getGame()->getActiveCard();
-    if (!card) {
-        return;
-    }
-
-    auto isSameColumn = [card](const CardItem *cardItem) { return cardItem->x() == card->x(); };
-    selectCardsInZone(card->getZone(), isSameColumn);
-}
-
 void PlayerActions::actDrawBottomCard()
 {
     if (player->getDeckZone()->getCards().empty()) {
@@ -929,7 +950,7 @@ void PlayerActions::actCreateToken(TokenInfo tokenToCreate)
     if (correctedCard) {
         lastTokenInfo.name = correctedCard.getName();
         int tableRow = lastTokenInfo.faceDown ? 2 : correctedCard.getInfo().getUiAttributes().tableRow;
-        lastTokenTableRow = TableZone::tableRowToGridY(tableRow);
+        lastTokenTableRow = TableZoneLogic::tableRowToGridY(tableRow);
         if (lastTokenInfo.pt.isEmpty()) {
             lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
         }
@@ -975,15 +996,14 @@ void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo)
         return;
     }
 
-    lastTokenInfo = {
-        .name = cardInfo->getName(),
-        .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(),
-        .pt = cardInfo->getPowTough(),
-        .annotation = SettingsCache::instance().userInterface().getAnnotateTokens() ? cardInfo->getText() : "",
-        .destroy = true,
-        .providerId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
+    lastTokenInfo = {.name = cardInfo->getName(),
+                     .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(),
+                     .pt = cardInfo->getPowTough(),
+                     .annotation = getAnnotateTokens() ? cardInfo->getText() : "",
+                     .destroy = true,
+                     .providerId = getCardPreferenceOverride(cardInfo->getName())};
 
-    lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow);
+    lastTokenTableRow = TableZoneLogic::tableRowToGridY(cardInfo->getUiAttributes().tableRow);
 
     emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name);
 }
@@ -1001,25 +1021,20 @@ void PlayerActions::actCreatePredefinedToken()
     actCreateAnotherToken();
 }
 
-void PlayerActions::actCreateRelatedCard()
+void PlayerActions::actCreateRelatedCard(const CardState *sourceCard, int index)
 {
-    const CardItem *sourceCard = player->getGame()->getActiveCard();
-
     if (!sourceCard) {
         return;
     }
 
-    auto *action = static_cast<QAction *>(sender());
-    // If there is a better way of passing a CardRelation through a QAction, please add it here.
     auto relatedCards = sourceCard->getCardInfo().getAllRelatedCards();
 
-    CardRelation *cardRelation = relatedCards.at(action->data().toInt());
+    CardRelation *cardRelation = relatedCards.at(index);
     actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
 }
 
-void PlayerActions::actCreateAllRelatedCards()
+void PlayerActions::actCreateAllRelatedCards(const CardState *sourceCard)
 {
-    const CardItem *sourceCard = player->getGame()->getActiveCard();
     if (!sourceCard) {
         return;
     }
@@ -1105,13 +1120,13 @@ void PlayerActions::actCreateAllRelatedCards()
     }
 }
 
-void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard,
+void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardState *sourceCard,
                                                               const CardRelation *cardRelation)
 {
     emit requestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
 }
 
-bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard,
+bool PlayerActions::createRelatedFromRelation(const CardState *sourceCard,
                                               const CardRelation *cardRelation,
                                               int variableCount)
 {
@@ -1163,7 +1178,7 @@ bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard,
     return true;
 }
 
-void PlayerActions::onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation)
+void PlayerActions::onRelatedCardCreated(const CardState *sourceCard, const CardRelation *cardRelation)
 {
     if (sourceCard == nullptr || cardRelation == nullptr) {
         return;
@@ -1183,7 +1198,7 @@ void PlayerActions::onRelatedCardCreated(const CardItem *sourceCard, const CardR
     setLastToken(relatedCard.getCardPtr());
 }
 
-void PlayerActions::createCard(const CardItem *sourceCard,
+void PlayerActions::createCard(const CardState *sourceCard,
                                const QString &dbCardName,
                                CardRelationType attachType,
                                bool persistent,
@@ -1195,7 +1210,7 @@ void PlayerActions::createCard(const CardItem *sourceCard,
         return;
     }
 
-    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow));
+    QPoint gridPoint = QPoint(-1, TableZoneLogic::tableRowToGridY(cardInfo->getUiAttributes().tableRow));
 
     // create the token for the related card
     Command_CreateToken cmd;
@@ -1214,7 +1229,7 @@ void PlayerActions::createCard(const CardItem *sourceCard,
     }
 
     cmd.set_pt(cardInfo->getPowTough().toStdString());
-    if (SettingsCache::instance().userInterface().getAnnotateTokens()) {
+    if (getAnnotateTokens()) {
         cmd.set_annotation(cardInfo->getText().toStdString());
     } else {
         cmd.set_annotation("");
@@ -1269,7 +1284,7 @@ void PlayerActions::actRequestMoveCardXCardsFromTopDialog()
     emit requestMoveCardXCardsFromTopDialog(defaultNumberTopCardsToPlaceBelow, deckSize);
 }
 
-void PlayerActions::actMoveCardXCardsFromTop(QList<CardItem *> selectedCards, int number)
+void PlayerActions::actMoveCardXCardsFromTop(QList<CardState *> selectedCards, int number)
 {
     defaultNumberTopCardsToPlaceBelow = number;
 
@@ -1303,14 +1318,14 @@ void PlayerActions::actMoveCardXCardsFromTop(QList<CardItem *> selectedCards, in
     }
 }
 
-void PlayerActions::actIncPT(QList<CardItem *> selectedCards, int deltaP, int deltaT)
+void PlayerActions::actIncPT(QList<CardState *> selectedCards, int deltaP, int deltaT)
 {
     int playerid = player->getPlayerInfo()->getId();
 
     QList<const ::google::protobuf::Message *> commandList;
     for (auto card : selectedCards) {
         QString pt = card->getPT();
-        const auto ptList = CardItem::parsePT(pt);
+        const auto ptList = CardState::parsePT(pt);
         QString newpt;
         if (ptList.isEmpty()) {
             newpt = QString::number(deltaP) + (deltaT ? "/" + QString::number(deltaT) : "");
@@ -1336,7 +1351,7 @@ void PlayerActions::actIncPT(QList<CardItem *> selectedCards, int deltaP, int de
     player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
-void PlayerActions::actResetPT(QList<CardItem *> selectedCards)
+void PlayerActions::actResetPT(QList<CardState *> selectedCards)
 {
     int playerid = player->getPlayerInfo()->getId();
     QList<const ::google::protobuf::Message *> commandList;
@@ -1369,7 +1384,7 @@ void PlayerActions::actResetPT(QList<CardItem *> selectedCards)
     }
 }
 
-void PlayerActions::actRequestSetPTDialog(QList<CardItem *> selectedCards)
+void PlayerActions::actRequestSetPTDialog(QList<CardState *> selectedCards)
 {
     QString oldPT;
 
@@ -1382,11 +1397,11 @@ void PlayerActions::actRequestSetPTDialog(QList<CardItem *> selectedCards)
     emit requestSetPTDialog(oldPT);
 }
 
-void PlayerActions::actSetPT(QList<CardItem *> selectedCards, const QString &pt)
+void PlayerActions::actSetPT(QList<CardState *> selectedCards, const QString &pt)
 {
     int playerid = player->getPlayerInfo()->getId();
 
-    const auto ptList = CardItem::parsePT(pt);
+    const auto ptList = CardState::parsePT(pt);
     bool empty = ptList.isEmpty();
 
     QList<const ::google::protobuf::Message *> commandList;
@@ -1394,7 +1409,7 @@ void PlayerActions::actSetPT(QList<CardItem *> selectedCards, const QString &pt)
         auto *cmd = new Command_SetCardAttr;
         QString newpt = QString();
         if (!empty) {
-            const auto oldpt = CardItem::parsePT(card->getPT());
+            const auto oldpt = CardState::parsePT(card->getPT());
             int ptIter = 0;
             for (const auto &_item : ptList) {
                 if (_item.typeId() == QMetaType::Type::Int) {
@@ -1422,55 +1437,65 @@ void PlayerActions::actSetPT(QList<CardItem *> selectedCards, const QString &pt)
     player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
-void PlayerActions::actDrawArrow()
-{
-    auto *card = player->getGame()->getActiveCard();
-    if (card) {
-        card->drawArrow(Qt::red);
-    }
-}
-
-void PlayerActions::actIncP(QList<CardItem *> selectedCards)
+void PlayerActions::actIncP(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, 1, 0);
 }
 
-void PlayerActions::actDecP(QList<CardItem *> selectedCards)
+void PlayerActions::actDecP(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, -1, 0);
 }
 
-void PlayerActions::actIncT(QList<CardItem *> selectedCards)
+void PlayerActions::actIncT(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, 0, 1);
 }
 
-void PlayerActions::actDecT(QList<CardItem *> selectedCards)
+void PlayerActions::actDecT(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, 0, -1);
 }
 
-void PlayerActions::actIncPT(QList<CardItem *> selectedCards)
+void PlayerActions::actIncPT(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, 1, 1);
 }
 
-void PlayerActions::actDecPT(QList<CardItem *> selectedCards)
+void PlayerActions::actDecPT(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, -1, -1);
 }
 
-void PlayerActions::actFlowP(QList<CardItem *> selectedCards)
+void PlayerActions::actFlowP(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, 1, -1);
 }
 
-void PlayerActions::actFlowT(QList<CardItem *> selectedCards)
+void PlayerActions::actFlowT(QList<CardState *> selectedCards)
 {
     actIncPT(selectedCards, -1, 1);
 }
 
-void PlayerActions::actReduceLifeByPower(QList<CardItem *> selectedCards)
+void PlayerActions::actIncrementCounter(int counterId, int delta)
+{
+    Command_IncCounter cmd;
+    cmd.set_counter_id(counterId);
+    cmd.set_delta(delta);
+
+    sendGameCommand(cmd);
+}
+
+void PlayerActions::actSetCounter(int counterId, int value)
+{
+    Command_SetCounter cmd;
+    cmd.set_counter_id(counterId);
+    cmd.set_value(value);
+
+    sendGameCommand(cmd);
+}
+
+void PlayerActions::actReduceLifeByPower(QList<CardState *> selectedCards)
 {
     // find life counter
     auto lifeCounter = player->getLifeCounter();
@@ -1481,7 +1506,7 @@ void PlayerActions::actReduceLifeByPower(QList<CardItem *> selectedCards)
     // calculate total power;
     int total = 0;
     for (auto card : selectedCards) {
-        QVariantList parsed = CardItem::parsePT(card->getPT());
+        QVariantList parsed = CardState::parsePT(card->getPT());
         if (!parsed.isEmpty()) {
             int power = parsed.first().toInt(); // toInt will default to 0 if it's not an int
             total += qMax(power, 0);
@@ -1495,17 +1520,7 @@ void PlayerActions::actReduceLifeByPower(QList<CardItem *> selectedCards)
     sendGameCommand(prepareGameCommand(cmd));
 }
 
-void AnnotationDialog::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_Return && event->modifiers() & Qt::ControlModifier) {
-        event->accept();
-        accept();
-        return;
-    }
-    QInputDialog::keyPressEvent(event);
-}
-
-void PlayerActions::actRequestSetAnnotationDialog(QList<CardItem *> selectedCards)
+void PlayerActions::actRequestSetAnnotationDialog(QList<CardState *> selectedCards)
 {
     QString oldAnnotation;
     for (auto card : selectedCards) {
@@ -1517,7 +1532,7 @@ void PlayerActions::actRequestSetAnnotationDialog(QList<CardItem *> selectedCard
     emit requestSetAnnotationDialog(oldAnnotation);
 }
 
-void PlayerActions::actSetAnnotation(QList<CardItem *> selectedCards, const QString &annotation)
+void PlayerActions::actSetAnnotation(QList<CardState *> selectedCards, const QString &annotation)
 {
     QList<const ::google::protobuf::Message *> commandList;
     for (auto card : selectedCards) {
@@ -1531,17 +1546,7 @@ void PlayerActions::actSetAnnotation(QList<CardItem *> selectedCards, const QStr
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-void PlayerActions::actAttach()
-{
-    auto *card = player->getGame()->getActiveCard();
-    if (!card) {
-        return;
-    }
-
-    card->drawAttachArrow();
-}
-
-void PlayerActions::actUnattach(QList<CardItem *> selectedCards)
+void PlayerActions::actUnattach(QList<CardState *> selectedCards)
 {
     QList<const ::google::protobuf::Message *> commandList;
     for (auto card : selectedCards) {
@@ -1557,17 +1562,17 @@ void PlayerActions::actUnattach(QList<CardItem *> selectedCards)
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-void PlayerActions::actAddCardCounter(QList<CardItem *> selectedCards, int counterId)
+void PlayerActions::actAddCardCounter(QList<CardState *> selectedCards, int counterId)
 {
     offsetCardCounter(selectedCards, counterId, 1);
 }
 
-void PlayerActions::actRemoveCardCounter(QList<CardItem *> selectedCards, int counterId)
+void PlayerActions::actRemoveCardCounter(QList<CardState *> selectedCards, int counterId)
 {
     offsetCardCounter(selectedCards, counterId, -1);
 }
 
-void PlayerActions::offsetCardCounter(QList<CardItem *> selectedCards, int counterId, int offset)
+void PlayerActions::offsetCardCounter(QList<CardState *> selectedCards, int counterId, int offset)
 {
     QList<const ::google::protobuf::Message *> commandList;
     for (auto card : selectedCards) {
@@ -1593,7 +1598,7 @@ void PlayerActions::offsetCardCounter(QList<CardItem *> selectedCards, int count
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-void PlayerActions::actRequestSetCardCounterDialog(QList<CardItem *> selectedCards, int counterId)
+void PlayerActions::actRequestSetCardCounterDialog(QList<CardState *> selectedCards, int counterId)
 {
     // If a single card is selected, we show the old value in the dialog. Otherwise, we show "x"
     QString oldValueForDlg = "x";
@@ -1605,7 +1610,7 @@ void PlayerActions::actRequestSetCardCounterDialog(QList<CardItem *> selectedCar
     emit requestSetCardCounterDialog(counterId, oldValueForDlg);
 }
 
-void PlayerActions::actSetCardCounter(QList<CardItem *> selectedCards, int counterId, const QString &counterValue)
+void PlayerActions::actSetCardCounter(QList<CardState *> selectedCards, int counterId, const QString &counterValue)
 {
     QList<const ::google::protobuf::Message *> commandList;
     for (auto card : selectedCards) {
@@ -1626,11 +1631,13 @@ void PlayerActions::actSetCardCounter(QList<CardItem *> selectedCards, int count
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-void PlayerActions::actIncrementAllCardCounters(QList<CardItem *> cardsToUpdate)
+void PlayerActions::actIncrementAllCardCounters(QList<CardState *> cardsToUpdate)
 {
     if (cardsToUpdate.isEmpty()) {
         // If no cards selected, update all cards on table
-        cardsToUpdate = static_cast<QList<CardItem *>>(player->getTableZone()->getCards());
+        for (auto *state : player->getTableZone()->getCards()) {
+            cardsToUpdate.append(state);
+        }
     }
 
     QList<const ::google::protobuf::Message *> commandList;
@@ -1673,7 +1680,7 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone)
     return false;
 }
 
-void PlayerActions::playSelectedCards(QList<CardItem *> selectedCards, const bool faceDown)
+void PlayerActions::playSelectedCards(QList<CardState *> selectedCards, const bool faceDown)
 {
     // CardIds will get shuffled downwards when cards leave the deck.
     // We need to iterate through the cards in reverse order so cardIds don't get changed out from under us as we play
@@ -1688,27 +1695,26 @@ void PlayerActions::playSelectedCards(QList<CardItem *> selectedCards, const boo
     }
 }
 
-void PlayerActions::actPlay(QList<CardItem *> selectedCards)
+void PlayerActions::actPlay(QList<CardState *> selectedCards)
 {
     playSelectedCards(selectedCards, false);
 }
 
-void PlayerActions::actPlayFacedown(QList<CardItem *> selectedCards)
+void PlayerActions::actPlayFacedown(QList<CardState *> selectedCards)
 {
     playSelectedCards(selectedCards, true);
 }
 
-void PlayerActions::actHide(QList<CardItem *> selectedCards)
+void PlayerActions::actHide(QList<CardState *> selectedCards)
 {
-    for (const auto &item : selectedCards) {
-        auto *card = static_cast<CardItem *>(item);
-        if (card && isUnwritableRevealZone(card->getZone())) {
+    for (const auto &card : selectedCards) {
+        if (isUnwritableRevealZone(card->getZone())) {
             card->getZone()->removeCard(card);
         }
     }
 }
 
-void PlayerActions::actReveal(QList<CardItem *> selectedCards, QAction *action)
+void PlayerActions::actReveal(QList<CardState *> selectedCards, QAction *action)
 {
     const int otherPlayerId = action->data().toInt();
 
@@ -1799,9 +1805,9 @@ void PlayerActions::actRevealRandomGraveyardCard(int revealToPlayerId)
     sendGameCommand(cmd);
 }
 
-void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActionType type)
+void PlayerActions::cardMenuAction(QList<CardState *> selectedCards, CardMenuActionType type)
 {
-    QList<CardItem *> cardList = selectedCards;
+    QList<CardState *> cardList = selectedCards;
 
     QList<const ::google::protobuf::Message *> commandList;
     if (type <= cmClone) {
@@ -1991,7 +1997,7 @@ void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActi
                         ctm->set_tapped(info.getUiAttributes().cipt);
                     }
 
-                    cmd->set_y(TableZone::tableRowToGridY(tableRow));
+                    cmd->set_y(TableZoneLogic::tableRowToGridY(tableRow));
                     commandList.append(cmd);
                 }
                 break;
@@ -2040,6 +2046,76 @@ PendingCommand *PlayerActions::prepareGameCommand(const QList<const ::google::pr
     }
 }
 
+void PlayerActions::moveCards(CardZoneLogic *startZone,
+                              CardZoneLogic *targetZone,
+                              int x,
+                              int y,
+                              const QList<CardMoveRequest> &cards)
+{
+    if (!startZone || !targetZone) {
+        return;
+    }
+
+    Command_MoveCard cmd;
+    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_start_zone(startZone->getName().toStdString());
+    cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(targetZone->getName().toStdString());
+    cmd.set_x(x);
+    cmd.set_y(y);
+
+    if (auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(targetZone)) {
+        cmd.set_is_reversed(viewLogic->getIsReversed());
+    }
+
+    for (const CardMoveRequest &card : cards) {
+        auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
+        cardToMove->set_card_id(card.cardId);
+        if (card.faceDown) {
+            cardToMove->set_face_down(true);
+        }
+        if (!card.pt.isEmpty()) {
+            cardToMove->set_pt(card.pt.toStdString());
+        }
+    }
+
+    sendGameCommand(cmd);
+}
+
+PendingCommand *PlayerActions::prepareZoneDump(CardZoneLogic *zone, int numberCards)
+{
+    if (!zone) {
+        return nullptr;
+    }
+
+    Command_DumpZone cmd;
+    cmd.set_player_id(zone->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_zone_name(zone->getName().toStdString());
+    cmd.set_number_cards(numberCards);
+    if (auto *viewLogic = qobject_cast<ZoneViewZoneLogic *>(zone)) {
+        cmd.set_is_reversed(viewLogic->getIsReversed());
+    }
+
+    return prepareGameCommand(cmd);
+}
+
+void PlayerActions::actToggleTapped(const QString &zoneName, const QList<CardState *> &cards, bool tapped)
+{
+    QList<const ::google::protobuf::Message *> cmdList;
+    for (CardState *card : cards) {
+        if (card->getTapped() != tapped) {
+            auto *cmd = new Command_SetCardAttr;
+            cmd->set_zone(zoneName.toStdString());
+            cmd->set_card_id(card->getId());
+            cmd->set_attribute(AttrTapped);
+            cmd->set_attr_value(tapped ? "1" : "0");
+            cmdList.append(cmd);
+        }
+    }
+
+    sendGameCommand(prepareGameCommand(cmdList));
+}
+
 void PlayerActions::sendGameCommand(const google::protobuf::Message &command)
 {
     if (player->getPlayerInfo()->getJudge() && !player->getPlayerInfo()->getLocal()) {
diff --git a/cockatrice/src/game/player/player_actions.h b/libcockatrice_game/libcockatrice/game/player/player_actions.h
similarity index 54%
rename from cockatrice/src/game/player/player_actions.h
rename to libcockatrice_game/libcockatrice/game/player/player_actions.h
index 8fff81635..7ed52b9a1 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/libcockatrice_game/libcockatrice/game/player/player_actions.h
@@ -8,12 +8,13 @@
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
 
-#include "../../game_graphics/board/card_item.h" // IWYU pragma: keep - moc instantiates the metatype for QList<CardItem *>, which Qt 6.4 needs complete
-#include "../../game_graphics/dialogs/dlg_create_token.h"
-#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
-#include "../../game_graphics/player/card_menu_action_type.h"
 #include "../board/card_list.h"
+#include "../board/card_state.h"
+#include "card_menu_action_type.h"
+#include "card_move_request.h"
 #include "libcockatrice/card/card_info.h"
+#include "move_top_cards_until_options.h"
+#include "token_info.h"
 
 #include <QObject>
 #include <QString>
@@ -22,7 +23,6 @@
 #include <libcockatrice/filters/filter_string.h>
 #include <qtmetamacros.h>
 
-class CardItem;
 class CardRelation;
 class QAction;
 class QTimer;
@@ -36,10 +36,16 @@ class Message;
 }
 } // namespace google
 
+class CardState;
+class CardZoneLogic;
 class Command_MoveCard;
+class GameEventContext;
+class ICardPreferenceProvider;
+class IInterfaceSettingsProvider;
 class PendingCommand;
 class PlayerLogic;
-
+class QAction;
+struct ArrowData;
 class PlayerActions : public QObject
 {
     Q_OBJECT
@@ -50,7 +56,9 @@ public:
         RANDOM_CARD_FROM_ZONE = -2
     };
 
-    explicit PlayerActions(PlayerLogic *player);
+    explicit PlayerActions(PlayerLogic *player,
+                           IInterfaceSettingsProvider *interfaceSettings = nullptr,
+                           ICardPreferenceProvider *cardPreferences = nullptr);
 
     void sendGameCommand(PendingCommand *pend);
     void sendGameCommand(const google::protobuf::Message &command);
@@ -58,7 +66,52 @@ public:
     PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd);
     PendingCommand *prepareGameCommand(const QList<const ::google::protobuf::Message *> &cmdList);
 
-    void moveOneCardUntil(CardItem *card);
+    /**
+     * @brief Moves the requested cards between zones on behalf of a view.
+     * @param startZone Zone the cards are dragged out of.
+     * @param targetZone Zone the cards are dropped onto.
+     * @param x Horizontal target index within the zone.
+     * @param y Vertical target index within the zone.
+     * @param cards The cards to move, as chosen by the view.
+     */
+    void
+    moveCards(CardZoneLogic *startZone, CardZoneLogic *targetZone, int x, int y, const QList<CardMoveRequest> &cards);
+
+    /**
+     * @brief Prepares a dump of the given zone, for the caller to connect to and send.
+     * @param zone Zone to dump.
+     * @param numberCards How many cards to dump, -1 for all.
+     */
+    PendingCommand *prepareZoneDump(CardZoneLogic *zone, int numberCards);
+
+    /**
+     * @brief Sets the tapped state of the cards that do not already have it.
+     * @param zoneName Zone the cards belong to.
+     * @param cards Cards the view wants toggled.
+     * @param tapped Desired tapped state.
+     */
+    void actToggleTapped(const QString &zoneName, const QList<CardState *> &cards, bool tapped);
+
+    /**
+     * @brief Attaches one card to another on the table on behalf of a view.
+     * @param startCard Card being attached.
+     * @param targetCard Card being attached to.
+     */
+    void attachCards(CardState *startCard, const CardState *targetCard);
+
+    /**
+     * @brief Draws an arrow from a card to another card or a player on behalf of a view.
+     *
+     * The view resolves the endpoints before playing the card out of hand, so the
+     * arrow still records the zone the card started in.
+     *
+     * @param startCard Card the arrow starts from.
+     * @param arrow Arrow endpoints and color, as resolved by the view.
+     * @param deleteInPhase Phase the arrow expires in, 0 to keep it until removed.
+     */
+    void createArrow(CardState *startCard, const ArrowData &arrow, int deleteInPhase);
+
+    void moveOneCardUntil(CardState *card);
     void stopMoveTopCardsUntil();
 
     [[nodiscard]] bool isMovingCardsUntil() const
@@ -87,7 +140,7 @@ signals:
     void requestDrawBottomCardsDialog(int defaultNumberBottomCards, int maxCards);
     void requestRollDieDialog();
     void requestCreateTokenDialog(const QStringList &predefinedTokens);
-    void requestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation);
+    void requestCreateRelatedFromRelationDialog(const CardState *sourceCard, const CardRelation *cardRelation);
     void requestMoveCardXCardsFromTopDialog(int defaultNumberTopCardsToPlaceBelow, int deckSize);
     void requestSetPTDialog(const QString &oldPT);
     void requestSetAnnotationDialog(const QString &oldAnnotation);
@@ -96,12 +149,18 @@ signals:
     void requestSortHand(const QList<CardList::SortOption> &options);
     void requestEnableAndSetCreateAnotherTokenAction(const QString &lastTokenName);
     void requestSetLastToken(CardInfoPtr lastToken);
+    /**
+     * @brief The player chose a mulligan size to remember as the starting hand size.
+     *
+     * Game logic must not write client settings itself, so persistence is left to the application.
+     */
+    void startingHandSizeChosen(int number);
 
 public slots:
     void setLastToken(CardInfoPtr cardInfo);
     void setLastTokenInfo(CardInfoPtr cardInfo);
-    void playCard(CardItem *c, bool faceDown);
-    void playCardToTable(const CardItem *c, bool faceDown);
+    void playCard(CardState *c, bool faceDown);
+    void playCardToTable(const CardState *c, bool faceDown);
 
     void actUntapAll();
     void actRequestRollDieDialog();
@@ -110,9 +169,9 @@ public slots:
     void actRequestCreateTokenDialog(const QStringList &predefinedTokens);
     void actCreateToken(TokenInfo tokenToCreate);
     void actCreateAnotherToken();
-    void actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation);
-    bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation, int variableCount);
-    void onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation);
+    void actRequestCreateRelatedFromRelationDialog(const CardState *sourceCard, const CardRelation *cardRelation);
+    bool createRelatedFromRelation(const CardState *sourceCard, const CardRelation *cardRelation, int variableCount);
+    void onRelatedCardCreated(const CardState *sourceCard, const CardRelation *cardRelation);
     void setLastRelatedCreationSucceeded(bool succeeded)
     {
         lastRelatedCreationSucceeded = succeeded;
@@ -132,9 +191,9 @@ public slots:
     void actMulliganMinusOne();
     void doMulligan(int number);
 
-    void actPlay(QList<CardItem *> selectedCards);
-    void actPlayFacedown(QList<CardItem *> selectedCards);
-    void actHide(QList<CardItem *> selectedCards);
+    void actPlay(QList<CardState *> selectedCards);
+    void actPlayFacedown(QList<CardState *> selectedCards);
+    void actHide(QList<CardState *> selectedCards);
 
     void actMoveTopCardToPlay();
     void actMoveTopCardToPlayFaceDown();
@@ -164,10 +223,6 @@ public slots:
     void actRequestMoveBottomCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
     void moveBottomCardsTo(int number, const QString &targetZone, bool faceDown);
 
-    void actSelectAll();
-    void actSelectRow();
-    void actSelectColumn();
-
     void actViewLibrary();
     void actViewHand();
     void actRequestViewTopCardsDialog();
@@ -187,47 +242,55 @@ public slots:
 
     void actOpenDeckInDeckEditor();
     void actCreatePredefinedToken();
-    void actCreateRelatedCard();
-    void actCreateAllRelatedCards();
+    void actCreateRelatedCard(const CardState *sourceCard, int index);
+    void actCreateAllRelatedCards(const CardState *sourceCard);
 
     void actRequestMoveCardXCardsFromTopDialog();
-    void actMoveCardXCardsFromTop(QList<CardItem *> selectedCards, int number);
-    void actRemoveCardCounter(QList<CardItem *> selectedCards, int counterId);
-    void actAddCardCounter(QList<CardItem *> selectedCards, int counterId);
-    void actRequestSetCardCounterDialog(QList<CardItem *> selectedCards, int counterId);
-    void actSetCardCounter(QList<CardItem *> selectedCards, int counterId, const QString &counterValue);
-    void actIncrementAllCardCounters(QList<CardItem *> cardsToUpdate);
-    void actAttach();
-    void actUnattach(QList<CardItem *> selectedCards);
-    void actDrawArrow();
-    void actIncPT(QList<CardItem *> selectedCards, int deltaP, int deltaT);
-    void actResetPT(QList<CardItem *> selectedCards);
-    void actRequestSetPTDialog(QList<CardItem *> selectedCards);
-    void actSetPT(QList<CardItem *> selectedCards, const QString &pt);
-    void actIncP(QList<CardItem *> selectedCards);
-    void actDecP(QList<CardItem *> selectedCards);
-    void actIncT(QList<CardItem *> selectedCards);
-    void actDecT(QList<CardItem *> selectedCards);
-    void actIncPT(QList<CardItem *> selectedCards);
-    void actDecPT(QList<CardItem *> selectedCards);
-    void actFlowP(QList<CardItem *> selectedCards);
-    void actFlowT(QList<CardItem *> selectedCards);
+    void actMoveCardXCardsFromTop(QList<CardState *> selectedCards, int number);
+    void actRemoveCardCounter(QList<CardState *> selectedCards, int counterId);
+    void actAddCardCounter(QList<CardState *> selectedCards, int counterId);
+    void actRequestSetCardCounterDialog(QList<CardState *> selectedCards, int counterId);
+    void actSetCardCounter(QList<CardState *> selectedCards, int counterId, const QString &counterValue);
+    void actIncrementAllCardCounters(QList<CardState *> cardsToUpdate);
+    void actUnattach(QList<CardState *> selectedCards);
+    void actIncPT(QList<CardState *> selectedCards, int deltaP, int deltaT);
+    void actResetPT(QList<CardState *> selectedCards);
+    void actRequestSetPTDialog(QList<CardState *> selectedCards);
+    void actSetPT(QList<CardState *> selectedCards, const QString &pt);
+    void actIncP(QList<CardState *> selectedCards);
+    void actDecP(QList<CardState *> selectedCards);
+    void actIncT(QList<CardState *> selectedCards);
+    void actDecT(QList<CardState *> selectedCards);
+    void actIncPT(QList<CardState *> selectedCards);
+    void actDecPT(QList<CardState *> selectedCards);
+    void actFlowP(QList<CardState *> selectedCards);
+    void actFlowT(QList<CardState *> selectedCards);
 
-    void actReduceLifeByPower(QList<CardItem *> selectedCards);
+    /** @brief Adjusts a player counter by a signed delta. */
+    void actIncrementCounter(int counterId, int delta);
 
-    void actRequestSetAnnotationDialog(QList<CardItem *> selectedCards);
-    void actSetAnnotation(QList<CardItem *> selectedCards, const QString &annotation);
-    void actReveal(QList<CardItem *> selectedCards, QAction *action);
+    /** @brief Sets a player counter to an absolute value. */
+    void actSetCounter(int counterId, int value);
+
+    void actReduceLifeByPower(QList<CardState *> selectedCards);
+
+    void actRequestSetAnnotationDialog(QList<CardState *> selectedCards);
+    void actSetAnnotation(QList<CardState *> selectedCards, const QString &annotation);
+    void actReveal(QList<CardState *> selectedCards, QAction *action);
     void actRevealHand(int revealToPlayerId);
     void actRevealRandomHandCard(int revealToPlayerId);
     void actRevealLibrary(int revealToPlayerId);
 
     void actSortHand();
 
-    void cardMenuAction(QList<CardItem *> selectedCards, CardMenuActionType type);
+    void cardMenuAction(QList<CardState *> selectedCards, CardMenuActionType type);
 
 private:
     PlayerLogic *player;
+    // Borrowed settings providers (owned by the application). Null outside the client, in which case the compiled-in
+    // defaults below apply.
+    IInterfaceSettingsProvider *interfaceSettings;
+    ICardPreferenceProvider *cardPreferences;
 
     int defaultNumberTopCards = 1;
     int defaultNumberTopCardsToPlaceBelow = 1;
@@ -245,18 +308,23 @@ private:
 
     bool lastRelatedCreationSucceeded = false;
 
-    void createCard(const CardItem *sourceCard,
+    [[nodiscard]] bool getPlayToStack() const;
+    [[nodiscard]] int getStartingHandSize() const;
+    [[nodiscard]] bool getAnnotateTokens() const;
+    [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const;
+
+    void createCard(const CardState *sourceCard,
                     const QString &dbCardName,
                     CardRelationType attach = CardRelationType::DoesNotAttach,
                     bool persistent = false,
                     bool faceDown = false);
 
-    void playSelectedCards(QList<CardItem *> selectedCards, bool faceDown = false);
+    void playSelectedCards(QList<CardState *> selectedCards, bool faceDown = false);
 
     void cmdSetTopCard(Command_MoveCard &cmd);
     void cmdSetBottomCard(Command_MoveCard &cmd);
 
-    void offsetCardCounter(QList<CardItem *> selectedCards, int counterId, int offset);
+    void offsetCardCounter(QList<CardState *> selectedCards, int counterId, int offset);
 };
 
 #endif // COCKATRICE_PLAYER_ACTIONS_H
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/libcockatrice_game/libcockatrice/game/player/player_event_handler.cpp
similarity index 88%
rename from cockatrice/src/game/player/player_event_handler.cpp
rename to libcockatrice_game/libcockatrice/game/player/player_event_handler.cpp
index 18f6573df..6588547da 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/libcockatrice_game/libcockatrice/game/player/player_event_handler.cpp
@@ -1,14 +1,14 @@
 #include "player_event_handler.h"
 
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/zones/view_zone.h"
 #include "../abstract_game.h"
 #include "../board/arrow_data.h"
 #include "../board/card_list.h"
+#include "../board/card_state.h"
 #include "../board/counter_state.h"
 #include "../zones/card_zone_logic.h"
 #include "../zones/hand_zone_logic.h"
 #include "../zones/pile_zone_logic.h"
+#include "../zones/view_zone_logic.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/printing/exact_card.h"
 #include "libcockatrice/protocol/pb/card_attributes.pb.h"
@@ -27,6 +27,9 @@
 #include <QSharedPointer>
 #include <QtGlobal>
 #include <algorithm>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/database/card_database_querier.h>
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
 #include <libcockatrice/protocol/pb/event_attach_card.pb.h>
@@ -49,6 +52,7 @@
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
+#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <qlogging.h>
 #include <string>
@@ -76,12 +80,12 @@ void PlayerEventHandler::eventShuffle(const Event_Shuffle &event)
     }
 
     // close all views that contain shuffled cards
-    for (ZoneViewZone *view : zone->getViews()) {
-        if (view != nullptr) {
-            int length = view->getLogic()->getCards().length();
+    for (auto *viewLogic : zone->getViews()) {
+        if (viewLogic != nullptr) {
+            int length = viewLogic->getCards().length();
             // we want to close empty views as well
             if (length == 0 || length > absStart) { // note this assumes views always start at the top of the library
-                view->close();
+                viewLogic->requestClose();
             }
         } else {
             qWarning() << zone->getName() << "of" << player->getPlayerInfo()->getName() << "holds empty zoneview!";
@@ -155,23 +159,29 @@ void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event)
     }
 
     CardRef cardRef = {QString::fromStdString(event.card_name()), QString::fromStdString(event.card_provider_id())};
-    CardItem *card = new CardItem(player, nullptr, cardRef, event.card_id());
     // use db PT if not provided in event and not face-down
-    if (!QString::fromStdString(event.pt()).isEmpty()) {
-        card->setPT(QString::fromStdString(event.pt()));
-    } else if (!event.face_down()) {
-        ExactCard dbCard = card->getCard();
+    QString pt = QString::fromStdString(event.pt());
+    if (pt.isEmpty() && !event.face_down()) {
+        ExactCard dbCard = CardDatabaseManager::query()->getCard(cardRef);
         if (dbCard) {
-            card->setPT(dbCard.getInfo().getPowTough());
+            pt = dbCard.getInfo().getPowTough();
         }
     }
-    card->setColor(QString::fromStdString(event.color()));
-    card->setAnnotation(QString::fromStdString(event.annotation()));
-    card->setDestroyOnZoneChange(event.destroy_on_zone_change());
-    card->setFaceDown(event.face_down());
 
-    emit logCreateToken(player, card->getName(), card->getPT(), card->getFaceDown());
-    zone->addCard(card, true, event.x(), event.y());
+    emit logCreateToken(player, cardRef.name, pt, event.face_down());
+
+    ServerInfo_Card cardInfo;
+    cardInfo.set_id(event.card_id());
+    cardInfo.set_name(event.card_name());
+    cardInfo.set_provider_id(event.card_provider_id());
+    cardInfo.set_pt(pt.toStdString());
+    cardInfo.set_color(event.color());
+    cardInfo.set_annotation(event.annotation());
+    cardInfo.set_destroy_on_zone_change(event.destroy_on_zone_change());
+    cardInfo.set_face_down(event.face_down());
+    cardInfo.set_x(event.x());
+    cardInfo.set_y(event.y());
+    emit zone->createCardRequested(cardInfo, true);
 }
 
 void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event,
@@ -193,7 +203,7 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event,
             emit logSetTapped(player, nullptr, event.attr_value() == "1");
         }
     } else {
-        CardItem *card = zone->getCard(event.card_id());
+        CardState *card = zone->getCard(event.card_id());
         if (!card) {
             qWarning() << "PlayerEventHandler::eventSetCardAttr: card id=" << event.card_id() << "not found";
             return;
@@ -203,7 +213,7 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event,
 }
 
 void PlayerEventHandler::setCardAttrHelper(const GameEventContext &context,
-                                           CardItem *card,
+                                           CardState *card,
                                            CardAttribute attribute,
                                            const QString &avalue,
                                            bool allCards,
@@ -264,7 +274,7 @@ void PlayerEventHandler::eventSetCardCounter(const Event_SetCardCounter &event)
         return;
     }
 
-    CardItem *card = zone->getCard(event.card_id());
+    CardState *card = zone->getCard(event.card_id());
     if (!card) {
         return;
     }
@@ -341,13 +351,13 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv
     if (x == -1) {
         x = 0;
     }
-    CardItem *card = startZone->takeCard(position, event.card_id(), startZone != targetZone);
+    CardState *card = startZone->takeCard(position, event.card_id(), startZone != targetZone);
     if (card == nullptr) {
         return;
     }
-    if (startZone != targetZone) {
-        card->deleteCardInfoPopup();
-    }
+    const bool zoneChanged = startZone != targetZone;
+    const bool ownerChanged = zoneChanged && startZone->getPlayer() != targetZone->getPlayer();
+    emit cardViewRefreshRequested(card, zoneChanged, ownerChanged ? targetZone->getPlayer() : nullptr);
     if (event.has_card_name()) {
         QString name = QString::fromStdString(event.card_name());
         QString providerId =
@@ -356,27 +366,19 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv
     }
 
     if (card->getAttachedTo() && (startZone != targetZone)) {
-        CardItem *parentCard = card->getAttachedTo();
+        CardState *parentCard = card->getAttachedTo();
+        // CardState::setAttachedTo removes the card from the old parent's attachedCards list and emits the zone events.
         card->setAttachedTo(nullptr);
         parentCard->getZone()->reorganizeCards();
     }
 
-    card->deleteDragItem();
-
     card->setId(event.new_card_id());
     card->setFaceDown(event.face_down());
     if (startZone != targetZone) {
-        card->setBeingPointedAt(false);
-        card->setHovered(false);
-
-        const QList<CardItem *> &attachedCards = card->getAttachedCards();
+        const QList<CardState *> &attachedCards = card->getAttachedCards();
         for (auto attachedCard : attachedCards) {
             emit targetZone->cardAdded(attachedCard);
         }
-
-        if (startZone->getPlayer() != targetZone->getPlayer()) {
-            card->setOwner(targetZone->getPlayer());
-        }
     }
 
     // The log event has to be sent before the card is added to the target zone
@@ -404,7 +406,7 @@ void PlayerEventHandler::eventFlipCard(const Event_FlipCard &event)
     if (!zone) {
         return;
     }
-    CardItem *card = zone->getCard(event.card_id());
+    CardState *card = zone->getCard(event.card_id());
     if (!card) {
         return;
     }
@@ -427,20 +429,28 @@ void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event)
         return;
     }
 
-    CardItem *card = zone->getCard(event.card_id());
+    CardState *card = zone->getCard(event.card_id());
     if (!card) {
         return;
     }
 
-    QList<CardItem *> attachedCards = card->getAttachedCards();
+    QList<CardState *> attachedCards = card->getAttachedCards();
     // This list is always empty except for buggy server implementations.
     for (auto &attachedCard : attachedCards) {
+        card->removeAttachedCard(attachedCard);
+        attachedCard->setGridPoint(QPoint(-1, attachedCard->getGridPoint().y()));
         attachedCard->setAttachedTo(nullptr);
+        if (attachedCard->getZone() == nullptr) {
+            attachedCard->deleteView();
+        } else {
+            emit attachedCard->getZone()->cardAdded(attachedCard);
+            attachedCard->getZone()->reorganizeCards();
+        }
     }
 
     emit logDestroyCard(player, card->getName());
     zone->takeCard(-1, event.card_id(), true);
-    card->deleteLater();
+    card->deleteView();
 }
 
 void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
@@ -448,7 +458,7 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
     const QMap<int, PlayerLogic *> &playerList = player->getGame()->getPlayerManager()->getPlayers();
     PlayerLogic *targetPlayer = nullptr;
     CardZoneLogic *targetZone = nullptr;
-    CardItem *targetCard = nullptr;
+    CardState *targetCard = nullptr;
     if (event.has_target_player_id()) {
         targetPlayer = playerList.value(event.target_player_id(), 0);
         if (targetPlayer) {
@@ -464,12 +474,12 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
         return;
     }
 
-    CardItem *startCard = startZone->getCard(event.card_id());
+    CardState *startCard = startZone->getCard(event.card_id());
     if (!startCard) {
         return;
     }
 
-    CardItem *oldParent = startCard->getAttachedTo();
+    CardState *oldParent = startCard->getAttachedTo();
 
     startCard->setAttachedTo(targetCard);
 
@@ -498,7 +508,7 @@ void PlayerEventHandler::eventDrawCards(const Event_DrawCards &event)
     if (listSize) {
         for (int i = 0; i < listSize; ++i) {
             const ServerInfo_Card &cardInfo = event.cards(i);
-            CardItem *card = _deck->takeCard(0, cardInfo.id());
+            CardState *card = _deck->takeCard(0, cardInfo.id());
             QString cardName = QString::fromStdString(cardInfo.name());
             QString providerId = QString::fromStdString(cardInfo.provider_id());
             card->setCardRef({cardName, providerId});
@@ -546,7 +556,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP
         for (const auto &card : cardList) {
             QString cardName = QString::fromStdString(card->name());
             QString providerId = QString::fromStdString(card->provider_id());
-            CardItem *cardItem = zone->getCard(card->id());
+            CardState *cardItem = zone->getCard(card->id());
             if (!cardItem) {
                 continue;
             }
diff --git a/cockatrice/src/game/player/player_event_handler.h b/libcockatrice_game/libcockatrice/game/player/player_event_handler.h
similarity index 89%
rename from cockatrice/src/game/player/player_event_handler.h
rename to libcockatrice_game/libcockatrice/game/player/player_event_handler.h
index 88254119b..d253deef0 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/libcockatrice_game/libcockatrice/game/player/player_event_handler.h
@@ -27,7 +27,7 @@
 #include <qtmetamacros.h>
 #include <sys/types.h>
 
-class CardItem;
+class CardState;
 class CardZoneLogic;
 class PlayerLogic;
 class Event_AttachCard;
@@ -61,7 +61,7 @@ template <typename T> class QList;
  * Design notes:
  * - All event handlers assume events are authoritative and already validated
  *   by the server.
- * - Most handlers mutate both logical state (CardItem, CardZoneLogic, counters)
+ * - Most handlers mutate both logical state (CardState, CardZoneLogic, counters)
  *   and visual/UI state (views, arrows, menus).
  * - Logging signals are emitted *after* or *during* state mutation, depending
  *   on whether later mutations would invalidate log data.
@@ -238,7 +238,7 @@ signals:
     void logUndoDraw(PlayerLogic *player, QString cardName);
     void logUndoDrawFailed(PlayerLogic *player);
     void logMoveCard(PlayerLogic *player,
-                     CardItem *card,
+                     CardState *card,
                      CardZoneLogic *startZone,
                      int oldX,
                      CardZoneLogic *targetZone,
@@ -248,11 +248,11 @@ signals:
     void logAttachCard(PlayerLogic *player, QString cardName, PlayerLogic *targetPlayer, QString targetCardName);
     void logUnattachCard(PlayerLogic *player, QString cardName);
     void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue);
-    void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped);
+    void logSetTapped(PlayerLogic *player, CardState *card, bool tapped);
     void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue);
-    void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap);
-    void logSetPT(PlayerLogic *player, CardItem *card, QString newPT);
-    void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation);
+    void logSetDoesntUntap(PlayerLogic *player, CardState *card, bool doesntUntap);
+    void logSetPT(PlayerLogic *player, CardState *card, QString newPT);
+    void logSetAnnotation(PlayerLogic *player, CardState *card, QString newAnnotation);
     void logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed = false);
     void logRevealCards(PlayerLogic *player,
                         CardZoneLogic *zone,
@@ -266,15 +266,23 @@ signals:
     void logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal);
     /** @} */
 
-    void cardZoneChanged(CardItem *card, bool sameZone);
-    void requestCardMenuUpdate(const CardItem *card);
+    void cardZoneChanged(CardState *card, bool sameZone);
+    void requestCardMenuUpdate(CardState *card);
+    /**
+     * @brief A card was just moved by the server and its view needs refreshing.
+     *
+     * @param card The card that moved.
+     * @param zoneChanged Whether the card crossed a zone boundary.
+     * @param newOwner The player the card now belongs to, or nullptr to leave the owner alone.
+     */
+    void cardViewRefreshRequested(CardState *card, bool zoneChanged, PlayerLogic *newOwner);
 
 private:
     /** Owning player instance. */
     PlayerLogic *player;
 
     void setCardAttrHelper(const GameEventContext &context,
-                           CardItem *card,
+                           CardState *card,
                            CardAttribute attribute,
                            const QString &avalue,
                            bool allCards,
diff --git a/cockatrice/src/game/player/player_info.cpp b/libcockatrice_game/libcockatrice/game/player/player_info.cpp
similarity index 100%
rename from cockatrice/src/game/player/player_info.cpp
rename to libcockatrice_game/libcockatrice/game/player/player_info.cpp
diff --git a/cockatrice/src/game/player/player_info.h b/libcockatrice_game/libcockatrice/game/player/player_info.h
similarity index 100%
rename from cockatrice/src/game/player/player_info.h
rename to libcockatrice_game/libcockatrice/game/player/player_info.h
diff --git a/cockatrice/src/game/player/player_logic.cpp b/libcockatrice_game/libcockatrice/game/player/player_logic.cpp
similarity index 89%
rename from cockatrice/src/game/player/player_logic.cpp
rename to libcockatrice_game/libcockatrice/game/player/player_logic.cpp
index b545b7088..96bd07164 100644
--- a/cockatrice/src/game/player/player_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/player/player_logic.cpp
@@ -1,8 +1,9 @@
 #include "player_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
 #include "../abstract_game.h"
 #include "../board/arrow_data.h"
+#include "../board/card_list.h"
+#include "../board/card_state.h"
 #include "../board/counter_state.h"
 #include "../game_meta_info.h"
 #include "../zones/hand_zone_logic.h"
@@ -33,10 +34,17 @@
 #include <qalgorithms.h>
 #include <string>
 
-PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
+PlayerLogic::PlayerLogic(const ServerInfo_User &info,
+                         int _id,
+                         bool _local,
+                         bool _judge,
+                         AbstractGame *_parent,
+                         IInterfaceSettingsProvider *interfaceSettings,
+                         ICardPreferenceProvider *cardPreferences)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
-      playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false),
-      conceded(false), zoneId(0), dialogSemaphore(false)
+      playerEventHandler(new PlayerEventHandler(this)),
+      playerActions(new PlayerActions(this, interfaceSettings, cardPreferences)), active(false), conceded(false),
+      zoneId(0), dialogSemaphore(false)
 {
     initializeZones();
 }
@@ -172,22 +180,20 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
         const int cardListSize = zoneInfo.card_list_size();
         if (!cardListSize) {
             for (int j = 0; j < zoneInfo.card_count(); ++j) {
-                zone->addCard(new CardItem(this), false, -1);
+                emit zone->createCardRequested(ServerInfo_Card(), false);
             }
         } else {
             for (int j = 0; j < cardListSize; ++j) {
-                const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
-                auto *card = new CardItem(this);
-                card->processCardInfo(cardInfo);
+                ServerInfo_Card cardInfo = zoneInfo.card_list(j);
                 // Zones without coordinates (hand, piles, stack) preserve the order
                 // they arrive in on the server in the positions of their cards list.
                 // The x coordinate of such cards is always 0, so inserting at it
                 // would reverse the list on reconnect. Append instead.
-                if (zoneInfo.with_coords()) {
-                    zone->addCard(card, false, cardInfo.x(), cardInfo.y());
-                } else {
-                    zone->addCard(card, false, -1);
+                if (!zoneInfo.with_coords()) {
+                    cardInfo.set_x(-1);
+                    cardInfo.set_y(-1);
                 }
+                emit zone->createCardRequested(cardInfo, false);
             }
         }
         if (zoneInfo.has_always_reveal_top_card()) {
@@ -219,8 +225,8 @@ void PlayerLogic::processCardAttachment(const ServerInfo_Player &info)
         for (int j = 0; j < cardListSize; ++j) {
             const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
             if (cardInfo.has_attach_player_id()) {
-                CardItem *startCard = zone->getCard(cardInfo.id());
-                CardItem *targetCard =
+                CardState *startCard = zone->getCard(cardInfo.id());
+                CardState *targetCard =
                     game->getCard(cardInfo.attach_player_id(), QString::fromStdString(cardInfo.attach_zone()),
                                   cardInfo.attach_card_id());
                 if (!targetCard) {
@@ -239,19 +245,19 @@ void PlayerLogic::processCardAttachment(const ServerInfo_Player &info)
     }
 }
 
-void PlayerLogic::addCard(CardItem *card)
+void PlayerLogic::addCard(AbstractCardItem *card)
 {
     emit newCardAdded(card);
 }
 
-void PlayerLogic::deleteCard(CardItem *card)
+void PlayerLogic::deleteCard(CardState *card)
 {
     if (card == nullptr) {
         return;
     } else if (dialogSemaphore) {
         cardsToDelete.append(card);
     } else {
-        card->deleteLater();
+        card->deleteView();
     }
 }
 
@@ -332,7 +338,7 @@ bool PlayerLogic::clearCardsToDelete()
 
     for (auto &i : cardsToDelete) {
         if (i != nullptr) {
-            i->deleteLater();
+            i->deleteView();
         }
     }
     cardsToDelete.clear();
diff --git a/cockatrice/src/game/player/player_logic.h b/libcockatrice_game/libcockatrice/game/player/player_logic.h
similarity index 88%
rename from cockatrice/src/game/player/player_logic.h
rename to libcockatrice_game/libcockatrice/game/player/player_logic.h
index 59da7cc32..d6c4f5187 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/libcockatrice_game/libcockatrice/game/player/player_logic.h
@@ -7,6 +7,8 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "../board/arrow_data.h"
+#include "../board/counter_state.h"
 #include "../zones/card_zone_logic.h"
 #include "../zones/hand_zone_logic.h"
 #include "../zones/pile_zone_logic.h"
@@ -17,12 +19,16 @@
 #include "libcockatrice/utility/playmat_params.h"
 
 #include <QColor>
-#include <QInputDialog>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QObject>
 #include <QString>
+#include <QTimer>
+#include <libcockatrice/deck_list/loaded_deck.h>
+#include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <libcockatrice/protocol/pb/game_event.pb.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <qtmetamacros.h>
 
@@ -31,7 +37,6 @@
 // signatures, which the moc-generated code needs to be complete.
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 
-class CardItem;
 class CounterState;
 class QWidget;
 class ServerInfo_PlayerProperties;
@@ -42,6 +47,8 @@ template <class T> class QSharedPointer;
 inline Q_LOGGING_CATEGORY(PlayerLog, "player");
 class AbstractCardItem;
 class AbstractGame;
+class ICardPreferenceProvider;
+class IInterfaceSettingsProvider;
 class PlayerInfo;
 class PlayerEventHandler;
 class PlayerActions;
@@ -67,7 +74,7 @@ signals:
     /** @brief Emitted when the remote playmat (card/params) is updated from player properties. */
     void playmatChanged();
     void newCardAdded(AbstractCardItem *card);
-    void requestCardMenuUpdate(const CardItem *card);
+    void requestCardMenuUpdate(CardState *card);
     void counterAdded(CounterState *state);
     void counterRemoved(int counterId);
     void rearrangeCounters();
@@ -87,7 +94,13 @@ public slots:
     void onRequestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed);
 
 public:
-    PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent);
+    PlayerLogic(const ServerInfo_User &info,
+                int _id,
+                bool _local,
+                bool _judge,
+                AbstractGame *_parent,
+                IInterfaceSettingsProvider *interfaceSettings = nullptr,
+                ICardPreferenceProvider *cardPreferences = nullptr);
     ~PlayerLogic() override;
 
     void initializeZones();
@@ -97,8 +110,8 @@ public:
     void processPlayerInfo(const ServerInfo_Player &info);
     void processCardAttachment(const ServerInfo_Player &info);
 
-    void addCard(CardItem *c);
-    void deleteCard(CardItem *c);
+    void addCard(AbstractCardItem *c);
+    void deleteCard(CardState *c);
 
     bool clearCardsToDelete();
 
@@ -250,7 +263,7 @@ private:
     QMap<int, CounterState *> counters;
 
     bool dialogSemaphore;
-    QList<CardItem *> cardsToDelete;
+    QList<CardState *> cardsToDelete;
 
     // Playmat from player properties (for opponent display)
     CardRef remotePlaymatCard;
@@ -258,15 +271,4 @@ private:
     bool hasRemotePlaymat = false;
 };
 
-class AnnotationDialog : public QInputDialog
-{
-    Q_OBJECT
-    void keyPressEvent(QKeyEvent *e) override;
-
-public:
-    explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent)
-    {
-    }
-};
-
 #endif
diff --git a/cockatrice/src/game/player/player_manager.cpp b/libcockatrice_game/libcockatrice/game/player/player_manager.cpp
similarity index 86%
rename from cockatrice/src/game/player/player_manager.cpp
rename to libcockatrice_game/libcockatrice/game/player/player_manager.cpp
index 4730805ad..284d21f68 100644
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/libcockatrice_game/libcockatrice/game/player/player_manager.cpp
@@ -12,9 +12,12 @@
 PlayerManager::PlayerManager(AbstractGame *_game,
                              int _localPlayerId,
                              bool _localPlayerIsJudge,
-                             bool localPlayerIsSpectator)
+                             bool localPlayerIsSpectator,
+                             IInterfaceSettingsProvider *_interfaceSettings,
+                             ICardPreferenceProvider *_cardPreferences)
     : QObject(_game), game(_game), players(QMap<int, PlayerLogic *>()), localPlayerId(_localPlayerId),
-      localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator)
+      localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator),
+      interfaceSettings(_interfaceSettings), cardPreferences(_cardPreferences)
 {
 }
 
@@ -52,7 +55,7 @@ bool PlayerManager::isLocalPlayer(int playerId)
 PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
 {
     auto *newPlayer = new PlayerLogic(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(),
-                                      isJudge(), getGame());
+                                      isJudge(), getGame(), interfaceSettings, cardPreferences);
     connect(newPlayer, &PlayerLogic::concededChanged, this, &PlayerManager::onPlayerConceded);
     players.insert(playerId, newPlayer);
     emit playerAdded(newPlayer);
diff --git a/cockatrice/src/game/player/player_manager.h b/libcockatrice_game/libcockatrice/game/player/player_manager.h
similarity index 82%
rename from cockatrice/src/game/player/player_manager.h
rename to libcockatrice_game/libcockatrice/game/player/player_manager.h
index 7a9f7645b..950574112 100644
--- a/cockatrice/src/game/player/player_manager.h
+++ b/libcockatrice_game/libcockatrice/game/player/player_manager.h
@@ -16,6 +16,8 @@
 #include <qtmetamacros.h>
 
 class AbstractGame;
+class ICardPreferenceProvider;
+class IInterfaceSettingsProvider;
 class PlayerLogic;
 
 class PlayerManager : public QObject
@@ -23,7 +25,12 @@ class PlayerManager : public QObject
     Q_OBJECT
 
 public:
-    PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator);
+    PlayerManager(AbstractGame *_game,
+                  int _localPlayerId,
+                  bool _localPlayerIsJudge,
+                  bool localPlayerIsSpectator,
+                  IInterfaceSettingsProvider *interfaceSettings = nullptr,
+                  ICardPreferenceProvider *cardPreferences = nullptr);
 
     AbstractGame *game;
     QMap<int, PlayerLogic *> players;
@@ -31,6 +38,9 @@ public:
     bool localPlayerIsJudge;
     bool localPlayerIsSpectator;
     QMap<int, ServerInfo_User> spectators;
+    // Borrowed settings providers forwarded to each PlayerLogic (owned by the application).
+    IInterfaceSettingsProvider *interfaceSettings;
+    ICardPreferenceProvider *cardPreferences;
 
     [[nodiscard]] bool isSpectator() const
     {
@@ -47,6 +57,11 @@ public:
         return localPlayerId;
     }
 
+    void setLocalPlayerId(int _localPlayerId)
+    {
+        localPlayerId = _localPlayerId;
+    }
+
     [[nodiscard]] const QMap<int, PlayerLogic *> &getPlayers() const
     {
         return players;
diff --git a/libcockatrice_game/libcockatrice/game/player/token_info.h b/libcockatrice_game/libcockatrice/game/player/token_info.h
new file mode 100644
index 000000000..99869f33e
--- /dev/null
+++ b/libcockatrice_game/libcockatrice/game/player/token_info.h
@@ -0,0 +1,23 @@
+/**
+ * @file token_info.h
+ * @ingroup GameLogicPlayers
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_TOKEN_INFO_H
+#define COCKATRICE_TOKEN_INFO_H
+
+#include <QString>
+
+struct TokenInfo
+{
+    QString name;
+    QString color;
+    QString pt;
+    QString annotation;
+    bool destroy = true;
+    bool faceDown = false;
+    QString providerId;
+};
+
+#endif // COCKATRICE_TOKEN_INFO_H
diff --git a/cockatrice/src/game/replay.cpp b/libcockatrice_game/libcockatrice/game/replay.cpp
similarity index 51%
rename from cockatrice/src/game/replay.cpp
rename to libcockatrice_game/libcockatrice/game/replay.cpp
index 4ab4a6321..4d41a12ea 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/libcockatrice_game/libcockatrice/game/replay.cpp
@@ -9,10 +9,15 @@
 class GameReplay;
 class QObject;
 
-Replay::Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
+Replay::Replay(QObject *_parent,
+               const GameReplay *_replay,
+               bool isLocalGame,
+               IInterfaceSettingsProvider *interfaceSettings,
+               ICardPreferenceProvider *cardPreferences)
+    : AbstractGame(_parent)
 {
     gameState = new GameState(this, 0, -1, isLocalGame, {}, false, false, -1, false);
     connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged);
-    playerManager = new PlayerManager(this, -1, false, true);
+    playerManager = new PlayerManager(this, -1, false, true, interfaceSettings, cardPreferences);
     loadReplay(_replay);
 }
diff --git a/libcockatrice_game/libcockatrice/game/replay.h b/libcockatrice_game/libcockatrice/game/replay.h
new file mode 100644
index 000000000..f8f82a70d
--- /dev/null
+++ b/libcockatrice_game/libcockatrice/game/replay.h
@@ -0,0 +1,32 @@
+/**
+ * @file replay.h
+ * @ingroup GameLogic
+ * @ingroup Replay
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_REPLAY_H
+#define COCKATRICE_REPLAY_H
+
+#include "abstract_game.h"
+
+#include <qtmetamacros.h>
+
+class GameReplay;
+class QObject;
+class ICardPreferenceProvider;
+class IInterfaceSettingsProvider;
+
+class Replay : public AbstractGame
+{
+    Q_OBJECT
+
+public:
+    explicit Replay(QObject *_parent,
+                    const GameReplay *_replay,
+                    bool isLocalGame,
+                    IInterfaceSettingsProvider *interfaceSettings = nullptr,
+                    ICardPreferenceProvider *cardPreferences = nullptr);
+};
+
+#endif // COCKATRICE_REPLAY_H
diff --git a/cockatrice/src/client/translation.h b/libcockatrice_game/libcockatrice/game/translation.h
similarity index 100%
rename from cockatrice/src/client/translation.h
rename to libcockatrice_game/libcockatrice/game/translation.h
diff --git a/cockatrice/src/game/zones/card_zone_algorithms.h b/libcockatrice_game/libcockatrice/game/zones/card_zone_algorithms.h
similarity index 81%
rename from cockatrice/src/game/zones/card_zone_algorithms.h
rename to libcockatrice_game/libcockatrice/game/zones/card_zone_algorithms.h
index 118a7d29d..35e96b86c 100644
--- a/cockatrice/src/game/zones/card_zone_algorithms.h
+++ b/libcockatrice_game/libcockatrice/game/zones/card_zone_algorithms.h
@@ -5,9 +5,9 @@ namespace CardZoneAlgorithms
 {
 
 /**
- * Shared insertion logic for zones where cards become visible on add and follow
- * the standard pattern: clamp index, insert, clear identity if contents unknown,
- * reset state, show card.
+ * Shared insertion logic for zones where cards follow the standard pattern:
+ * clamp index, insert, clear identity if contents unknown, reset state.
+ * Visibility and parenting are handled by the graphics zone's onCardAdded().
  *
  * Zones with different post-add behavior (signal connections, positional resets,
  * hidden cards, or coordinate-based placement) should NOT use this — implement
@@ -18,8 +18,7 @@ namespace CardZoneAlgorithms
  *
  * @tparam CardList Must provide: size() -> int, insert(int, CardType*),
  *                  getContentsKnown() -> bool
- * @tparam CardType Must provide: setId(int), setCardRef(CardRefType),
- *                  resetState(bool), setVisible(bool)
+ * @tparam CardType Must provide: setId(int), setCardRef(CardRefType), resetState(bool)
  * @param keepAnnotations Forwarded to card->resetState(). Stack-like zones preserve
  *                        annotations across zone transitions; hand-like zones clear them.
  */
@@ -37,7 +36,6 @@ void addCardToList(CardList &cards, CardType *card, int x, bool keepAnnotations)
     }
 
     card->resetState(keepAnnotations);
-    card->setVisible(true);
 }
 
 } // namespace CardZoneAlgorithms
diff --git a/cockatrice/src/game/zones/card_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp
similarity index 79%
rename from cockatrice/src/game/zones/card_zone_logic.cpp
rename to libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp
index d997ab9ad..a160dcc1d 100644
--- a/cockatrice/src/game/zones/card_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp
@@ -1,13 +1,11 @@
 #include "card_zone_logic.h"
 
-#include "../../client/translation.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/zones/card_zone.h"
-#include "../../game_graphics/zones/view_zone.h"
 #include "../board/card_list.h"
+#include "../board/card_state.h"
 #include "../player/player_actions.h"
 #include "../player/player_info.h"
 #include "../player/player_logic.h"
+#include "../translation.h"
 #include "libcockatrice/card/database/card_database.h"
 #include "view_zone_logic.h"
 
@@ -44,19 +42,24 @@ CardZoneLogic::CardZoneLogic(PlayerLogic *_player,
             &CardZoneLogic::refreshCardInfos);
 }
 
-void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x, const int y)
+void CardZoneLogic::addCard(CardState *card, const bool reorganize, const int x, const int y)
 {
     if (!card) {
-        qCWarning(CardZoneLog) << "CardZoneLogic::addCard() card is null; this shouldn't normally happen";
+        qCWarning(CardZoneLogicLog) << "CardZoneLogic::addCard() card is null; this shouldn't normally happen";
         return;
     }
 
-    for (auto *view : views) {
-        if (qobject_cast<ZoneViewZoneLogic *>(view->getLogic())->prepareAddCard(x)) {
-            auto copy = new CardItem(player, nullptr, card->getCardRef(), card->getId());
-            copy->setFaceDown(card->getFaceDown());
-
-            view->getLogic()->addCard(copy, reorganize, x, y);
+    for (auto *viewLogic : views) {
+        if (viewLogic->prepareAddCard(x)) {
+            ServerInfo_Card cardInfo;
+            const CardRef &cardRef = card->getCardRef();
+            cardInfo.set_name(cardRef.name.toStdString());
+            cardInfo.set_provider_id(cardRef.providerId.toStdString());
+            cardInfo.set_id(card->getId());
+            cardInfo.set_face_down(card->getFaceDown());
+            cardInfo.set_x(x);
+            cardInfo.set_y(y);
+            emit viewLogic->createCardRequested(cardInfo, reorganize);
         }
     }
 
@@ -71,7 +74,7 @@ void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x,
     emit cardCountChanged();
 }
 
-CardItem *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone)
+CardState *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone)
 {
     if (position == -1) {
         // position == -1 means either that the zone is indexed by card id
@@ -90,11 +93,11 @@ CardItem *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone)
         return nullptr;
     }
 
-    for (auto *view : views) {
-        qobject_cast<ZoneViewZoneLogic *>(view->getLogic())->removeCard(position, toNewZone);
+    for (auto *viewLogic : views) {
+        viewLogic->removeCard(position, toNewZone);
     }
 
-    CardItem *c = cards.takeAt(position);
+    CardState *c = cards.takeAt(position);
 
     c->setId(cardId);
 
@@ -103,11 +106,11 @@ CardItem *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone)
     return c;
 }
 
-CardItem *CardZoneLogic::getCard(int cardId)
+CardState *CardZoneLogic::getCard(int cardId)
 {
-    CardItem *c = cards.findCard(cardId);
+    CardState *c = cards.findCard(cardId);
     if (!c) {
-        qCWarning(CardZoneLog) << "CardZoneLogic::getCard: card id=" << cardId << "not found";
+        qCWarning(CardZoneLogicLog) << "CardZoneLogic::getCard: card id=" << cardId << "not found";
         return nullptr;
     }
     // If the card's id is -1, this zone is invisible,
@@ -119,10 +122,10 @@ CardItem *CardZoneLogic::getCard(int cardId)
     return c;
 }
 
-void CardZoneLogic::removeCard(CardItem *card)
+void CardZoneLogic::removeCard(CardState *card)
 {
     if (!card) {
-        qCWarning(CardZoneLog) << "CardZoneLogic::removeCard: card is null, this shouldn't normally happen";
+        qCWarning(CardZoneLogicLog) << "CardZoneLogic::removeCard: card is null, this shouldn't normally happen";
         return;
     }
 
@@ -135,8 +138,8 @@ void CardZoneLogic::removeCard(CardItem *card)
 
 void CardZoneLogic::refreshCardInfos()
 {
-    for (const auto &cardItem : cards) {
-        cardItem->refreshCardInfo();
+    for (const auto &cardState : cards) {
+        cardState->refreshCardInfo();
     }
 }
 
@@ -168,17 +171,17 @@ void CardZoneLogic::clearContents()
     const CardList toClear = cards;
 
     // Detach and notify attached cards and zones *before* deleting anything.
-    for (CardItem *card : toClear) {
+    for (CardState *card : toClear) {
         // If an incorrectly implemented server doesn't return attached cards to whom they belong before dropping a
         // player, we have to return them to avoid a crash.
-        const QList<CardItem *> &attachedCards = card->getAttachedCards();
-        for (CardItem *attachedCard : attachedCards) {
+        const QList<CardState *> &attachedCards = card->getAttachedCards();
+        for (CardState *attachedCard : attachedCards) {
             emit attachedCard->getZone()->cardAdded(attachedCard);
         }
     }
 
     // Now request deletions after all manipulations are done.
-    for (CardItem *card : toClear) {
+    for (CardState *card : toClear) {
         player->deleteCard(card);
     }
 
diff --git a/cockatrice/src/game/zones/card_zone_logic.h b/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h
similarity index 73%
rename from cockatrice/src/game/zones/card_zone_logic.h
rename to libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h
index 2e232b258..d3cd9121f 100644
--- a/cockatrice/src/game/zones/card_zone_logic.h
+++ b/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h
@@ -7,28 +7,30 @@
 #ifndef COCKATRICE_CARD_ZONE_LOGIC_H
 #define COCKATRICE_CARD_ZONE_LOGIC_H
 
-#include "../../client/translation.h"
 #include "../board/card_list.h"
+#include "../translation.h"
 
 #include <QList>
 #include <QLoggingCategory>
 #include <QObject>
 #include <QString>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <qtmetamacros.h>
 
-class CardItem;
-
 inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic");
 
 class PlayerLogic;
-class ZoneViewZone;
+class ZoneViewZoneLogic;
+class CardDragItem;
 
 class CardZoneLogic : public QObject
 {
     Q_OBJECT
 
 signals:
-    void cardAdded(CardItem *addedCard);
+    void cardAdded(CardState *addedCard);
+    /** @brief Asks the graphics side to build the card item for @p cardInfo and add it to this zone. */
+    void createCardRequested(const ServerInfo_Card &cardInfo, bool reorganize);
     void cardCountChanged();
     void reorganizeCards();
     void updateGraphics();
@@ -43,16 +45,17 @@ public:
                            bool _contentsKnown,
                            QObject *parent = nullptr);
 
-    void addCard(CardItem *card, bool reorganize, int x, int y = -1);
+    void addCard(CardState *card, bool reorganize, int x, int y = -1);
     // getCard() finds a card by id.
-    CardItem *getCard(int cardId);
-    void removeCard(CardItem *card);
+    CardState *getCard(int cardId);
+    void removeCard(CardState *card);
     // takeCard() finds a card by position and removes it from the zone and from all of its views.
-    virtual CardItem *takeCard(int position, int cardId, bool canResize = true);
+    virtual CardState *takeCard(int position, int cardId, bool canResize = true);
 
-    void rawInsertCard(CardItem *card, int index)
+    void rawInsertCard(CardState *card, int index)
     {
         cards.insert(index, card);
+        emit cardCountChanged();
     }
 
     [[nodiscard]] const CardList &getCards() const
@@ -63,6 +66,7 @@ public:
     void sortCards(const QList<CardList::SortOption> &options)
     {
         cards.sortBy(options);
+        emit cardCountChanged();
     }
     [[nodiscard]] QString getName() const
     {
@@ -77,7 +81,7 @@ public:
     {
         return cards.getContentsKnown();
     }
-    QList<ZoneViewZone *> &getViews()
+    QList<ZoneViewZoneLogic *> &getViews()
     {
         return views;
     }
@@ -109,12 +113,12 @@ protected:
     PlayerLogic *player;
     QString name;
     CardList cards;
-    QList<ZoneViewZone *> views;
+    QList<ZoneViewZoneLogic *> views;
     bool hasCardAttr;
     bool isShufflable;
     bool alwaysRevealTopCard;
 
-    virtual void addCardImpl(CardItem *card, int x, int y) = 0;
+    virtual void addCardImpl(CardState *card, int x, int y) = 0;
 };
 
 #endif // COCKATRICE_CARD_ZONE_LOGIC_H
diff --git a/cockatrice/src/game/zones/hand_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.cpp
similarity index 82%
rename from cockatrice/src/game/zones/hand_zone_logic.cpp
rename to libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.cpp
index cea17d031..1d3f54929 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "hand_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "../board/card_state.h"
 #include "card_zone_algorithms.h"
 
 class PlayerLogic;
@@ -16,7 +16,7 @@ HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
 {
 }
 
-void HandZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
+void HandZoneLogic::addCardImpl(CardState *card, int x, int /*y*/)
 {
     CardZoneAlgorithms::addCardToList(cards, card, x, false);
 }
diff --git a/cockatrice/src/game/zones/hand_zone_logic.h b/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.h
similarity index 91%
rename from cockatrice/src/game/zones/hand_zone_logic.h
rename to libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.h
index c7d63bc0d..f8756eafd 100644
--- a/cockatrice/src/game/zones/hand_zone_logic.h
+++ b/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.h
@@ -26,7 +26,7 @@ public:
                   QObject *parent = nullptr);
 
 protected:
-    void addCardImpl(CardItem *card, int x, int y) override;
+    void addCardImpl(CardState *card, int x, int y) override;
 };
 
 #endif // COCKATRICE_HAND_ZONE_LOGIC_H
diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.cpp
similarity index 70%
rename from cockatrice/src/game/zones/pile_zone_logic.cpp
rename to libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.cpp
index 40af25cc5..e33d8fe79 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.cpp
@@ -1,10 +1,6 @@
 #include "pile_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
-
-class PlayerLogic;
-class QObject;
+#include "../board/card_state.h"
 
 PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
                              const QString &_name,
@@ -16,15 +12,14 @@ PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
 {
 }
 
-void PileZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
+void PileZoneLogic::addCardImpl(CardState *card, int x, int /*y*/)
 {
-    connect(card, &CardItem::sigPixmapUpdated, this, &PileZoneLogic::callUpdate);
+    connect(card, &CardState::cardPixmapUpdated, this, &PileZoneLogic::callUpdate);
     // if x is negative set it to add at end
     if (x < 0 || x >= cards.size()) {
         x = cards.size();
     }
     cards.insert(x, card);
-    card->setPos(0, 0);
     if (!contentsKnown()) {
         card->setCardRef({});
         card->setId(-1);
@@ -33,6 +28,5 @@ void PileZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
             cards.at(x + 1)->setCardRef({});
         }
     }
-    card->setVisible(false);
-    card->resetState();
+    card->resetState(false);
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/zones/pile_zone_logic.h b/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.h
similarity index 91%
rename from cockatrice/src/game/zones/pile_zone_logic.h
rename to libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.h
index ed6841b75..662b0377f 100644
--- a/cockatrice/src/game/zones/pile_zone_logic.h
+++ b/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.h
@@ -31,7 +31,7 @@ public:
                   QObject *parent = nullptr);
 
 protected:
-    void addCardImpl(CardItem *card, int x, int y) override;
+    void addCardImpl(CardState *card, int x, int y) override;
 };
 
 #endif // COCKATRICE_PILE_ZONE_LOGIC_H
diff --git a/cockatrice/src/game/zones/stack_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.cpp
similarity index 83%
rename from cockatrice/src/game/zones/stack_zone_logic.cpp
rename to libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.cpp
index 454274971..ccf0d32f3 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.cpp
@@ -1,6 +1,6 @@
 #include "stack_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
+#include "../board/card_state.h"
 #include "card_zone_algorithms.h"
 
 class PlayerLogic;
@@ -16,7 +16,7 @@ StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
 {
 }
 
-void StackZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
+void StackZoneLogic::addCardImpl(CardState *card, int x, int /*y*/)
 {
     CardZoneAlgorithms::addCardToList(cards, card, x, true);
 }
diff --git a/cockatrice/src/game/zones/stack_zone_logic.h b/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.h
similarity index 91%
rename from cockatrice/src/game/zones/stack_zone_logic.h
rename to libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.h
index 657d44ecf..ac6c4617c 100644
--- a/cockatrice/src/game/zones/stack_zone_logic.h
+++ b/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.h
@@ -26,7 +26,7 @@ public:
                    QObject *parent = nullptr);
 
 protected:
-    void addCardImpl(CardItem *card, int x, int y) override;
+    void addCardImpl(CardState *card, int x, int y) override;
 };
 
 #endif // COCKATRICE_STACK_ZONE_LOGIC_H
diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.cpp
similarity index 60%
rename from cockatrice/src/game/zones/table_zone_logic.cpp
rename to libcockatrice_game/libcockatrice/game/zones/table_zone_logic.cpp
index 07e4a759b..834794268 100644
--- a/cockatrice/src/game/zones/table_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.cpp
@@ -1,14 +1,9 @@
 #include "table_zone_logic.h"
 
-#include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
-#include "libcockatrice/card/card_info.h"
+#include "../board/card_state.h"
 
 #include <QPoint>
 
-class PlayerLogic;
-class QObject;
-
 TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
                                const QString &_name,
                                bool _hasCardAttr,
@@ -19,7 +14,7 @@ TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
 {
 }
 
-void TableZoneLogic::addCardImpl(CardItem *card, int _x, int _y)
+void TableZoneLogic::addCardImpl(CardState *card, int _x, int _y)
 {
     cards.append(card);
     if (!card->getFaceDown() && card->getPT().isEmpty()) {
@@ -29,15 +24,33 @@ void TableZoneLogic::addCardImpl(CardItem *card, int _x, int _y)
         card->setDoesntUntap(true);
     }
     card->setGridPoint(QPoint(_x, _y));
-    card->setVisible(true);
 }
 
-CardItem *TableZoneLogic::takeCard(int position, int cardId, bool toNewZone)
+CardState *TableZoneLogic::takeCard(int position, int cardId, bool toNewZone)
 {
-    CardItem *result = CardZoneLogic::takeCard(position, cardId);
+    CardState *result = CardZoneLogic::takeCard(position, cardId);
 
     if (toNewZone) {
         emit contentSizeChanged();
     }
     return result;
-}
\ No newline at end of file
+}
+
+int TableZoneLogic::clampValidTableRow(const int row)
+{
+    if (row < 0) {
+        return 0;
+    }
+    if (row >= ROW_COUNT) {
+        return ROW_COUNT - 1;
+    }
+    return row;
+}
+
+int TableZoneLogic::tableRowToGridY(int tableRow)
+{
+    if (tableRow > 2) {
+        tableRow = 1;
+    }
+    return clampValidTableRow(2 - tableRow);
+}
diff --git a/cockatrice/src/game/zones/table_zone_logic.h b/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.h
similarity index 57%
rename from cockatrice/src/game/zones/table_zone_logic.h
rename to libcockatrice_game/libcockatrice/game/zones/table_zone_logic.h
index 8078bfd05..c828d8b91 100644
--- a/cockatrice/src/game/zones/table_zone_logic.h
+++ b/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.h
@@ -29,8 +29,23 @@ public:
                    bool _contentsKnown,
                    QObject *parent = nullptr);
 
+    /** @brief Number of rows in the table zone grid (0=creatures, 1=noncreatures, 2=lands). */
+    static const int ROW_COUNT = 3;
+
+    /**
+     * Clamps a grid row index into [0, ROW_COUNT - 1].
+     */
+    static int clampValidTableRow(const int row);
+
+    /**
+     * Converts a card's logical table row (0=creatures, 1=noncreatures, 2=lands)
+     * to the corresponding grid Y coordinate. Cards with tableRow > 2 (e.g.,
+     * instants/sorceries) default to the noncreatures row.
+     */
+    static int tableRowToGridY(int tableRow);
+
 protected:
-    void addCardImpl(CardItem *card, int x, int y) override;
+    void addCardImpl(CardState *card, int x, int y) override;
 
     /**
      *  @brief Removes a card from view.
@@ -38,9 +53,9 @@ protected:
      *  @param position card position
      *  @param cardId id of card to take
      *  @param toNewZone Whether the destination of the card is not the same as the starting zone. Defaults to true
-     *  @return CardItem that has been removed
+     *  @return CardState that has been removed
      */
-    CardItem *takeCard(int position, int cardId, bool toNewZone = true) override;
+    CardState *takeCard(int position, int cardId, bool toNewZone = true) override;
 };
 
 #endif // COCKATRICE_TABLE_ZONE_LOGIC_H
diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp
similarity index 81%
rename from cockatrice/src/game/zones/view_zone_logic.cpp
rename to libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp
index eb3b7715f..db1fa32c3 100644
--- a/cockatrice/src/game/zones/view_zone_logic.cpp
+++ b/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp
@@ -1,10 +1,11 @@
 #include "view_zone_logic.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
+#include "../board/card_state.h"
+#include "../player/player_actions.h"
+#include "../player/player_logic.h"
 
 #include <QtGlobal>
+#include <libcockatrice/interfaces/interface_interface_settings_provider.h>
 #include <libcockatrice/settings/interface_settings.h>
 
 class PlayerLogic;
@@ -22,13 +23,19 @@ ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player,
                                      bool _revealZone,
                                      bool _writeableRevealZone,
                                      bool _isReversed,
+                                     IInterfaceSettingsProvider *_interfaceSettings,
                                      QObject *parent)
     : CardZoneLogic(_player, _origZone->getName(), false, false, true, parent), origZone(_origZone),
       numberCards(_numberCards), revealZone(_revealZone), writeableRevealZone(_writeableRevealZone),
-      isReversed(_isReversed)
+      isReversed(_isReversed), interfaceSettings(_interfaceSettings)
 {
 }
 
+bool ZoneViewZoneLogic::getCloseEmptyCardView() const
+{
+    return interfaceSettings ? interfaceSettings->getCloseEmptyCardView() : true;
+}
+
 /**
  * Checks if inserting a card at the given position requires an actual new card to be created and added to the view.
  * Also does any cardId updates that would be required if a card is inserted in that position.
@@ -36,7 +43,7 @@ ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player,
  * Note that this method can end up modifying the cardIds despite returning false.
  * (for example, if the card is inserted into a hidden portion of the deck while the view is reversed)
  *
- * Make sure to call this method once before calling addCard(), so that you skip creating a new CardItem and calling
+ * Make sure to call this method once before calling addCard(), so that you skip creating the card and calling
  * addCard() if it's not required.
  *
  * @param x The position to insert the card at.
@@ -64,7 +71,7 @@ bool ZoneViewZoneLogic::prepareAddCard(int x)
 
     // autoclose check is done both here and in removeCard
 
-    if (cards.isEmpty() && !doInsert && SettingsCache::instance().userInterface().getCloseEmptyCardView()) {
+    if (cards.isEmpty() && !doInsert && getCloseEmptyCardView()) {
         emit closeView();
     }
 
@@ -75,7 +82,7 @@ bool ZoneViewZoneLogic::prepareAddCard(int x)
  * Make sure prepareAddCard() was called before calling addCard().
  * This method assumes we already checked that the card is being inserted into the visible portion
  */
-void ZoneViewZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
+void ZoneViewZoneLogic::addCardImpl(CardState *card, int x, int /*y*/)
 {
     if (!isReversed) {
         // if x is negative set it to add at end
@@ -144,14 +151,14 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone)
         return;
     }
 
-    CardItem *card = cards.takeAt(position);
-    card->deleteLater();
+    CardState *card = cards.takeAt(position);
+    card->deleteView();
 
     // The toNewZone check is to prevent the view from auto-closing if the view contains only a single card and that
     // card gets dragged within the view.
     // Another autoclose check is done in prepareAddCard so that the view autocloses if the last card was moved to an
     // unrevealed portion of the same zone.
-    if (cards.isEmpty() && SettingsCache::instance().userInterface().getCloseEmptyCardView() && toNewZone) {
+    if (cards.isEmpty() && getCloseEmptyCardView() && toNewZone) {
         emit closeView();
         return;
     }
@@ -160,12 +167,18 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone)
     reorganizeCards();
 }
 
+void ZoneViewZoneLogic::requestClose()
+{
+    emit closeView();
+}
+
 void ZoneViewZoneLogic::clearCards()
 {
     for (auto card : cards) {
-        card->deleteLater();
+        card->deleteView();
     }
     cards.clear();
+    emit cardCountChanged();
 }
 
 void ZoneViewZoneLogic::setWriteableRevealZone(bool _writeableRevealZone)
@@ -177,4 +190,16 @@ void ZoneViewZoneLogic::setWriteableRevealZone(bool _writeableRevealZone)
         emit removeFromViews();
     }
     writeableRevealZone = _writeableRevealZone;
-}
\ No newline at end of file
+}
+
+PendingCommand *ZoneViewZoneLogic::prepareZoneDump()
+{
+    return getPlayer()->getPlayerActions()->prepareZoneDump(this, numberCards);
+}
+
+void ZoneViewZoneLogic::sendZoneDump(PendingCommand *pendingCommand)
+{
+    if (pendingCommand != nullptr) {
+        getPlayer()->getPlayerActions()->sendGameCommand(pendingCommand);
+    }
+}
diff --git a/cockatrice/src/game/zones/view_zone_logic.h b/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.h
similarity index 55%
rename from cockatrice/src/game/zones/view_zone_logic.h
rename to libcockatrice_game/libcockatrice/game/zones/view_zone_logic.h
index 6fae301e4..a29e543a3 100644
--- a/cockatrice/src/game/zones/view_zone_logic.h
+++ b/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.h
@@ -12,6 +12,8 @@
 
 class PlayerLogic;
 class QObject;
+class PendingCommand;
+class IInterfaceSettingsProvider;
 
 class ZoneViewZoneLogic : public CardZoneLogic
 {
@@ -26,6 +28,8 @@ private:
     int numberCards;
     bool revealZone, writeableRevealZone;
     bool isReversed;
+    // Borrowed settings provider (owned by the application). Null outside the client, in which case views stay open.
+    IInterfaceSettingsProvider *interfaceSettings;
 
 public:
     enum CardAction
@@ -41,15 +45,25 @@ public:
                       bool _revealZone,
                       bool _writeableRevealZone,
                       bool _isReversed,
+                      IInterfaceSettingsProvider *interfaceSettings = nullptr,
                       QObject *parent = nullptr);
 
     bool prepareAddCard(int x);
     void removeCard(int position, bool toNewZone);
     void updateCardIds(CardAction action);
 
+    /**
+     * @brief Asks the graphics view showing this zone to close itself.
+     *
+     * Logic code has no handle on the view, so it goes through the logic object the view was built from.
+     */
+    void requestClose();
+
     /** @brief Removes all cards from the view, without touching anything else. Used in replay rewind */
     void clearCards();
 
+    [[nodiscard]] bool getCloseEmptyCardView() const;
+
     int getNumberCards() const
     {
         return numberCards;
@@ -73,8 +87,25 @@ public:
         return origZone;
     }
 
+    /**
+     * @brief Builds the zone-dump command for this view without sending it.
+     * @return The pending command, or nullptr when there is no zone to dump.
+     *
+     * Keeps command construction in game/ so graphics views don't reach
+     * through the player into PlayerActions to set it up. The response can
+     * arrive synchronously (local games), so callers must connect to
+     * PendingCommand::finished before calling sendZoneDump().
+     */
+    PendingCommand *prepareZoneDump();
+
+    /**
+     * @brief Sends a command returned by prepareZoneDump().
+     * @param pendingCommand The prepared command; nullptr is ignored.
+     */
+    void sendZoneDump(PendingCommand *pendingCommand);
+
 protected:
-    void addCardImpl(CardItem *card, int x, int y) override;
+    void addCardImpl(CardState *card, int x, int y) override;
 };
 
 #endif // COCKATRICE_VIEW_ZONE_LOGIC_H
diff --git a/libcockatrice_interfaces/CMakeLists.txt b/libcockatrice_interfaces/CMakeLists.txt
index 3b17569b1..69ed13b0e 100644
--- a/libcockatrice_interfaces/CMakeLists.txt
+++ b/libcockatrice_interfaces/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS
     libcockatrice/interfaces/interface_cache_storage_settings_provider.h
     libcockatrice/interfaces/interface_card_database_path_provider.h
@@ -24,9 +20,7 @@ set(HEADERS
     libcockatrice/interfaces/noop_card_set_priority_controller.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-add_library(libcockatrice_interfaces STATIC ${MOC_SOURCES})
+add_library(libcockatrice_interfaces STATIC ${HEADERS})
 
 target_include_directories(libcockatrice_interfaces PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h
index 2b1ddf8ec..00763d031 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h
@@ -20,6 +20,7 @@ public:
     [[nodiscard]] virtual bool getCreateGameAsSpectator() const = 0;
     [[nodiscard]] virtual int getDefaultStartingLifeTotal() const = 0;
     [[nodiscard]] virtual bool getShareDecklistsOnLoad() const = 0;
+    [[nodiscard]] virtual bool getShufflePlayers() const = 0;
     [[nodiscard]] virtual bool getRememberGameSettings() const = 0;
     [[nodiscard]] virtual bool getLocalGameRememberSettings() const = 0;
     [[nodiscard]] virtual int getLocalGameMaxPlayers() const = 0;
diff --git a/libcockatrice_models/CMakeLists.txt b/libcockatrice_models/CMakeLists.txt
index 7af35b2d5..5186eff13 100644
--- a/libcockatrice_models/CMakeLists.txt
+++ b/libcockatrice_models/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 add_subdirectory(libcockatrice/models/database)
 add_subdirectory(libcockatrice/models/deck_list)
 
diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
index a73e36dbb..22a04cd32 100644
--- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
@@ -1,10 +1,7 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS
     card_database_model.h
     card_database_display_model.h
+    card_database_visual_display_model.h
     card/card_completer_proxy_model.h
     card/card_search_model.h
     card_set/card_sets_model.h
@@ -12,13 +9,12 @@ set(HEADERS
     token/token_edit_model.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
   libcockatrice_models_database STATIC
-  ${MOC_SOURCES}
+  ${HEADERS}
   card_database_model.cpp
   card_database_display_model.cpp
+  card_database_visual_display_model.cpp
   card/card_completer_proxy_model.cpp
   card/card_search_model.cpp
   card_set/card_sets_model.cpp
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
index 5573deb18..9ec0afd9c 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
@@ -21,7 +21,7 @@
 class QObject;
 
 CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
-    : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr),
+    : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr), cardModel(nullptr),
       collator(NaturalSort::makeNaturalSortCollator())
 {
     filterTree = nullptr;
@@ -33,22 +33,37 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
         invalidate();
         emit modelDirty();
     });
-
-    loadedRowCount = 0;
 }
 
 void CardDatabaseDisplayModel::setSourceModel(QAbstractItemModel *model)
 {
+    cardModel = qobject_cast<CardDatabaseModel *>(model);
     QSortFilterProxyModel::setSourceModel(model);
 
     connect(model, &QAbstractItemModel::rowsInserted, this, [this]() { dirty(); });
 
     connect(model, &QAbstractItemModel::rowsRemoved, this, [this]() { dirty(); });
 
-    connect(model, &QAbstractItemModel::modelReset, this, [this]() {
-        loadedRowCount = 0;
-        dirty();
-    });
+    connect(model, &QAbstractItemModel::modelReset, this, [this]() { dirty(); });
+}
+
+QVariant CardDatabaseDisplayModel::data(const QModelIndex &index, int role) const
+{
+    if (role == CardInfoRole) {
+        return QVariant::fromValue(cardInfoAt(index));
+    }
+
+    return QSortFilterProxyModel::data(index, role);
+}
+
+CardInfoPtr CardDatabaseDisplayModel::cardInfoAt(const QModelIndex &index) const
+{
+    if (!index.isValid() || cardModel == nullptr) {
+        return {};
+    }
+
+    const QModelIndex sourceIndex = mapToSource(index);
+    return sourceIndex.isValid() ? cardModel->getCard(sourceIndex.row()) : CardInfoPtr();
 }
 
 QMap<wchar_t, wchar_t> CardDatabaseDisplayModel::characterTranslation = {{L'“', L'\"'},
@@ -56,32 +71,6 @@ QMap<wchar_t, wchar_t> CardDatabaseDisplayModel::characterTranslation = {{L'“'
                                                                          {L'‘', L'\''},
                                                                          {L'’', L'\''}};
 
-bool CardDatabaseDisplayModel::canFetchMore(const QModelIndex &index) const
-{
-    return loadedRowCount < sourceModel()->rowCount(index);
-}
-
-void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)
-{
-    int remainder = sourceModel()->rowCount(index) - loadedRowCount;
-    int itemsToFetch = qMin(100, remainder);
-
-    if (itemsToFetch == 0) {
-        return;
-    }
-
-    const auto startIndex = qMin(rowCount(QModelIndex()), loadedRowCount);
-    beginInsertRows(QModelIndex(), startIndex, startIndex + itemsToFetch - 1);
-
-    loadedRowCount += itemsToFetch;
-    endInsertRows();
-}
-
-int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const
-{
-    return QSortFilterProxyModel::rowCount(parent);
-}
-
 bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
     const QString leftString = sourceModel()->data(left, CardDatabaseModel::SortRole).toString();
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
index 343a7482e..3a9bbc6ab 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
@@ -21,6 +21,7 @@
 #include <libcockatrice/filters/filter_string.h>
 #include <qtmetamacros.h>
 
+class CardDatabaseModel;
 class FilterTree;
 class QObject;
 template <class Key, class T> class QMap;
@@ -36,13 +37,25 @@ public:
         ShowAll
     };
 
+    enum Role
+    {
+        /**
+         * @brief The CardInfoPtr behind a proxy row.
+         *
+         * Saves views from looking the card up again through its name, and keeps
+         * them from depending on the source model's column layout.
+         */
+        CardInfoRole = Qt::UserRole + 1
+    };
+
 private:
     FilterBool isToken;
     QString cardName, cardText;
     QSet<QString> cardNameSet, cardTypes, cardColors;
     FilterTree *filterTree;
     FilterString *filterString;
-    int loadedRowCount;
+    /// The source model, kept typed so CardInfoRole does not cast per row.
+    CardDatabaseModel *cardModel;
     QTimer dirtyTimer;
     CardSearchLanguage searchLanguage;
     QString searchText;
@@ -85,9 +98,16 @@ public:
         dirtyTimer.start(20);
     }
     void clearFilterAll();
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] bool canFetchMore(const QModelIndex &parent) const override;
-    void fetchMore(const QModelIndex &parent) override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Returns the card behind a proxy row, without the QVariant wrapper of CardInfoRole.
+     *
+     * The visual grid calls this for every row on each rebuild; CardInfoRole stays the
+     * generic way in for consumers that only see the model through data().
+     */
+    [[nodiscard]] CardInfoPtr cardInfoAt(const QModelIndex &index) const;
+
 signals:
     void modelDirty();
 
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
index 1ede554f8..a83b7c83d 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
@@ -27,14 +27,18 @@ CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromE
 
 CardDatabaseModel::~CardDatabaseModel() = default;
 
-int CardDatabaseModel::rowCount(const QModelIndex & /*parent*/) const
+int CardDatabaseModel::rowCount(const QModelIndex &parent) const
 {
-    return cardList.size();
+    // A list model's card rows are leaves; returning the full card count for a
+    // valid parent makes every row claim all cards as children.
+    return parent.isValid() ? 0 : cardList.size();
 }
 
-int CardDatabaseModel::columnCount(const QModelIndex & /*parent*/) const
+int CardDatabaseModel::columnCount(const QModelIndex &parent) const
 {
-    return CARDDBMODEL_COLUMNS;
+    // Card rows are leaves, so a valid parent holds no columns. Reporting the
+    // row width for a card index would claim child cells that do not exist.
+    return parent.isValid() ? 0 : CARDDBMODEL_COLUMNS;
 }
 
 QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp
new file mode 100644
index 000000000..f6a3a925c
--- /dev/null
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp
@@ -0,0 +1,123 @@
+#include "card_database_visual_display_model.h"
+
+#include "card_database_display_model.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+
+#include <QAbstractItemModel>
+#include <QList>
+#include <QStringList>
+#include <QVariant>
+
+/// Coalesces the bursts of proxy signals a filter, sort or database load produces.
+static constexpr int REBUILD_COALESCE_MS = 30;
+
+CardDatabaseVisualDisplayModel::CardDatabaseVisualDisplayModel(CardDatabaseDisplayModel *_displayModel,
+                                                               CardDatabaseQuerier *_querier,
+                                                               QObject *parent)
+    : QAbstractListModel(parent), displayModel(_displayModel), querier(_querier)
+{
+    rebuildTimer.setSingleShot(true);
+    rebuildTimer.setInterval(REBUILD_COALESCE_MS);
+    connect(&rebuildTimer, &QTimer::timeout, this, &CardDatabaseVisualDisplayModel::rebuild);
+
+    if (displayModel == nullptr) {
+        return;
+    }
+
+    connect(displayModel, &QAbstractItemModel::modelReset, this, &CardDatabaseVisualDisplayModel::scheduleRebuild);
+    connect(displayModel, &QAbstractItemModel::layoutChanged, this, &CardDatabaseVisualDisplayModel::scheduleRebuild);
+    connect(displayModel, &QAbstractItemModel::rowsInserted, this, &CardDatabaseVisualDisplayModel::scheduleRebuild);
+    connect(displayModel, &QAbstractItemModel::rowsRemoved, this, &CardDatabaseVisualDisplayModel::scheduleRebuild);
+    connect(displayModel, &QAbstractItemModel::dataChanged, this, &CardDatabaseVisualDisplayModel::scheduleRebuild);
+}
+
+void CardDatabaseVisualDisplayModel::setSetFilterTerms(const QStringList &terms)
+{
+    if (setFilterTerms == terms) {
+        return;
+    }
+
+    setFilterTerms = terms;
+    refresh();
+}
+
+void CardDatabaseVisualDisplayModel::refresh()
+{
+    rebuildTimer.stop();
+    rebuild();
+}
+
+void CardDatabaseVisualDisplayModel::scheduleRebuild()
+{
+    rebuildTimer.start();
+}
+
+void CardDatabaseVisualDisplayModel::rebuild()
+{
+    beginResetModel();
+    entries.clear();
+
+    if (displayModel != nullptr) {
+        const int proxyRows = displayModel->rowCount();
+        entries.reserve(proxyRows);
+        for (int row = 0; row < proxyRows; ++row) {
+            const CardInfoPtr info = displayModel->cardInfoAt(displayModel->index(row, 0));
+            if (info) {
+                appendPrintingsFor(info);
+            }
+        }
+    }
+
+    endResetModel();
+}
+
+void CardDatabaseVisualDisplayModel::appendPrintingsFor(const CardInfoPtr &info)
+{
+    if (setFilterTerms.isEmpty()) {
+        entries.append({info, PrintingInfo()});
+        return;
+    }
+
+    const auto &printingsBySet = info->getSets();
+    for (const QString &term : setFilterTerms) {
+        const auto printings = printingsBySet.constFind(term);
+        if (printings == printingsBySet.constEnd()) {
+            continue;
+        }
+        for (const PrintingInfo &printing : printings.value()) {
+            entries.append({info, printing});
+        }
+    }
+}
+
+int CardDatabaseVisualDisplayModel::rowCount(const QModelIndex &parent) const
+{
+    return parent.isValid() ? 0 : static_cast<int>(entries.size());
+}
+
+QVariant CardDatabaseVisualDisplayModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() >= entries.size()) {
+        return {};
+    }
+
+    if (role == Qt::DisplayRole || role == Qt::AccessibleTextRole) {
+        return cardAt(index.row()).getName();
+    }
+
+    return {};
+}
+
+ExactCard CardDatabaseVisualDisplayModel::cardAt(int row) const
+{
+    if (row < 0 || row >= entries.size()) {
+        return {};
+    }
+
+    const Entry &entry = entries.at(row);
+    if (entry.printing.isEmpty() && setFilterTerms.isEmpty()) {
+        return querier != nullptr ? querier->getPreferredCard(entry.info) : ExactCard(entry.info);
+    }
+
+    return ExactCard(entry.info, entry.printing);
+}
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h
new file mode 100644
index 000000000..1303b6464
--- /dev/null
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h
@@ -0,0 +1,90 @@
+/**
+ * @file card_database_visual_display_model.h
+ * @ingroup CardDatabaseModels
+ * @brief A list model of the exact cards a visual card grid paints.
+ *
+ * The filtered and sorted CardDatabaseDisplayModel holds one row per card name.
+ * A visual grid shows one picture per *printing* instead, so this model flattens
+ * the proxy rows into ExactCards: the preferred printing per card normally, and
+ * every printing of the selected sets while set filters are active.
+ */
+
+#ifndef COCKATRICE_CARD_DATABASE_VISUAL_DISPLAY_MODEL_H
+#define COCKATRICE_CARD_DATABASE_VISUAL_DISPLAY_MODEL_H
+
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QModelIndex>
+#include <QPointer>
+#include <QStringList>
+#include <QTimer>
+#include <qtmetamacros.h>
+
+class CardDatabaseDisplayModel;
+class CardDatabaseQuerier;
+
+class CardDatabaseVisualDisplayModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Flattens _displayModel into the cards a visual grid displays.
+     * @param _displayModel The filtered and sorted proxy model of the card database.
+     * @param _querier Resolves the preferred printing of a card.
+     * @param parent Parent object.
+     */
+    explicit CardDatabaseVisualDisplayModel(CardDatabaseDisplayModel *_displayModel,
+                                            CardDatabaseQuerier *_querier,
+                                            QObject *parent = nullptr);
+
+    /**
+     * @brief Sets the set shorthand names of the active set filters.
+     *
+     * With no terms every card is shown with its preferred printing. With terms
+     * every printing belonging to one of the named sets is shown instead, in term
+     * order. Rebuilds immediately when the terms change.
+     */
+    void setSetFilterTerms(const QStringList &terms);
+
+    /**
+     * @brief Rebuilds the row list from the proxy model right away.
+     *
+     * Proxy model changes normally rebuild on a short coalescing timer; call this
+     * when the caller needs the new rows before returning.
+     */
+    void refresh();
+
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Returns the card painted at @p row, with its preferred printing resolved.
+     * @param row Row in this model, not in the proxy model.
+     */
+    [[nodiscard]] ExactCard cardAt(int row) const;
+
+private:
+    struct Entry
+    {
+        CardInfoPtr info;
+        /// Empty when the entry follows the preferred printing rather than a set filter.
+        PrintingInfo printing;
+    };
+
+    void scheduleRebuild();
+    void rebuild();
+    void appendPrintingsFor(const CardInfoPtr &info);
+
+    QPointer<CardDatabaseDisplayModel> displayModel;
+    CardDatabaseQuerier *querier;
+    QStringList setFilterTerms;
+    QList<Entry> entries;
+    QTimer rebuildTimer;
+};
+
+#endif // COCKATRICE_CARD_DATABASE_VISUAL_DISPLAY_MODEL_H
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
index 324bed102..ce5c4d54b 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
@@ -1,13 +1,7 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS deck_list_model.h deck_list_sort_filter_proxy_model.h)
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
-  libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_model_custom_zones.cpp
+  libcockatrice_models_deck_list STATIC ${HEADERS} deck_list_model.cpp deck_list_model_custom_zones.cpp
                                         deck_list_sort_filter_proxy_model.cpp
 )
 
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
index 4b4088972..f3c4545d7 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
@@ -134,6 +134,13 @@ void DeckListModel::rebuildTree()
 
 int DeckListModel::rowCount(const QModelIndex &parent) const
 {
+    // Only column 0 carries children. Column 1 and later indexes are siblings
+    // used by views for the remaining cells of a row, and a model that hangs
+    // children off them breaks QAbstractItemModelTester and proxy models.
+    if (parent.isValid() && parent.column() != 0) {
+        return 0;
+    }
+
     // debugIndexInfo("rowCount", parent);
     auto *node = getNode<InnerDecklistNode *>(parent);
     if (node) {
@@ -282,7 +289,7 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie
 QModelIndex DeckListModel::index(int row, int column, const QModelIndex &parent) const
 {
     // debugIndexInfo("index", parent);
-    if (!hasIndex(row, column, parent)) {
+    if ((parent.isValid() && parent.column() != 0) || !hasIndex(row, column, parent)) {
         return {};
     }
 
@@ -739,7 +746,8 @@ QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const
 void DeckListModel::sortShadowTree(InnerDecklistNode *node, Qt::SortOrder order)
 {
     // The mapping is not needed: fresh shadow nodes have no persistent indices yet.
-    (void)DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order);
+    (void)DeckListModelCustomZones::sortWithCustomZonesLast(
+        root, node, order, activeGroupCriteria == DeckListModelGroupCriteria::MANA_COST && lastKnownColumn != 0);
 
     for (int i = node->size() - 1; i >= 0; --i) {
         if (auto *subNode = dynamic_cast<InnerDecklistNode *>(node->at(i))) {
@@ -752,7 +760,8 @@ void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order)
 {
     // Sort children (custom zones always sorted after groups within a board) and
     // use the movement mapping to update the list of persistent indices.
-    const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order);
+    const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(
+        root, node, order, activeGroupCriteria == DeckListModelGroupCriteria::MANA_COST && lastKnownColumn != 0);
 
     QModelIndexList from, to;
     int columns = columnCount();
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
index 419c38b04..523708cbd 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
@@ -8,6 +8,8 @@
 #include <QHash>
 #include <QSharedPointer>
 #include <QVector>
+#include <algorithm>
+#include <cmath>
 #include <utility>
 
 namespace DeckListModelCustomZones
@@ -111,7 +113,7 @@ QList<QPair<int, int>> plainSort(InnerDecklistNode *node, Qt::SortOrder order)
  *
  * @return The (preSortRow, finalRow) mapping covering both the sort and the shift.
  */
-QList<QPair<int, int>> boardSort(InnerDecklistNode *node, Qt::SortOrder order)
+QList<QPair<int, int>> boardSort(InnerDecklistNode *node, Qt::SortOrder order, bool numericGroups)
 {
     const QVector<QPair<int, int>> sortResult = node->sort(order);
 
@@ -132,6 +134,27 @@ QList<QPair<int, int>> boardSort(InnerDecklistNode *node, Qt::SortOrder order)
         }
     }
 
+    if (numericGroups) {
+        // Only criteria groups are numeric. Mixing numeric and lexical fallback
+        // comparisons with custom zone names would not define a strict ordering.
+        std::sort(groups.begin(), groups.end(), [order](const auto *left, const auto *right) {
+            const QString leftName = left->getName();
+            const QString rightName = right->getName();
+            bool leftIsNumber, rightIsNumber;
+            const double leftValue = leftName.toDouble(&leftIsNumber);
+            const double rightValue = rightName.toDouble(&rightIsNumber);
+            leftIsNumber = leftIsNumber && std::isfinite(leftValue);
+            rightIsNumber = rightIsNumber && std::isfinite(rightValue);
+            if (leftIsNumber != rightIsNumber) {
+                return leftIsNumber;
+            }
+            if (leftIsNumber && leftValue != rightValue) {
+                return order == Qt::AscendingOrder ? leftValue < rightValue : leftValue > rightValue;
+            }
+            return order == Qt::AscendingOrder ? leftName < rightName : leftName > rightName;
+        });
+    }
+
     QVector<AbstractDecklistNode *> ordered = groups + customZones;
     for (int i = 0; i < ordered.size(); ++i) {
         node->replace(i, ordered[i]);
@@ -147,10 +170,11 @@ QList<QPair<int, int>> boardSort(InnerDecklistNode *node, Qt::SortOrder order)
 
 } // namespace
 
-QList<QPair<int, int>> sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order)
+QList<QPair<int, int>>
+sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order, bool numericGroups)
 {
     const bool isBoardZone = (node != root) && (node->getParent() == root);
-    return isBoardZone ? boardSort(node, order) : plainSort(node, order);
+    return isBoardZone ? boardSort(node, order, numericGroups) : plainSort(node, order);
 }
 
 } // namespace DeckListModelCustomZones
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
index 53bdeaa1e..d3f477450 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
@@ -91,10 +91,15 @@ void mirrorCustomZones(const InnerDecklistNode *deckBoardZone, InnerDecklistNode
  * @param root Root of the shadow tree (used to classify board zones).
  * @param node The shadow node whose children are reordered.
  * @param order Sort order to apply.
+ * @param numericGroups Compare criteria-group names as mana values. Custom zone
+ * names and card names retain their normal comparison; nonnumeric groups follow
+ * numeric groups in either sort direction.
  * @return A list of (preSortRow, finalRow) pairs describing how each node moved.
  */
-[[nodiscard]] QList<QPair<int, int>>
-sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order);
+[[nodiscard]] QList<QPair<int, int>> sortWithCustomZonesLast(InnerDecklistNode *root,
+                                                             InnerDecklistNode *node,
+                                                             Qt::SortOrder order,
+                                                             bool numericGroups = false);
 
 } // namespace DeckListModelCustomZones
 
diff --git a/libcockatrice_network/CMakeLists.txt b/libcockatrice_network/CMakeLists.txt
index 3069c0db4..925e4d445 100644
--- a/libcockatrice_network/CMakeLists.txt
+++ b/libcockatrice_network/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 add_subdirectory(libcockatrice/network/client)
 add_subdirectory(libcockatrice/network/server)
 
diff --git a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
index bcf62463c..cf8d9fc4d 100644
--- a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 add_subdirectory(abstract)
 add_subdirectory(local)
 add_subdirectory(remote)
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
index 53ad524b4..33812e0bf 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
@@ -1,14 +1,8 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS abstract_client.h latency_tracker.h)
 
 set(SOURCES abstract_client.cpp latency_tracker.cpp)
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
+add_library(libcockatrice_network_client_abstract STATIC ${HEADERS} ${SOURCES})
 
 add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)
 
@@ -17,7 +11,7 @@ target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
 target_link_libraries(
   libcockatrice_network_client_abstract
   PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol
-         libcockatrice_network_server_remote
+         libcockatrice_network_server_remote libcockatrice_utility
 )
 
 target_precompile_headers(libcockatrice_network_client_abstract PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
index 0c523d776..04e6beda0 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
@@ -10,6 +10,7 @@
 #include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "libcockatrice/protocol/pb/session_commands.pb.h"
 #include "libcockatrice/protocol/pb/session_event.pb.h"
+#include "libcockatrice/utility/passwordhasher.h"
 
 #include <QDebug>
 #include <QList>
@@ -80,6 +81,26 @@ AbstractClient::~AbstractClient()
 {
 }
 
+Command_AccountPassword AbstractClient::makeAccountPasswordCommand(const QString &oldPassword,
+                                                                   const QString &newPassword) const
+{
+    Command_AccountPassword cmd;
+    cmd.set_old_password(oldPassword.toStdString());
+    if (getServerSupportsChallengeResponse()) {
+        // A verifier lets the server upgrade the stored credential without ever seeing the
+        // password, and it is what a challenge-response server expects for a new password.
+        cmd.set_hashed_new_password(PasswordHasher::generatePasswordVerifier(newPassword).toStdString());
+    } else if (getServerSupportsPasswordHash()) {
+        // The server hashes the password itself with its own salt; a salted hash is the
+        // strongest form it accepts, so the plaintext never goes on the wire.
+        const QString passwordSalt = PasswordHasher::generateRandomSalt();
+        cmd.set_hashed_new_password(PasswordHasher::computeHash(newPassword, passwordSalt).toStdString());
+    } else {
+        cmd.set_new_password(newPassword.toStdString());
+    }
+    return cmd;
+}
+
 void AbstractClient::processProtocolItem(const ServerMessage &item)
 {
     switch (item.message_type()) {
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
index 7efd67972..005587ccc 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
@@ -47,6 +47,7 @@ class Event_UserJoined;
 class Event_UserLeft;
 class Event_ServerMessage;
 class Event_ListRooms;
+class Command_AccountPassword;
 class Event_GameJoined;
 class Event_UserMessage;
 class Event_NotifyUser;
@@ -67,6 +68,9 @@ enum ClientStatus
     StatusSubmitForgotPasswordReset,
     StatusSubmitForgotPasswordChallenge,
     StatusGettingPasswordSalt,
+    //! The server accepted the credentials but keeps the session open until the account
+    //! password is replaced; the connection must survive for `Command_AccountPassword`.
+    StatusPasswordChangeRequired,
 };
 
 class AbstractClient : public QObject
@@ -171,6 +175,16 @@ public:
     {
         return serverSupportsChallengeResponse;
     }
+
+    /**
+     * @brief Builds the account-password command in the form this server understands.
+     *
+     * Challenge-response servers take a scrypt verifier; servers that only advertise
+     * SupportsPasswordHash take a salted SHA-512 hash; anything older gets the plaintext,
+     * which is the only form it understands. Both password-change paths go through here so
+     * the two cannot drift apart and hand a plaintext password to a server that can hash it.
+     */
+    Command_AccountPassword makeAccountPasswordCommand(const QString &oldPassword, const QString &newPassword) const;
     const QString &getUserName() const
     {
         return userName;
diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
index 08c12b7f8..3eff7943a 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
@@ -1,14 +1,8 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS local_client.h)
 
 set(SOURCES local_client.cpp)
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
+add_library(libcockatrice_network_client_local STATIC ${HEADERS} ${SOURCES})
 
 add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)
 
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
index c1c1cc976..b9a1566f8 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
@@ -33,20 +33,26 @@ LocalClient::LocalClient(LocalServerInterface *_lsi,
     sendCommand(prepareSessionCommand(joinCmd));
 }
 
-LocalClient::~LocalClient()
-{
-}
-
 void LocalClient::sendCommandContainer(const CommandContainer &cont)
 {
-    qCDebug(LocalClientLog).noquote() << userName << "OUT" << getSafeDebugString(cont);
+    if (LocalClientLog().isDebugEnabled()) {
+        qCDebug(LocalClientLog).noquote() << userName << "OUT" << getSafeDebugString(cont);
+    }
+
+    if (lsi.isNull()) {
+        qCWarning(LocalClientLog).noquote()
+            << userName << "dropping command, local server interface no longer exists:" << getSafeDebugString(cont);
+        return;
+    }
 
     lsi->itemFromClient(cont);
 }
 
 void LocalClient::itemFromServer(const ServerMessage &item)
 {
-    qCDebug(LocalClientLog).noquote() << userName << "IN" << getSafeDebugString(item);
+    if (LocalClientLog().isDebugEnabled()) {
+        qCDebug(LocalClientLog).noquote() << userName << "IN" << getSafeDebugString(item);
+    }
 
     processProtocolItem(item);
 }
diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
index 3ae570255..15b36d3db 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
@@ -10,6 +10,7 @@
 #include "../abstract/abstract_client.h"
 
 #include <QLoggingCategory>
+#include <QPointer>
 #include <QString>
 #include <qtmetamacros.h>
 
@@ -24,14 +25,15 @@ class LocalClient : public AbstractClient
 {
     Q_OBJECT
 private:
-    LocalServerInterface *lsi;
+    // Guarded pointer: the LocalServer (and its interfaces) may be destroyed while this client
+    // still has pending commands queued on the event loop.
+    QPointer<LocalServerInterface> lsi;
 
 public:
     LocalClient(LocalServerInterface *_lsi,
                 const QString &_playerName,
                 const QString &_clientId,
                 QObject *parent = nullptr);
-    ~LocalClient() override;
 
     void sendCommandContainer(const CommandContainer &cont) override;
 private slots:
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
index c32ca0aa8..006c18d42 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
@@ -1,14 +1,8 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS remote_client.h)
 
 set(SOURCES remote_client.cpp)
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
+add_library(libcockatrice_network_client_remote STATIC ${HEADERS} ${SOURCES})
 
 add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)
 
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
index cbf7dbda2..636c603c6 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -40,6 +40,48 @@ class QObject;
 
 static const unsigned int protocolVersion = 14;
 
+// Explanations for logins that do not complete but carry no missing-feature list: the
+// ones RemoteClient stops itself, plus a strict server asking for a password. They all
+// travel with RespClientUpdateRequired and are shown by the same dialog, so their wording
+// is kept together here and adjusted as a set. The context has to stay "RemoteClient" for
+// the tr() calls at the use sites to find the translations.
+namespace
+{
+// The server warns that this account still uses the legacy password hash while this client
+// holds a scrypt verifier. Sending the verifier would downgrade the proof, so the client
+// stops; the login only succeeds after the saved verifier is gone and the user types the
+// password, which also upgrades the account. Unticking "Save password" drops the verifier
+// for the next connection.
+constexpr const char *const LOGIN_ABORT_AUTH_DOWNGRADE = QT_TRANSLATE_NOOP(
+    "RemoteClient",
+    "The server still uses an old password format for this account, so the saved login on this computer cannot be "
+    "used. Untick 'Save password' in the Connect window and log in with your password.");
+// The account is still on the legacy hash and only the plaintext password can produce it.
+constexpr const char *const LOGIN_ABORT_PASSWORD_REQUIRED =
+    QT_TRANSLATE_NOOP("RemoteClient",
+                      "This account still uses an old password format. Type your password in the Connect window and "
+                      "log in; the account is upgraded automatically.");
+// Rejected by PasswordHasher::costParamsAreSane, either for being weak or for being too
+// expensive for this client. Nothing on the client side can fix it.
+constexpr const char *const LOGIN_ABORT_UNSAFE_SCRYPT_PARAMS =
+    QT_TRANSLATE_NOOP("RemoteClient",
+                      "The server asked for password settings that Cockatrice will not accept because they are too "
+                      "weak or too demanding. The login was stopped; only the server's staff can change this.");
+// Scrypt derivation failed locally: a device resource problem, or server parameters this
+// client cannot satisfy.
+constexpr const char *const LOGIN_ABORT_VERIFIER_NOT_DERIVED =
+    QT_TRANSLATE_NOOP("RemoteClient",
+                      "Cockatrice could not prepare your password for this login. Try again; if it keeps happening, "
+                      "the server's password settings may be too demanding for this version of Cockatrice.");
+constexpr const char *const LOGIN_ABORT_STORED_VERIFIER_UNUSABLE =
+    QT_TRANSLATE_NOOP("RemoteClient",
+                      "The saved login for this account cannot be used. Type your password in the Connect window; if "
+                      "'Save password' is ticked, a new saved login is created after you log in.");
+constexpr const char *const LOGIN_ABORT_PASSWORD_MISSING =
+    QT_TRANSLATE_NOOP("RemoteClient",
+                      "This server requires your password to log in. Type it in the Connect window and try again.");
+} // namespace
+
 RemoteClient::RemoteClient(QObject *parent, INetworkSettingsProvider *_networkSettingsProvider)
     : AbstractClient(parent), networkSettingsProvider(_networkSettingsProvider), timeRunning(0), lastDataReceived(0),
       messageInProgress(false), handshakeStarted(false), usingWebSocket(false), messageLength(0), hashedPassword(),
@@ -84,6 +126,7 @@ RemoteClient::RemoteClient(QObject *parent, INetworkSettingsProvider *_networkSe
             &RemoteClient::doSubmitForgotPasswordResetToServer);
     connect(this, &RemoteClient::sigSubmitForgotPasswordChallengeToServer, this,
             &RemoteClient::doSubmitForgotPasswordChallengeToServer);
+    connect(this, &RemoteClient::sigChangePasswordToServer, this, &RemoteClient::doChangePasswordToServer);
 }
 
 RemoteClient::~RemoteClient()
@@ -95,6 +138,7 @@ RemoteClient::~RemoteClient()
 void RemoteClient::slotSocketError(QAbstractSocket::SocketError /*error*/)
 {
     QString errorString = socket->errorString();
+    qCWarning(RemoteClientLog) << "Server connection error:" << errorString;
     doDisconnectFromServer();
     emit socketError(errorString);
 }
@@ -104,6 +148,7 @@ void RemoteClient::slotWebSocketError(QAbstractSocket::SocketError /*error*/)
 
     QString errorString = websocket->errorString();
     if (getStatus() != ClientStatus::StatusDisconnected) {
+        qCWarning(RemoteClientLog) << "Server connection error:" << errorString;
         doDisconnectFromServer();
         emit socketError(errorString);
     }
@@ -111,6 +156,7 @@ void RemoteClient::slotWebSocketError(QAbstractSocket::SocketError /*error*/)
 
 void RemoteClient::slotConnected()
 {
+    qCInfo(RemoteClientLog) << "Server transport connected";
     timeRunning = lastDataReceived = 0;
     timer->start();
 
@@ -124,6 +170,12 @@ void RemoteClient::slotConnected()
 
 void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentification &event)
 {
+    // Identification arrives before login, including when protocol versions differ.
+    // Quote the server-supplied strings in the log and limit their size.
+    const QString serverName = QString::fromStdString(event.server_name()).left(256);
+    const QString serverVersion = QString::fromStdString(event.server_version()).left(256);
+    qCInfo(RemoteClientLog) << "Server identification:" << serverName << "version" << serverVersion
+                            << "protocol version" << event.protocol_version();
     if (event.protocol_version() != protocolVersion) {
         emit protocolVersionMismatch(protocolVersion, event.protocol_version());
         setStatus(StatusDisconnecting);
@@ -313,6 +365,29 @@ void RemoteClient::submitPasswordVerifierResponse(const Response &response)
     }
 }
 
+void RemoteClient::changePasswordToServer(const QString &oldPassword, const QString &newPassword)
+{
+    emit sigChangePasswordToServer(oldPassword, newPassword);
+}
+
+void RemoteClient::doChangePasswordToServer(const QString &oldPassword, const QString &newPassword)
+{
+    const Command_AccountPassword cmd = makeAccountPasswordCommand(oldPassword, newPassword);
+
+    PendingCommand *pend = prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &RemoteClient::accountPasswordResponse);
+    sendCommand(pend);
+}
+
+void RemoteClient::accountPasswordResponse(const Response &response)
+{
+    if (response.response_code() == Response::RespOk) {
+        emit sigPasswordChangeSuccess();
+    } else {
+        emit sigPasswordChangeError(response.response_code());
+    }
+}
+
 void RemoteClient::processConnectionClosedEvent(const Event_ConnectionClosed & /*event*/)
 {
     doDisconnectFromServer();
@@ -335,9 +410,7 @@ void RemoteClient::passwordSaltResponse(const Response &response)
             // 1000-round legacy hash is a downgrade of the KDF — refuse it rather
             // than hand an attacker a weakly-keyed HMAC they can attack offline.
             if (resp.needs_migration() && PasswordHasher::parsePasswordVerifier(storedVerifier).isValid) {
-                emit loginError(Response::RespClientUpdateRequired,
-                                QStringLiteral("Server asked to downgrade authentication for a migrated account."), 0,
-                                {});
+                emit loginError(Response::RespClientUpdateRequired, tr(LOGIN_ABORT_AUTH_DOWNGRADE), 0, {});
                 return;
             }
             QByteArray key;
@@ -345,8 +418,7 @@ void RemoteClient::passwordSaltResponse(const Response &response)
                 // The account still uses the legacy format; the legacy full hash
                 // is only derivable from the plaintext password.
                 if (password.isEmpty()) {
-                    emit loginError(Response::RespClientUpdateRequired,
-                                    QStringLiteral("This account must be logged in with its password once."), 0, {});
+                    emit loginError(Response::RespClientUpdateRequired, tr(LOGIN_ABORT_PASSWORD_REQUIRED), 0, {});
                     return;
                 }
                 key = PasswordHasher::computeHash(password, passwordSalt).toUtf8();
@@ -357,8 +429,7 @@ void RemoteClient::passwordSaltResponse(const Response &response)
                 const int r = resp.has_r() ? resp.r() : SCRYPT_R;
                 const int p = resp.has_p() ? resp.p() : SCRYPT_P;
                 if (!PasswordHasher::costParamsAreSane(n, r, p)) {
-                    emit loginError(Response::RespClientUpdateRequired,
-                                    QStringLiteral("The server requested unreasonable scrypt cost parameters."), 0, {});
+                    emit loginError(Response::RespClientUpdateRequired, tr(LOGIN_ABORT_UNSAFE_SCRYPT_PARAMS), 0, {});
                     return;
                 }
                 // password_salt may carry a legacy backup salt for pre-challenge clients;
@@ -367,8 +438,7 @@ void RemoteClient::passwordSaltResponse(const Response &response)
                     resp.has_scrypt_salt() ? QString::fromStdString(resp.scrypt_salt()) : passwordSalt;
                 key = PasswordHasher::deriveKey(password, QByteArray::fromBase64(scryptSalt.toUtf8()), n, r, p);
                 if (key.isEmpty()) {
-                    emit loginError(Response::RespClientUpdateRequired, QStringLiteral("Unable to derive verifier."), 0,
-                                    {});
+                    emit loginError(Response::RespClientUpdateRequired, tr(LOGIN_ABORT_VERIFIER_NOT_DERIVED), 0, {});
                     return;
                 }
                 derivedVerifier =
@@ -376,8 +446,8 @@ void RemoteClient::passwordSaltResponse(const Response &response)
             } else if (!storedVerifier.isEmpty()) {
                 const PasswordVerifier verifier = PasswordHasher::parsePasswordVerifier(storedVerifier);
                 if (!verifier.isValid) {
-                    emit loginError(Response::RespClientUpdateRequired, QStringLiteral("Stored verifier is invalid."),
-                                    0, {});
+                    emit loginError(Response::RespClientUpdateRequired, tr(LOGIN_ABORT_STORED_VERIFIER_UNUSABLE), 0,
+                                    {});
                     return;
                 }
                 key = verifier.verifier;
@@ -439,6 +509,23 @@ void RemoteClient::loginResponse(const Response &response)
             emit notifyUserAboutUpdate();
         }
 
+    } else if (response.response_code() == Response::RespPasswordChangeRequired) {
+        // The credentials were accepted: the server keeps this session open and serves
+        // nothing but ping and Command_AccountPassword until the password is replaced.
+        // Treating it as a failed login would disconnect before the dialog that collects
+        // the new password (queued to the UI thread behind this slot) can send anything:
+        // the command would sit in pendingCommands forever, because the ping timer that
+        // times it out stops with the connection. Keep the session and let the controller
+        // report the outcome through accountPasswordResponse().
+        QList<QString> missingFeatures;
+        if (resp.missing_features_size() > 0) {
+            for (int i = 0; i < resp.missing_features_size(); ++i) {
+                missingFeatures << QString::fromStdString(resp.missing_features(i));
+            }
+        }
+        setStatus(StatusPasswordChangeRequired);
+        emit loginError(response.response_code(), QString::fromStdString(resp.denied_reason_str()),
+                        static_cast<quint32>(resp.denied_end_time()), missingFeatures);
     } else if (response.response_code() != Response::RespNotConnected) {
         QList<QString> missingFeatures;
         if (resp.missing_features_size() > 0) {
@@ -446,8 +533,19 @@ void RemoteClient::loginResponse(const Response &response)
                 missingFeatures << QString::fromStdString(resp.missing_features(i));
             }
         }
-        emit loginError(response.response_code(), QString::fromStdString(resp.denied_reason_str()),
-                        static_cast<quint32>(resp.denied_end_time()), missingFeatures);
+
+        QString reasonStr = QString::fromStdString(resp.denied_reason_str());
+        // A strict server reports a login that carried no credential as a missing feature,
+        // because challenge-response needs one. No client update can supply a password, so
+        // report it like the other local aborts instead of advising an update.
+        if (response.response_code() == Response::RespClientUpdateRequired && missingFeatures.size() == 1 &&
+            missingFeatures.first() == "challenge_response_auth" && password.isEmpty() && storedVerifier.isEmpty()) {
+            missingFeatures.clear();
+            reasonStr = tr(LOGIN_ABORT_PASSWORD_MISSING);
+        }
+
+        emit loginError(response.response_code(), reasonStr, static_cast<quint32>(resp.denied_end_time()),
+                        missingFeatures);
         setStatus(StatusDisconnecting);
     }
 }
@@ -496,9 +594,15 @@ void RemoteClient::readData()
 
     inputBuffer.append(data);
 
-    do {
+    // Parse messages straight out of inputBuffer at readOffset. Removing each
+    // consumed message from the front of the buffer would memmove all of the
+    // remaining bytes once per message; instead the consumed prefix is dropped
+    // once parsing stops.
+    qsizetype readOffset = 0;
+
+    while (true) {
         if (!messageInProgress) {
-            if (inputBuffer.size() >= 4) {
+            if (inputBuffer.size() - readOffset >= 4) {
                 // dirty hack to be compatible with v14 server that sends 60 bytes of garbage at the beginning
                 if (!handshakeStarted) {
                     handshakeStarted = true;
@@ -508,29 +612,30 @@ void RemoteClient::readData()
                     }
                 } else {
                     // end of hack
-                    messageLength = (((quint32)(unsigned char)inputBuffer[0]) << 24) +
-                                    (((quint32)(unsigned char)inputBuffer[1]) << 16) +
-                                    (((quint32)(unsigned char)inputBuffer[2]) << 8) +
-                                    ((quint32)(unsigned char)inputBuffer[3]);
-                    inputBuffer.remove(0, 4);
+                    const auto *header = reinterpret_cast<const unsigned char *>(inputBuffer.constData() + readOffset);
+                    messageLength = (static_cast<quint32>(header[0]) << 24) + (static_cast<quint32>(header[1]) << 16) +
+                                    (static_cast<quint32>(header[2]) << 8) + static_cast<quint32>(header[3]);
+                    readOffset += 4;
                     messageInProgress = true;
                 }
             } else {
-                return;
+                break;
             }
         }
-        if (inputBuffer.size() < messageLength) {
-            return;
+        if (inputBuffer.size() - readOffset < messageLength) {
+            break;
         }
 
         ServerMessage newServerMessage;
-        bool ok = newServerMessage.ParseFromArray(inputBuffer.data(), messageLength);
+        bool ok = newServerMessage.ParseFromArray(inputBuffer.constData() + readOffset, messageLength);
 
-        inputBuffer.remove(0, messageLength);
+        readOffset += messageLength;
         messageInProgress = false;
 
         if (ok) {
-            qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+            if (RemoteClientLog().isDebugEnabled()) {
+                qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+            }
 
             processProtocolItem(newServerMessage);
         } else {
@@ -540,7 +645,12 @@ void RemoteClient::readData()
         if (getStatus() == StatusDisconnecting) { // use thread-safe getter
             doDisconnectFromServer();
         }
-    } while (!inputBuffer.isEmpty());
+    }
+
+    // Drop the consumed prefix once, instead of shifting the buffer per message.
+    if (readOffset > 0) {
+        inputBuffer.remove(0, readOffset);
+    }
 }
 
 void RemoteClient::websocketMessageReceived(const QByteArray &message)
@@ -548,7 +658,9 @@ void RemoteClient::websocketMessageReceived(const QByteArray &message)
     lastDataReceived = timeRunning;
     ServerMessage newServerMessage;
     if (newServerMessage.ParseFromArray(message.data(), message.length())) {
-        qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+        if (RemoteClientLog().isDebugEnabled()) {
+            qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+        }
 
         processProtocolItem(newServerMessage);
     } else {
@@ -564,7 +676,9 @@ void RemoteClient::sendCommandContainer(const CommandContainer &cont)
     auto size = static_cast<unsigned int>(cont.ByteSize());
 #endif
 
-    qCDebug(RemoteClientLog).noquote() << "OUT" << getSafeDebugString(cont);
+    if (RemoteClientLog().isDebugEnabled()) {
+        qCDebug(RemoteClientLog).noquote() << "OUT" << getSafeDebugString(cont);
+    }
 
     QByteArray buf;
     bool ok;
@@ -594,6 +708,8 @@ void RemoteClient::sendCommandContainer(const CommandContainer &cont)
 void RemoteClient::connectToHost(const QString &hostname, unsigned int port)
 {
     usingWebSocket = port == 443 || port == 80 || port == 4748 || port == 8080;
+    qCInfo(RemoteClientLog) << "Connecting to server" << hostname << "port" << port
+                            << (usingWebSocket ? "using WebSocket" : "using TCP");
     if (usingWebSocket) {
         QUrl url(QString("%1://%2:%3/servatrice").arg(port == 443 ? "wss" : "ws").arg(hostname).arg(port));
         websocket->open(url);
@@ -821,7 +937,7 @@ void RemoteClient::requestForgotPasswordResponse(const Response &response)
             emit sigPromptForForgotPasswordReset();
         }
     } else {
-        emit sigForgotPasswordError();
+        emit sigForgotPasswordError(response.response_code());
     }
 
     doDisconnectFromServer();
@@ -857,7 +973,7 @@ void RemoteClient::submitForgotPasswordResetResponse(const Response &response)
             derivedVerifier.clear();
         }
     } else {
-        emit sigForgotPasswordError();
+        emit sigForgotPasswordError(response.response_code());
     }
 
     doDisconnectFromServer();
@@ -892,7 +1008,7 @@ void RemoteClient::submitForgotPasswordChallengeResponse(const Response &respons
     if (response.response_code() == Response::RespOk) {
         emit sigPromptForForgotPasswordReset();
     } else {
-        emit sigForgotPasswordError();
+        emit sigForgotPasswordError(response.response_code());
     }
 
     doDisconnectFromServer();
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
index dd91c4c6d..1cf40491c 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
@@ -54,7 +54,7 @@ signals:
     void notifyUserAboutUpdate();
     void sigRequestForgotPasswordToServer(const QString &hostname, unsigned int port, const QString &_userName);
     void sigForgotPasswordSuccess();
-    void sigForgotPasswordError();
+    void sigForgotPasswordError(int responseCode);
     void sigPromptForForgotPasswordReset();
     void sigSubmitForgotPasswordResetToServer(const QString &hostname,
                                               unsigned int port,
@@ -71,6 +71,11 @@ signals:
     //! should only store it for the connection it is currently negotiating, so
     //! the hostname and user name are intentionally not part of the signal.
     void sigPasswordVerifierReady(const QString &verifier);
+    //! \brief Outcome of the password change the server demanded at login.
+    void sigPasswordChangeSuccess();
+    void sigPasswordChangeError(int responseCode);
+    //! \brief Request a password change; queued to the client thread like the other requests.
+    void sigChangePasswordToServer(const QString &oldPassword, const QString &newPassword);
 private slots:
     void slotConnected();
     void readData();
@@ -99,6 +104,8 @@ private slots:
     Command_Login generateCommandLogin();
     void doSubmitPasswordVerifier();
     void submitPasswordVerifierResponse(const Response &response);
+    void accountPasswordResponse(const Response &response);
+    void doChangePasswordToServer(const QString &oldPassword, const QString &newPassword);
     void doDisconnectFromServer();
     void doActivateToServer(const QString &_token);
     void doRequestForgotPasswordToServer(const QString &hostname, unsigned int port, const QString &_userName);
@@ -201,6 +208,10 @@ public:
                                                unsigned int port,
                                                const QString &_userName,
                                                const QString &_email);
+    //! \brief Change the password of the account that just logged in, following the
+    //! server's forced-password-change reply. Emits sigPasswordChangeSuccess or
+    //! sigPasswordChangeError when the server answers.
+    void changePasswordToServer(const QString &oldPassword, const QString &newPassword);
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
index cbb717ad8..b59d61572 100644
--- a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 add_subdirectory(local)
 add_subdirectory(remote)
 
diff --git a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
index 020753d7f..4055efa64 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
@@ -1,14 +1,8 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS local_server.h local_server_interface.h)
 
 set(SOURCES local_server.cpp local_server_interface.cpp)
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
+add_library(libcockatrice_network_server_local STATIC ${HEADERS} ${SOURCES})
 
 add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
 
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
index 2127487d2..181218e1a 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS
     game/dump_zone_range.h
     game/server_abstract_participant.h
@@ -12,6 +8,7 @@ set(HEADERS
     game/server_cardzone.h
     game/server_counter.h
     game/game_config.h
+    game/role_info.h
     game/server_deck_validation_strategy.h
     game/server_game.h
     game/server_game_lifecycle_strategy.h
@@ -29,11 +26,9 @@ set(HEADERS
     serverinfo_user_container.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
   libcockatrice_network_server_remote STATIC
-  ${MOC_SOURCES}
+  ${HEADERS}
   game/dump_zone_range.cpp
   game/server_abstract_participant.cpp
   game/server_abstract_player.cpp
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h b/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h
index baf946632..0661bd2aa 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h
@@ -21,6 +21,7 @@ struct GameConfig
     bool spectatorsSeeEverything = true;
     int startingLifeTotal = 20;
     bool shareDecklistsOnLoad = true;
+    bool shufflePlayers = false;
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/role_info.h b/libcockatrice_network/libcockatrice/network/server/remote/game/role_info.h
new file mode 100644
index 000000000..ef8692361
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/role_info.h
@@ -0,0 +1,13 @@
+#ifndef COCKATRICE_ROLE_INFO_H
+#define COCKATRICE_ROLE_INFO_H
+
+/**
+ * @brief Represents information about a participant's roles.
+ */
+struct RoleInfo
+{
+    bool isJudge = false;     ///< Whether the participant joined as a judge
+    bool isSpectator = false; ///< Whether the participant joined as a spectator
+};
+
+#endif // COCKATRICE_ROLE_INFO_H
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
index 5b8d901bb..dcd14d14c 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
@@ -43,6 +43,7 @@
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_player_order.pb.h>
 #include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
@@ -61,10 +62,10 @@
 Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game,
                                                        int _playerId,
                                                        const ServerInfo_User &_userInfo,
-                                                       bool _judge,
+                                                       const RoleInfo &_roleInfo,
                                                        Server_AbstractUserInterface *_userInterface)
     : ServerInfo_User_Container(_userInfo), game(_game), userInterface(_userInterface), pingTime(0),
-      playerId(_playerId), judge(_judge)
+      playerId(_playerId), roleInfo(_roleInfo)
 {
 }
 
@@ -98,8 +99,8 @@ void Server_AbstractParticipant::getProperties(ServerInfo_PlayerProperties &resu
     if (withUserInfo) {
         copyUserInfo(*(result.mutable_user_info()), true);
     }
-    result.set_spectator(spectator);
-    result.set_judge(judge);
+    result.set_spectator(isSpectator());
+    result.set_judge(isJudge());
     result.set_ping_seconds(pingTime);
     getPlayerProperties(result);
 }
@@ -176,7 +177,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdUnconcede(const Command_Un
 Response::ResponseCode
 Server_AbstractParticipant::cmdJudge(const Command_Judge &cmd, ResponseContainer &rc, GameEventStorage &ges)
 {
-    if (!judge) {
+    if (!isJudge()) {
         return Response::RespFunctionNotAllowed;
     }
 
@@ -204,7 +205,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdReadyStart(const Command_R
 Response::ResponseCode
 Server_AbstractParticipant::cmdGameSay(const Command_GameSay &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges)
 {
-    if (spectator) {
+    if (isSpectator()) {
         /* Spectators can only talk if:
          * (a) the game creator allows it
          * (b) the spectator is a moderator/administrator
@@ -365,7 +366,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdNextTurn(const Command_Nex
         return Response::RespGameNotStarted;
     }
 
-    if (!judge) {
+    if (!isJudge()) {
         return Response::RespFunctionNotAllowed;
     }
 
@@ -381,7 +382,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdSetActivePhase(const Comma
         return Response::RespGameNotStarted;
     }
 
-    if (!judge) {
+    if (!isJudge()) {
         return Response::RespFunctionNotAllowed;
     }
 
@@ -415,8 +416,8 @@ Response::ResponseCode Server_AbstractParticipant::cmdReverseTurn(const Command_
                                                                   ResponseContainer & /*rc*/,
                                                                   GameEventStorage &ges)
 {
-    if (!judge) {
-        if (spectator) {
+    if (!isJudge()) {
+        if (isSpectator()) {
             return Response::RespFunctionNotAllowed;
         }
 
@@ -434,6 +435,33 @@ Response::ResponseCode Server_AbstractParticipant::cmdReverseTurn(const Command_
     return Response::RespOk;
 }
 
+Response::ResponseCode Server_AbstractParticipant::cmdSetPlayerOrder(const Command_SetPlayerOrder &cmd,
+                                                                     ResponseContainer & /*rc*/,
+                                                                     GameEventStorage & /*ges*/)
+{
+    if ((game->getHostId() != playerId) && !(userInfo->user_level() & ServerInfo_User::IsModerator)) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (game->getGameStarted()) {
+        return Response::RespContextError;
+    }
+
+    if (cmd.randomize()) {
+        game->shufflePlayerSeats();
+    } else {
+        QList<QString> playerNames;
+        for (int i = 0; i < cmd.player_names_size(); ++i) {
+            playerNames.append(QString::fromStdString(cmd.player_names(i)));
+        }
+        game->reorderPlayerSeats(playerNames);
+    }
+
+    // Clients learn the new seating from the Event_PlayerOrderChanged that
+    // reseatPlayers broadcasts; no full game state resend is needed for it.
+    return Response::RespOk;
+}
+
 Response::ResponseCode
 Server_AbstractParticipant::processGameCommand(const GameCommand &command, ResponseContainer &rc, GameEventStorage &ges)
 {
@@ -543,6 +571,9 @@ Server_AbstractParticipant::processGameCommand(const GameCommand &command, Respo
         case GameCommand::SET_PLAYMAT:
             return cmdSetPlaymat(command.GetExtension(Command_SetPlaymat::ext), rc, ges);
             break;
+        case GameCommand::SET_PLAYER_ORDER:
+            return cmdSetPlayerOrder(command.GetExtension(Command_SetPlayerOrder::ext), rc, ges);
+            break;
         default:
             return Response::RespInvalidCommand;
     }
@@ -577,7 +608,7 @@ void Server_AbstractParticipant::setUserInterface(Server_AbstractUserInterface *
 void Server_AbstractParticipant::disconnectClient()
 {
     bool isRegistered = userInfo->user_level() & ServerInfo_User::IsRegistered;
-    if (!isRegistered || spectator) {
+    if (!isRegistered || isSpectator()) {
         game->removeParticipant(this, Event_Leave::USER_DISCONNECTED);
     } else {
         setUserInterface(nullptr);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
index 195da9b7f..316b9727c 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
@@ -2,6 +2,7 @@
 #define ABSTRACT_PARTICIPANT_H
 
 #include "../serverinfo_user_container.h"
+#include "role_info.h"
 #include "server_arrowtarget.h"
 
 #include <QMutex>
@@ -52,6 +53,7 @@ class Command_DeckSelect;
 class Command_SetSideboardLock;
 class Command_ChangeZoneProperties;
 class Command_SetPlaymat;
+class Command_SetPlayerOrder;
 
 class Server_AbstractParticipant : public Server_ArrowTarget, public ServerInfo_User_Container
 {
@@ -61,8 +63,7 @@ protected:
     Server_AbstractUserInterface *userInterface;
     int pingTime;
     int playerId;
-    bool spectator;
-    bool judge;
+    RoleInfo roleInfo;
     virtual void getPlayerProperties(ServerInfo_PlayerProperties &result);
     mutable QMutex playerMutex;
 
@@ -70,7 +71,7 @@ public:
     Server_AbstractParticipant(Server_Game *_game,
                                int _playerId,
                                const ServerInfo_User &_userInfo,
-                               bool _judge,
+                               const RoleInfo &_roleInfo,
                                Server_AbstractUserInterface *_handler);
     ~Server_AbstractParticipant() override;
     virtual void prepareDestroy()
@@ -89,13 +90,17 @@ public:
     {
         return playerId;
     }
+    void setPlayerId(int _playerId)
+    {
+        playerId = _playerId;
+    }
     bool isSpectator() const
     {
-        return spectator;
+        return roleInfo.isSpectator;
     }
     bool isJudge() const
     {
-        return judge;
+        return roleInfo.isJudge;
     }
     Server_Game *getGame() const
     {
@@ -173,6 +178,8 @@ public:
     virtual Response::ResponseCode
     cmdReverseTurn(const Command_ReverseTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges);
     virtual Response::ResponseCode
+    cmdSetPlayerOrder(const Command_SetPlayerOrder &cmd, ResponseContainer &rc, GameEventStorage &ges);
+    virtual Response::ResponseCode
     cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd, ResponseContainer &rc, GameEventStorage &ges);
 
     Response::ResponseCode processGameCommand(const GameCommand &command, ResponseContainer &rc, GameEventStorage &ges);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
index c03f1e966..b5a620798 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
@@ -81,10 +81,9 @@ Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
                                              const ServerInfo_User &_userInfo,
                                              bool _judge,
                                              Server_AbstractUserInterface *_userInterface)
-    : Server_AbstractParticipant(_game, _playerId, _userInfo, _judge, _userInterface), conceded(false), deck(nullptr),
-      sideboardLocked(true), readyStart(false), nextCardId(0)
+    : Server_AbstractParticipant(_game, _playerId, _userInfo, {.isJudge = _judge}, _userInterface), conceded(false),
+      deck(nullptr), sideboardLocked(true), readyStart(false), nextCardId(0)
 {
-    spectator = false;
 }
 
 Server_AbstractPlayer::~Server_AbstractPlayer() = default;
@@ -295,7 +294,7 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
 {
     // Disallow controller change to other zones than the table.
     if (((targetzone->getType() != ServerInfo_Zone::PublicZone) || !targetzone->hasCoords()) &&
-        (startzone->getPlayer() != targetzone->getPlayer()) && !judge) {
+        (startzone->getPlayer() != targetzone->getPlayer()) && !isJudge()) {
         return Response::RespContextError;
     }
 
@@ -808,7 +807,7 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine
         return Response::RespNameNotFound;
     }
 
-    if ((startPlayer != this) && (!startZone->getPlayersWithWritePermission().contains(playerId)) && !judge) {
+    if ((startPlayer != this) && (!startZone->getPlayersWithWritePermission().contains(playerId)) && !isJudge()) {
         return Response::RespContextError;
     }
 
@@ -821,7 +820,7 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine
         return Response::RespNameNotFound;
     }
 
-    if ((startPlayer != this) && (targetPlayer != this) && !judge) {
+    if ((startPlayer != this) && (targetPlayer != this) && !isJudge()) {
         return Response::RespContextError;
     }
 
@@ -1598,7 +1597,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
             zone->addWritePermission(cmd.player_id());
         }
 
-        if (judge) {
+        if (isJudge()) {
             ges.setOverwriteOwnership(true);
         }
 
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
index b1863c91e..e2724523e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
@@ -41,6 +41,7 @@
 #include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h"
 #include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
 #include "libcockatrice/protocol/pb/session_event.pb.h"
+#include "role_info.h"
 #include "server_abstract_player.h"
 #include "server_abstractuserinterface.h"
 #include "server_arrow.h"
@@ -72,11 +73,13 @@
 #include <libcockatrice/protocol/pb/event_join.pb.h>
 #include <libcockatrice/protocol/pb/event_kicked.pb.h>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
+#include <libcockatrice/protocol/pb/event_player_order_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
 #include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <qlogging.h>
 #include <qnamespace.h>
@@ -90,8 +93,8 @@ Server_Game::Server_Game(const GameConfig &config, Server_Room *_room)
       spectatorsAllowed(config.spectatorsAllowed), spectatorsNeedPassword(config.spectatorsNeedPassword),
       spectatorsCanTalk(config.spectatorsCanTalk), spectatorsSeeEverything(config.spectatorsSeeEverything),
       startingLifeTotal(config.startingLifeTotal), shareDecklistsOnLoad(config.shareDecklistsOnLoad),
-      inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0), firstGameStarted(false),
-      turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
+      shufflePlayers(config.shufflePlayers), inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0),
+      firstGameStarted(false), turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
       deckValidationStrategy(new Server_DefaultDeckValidationStrategy),
       lifecycleStrategy(new Server_DefaultLifecycleStrategy), matchResultStrategy(new Server_NullMatchResultStrategy),
       gameMutex()
@@ -291,6 +294,32 @@ int Server_Game::getSpectatorCount() const
     return result;
 }
 
+QList<Server_AbstractParticipant *> Server_Game::getParticipantsInSeatOrder() const
+{
+    // Players in seat order first (fall back to id order for seats predating
+    // seatOrder), then spectators. Player ids are stable; only the ordering
+    // changes on shuffle/reorder.
+    QList<Server_AbstractParticipant *> ordered;
+    ordered.reserve(participants.size());
+    for (int id : seatOrder) {
+        auto *participant = participants.value(id, nullptr);
+        if (participant && !participant->isSpectator() && !ordered.contains(participant)) {
+            ordered.append(participant);
+        }
+    }
+    for (auto *participant : participants.values()) {
+        if (!participant->isSpectator() && !ordered.contains(participant)) {
+            ordered.append(participant);
+        }
+    }
+    for (auto *participant : participants.values()) {
+        if (participant->isSpectator()) {
+            ordered.append(participant);
+        }
+    }
+    return ordered;
+}
+
 void Server_Game::createGameStateChangedEvent(Event_GameStateChanged *event,
                                               Server_AbstractParticipant *recipient,
                                               bool omniscient,
@@ -305,16 +334,24 @@ void Server_Game::createGameStateChangedEvent(Event_GameStateChanged *event,
         event->set_game_started(false);
     }
 
-    for (Server_AbstractParticipant *participant : participants.values()) {
+    // Emit the player list in seat order so every client (including old ones
+    // that ignore Event_PlayerOrderChanged) sees the current seating. Player
+    // ids are stable; only this ordering changes on shuffle/reorder.
+    QList<Server_AbstractParticipant *> ordered = getParticipantsInSeatOrder();
+    for (Server_AbstractParticipant *participant : ordered) {
         participant->getInfo(event->add_player_list(), recipient, omniscient, withUserInfo);
     }
+
+    if (recipient != nullptr) {
+        event->set_local_player_id(recipient->getPlayerId());
+    }
 }
 
 void Server_Game::sendGameStateToPlayers()
 {
     // game state information for replay and omniscient spectators
     Event_GameStateChanged omniscientEvent;
-    createGameStateChangedEvent(&omniscientEvent, nullptr, true, false);
+    createGameStateChangedEvent(&omniscientEvent, nullptr, true, true);
 
     GameEventContainer *replayCont = prepareGameEvent(omniscientEvent, -1);
     replayCont->set_seconds_elapsed(secondsElapsed - startTimeOfThisGame);
@@ -326,7 +363,7 @@ void Server_Game::sendGameStateToPlayers()
     // the data we used for the replay. All spectators are equal, so we don't need to make a createGameStateChangedEvent
     // call for each one.
     Event_GameStateChanged spectatorNormalEvent;
-    createGameStateChangedEvent(&spectatorNormalEvent, nullptr, false, false);
+    createGameStateChangedEvent(&spectatorNormalEvent, nullptr, false, true);
 
     // send game state info to clients according to their role in the game
     for (auto *participant : participants.values()) {
@@ -339,7 +376,7 @@ void Server_Game::sendGameStateToPlayers()
             }
         } else {
             Event_GameStateChanged event;
-            createGameStateChangedEvent(&event, participant, participant->isJudge(), false);
+            createGameStateChangedEvent(&event, participant, participant->isJudge(), true);
 
             gec = prepareGameEvent(event, -1);
         }
@@ -379,6 +416,11 @@ void Server_Game::doStartGameIfReady(bool forceStartGame)
         return;
     }
 
+    if (shufflePlayers && players.size() > 1) {
+        shufflePlayerSeats();
+        players = getPlayers();
+    }
+
     for (Server_AbstractPlayer *player : players.values()) {
         player->setupZones();
     }
@@ -432,6 +474,116 @@ void Server_Game::startGameIfReady(bool forceStartGame)
     emit sigStartGameIfReady(forceStartGame);
 }
 
+void Server_Game::shufflePlayerSeats()
+{
+    QMutexLocker locker(&gameMutex);
+
+    // Collect players in current seat order (fall back to id order for seats
+    // predating seatOrder). Spectators keep their seats.
+    QList<Server_AbstractParticipant *> players;
+    for (int id : seatOrder) {
+        auto *participant = participants.value(id, nullptr);
+        if (participant && !participant->isSpectator()) {
+            players.append(participant);
+        }
+    }
+    for (auto *participant : participants.values()) {
+        if (!participant->isSpectator() && !players.contains(participant)) {
+            players.append(participant);
+        }
+    }
+    QList<Server_AbstractParticipant *> spectators;
+    for (auto *participant : participants.values()) {
+        if (participant->isSpectator()) {
+            spectators.append(participant);
+        }
+    }
+
+    // Fisher-Yates shuffle of the players.
+    QList<Server_AbstractParticipant *> shuffledPlayers;
+    while (!players.isEmpty()) {
+        const int index = rng->rand(0, players.size() - 1);
+        shuffledPlayers.append(players.takeAt(index));
+    }
+
+    reseatPlayers(shuffledPlayers + spectators, true);
+}
+
+void Server_Game::reorderPlayerSeats(const QList<QString> &orderedNames)
+{
+    QMutexLocker locker(&gameMutex);
+
+    // Collect players in current seat order (fall back to id order for seats
+    // predating seatOrder). Spectators keep their seats.
+    QList<Server_AbstractParticipant *> players;
+    for (int id : seatOrder) {
+        auto *participant = participants.value(id, nullptr);
+        if (participant && !participant->isSpectator()) {
+            players.append(participant);
+        }
+    }
+    for (auto *participant : participants.values()) {
+        if (!participant->isSpectator() && !players.contains(participant)) {
+            players.append(participant);
+        }
+    }
+    QList<Server_AbstractParticipant *> spectators;
+    for (auto *participant : participants.values()) {
+        if (participant->isSpectator()) {
+            spectators.append(participant);
+        }
+    }
+
+    // Order the players according to the given names, appending any player that
+    // was not listed (should not happen) in their current seat order.
+    QList<Server_AbstractParticipant *> orderedPlayers;
+    QSet<Server_AbstractParticipant *> placed;
+    for (const QString &name : orderedNames) {
+        for (auto *participant : players) {
+            if (!placed.contains(participant) && (QString::fromStdString(participant->getUserInfo()->name()) == name)) {
+                orderedPlayers.append(participant);
+                placed.insert(participant);
+                break;
+            }
+        }
+    }
+    for (auto *participant : players) {
+        if (!placed.contains(participant)) {
+            orderedPlayers.append(participant);
+        }
+    }
+
+    reseatPlayers(orderedPlayers + spectators, false);
+}
+
+void Server_Game::reseatPlayers(const QList<Server_AbstractParticipant *> &orderedParticipants, bool randomized)
+{
+    QMutexLocker locker(&gameMutex);
+
+    // Keep player ids stable and only reorder the seating/turn order. Changing
+    // ids would break old clients (stale localPlayerId from Event_GameJoined
+    // duplicates their own seat as an opponent), invalidate the home-server
+    // per-user game/seat mapping used for ISL command routing, and orphan the
+    // host id. All of those maps stay valid because ids never change here.
+    // The current host therefore keeps its id and needs no re-key tracking.
+    seatOrder.clear();
+    for (auto *participant : orderedParticipants) {
+        if (!participant->isSpectator()) {
+            seatOrder.append(participant->getPlayerId());
+        }
+    }
+
+    // Broadcast the new seating order so that every client can display it.
+    Event_PlayerOrderChanged event;
+    for (auto *participant : orderedParticipants) {
+        if (!participant->isSpectator()) {
+            event.add_player_names(QString::fromStdString(participant->getUserInfo()->name()).toStdString());
+        }
+    }
+    event.set_randomized(randomized);
+    sendGameEventContainer(prepareGameEvent(event, -1));
+}
+
 void Server_Game::stopGameIfFinished()
 {
     QMutexLocker locker(&gameMutex);
@@ -479,9 +631,8 @@ void Server_Game::stopGameIfFinished()
 
 Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user,
                                               const QString &_password,
-                                              bool spectator,
-                                              bool overrideRestrictions,
-                                              bool asJudge)
+                                              const RoleInfo &roleInfo,
+                                              bool overrideRestrictions)
 {
     Server_DatabaseInterface *databaseInterface = room->getServer()->getDatabaseInterface();
     for (auto *participant : participants.values()) {
@@ -490,11 +641,11 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user,
         }
     }
 
-    if (asJudge && !(user->user_level() & ServerInfo_User::IsJudge)) {
+    if (roleInfo.isJudge && !(user->user_level() & ServerInfo_User::IsJudge)) {
         return Response::RespUserLevelTooLow;
     }
     if (!(overrideRestrictions && (user->user_level() & (ServerInfo_User::IsModerator | ServerInfo_User::IsJudge)))) {
-        if ((_password != password) && !(spectator && !spectatorsNeedPassword)) {
+        if ((_password != password) && !(roleInfo.isSpectator && !spectatorsNeedPassword)) {
             return Response::RespWrongPassword;
         }
         if (!(user->user_level() & ServerInfo_User::IsRegistered) && onlyRegistered) {
@@ -510,13 +661,13 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user,
                                               QString::fromStdString(user->name()))) {
             return Response::RespInIgnoreList;
         }
-        if (spectator) {
+        if (roleInfo.isSpectator) {
             if (!spectatorsAllowed) {
                 return Response::RespSpectatorsNotAllowed;
             }
         }
     }
-    if (!spectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) {
+    if (!roleInfo.isSpectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) {
         return Response::RespGameFull;
     }
 
@@ -537,19 +688,18 @@ bool Server_Game::containsUser(const QString &userName) const
 
 void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
                             ResponseContainer &rc,
-                            bool spectator,
-                            bool judge,
+                            const RoleInfo &roleInfo,
                             bool broadcastUpdate)
 {
     QMutexLocker locker(&gameMutex);
 
     Server_AbstractParticipant *newParticipant;
-    if (spectator) {
+    if (roleInfo.isSpectator) {
         newParticipant = new Server_Spectator(this, nextPlayerId++, userInterface->copyUserInfo(true, true, true),
-                                              judge, userInterface);
+                                              roleInfo.isJudge, userInterface);
     } else {
-        newParticipant = new Server_Player(this, nextPlayerId++, userInterface->copyUserInfo(true, true, true), judge,
-                                           userInterface);
+        newParticipant = new Server_Player(this, nextPlayerId++, userInterface->copyUserInfo(true, true, true),
+                                           roleInfo.isJudge, userInterface);
     }
 
     newParticipant->moveToThread(thread());
@@ -560,10 +710,11 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
 
     const QString playerName = QString::fromStdString(newParticipant->getUserInfo()->name());
     participants.insert(newParticipant->getPlayerId(), newParticipant);
-    if (spectator) {
+    if (roleInfo.isSpectator) {
         allSpectatorsEver.insert(playerName);
     } else {
         allPlayersEver.insert(playerName);
+        seatOrder.append(newParticipant->getPlayerId());
 
         // if the original creator of the game joins, give them host status back
         //! \todo Transferring host to spectators has side effects.
@@ -579,7 +730,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
         emit gameInfoChanged(gameInfo);
     }
 
-    if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !spectator) {
+    if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !roleInfo.isSpectator) {
         room->getServer()->addPersistentPlayer(playerName, room->getId(), gameId, newParticipant->getPlayerId());
     }
 
@@ -593,6 +744,7 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
     room->getServer()->removePersistentPlayer(QString::fromStdString(participant->getUserInfo()->name()), room->getId(),
                                               gameId, participant->getPlayerId());
     participants.remove(participant->getPlayerId());
+    seatOrder.removeAll(participant->getPlayerId());
 
     bool spectator = participant->isSpectator();
     GameEventStorage ges;
@@ -612,10 +764,20 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
     participant->prepareDestroy();
 
     if (playerHost) {
+        // Pass host to the next player in seat order so the game always keeps
+        // a host while players remain.
         int newHostId = -1;
-        for (auto *otherPlayer : getPlayers().values()) {
-            newHostId = otherPlayer->getPlayerId();
-            break;
+        for (int id : seatOrder) {
+            if (participants.contains(id)) {
+                newHostId = id;
+                break;
+            }
+        }
+        if (newHostId == -1) {
+            for (auto *otherPlayer : getPlayers().values()) {
+                newHostId = otherPlayer->getPlayerId();
+                break;
+            }
         }
         if (newHostId != -1) {
             hostId = newHostId;
@@ -772,7 +934,20 @@ void Server_Game::nextTurn()
     }
 
     auto players = getPlayers();
-    const QList<int> keys = players.keys();
+    // Advance in seat order, not id order, so shuffles/reorders change the
+    // turn sequence while ids stay stable.
+    QList<int> keys;
+    keys.reserve(players.size());
+    for (int id : seatOrder) {
+        if (players.contains(id)) {
+            keys.append(id);
+        }
+    }
+    for (int id : players.keys()) {
+        if (!keys.contains(id)) {
+            keys.append(id);
+        }
+    }
     int listPos = -1;
     if (activePlayer != -1) {
         listPos = keys.indexOf(activePlayer);
@@ -822,7 +997,7 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     event2.set_active_phase(activePhase);
 
     bool omniscient = (joiningParticipant->isSpectator() && spectatorsSeeEverything) || joiningParticipant->isJudge();
-    for (auto *participant : participants.values()) {
+    for (auto *participant : getParticipantsInSeatOrder()) {
         participant->getInfo(event2.add_player_list(), joiningParticipant, omniscient, true);
     }
 
@@ -871,6 +1046,13 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     }
 }
 
+bool Server_Game::canSeePrivateEventsFor(const Server_AbstractParticipant *participant, int privatePlayerId) const
+{
+    return participant->getPlayerId() == privatePlayerId               // same player
+           || participant->isJudge()                                   // judges see everything
+           || (participant->isSpectator() && spectatorsSeeEverything); // spectators see everything
+}
+
 void Server_Game::sendGameEventContainer(GameEventContainer *cont,
                                          GameEventStorageItem::EventRecipients recipients,
                                          int privatePlayerId)
@@ -879,8 +1061,7 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont,
 
     cont->set_game_id(gameId);
     for (auto *participant : participants.values()) {
-        const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) || participant->isJudge() ||
-                                   (participant->isSpectator() && spectatorsSeeEverything);
+        const bool playerPrivate = canSeePrivateEventsFor(participant, privatePlayerId);
         if ((recipients.testFlag(GameEventStorageItem::SendToPrivate) && playerPrivate) ||
             (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate)) {
             participant->sendGameEvent(*cont);
@@ -945,6 +1126,7 @@ void Server_Game::getInfo(ServerInfo_Game &result) const
         result.set_spectators_can_chat(spectatorsCanTalk);
         result.set_spectators_omniscient(spectatorsSeeEverything);
         result.set_share_decklists_on_load(shareDecklistsOnLoad);
+        result.set_shuffle_players(shufflePlayers);
         result.set_spectators_count(getSpectatorCount());
         result.set_start_time(startTime.toSecsSinceEpoch());
     }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
index c7f8d0929..23ba96598 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
@@ -62,6 +62,7 @@ class Message;
 } // namespace protobuf
 } // namespace google
 struct GameConfig;
+struct RoleInfo;
 
 class Server_Game : public QObject
 {
@@ -73,6 +74,11 @@ private:
     int hostId;
     ServerInfo_User *creatorInfo;
     QMap<int, Server_AbstractParticipant *> participants;
+    // Seating/turn order as an ordered list of player ids. Player ids themselves
+    // are stable for the lifetime of the participant; shuffling or reordering
+    // only permutes this list so old clients, ISL routes and persistent
+    // references (all keyed by player id) keep working.
+    QList<int> seatOrder;
     QSet<QString> allPlayersEver, allSpectatorsEver;
     bool gameStarted;
     bool gameClosed;
@@ -89,6 +95,7 @@ private:
     bool spectatorsSeeEverything;
     int startingLifeTotal;
     bool shareDecklistsOnLoad;
+    bool shufflePlayers;
     int inactivityCounter;
     int startTimeOfThisGame, secondsElapsed;
     bool firstGameStarted;
@@ -108,7 +115,10 @@ private:
                                      Server_AbstractParticipant *recipient,
                                      bool omniscient,
                                      bool withUserInfo);
+    QList<Server_AbstractParticipant *> getParticipantsInSeatOrder() const;
+    void reseatPlayers(const QList<Server_AbstractParticipant *> &orderedParticipants, bool randomized);
     void storeGameInformation();
+    bool canSeePrivateEventsFor(const Server_AbstractParticipant *participant, int privatePlayerId) const;
 signals:
     void sigStartGameIfReady(bool override);
     void gameInfoChanged(ServerInfo_Game gameInfo);
@@ -147,6 +157,10 @@ public:
     {
         return participants;
     }
+    QList<int> getSeatOrder() const
+    {
+        return seatOrder;
+    }
     int getGameId() const
     {
         return gameId;
@@ -187,13 +201,16 @@ public:
     {
         return shareDecklistsOnLoad;
     }
+    bool getShufflePlayers() const
+    {
+        return shufflePlayers;
+    }
     Response::ResponseCode
-    checkJoin(ServerInfo_User *user, const QString &_password, bool spectator, bool overrideRestrictions, bool asJudge);
+    checkJoin(ServerInfo_User *user, const QString &_password, const RoleInfo &roleInfo, bool overrideRestrictions);
     bool containsUser(const QString &userName) const;
     void addPlayer(Server_AbstractUserInterface *userInterface,
                    ResponseContainer &rc,
-                   bool spectator,
-                   bool judge,
+                   const RoleInfo &roleInfo,
                    bool broadcastUpdate = true);
     void removeParticipant(Server_AbstractParticipant *participant, Event_Leave::LeaveReason reason);
     void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_AbstractPlayer *player);
@@ -201,6 +218,8 @@ public:
     bool kickParticipant(int playerId);
     void startGameIfReady(bool forceStartGame);
     void stopGameIfFinished();
+    void shufflePlayerSeats();
+    void reorderPlayerSeats(const QList<QString> &orderedNames);
     int getActivePlayer() const
     {
         return activePlayer;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
index 949d04b4b..b40dae09b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -573,7 +573,7 @@ Server_Player::cmdNextTurn(const Command_NextTurn & /*cmd*/, ResponseContainer &
         return Response::RespGameNotStarted;
     }
 
-    if (conceded && !judge) {
+    if (conceded && !isJudge()) {
         return Response::RespContextError;
     }
 
@@ -589,7 +589,7 @@ Response::ResponseCode Server_Player::cmdSetActivePhase(const Command_SetActiveP
         return Response::RespGameNotStarted;
     }
 
-    if (!judge) {
+    if (!isJudge()) {
         if (conceded) {
             return Response::RespContextError;
         }
@@ -623,7 +623,7 @@ Response::ResponseCode
 Server_Player::cmdReverseTurn(const Command_ReverseTurn &cmd, ResponseContainer &rc, GameEventStorage &ges)
 {
 
-    if (!judge && conceded) {
+    if (!isJudge() && conceded) {
         return Response::RespContextError;
     }
     return Server_AbstractParticipant::cmdReverseTurn(cmd, rc, ges);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
index d1c369949..164a4af5e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
@@ -11,7 +11,6 @@ Server_Spectator::Server_Spectator(Server_Game *_game,
                                    const ServerInfo_User &_userInfo,
                                    bool _judge,
                                    Server_AbstractUserInterface *_userInterface)
-    : Server_AbstractParticipant(_game, _playerId, _userInfo, _judge, _userInterface)
+    : Server_AbstractParticipant(_game, _playerId, _userInfo, {.isJudge = _judge, .isSpectator = true}, _userInterface)
 {
-    spectator = true;
 }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
index 63989bbfa..8ea2cd993 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -131,6 +131,16 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session,
         return authState;
     }
 
+    if (authState == PasswordChangeRequired) {
+        // The credentials were right, but the account must choose a new password before it may
+        // use the server. Give the session an identity so it can complete that change, without
+        // registering a user session or announcing the user as logged in.
+        ServerInfo_User pendingData = databaseInterface->getUserData(name, true);
+        pendingData.set_address(session->getAddress().toStdString());
+        session->setUserInfo(pendingData);
+        return authState;
+    }
+
     ServerInfo_User data = databaseInterface->getUserData(name, true);
     data.set_address(session->getAddress().toStdString());
     name = QString::fromStdString(data.name()); // Compensate for case indifference
@@ -296,7 +306,9 @@ void Server::removeClient(Server_ProtocolHandler *client)
     QWriteLocker locker(&clientsLock);
     clients.removeAt(clientIndex);
     ServerInfo_User *data = client->getUserInfo();
-    if (data) {
+    // A session that never completed login (for example one that still owes a password change)
+    // has no session id: it was never announced as joined, so it must not be announced as leaving.
+    if (data && data->has_session_id()) {
         Event_UserLeft event;
         event.set_name(data->name());
         SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
@@ -311,12 +323,10 @@ void Server::removeClient(Server_ProtocolHandler *client)
         users.remove(QString::fromStdString(data->name()));
         qDebug() << "Server::removeClient: name=" << QString::fromStdString(data->name());
 
-        if (data->has_session_id()) {
-            const qint64 sessionId = data->session_id();
-            usersBySessionId.remove(sessionId);
-            emit endSession(sessionId);
-            qDebug() << "closed session id:" << sessionId;
-        }
+        const qint64 sessionId = data->session_id();
+        usersBySessionId.remove(sessionId);
+        emit endSession(sessionId);
+        qDebug() << "closed session id:" << sessionId;
     }
     qDebug() << "Server::removeClient: removed" << (void *)client << ";" << clients.size() << "clients; "
              << users.size() << "users left";
@@ -330,7 +340,9 @@ QList<QString> Server::getOnlineModeratorList() const
         ServerInfo_User *data = client->getUserInfo();
 
         //! \todo This line should be updated in the event there is any type of new user level created.
-        if (data &&
+        // A session that still owes a forced password change has user info but no session id:
+        // it never joined, so it must not be reported as an online moderator either.
+        if (data && data->has_session_id() &&
             (data->user_level() & ServerInfo_User::IsModerator || data->user_level() & ServerInfo_User::IsAdmin)) {
             results << QString::fromStdString(data->name()).simplified();
         }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
index 25aa415fc..c3524bb93 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
@@ -84,6 +84,18 @@ void Server_AbstractUserInterface::onLogin(ResponseContainer &)
 {
 }
 
+bool Server_AbstractUserInterface::getGameInfo(int gameId, int &roomId, int &playerId) const
+{
+    QMutexLocker locker(&gameListMutex);
+    const auto it = games.constFind(gameId);
+    if (it == games.constEnd()) {
+        return false;
+    }
+    roomId = it.value().first;
+    playerId = it.value().second;
+    return true;
+}
+
 void Server_AbstractUserInterface::playerRemovedFromGame(Server_Game *game)
 {
     qDebug() << "Server_AbstractUserInterface::playerRemovedFromGame(): gameId =" << game->getGameId();
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
index a19475e34..a2a4ed8c7 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
@@ -58,6 +58,13 @@ public:
         return games;
     }
 
+    /**
+     * @brief Looks up the room and player id of one game without copying the game list.
+     *
+     * @return True if the game is known; otherwise false and the outputs are untouched.
+     */
+    bool getGameInfo(int gameId, int &roomId, int &playerId) const;
+
     virtual void sendProtocolItem(const Response &item) = 0;
     virtual void sendProtocolItem(const SessionEvent &item) = 0;
     virtual void sendProtocolItem(const GameEventContainer &item) = 0;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index eb2b2fc1c..78b9d955f 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -64,8 +64,9 @@ Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,
                                                Server_DatabaseInterface *_databaseInterface,
                                                QObject *parent)
     : QObject(parent), Server_AbstractUserInterface(_server), deleted(false), databaseInterface(_databaseInterface),
-      authState(NotLoggedIn), usingRealPassword(false), acceptsUserListChanges(false), acceptsRoomListChanges(false),
-      idleClientWarningSent(false), timeRunning(0), lastDataReceived(0), lastActionReceived(0)
+      authState(NotLoggedIn), usingRealPassword(false), passwordChangePending(false), acceptsUserListChanges(false),
+      acceptsRoomListChanges(false), idleClientWarningSent(false), timeRunning(0), lastDataReceived(0),
+      lastActionReceived(0)
 
 {
     connect(server, &Server::pingClockTimeout, this, &Server_ProtocolHandler::pingClockTimeout);
@@ -208,11 +209,14 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co
         Response::ResponseCode resp = Response::RespInvalidCommand;
         const SessionCommand &sc = cont.session_command(i);
         const int num = getPbExtension(sc);
-        if (num != SessionCommand::PING) { // don't log ping commands
+        if (num != SessionCommand::PING && logsDebugMessages()) { // don't log ping commands
             logDebugMessage(getSafeDebugString(sc));
         }
         const auto commandType = static_cast<SessionCommand::SessionCommandType>(num);
-        if (authState == NotLoggedIn && !isPreAuthSessionCommand(commandType)) {
+        if (passwordChangePending && commandType != SessionCommand::PING &&
+            commandType != SessionCommand::ACCOUNT_PASSWORD) {
+            resp = Response::RespFunctionNotAllowed;
+        } else if (authState == NotLoggedIn && !isPreAuthSessionCommand(commandType)) {
             resp = Response::RespLoginNeeded;
         } else {
             switch (commandType) {
@@ -271,7 +275,9 @@ Response::ResponseCode Server_ProtocolHandler::processRoomCommandContainer(const
         Response::ResponseCode resp = Response::RespInvalidCommand;
         const RoomCommand &sc = cont.room_command(i);
         const int num = getPbExtension(sc);
-        logDebugMessage(getSafeDebugString(sc));
+        if (logsDebugMessages()) {
+            logDebugMessage(getSafeDebugString(sc));
+        }
         switch ((RoomCommand::RoomCommandType)num) {
             case RoomCommand::LEAVE_ROOM:
                 resp = cmdLeaveRoom(sc.GetExtension(Command_LeaveRoom::ext), room, rc);
@@ -320,14 +326,14 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
         return Response::RespLoginNeeded;
     }
 
-    QMap<int, QPair<int, int>> gameMap = getGames();
-    if (!gameMap.contains(cont.game_id())) {
+    int roomId;
+    int playerId;
+    if (!getGameInfo(cont.game_id(), roomId, playerId)) {
         return Response::RespNotInRoom;
     }
-    const QPair<int, int> roomIdAndPlayerId = gameMap.value(cont.game_id());
 
     QReadLocker roomsLocker(&server->roomsLock);
-    Server_Room *room = server->getRooms().value(roomIdAndPlayerId.first);
+    Server_Room *room = server->getRooms().value(roomId);
     if (!room) {
         return Response::RespNotInRoom;
     }
@@ -337,14 +343,14 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
     if (!game) {
         if (room->getExternalGames().contains(cont.game_id())) {
             server->sendIsl_GameCommand(cont, room->getExternalGames().value(cont.game_id()).server_id(),
-                                        userInfo->session_id(), roomIdAndPlayerId.first, roomIdAndPlayerId.second);
+                                        userInfo->session_id(), roomId, playerId);
             return Response::RespNothing;
         }
         return Response::RespNotInRoom;
     }
 
     QMutexLocker gameLocker(&game->gameMutex);
-    auto *participant = game->getParticipants().value(roomIdAndPlayerId.second);
+    auto *participant = game->getParticipants().value(playerId);
     if (!participant) {
         return Response::RespNotInRoom;
     }
@@ -357,8 +363,9 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
     Response::ResponseCode finalResponseCode = Response::RespOk;
     for (int i = cont.game_command_size() - 1; i >= 0; --i) {
         const GameCommand &sc = cont.game_command(i);
-        logDebugMessage(QString("game %1 player %2: ").arg(cont.game_id()).arg(roomIdAndPlayerId.second) +
-                        getSafeDebugString(sc));
+        if (logsDebugMessages()) {
+            logDebugMessage(QString("game %1 player %2: ").arg(cont.game_id()).arg(playerId) + getSafeDebugString(sc));
+        }
 
         if (commandCountingInterval > 0) {
             int totalCount = 0;
@@ -407,7 +414,9 @@ Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer(
         Response::ResponseCode resp = Response::RespInvalidCommand;
         const ModeratorCommand &sc = cont.moderator_command(i);
         const int num = getPbExtension(sc);
-        logDebugMessage(getSafeDebugString(sc));
+        if (logsDebugMessages()) {
+            logDebugMessage(getSafeDebugString(sc));
+        }
 
         resp = processExtendedModeratorCommand(num, sc, rc);
         if (resp != Response::RespOk) {
@@ -434,7 +443,9 @@ Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(cons
         Response::ResponseCode resp = Response::RespInvalidCommand;
         const AdminCommand &sc = cont.admin_command(i);
         const int num = getPbExtension(sc);
-        logDebugMessage(getSafeDebugString(sc));
+        if (logsDebugMessages()) {
+            logDebugMessage(getSafeDebugString(sc));
+        }
 
         resp = processExtendedAdminCommand(num, sc, rc);
         if (resp != Response::RespOk) {
@@ -461,7 +472,9 @@ Response::ResponseCode Server_ProtocolHandler::processDeveloperCommandContainer(
         Response::ResponseCode resp = Response::RespInvalidCommand;
         const DeveloperCommand &sc = cont.developer_command(i);
         const int num = getPbExtension(sc);
-        logDebugMessage(getSafeDebugString(sc));
+        if (logsDebugMessages()) {
+            logDebugMessage(getSafeDebugString(sc));
+        }
 
         resp = processExtendedDeveloperCommand(num, sc, rc);
         if (resp != Response::RespOk) {
@@ -480,6 +493,19 @@ void Server_ProtocolHandler::processCommandContainer(const CommandContainer &con
 
     lastDataReceived = timeRunning;
 
+    // A session that still owes a forced password change may only reach the session family,
+    // where processSessionCommandContainer narrows it further to ping and the change itself.
+    // Every other family is rejected here, including a container that also carries a session
+    // command: the dispatch below prefers game/room over session, so testing only for the
+    // absence of a session command would let such a container through.
+    if (passwordChangePending &&
+        (cont.game_command_size() || cont.room_command_size() || cont.moderator_command_size() ||
+         cont.admin_command_size() || cont.developer_command_size())) {
+        sendResponseContainer(ResponseContainer(cont.has_cmd_id() ? cont.cmd_id() : -1),
+                              Response::RespFunctionNotAllowed);
+        return;
+    }
+
     ResponseContainer responseContainer(cont.has_cmd_id() ? cont.cmd_id() : -1);
     Response::ResponseCode finalResponseCode;
 
@@ -687,6 +713,11 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
             server->recordFailedLogin(getAddress(), userName);
             return Response::RespAccountNotActivated;
         case PasswordChangeRequired:
+            // The credentials were right, but the account must choose a new password first.
+            // Keep the session authenticated just far enough for the client to do that:
+            // processCommandContainer refuses everything except the change itself.
+            authState = PasswordRight;
+            passwordChangePending = true;
             return Response::RespPasswordChangeRequired;
         default:
             server->clearFailedLogins(getAddress(), userName);
@@ -1085,6 +1116,7 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
     int startingLifeTotal = cmd.has_starting_life_total() ? cmd.starting_life_total() : 20;
 
     bool shareDecklistsOnLoad = cmd.has_share_decklists_on_load() ? cmd.share_decklists_on_load() : false;
+    bool shufflePlayers = cmd.has_shuffle_players() ? cmd.shuffle_players() : false;
 
     const int gameId = databaseInterface->getNextGameId();
     if (gameId == -1) {
@@ -1106,11 +1138,13 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
                       .spectatorsCanTalk = cmd.spectators_can_talk(),
                       .spectatorsSeeEverything = cmd.spectators_see_everything(),
                       .startingLifeTotal = startingLifeTotal,
-                      .shareDecklistsOnLoad = shareDecklistsOnLoad};
+                      .shareDecklistsOnLoad = shareDecklistsOnLoad,
+                      .shufflePlayers = shufflePlayers};
 
     auto *game = new Server_Game(config, room);
 
-    game->addPlayer(this, rc, asSpectator, asJudge, false);
+    RoleInfo roleInfo{.isJudge = asJudge, .isSpectator = asSpectator};
+    game->addPlayer(this, rc, roleInfo, false);
     room->addGame(game);
 
     return Response::RespOk;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
index c0a1ffe9a..8ce110354 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
@@ -46,6 +46,12 @@ protected:
     Server_DatabaseInterface *databaseInterface;
     AuthenticationResult authState;
     bool usingRealPassword;
+    /**
+     * @brief True when the credentials were right but the account must choose a new password
+     *        before it may use the server. Only ping, the password change and disconnecting
+     *        are served while this is set.
+     */
+    bool passwordChangePending;
     bool acceptsUserListChanges;
     bool acceptsRoomListChanges;
     bool idleClientWarningSent;
@@ -55,6 +61,17 @@ protected:
     virtual void logDebugMessage(const QString & /* message */)
     {
     }
+    /**
+     * @brief Whether debug messages produced by this handler are actually written anywhere.
+     *
+     * Formatting a protocol message for the log is expensive, so callers only
+     * build the debug string when this returns true. The base handler has no
+     * log destination and therefore never needs one.
+     */
+    [[nodiscard]] virtual bool logsDebugMessages() const
+    {
+        return false;
+    }
 
 private:
     QList<int> messageSizeOverTime, messageCountOverTime, commandCountOverTime;
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
index 68b137cd4..78ef2b289 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
@@ -1,5 +1,6 @@
 #include "server_room.h"
 
+#include "game/role_info.h"
 #include "game/server_game.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 #include "libcockatrice/protocol/pb/room_event.pb.h"
@@ -372,11 +373,11 @@ Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGam
 
     QMutexLocker gameLocker(&game->gameMutex);
 
-    Response::ResponseCode result =
-        game->checkJoin(userInterface->getUserInfo(), QString::fromStdString(cmd.password()), cmd.spectator(),
-                        cmd.override_restrictions(), cmd.join_as_judge());
+    RoleInfo roleInfo{.isJudge = cmd.join_as_judge(), .isSpectator = cmd.spectator()};
+    Response::ResponseCode result = game->checkJoin(
+        userInterface->getUserInfo(), QString::fromStdString(cmd.password()), roleInfo, cmd.override_restrictions());
     if (result == Response::RespOk) {
-        game->addPlayer(userInterface, rc, cmd.spectator(), cmd.join_as_judge());
+        game->addPlayer(userInterface, rc, roleInfo);
     }
 
     return result;
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
index bd0b5bda2..5fba2631d 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
@@ -66,6 +66,7 @@ set(PROTO_FILES
     command_set_card_attr.proto
     command_set_card_counter.proto
     command_set_counter.proto
+    command_set_player_order.proto
     command_set_playmat.proto
     command_set_sideboard_lock.proto
     command_set_sideboard_plan.proto
@@ -110,6 +111,7 @@ set(PROTO_FILES
     event_list_rooms.proto
     event_move_card.proto
     event_notify_user.proto
+    event_player_order_changed.proto
     event_player_properties_changed.proto
     event_remove_from_list.proto
     event_remove_messages.proto
@@ -174,6 +176,8 @@ set(PROTO_FILES
     response_report_user_info.proto
     response_moderator_last_logins.proto
     response_remove_user_avatar.proto
+    response_remove_user_banner.proto
+    response_clear_blacklisted_banners.proto
     response_reset_user_password.proto
     response_user_alts.proto
     response_user_sessions.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_player_order.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_player_order.proto
new file mode 100644
index 000000000..97e27038f
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_player_order.proto
@@ -0,0 +1,15 @@
+syntax = "proto2";
+import "game_commands.proto";
+message Command_SetPlayerOrder {
+    extend GameCommand {
+        optional Command_SetPlayerOrder ext = 1206;
+    }
+
+    // The desired seating order, expressed as player names. Only used when
+    // randomize is false.
+    repeated string player_names = 1;
+
+    // When set, the server shuffles the seating order instead of using
+    // player_names.
+    optional bool randomize = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto
index 5c8aee3fe..bbf2d0f98 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto
@@ -24,4 +24,9 @@ message Event_GameStateChanged {
 
     // the amount of seconds since the game started
     optional uint32 seconds_elapsed = 5;
+
+    // the id of the player this event is addressed to. Used to re-identify the
+    // local player after seats have been shuffled. Only set for events sent to
+    // a specific participant, never for omniscient/replay events.
+    optional sint32 local_player_id = 6;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_order_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_order_changed.proto
new file mode 100644
index 000000000..d119398b7
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_order_changed.proto
@@ -0,0 +1,13 @@
+syntax = "proto2";
+import "game_event.proto";
+message Event_PlayerOrderChanged {
+    extend GameEvent {
+        optional Event_PlayerOrderChanged ext = 2023;
+    }
+
+    // The new seating order, expressed as player names.
+    repeated string player_names = 1;
+
+    // Whether the order was obtained by randomizing rather than set explicitly.
+    optional bool randomized = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
index 2e5b88978..eb399ffb9 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
@@ -180,6 +180,11 @@ message GameCommand {
         /// Server: Server_Player::cmdSetPlaymat
         /// Client: reflected via player properties changed event
         SET_PLAYMAT = 1035;
+
+        /// Set the seating (turn) order of the players.
+        /// Server: Server_AbstractParticipant::cmdSetPlayerOrder
+        /// Client: reflected via Event_PlayerOrderChanged
+        SET_PLAYER_ORDER = 1206;
     }
 
     extensions 100 to max;
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
index 7d3147701..573d26453 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
@@ -34,6 +34,7 @@ message GameEvent {
         CHANGE_ZONE_PROPERTIES = 2020;
         REVERSE_TURN = 2021;
         GAME_LOG_NOTICE = 2022;
+        PLAYER_ORDER_CHANGED = 2023;
     }
     optional sint32 player_id = 1 [default = -1];
     extensions 100 to max;
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
index 5298d3dad..04cb31d98 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
@@ -20,6 +20,8 @@ message ModeratorCommand {
         GET_MODERATOR_LAST_LOGINS = 1015;
         RESET_USER_PASSWORD = 1016;
         REMOVE_USER_AVATAR = 1017;
+        REMOVE_USER_BANNER = 1018;
+        CLEAR_BLACKLISTED_BANNERS = 1019;
         REPORT_LIST = 1200;
         REPORT_ASSIGN = 1201;
         REPORT_RESOLVE = 1202;
@@ -85,14 +87,16 @@ message Command_ViewLogHistory {
     extend DeveloperCommand {
         optional Command_ViewLogHistory dev_ext = 1001;
     }
-    optional string user_name = 1;       // user that created message
-    optional string ip_address = 2;      // ip address of user that created message
-    optional string game_name = 3;       // client id of user that created the message
-    optional string game_id = 4;         // game number the message was sent to
-    optional string message = 5;         // raw message that was sent
-    repeated string log_location = 6;    // destination of message (ex: main room, game room, private chat)
-    required uint32 date_range = 7;      // the length of time (in minutes) to look back for
-    optional uint32 maximum_results = 8; // the maximum number of query results
+    optional string user_name = 1;            // user that created message
+    optional string ip_address = 2;           // ip address of user that created message
+    optional string game_name = 3;            // client id of user that created the message
+    optional string game_id = 4;              // game number the message was sent to
+    optional string message = 5;              // raw message that was sent
+    repeated string log_location = 6;         // destination of message (ex: main room, game room, private chat)
+    required uint32 date_range = 7;           // the length of time (in minutes) to look back for
+    optional uint32 maximum_results = 8;      // the maximum number of query results (page size when paginating)
+    optional uint32 offset = 9 [default = 0]; // rows to skip for pagination, ORDER BY log_time DESC
+    optional string before_time = 10; // page those rows against this `log_time` snapshot (newest first page row)
 }
 
 message Command_GrantReplayAccess {
@@ -179,3 +183,16 @@ message Command_RemoveUserAvatar {
     }
     optional string user_name = 1;
 }
+
+message Command_RemoveUserBanner {
+    extend ModeratorCommand {
+        optional Command_RemoveUserBanner ext = 1018;
+    }
+    optional string user_name = 1;
+}
+
+message Command_ClearBlacklistedBanners {
+    extend ModeratorCommand {
+        optional Command_ClearBlacklistedBanners ext = 1019;
+    }
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_clear_blacklisted_banners.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_clear_blacklisted_banners.proto
new file mode 100644
index 000000000..86cbc92f3
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_clear_blacklisted_banners.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_ClearBlacklistedBanners {
+    extend Response {
+        optional Response_ClearBlacklistedBanners ext = 1222;
+    }
+    optional uint32 cleared_count = 1 [default = 0];
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_remove_user_banner.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_remove_user_banner.proto
new file mode 100644
index 000000000..bfad7333c
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_remove_user_banner.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_RemoveUserBanner {
+    extend Response {
+        optional Response_RemoveUserBanner ext = 1221;
+    }
+    optional string user_name = 1;
+    // false when the user exists but had no banner card set, so nothing was cleared
+    optional bool had_banner = 2 [default = true];
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto
index 2ec0aff28..1041bca74 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto
@@ -7,4 +7,5 @@ message Response_ViewLogHistory {
         optional Response_ViewLogHistory ext = 1015;
     }
     repeated ServerInfo_ChatMessage log_message = 1;
+    optional bool has_more = 2 [default = false]; // true when more rows exist past this page
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto
index 9d9c6d277..3be7e4e64 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto
@@ -78,6 +78,9 @@ message Command_CreateGame {
 
     // share decklists with all players when selected
     optional bool share_decklists_on_load = 14;
+
+    // shuffle the player order (seats) before each game starts
+    optional bool shuffle_players = 15;
 }
 
 message Command_JoinGame {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
index 9989ae18a..39ec79914 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
@@ -48,6 +48,9 @@ message ServerInfo_Game {
     // decklists are sent to all players when loaded
     optional bool share_decklists_on_load = 15;
 
+    // players are shuffled into new seats before each game starts
+    optional bool shuffle_players = 16;
+
     // the current player count
     optional uint32 player_count = 30;
 
diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt
index 6128e3f6e..77165122c 100644
--- a/libcockatrice_rng/CMakeLists.txt
+++ b/libcockatrice_rng/CMakeLists.txt
@@ -1,13 +1,7 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcockatrice/rng/sfmt/SFMT.h)
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
-  libcockatrice_rng STATIC ${MOC_SOURCES} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp
+  libcockatrice_rng STATIC ${HEADERS} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp
                            libcockatrice/rng/sfmt/SFMT.c
 )
 
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
index 34d9e746f..df114cf9b 100644
--- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
+++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
@@ -113,6 +113,14 @@ union W128_T {
 /** 128-bit data type */
 typedef union W128_T w128_t;
 
+#if defined(__AVX2__)
+/* The AVX2 state below names __m256i (and __m512i under AVX-512VL). The SIMD header
+   above is only pulled in for HAVE_SSE2, so a build that has __AVX2__ from the compiler
+   (e.g. -march=native) but not HAVE_SSE2 from the build system would otherwise not have
+   those types declared. */
+  #include <immintrin.h>
+#endif
+
 /**
  * SFMT internal state
  */
diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt
index 5a2fa42a9..a3b9a68db 100644
--- a/libcockatrice_settings/CMakeLists.txt
+++ b/libcockatrice_settings/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(HEADERS
     libcockatrice/settings/appearance_settings.h
     libcockatrice/settings/cache_storage_settings.h
@@ -31,11 +27,9 @@ set(HEADERS
     libcockatrice/settings/visual_deck_storage_settings.h
 )
 
-qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-
 add_library(
   libcockatrice_settings STATIC
-  ${MOC_SOURCES}
+  ${HEADERS}
   libcockatrice/settings/appearance_settings.cpp
   libcockatrice/settings/cache_storage_settings.cpp
   libcockatrice/settings/card_database_settings.cpp
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
index c8c6463e3..89fe7b85e 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
@@ -71,6 +71,11 @@ bool GameSettings::getShareDecklistsOnLoad() const
     return getValue("shareDecklistsOnLoad", "game").toBool();
 }
 
+bool GameSettings::getShufflePlayers() const
+{
+    return getValue("shuffleplayers", "game").toBool();
+}
+
 bool GameSettings::getRememberGameSettings() const
 {
     return getValue("rememberGameSettings", "game", QString(), true).toBool();
@@ -151,6 +156,11 @@ void GameSettings::setShareDecklistsOnLoad(bool _shareDecklistsOnLoad)
     setValue(_shareDecklistsOnLoad, "shareDecklistsOnLoad", "game");
 }
 
+void GameSettings::setShufflePlayers(bool _shufflePlayers)
+{
+    setValue(_shufflePlayers, "shuffleplayers", "game");
+}
+
 void GameSettings::setRememberGameSettings(bool _rememberGameSettings)
 {
     setValue(_rememberGameSettings, "rememberGameSettings", "game");
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.h b/libcockatrice_settings/libcockatrice/settings/game_settings.h
index 3e64234fc..45ec8554b 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.h
@@ -27,6 +27,7 @@ public:
     [[nodiscard]] bool getCreateGameAsSpectator() const override;
     [[nodiscard]] int getDefaultStartingLifeTotal() const override;
     [[nodiscard]] bool getShareDecklistsOnLoad() const override;
+    [[nodiscard]] bool getShufflePlayers() const override;
     [[nodiscard]] bool getRememberGameSettings() const override;
     [[nodiscard]] bool getLocalGameRememberSettings() const override;
     [[nodiscard]] int getLocalGameMaxPlayers() const override;
@@ -44,6 +45,7 @@ public:
     void setCreateGameAsSpectator(bool _createGameAsSpectator);
     void setDefaultStartingLifeTotal(int _defaultStartingLifeTotal);
     void setShareDecklistsOnLoad(bool _shareDecklistsOnLoad);
+    void setShufflePlayers(bool _shufflePlayers);
     void setRememberGameSettings(bool _rememberGameSettings);
     void setLocalGameRememberSettings(bool value);
     void setLocalGameMaxPlayers(int value);
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
index 4595da2a2..38b87b97c 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
@@ -5,16 +5,118 @@
 #include <QDebug>
 #include <QList>
 #include <QMessageLogger>
-#include <QSharedPointer>
+#include <QSettings>
+#include <QString>
 #include <QVariant>
-#include <qnamespace.h>
+#include <algorithm>
+#include <optional>
 #include <utility>
 
-class QObject;
+namespace
+{
+constexpr auto SERVER_GROUP = "server";
+constexpr auto SERVER_DETAILS_GROUP = "server_details";
+constexpr auto SERVERS_ARRAY = "servers";
+
+QString legacyKey(const char *field, int index)
+{
+    return QStringLiteral("%1/%2%3")
+        .arg(QString::fromLatin1(SERVER_DETAILS_GROUP), QString::fromLatin1(field))
+        .arg(index);
+}
+
+//! Expects \a settings to be positioned on the server group.
+QList<ServersSettings::ServerEntry> readServerArray(QSettings &settings)
+{
+    QList<ServersSettings::ServerEntry> servers;
+
+    settings.beginGroup(SERVER_DETAILS_GROUP);
+    const int size = settings.beginReadArray(SERVERS_ARRAY);
+    servers.reserve(size);
+    for (int i = 0; i < size; ++i) {
+        settings.setArrayIndex(i);
+        ServersSettings::ServerEntry entry;
+        entry.saveName = settings.value("saveName").toString();
+        entry.host = settings.value("server").toString();
+        entry.port = settings.value("port").toString();
+        entry.username = settings.value("username").toString();
+        entry.password = settings.value("password").toString();
+        entry.savePassword = settings.value("savePassword").toBool();
+        entry.site = settings.value("site").toString();
+        servers.append(entry);
+    }
+    settings.endArray();
+    settings.endGroup();
+
+    return servers;
+}
+
+//! Expects \a settings to be positioned on the server group.
+QList<ServersSettings::ServerEntry> readLegacyServers(QSettings &settings, int lastIndex)
+{
+    QList<ServersSettings::ServerEntry> servers;
+
+    for (int i = 0; i <= lastIndex; ++i) {
+        ServersSettings::ServerEntry entry;
+        entry.saveName = settings.value(legacyKey("saveName", i)).toString();
+        entry.host = settings.value(legacyKey("server", i)).toString();
+        entry.port = settings.value(legacyKey("port", i)).toString();
+        entry.username = settings.value(legacyKey("username", i)).toString();
+        entry.password = settings.value(legacyKey("password", i)).toString();
+        entry.savePassword = settings.value(legacyKey("savePassword", i)).toBool();
+        entry.site = settings.value(legacyKey("site", i)).toString();
+
+        // Older builds could leave the unused index 0 behind.
+        if (!entry.saveName.isEmpty() || !entry.host.isEmpty()) {
+            servers.append(entry);
+        }
+    }
+
+    return servers;
+}
+
+void writeServerArray(QSettings &settings, const QList<ServersSettings::ServerEntry> &servers)
+{
+    settings.beginGroup(SERVER_DETAILS_GROUP);
+    // beginWriteArray() never drops entries past the new size, so without this
+    // a removed profile would keep its slot - including its saved password -
+    // in servers.ini forever. The legacy keys live beside the array, not in it.
+    settings.remove(SERVERS_ARRAY);
+    settings.beginWriteArray(SERVERS_ARRAY, servers.size());
+    for (int i = 0; i < servers.size(); ++i) {
+        settings.setArrayIndex(i);
+        const ServersSettings::ServerEntry &entry = servers.at(i);
+        settings.setValue("saveName", entry.saveName);
+        settings.setValue("server", entry.host);
+        settings.setValue("port", entry.port);
+        settings.setValue("username", entry.username);
+        settings.setValue("password", entry.password);
+        settings.setValue("savePassword", entry.savePassword);
+        settings.setValue("site", entry.site);
+    }
+    settings.endArray();
+    settings.endGroup();
+}
+} // namespace
 
 ServersSettings::ServersSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "servers.ini", "server", QString(), parent)
+    : SettingsManager(settingPath + "servers.ini", SERVER_GROUP, QString(), parent)
 {
+    migrateLegacyServers();
+}
+
+QList<ServersSettings::ServerEntry> ServersSettings::getServers() const
+{
+    return loadServers();
+}
+
+std::optional<ServersSettings::ServerEntry> ServersSettings::getServer(int index) const
+{
+    const QList<ServerEntry> servers = loadServers();
+    if (index < 0 || index >= servers.size()) {
+        return std::nullopt;
+    }
+    return servers.at(index);
 }
 
 void ServersSettings::setPreviousHostLogin(int previous)
@@ -45,16 +147,14 @@ void ServersSettings::setPrevioushostName(const QString &name)
 
 QString ServersSettings::getSaveName(QString defaultname)
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-    QVariant saveName = getValue(QString("saveName%1").arg(index), "server", "server_details");
-    return saveName == QVariant() ? std::move(defaultname) : saveName.toString();
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    return server ? server->saveName : std::move(defaultname);
 }
 
 QString ServersSettings::getSite(QString defaultSite)
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-    QVariant site = getValue(QString("site%1").arg(index), "server", "server_details");
-    return site == QVariant() ? std::move(defaultSite) : site.toString();
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    return server ? server->site : std::move(defaultSite);
 }
 
 QString ServersSettings::getPrevioushostName() const
@@ -65,10 +165,9 @@ QString ServersSettings::getPrevioushostName() const
 
 int ServersSettings::getPrevioushostindex(const QString &saveName) const
 {
-    int size = getValue("totalServers", "server", "server_details").toInt();
-
-    for (int i = 0; i <= size; ++i) {
-        if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) {
+    const QList<ServerEntry> servers = loadServers();
+    for (int i = 0; i < servers.size(); ++i) {
+        if (servers.at(i).saveName == saveName) {
             return i;
         }
     }
@@ -78,43 +177,38 @@ int ServersSettings::getPrevioushostindex(const QString &saveName) const
 
 QString ServersSettings::getHostname(QString defaultHost) const
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-    QVariant hostname = getValue(QString("server%1").arg(index), "server", "server_details");
-    return hostname == QVariant() ? std::move(defaultHost) : hostname.toString();
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    return server ? server->host : std::move(defaultHost);
 }
 
 QString ServersSettings::getPort(QString defaultPort) const
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-    QVariant port = getValue(QString("port%1").arg(index), "server", "server_details");
-    qCDebug(ServersSettingsLog) << "getPort() index = " << index << " port.val = " << port.toString();
-    return port == QVariant() ? std::move(defaultPort) : port.toString();
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    qCDebug(ServersSettingsLog) << "getPort() found server = " << server.has_value();
+    return server ? server->port : std::move(defaultPort);
 }
 
 QString ServersSettings::getPlayerName(QString defaultName) const
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-    QVariant name = getValue(QString("username%1").arg(index), "server", "server_details");
-    qCDebug(ServersSettingsLog) << "getPlayerName() index = " << index << " name.val = " << name.toString();
-    return name == QVariant() ? std::move(defaultName) : name.toString();
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    qCDebug(ServersSettingsLog) << "getPlayerName() found server = " << server.has_value();
+    return server ? server->username : std::move(defaultName);
 }
 
 QString ServersSettings::getPassword()
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-
-    if (getSavePassword()) {
-        return getValue(QString("password%1").arg(index), "server", "server_details").toString();
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    if (!server || !server->savePassword) {
+        return QString();
     }
 
-    return QString();
+    return server->password;
 }
 
 bool ServersSettings::getSavePassword() const
 {
-    int index = getPrevioushostindex(getPrevioushostName());
-    bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool();
-    return save;
+    const auto server = getServer(getPrevioushostindex(getPrevioushostName()));
+    return server && server->savePassword;
 }
 
 void ServersSettings::setAutoConnect(int autoconnect)
@@ -157,15 +251,19 @@ void ServersSettings::setFPPlayerName(QString playerName)
 
 void ServersSettings::setServerPassword(const QString &saveName, const QString &password)
 {
-    const int index = getPrevioushostindex(saveName);
-    if (index >= 0) {
-        setValue(password, QString("password%1").arg(index), "server", "server_details");
-    } else {
-        // A credential write that silently no-ops is hard to diagnose from a
-        // bug report; surface a mismatched profile name instead.
-        qCWarning(ServersSettingsLog) << "setServerPassword() could not find profile:" << saveName
-                                      << "- password not saved";
+    QList<ServerEntry> servers = loadServers();
+    for (ServerEntry &server : servers) {
+        if (server.saveName == saveName) {
+            server.password = password;
+            storeServers(servers);
+            return;
+        }
     }
+
+    // A credential write that silently no-ops is hard to diagnose from a bug
+    // report; surface a mismatched profile name instead.
+    qCWarning(ServersSettingsLog) << "setServerPassword() could not find profile:" << saveName
+                                  << "- password not saved";
 }
 
 QString ServersSettings::getFPPlayerName(QString defaultName) const
@@ -202,62 +300,29 @@ void ServersSettings::addNewServer(const QString &saveName,
         return;
     }
 
-    int index = getValue("totalServers", "server", "server_details").toInt() + 1;
-
-    setValue(saveName, QString("saveName%1").arg(index), "server", "server_details");
-    setValue(serv, QString("server%1").arg(index), "server", "server_details");
-    setValue(port, QString("port%1").arg(index), "server", "server_details");
-    setValue(username, QString("username%1").arg(index), "server", "server_details");
-    setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details");
-    setValue(index, "totalServers", "server", "server_details");
-    setValue(password, QString("password%1").arg(index), "server", "server_details");
-    setValue(site, QString("site%1").arg(index), "server", "server_details");
+    QList<ServerEntry> servers = loadServers();
+    ServerEntry entry;
+    entry.saveName = saveName;
+    entry.host = serv;
+    entry.port = port;
+    entry.username = username;
+    entry.password = password;
+    entry.savePassword = savePassword;
+    entry.site = site;
+    servers.append(entry);
+    storeServers(servers);
 }
 
 void ServersSettings::removeServer(QString servAddr)
 {
-    int size = getValue("totalServers", "server", "server_details").toInt();
-
-    bool found = false;
-    for (int i = 0; i <= size; ++i) {
-        if (!found) {
-            // find entry and overwrite it
-            if (servAddr == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
-                found = true;
-            }
-        } else {
-            // move all other entries after it one back, overwriting the previous one
-            int previous = i - 1; // we delete only one entry
-            setValue(getValue(QString("server%1").arg(i), "server", "server_details"),
-                     QString("server%1").arg(previous), "server", "server_details");
-            setValue(getValue(QString("port%1").arg(i), "server", "server_details"), QString("port%1").arg(previous),
-                     "server", "server_details");
-            setValue(getValue(QString("username%1").arg(i), "server", "server_details"),
-                     QString("username%1").arg(previous), "server", "server_details");
-            setValue(getValue(QString("savePassword%1").arg(i), "server", "server_details"),
-                     QString("savePassword%1").arg(previous), "server", "server_details");
-            setValue(getValue(QString("password%1").arg(i), "server", "server_details"),
-                     QString("password%1").arg(previous), "server", "server_details");
-            setValue(getValue(QString("saveName%1").arg(i), "server", "server_details"),
-                     QString("saveName%1").arg(previous), "server", "server_details");
-            setValue(getValue(QString("site%1").arg(i), "server", "server_details"), QString("site%1").arg(previous),
-                     "server", "server_details");
+    QList<ServerEntry> servers = loadServers();
+    for (int i = 0; i < servers.size(); ++i) {
+        if (servers.at(i).host == servAddr) {
+            servers.removeAt(i);
+            storeServers(servers);
+            return;
         }
     }
-
-    // if we have deleted an entry, adjust the total
-    if (found) {
-        setValue(size - 1, "totalServers", "server", "server_details");
-
-        // delete last value
-        deleteValue(QString("server%1").arg(size), "server", "server_details");
-        deleteValue(QString("port%1").arg(size), "server", "server_details");
-        deleteValue(QString("username%1").arg(size), "server", "server_details");
-        deleteValue(QString("savePassword%1").arg(size), "server", "server_details");
-        deleteValue(QString("password%1").arg(size), "server", "server_details");
-        deleteValue(QString("saveName%1").arg(size), "server", "server_details");
-        deleteValue(QString("site%1").arg(size), "server", "server_details");
-    }
 }
 
 /**
@@ -265,23 +330,23 @@ void ServersSettings::removeServer(QString servAddr)
  */
 bool ServersSettings::updateExistingServerWithoutLoss(QString saveName, QString serv, QString port, QString site)
 {
-    int size = getValue("totalServers", "server", "server_details").toInt();
-
-    for (int i = 0; i <= size; ++i) {
-        if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
-            if (!port.isEmpty()) {
-                setValue(port, QString("port%1").arg(i), "server", "server_details");
-            }
-
-            if (!site.isEmpty()) {
-                setValue(site, QString("site%1").arg(i), "server", "server_details");
-            }
-
-            setValue(saveName, QString("saveName%1").arg(i), "server", "server_details");
-
-            return true;
+    QList<ServerEntry> servers = loadServers();
+    for (ServerEntry &server : servers) {
+        if (server.host != serv) {
+            continue;
         }
+
+        if (!port.isEmpty()) {
+            server.port = port;
+        }
+        if (!site.isEmpty()) {
+            server.site = site;
+        }
+        server.saveName = saveName;
+        storeServers(servers);
+        return true;
     }
+
     return false;
 }
 
@@ -293,17 +358,13 @@ bool ServersSettings::updateExistingServer(QString saveName,
                                            bool savePassword,
                                            QString site)
 {
-    int size = getValue("totalServers", "server", "server_details").toInt();
-
-    for (int i = 0; i <= size; ++i) {
-        if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
-            setValue(port, QString("port%1").arg(i), "server", "server_details");
-            updateServerFields(i, saveName, username, password, savePassword, site);
-
-            return true;
-        }
+    const int index = findServerIndex(serv, port);
+    if (index < 0) {
+        return false;
     }
-    return false;
+
+    updateServerFields(index, saveName, username, password, savePassword, site);
+    return true;
 }
 
 void ServersSettings::updateServerFields(int index,
@@ -313,33 +374,33 @@ void ServersSettings::updateServerFields(int index,
                                          bool savePassword,
                                          const QString &site)
 {
+    QList<ServerEntry> servers = loadServers();
+    if (index < 0 || index >= servers.size()) {
+        return;
+    }
+
+    ServerEntry &server = servers[index];
     if (!username.isEmpty()) {
-        setValue(username, QString("username%1").arg(index), "server", "server_details");
+        server.username = username;
     }
-
     if (savePassword && !password.isEmpty()) {
-        setValue(password, QString("password%1").arg(index), "server", "server_details");
+        server.password = password;
     } else {
-        setValue(QString(), QString("password%1").arg(index), "server", "server_details");
+        server.password.clear();
     }
-
     if (!site.isEmpty()) {
-        setValue(site, QString("site%1").arg(index), "server", "server_details");
+        server.site = site;
     }
-
-    setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details");
-    setValue(saveName, QString("saveName%1").arg(index), "server", "server_details");
+    server.savePassword = savePassword;
+    server.saveName = saveName;
+    storeServers(servers);
 }
 
 int ServersSettings::findServerIndex(const QString &host, const QString &port) const
 {
-    int size = getValue("totalServers", "server", "server_details").toInt();
-
-    for (int i = 0; i <= size; ++i) {
-        QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString();
-        QString storedPort = getValue(QString("port%1").arg(i), "server", "server_details").toString();
-
-        if (storedHost == host && storedPort == port) {
+    const QList<ServerEntry> servers = loadServers();
+    for (int i = 0; i < servers.size(); ++i) {
+        if (servers.at(i).host == host && servers.at(i).port == port) {
             return i;
         }
     }
@@ -349,12 +410,9 @@ int ServersSettings::findServerIndex(const QString &host, const QString &port) c
 
 int ServersSettings::findHostIndex(const QString &host) const
 {
-    int size = getValue("totalServers", "server", "server_details").toInt();
-
-    for (int i = 0; i <= size; ++i) {
-        QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString();
-
-        if (storedHost.compare(host, Qt::CaseInsensitive) == 0) {
+    const QList<ServerEntry> servers = loadServers();
+    for (int i = 0; i < servers.size(); ++i) {
+        if (servers.at(i).host.compare(host, Qt::CaseInsensitive) == 0) {
             return i;
         }
     }
@@ -364,29 +422,100 @@ int ServersSettings::findHostIndex(const QString &host) const
 
 bool ServersSettings::hasUsername(const QString &host, const QString &port) const
 {
-    int index = findServerIndex(host, port);
-    if (index < 0) {
-        return false;
-    }
-
-    QString user = getValue(QString("username%1").arg(index), "server", "server_details").toString();
-    return !user.isEmpty();
+    const auto server = getServer(findServerIndex(host, port));
+    return server && !server->username.isEmpty();
 }
 
 bool ServersSettings::hasCredentials(const QString &host, const QString &port) const
 {
-    int index = findServerIndex(host, port);
-    if (index < 0) {
-        return false;
-    }
-
-    bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool();
-    QString password = getValue(QString("password%1").arg(index), "server", "server_details").toString();
-
-    return save && !password.isEmpty();
+    const auto server = getServer(findServerIndex(host, port));
+    return server && server->savePassword && !server->password.isEmpty();
 }
 
 bool ServersSettings::hasLoginData(const QString &host, const QString &port) const
 {
     return hasUsername(host, port) && hasCredentials(host, port);
 }
+
+QList<ServersSettings::ServerEntry> ServersSettings::loadServers() const
+{
+    QSettings settings = getSettings();
+    settings.beginGroup(SERVER_GROUP);
+    const QList<ServerEntry> servers = readServerArray(settings);
+    settings.endGroup();
+
+    return servers;
+}
+
+void ServersSettings::storeServers(const QList<ServerEntry> &servers)
+{
+    batchWrite([&servers](QSettings &settings) {
+        settings.beginGroup(SERVER_GROUP);
+        writeServerArray(settings, servers);
+        settings.endGroup();
+    });
+}
+
+void ServersSettings::migrateLegacyServers()
+{
+    {
+        QSettings settings = getSettings();
+        settings.beginGroup(SERVER_GROUP);
+        // Only builds that predate the array format write this marker. Once it
+        // is gone there is nothing left to import and no reason to touch the
+        // file (a sync on every start is a needless open-and-write).
+        const bool hasLegacy = settings.contains(QStringLiteral("%1/totalServers").arg(SERVER_DETAILS_GROUP));
+        settings.endGroup();
+
+        if (!hasLegacy) {
+            return;
+        }
+    }
+
+    const QSettings::Status status = batchWrite([](QSettings &settings) {
+        settings.beginGroup(SERVER_GROUP);
+
+        const int lastLegacyIndex =
+            settings.value(QStringLiteral("%1/totalServers").arg(SERVER_DETAILS_GROUP), -1).toInt();
+
+        QList<ServersSettings::ServerEntry> servers = readServerArray(settings);
+
+        // An older build can write the legacy keys again after the array
+        // migration, so the array is not automatically complete: append every
+        // legacy profile the array does not already hold instead of dropping it.
+        int imported = 0;
+        const QList<ServersSettings::ServerEntry> legacyServers = readLegacyServers(settings, lastLegacyIndex);
+        for (const ServersSettings::ServerEntry &entry : legacyServers) {
+            const bool known =
+                std::any_of(servers.cbegin(), servers.cend(), [&entry](const ServersSettings::ServerEntry &existing) {
+                    return existing.host == entry.host && existing.port == entry.port;
+                });
+            if (!known) {
+                servers.append(entry);
+                ++imported;
+            }
+        }
+
+        writeServerArray(settings, servers);
+        if (imported > 0) {
+            qCDebug(ServersSettingsLog) << "Migrated" << imported << "server profiles to the array format";
+        }
+
+        // The array (freshly written or already present) is authoritative now.
+        for (int i = 0; i <= lastLegacyIndex; ++i) {
+            settings.remove(legacyKey("saveName", i));
+            settings.remove(legacyKey("server", i));
+            settings.remove(legacyKey("port", i));
+            settings.remove(legacyKey("username", i));
+            settings.remove(legacyKey("password", i));
+            settings.remove(legacyKey("savePassword", i));
+            settings.remove(legacyKey("site", i));
+        }
+        settings.remove(QStringLiteral("%1/totalServers").arg(SERVER_DETAILS_GROUP));
+        settings.endGroup();
+    });
+
+    if (status != QSettings::NoError) {
+        qCWarning(ServersSettingsLog) << "Failed to migrate server profiles:" << status;
+    }
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
index 38bb02876..b403b1cea 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
@@ -9,9 +9,11 @@
 
 #include "settings_manager.h"
 
+#include <QList>
 #include <QLoggingCategory>
 #include <QString>
 #include <QStringList>
+#include <optional>
 #include <qtmetamacros.h>
 
 class QObject;
@@ -27,6 +29,22 @@ class ServersSettings : public SettingsManager
     friend class SettingsCache;
 
 public:
+    struct ServerEntry
+    {
+        QString saveName;
+        QString host;
+        QString port;
+        QString username;
+        QString password;
+        bool savePassword = false;
+        QString site;
+    };
+
+    explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr);
+
+    QList<ServerEntry> getServers() const;
+    std::optional<ServerEntry> getServer(int index) const;
+
     int getPreviousHostLogin() const;
     int getPrevioushostindex(const QString &) const;
     QStringList getPreviousHostList() const;
@@ -88,8 +106,11 @@ public:
     bool getClearDebugLogStatus(bool abDefaultValue) const;
 
 private:
-    explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr);
     ServersSettings(const ServersSettings & /*other*/);
+
+    QList<ServerEntry> loadServers() const;
+    void storeServers(const QList<ServerEntry> &servers);
+    void migrateLegacyServers();
 };
 
 #endif // SERVERSSETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
index f98778ca0..7cc1fd7be 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
@@ -193,13 +193,12 @@ QVariant SettingsManager::getValue(const QString &name,
     return value;
 }
 
-void SettingsManager::batchWrite(std::function<void(QSettings &)> batchWriteFunction)
+QSettings::Status SettingsManager::batchWrite(std::function<void(QSettings &)> batchWriteFunction)
 {
     auto settings = getSettings();
-    settings.setAtomicSyncRequired(false);
     batchWriteFunction(settings);
     settings.sync(); // single flush
-    settings.setAtomicSyncRequired(true);
+    return settings.status();
 }
 
 /**
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
index 8d3110106..760d095e6 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
@@ -28,7 +28,9 @@ public:
     QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString()) const;
     QVariant
     getValue(const QString &name, const QString &group, const QString &subGroup, const QVariant &defaultValue) const;
-    void batchWrite(std::function<void(QSettings &)> batchWriteFunction);
+    //! \brief Runs \a batchWriteFunction on a temporary QSettings and syncs once.
+    //! \return the status of the underlying file after the final sync.
+    QSettings::Status batchWrite(std::function<void(QSettings &)> batchWriteFunction);
 
     void sync();
 
diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt
index 748f6b90f..98ad40e69 100644
--- a/libcockatrice_utility/CMakeLists.txt
+++ b/libcockatrice_utility/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
 set(UTILITY_SOURCES
     libcockatrice/utility/cryptoutil.cpp
     libcockatrice/utility/expression.cpp
@@ -12,6 +8,7 @@ set(UTILITY_SOURCES
     libcockatrice/utility/passwordhasher.cpp
     libcockatrice/utility/report_categories.cpp
     libcockatrice/utility/server_rate_limiter.cpp
+    libcockatrice/utility/svg_recolor.cpp
     libcockatrice/utility/translation_loader.cpp
     libcockatrice/utility/user_data_backup.cpp
     libcockatrice/utility/warning_categories.cpp
@@ -23,6 +20,7 @@ set(UTILITY_HEADERS
     libcockatrice/utility/cryptoutil.h
     libcockatrice/utility/debouncer.h
     libcockatrice/utility/expression.h
+    libcockatrice/utility/installer_close_protocol.h
     libcockatrice/utility/levenshtein.h
     libcockatrice/utility/local_server_name.h
     libcockatrice/utility/macros.h
@@ -37,6 +35,7 @@ set(UTILITY_HEADERS
     libcockatrice/utility/zone_names.h
     libcockatrice/utility/days_years_between.h
     libcockatrice/utility/server_rate_limiter.h
+    libcockatrice/utility/svg_recolor.h
     libcockatrice/utility/translation_loader.h
     libcockatrice/utility/user_data_backup.h
     libcockatrice/utility/warning_categories.h
diff --git a/libcockatrice_utility/libcockatrice/utility/installer_close_protocol.h b/libcockatrice_utility/libcockatrice/utility/installer_close_protocol.h
new file mode 100644
index 000000000..1db467b2f
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/installer_close_protocol.h
@@ -0,0 +1,18 @@
+#ifndef COCKATRICE_INSTALLER_CLOSE_PROTOCOL_H
+#define COCKATRICE_INSTALLER_CLOSE_PROTOCOL_H
+
+/**
+ * @brief The one line the installer's holder probe writes to a running instance.
+ *
+ * Both ends include this header: the probe writes the line
+ * (tools/installer-holder-probe/installer_close_request.cpp) and the client's
+ * InstallerCloseServer reads it. Keeping the bytes in one place means the two ends cannot
+ * drift apart, and the test pins the exact line so a change to it is a deliberate protocol
+ * change rather than a typo in one copy.
+ *
+ * Plain C++ on purpose: the probe links no Qt and no part of this project, so this header
+ * must stay free of both.
+ */
+inline constexpr char INSTALLER_CLOSE_COMMAND[] = "COCKATRICE_INSTALLER_CLOSE\n";
+
+#endif // COCKATRICE_INSTALLER_CLOSE_PROTOCOL_H
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
index a7106aadc..8e876d5bc 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
@@ -62,9 +62,11 @@ QByteArray PasswordHasher::deriveKey(const QString &password, const QByteArray &
 {
     QByteArray key(SCRYPT_VERIFIER_LENGTH, '\0');
     const QByteArray passwordUtf8 = password.toUtf8();
-    // EVP_PBE_scrypt aborts unless maxmem covers the required working memory,
-    // which is roughly 128 * n * r bytes (plus the small Salsa20/8 block array).
-    const auto maxmem = static_cast<quint64>(128) * n * r + static_cast<quint64>(128) * r * p + 4096;
+    // EVP_PBE_scrypt aborts unless maxmem covers the required working memory: V is 128 * n *
+    // r bytes, B is 128 * r * p, and XY is 256 * r. Under-budgeting XY makes OpenSSL fail
+    // for r >= 17, which costParamsAreSane still accepts.
+    const auto maxmem =
+        static_cast<quint64>(128) * n * r + static_cast<quint64>(128) * r * p + static_cast<quint64>(256) * r + 4096;
     if (EVP_PBE_scrypt(passwordUtf8.constData(), passwordUtf8.size(),
                        reinterpret_cast<const unsigned char *>(salt.constData()), salt.size(), n, r, p, maxmem,
                        reinterpret_cast<unsigned char *>(key.data()), key.size()) != 1) {
diff --git a/libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp b/libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp
new file mode 100644
index 000000000..041e289fe
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp
@@ -0,0 +1,44 @@
+#include "svg_recolor.h"
+
+#include <QByteArrayView>
+
+namespace
+{
+constexpr QByteArrayView SENTINEL = "currentColor";
+
+/// Case-insensitive byte search for the sentinel, starting at @p from.
+/// QByteArray::indexOf() only matches case-sensitively for QByteArrayView, and
+/// its char overload cannot match a word.
+qsizetype findSentinel(const QByteArray &bytes, qsizetype from)
+{
+    // QByteArrayView::sliced() is a view, so the scan does not allocate a copy
+    // at every byte position (QByteArray::sliced() would).
+    const QByteArrayView view(bytes);
+    for (qsizetype i = from; i + SENTINEL.size() <= view.size(); ++i) {
+        if (view.sliced(i, SENTINEL.size()).compare(SENTINEL, Qt::CaseInsensitive) == 0) {
+            return i;
+        }
+    }
+    return -1;
+}
+} // namespace
+
+QByteArray resolveSvgColorSentinel(const QByteArray &svg, const QByteArray &color)
+{
+    // The sentinel and the replacement are both ASCII, so stay in bytes: a
+    // QString round trip would decode the whole document (and mangle bytes that
+    // are not valid UTF-8) even on the no-op path.
+    qsizetype pos = findSentinel(svg, 0);
+    if (pos < 0) {
+        return svg;
+    }
+
+    QByteArray resolved = svg;
+    while (pos >= 0) {
+        resolved.replace(pos, SENTINEL.size(), color);
+        // Skip past the inserted color: a caller's color never contains the
+        // sentinel, and this keeps the scan linear.
+        pos = findSentinel(resolved, pos + color.size());
+    }
+    return resolved;
+}
diff --git a/libcockatrice_utility/libcockatrice/utility/svg_recolor.h b/libcockatrice_utility/libcockatrice/utility/svg_recolor.h
new file mode 100644
index 000000000..56d609b87
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/svg_recolor.h
@@ -0,0 +1,31 @@
+/**
+ * @file svg_recolor.h
+ * @ingroup Core
+ */
+
+#ifndef SVG_RECOLOR_H
+#define SVG_RECOLOR_H
+
+#include <QByteArray>
+
+/**
+ * @brief Resolves the `currentColor` sentinel in authored SVG data.
+ *
+ * Qt's SVG renderer has no CSS cascade or ambient color context, so the
+ * sentinel is not resolved by Qt. Callers pass the concrete color they want
+ * (for example a QPalette role serialized to #RRGGBB) and receive SVG bytes
+ * that are safe to hand to QSvgRenderer.
+ *
+ * Matching is a plain, case-insensitive substring search, not a CSS parse: an
+ * identifier that merely starts with the sentinel (for example
+ * `id="currentColorStop"`) is rewritten too. That is acceptable for the assets
+ * this project authors, and keeps the resolver dependency-free.
+ *
+ * @param svg SVG source bytes, expected to be UTF-8. Invalid UTF-8 is preserved
+ *            byte-for-byte, since the resolver never decodes the document.
+ * @param color Concrete SVG color (for example "#ff00ff"), as ASCII bytes.
+ * @return The recolored SVG source; the input is left untouched.
+ */
+QByteArray resolveSvgColorSentinel(const QByteArray &svg, const QByteArray &color);
+
+#endif // SVG_RECOLOR_H
diff --git a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
index 41c6107b3..e5761fcaf 100644
--- a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
@@ -5,8 +5,10 @@
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QHash>
 #include <QLatin1Char>
 #include <QLibraryInfo>
+#include <QLocale>
 #include <QMessageLogger>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
@@ -100,6 +102,60 @@ QList<QString> TranslationLoader::availableLanguages(const QString &_prefix, con
     return sortedLanguages;
 }
 
+QString TranslationLoader::languageDisplayName(const QString &_lang)
+{
+    if (_lang.isEmpty()) {
+        return QString();
+    }
+
+    // The native name first, so a speaker finds their own language, then the English one, so everyone
+    // else does. A language shipped with a .qm file belongs in here: the names used to come from the
+    // translation files, where a missing translation left the selector blank.
+    static const QHash<QString, QString> displayNames = {
+        {QStringLiteral("ca"), QStringLiteral("Català (Catalan)")},
+        {QStringLiteral("cs"), QStringLiteral("Česky (Czech)")},
+        {QStringLiteral("de"), QStringLiteral("Deutsch (German)")},
+        {QStringLiteral("el"), QStringLiteral("Ελληνικά (Greek)")},
+        {QStringLiteral("en@pirate"), QStringLiteral("English, arr! (Pirate English)")},
+        {QStringLiteral("en_US"), QStringLiteral("English (United States)")},
+        {QStringLiteral("es"), QStringLiteral("Español (Spanish)")},
+        {QStringLiteral("et"), QStringLiteral("Eesti Keel (Estonian)")},
+        {QStringLiteral("fi"), QStringLiteral("Suomi (Finnish)")},
+        {QStringLiteral("fr"), QStringLiteral("Français (French)")},
+        {QStringLiteral("hu"), QStringLiteral("Magyar (Hungarian)")},
+        {QStringLiteral("it"), QStringLiteral("Italiano (Italian)")},
+        {QStringLiteral("ja"), QStringLiteral("日本語 (Japanese)")},
+        {QStringLiteral("ko"), QStringLiteral("한국어 (Korean)")},
+        {QStringLiteral("nb"), QStringLiteral("Norsk Bokmål (Norwegian Bokmål)")},
+        {QStringLiteral("nl"), QStringLiteral("Nederlands (Dutch)")},
+        {QStringLiteral("pl"), QStringLiteral("Polski (Polish)")},
+        {QStringLiteral("pt"), QStringLiteral("Português (Portuguese)")},
+        {QStringLiteral("pt_BR"), QStringLiteral("Português do Brasil (Brazilian Portuguese)")},
+        {QStringLiteral("ru"), QStringLiteral("Русский (Russian)")},
+        {QStringLiteral("sr"), QStringLiteral("Srpski (Serbian)")},
+        {QStringLiteral("sv"), QStringLiteral("Svenska (Swedish)")},
+        {QStringLiteral("tr"), QStringLiteral("Türkçe (Turkish)")},
+        {QStringLiteral("yue"), QStringLiteral("粵語 (Cantonese)")},
+        {QStringLiteral("zh-Hans"), QStringLiteral("简体中文 (Chinese Simplified)")},
+        {QStringLiteral("zh-Hant"), QStringLiteral("繁體中文 (Chinese Traditional)")},
+    };
+
+    const QString displayName = displayNames.value(_lang);
+    if (!displayName.isEmpty()) {
+        return displayName;
+    }
+
+    // A language added after this table still gets a label instead of the blank one this function exists
+    // to prevent. Qt knows no name for an unknown code and answers with an empty string.
+    const QString nativeName = QLocale(_lang).nativeLanguageName();
+    return nativeName.isEmpty() ? _lang : nativeName;
+}
+
+QString TranslationLoader::defaultLanguageCode()
+{
+    return QStringLiteral("en_US");
+}
+
 TranslationLoadResult
 TranslationLoader::loadFrom(QTranslator &_translator, const QString &_nameHint, const QList<QString> &_directories)
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/translation_loader.h b/libcockatrice_utility/libcockatrice/utility/translation_loader.h
index 645489696..53f419cf2 100644
--- a/libcockatrice_utility/libcockatrice/utility/translation_loader.h
+++ b/libcockatrice_utility/libcockatrice/utility/translation_loader.h
@@ -74,6 +74,26 @@ TranslationLoadResult loadQt(QTranslator &_translator, const QString &_lang);
  */
 QList<QString> availableLanguages(const QString &_prefix, const QList<QString> &_directories);
 
+/**
+ * @brief A human-readable name for a language, e.g. "Deutsch (German)".
+ *
+ * The names are data, not translations: a language selector has to be readable before any translation
+ * is loaded, and its labels must not depend on the translation of the language they name.
+ *
+ * @param _lang The language code, e.g. "de" or "pt_BR".
+ * @return The curated name; for a code it does not know, the native language name; the code itself when
+ *         Qt has no name for it either; an empty string when _lang is empty.
+ */
+QString languageDisplayName(const QString &_lang);
+
+/**
+ * @brief The language a client runs with when none is configured, for preselecting a selector entry.
+ *
+ * English is the untranslated default and ships no translation file of its own, so a selector has nothing
+ * of its own to point at and uses the entry that carries an English translation instead.
+ */
+QString defaultLanguageCode();
+
 /**
  * @brief Loads the <_prefix>_<_lang>.qm translation file from _directories into _translator.
  *
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 0df345812..4ca2acd07 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -17,6 +17,7 @@ set(ORACLE_WIN32_QM_INSTALL_DIR "translations")
 # Sources
 # ------------------------
 set(oracle_SOURCES
+    src/database_writer.cpp
     src/main.cpp
     src/oraclewizard.cpp
     src/oracleimporter.cpp
@@ -30,6 +31,7 @@ set(oracle_SOURCES
     ../cockatrice/src/client/network/update/client/release_channel.cpp
     ../cockatrice/src/interface/pixel_map_generator.cpp
     ../cockatrice/src/interface/theme_config.cpp
+    ../cockatrice/src/interface/theme_icon.cpp
     ../cockatrice/src/interface/theme_manager.cpp
     ${VERSION_STRING_CPP}
 )
@@ -63,7 +65,7 @@ set(oracle_RESOURCES oracle.qrc)
 # ------------------------
 # Qt resources
 # ------------------------
-qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
+qt_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
 
 # ------------------------
 # Include directories
@@ -108,7 +110,7 @@ set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations")
 set(ORACLE_WIN32_QM_INSTALL_DIR "translations")
 
 # Qt6 Translations are linked after the executable is created in manual mode
-qt6_add_executable(
+qt_add_executable(
   oracle
   WIN32
   MACOSX_BUNDLE
@@ -283,7 +285,7 @@ endif()
 if(Qt6LinguistTools_FOUND)
   #Qt6 Translations happen after the executable is built up
   if(UPDATE_TRANSLATIONS)
-    qt6_add_translations(
+    qt_add_translations(
       oracle
       TS_FILES
       ${oracle_TS}
@@ -293,7 +295,7 @@ if(Qt6LinguistTools_FOUND)
       oracle_QM
     )
   else()
-    qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM)
+    qt_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM)
   endif()
 
   if(UNIX)
@@ -319,4 +321,4 @@ if(Qt6LinguistTools_FOUND)
   endforeach()
 endif()
 
-qt6_finalize_target(oracle)
+qt_finalize_target(oracle)
diff --git a/oracle/src/database_writer.cpp b/oracle/src/database_writer.cpp
new file mode 100644
index 000000000..e80aa853a
--- /dev/null
+++ b/oracle/src/database_writer.cpp
@@ -0,0 +1,52 @@
+#include "database_writer.h"
+
+#include <QCoreApplication>
+#include <QIODevice>
+#include <QSaveFile>
+#include <QXmlStreamReader>
+
+namespace OracleDatabase
+{
+QString validateXml(const QByteArray &data)
+{
+    QXmlStreamReader xml(data);
+    if (!xml.readNextStartElement() || xml.name() != QLatin1String("cockatrice_carddatabase")) {
+        return QCoreApplication::translate("OracleDatabase", "The download is not a Cockatrice card database.");
+    }
+    const auto version = xml.attributes().value("version");
+    if (version != QLatin1String("3") && version != QLatin1String("4")) {
+        return QCoreApplication::translate("OracleDatabase", "The downloaded card database version is not supported.");
+    }
+    while (!xml.atEnd()) {
+        xml.readNext();
+    }
+    if (xml.hasError()) {
+        return QCoreApplication::translate("OracleDatabase",
+                                           "The downloaded card database is incomplete or invalid: %1")
+            .arg(xml.errorString());
+    }
+    return {};
+}
+
+bool saveXml(const QString &fileName, const QByteArray &data, QString *error)
+{
+    const QString validationError = validateXml(data);
+    if (!validationError.isEmpty()) {
+        if (error) {
+            *error = validationError;
+        }
+        return false;
+    }
+    QSaveFile file(fileName);
+    if (!file.open(QIODevice::WriteOnly) || file.write(data) != data.size() || !file.commit()) {
+        if (error) {
+            *error = file.errorString();
+        }
+        return false;
+    }
+    if (error) {
+        error->clear();
+    }
+    return true;
+}
+} // namespace OracleDatabase
diff --git a/oracle/src/database_writer.h b/oracle/src/database_writer.h
new file mode 100644
index 000000000..173fd23ab
--- /dev/null
+++ b/oracle/src/database_writer.h
@@ -0,0 +1,17 @@
+#ifndef ORACLE_DATABASE_WRITER_H
+#define ORACLE_DATABASE_WRITER_H
+
+#include <QByteArray>
+#include <QString>
+
+namespace OracleDatabase
+{
+// Validate the complete downloaded document without allocating a card database.
+// Empty string means valid; otherwise returns a diagnostic suitable for the wizard.
+QString validateXml(const QByteArray &data);
+// Never truncate the installed database: validate, write a sibling temporary file,
+// check the complete write and atomically commit it.
+bool saveXml(const QString &fileName, const QByteArray &data, QString *error = nullptr);
+} // namespace OracleDatabase
+
+#endif
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 477c54d21..c83c962e3 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -100,6 +100,10 @@ static CardSet::Priority getSetPriority(const QString &setType, const QString &s
 
 bool OracleImporter::readSetsFromByteArray(QByteArray data)
 {
+    importSuccessful = false;
+    importError.clear();
+    allSets.clear();
+    rawSetsData.clear();
     const RawJson::ScanProgressCallback progress =
         progressReporting
             ? [this](
@@ -764,7 +768,15 @@ int OracleImporter::startImport()
 {
     static ICardSetPriorityController *noOpController = new NoopCardSetPriorityController();
 
-    importCancelled.storeRelease(0);
+    importSuccessful = false;
+    importError.clear();
+    sets.clear();
+    cards.clear();
+    localizedEntries.clear();
+    splitLocalizedTexts.clear();
+    if (allSets.isEmpty()) {
+        return failImport(tr("No set has been selected for import."));
+    }
 
     // Pre-allocate the cards hash to avoid rehashing during import. Keys are
     // distinct card names while raw ranges only count printings (AllPrintings
@@ -786,9 +798,7 @@ int OracleImporter::startImport()
 
     for (const SetToDownload &curSetToParse : allSets) {
         if (importCancelled.loadAcquire()) {
-            // The wizard was closed mid-import: stop at the next set boundary so
-            // the caller can wait for this future without processing every set.
-            break;
+            return failImport(tr("The card database import was cancelled."));
         }
 
         CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(),
@@ -798,30 +808,20 @@ int OracleImporter::startImport()
         // parse only this set's slice of the raw document so the whole JSON tree is
         // never kept in memory at once
         const RawJson::SetDataRange &rawRange = curSetToParse.getRawRange();
-        const qsizetype rangeEnd = rawRange.start + rawRange.length;
-        if (rawRange.start < 0 || rawRange.length <= 0 || rangeEnd > rawSetsData.size()) {
-            // rawSetsData is cleared by releaseSetData() while SetToDownload copies
-            // taken from getSets() keep their ranges, and nothing else enforces the
-            // pairing — so never index past the buffer on stale/mismatched ranges.
-            qWarning() << "error: out-of-bounds raw range for set" << curSetToParse.getShortName() << "skipping";
-            ++setIndex;
-            emit setIndexChanged(0, setIndex, curSetToParse.getLongName());
-            continue;
+        if (rawRange.start < 0 || rawRange.length <= 0 || rawRange.start > rawSetsData.size() ||
+            rawRange.length > rawSetsData.size() - rawRange.start) {
+            return failImport(tr("The source data for set %1 is unavailable. Load the sets file again.")
+                                  .arg(curSetToParse.getShortName()));
         }
-        // sliced() shares the buffer instead of deep-copying the slice; the largest
-        // sets in AllPrintings are tens of MB, so the copy is worth avoiding here.
         const QByteArray setBytes = rawSetsData.sliced(rawRange.start, rawRange.length);
         QJsonParseError parseError;
         const QJsonDocument setDoc = QJsonDocument::fromJson(setBytes, &parseError);
         if (parseError.error != QJsonParseError::NoError) {
-            qWarning() << "error: parsing card data for set" << curSetToParse.getShortName() << ":"
-                       << parseError.errorString();
-            ++setIndex;
-            // Keep the progress accounting honest: a set that failed to parse
-            // still advanced the index, so report it (with zero imported cards)
-            // rather than letting SaveSetsPage's bar stall per failed set.
-            emit setIndexChanged(0, setIndex, curSetToParse.getLongName());
-            continue;
+            return failImport(
+                tr("Could not import set %1: %2").arg(curSetToParse.getShortName(), parseError.errorString()));
+        }
+        if (!setDoc.isObject() || !setDoc.object().value("cards").isArray()) {
+            return failImport(tr("Set %1 does not contain a card list.").arg(curSetToParse.getShortName()));
         }
 
         // Only add the set to the database once its slice parsed cleanly;
@@ -838,7 +838,14 @@ int OracleImporter::startImport()
         emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName());
     }
 
+    if (importCancelled.loadAcquire()) {
+        return failImport(tr("The card database import was cancelled."));
+    }
+    if (cards.isEmpty()) {
+        return failImport(tr("No cards were imported. The existing card database has been kept."));
+    }
     applyLocalizedData();
+    importSuccessful = true;
 
     emit setIndexChanged(0, setIndex, QString());
 
@@ -846,8 +853,23 @@ int OracleImporter::startImport()
     return setIndex;
 }
 
+int OracleImporter::failImport(const QString &message)
+{
+    importSuccessful = false;
+    importError = message;
+    sets.clear();
+    cards.clear();
+    localizedEntries.clear();
+    splitLocalizedTexts.clear();
+    qWarning() << message;
+    return 0;
+}
+
 bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion)
 {
+    if (!importSuccessful) {
+        return false;
+    }
     CockatriceXml4Parser parser(new NoopCardSetPriorityController());
 
     return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName, sourceUrl, sourceVersion);
@@ -861,6 +883,7 @@ void OracleImporter::releaseSetData()
 
 void OracleImporter::clear()
 {
+    prepareImport();
     sets.clear();
     cards.clear();
     allSets.clear();
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index d872e184e..5ebe9cf36 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -198,6 +198,11 @@ private:
      * the whole import (or racing it).
      */
     QAtomicInt importCancelled;
+    bool importSuccessful = false;
+    QString importError;
+
+    // Discard the incomplete in-memory database; the installed file is untouched.
+    int failImport(const QString &message);
 
     /**
      * The ISO-639 language code whose foreignData is imported; "en" by default.
@@ -278,7 +283,24 @@ public:
      * the wizard can hand over its decompressed buffer without copying it.
      */
     bool readSetsFromByteArray(QByteArray data);
+    // Returns the complete selected-set count on success, zero on failure or cancellation.
     int startImport();
+    bool hasSuccessfulImport() const
+    {
+        return importSuccessful;
+    }
+    const QString &getImportError() const
+    {
+        return importError;
+    }
+    // Call on the owning thread before scheduling a worker, so a cancellation
+    // arriving before that worker starts is not lost.
+    void prepareImport()
+    {
+        importCancelled.storeRelease(0);
+        importSuccessful = false;
+        importError.clear();
+    }
     /**
      * @brief Requests an in-flight startImport() to stop at the next set boundary.
      *
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 47afecc06..dc8c7ecb3 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -1,6 +1,7 @@
 #include "oraclewizard.h"
 
 #include "client/settings/cache_settings.h"
+#include "database_writer.h"
 #include "main.h"
 #include "oracleimporter.h"
 #include "pages.h"
@@ -32,9 +33,6 @@ class QWidget;
 
 OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
 {
-    // define a dummy context that will be used where needed
-    QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
-
 #ifdef Q_OS_WIN
     setWizardStyle(QWizard::ModernStyle);
 #endif
@@ -144,6 +142,13 @@ void OracleWizard::reject()
     }
 
     QWizard::reject();
+    // A hidden wizard does not close the application's last visible window.
+    // Stop background refreshes explicitly so the hosting client receives a verdict,
+    // using the same rule as main(): a reject after the database was written is still
+    // a successful update, only a reject that wrote nothing counts as a failure.
+    if (backgroundMode) {
+        QCoreApplication::exit(hasSavedDatabase() ? 0 : 1);
+    }
 }
 
 void OracleWizard::runInBackground()
@@ -215,17 +220,10 @@ void OracleWizard::disableButtons()
 
 bool OracleWizard::saveTokensToFile(const QString &fileName)
 {
-    QFile file(fileName);
-    if (!file.open(QIODevice::WriteOnly)) {
-        qDebug() << "File open (w) failed for" << fileName;
+    QString error;
+    if (!OracleDatabase::saveXml(fileName, tokensData, &error)) {
+        qWarning() << error;
         return false;
     }
-
-    if (file.write(tokensData) == -1) {
-        qDebug() << "File write (w) failed for" << fileName;
-        return false;
-    }
-
-    file.close();
     return true;
 }
diff --git a/oracle/src/pages.cpp b/oracle/src/pages.cpp
index ed8e04d1a..f5c38be1c 100644
--- a/oracle/src/pages.cpp
+++ b/oracle/src/pages.cpp
@@ -1,6 +1,7 @@
 #include "pages.h"
 
 #include "client/settings/cache_settings.h"
+#include "database_writer.h"
 #include "main.h"
 #include "oracleimporter.h"
 #include "oraclewizard.h"
@@ -10,7 +11,6 @@
 #include <QBuffer>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
@@ -39,12 +39,12 @@
 #include <QTextEdit>
 #include <QTextStream>
 #include <QTimer>
-#include <QTranslator>
 #include <QUrl>
 #include <QVariant>
 #include <QWizard>
 #include <QtConcurrentRun>
 #include <QtGlobal>
+#include <algorithm>
 #include <cstdio>
 #include <functional>
 #include <libcockatrice/settings/personal_settings.h>
@@ -171,7 +171,16 @@ LoadSetsResult loadSetsData(const QPointer<OracleImporter> &importer, QByteArray
         break;
     }
 
-    if (data.startsWith("<")) {
+    // Test the first non-space byte in place: trimmed() would duplicate the whole
+    // payload, which on the plain-XML path is the largest download we handle.
+    const auto firstNonSpace = std::find_if_not(data.cbegin(), data.cend(),
+                                                [](char c) { return c == ' ' || c == '\t' || c == '\n' || c == '\r'; });
+    const bool looksLikeXml = firstNonSpace != data.cend() && *firstNonSpace == '<';
+    if (looksLikeXml) {
+        result.errorMessage = OracleDatabase::validateXml(data);
+        if (!result.errorMessage.isEmpty()) {
+            return result;
+        }
         result.ok = true;
         result.plainXml = true;
         result.xmlData = std::move(data);
@@ -203,16 +212,23 @@ IntroPage::IntroPage(QWidget *parent) : OracleWizardPage(parent)
 
     QStringList languageCodes = findQmFiles();
     for (const QString &code : languageCodes) {
-        QString langName = languageName(code);
-        languageBox->addItem(langName, code);
+        languageBox->addItem(TranslationLoader::languageDisplayName(code), code);
     }
 
-    QString setLanguage = QCoreApplication::translate("i18n", DEFAULT_LANG_NAME);
-    int index = languageBox->findText(setLanguage, Qt::MatchExactly);
-    if (index == -1) {
-        qWarning() << "could not find language" << setLanguage;
-    } else {
+    // Select the language the wizard runs with: its own entry, the base language for a variant without a
+    // file of its own (de_CH -> de), and the default language for an unset setting, which names no file.
+    const QString configuredLanguage = SettingsCache::instance().personal().getLang();
+    int index = languageBox->findData(configuredLanguage);
+    if (index < 0) {
+        index = languageBox->findData(configuredLanguage.section('_', 0, 0));
+    }
+    if (index < 0) {
+        index = languageBox->findData(TranslationLoader::defaultLanguageCode());
+    }
+    if (index >= 0) {
         languageBox->setCurrentIndex(index);
+    } else {
+        qWarning() << "could not find language" << configuredLanguage;
     }
 
     connect(languageBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &IntroPage::languageBoxChanged);
@@ -239,18 +255,6 @@ QStringList IntroPage::findQmFiles()
                                                  TranslationLoader::applicationTranslationPaths(translationPath));
 }
 
-QString IntroPage::languageName(const QString &lang)
-{
-    QTranslator qTranslator;
-
-    // Only the language name is needed here, so the file is loaded without logging a line per
-    // language: findQmFiles() asked for languages whose files exist in the first place.
-    TranslationLoader::loadFrom(qTranslator, translationPrefix + "_" + lang,
-                                TranslationLoader::applicationTranslationPaths(translationPath));
-
-    return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
-}
-
 void IntroPage::languageBoxChanged(int index)
 {
     SettingsCache::instance().personal().setLang(languageBox->itemData(index).toString());
@@ -658,6 +662,10 @@ void LoadSetsPage::importFinished()
         } else if (!result.ok && !result.plainXml) {
             qWarning() << tr("The file was retrieved successfully, but it does not contain any sets data.");
         }
+        if (!result.ok) {
+            wizard()->reject();
+            return;
+        }
         emit readyToContinue();
         return;
     }
@@ -724,7 +732,7 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
 
 bool SaveSetsPage::isComplete() const
 {
-    return !importActive;
+    return !importActive && importReady;
 }
 
 void SaveSetsPage::cleanupPage()
@@ -737,8 +745,11 @@ void SaveSetsPage::cleanupPage()
 
 void SaveSetsPage::initializePage()
 {
+    importReady = false;
     retranslateUi();
     if (wizard()->downloadedPlainXml) {
+        importReady = true;
+        emit completeChanged();
         messageLog->hide();
         progressBar->hide();
         if (wizard()->backgroundMode) {
@@ -764,6 +775,9 @@ void SaveSetsPage::initializePage()
     emit completeChanged();
 
     const QPointer<OracleImporter> importer = wizard()->importer;
+    if (auto *activeImporter = importer.data()) {
+        activeImporter->prepareImport();
+    }
     importFuture = QtConcurrent::run([importer] { return importer ? importer->startImport() : 0; });
     importWatcher.setFuture(importFuture);
 }
@@ -795,22 +809,28 @@ void SaveSetsPage::importFinished()
 
     const int setsImported = importWatcher.result();
     const QPointer<OracleImporter> importer = wizard()->importer;
+    importReady = importer && importer->hasSuccessfulImport() && setsImported == totalSets;
+    const QString error = importer ? importer->getImportError() : tr("The card database importer is unavailable.");
     if (importer) {
         importer->releaseSetData();
     }
+    wizard()->button(QWizard::NextButton)->setEnabled(importReady);
+    emit completeChanged();
 
-    if (wizard()->backgroundMode) {
-        if (setsImported == 0) {
-            qWarning() << tr("No set has been imported.");
+    if (!importReady) {
+        const QString message = error.isEmpty() ? tr("No set has been imported.") : error;
+        if (wizard()->backgroundMode) {
+            qWarning() << message;
+            wizard()->reject();
+        } else {
+            QMessageBox::critical(this, tr("Error"), message);
         }
-        emit readyToContinue();
         return;
     }
 
     progressBar->setValue(progressBar->maximum());
-
-    if (setsImported == 0) {
-        QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
+    if (wizard()->backgroundMode) {
+        emit readyToContinue();
     }
 }
 
@@ -861,6 +881,18 @@ void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QS
 
 bool SaveSetsPage::validatePage()
 {
+    if (!isComplete()) {
+        return false;
+    }
+    const auto failSave = [this](const QString &message) {
+        qWarning() << message;
+        if (wizard()->backgroundMode) {
+            wizard()->reject();
+        } else {
+            QMessageBox::critical(this, tr("Error"), message);
+        }
+        return false;
+    };
     QString defaultPath = SettingsCache::instance().getCardDatabasePath();
     QString windowName = tr("Save card database");
     QString fileType = tr("XML; card database (*.xml)");
@@ -879,24 +911,21 @@ bool SaveSetsPage::validatePage()
     QFileInfo fi(fileName);
     QDir fileDir(fi.path());
     if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) {
-        return false;
+        return failSave(tr("The database directory could not be created: %1").arg(fileDir.absolutePath()));
     }
 
     if (wizard()->downloadedPlainXml) {
-        QFile file(fileName);
-        if (!file.open(QIODevice::WriteOnly)) {
-            qDebug() << "File write (w) failed for" << fileName;
-            return false;
-        }
-        if (file.write(wizard()->xmlData) < 1) {
-            qDebug() << "File write (w) failed for" << fileName;
-            return false;
+        QString error;
+        if (!OracleDatabase::saveXml(fileName, wizard()->xmlData, &error)) {
+            return failSave(tr("The file could not be saved to %1: %2").arg(fileName, error));
         }
         wizard()->xmlData.clear();
     } else if (!wizard()->importer->saveToFile(fileName, wizard()->getCardSourceUrl(),
                                                wizard()->getCardSourceVersion())) {
-        QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName));
-        return false;
+        // The importer refuses to write a database whose import did not finish, and
+        // reports the reason there; do not dress an import failure up as a disk failure.
+        const QString importError = wizard()->importer->getImportError();
+        return failSave(importError.isEmpty() ? tr("The file could not be saved to %1").arg(fileName) : importError);
     }
 
     wizard()->markDatabaseSaved();
diff --git a/oracle/src/pages.h b/oracle/src/pages.h
index 221f032d3..e29a8e84a 100644
--- a/oracle/src/pages.h
+++ b/oracle/src/pages.h
@@ -31,7 +31,6 @@ public:
 
 private:
     QStringList findQmFiles();
-    QString languageName(const QString &lang);
 
 private:
     QLabel *label, *languageLabel, *versionLabel;
@@ -129,6 +128,7 @@ private:
     QFuture<int> importFuture;
     int totalSets = 0;
     bool importActive = false;
+    bool importReady = false;
 
 protected:
     void initializePage() override;
diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp
index dcc8e070c..7e5f30bb7 100644
--- a/oracle/src/pagetemplates.cpp
+++ b/oracle/src/pagetemplates.cpp
@@ -1,5 +1,6 @@
 #include "pagetemplates.h"
 
+#include "database_writer.h"
 #include "oraclewizard.h"
 
 #include <QCheckBox>
@@ -184,9 +185,17 @@ void SimpleDownloadFilePage::actDownloadFinished()
     }
     QNetworkReply::NetworkError errorCode = reply->error();
     if (errorCode != QNetworkReply::NoError) {
-        QMessageBox::critical(this, tr("Error"), tr("Network error: %1.").arg(reply->errorString()));
-        wizard()->enableButtons();
+        const QString message = tr("Network error: %1.").arg(reply->errorString());
         reply->deleteLater();
+        // A hidden wizard cannot show a modal box: without an explicit stop it would sit
+        // here forever and the hosting client would wait with no timeout.
+        if (wizard()->backgroundMode) {
+            qWarning() << message;
+            wizard()->reject();
+            return;
+        }
+        QMessageBox::critical(this, tr("Error"), message);
+        wizard()->enableButtons();
         return;
     }
 
@@ -218,6 +227,15 @@ void SimpleDownloadFilePage::actDownloadFinished()
 
 bool SimpleDownloadFilePage::saveToFile()
 {
+    const auto failSave = [this](const QString &message) {
+        qWarning() << message;
+        if (wizard()->backgroundMode) {
+            wizard()->reject();
+        } else {
+            QMessageBox::critical(this, tr("Error"), message);
+        }
+        return false;
+    };
     QString defaultPath = getDefaultSavePath();
     QString windowName = getWindowTitle();
     QString fileType = getFileType();
@@ -236,12 +254,11 @@ bool SimpleDownloadFilePage::saveToFile()
     QFileInfo fi(fileName);
     QDir fileDir(fi.path());
     if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) {
-        return false;
+        return failSave(tr("The database directory could not be created: %1").arg(fileDir.absolutePath()));
     }
 
     if (!internalSaveToFile(fileName)) {
-        QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName));
-        return false;
+        return failSave(tr("The file could not be saved to %1").arg(fileName));
     }
 
     // clean saved downloadData
@@ -252,17 +269,10 @@ bool SimpleDownloadFilePage::saveToFile()
 
 bool SimpleDownloadFilePage::internalSaveToFile(const QString &fileName)
 {
-    QFile file(fileName);
-    if (!file.open(QIODevice::WriteOnly)) {
-        qDebug() << "File open (w) failed for" << fileName;
+    QString error;
+    if (!OracleDatabase::saveXml(fileName, downloadData, &error)) {
+        qWarning() << error;
         return false;
     }
-
-    if (file.write(downloadData) == -1) {
-        qDebug() << "File write (w) failed for" << fileName;
-        return false;
-    }
-
-    file.close();
     return true;
 }
diff --git a/oracle/translations/oracle_de.ts b/oracle/translations/oracle_de.ts
index faf08d5ce..50a5f8e20 100644
--- a/oracle/translations/oracle_de.ts
+++ b/oracle/translations/oracle_de.ts
@@ -137,22 +137,22 @@
     <message>
         <location filename="src/pages.cpp" line="379"/>
         <source>Downloading (0 MB)</source>
-        <translation type="unfinished"/>
+        <translation>Herunterladen (0 MB)</translation>
     </message>
     <message>
         <location filename="src/pages.cpp" line="460"/>
         <source>Downloading (%1 MB)</source>
-        <translation type="unfinished"/>
+        <translation>Herunterladen (%1 MB)</translation>
     </message>
     <message>
         <location filename="src/pages.cpp" line="509"/>
         <source>Parsing file (%1%)</source>
-        <translation type="unfinished"/>
+        <translation>Datei wird verarbeitet (%1%)</translation>
     </message>
     <message>
         <location filename="src/pages.cpp" line="524"/>
         <source>Extracting file...</source>
-        <translation type="unfinished"/>
+        <translation>Extrahiere Datei...</translation>
     </message>
     <message>
         <location filename="src/pages.cpp" line="604"/>
@@ -168,7 +168,7 @@
     <message>
         <location filename="src/pages.cpp" line="666"/>
         <source>Parsing file (100%)</source>
-        <translation type="unfinished"/>
+        <translation>Datei wird verarbeitet (100%)</translation>
     </message>
 </context>
 <context>
@@ -348,7 +348,7 @@
     <message>
         <location filename="src/pages.cpp" line="797"/>
         <source>A Cockatrice card database file of %1 MB has been downloaded.</source>
-        <translation type="unfinished"/>
+        <translation>Eine Cockatrice-Kartendatenbankdatei der Größe %1 MB wurde heruntergeladen.</translation>
     </message>
     <message>
         <location filename="src/pages.cpp" line="800"/>
@@ -434,7 +434,7 @@
         <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0 MB)</source>
         <oldsource>Downloading (0MB)</oldsource>
-        <translation type="unfinished"/>
+        <translation>Herunterladen (0 MB)</translation>
     </message>
     <message>
         <location filename="src/pagetemplates.cpp" line="129"/>
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 255469934..9d8dd46d2 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -56,7 +56,7 @@ if(APPLE)
   set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 endif(APPLE)
 
-qt6_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
+qt_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
 
 set(QT_DONT_USE_QTGUI TRUE)
 
diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example
index 021f5157f..ac291fd7f 100644
--- a/servatrice/servatrice.ini.example
+++ b/servatrice/servatrice.ini.example
@@ -455,9 +455,11 @@ authentication_strictness=mixed
 ; the scrypt verifier, so old clients can still log in during the window below without
 ; the database holding a fast-crackable hash in the clear.
 ; Generate with: openssl rand -hex 32
-; If unset, migrated accounts have no downgrade window: old clients must use a password
-; reset to get back in. Rotating the key invalidates existing backups (they become
-; unusable immediately; expired ones are still purged).
+; If unset there is no downgrade path at all: a migrated account keeps only a scrypt
+; verifier, and an administrator's password reset stores a verifier too, so pre-challenge
+; clients cannot log in with the temporary password either. Set the key if you still serve
+; them. Rotating the key invalidates existing backups (they become unusable immediately;
+; expired ones are still purged).
 legacy_backup_key=
 
 ; Days a legacy password backup may go unused before it is purged from the database.
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 8733c9a40..1898cd5fa 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -58,17 +58,16 @@ void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privat
     socket->setLocalCertificate(cert);
     socket->setPrivateKey(privateKey);
 
-    connect(socket, SIGNAL(readyRead()), this, SLOT(readClient()), Qt::QueuedConnection);
-    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-            SLOT(catchSocketError(QAbstractSocket::SocketError)));
-    connect(this, SIGNAL(outputBufferChanged()), this, SLOT(flushOutputBuffer()), Qt::QueuedConnection);
+    connect(socket, &QSslSocket::readyRead, this, &IslInterface::readClient, Qt::QueuedConnection);
+    connect(socket, &QAbstractSocket::errorOccurred, this, &IslInterface::catchSocketError);
+    connect(this, &IslInterface::outputBufferChanged, this, &IslInterface::flushOutputBuffer, Qt::QueuedConnection);
 }
 
 IslInterface::IslInterface(int _socketDescriptor,
                            const QSslCertificate &cert,
                            const QSslKey &privateKey,
                            Servatrice *_server)
-    : QObject(), socketDescriptor(_socketDescriptor), server(_server), messageInProgress(false)
+    : QObject(), serverId(-1), socketDescriptor(_socketDescriptor), server(_server), messageInProgress(false)
 {
     sharedCtor(cert, privateKey);
 }
@@ -264,13 +263,17 @@ void IslInterface::readClient()
     server->incRxBytes(data.size());
     inputBuffer.append(data);
 
-    do {
+    // Parse messages straight out of inputBuffer at readOffset. Removing each
+    // consumed message from the front would memmove the remaining bytes once
+    // per message; the consumed prefix is dropped once parsing stops.
+    qsizetype readOffset = 0;
+
+    while (true) {
         if (!messageInProgress) {
-            if (inputBuffer.size() >= 4) {
-                messageLength = (((quint32)(unsigned char)inputBuffer[0]) << 24) +
-                                (((quint32)(unsigned char)inputBuffer[1]) << 16) +
-                                (((quint32)(unsigned char)inputBuffer[2]) << 8) +
-                                ((quint32)(unsigned char)inputBuffer[3]);
+            if (inputBuffer.size() - readOffset >= 4) {
+                const auto *header = reinterpret_cast<const unsigned char *>(inputBuffer.constData() + readOffset);
+                messageLength = (static_cast<quint32>(header[0]) << 24) + (static_cast<quint32>(header[1]) << 16) +
+                                (static_cast<quint32>(header[2]) << 8) + static_cast<quint32>(header[3]);
                 // Reject implausible lengths instead of buffering until they arrive.
                 // This also handles lengths that overflow into negative int values.
                 if (messageLength < 0 || messageLength > MAX_ISL_MESSAGE_SIZE) {
@@ -278,19 +281,19 @@ void IslInterface::readClient()
                     socket->disconnectFromHost();
                     return;
                 }
-                inputBuffer.remove(0, 4);
+                readOffset += 4;
                 messageInProgress = true;
             } else {
-                return;
+                break;
             }
         }
-        if (inputBuffer.size() < messageLength) {
-            return;
+        if (inputBuffer.size() - readOffset < messageLength) {
+            break;
         }
 
         IslMessage newMessage;
-        bool ok = newMessage.ParseFromArray(inputBuffer.data(), messageLength);
-        inputBuffer.remove(0, messageLength);
+        bool ok = newMessage.ParseFromArray(inputBuffer.constData() + readOffset, messageLength);
+        readOffset += messageLength;
         messageInProgress = false;
 
         if (ok) {
@@ -298,7 +301,12 @@ void IslInterface::readClient()
         } else {
             qCWarning(IslInterfaceLog) << "parsing error!";
         }
-    } while (!inputBuffer.isEmpty());
+    }
+
+    // Drop the consumed prefix once, instead of shifting the buffer per message.
+    if (readOffset > 0) {
+        inputBuffer.remove(0, readOffset);
+    }
 }
 
 void IslInterface::catchSocketError(QAbstractSocket::SocketError socketError)
@@ -495,7 +503,9 @@ void IslInterface::processRoomCommand(const CommandContainer &cont, qint64 sessi
 
 void IslInterface::processMessage(const IslMessage &item)
 {
-    qCDebug(IslInterfaceLog) << getSafeDebugString(item);
+    if (IslInterfaceLog().isDebugEnabled()) {
+        qCDebug(IslInterfaceLog) << getSafeDebugString(item);
+    }
 
     switch (item.message_type()) {
         case IslMessage::ROOM_COMMAND_CONTAINER: {
diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index eb019a2b7..4d513d026 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -41,6 +41,7 @@
 #include <QThread>
 #include <QVariant>
 #include <QVector>
+#include <cstdlib>
 #include <google/protobuf/stubs/common.h>
 #include <iostream>
 #include <libcockatrice/rng/rng_sfmt.h>
@@ -162,14 +163,15 @@ int main(int argc, char *argv[])
         configPath = SettingsCache::guessConfigurationPath();
     } else if (!QFile::exists(configPath)) {
         qCritical() << "Could not find configuration file at" << configPath;
-        return 1;
+        return EXIT_FAILURE;
     }
     qWarning() << "Using configuration file: " << configPath;
     settingsCache = new SettingsCache(configPath);
 
     loggerThread = new QThread;
     loggerThread->setObjectName("logger");
-    logger = new ServerLogger(logToConsole);
+    logger = new ServerLogger(logToConsole, settingsCache->value("server/writelog", 1).toBool(),
+                              settingsCache->value("server/logfilters").toString());
     logger->moveToThread(loggerThread);
 
     loggerThread->start();
@@ -214,8 +216,16 @@ int main(int argc, char *argv[])
 
         std::cerr << "Server quit." << std::endl;
         std::cerr << "-------------------------" << std::endl;
+    } else {
+        // initServer() logged the reason; a failed startup must not look like a clean exit.
+        std::cerr << "Server initialization failed, exiting." << std::endl;
+        retval = EXIT_FAILURE;
     }
 
+    // The handler reads the logger and settingsCache globals torn down below; leaving it
+    // installed lets Qt's own shutdown warnings dereference freed memory.
+    qInstallMessageHandler(nullptr);
+
     delete smtpClient;
     delete rng;
     delete signalhandler;
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index b6eaf11f4..afe028f32 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -100,8 +100,10 @@ Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
 
         newThread->start();
         server->watchWorkerThread(newThread);
-        QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection,
-                                  Q_ARG(QSqlDatabase, _sqlDatabase));
+        QMetaObject::invokeMethod(
+            newDatabaseInterface,
+            [newDatabaseInterface, _sqlDatabase] { newDatabaseInterface->initDatabase(_sqlDatabase); },
+            Qt::BlockingQueuedConnection);
 
         connectionPools.append(newPool);
     }
@@ -125,9 +127,10 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor)
     auto ssi = new TcpServerSocketInterface(server, pool->getDatabaseInterface());
     ssi->moveToThread(pool->thread());
     pool->addClient();
-    connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient()));
+    connect(ssi, &QObject::destroyed, pool, &Servatrice_ConnectionPool::removeClient);
 
-    QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor));
+    QMetaObject::invokeMethod(
+        ssi, [ssi, socketDescriptor] { ssi->initConnection(socketDescriptor); }, Qt::QueuedConnection);
 }
 
 Servatrice_ConnectionPool *Servatrice_GameServer::findLeastUsedConnectionPool()
@@ -168,13 +171,15 @@ Servatrice_WebsocketGameServer::Servatrice_WebsocketGameServer(Servatrice *_serv
 
         newThread->start();
         server->watchWorkerThread(newThread);
-        QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection,
-                                  Q_ARG(QSqlDatabase, _sqlDatabase));
+        QMetaObject::invokeMethod(
+            newDatabaseInterface,
+            [newDatabaseInterface, _sqlDatabase] { newDatabaseInterface->initDatabase(_sqlDatabase); },
+            Qt::BlockingQueuedConnection);
 
         connectionPools.append(newPool);
-
-        connect(this, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
     }
+
+    connect(this, &QWebSocketServer::newConnection, this, &Servatrice_WebsocketGameServer::onNewConnection);
 }
 
 Servatrice_WebsocketGameServer::~Servatrice_WebsocketGameServer()
@@ -199,9 +204,10 @@ void Servatrice_WebsocketGameServer::onNewConnection()
      */
     // ssi->moveToThread(pool->thread());
     pool->addClient();
-    connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient()));
+    connect(ssi, &QObject::destroyed, pool, &Servatrice_ConnectionPool::removeClient);
 
-    QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(void *, nextPendingConnection()));
+    void *socket = nextPendingConnection();
+    QMetaObject::invokeMethod(ssi, [ssi, socket] { ssi->initConnection(socket); }, Qt::QueuedConnection);
 }
 
 Servatrice_ConnectionPool *Servatrice_WebsocketGameServer::findLeastUsedConnectionPool()
@@ -224,14 +230,14 @@ Servatrice_ConnectionPool *Servatrice_WebsocketGameServer::findLeastUsedConnecti
 void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor)
 {
     auto thread = new QThread;
-    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+    connect(thread, &QThread::finished, thread, &QObject::deleteLater);
 
     auto interface = new IslInterface(static_cast<int>(socketDescriptor), cert, privateKey, server);
     interface->moveToThread(thread);
-    connect(interface, SIGNAL(destroyed()), thread, SLOT(quit()));
+    connect(interface, &QObject::destroyed, thread, &QThread::quit);
 
     thread->start();
-    QMetaObject::invokeMethod(interface, "initServer", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(interface, [interface] { interface->initServer(); }, Qt::QueuedConnection);
 }
 
 Servatrice::Servatrice(QObject *parent)
@@ -308,7 +314,8 @@ bool Servatrice::initServer()
         authenticationMethod = AuthenticationPassword;
     } else {
         if (getRegOnlyServerEnabled()) {
-            qDebug() << "Registration only server enabled but no authentication method defined: Error.";
+            qCCritical(ServatriceLog) << "Registration only server enabled but no authentication method defined; "
+                                         "refusing to start.";
             return false;
         }
         qDebug() << "Authenticating method: none";
@@ -379,7 +386,7 @@ bool Servatrice::initServer()
         bool dbOpened = servatriceDatabaseInterface->initDatabase(
             "QMYSQL", getDBHostNameString(), getDBDatabaseNameString(), getDBUserNameString(), getDBPasswordString());
         if (!dbOpened) {
-            qDebug() << "Failed to open database";
+            qCCritical(ServatriceLog) << "Failed to open the database; refusing to start.";
             return false;
         }
         updateServerList();
@@ -584,15 +591,16 @@ bool Servatrice::initServer()
 
                 auto *thread = new QThread;
                 thread->setObjectName("isl_" + QString::number(prop.id));
-                connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+                connect(thread, &QThread::finished, thread, &QObject::deleteLater);
 
                 IslInterface *interface = new IslInterface(prop.id, prop.hostname, prop.address.toString(),
                                                            prop.controlPort, prop.cert, cert, key, this);
                 interface->moveToThread(thread);
-                connect(interface, SIGNAL(destroyed()), thread, SLOT(quit()));
+                connect(interface, &QObject::destroyed, thread, &QThread::quit);
 
                 thread->start();
-                QMetaObject::invokeMethod(interface, "initClient", Qt::BlockingQueuedConnection);
+                QMetaObject::invokeMethod(
+                    interface, [interface] { interface->initClient(); }, Qt::BlockingQueuedConnection);
             }
 
             qDebug() << "Starting ISL server on port" << getISLNetworkPort();
@@ -600,27 +608,27 @@ bool Servatrice::initServer()
             if (islServer->listen(QHostAddress::Any, static_cast<quint16>(getISLNetworkPort()))) {
                 qDebug() << "ISL server listening.";
             } else {
-                throw QString("islServer->listen()");
+                throw islServer->errorString();
             }
         }
     } catch (QString &error) {
-        qDebug() << "ERROR --" << error;
+        qCCritical(ServatriceLog) << "Failed to start the ISL server:" << error;
         return false;
     }
 
     pingClock = new QTimer(this);
-    connect(pingClock, SIGNAL(timeout()), this, SIGNAL(pingClockTimeout()));
+    connect(pingClock, &QTimer::timeout, this, &Servatrice::pingClockTimeout);
     pingClock->start(getClientKeepAlive() * 1000);
 
     statusUpdateClock = new QTimer(this);
-    connect(statusUpdateClock, SIGNAL(timeout()), this, SLOT(statusUpdate()));
+    connect(statusUpdateClock, &QTimer::timeout, this, &Servatrice::statusUpdate);
     if (getServerStatusUpdateTime() != 0) {
         qDebug() << "Starting status update clock, interval" << getServerStatusUpdateTime() << "ms";
         statusUpdateClock->start(getServerStatusUpdateTime());
     }
 
     deckShareCleanupClock = new QTimer(this);
-    connect(deckShareCleanupClock, SIGNAL(timeout()), this, SLOT(cleanupExpiredDeckShares()));
+    connect(deckShareCleanupClock, &QTimer::timeout, this, &Servatrice::cleanupExpiredDeckShares);
     const int deckShareCleanupInterval = getDeckShareCleanupInterval();
     if (deckShareCleanupInterval > 0) {
         qDebug() << "Starting deck share cleanup clock, interval" << deckShareCleanupInterval << "ms";
@@ -641,7 +649,7 @@ bool Servatrice::initServer()
         if (gameServer->listen(tcpHost, static_cast<quint16>(getServerTCPPort()))) {
             qDebug() << "Server listening.";
         } else {
-            qDebug() << "gameServer->listen(): Error:" << gameServer->errorString();
+            qCCritical(ServatriceLog) << "Failed to listen for TCP clients:" << gameServer->errorString();
             return false;
         }
     }
@@ -657,7 +665,8 @@ bool Servatrice::initServer()
         if (websocketGameServer->listen(webSocketHost, static_cast<quint16>(getServerWebSocketPort()))) {
             qDebug() << "Websocket server listening.";
         } else {
-            qDebug() << "websocketGameServer->listen(): Error:" << websocketGameServer->errorString();
+            qCCritical(ServatriceLog) << "Failed to listen for websocket clients:"
+                                      << websocketGameServer->errorString();
             return false;
         }
     }
@@ -1036,7 +1045,7 @@ void Servatrice::scheduleShutdown(const QString &reason, int minutes)
     nextShutdownMessageMinutes = shutdownMinutes;
     if (minutes > 0) {
         shutdownTimer = new QTimer;
-        connect(shutdownTimer, SIGNAL(timeout()), this, SLOT(shutdownTimeout()));
+        connect(shutdownTimer, &QTimer::timeout, this, &Servatrice::shutdownTimeout);
         shutdownTimer->start(60000);
     }
     shutdownStateMutex.unlock();
@@ -1099,25 +1108,19 @@ void Servatrice::addIslInterface(int _serverId, IslInterface *interface)
 {
     // Only call with islLock locked for writing
     islInterfaces.insert(_serverId, interface);
-    connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User)));
-    connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString)));
-    connect(interface, SIGNAL(externalRoomUserJoined(int, ServerInfo_User)), this,
-            SLOT(externalRoomUserJoined(int, ServerInfo_User)));
-    connect(interface, SIGNAL(externalRoomUserLeft(int, QString)), this, SLOT(externalRoomUserLeft(int, QString)));
-    connect(interface, SIGNAL(externalRoomSay(int, QString, QString, QString)), this,
-            SLOT(externalRoomSay(int, QString, QString, QString)));
-    connect(interface, SIGNAL(externalRoomRemoveMessages(int, QString, int)), this,
-            SLOT(externalRoomRemoveMessages(int, QString, int)));
-    connect(interface, SIGNAL(externalRoomGameListChanged(int, ServerInfo_Game)), this,
-            SLOT(externalRoomGameListChanged(int, ServerInfo_Game)));
-    connect(interface, SIGNAL(joinGameCommandReceived(Command_JoinGame, int, int, int, qint64)), this,
-            SLOT(externalJoinGameCommandReceived(Command_JoinGame, int, int, int, qint64)));
-    connect(interface, SIGNAL(gameCommandContainerReceived(CommandContainer, int, int, qint64)), this,
-            SLOT(externalGameCommandContainerReceived(CommandContainer, int, int, qint64)));
-    connect(interface, SIGNAL(responseReceived(Response, qint64)), this,
-            SLOT(externalResponseReceived(Response, qint64)));
-    connect(interface, SIGNAL(gameEventContainerReceived(GameEventContainer, qint64)), this,
-            SLOT(externalGameEventContainerReceived(GameEventContainer, qint64)));
+    connect(interface, &IslInterface::externalUserJoined, this, &Servatrice::externalUserJoined);
+    connect(interface, &IslInterface::externalUserLeft, this, &Servatrice::externalUserLeft);
+    connect(interface, &IslInterface::externalRoomUserJoined, this, &Servatrice::externalRoomUserJoined);
+    connect(interface, &IslInterface::externalRoomUserLeft, this, &Servatrice::externalRoomUserLeft);
+    connect(interface, &IslInterface::externalRoomSay, this, &Servatrice::externalRoomSay);
+    connect(interface, &IslInterface::externalRoomRemoveMessages, this, &Servatrice::externalRoomRemoveMessages);
+    connect(interface, &IslInterface::externalRoomGameListChanged, this, &Servatrice::externalRoomGameListChanged);
+    connect(interface, &IslInterface::joinGameCommandReceived, this, &Servatrice::externalJoinGameCommandReceived);
+    connect(interface, &IslInterface::gameCommandContainerReceived, this,
+            &Servatrice::externalGameCommandContainerReceived);
+    connect(interface, &IslInterface::responseReceived, this, &Servatrice::externalResponseReceived);
+    connect(interface, &IslInterface::gameEventContainerReceived, this,
+            &Servatrice::externalGameEventContainerReceived);
 }
 
 void Servatrice::removeIslInterface(int _serverId)
diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp
index 04f6047fa..a4f184e38 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -33,6 +33,7 @@
 #include <QStringList>
 #include <QVariant>
 #include <QVariantList>
+#include <QtGlobal>
 #include <google/protobuf/stubs/common.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
@@ -482,6 +483,10 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
                     const QByteArray expected = PasswordHasher::computeResponse(key, nonce);
                     handler->clearAuthNonce();
                     if (PasswordHasher::constantTimeEquals(expected, response)) {
+                        if (forceChange) {
+                            qCDebug(DatabaseInterfaceLog) << "Login accepted but password change required";
+                            return PasswordChangeRequired;
+                        }
                         qCDebug(DatabaseInterfaceLog) << "Login accepted: challenge-response password right";
                         return PasswordRight;
                     }
@@ -755,6 +760,20 @@ QString Servatrice_DatabaseInterface::getUserPasswordData(const QString &user)
     return query->value(0).toString();
 }
 
+QString Servatrice_DatabaseInterface::sealLegacyBackup(const QString &storedName, const QString &credential)
+{
+    const QByteArray key = server->getLegacyBackupKey();
+    if (key.isEmpty()) {
+        return {};
+    }
+    const QByteArray aad = storedName.simplified().toUtf8();
+    const QString sealed = CryptoUtil::encryptSecret(credential.toUtf8(), key, aad);
+    if (sealed.isEmpty() || sealed.length() > MAX_LEGACY_BACKUP_LENGTH) {
+        return {};
+    }
+    return sealed;
+}
+
 bool Servatrice_DatabaseInterface::submitPasswordVerifier(const QString &user, const QString &passwordVerifier)
 {
     if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) {
@@ -779,18 +798,13 @@ bool Servatrice_DatabaseInterface::submitPasswordVerifier(const QString &user, c
 
     QString sealedBackup;
     QDateTime backupUsedAt;
-    if (PasswordHasher::isLegacyFormat(currentCredential)) {
-        const QByteArray key = server->getLegacyBackupKey();
-        if (!key.isEmpty()) {
-            const QByteArray aad = storedName.simplified().toUtf8();
-            sealedBackup = CryptoUtil::encryptSecret(currentCredential.toUtf8(), key, aad);
-            if (sealedBackup.isEmpty() || sealedBackup.length() > MAX_LEGACY_BACKUP_LENGTH) {
-                qCWarning(DatabaseInterfaceLog)
-                    << "Failed to seal legacy backup for user" << user << "- account migrates without a downgrade path";
-                sealedBackup.clear();
-            } else {
-                backupUsedAt = QDateTime::currentDateTimeUtc();
-            }
+    if (PasswordHasher::isLegacyFormat(currentCredential) && !server->getLegacyBackupKey().isEmpty()) {
+        sealedBackup = sealLegacyBackup(storedName, currentCredential);
+        if (sealedBackup.isEmpty()) {
+            qCWarning(DatabaseInterfaceLog)
+                << "Failed to seal legacy backup for user" << user << "- account migrates without a downgrade path";
+        } else {
+            backupUsedAt = QDateTime::currentDateTimeUtc();
         }
     }
 
@@ -1644,6 +1658,54 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
     return passwordQuery->numRowsAffected() > 0;
 }
 
+bool Servatrice_DatabaseInterface::changeUserPasswordWithLegacyBackup(const QString &user,
+                                                                      const QString &passwordVerifier,
+                                                                      const QString &legacyCredential)
+{
+    if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) {
+        return false;
+    }
+
+    if (!checkSql()) {
+        return false;
+    }
+
+    // Seal against the stored row name, not the caller-supplied one: the name column is
+    // case-insensitive, so a differently-cased name would fail the tag check on open.
+    QSqlQuery *nameQuery = prepareQuery("SELECT name FROM {prefix}_users WHERE name = :name");
+    nameQuery->bindValue(":name", user);
+    if (!execSqlQuery(nameQuery) || !nameQuery->next()) {
+        return false;
+    }
+    const QString storedName = nameQuery->value(0).toString();
+
+    const QString sealedBackup = sealLegacyBackup(storedName, legacyCredential);
+    const QDateTime backupUsedAt = sealedBackup.isEmpty() ? QDateTime() : QDateTime::currentDateTimeUtc();
+    if (sealedBackup.isEmpty()) {
+        // Without a backup a pre-challenge client has nothing to authenticate against: the
+        // row holds a verifier and the legacy hash it would send cannot match it. Say so,
+        // because the symptom - the temporary password appearing not to work - shows up on
+        // a different machine from the one that reset it.
+        qCWarning(DatabaseInterfaceLog) << "Stored a verifier without a legacy backup for user" << user
+                                        << "- pre-challenge clients cannot use this password"
+                                        << "- check security/legacy_backup_key";
+    }
+
+    QSqlQuery *query = prepareQuery("update {prefix}_users set password_sha512=:password, "
+                                    "password_legacy_backup=:backup, password_legacy_backup_used_at=:used_at, "
+                                    "passwordLastChangedDate = NOW() where name = :name");
+    query->bindValue(":password", passwordVerifier);
+    query->bindValue(":backup", sealedBackup);
+    query->bindValue(":used_at", backupUsedAt.isValid()
+                                     ? QVariant(backupUsedAt.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss")))
+                                     : QVariant());
+    query->bindValue(":name", storedName);
+    if (!execSqlQuery(query)) {
+        return false;
+    }
+    return query->numRowsAffected() > 0;
+}
+
 void Servatrice_DatabaseInterface::setForcePasswordChange(const QString &user, bool force)
 {
     if (!checkSql()) {
@@ -2077,6 +2139,108 @@ bool Servatrice_DatabaseInterface::removeUserAvatar(const QString &userName)
     return query->numRowsAffected() > 0;
 }
 
+Servatrice_DatabaseInterface::RemoveUserBannerResult
+Servatrice_DatabaseInterface::removeUserBanner(const QString &userName)
+{
+    if (!checkSql()) {
+        return RemoveUserBannerResult::DatabaseError;
+    }
+
+    // The UPDATE alone cannot tell a missing user from a user without a banner,
+    // so read the row first and let the moderator know which case they hit.
+    QSqlQuery *lookupQuery = prepareQuery("SELECT card_art_params FROM {prefix}_users WHERE name = :user_name");
+    lookupQuery->bindValue(":user_name", userName);
+    if (!execSqlQuery(lookupQuery)) {
+        return RemoveUserBannerResult::DatabaseError;
+    }
+    if (!lookupQuery->next()) {
+        return RemoveUserBannerResult::NoSuchUser;
+    }
+    if (lookupQuery->value(0).toString().isEmpty()) {
+        return RemoveUserBannerResult::NothingToRemove;
+    }
+
+    QSqlQuery *query = prepareQuery("UPDATE {prefix}_users SET card_art_params = NULL WHERE name = :user_name");
+    query->bindValue(":user_name", userName);
+    if (!execSqlQuery(query)) {
+        return RemoveUserBannerResult::DatabaseError;
+    }
+    return RemoveUserBannerResult::Removed;
+}
+
+// isCardArtAllowed() compares against the rule table with the database's
+// case-insensitive collation, so the sweep has to fold case the same way or it
+// leaves behind banners the server already treats as blacklisted.
+static QPair<QString, QString> bannerKey(const QString &cardName, const QString &cardProviderId)
+{
+    return {cardName.toCaseFolded(), cardProviderId.toCaseFolded()};
+}
+
+int Servatrice_DatabaseInterface::clearBlacklistedBanners()
+{
+    if (!checkSql()) {
+        return -1;
+    }
+
+    QSqlQuery *ruleQuery = prepareQuery("SELECT card_name, card_provider_id FROM {prefix}_card_art_name_rules "
+                                        "WHERE mode = 'DENY'");
+    if (!execSqlQuery(ruleQuery)) {
+        return -1;
+    }
+
+    QSet<QPair<QString, QString>> denied;
+    while (ruleQuery->next()) {
+        denied.insert(bannerKey(ruleQuery->value(0).toString(), ruleQuery->value(1).toString()));
+    }
+    if (denied.isEmpty()) {
+        return 0;
+    }
+
+    QSqlQuery *userQuery =
+        prepareQuery("SELECT id, card_art_params FROM {prefix}_users WHERE card_art_params IS NOT NULL");
+    if (!execSqlQuery(userQuery)) {
+        return -1;
+    }
+
+    QList<QVariant> matchingIds;
+    while (userQuery->next()) {
+        const QJsonDocument doc = QJsonDocument::fromJson(userQuery->value(1).toString().toUtf8());
+        if (!doc.isObject()) {
+            continue;
+        }
+        const QJsonObject obj = doc.object();
+        if (denied.contains(bannerKey(obj.value("card_name").toString(), obj.value("card_provider_id").toString()))) {
+            matchingIds.append(userQuery->value(0));
+        }
+    }
+
+    if (matchingIds.isEmpty()) {
+        return 0;
+    }
+
+    // Chunk the UPDATE so very large user tables do not exceed driver placeholder limits.
+    int cleared = 0;
+    constexpr int BATCH_SIZE = 500;
+    for (int i = 0; i < matchingIds.size(); i += BATCH_SIZE) {
+        const QList<QVariant> batch = matchingIds.mid(i, BATCH_SIZE);
+        QStringList placeholders;
+        placeholders.reserve(batch.size());
+        for (int j = 0; j < batch.size(); ++j) {
+            placeholders.append(QString(":id%1").arg(j));
+        }
+        QSqlQuery *clearQuery = prepareQuery(
+            QString("UPDATE {prefix}_users SET card_art_params = NULL WHERE id IN (%1)").arg(placeholders.join(",")));
+        for (int j = 0; j < batch.size(); ++j) {
+            clearQuery->bindValue(placeholders.at(j), batch.at(j));
+        }
+        if (!execSqlQuery(clearQuery)) {
+            return -1;
+        }
+        cleared += clearQuery->numRowsAffected();
+    }
+    return cleared;
+}
+
 QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory(const QString &user,
                                                                                  const QString &ipaddress,
                                                                                  const QString &gamename,
@@ -2086,8 +2250,14 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
                                                                                  bool &game,
                                                                                  bool &room,
                                                                                  int &range,
-                                                                                 int &maxresults)
+                                                                                 int &maxresults,
+                                                                                 int offset,
+                                                                                 const QString &beforeTime,
+                                                                                 bool *hasMore)
 {
+    if (hasMore != nullptr) {
+        *hasMore = false;
+    }
 
     QList<ServerInfo_ChatMessage> results;
     ServerInfo_ChatMessage chatMessage;
@@ -2096,8 +2266,31 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
         return results;
     }
 
-    if (user.isEmpty() && ipaddress.isEmpty() && gameid.isEmpty() && gamename.isEmpty()) {
-        // To ensure quick results and minimal lag, require an indexed field
+    // Page size guard: always bound the scan so a filter-less browse of room
+    // history cannot become a 50M-row fetch. Zero means "client did not set a
+    // size", so fall back to one smooth-scroll page.
+    const int pageSize = maxresults <= 0 ? 200 : qBound(1, maxresults, 1000);
+    maxresults = pageSize;
+    const int safeOffset = qMax(0, offset);
+
+    const bool hasIndexedFilter = !user.isEmpty() || !ipaddress.isEmpty() || !gameid.isEmpty() || !gamename.isEmpty();
+    const bool hasLocationFilter = chat || game || room;
+    if (!hasLocationFilter) {
+        // No target_type restriction would mix private chat into a room/game
+        // browse, so refuse rather than leak.
+        return results;
+    }
+    // A browse narrowed only by a message substring has no index to serve it, and `range`
+    // has no upper bound on the wire: the client offers 20 days, but a hand-built command
+    // can ask for any value and every LIKE candidate in it is a row the server examines.
+    // Clamping here keeps the guard independent of what the client happens to send.
+    constexpr int maxFilterlessRangeHours = 20 * 24;
+    if (!hasIndexedFilter && range > maxFilterlessRangeHours) {
+        range = maxFilterlessRangeHours;
+    }
+    if (!hasIndexedFilter && range <= 0) {
+        // Filter-less browse must stay time-bounded (idx_log_time) so the
+        // query stays an index range scan instead of a full table scan.
         return results;
     }
 
@@ -2152,10 +2345,23 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
         queryString.append(" AND log_time >= DATE_SUB(now(), INTERVAL :range_time HOUR)");
     }
 
-    if (maxresults) {
-        queryString.append(" LIMIT :limit_size");
+    if (!beforeTime.isEmpty()) {
+        // Pages after the first run against the snapshot fixed by the first one, so rows
+        // logged while the moderator scrolls can no longer push the OFFSET window down and
+        // repeat a row already on screen.
+        queryString.append(" AND log_time <= :before_time");
     }
 
+    // Newest-first keeps "going back from today" stable across pages and lets
+    // the client append older rows at the bottom for smooth infinite scroll.
+    queryString.append(" ORDER BY log_time DESC");
+
+    // Fetch one extra row when the caller wants a has_more cursor so a full
+    // page does not need a second empty round-trip to prove exhaustion.
+    const bool detectMore = (hasMore != nullptr);
+    const int fetchSize = detectMore ? pageSize + 1 : pageSize;
+    queryString.append(" LIMIT :limit_size OFFSET :offset_size");
+
     QSqlQuery *query = prepareQuery(queryString);
     if (!user.isEmpty()) {
         query->bindValue(":user_name", user);
@@ -2175,9 +2381,11 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
     if (range) {
         query->bindValue(":range_time", range);
     }
-    if (maxresults) {
-        query->bindValue(":limit_size", maxresults);
+    if (!beforeTime.isEmpty()) {
+        query->bindValue(":before_time", beforeTime);
     }
+    query->bindValue(":limit_size", fetchSize);
+    query->bindValue(":offset_size", safeOffset);
 
     if (!execSqlQuery(query)) {
         qCWarning(DatabaseInterfaceLog) << "Failed to collect log history information: SQL Error";
@@ -2197,6 +2405,11 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
         results << chatMessage;
     }
 
+    if (detectMore && results.size() > pageSize) {
+        results.removeLast();
+        *hasMore = true;
+    }
+
     return results;
 }
 
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 822accada..eb74063ac 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -62,6 +62,9 @@ private:
     bool checkUserIsIpBanned(const QString &ipAddress, QString &banReason, int &banSecondsRemaining);
     /** Must be called after checkSql and server is known to be in auth mode. */
     bool checkUserIsNameBanned(QString const &userName, QString &banReason, int &banSecondsRemaining);
+    /** Seal a legacy credential for the account's downgrade backup; empty when the
+     *  backup key is unset or the sealed value does not fit the column. */
+    QString sealLegacyBackup(const QString &storedName, const QString &credential);
     bool isStrictModeEnabled(bool &ok) const;
 
 protected:
@@ -192,6 +195,11 @@ public:
                     const QString &targetName,
                     const QString &channel = QString()) override;
     bool changeUserPassword(const QString &user, const QString &password, bool passwordNeedsHash) override;
+    /** Replace a credential with an already-derived verifier, keeping a sealed legacy hash of the
+     *  same password as the downgrade backup for pre-challenge clients. */
+    bool changeUserPasswordWithLegacyBackup(const QString &user,
+                                            const QString &passwordVerifier,
+                                            const QString &legacyCredential);
     bool changeUserPassword(const QString &user,
                             const QString &oldPassword,
                             bool oldPasswordNeedsHash,
@@ -211,7 +219,10 @@ public:
                                                        bool &game,
                                                        bool &room,
                                                        int &range,
-                                                       int &maxresults);
+                                                       int &maxresults,
+                                                       int offset = 0,
+                                                       const QString &beforeTime = QString(),
+                                                       bool *hasMore = nullptr);
     QList<ServerInfo_UserSession> getUserSessions(const QString &userName, int limit);
     QList<ServerInfo_UserAlt> getUserAlts(const QString &userName);
     QList<ServerInfo_ModeratorLogin> getModeratorLastLogins();
@@ -231,6 +242,18 @@ public:
     };
     UptimeSnapshot getLatestUptimeSnapshot(int serverId);
     bool removeUserAvatar(const QString &userName);
+
+    // Outcome of removeUserBanner(), so the caller can tell a missing user apart
+    // from a user who simply has no banner card set.
+    enum class RemoveUserBannerResult
+    {
+        Removed,
+        NothingToRemove,
+        NoSuchUser,
+        DatabaseError,
+    };
+    RemoveUserBannerResult removeUserBanner(const QString &userName);
+    int clearBlacklistedBanners();
     bool isCardArtAllowed(const QString &cardName, const QString &cardProviderId) override;
     bool addForgotPassword(const QString &user);
     bool removeForgotPassword(const QString &user) override;
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 1972444f1..09453b7ee 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -1,42 +1,45 @@
 #include "server_logger.h"
 
-#include "settingscache.h"
-
 #include <QDateTime>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QForeach>
 #include <QIODevice>
+#include <QMutexLocker>
 #include <QTextStream>
 #include <QThread>
-#include <QVariant>
 #include <QtGlobal>
 #include <iostream>
 #include <qnamespace.h>
 #include <qobjectdefs.h>
 #include <string>
 
-ServerLogger::ServerLogger(bool _logToConsole, QObject *parent)
+ServerLogger::ServerLogger(bool _logToConsole, bool _writeLog, const QString &_logFilters, QObject *parent)
     : QObject(parent), logToConsole(_logToConsole), flushRunning(false)
 {
+    reloadConfig(_writeLog, _logFilters);
+    connect(this, SIGNAL(sigFlushBuffer()), this, SLOT(flushBuffer()), Qt::QueuedConnection);
 }
 
 ServerLogger::~ServerLogger()
 {
     flushBuffer();
+    // logFile is a child of this object and is closed and deleted by ~QObject.
     // This does not work with the destroyed() signal as this destructor is called after the main event loop is done.
     thread()->quit();
 }
 
 void ServerLogger::startLog(const QString &logFileName)
 {
+    delete logFile;
+    logFile = nullptr;
+
     if (!logFileName.isEmpty()) {
         QFileInfo fi(logFileName);
         QDir fileDir(fi.path());
         if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) {
             std::cerr << "ERROR: logfile folder doesn't exist and i can't create it." << std::endl;
-            logFile = 0;
             return;
         }
 
@@ -44,55 +47,81 @@ void ServerLogger::startLog(const QString &logFileName)
         if (!logFile->open(QIODevice::Append)) {
             std::cerr << "ERROR: can't open() logfile." << std::endl;
             delete logFile;
-            logFile = 0;
+            logFile = nullptr;
             return;
         }
-    } else {
-        logFile = 0;
     }
+}
 
-    connect(this, SIGNAL(sigFlushBuffer()), this, SLOT(flushBuffer()), Qt::QueuedConnection);
+void ServerLogger::reloadConfig(bool _writeLog, const QString &_logFilters)
+{
+    const bool filterActive = !_logFilters.trimmed().isEmpty();
+    const QStringList filters = _logFilters.split(QStringLiteral(","), Qt::SkipEmptyParts);
+
+    configMutex.lock();
+    writeLog = _writeLog;
+    messageFilterActive = filterActive;
+    logFilters = filters;
+    configMutex.unlock();
+}
+
+bool ServerLogger::isLoggingEnabled() const
+{
+    // Mirror logMessage(): the console is an independent sink and the logfile needs writeLog.
+    QMutexLocker locker(&configMutex);
+    return logToConsole || (logFile != nullptr && writeLog);
 }
 
 void ServerLogger::logMessage(const QString &message, void *caller)
 {
-    if (!logFile) {
-        return;
-    }
-
     QString callerString;
     if (caller) {
-        callerString = QString::number((qulonglong)caller, 16) + " ";
+        callerString = QString::number(reinterpret_cast<qulonglong>(caller), 16) + " ";
     }
 
-    // filter out all log entries based on values in configuration file
-    bool shouldWeWriteLog = settingsCache->value("server/writelog", 1).toBool();
-    QString logFilters = settingsCache->value("server/logfilters").toString();
-    QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts);
-    bool shouldWeSkipLine = false;
+    const QString line = QDateTime::currentDateTime().toString() + " " + callerString + message;
+    bool queued = false;
 
-    if (!shouldWeWriteLog) {
-        return;
+    // The console is an independent sink: writelog and logfilters only describe the logfile
+    // (see servatrice.ini.example), so a disabled or unopenable logfile must not swallow
+    // startup errors such as a refused database connection. Lines are buffered for the logger
+    // thread instead of written here, so a stalled stdout reader cannot stall game threads.
+    if (logToConsole) {
+        bufferMutex.lock();
+        consoleBuffer.append(line);
+        bufferMutex.unlock();
+        queued = true;
     }
 
-    if (!logFilters.trimmed().isEmpty()) {
-        shouldWeSkipLine = true;
-        for (const QString &logFilter : listlogFilters) {
-            if (message.contains(logFilter, Qt::CaseInsensitive)) {
-                shouldWeSkipLine = false;
-                break;
+    configMutex.lock();
+    const bool shouldWriteFile = writeLog;
+    const bool filterMessages = messageFilterActive;
+    const QStringList filters = logFilters;
+    configMutex.unlock();
+
+    if (logFile && shouldWriteFile) {
+        // filter out all log entries based on values in configuration file
+        bool shouldWriteLine = !filterMessages;
+        if (filterMessages) {
+            for (const QString &logFilter : filters) {
+                if (message.contains(logFilter, Qt::CaseInsensitive)) {
+                    shouldWriteLine = true;
+                    break;
+                }
             }
         }
+
+        if (shouldWriteLine) {
+            bufferMutex.lock();
+            buffer.append(line);
+            bufferMutex.unlock();
+            queued = true;
+        }
     }
 
-    if (shouldWeSkipLine) {
-        return;
+    if (queued) {
+        emit sigFlushBuffer();
     }
-
-    bufferMutex.lock();
-    buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message);
-    bufferMutex.unlock();
-    emit sigFlushBuffer();
 }
 
 void ServerLogger::flushBuffer()
@@ -102,25 +131,42 @@ void ServerLogger::flushBuffer()
     }
 
     flushRunning = true;
-    QTextStream stream(logFile);
-    forever
-    {
-        bufferMutex.lock();
-        if (buffer.isEmpty()) {
-            bufferMutex.unlock();
-            flushRunning = false;
-            return;
-        }
-        QString message = buffer.takeFirst();
-        bufferMutex.unlock();
 
-        stream << message << "\n";
-        stream.flush();
+    bufferMutex.lock();
+    QStringList consoleLines;
+    consoleLines.swap(consoleBuffer);
+    bufferMutex.unlock();
 
-        if (logToConsole) {
-            std::cout << message.toStdString() << std::endl;
-        }
+    for (const QString &line : consoleLines) {
+        std::cout << line.toStdString() << '\n';
     }
+    if (!consoleLines.isEmpty()) {
+        std::cout.flush();
+    }
+
+    if (logFile) {
+        QTextStream stream(logFile);
+        forever
+        {
+            bufferMutex.lock();
+            if (buffer.isEmpty()) {
+                bufferMutex.unlock();
+                break;
+            }
+            QString message = buffer.takeFirst();
+            bufferMutex.unlock();
+
+            stream << message << "\n";
+            stream.flush();
+        }
+    } else {
+        // No logfile to write to; do not let the buffer grow without bound.
+        bufferMutex.lock();
+        buffer.clear();
+        bufferMutex.unlock();
+    }
+
+    flushRunning = false;
 }
 
 void ServerLogger::rotateLogs()
@@ -136,5 +182,3 @@ void ServerLogger::rotateLogs()
         std::cerr << "ERROR: Failed to open log file for writing!" << std::endl;
     }
 }
-
-QFile *ServerLogger::logFile;
diff --git a/servatrice/src/server_logger.h b/servatrice/src/server_logger.h
index f2875a6a3..40df9fd62 100644
--- a/servatrice/src/server_logger.h
+++ b/servatrice/src/server_logger.h
@@ -14,10 +14,20 @@ class ServerLogger : public QObject
 {
     Q_OBJECT
 public:
-    ServerLogger(bool _logToConsole, QObject *parent = 0);
+    ServerLogger(bool _logToConsole, bool _writeLog, const QString &_logFilters, QObject *parent = nullptr);
     ~ServerLogger();
+
+    /**
+     * @brief Whether messages passed to logMessage() would be written anywhere.
+     *
+     * Callers use this to avoid formatting expensive debug payloads that
+     * logMessage() would discard.
+     */
+    [[nodiscard]] bool isLoggingEnabled() const;
+
 public slots:
     void startLog(const QString &logFileName);
+    void reloadConfig(bool _writeLog, const QString &_logFilters);
     void logMessage(const QString &message, void *caller = 0);
     void rotateLogs();
 private slots:
@@ -27,9 +37,17 @@ signals:
 
 private:
     bool logToConsole;
-    static QFile *logFile;
+    bool writeLog = true;
+    bool messageFilterActive = false;
+    QStringList logFilters;
+    // Guards writeLog/messageFilterActive/logFilters: SIGHUP rewrites them while other threads log.
+    mutable QMutex configMutex;
+    QFile *logFile = nullptr;
     bool flushRunning;
     QStringList buffer;
+    // Console lines wait here for the logger thread, so game threads never block on stdout.
+    QStringList consoleBuffer;
+    // Guards buffer and consoleBuffer.
     QMutex bufferMutex;
 };
 
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 890a93fbc..c38d790b1 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -126,6 +126,7 @@
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/response_ban_history.pb.h>
 #include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
+#include <libcockatrice/protocol/pb/response_clear_blacklisted_banners.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_list.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
@@ -140,6 +141,7 @@
 #include <libcockatrice/protocol/pb/response_password_salt.pb.h>
 #include <libcockatrice/protocol/pb/response_register.pb.h>
 #include <libcockatrice/protocol/pb/response_remove_user_avatar.pb.h>
+#include <libcockatrice/protocol/pb/response_remove_user_banner.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_download_by_game_id.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
@@ -197,7 +199,8 @@ AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server
     // Never call flushOutputQueue directly from outputQueueChanged. In case of a socket error,
     // it could lead to this object being destroyed while another function is still on the call stack. -> mutex
     // deadlocks etc.
-    connect(this, SIGNAL(outputQueueChanged()), this, SLOT(flushOutputQueue()), Qt::QueuedConnection);
+    connect(this, &AbstractServerSocketInterface::outputQueueChanged, this,
+            &AbstractServerSocketInterface::flushOutputQueue, Qt::QueuedConnection);
 }
 
 bool AbstractServerSocketInterface::initSession()
@@ -265,6 +268,11 @@ void AbstractServerSocketInterface::logDebugMessage(const QString &message)
     logger->logMessage(message, this);
 }
 
+bool AbstractServerSocketInterface::logsDebugMessages() const
+{
+    return logger != nullptr && logger->isLoggingEnabled();
+}
+
 void AbstractServerSocketInterface::processCommandContainer(const CommandContainer &cont)
 {
     QElapsedTimer timer;
@@ -479,6 +487,10 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedModeratorCo
             return cmdGetModeratorLastLogins(cmd.GetExtension(Command_GetModeratorLastLogins::ext), rc);
         case ModeratorCommand::REMOVE_USER_AVATAR:
             return cmdRemoveUserAvatar(cmd.GetExtension(Command_RemoveUserAvatar::ext), rc);
+        case ModeratorCommand::REMOVE_USER_BANNER:
+            return cmdRemoveUserBanner(cmd.GetExtension(Command_RemoveUserBanner::ext), rc);
+        case ModeratorCommand::CLEAR_BLACKLISTED_BANNERS:
+            return cmdClearBlacklistedBanners(cmd.GetExtension(Command_ClearBlacklistedBanners::ext), rc);
         default:
             return Response::RespFunctionNotAllowed;
     }
@@ -1731,12 +1743,17 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com
 
     int dateRange = cmd.date_range();
     int maximumResults = cmd.maximum_results();
+    const int offset = cmd.has_offset() ? static_cast<int>(cmd.offset()) : 0;
+    const QString beforeTime = cmd.has_before_time() ? QString::fromStdString(cmd.before_time()) : QString();
 
     Response_ViewLogHistory *re = new Response_ViewLogHistory;
 
     if (servatrice->getEnableLogQuery()) {
-        QListIterator<ServerInfo_ChatMessage> messageIterator(sqlInterface->getMessageLogHistory(
-            userName, ipAddress, gameName, gameID, message, chatType, gameType, roomType, dateRange, maximumResults));
+        bool hasMore = false;
+        QList<ServerInfo_ChatMessage> history =
+            sqlInterface->getMessageLogHistory(userName, ipAddress, gameName, gameID, message, chatType, gameType,
+                                               roomType, dateRange, maximumResults, offset, beforeTime, &hasMore);
+        QListIterator<ServerInfo_ChatMessage> messageIterator(history);
         while (messageIterator.hasNext()) {
             ServerInfo_ChatMessage chatMessage = messageIterator.next();
             if (!allowPrivateChat) {
@@ -1744,6 +1761,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com
             }
             re->add_log_message()->CopyFrom(chatMessage);
         }
+        re->set_has_more(hasMore);
     } else {
         ServerInfo_ChatMessage chatMessage;
 
@@ -1971,7 +1989,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
             SessionEvent *se = userList[i]->prepareSessionEvent(event);
             userList[i]->sendProtocolItem(*se);
             delete se;
-            QMetaObject::invokeMethod(userList[i], "prepareDestroy", Qt::QueuedConnection);
+            QMetaObject::invokeMethod(
+                userList[i], [user = userList[i]] { user->prepareDestroy(); }, Qt::QueuedConnection);
         }
     }
 
@@ -2630,7 +2649,15 @@ Response::ResponseCode AbstractServerSocketInterface::cmdResetUserPassword(const
     }
 
     const QString tempPassword = PasswordHasher::generateRandomSalt();
-    if (!sqlInterface->changeUserPassword(userName, tempPassword, true)) {
+    // Store a scrypt verifier rather than a legacy salt+hash: a legacy row makes the next
+    // login look like an authentication downgrade, which modern clients refuse when they
+    // still hold a verifier for the account. Where security/legacy_backup_key is configured,
+    // keep a sealed legacy hash of the same temporary password as the downgrade backup so
+    // pre-challenge clients keep the path the reset used to provide; without the key they
+    // have none, which changeUserPasswordWithLegacyBackup warns about.
+    const QString verifier = PasswordHasher::generatePasswordVerifier(tempPassword);
+    const QString legacyCredential = PasswordHasher::computeHash(tempPassword, PasswordHasher::generateRandomSalt());
+    if (!sqlInterface->changeUserPasswordWithLegacyBackup(userName, verifier, legacyCredential)) {
         return Response::RespInternalError;
     }
     sqlInterface->setForcePasswordChange(userName, true);
@@ -2686,6 +2713,67 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRemoveUserAvatar(const
     return Response::RespOk;
 }
 
+Response::ResponseCode AbstractServerSocketInterface::cmdRemoveUserBanner(const Command_RemoveUserBanner &cmd,
+                                                                          ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const QString userName = nameFromStdString(cmd.user_name()).simplified();
+    if (userName.isEmpty()) {
+        return Response::RespContextError;
+    }
+
+    bool hadBanner = true;
+    switch (sqlInterface->removeUserBanner(userName)) {
+        case Servatrice_DatabaseInterface::RemoveUserBannerResult::Removed:
+            break;
+        case Servatrice_DatabaseInterface::RemoveUserBannerResult::NothingToRemove:
+            hadBanner = false;
+            break;
+        case Servatrice_DatabaseInterface::RemoveUserBannerResult::NoSuchUser:
+            return Response::RespNameNotFound;
+        case Servatrice_DatabaseInterface::RemoveUserBannerResult::DatabaseError:
+        default:
+            return Response::RespInternalError;
+    }
+
+    if (hadBanner) {
+        sqlInterface->addAuditRecord(userName, this->getAddress(), QString::fromStdString(userInfo->clientid()),
+                                     "REMOVE_USER_BANNER", "Moderator removed user banner card", true);
+    }
+
+    Response_RemoveUserBanner *re = new Response_RemoveUserBanner;
+    re->set_user_name(userName.toStdString());
+    re->set_had_banner(hadBanner);
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+AbstractServerSocketInterface::cmdClearBlacklistedBanners(const Command_ClearBlacklistedBanners & /* cmd */,
+                                                          ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const int cleared = sqlInterface->clearBlacklistedBanners();
+    if (cleared < 0) {
+        return Response::RespInternalError;
+    }
+
+    sqlInterface->addAuditRecord(QString::fromStdString(userInfo->name()), this->getAddress(),
+                                 QString::fromStdString(userInfo->clientid()), "CLEAR_BLACKLISTED_BANNERS",
+                                 QString("Moderator cleared %1 blacklisted banner(s)").arg(cleared), true);
+
+    Response_ClearBlacklistedBanners *re = new Response_ClearBlacklistedBanners;
+    re->set_cleared_count(static_cast<unsigned int>(cleared));
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
 void AbstractServerSocketInterface::sendPendingReportNotifications(ResponseContainer &rc)
 {
     if (!sqlInterface->checkSql()) {
@@ -3707,6 +3795,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountPassword(const C
     }
 
     databaseInterface->setForcePasswordChange(userName, false);
+    // The forced change is done, but this session never completed login (see
+    // Server_ProtocolHandler::cmdLogin). It stays restricted to ping and another password
+    // change; the client reconnects with the new password to actually enter the server.
 
     return Response::RespOk;
 }
@@ -4108,15 +4199,15 @@ Response::ResponseCode
 AbstractServerSocketInterface::cmdUpdateServerMessage(const Command_UpdateServerMessage & /*cmd*/,
                                                       ResponseContainer & /*rc*/)
 {
-    QMetaObject::invokeMethod(server, "updateLoginMessage");
+    QMetaObject::invokeMethod(servatrice, [srv = servatrice] { srv->updateLoginMessage(); });
     return Response::RespOk;
 }
 
 Response::ResponseCode AbstractServerSocketInterface::cmdShutdownServer(const Command_ShutdownServer &cmd,
                                                                         ResponseContainer & /*rc*/)
 {
-    QMetaObject::invokeMethod(server, "scheduleShutdown", Q_ARG(QString, textFromStdString(cmd.reason())),
-                              Q_ARG(int, cmd.minutes()));
+    QMetaObject::invokeMethod(servatrice, [srv = servatrice, reason = textFromStdString(cmd.reason()),
+                                           minutes = cmd.minutes()] { srv->scheduleShutdown(reason, minutes); });
     return Response::RespOk;
 }
 
@@ -4125,7 +4216,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReloadConfig(const Comm
 {
     logDebugMessage("Received admin command: reloading configuration");
     settingsCache->sync();
-    QMetaObject::invokeMethod(server, "setRequiredFeatures", Q_ARG(QString, server->getRequiredFeatures()));
+    QMetaObject::invokeMethod(servatrice, [srv = servatrice, features = servatrice->getRequiredFeatures()] {
+        srv->setRequiredFeatures(features);
+    });
     return Response::RespOk;
 }
 
@@ -4177,7 +4270,7 @@ bool AbstractServerSocketInterface::removeAdminFlagFromUser(const QString &userN
         delete se;
     }
 
-    QMetaObject::invokeMethod(user, "prepareDestroy", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(user, [user] { user->prepareDestroy(); }, Qt::QueuedConnection);
     return true;
 }
 
@@ -4352,10 +4445,10 @@ TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server,
 {
     socket = new QTcpSocket(this);
     socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
-    connect(socket, SIGNAL(readyRead()), this, SLOT(readClient()));
-    connect(socket, SIGNAL(disconnected()), this, SLOT(catchSocketDisconnected()));
-    connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this,
-            SLOT(catchSocketError(QAbstractSocket::SocketError)));
+    connect(socket, &QTcpSocket::readyRead, this, [this] { readClient(); });
+    connect(socket, &QTcpSocket::disconnected, this, [this] { catchSocketDisconnected(); });
+    connect(socket, &QTcpSocket::errorOccurred, this,
+            [this](QAbstractSocket::SocketError error) { catchSocketError(error); });
 }
 
 TcpServerSocketInterface::~TcpServerSocketInterface()
@@ -4431,13 +4524,17 @@ void TcpServerSocketInterface::readClient()
     servatrice->incRxBytes(data.size());
     inputBuffer.append(data);
 
-    do {
+    // Parse messages straight out of inputBuffer at readOffset. Removing each
+    // consumed message from the front would memmove the remaining bytes once
+    // per message; the consumed prefix is dropped once parsing stops.
+    qsizetype readOffset = 0;
+
+    while (true) {
         if (!messageInProgress) {
-            if (inputBuffer.size() >= 4) {
-                messageLength = (((quint32)(unsigned char)inputBuffer[0]) << 24) +
-                                (((quint32)(unsigned char)inputBuffer[1]) << 16) +
-                                (((quint32)(unsigned char)inputBuffer[2]) << 8) +
-                                ((quint32)(unsigned char)inputBuffer[3]);
+            if (inputBuffer.size() - readOffset >= 4) {
+                const auto *header = reinterpret_cast<const unsigned char *>(inputBuffer.constData() + readOffset);
+                messageLength = (static_cast<quint32>(header[0]) << 24) + (static_cast<quint32>(header[1]) << 16) +
+                                (static_cast<quint32>(header[2]) << 8) + static_cast<quint32>(header[3]);
                 // Reject implausible lengths instead of buffering until they arrive.
                 // This also handles lengths that overflow into negative int values.
                 if (messageLength < 0 || messageLength > MAX_TCP_MESSAGE_SIZE) {
@@ -4446,32 +4543,33 @@ void TcpServerSocketInterface::readClient()
                     prepareDestroy();
                     return;
                 }
-                inputBuffer.remove(0, 4);
+                readOffset += 4;
                 messageInProgress = true;
             } else {
-                return;
+                break;
             }
         }
-        if (inputBuffer.size() < messageLength) {
-            return;
+        if (inputBuffer.size() - readOffset < messageLength) {
+            break;
         }
 
         CommandContainer newCommandContainer;
-        bool ok;
+        bool ok = false;
         try {
-            ok = newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength);
+            ok = newCommandContainer.ParseFromArray(inputBuffer.constData() + readOffset, messageLength);
         } catch (std::exception &e) {
-            qCWarning(TcpServerSocketInterfaceLog) << "Caught std::exception in" << __FILE__ << __LINE__ <<
+            qCWarning(TcpServerSocketInterfaceLog)
+                << "Caught std::exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
                 __FUNCTION__
 #else
                 __PRETTY_FUNCTION__
 #endif
-                                                   << Qt::endl
-                                                   << "Exception:" << e.what() << Qt::endl
-                                                   << "Message coming from:" << getAddress() << Qt::endl
-                                                   << "Message length:" << messageLength << Qt::endl
-                                                   << "Message content:" << inputBuffer.toHex();
+                << Qt::endl
+                << "Exception:" << e.what() << Qt::endl
+                << "Message coming from:" << getAddress() << Qt::endl
+                << "Message length:" << messageLength << Qt::endl
+                << "Message content:" << inputBuffer.mid(readOffset, messageLength).toHex();
         } catch (...) {
             qCWarning(TcpServerSocketInterfaceLog) << "Unhandled exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
@@ -4482,7 +4580,7 @@ void TcpServerSocketInterface::readClient()
                                                    << Qt::endl
                                                    << "Message coming from:" << getAddress();
         }
-        inputBuffer.remove(0, messageLength);
+        readOffset += messageLength;
         messageInProgress = false;
 
         if (ok) {
@@ -4499,8 +4597,12 @@ void TcpServerSocketInterface::readClient()
         } else {
             qCWarning(TcpServerSocketInterfaceLog) << "parsing error!";
         }
+    }
 
-    } while (!inputBuffer.isEmpty());
+    // Drop the consumed prefix once, instead of shifting the buffer per message.
+    if (readOffset > 0) {
+        inputBuffer.remove(0, readOffset);
+    }
 }
 
 bool TcpServerSocketInterface::initTcpSession()
@@ -4568,11 +4670,17 @@ void WebsocketServerSocketInterface::initConnection(void *_socket)
         }
     }
 
-    connect(socket, SIGNAL(binaryMessageReceived(const QByteArray &)), this,
-            SLOT(binaryMessageReceived(const QByteArray &)));
+    connect(socket, &QWebSocket::binaryMessageReceived, this, &WebsocketServerSocketInterface::binaryMessageReceived);
+    // QWebSocket::errorOccurred was added in Qt 6.5 (error() is deprecated from 6.5 on),
+    // so a typed connect cannot compile against the 6.4 floor.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    connect(socket, &QWebSocket::errorOccurred, this,
+            [this](QAbstractSocket::SocketError error) { catchSocketError(error); });
+#else
     connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
             SLOT(catchSocketError(QAbstractSocket::SocketError)));
-    connect(socket, SIGNAL(disconnected()), this, SLOT(catchSocketDisconnected()));
+#endif
+    connect(socket, &QWebSocket::disconnected, this, [this] { catchSocketDisconnected(); });
 
     // Add this object to the server's list of connections before it can receive socket events.
     // Otherwise, in case of a socket error, it could be removed from the list before it is added.
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index dd9d3f2bb..cd37286c6 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -73,6 +73,7 @@ class Command_AccountPassword;
 class Command_Activate;
 class Command_AddCardArtRule;
 class Command_AdjustMod;
+class Command_ClearBlacklistedBanners;
 class Command_ForceActivateUser;
 class Command_ForgotPasswordChallenge;
 class Command_ForgotPasswordRequest;
@@ -90,6 +91,7 @@ class Command_ListCardArtRules;
 class Command_Register;
 class Command_RemoveCardArtRule;
 class Command_RemoveUserAvatar;
+class Command_RemoveUserBanner;
 class Command_Report;
 class Command_ReportAddComment;
 class Command_ReportAssign;
@@ -123,6 +125,7 @@ signals:
 
 protected:
     void logDebugMessage(const QString &message) override;
+    [[nodiscard]] bool logsDebugMessages() const override;
     bool tooManyRegistrationAttempts(const QString &ipAddress);
     void processCommandContainer(const CommandContainer &cont) override;
     bool acceptsCredentialFormat(bool passwordNeedsHash, const QString &password) const;
@@ -235,6 +238,9 @@ private:
     Response::ResponseCode cmdGetModeratorLastLogins(const Command_GetModeratorLastLogins &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdResetUserPassword(const Command_ResetUserPassword &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdRemoveUserAvatar(const Command_RemoveUserAvatar &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdRemoveUserBanner(const Command_RemoveUserBanner &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdClearBlacklistedBanners(const Command_ClearBlacklistedBanners &cmd,
+                                                      ResponseContainer &rc);
 
     Response::ResponseCode cmdGetServerStats(const Command_GetServerStats &cmd, ResponseContainer &rc);
 
diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp
index 32cd5b206..b8a7e3538 100644
--- a/servatrice/src/signalhandler.cpp
+++ b/servatrice/src/signalhandler.cpp
@@ -73,6 +73,8 @@ void SignalHandler::internalSigHupHandler()
     logger->rotateLogs();
 
     settingsCache->sync();
+    logger->reloadConfig(settingsCache->value("server/writelog", 1).toBool(),
+                         settingsCache->value("server/logfilters").toString());
 
     snHup->setEnabled(true);
 }
diff --git a/servatrice/src/smtpclient.cpp b/servatrice/src/smtpclient.cpp
index 82824e496..bfdfae905 100644
--- a/servatrice/src/smtpclient.cpp
+++ b/servatrice/src/smtpclient.cpp
@@ -25,7 +25,7 @@ static const qint64 IDLE_TIMEOUT_MS = 60000; // 60 seconds
 // MAX_RETRY_DELAY cap is applied, preventing unbounded intermediate values.
 static const int MAX_BACKOFF_SHIFT = 10;
 
-inline Q_LOGGING_CATEGORY(SmtpClientLog, "smtp_client")
+inline Q_LOGGING_CATEGORY(SmtpClientLog, "smtp_client");
 
 static QString pendingKey(const QString &userName, EmailType type, const QString &token)
 {
@@ -55,24 +55,23 @@ SmtpClient::SmtpClient(QObject *parent) : QObject(parent)
 
     idleTimer = new QTimer(this);
     idleTimer->setSingleShot(true);
-    connect(idleTimer, SIGNAL(timeout()), this, SLOT(idleTimeout()));
+    connect(idleTimer, &QTimer::timeout, this, &SmtpClient::idleTimeout);
 
-    connect(smtp, SIGNAL(authenticated()), this, SLOT(authenticated()));
-    connect(smtp, SIGNAL(authenticationFailed(const QByteArray &)), this,
-            SLOT(authenticationFailed(const QByteArray &)));
-    connect(smtp, SIGNAL(connected()), this, SLOT(connected()));
-    connect(smtp, SIGNAL(connectionFailed(const QByteArray &)), this, SLOT(connectionFailed(const QByteArray &)));
-    connect(smtp, SIGNAL(disconnected()), this, SLOT(disconnected()));
-    connect(smtp, SIGNAL(encrypted()), this, SLOT(encrypted()));
-    connect(smtp, SIGNAL(encryptionFailed(const QByteArray &)), this, SLOT(encryptionFailed(const QByteArray &)));
-    connect(smtp, SIGNAL(finished()), this, SLOT(finished()));
-    connect(smtp, SIGNAL(mailFailed(int, int, const QByteArray &)), this,
-            SLOT(mailFailed(int, int, const QByteArray &)));
-    connect(smtp, SIGNAL(mailSent(int)), this, SLOT(mailSent(int)));
-    connect(smtp, SIGNAL(recipientRejected(int, const QString &, const QByteArray &)), this,
-            SLOT(recipientRejected(int, const QString &, const QByteArray &)));
-    connect(smtp, SIGNAL(senderRejected(int, const QString &, const QByteArray &)), this,
-            SLOT(senderRejected(int, const QString &, const QByteArray &)));
+    connect(smtp, &QxtSmtp::authenticated, this, &SmtpClient::authenticated);
+    connect(smtp, qOverload<const QByteArray &>(&QxtSmtp::authenticationFailed), this,
+            &SmtpClient::authenticationFailed);
+    connect(smtp, &QxtSmtp::connected, this, &SmtpClient::connected);
+    connect(smtp, qOverload<const QByteArray &>(&QxtSmtp::connectionFailed), this, &SmtpClient::connectionFailed);
+    connect(smtp, &QxtSmtp::disconnected, this, &SmtpClient::disconnected);
+    connect(smtp, &QxtSmtp::encrypted, this, &SmtpClient::encrypted);
+    connect(smtp, qOverload<const QByteArray &>(&QxtSmtp::encryptionFailed), this, &SmtpClient::encryptionFailed);
+    connect(smtp, &QxtSmtp::finished, this, &SmtpClient::finished);
+    connect(smtp, qOverload<int, int, const QByteArray &>(&QxtSmtp::mailFailed), this, &SmtpClient::mailFailed);
+    connect(smtp, &QxtSmtp::mailSent, this, &SmtpClient::mailSent);
+    connect(smtp, qOverload<int, const QString &, const QByteArray &>(&QxtSmtp::recipientRejected), this,
+            &SmtpClient::recipientRejected);
+    connect(smtp, qOverload<int, const QString &, const QByteArray &>(&QxtSmtp::senderRejected), this,
+            &SmtpClient::senderRejected);
 }
 
 SmtpClient::~SmtpClient()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e2c3252ee..84b9f02bf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -177,9 +177,32 @@ cockatrice_add_test(NAME test_age_formatting SOURCES test_age_formatting.cpp LIB
 cockatrice_add_test(NAME user_data_backup_test SOURCES user_data_backup_test.cpp LIBS libcockatrice_utility)
 cockatrice_add_test(NAME password_hash_test SOURCES password_hash_test.cpp LIBS libcockatrice_utility)
 cockatrice_add_test(NAME report_categories_test SOURCES report_categories_test.cpp LIBS libcockatrice_utility)
+cockatrice_add_test(NAME svg_recolor_test SOURCES svg_recolor_test.cpp LIBS libcockatrice_utility)
 cockatrice_add_test(NAME warning_categories_test SOURCES warning_categories_test.cpp LIBS libcockatrice_utility)
-# The installer's holder probe is Windows-only, but the wording it produces is plain C++
-# and is what a stuck user has to act on, so it is tested everywhere.
+cockatrice_add_test(
+  NAME
+  user_games_model_test
+  SOURCES
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/widgets/server/user/user_games_model.cpp
+  user_games_model_test.cpp
+  LIBS
+  libcockatrice_network_client_abstract
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/cockatrice/src
+  ${CMAKE_SOURCE_DIR}/libcockatrice_network
+)
+cockatrice_add_test(
+  NAME
+  spoiler_file_test
+  SOURCES
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp
+  spoiler_file_test.cpp
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/cockatrice/src
+)
+# The installer's holder probe is Windows-only, but the wording it produces and the
+# question which programs are the payload's own are plain C++ and are what a stuck user
+# has to act on, so they are tested everywhere.
 cockatrice_add_test(
   NAME
   holder_line_test
@@ -189,6 +212,15 @@ cockatrice_add_test(
   INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/tools/installer-holder-probe
 )
+cockatrice_add_test(
+  NAME
+  payload_paths_test
+  SOURCES
+  ${CMAKE_SOURCE_DIR}/tools/installer-holder-probe/payload_paths.cpp
+  payload_paths_test.cpp
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/tools/installer-holder-probe
+)
 cockatrice_add_test(
   NAME
   playmat_resolver_test
@@ -198,6 +230,18 @@ cockatrice_add_test(
   libcockatrice_deck_list
   libcockatrice_utility
 )
+cockatrice_add_test(
+  NAME
+  card_art_crop_test
+  SOURCES
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
+  ${VERSION_STRING_CPP}
+  card_art_crop_test.cpp
+  LIBS
+  libcockatrice_card
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/cockatrice/src
+)
 cockatrice_add_test(
   NAME
   server_rate_limiter_test
@@ -241,6 +285,17 @@ cockatrice_add_test(
   LABELS
   server
 )
+cockatrice_add_test(
+  NAME
+  server_logger_test
+  SOURCES
+  ${CMAKE_SOURCE_DIR}/servatrice/src/server_logger.cpp
+  server_logger_test.cpp
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/servatrice/src
+  LABELS
+  server
+)
 cockatrice_add_test(
   NAME
   server_card_counter_test
@@ -307,6 +362,40 @@ cockatrice_add_test(
   LABELS
   server
 )
+cockatrice_add_test(
+  NAME
+  server_forced_password_change_test
+  SOURCES
+  server_forced_password_change_test.cpp
+  LIBS
+  libcockatrice_network_server_remote
+  libcockatrice_rng
+  LABELS
+  server
+)
+cockatrice_add_test(
+  NAME
+  client_login_status_test
+  SOURCES
+  ${VERSION_STRING_CPP}
+  client_login_status_test.cpp
+  LIBS
+  libcockatrice_network_client_remote
+  LABELS
+  ci
+)
+# The local game runs one client and one server in the same process.
+# Either of them can be destroyed first; the survivor has to stay usable.
+cockatrice_add_test(
+  NAME
+  local_client_lifetime_test
+  SOURCES
+  local_client_lifetime_test.cpp
+  LIBS
+  libcockatrice_network
+  LABELS
+  ci
+)
 cockatrice_add_test(
   NAME
   server_room_channels_test
@@ -359,18 +448,10 @@ cockatrice_add_test(
 )
 cockatrice_add_test(
   NAME
-  loader_local_matching_test
+  font_config_test
   SOURCES
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
-  ${VERSION_STRING_CPP}
-  loader_local_matching_test.cpp
-  LIBS
-  libcockatrice_network
-  libcockatrice_settings
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_config.cpp
+  font_config_test.cpp
   INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/cockatrice/src
 )
@@ -406,6 +487,7 @@ if(TARGET Qt6::lrelease)
     libcockatrice_utility
     DEFINITIONS
     TRANSLATION_LOADER_TEST_DIR="${CMAKE_CURRENT_BINARY_DIR}"
+    COCKATRICE_TRANSLATIONS_DIR="${CMAKE_SOURCE_DIR}/cockatrice/translations"
   )
   add_dependencies(translation_loader_test translation_loader_test_qm)
 
@@ -424,6 +506,19 @@ endif()
 
 # Guard must match the condition for src/single_instance_manager.cpp in cockatrice/CMakeLists.txt.
 if(WITH_CLIENT)
+  cockatrice_add_test(
+    NAME
+    moxfield_signature_spells_test
+    SOURCES
+    ${VERSION_STRING_CPP}
+    ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/deck_loader/card_node_function.cpp
+    moxfield_signature_spells_test.cpp
+    LIBS
+    libcockatrice_card
+    libcockatrice_deck_list
+    INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}/cockatrice/src
+  )
   cockatrice_add_test(
     NAME
     single_instance_manager_test
@@ -434,6 +529,22 @@ if(WITH_CLIENT)
     ${CMAKE_SOURCE_DIR}/cockatrice/src
     ${CMAKE_SOURCE_DIR}/libcockatrice_utility
   )
+  # The installer's probe and the client build the socket name independently, and the
+  # command they exchange is spelled in both places. Compiling both ends into one test is
+  # what keeps them from drifting apart unnoticed: a mismatch would leave the installer
+  # unable to close an instance whose window it cannot reach.
+  cockatrice_add_test(
+    NAME
+    installer_close_server_test
+    SOURCES
+    ${CMAKE_SOURCE_DIR}/cockatrice/src/installer_close_server.cpp
+    ${CMAKE_SOURCE_DIR}/tools/installer-holder-probe/installer_close_name.cpp
+    installer_close_server_test.cpp
+    INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}/cockatrice/src
+    ${CMAKE_SOURCE_DIR}/libcockatrice_utility
+    ${CMAKE_SOURCE_DIR}/tools/installer-holder-probe
+  )
   # CrashReporter is client code; DEFINITIONS keeps the test hermetic by compiling the
   # no-op path (no sentry-native headers needed) regardless of WITH_CRASH_REPORTING.
   cockatrice_add_test(
@@ -455,11 +566,18 @@ add_subdirectory(card_zone_algorithms)
 add_subdirectory(carddatabase)
 add_subdirectory(deck_list_model)
 add_subdirectory(deck_list_zones)
+add_subdirectory(icon_assets)
 add_subdirectory(loading_from_clipboard)
+add_subdirectory(model_contract)
 add_subdirectory(movecard_tests)
 add_subdirectory(oracle)
 add_subdirectory(settings)
 
+# libcockatrice_game only exists when the client is built.
+if(WITH_CLIENT)
+  add_subdirectory(game)
+endif()
+
 # theme_migration_test compiles client sources, whose headers are only reachable from a client build.
 if(WITH_CLIENT)
   add_subdirectory(theme_migration)
@@ -470,3 +588,46 @@ endif()
 if(WITH_ORACLE OR WITH_CLIENT)
   add_subdirectory(picture_loader_benchmark)
 endif()
+
+# loader_local_matching_test and deck_state_manager_test links libcockatrice_settings,
+# which only exists when a client/UI-capable target is being built.
+if(WITH_ORACLE OR WITH_CLIENT)
+  set(SETTINGS_SOURCES
+      ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
+      ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp
+      ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp
+      ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp
+      ${VERSION_STRING_CPP}
+  )
+  set(SETTINGS_LIBS libcockatrice_network libcockatrice_settings)
+  set(SETTINGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/cockatrice/src)
+
+  cockatrice_add_test(
+    NAME
+    loader_local_matching_test
+    SOURCES
+    ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp
+    ${SETTINGS_SOURCES}
+    loader_local_matching_test.cpp
+    LIBS
+    ${SETTINGS_LIBS}
+    INCLUDE_DIRS
+    ${SETTINGS_INCLUDE_DIRS}
+  )
+  cockatrice_add_test(
+    NAME
+    deck_state_manager_test
+    SOURCES
+    ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
+    ${SETTINGS_SOURCES}
+    deck_state_manager_test.cpp
+    LIBS
+    libcockatrice_card
+    libcockatrice_deck_list
+    libcockatrice_models
+    libcockatrice_utility
+    ${SETTINGS_LIBS}
+    INCLUDE_DIRS
+    ${SETTINGS_INCLUDE_DIRS}
+  )
+endif()
diff --git a/tests/card_art_crop_test.cpp b/tests/card_art_crop_test.cpp
new file mode 100644
index 000000000..1c4a9ff8d
--- /dev/null
+++ b/tests/card_art_crop_test.cpp
@@ -0,0 +1,92 @@
+#include "interface/widgets/cards/card_art_utils.h"
+
+#include <QApplication>
+#include <QImage>
+#include <QPainter>
+#include <QTransform>
+#include <gtest/gtest.h>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/card/printing/exact_card.h>
+
+namespace
+{
+ExactCard makeCard(bool landscape)
+{
+    CardInfo::UiAttributes attributes;
+    attributes.landscapeOrientation = landscape;
+    return ExactCard(CardInfo::newInstance("Artwork", "", false, {}, {}, {}, {}, attributes));
+}
+
+QPixmap landscapeCardWithFrame()
+{
+    // Normalized landscape frame: the title reaches 14% down the upright
+    // image, and the Battle type line starts at 56%. Artwork has two colors
+    // so the test also detects a wrong or missing rotation.
+    QImage upright(1400, 1000, QImage::Format_RGB32);
+    upright.fill(Qt::red);
+    QPainter painter(&upright);
+    painter.fillRect(QRect(70, 140, 1260, 420), Qt::green);
+    painter.fillRect(QRect(700, 140, 630, 420), Qt::blue);
+    painter.end();
+    QTransform storedOrientation;
+    storedOrientation.rotate(-90);
+    return QPixmap::fromImage(upright.transformed(storedOrientation));
+}
+
+TEST(CardArtCrop, LandscapeCropExcludesNameAndRulesBoxesAndRotatesUpright)
+{
+    const QImage crop = CardArtUtils::cropCardArt(landscapeCardWithFrame(), makeCard(true)).toImage();
+    ASSERT_GT(crop.width(), crop.height());
+    ASSERT_FALSE(crop.isNull());
+    for (int y = 0; y < crop.height(); ++y) {
+        for (int x = 0; x < crop.width(); ++x) {
+            EXPECT_EQ(x < crop.width() / 2 ? QColor(Qt::green) : QColor(Qt::blue), crop.pixelColor(x, y));
+        }
+    }
+}
+
+TEST(CardArtCrop, PortraitCropRetainsItsExistingArtworkBounds)
+{
+    QImage source(745, 1040, QImage::Format_RGB32);
+    for (int y = 0; y < source.height(); ++y) {
+        for (int x = 0; x < source.width(); ++x) {
+            source.setPixelColor(x, y, QColor(x % 256, y % 256, (x + y) % 256));
+        }
+    }
+    const QPixmap input = QPixmap::fromImage(source);
+    const QImage crop = CardArtUtils::cropCardArt(input, makeCard(false)).toImage();
+    EXPECT_EQ(source.copy(QRect(52, 114, 641, 458)), crop);
+}
+
+TEST(CardArtCrop, DevicePixelRatioDoesNotChangeTheArtworkPixels)
+{
+    QPixmap source = landscapeCardWithFrame();
+    const QPixmap normal = CardArtUtils::cropCardArt(source, makeCard(true));
+    source.setDevicePixelRatio(2.0);
+    const QPixmap highDpi = CardArtUtils::cropCardArt(source, makeCard(true));
+    EXPECT_EQ(normal.size(), highDpi.size());
+    EXPECT_EQ(2.0, highDpi.devicePixelRatio());
+    QImage normalPixels = normal.toImage();
+    QImage highDpiPixels = highDpi.toImage();
+    normalPixels.setDevicePixelRatio(1.0);
+    highDpiPixels.setDevicePixelRatio(1.0);
+    EXPECT_EQ(normalPixels, highDpiPixels);
+}
+
+TEST(CardArtCrop, EmptyAndSmallImagesStayWithinTheirBounds)
+{
+    EXPECT_TRUE(CardArtUtils::cropCardArt({}, makeCard(true)).isNull());
+    QPixmap small(1, 1);
+    small.fill(Qt::green);
+    EXPECT_EQ(small.toImage(), CardArtUtils::cropCardArt(small, makeCard(true)).toImage());
+    EXPECT_EQ(small.toImage(), CardArtUtils::cropCardArt(small, makeCard(false)).toImage());
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    qputenv("QT_QPA_PLATFORM", "offscreen");
+    QApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/card_zone_algorithms/CMakeLists.txt b/tests/card_zone_algorithms/CMakeLists.txt
index 945f8a0ed..2418092de 100644
--- a/tests/card_zone_algorithms/CMakeLists.txt
+++ b/tests/card_zone_algorithms/CMakeLists.txt
@@ -1,4 +1,4 @@
 cockatrice_add_test(
   NAME card_zone_algorithms_test SOURCES card_zone_algorithms_test.cpp INCLUDE_DIRS
-  ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones
+  ${CMAKE_SOURCE_DIR}/libcockatrice_game/libcockatrice/game/zones
 )
diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
index 4f5282235..3d4baa430 100644
--- a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
+++ b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
@@ -16,7 +16,6 @@ struct MockCard
     bool cardRefWasCalled = false;
     bool resetStateCalled = false;
     bool resetStateKeepAnnotations = false;
-    bool visibleSet = false;
 
     void setId(int id)
     {
@@ -35,11 +34,6 @@ struct MockCard
         resetStateCalled = true;
         resetStateKeepAnnotations = keepAnnotations;
     }
-
-    void setVisible(bool visible)
-    {
-        visibleSet = visible;
-    }
 };
 
 class MockCardList
@@ -109,7 +103,6 @@ TEST_F(AddCardAlgorithmTest, ContentsKnownPreservesIdentity)
 
     EXPECT_FALSE(card.idWasCalled);
     EXPECT_FALSE(card.cardRefWasCalled);
-    EXPECT_TRUE(card.visibleSet);
 }
 
 TEST_F(AddCardAlgorithmTest, ContentsUnknownClearsIdentity)
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 22171a9e8..012081fd2 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -21,10 +21,12 @@ cockatrice_add_test(
 )
 
 # ------------------------
-# Filter String Test
-# (guard must match the condition for libcockatrice_filters in the root CMakeLists.txt)
+# Guard to match condition for libcockatrice_filters in the root CMakeLists.txt
 # ------------------------
 if(WITH_ORACLE OR WITH_CLIENT)
+  # ------------------------
+  # Filter String Test
+  # ------------------------
   cockatrice_add_test(
     NAME
     filter_string_test
@@ -35,6 +37,49 @@ if(WITH_ORACLE OR WITH_CLIENT)
     LIBS
     libcockatrice_filters
   )
+
+  # ------------------------
+  # Filter Tree Test
+  # ------------------------
+  cockatrice_add_test(
+    NAME
+    filter_tree_test
+    SOURCES
+    ${VERSION_STRING_CPP}
+    filter_tree_test.cpp
+    mocks.cpp
+    LIBS
+    libcockatrice_filters
+  )
+
+  # ------------------------
+  # Filter Mode Test
+  # ------------------------
+  cockatrice_add_test(
+    NAME
+    filter_mode_test
+    SOURCES
+    ${VERSION_STRING_CPP}
+    filter_mode_test.cpp
+    mocks.cpp
+    LIBS
+    libcockatrice_filters
+  )
+
+  # ------------------------
+  # Visual Display Model Test
+  # ------------------------
+  cockatrice_add_test(
+    NAME
+    visual_display_model_test
+    SOURCES
+    ${VERSION_STRING_CPP}
+    visual_display_model_test.cpp
+    mocks.cpp
+    LIBS
+    libcockatrice_card
+    libcockatrice_models
+  )
 endif()
 
 # ------------------------
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index eb522434d..350d9be7e 100644
--- a/tests/carddatabase/carddatabase_test.cpp
+++ b/tests/carddatabase/carddatabase_test.cpp
@@ -1,3 +1,4 @@
+#include "../support/scoped_file_size_limit.h"
 #include "libcockatrice/card/database/card_database.h"
 #include "libcockatrice/card/database/card_database_loader.h"
 #include "libcockatrice/card/database/card_database_querier.h"
@@ -17,10 +18,12 @@
 #include <QIODevice>
 #include <QList>
 #include <QSharedPointer>
+#include <QSignalSpy>
 #include <QString>
 #include <QStringList>
 #include <QTemporaryDir>
 #include <QVector>
+#include <QWeakPointer>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_data.h>
 #include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
@@ -202,6 +205,57 @@ TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip)
     ASSERT_EQ(printings.first().getProperty("manacost"), "1R");
 }
 
+#ifdef Q_OS_UNIX
+/**
+ * @brief A failed write keeps the previously installed card database intact.
+ *
+ * This is the writer Oracle uses to install a refreshed database, so the truncation
+ * bug has to be covered here and not only through OracleDatabase::saveXml.
+ */
+TEST(CardDatabaseTest, Xml4ShortWriteKeepsInstalledFile)
+{
+    NoopCardSetPriorityController controller;
+    CardSetPtr set =
+        CardSet::newInstance(&controller, "TST", "Test Set", "expansion", QDate(), CardSet::PriorityPrimary);
+
+    QHash<QString, QString> props;
+    props["manacost"] = "1R";
+    PrintingInfo printing(set, LazyPropertiesHash(props));
+    SetToPrintingsMap setsInfo;
+    setsInfo["TST"].append(printing);
+
+    CardInfo::UiAttributes attributes = {.tableRow = 1};
+    CardInfoPtr card =
+        CardInfo::newInstance("Lightning Bolt", QString(1024, 'x'), false, {}, {}, {}, setsInfo, attributes);
+
+    SetNameMap sets;
+    sets.insert("TST", set);
+    CardNameMap cards;
+    cards.insert("Lightning Bolt", card);
+
+    QTemporaryDir tempDir;
+    ASSERT_TRUE(tempDir.isValid());
+    const QString fileName = tempDir.filePath("cards.xml");
+
+    QFile installed(fileName);
+    ASSERT_TRUE(installed.open(QIODevice::WriteOnly));
+    ASSERT_EQ(installed.write("installed database"), 18);
+    installed.close();
+
+    // A real filesystem write failure: the soft file-size cap makes the writer's own
+    // flush fail without filling a disk. The cap is scoped rather than forked, because a
+    // death-test child under RLIMIT_FSIZE is killed by SIGSEGV on macOS.
+    test_support::ScopedFileSizeLimit fileSizeCap(128);
+    ASSERT_TRUE(fileSizeCap.isValid());
+
+    CockatriceXml4Parser writer(&controller);
+    EXPECT_FALSE(writer.saveToFile({}, sets, cards, fileName));
+
+    ASSERT_TRUE(installed.open(QIODevice::ReadOnly));
+    EXPECT_EQ(installed.readAll(), "installed database");
+}
+#endif
+
 /**
  * @brief Path provider serving a sandboxed copy of the test card database.
  */
@@ -608,6 +662,110 @@ TEST_F(CardDatabaseCacheInvalidationTest, MarkAllSetsAsKnownIsBatched)
     // Ignored sets keep their known state but are enabled.
     EXPECT_TRUE(controller.isEnabled("XXX"));
 }
+
+TEST_F(CardDatabaseCacheInvalidationTest, ReloadReleasesPreviousSnapshot)
+{
+    NoopCardPreferenceProvider prefs;
+    SandboxPathProvider pathProvider(root);
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    db.loadCardDatabases();
+    CardInfoPtr card = db.getCardList().value("Cat");
+    ASSERT_FALSE(card.isNull());
+    QWeakPointer<CardInfo> weakCard(card);
+    card.clear();
+
+    db.reloadCardDatabasesAndNotify();
+
+    // CardSet holds strong CardInfoPtrs and CardInfo holds the CardSetPtr through its printings; if that
+    // cycle is not broken, the previous snapshot survives the reload.
+    EXPECT_TRUE(weakCard.isNull()) << "a reload must release the previous card snapshot";
+}
+
+TEST_F(CardDatabaseCacheInvalidationTest, ClearReleasesCards)
+{
+    NoopCardPreferenceProvider prefs;
+    SandboxPathProvider pathProvider(root);
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    db.loadCardDatabases();
+    CardInfoPtr card = db.getCardList().value("Cat");
+    ASSERT_FALSE(card.isNull());
+    QWeakPointer<CardInfo> weakCard(card);
+    card.clear();
+
+    db.clear();
+
+    EXPECT_TRUE(weakCard.isNull()) << "clear() must release cards held by set membership";
+}
+
+TEST_F(CardDatabaseCacheInvalidationTest, RemoveCardDetachesItFromItsSet)
+{
+    // removeCard() is the one teardown path a caller can trigger for a single card (the token editor
+    // uses it). Without the detach the set's strong reference keeps the removed card alive forever.
+    NoopCardPreferenceProvider prefs;
+    SandboxPathProvider pathProvider(root);
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    db.loadCardDatabases();
+    CardInfoPtr card = db.getCardList().value("Cat");
+    ASSERT_FALSE(card.isNull());
+    const CardSetPtr catSet = db.getSet("CAT");
+    ASSERT_TRUE(catSet->contains(card));
+
+    db.removeCard(card);
+
+    EXPECT_FALSE(catSet->contains(card)) << "removeCard() must detach the card from its set";
+    QWeakPointer<CardInfo> weakCard(card);
+    card.clear();
+    EXPECT_TRUE(weakCard.isNull()) << "a removed card must not stay alive through its set";
+}
+
+TEST_F(CardDatabaseCacheInvalidationTest, RemoveSelfPointerStillNotifiesDatabaseCard)
+{
+    // cardInfoChanged() used to be emitted through a self pointer stored on the card. Without it the
+    // card must still notify its observers whenever its properties change.
+    NoopCardPreferenceProvider prefs;
+    SandboxPathProvider pathProvider(root);
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    db.loadCardDatabases();
+    const CardInfoPtr card = db.getCardList().value("Cat");
+    ASSERT_FALSE(card.isNull());
+    QSignalSpy spy(card.data(), &CardInfo::cardInfoChanged);
+
+    card->setProperty("manacost", "1G");
+
+    ASSERT_EQ(spy.count(), 1) << "a property change on a database card must still emit cardInfoChanged";
+    const QList<QVariant> arguments = spy.takeFirst();
+    ASSERT_EQ(arguments.size(), 1);
+    EXPECT_EQ(arguments.first().value<CardInfoPtr>().data(), card.data())
+        << "the signal must carry the card that changed";
+}
+
+TEST_F(CardDatabaseCacheInvalidationTest, RemoveSelfPointerCloneNotifiesAsItself)
+{
+    // A clone owns its own shared reference, so its changes must be reported as the clone's, never the
+    // original's: decks and views listening to the original must not be invalidated by a clone edit.
+    NoopCardPreferenceProvider prefs;
+    SandboxPathProvider pathProvider(root);
+    CardDatabase db(nullptr, &prefs, &pathProvider, &controller);
+
+    db.loadCardDatabases();
+    const CardInfoPtr original = db.getCardList().value("Cat");
+    ASSERT_FALSE(original.isNull());
+    const CardInfoPtr clone = original->clone();
+    QSignalSpy originalSpy(original.data(), &CardInfo::cardInfoChanged);
+    QSignalSpy cloneSpy(clone.data(), &CardInfo::cardInfoChanged);
+
+    clone->setProperty("manacost", "1G");
+
+    ASSERT_EQ(cloneSpy.count(), 1) << "the clone must notify its own observers";
+    EXPECT_EQ(cloneSpy.first().first().value<CardInfoPtr>().data(), clone.data())
+        << "the clone's signal must carry the clone";
+    EXPECT_EQ(originalSpy.count(), 0) << "the clone must not notify the original's observers";
+}
+
 } // namespace
 
 int main(int argc, char **argv)
diff --git a/tests/carddatabase/filter_mode_test.cpp b/tests/carddatabase/filter_mode_test.cpp
new file mode 100644
index 000000000..3fec7e25d
--- /dev/null
+++ b/tests/carddatabase/filter_mode_test.cpp
@@ -0,0 +1,147 @@
+#include "libcockatrice/filters/filter_mode.h"
+
+#include <gtest/gtest.h>
+
+class FilterModeTest : public ::testing::Test
+{
+protected:
+    ~FilterModeTest() override
+    {
+        for (CardFilter *filter : owned) {
+            delete filter;
+        }
+    }
+
+    /** @brief Create a filter owned by the fixture and append it to the set under test. */
+    const CardFilter *
+    add(const QString &term, CardFilter::Type type, CardFilter::Attr attr = CardFilter::Attr::AttrColor)
+    {
+        owned.append(new CardFilter(term, type, attr));
+        filters.append(owned.last());
+        return owned.last();
+    }
+
+    QList<CardFilter *> owned;
+    QList<const CardFilter *> filters;
+};
+
+TEST(FilterModeInfoTest, EachModeDescribesItsOwnFilters)
+{
+    EXPECT_EQ(getFilterModeInfo(FilterMode::Includes).includeType, CardFilter::Type::TypeOr);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::Includes).excludeType, CardFilter::Type::TypeEnd);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::Includes).attr, CardFilter::Attr::AttrColor);
+
+    EXPECT_EQ(getFilterModeInfo(FilterMode::Excludes).includeType, CardFilter::Type::TypeAndNot);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::Excludes).excludeType, CardFilter::Type::TypeEnd);
+
+    EXPECT_EQ(getFilterModeInfo(FilterMode::IncludeExclude).includeType, CardFilter::Type::TypeOr);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::IncludeExclude).excludeType, CardFilter::Type::TypeAndNot);
+
+    EXPECT_EQ(getFilterModeInfo(FilterMode::ExactMatch).includeType, CardFilter::Type::TypeAnd);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::ExactMatch).excludeType, CardFilter::Type::TypeAndNot);
+
+    // Color identity only excludes: the selected colors must be the identity, so nothing is included positively.
+    EXPECT_EQ(getFilterModeInfo(FilterMode::ColorIdentity).includeType, CardFilter::Type::TypeEnd);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::ColorIdentity).excludeType, CardFilter::Type::TypeAndNot);
+    EXPECT_EQ(getFilterModeInfo(FilterMode::ColorIdentity).attr, CardFilter::Attr::AttrColorIdentity);
+
+    EXPECT_EQ(getFilterModeInfo(FilterMode::Custom).attr, CardFilter::Attr::AttrEnd);
+}
+
+TEST_F(FilterModeTest, EmptyFilterSetKeepsACompatibleMode)
+{
+    // Includes and Color identity both allow an empty set, so the live mode is not swapped for another.
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Includes);
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::ColorIdentity), FilterMode::ColorIdentity);
+}
+
+// Include / Exclude and Exact match always hold one filter per color, so an empty set cannot have come from
+// them and falls back to the first mode that can describe it.
+TEST_F(FilterModeTest, EmptyFilterSetFallsBackWhenTheModeNeedsOneFilterPerColor)
+{
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::IncludeExclude), FilterMode::Includes);
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::ExactMatch), FilterMode::Includes);
+}
+
+TEST_F(FilterModeTest, IncludesFromOrFilters)
+{
+    add("W", CardFilter::Type::TypeOr);
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Includes);
+    // A single OR filter cannot come from Excludes, so the first mode that can produce it is selected.
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Excludes), FilterMode::Includes);
+}
+
+TEST_F(FilterModeTest, ExcludesFromAndNotFilters)
+{
+    add("W", CardFilter::Type::TypeAndNot);
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Excludes), FilterMode::Excludes);
+    // Includes needs an OR or an end filter, so an AND NOT filter selects Excludes.
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Excludes);
+}
+
+TEST_F(FilterModeTest, IncludeExcludeNeedsOneFilterPerColor)
+{
+    add("W", CardFilter::Type::TypeOr);
+    for (const QChar color : QString("UBRG")) {
+        add(QString(color), CardFilter::Type::TypeAndNot);
+    }
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::IncludeExclude), FilterMode::IncludeExclude);
+}
+
+TEST_F(FilterModeTest, IncludeExcludeRejectsAnIncompleteColorSet)
+{
+    add("W", CardFilter::Type::TypeOr);
+    add("U", CardFilter::Type::TypeAndNot);
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::IncludeExclude), FilterMode::Custom);
+}
+
+TEST_F(FilterModeTest, ExactMatchFromAndAndAndNotFilters)
+{
+    add("W", CardFilter::Type::TypeAnd);
+    for (const QChar color : QString("UBRG")) {
+        add(QString(color), CardFilter::Type::TypeAndNot);
+    }
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::ExactMatch), FilterMode::ExactMatch);
+}
+
+TEST_F(FilterModeTest, ColorIdentityFromIdentityAndNotFilters)
+{
+    for (const QChar color : QString("BRG")) {
+        add(QString(color), CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity);
+    }
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::ColorIdentity), FilterMode::ColorIdentity);
+}
+
+TEST_F(FilterModeTest, MixedAttributesAreCustom)
+{
+    add("W", CardFilter::Type::TypeOr, CardFilter::Attr::AttrColor);
+    add("U", CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity);
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Custom);
+}
+
+TEST_F(FilterModeTest, CustomLeavesAsSoonAsAModeCanExplainTheFilters)
+{
+    add("W", CardFilter::Type::TypeOr);
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Custom), FilterMode::Includes);
+}
+
+// Exact match with no color selected stores one AND NOT filter per color. That is a legitimate Exact match
+// state, so the live mode is kept; a mode that cannot produce the set re-derives to Excludes, which produces
+// the identical filters.
+TEST_F(FilterModeTest, FullyExcludedColorSetIsExactMatchOrExcludes)
+{
+    for (const QChar color : QString("WUBRG")) {
+        add(QString(color), CardFilter::Type::TypeAndNot);
+    }
+
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::ExactMatch), FilterMode::ExactMatch);
+    EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Excludes);
+}
diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp
index e561db590..931cb7e0c 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -123,6 +123,25 @@ CardInfoPtr greenIdentityCard()
     return CardInfo::newInstance("Identity Cat", "", false, {{"colors", "G"}, {"coloridentity", "G"}}, {}, {}, {}, {});
 }
 
+// A card whose color identity differs from its colors, so that a query reading the wrong one is visible.
+CardInfoPtr splitIdentityCard()
+{
+    return CardInfo::newInstance("Split Identity", "", false, {{"colors", "G"}, {"coloridentity", "W"}}, {}, {}, {},
+                                 {});
+}
+
+// "ci!" (exactly these color identities) used to read the camelCase "colorIdentity" property instead of the
+// lowercase "coloridentity" key, so it matched the empty string and rejected every card.
+TEST_F(CardQuery, ColorIdentityExactReadsTheColorIdentityProperty)
+{
+    const CardData card = splitIdentityCard();
+    ASSERT_TRUE(FilterString("ci!w").check(card));
+    ASSERT_FALSE(FilterString("ci!g").check(card));
+    // "c!" still reads colors, not identity.
+    ASSERT_TRUE(FilterString("c!g").check(card));
+    ASSERT_FALSE(FilterString("c!w").check(card));
+}
+
 // Whitespace belongs around the separator, never inside an operator token: "c i: g" must not
 // be read as the color-identity operator "ci" (it is a generic "c" AND a field query on "i").
 TEST_F(CardQuery, ColorIdentityOperatorIsNotSplitByWhitespace)
diff --git a/tests/carddatabase/filter_tree_test.cpp b/tests/carddatabase/filter_tree_test.cpp
new file mode 100644
index 000000000..8d3706071
--- /dev/null
+++ b/tests/carddatabase/filter_tree_test.cpp
@@ -0,0 +1,204 @@
+
+#include "libcockatrice/filters/filter_tree.h"
+
+#include <gtest/gtest.h>
+#include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/filters/filter_string.h>
+
+namespace
+{
+class FilterTreeTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        language = CardSearchLanguage{};
+
+        island = CardInfo::newInstance("Island", "", false, {{"colors", ""}, {"coloridentity", "U"}}, {}, {}, {}, {});
+        artifact =
+            CardInfo::newInstance("Artifact", "", false, {{"colors", ""}, {"coloridentity", ""}}, {}, {}, {}, {});
+        truth = CardInfo::newInstance("Truth", "", false, {{"colors", "U"}, {"coloridentity", "U"}}, {}, {}, {}, {});
+        notDead =
+            CardInfo::newInstance("Not Dead", "", false, {{"colors", "B"}, {"coloridentity", "B"}}, {}, {}, {}, {});
+        wallOfDenial = CardInfo::newInstance("Wall of Denial", "", false, {{"colors", "WU"}, {"coloridentity", "WU"}},
+                                             {}, {}, {}, {});
+        maelstromAngel = CardInfo::newInstance("Maelstrom Archangel", "", false,
+                                               {{"colors", "WUBRG"}, {"coloridentity", "WUBRG"}}, {}, {}, {}, {});
+    }
+
+    CardSearchLanguage language;
+
+    CardData island;         // c/u
+    CardData artifact;       // c
+    CardData truth;          // u
+    CardData notDead;        // b
+    CardData wallOfDenial;   // wu
+    CardData maelstromAngel; // wubrg
+};
+} // namespace
+
+// =====================================================================================================================
+// acceptColor
+// =====================================================================================================================
+
+TEST_F(FilterTreeTest, Color)
+{
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "wu");
+    ASSERT_FALSE(filterTree.acceptsCard(island, language));
+    ASSERT_FALSE(filterTree.acceptsCard(artifact, language));
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+TEST_F(FilterTreeTest, ColorColorless)
+{
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "c");
+    ASSERT_TRUE(filterTree.acceptsCard(island, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_FALSE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+TEST_F(FilterTreeTest, ColorNot)
+{
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAndNot, "b");
+    ASSERT_TRUE(filterTree.acceptsCard(island, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    ASSERT_TRUE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+TEST_F(FilterTreeTest, ColorAliases)
+{
+    FilterTree filterTree;
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "green");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "grn");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "blue");
+    ASSERT_TRUE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "blu");
+    ASSERT_TRUE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "black");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(notDead, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "blk");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(notDead, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "red");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "white");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "wht");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "colorless");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "colourless");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    filterTree.clear();
+
+    filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "none");
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    filterTree.clear();
+}
+
+// =====================================================================================================================
+// acceptColorIdentity
+// =====================================================================================================================
+
+TEST_F(FilterTreeTest, ColorIdentity)
+{
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAnd, "wu");
+    ASSERT_FALSE(filterTree.acceptsCard(island, language));
+    ASSERT_FALSE(filterTree.acceptsCard(artifact, language));
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+TEST_F(FilterTreeTest, ColorIdentityColorless)
+{
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAnd, "c");
+    ASSERT_FALSE(filterTree.acceptsCard(island, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    ASSERT_FALSE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_FALSE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+TEST_F(FilterTreeTest, ColorIdentityNot)
+{
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "b");
+    ASSERT_TRUE(filterTree.acceptsCard(island, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    ASSERT_TRUE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+TEST_F(FilterTreeTest, ColorIdentityMultiple)
+{
+    // Simulate a WU commander.
+    FilterTree filterTree;
+    filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "b");
+    filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "r");
+    filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "g");
+    ASSERT_TRUE(filterTree.acceptsCard(island, language));
+    ASSERT_TRUE(filterTree.acceptsCard(artifact, language));
+    ASSERT_TRUE(filterTree.acceptsCard(truth, language));
+    ASSERT_FALSE(filterTree.acceptsCard(notDead, language));
+    ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language));
+    ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language));
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/carddatabase/visual_display_model_test.cpp b/tests/carddatabase/visual_display_model_test.cpp
new file mode 100644
index 000000000..5fa554bb3
--- /dev/null
+++ b/tests/carddatabase/visual_display_model_test.cpp
@@ -0,0 +1,188 @@
+/**
+ * @file visual_display_model_test.cpp
+ * @brief Tests for the flattened model behind the visual card database grid.
+ */
+
+#include "card_database_display_model.h"
+#include "card_database_model.h"
+#include "card_database_visual_display_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/interfaces/noop_card_preference_provider.h"
+#include "libcockatrice/interfaces/noop_card_set_priority_controller.h"
+#include "test_card_database_path_provider.h"
+
+#include "gtest/gtest.h"
+#include <QCoreApplication>
+#include <QDate>
+#include <QEventLoop>
+#include <QHash>
+#include <QMap>
+#include <QString>
+#include <QTimer>
+#include <memory>
+
+namespace
+{
+// GTest's main() creates no QCoreApplication, which QTimer needs for its event loop.
+const QCoreApplication &application()
+{
+    static int argc = 1;
+    static char executable[] = "visual_display_model_test";
+    static char *argv[] = {executable, nullptr};
+    static const QCoreApplication app(argc, argv);
+    return app;
+}
+
+/// Lets the rebuild timer fire, as it would in the running client.
+void waitForRebuild()
+{
+    QEventLoop loop;
+    QTimer::singleShot(100, &loop, &QEventLoop::quit);
+    loop.exec();
+}
+
+class CardDatabaseVisualDisplayModelTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        (void)application();
+
+        db = std::make_unique<CardDatabase>(nullptr, new NoopCardPreferenceProvider(),
+                                            new TestCardDatabasePathProvider(), new NoopCardSetPriorityController());
+        db->loadCardDatabases();
+
+        cardModel = std::make_unique<CardDatabaseModel>(db.get(), false);
+        displayModel = std::make_unique<CardDatabaseDisplayModel>();
+        displayModel->setSourceModel(cardModel.get());
+        visualModel = std::make_unique<CardDatabaseVisualDisplayModel>(displayModel.get(), db->query());
+        visualModel->refresh();
+    }
+
+    /**
+     * @brief Builds a card with @p printingCount printings in each named set.
+     * @param printingCountPerSet Set short name to the number of printings in that set.
+     */
+    [[nodiscard]] CardInfoPtr makeCard(const QString &name, const QMap<QString, int> &printingCountPerSet)
+    {
+        SetToPrintingsMap setsInfo;
+        for (auto it = printingCountPerSet.constBegin(); it != printingCountPerSet.constEnd(); ++it) {
+            CardSetPtr set = CardSet::newInstance(&setController, it.key(), it.key() + " test set", "expansion",
+                                                  QDate(), CardSet::PriorityPrimary);
+            for (int printing = 0; printing < it.value(); ++printing) {
+                QHash<QString, QString> properties;
+                properties["uuid"] = QString("%1-%2-%3").arg(it.key(), name).arg(printing);
+                setsInfo[it.key()].append(PrintingInfo(set, LazyPropertiesHash(properties)));
+            }
+        }
+
+        CardInfo::UiAttributes attributes = {.tableRow = 1};
+        return CardInfo::newInstance(name, "", false, {}, {}, {}, setsInfo, attributes);
+    }
+
+    NoopCardSetPriorityController setController;
+    std::unique_ptr<CardDatabase> db;
+    std::unique_ptr<CardDatabaseModel> cardModel;
+    std::unique_ptr<CardDatabaseDisplayModel> displayModel;
+    std::unique_ptr<CardDatabaseVisualDisplayModel> visualModel;
+};
+
+TEST_F(CardDatabaseVisualDisplayModelTest, ExposesTheCardInfoBehindAProxyRow)
+{
+    ASSERT_GT(displayModel->rowCount(), 0);
+
+    const QVariant info = displayModel->data(displayModel->index(0, CardDatabaseModel::NameColumn),
+                                             CardDatabaseDisplayModel::CardInfoRole);
+    ASSERT_TRUE(info.isValid());
+    EXPECT_FALSE(info.value<CardInfoPtr>().isNull());
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, FlattensOneRowPerProxyCardWithoutSetFilters)
+{
+    ASSERT_GT(displayModel->rowCount(), 0);
+    EXPECT_EQ(displayModel->rowCount(), visualModel->rowCount());
+
+    for (int row = 0; row < visualModel->rowCount(); ++row) {
+        const ExactCard card = visualModel->cardAt(row);
+        ASSERT_TRUE(card) << "row " << row;
+        EXPECT_EQ(
+            displayModel->data(displayModel->index(row, CardDatabaseModel::NameColumn), Qt::DisplayRole).toString(),
+            card.getName())
+            << "row " << row;
+    }
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, ShowsOneRowPerCardWhenNoSetIsFiltered)
+{
+    const int rowsBefore = visualModel->rowCount();
+
+    db->addCard(makeCard("Multi", {{"TST", 2}, {"OTH", 1}}));
+    visualModel->refresh();
+
+    EXPECT_EQ(rowsBefore + 1, visualModel->rowCount());
+    EXPECT_EQ("Multi", visualModel->cardAt(visualModel->rowCount() - 1).getName());
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, ShowsEveryPrintingOfAFilteredSet)
+{
+    db->addCard(makeCard("Multi", {{"TST", 2}, {"OTH", 1}}));
+    visualModel->refresh();
+
+    visualModel->setSetFilterTerms({"TST"});
+
+    ASSERT_EQ(2, visualModel->rowCount());
+    for (int row = 0; row < visualModel->rowCount(); ++row) {
+        const ExactCard card = visualModel->cardAt(row);
+        ASSERT_TRUE(card) << "row " << row;
+        EXPECT_EQ("Multi", card.getName());
+        ASSERT_FALSE(card.getPrinting().isEmpty()) << "row " << row;
+        EXPECT_EQ("TST", card.getPrinting().getSet()->getShortName()) << "row " << row;
+    }
+    EXPECT_NE(visualModel->cardAt(0).getPrinting(), visualModel->cardAt(1).getPrinting());
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, HidesCardsWithoutAPrintingInTheFilteredSets)
+{
+    visualModel->setSetFilterTerms({"NO SUCH SET"});
+
+    EXPECT_EQ(0, visualModel->rowCount());
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, RestoresOneRowPerCardWhenTheSetTermsClear)
+{
+    db->addCard(makeCard("Multi", {{"TST", 2}, {"OTH", 1}}));
+    visualModel->refresh();
+    const int rowsBefore = visualModel->rowCount();
+
+    visualModel->setSetFilterTerms({"TST"});
+    ASSERT_EQ(2, visualModel->rowCount());
+
+    visualModel->setSetFilterTerms({});
+    EXPECT_EQ(rowsBefore, visualModel->rowCount());
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, RebuildsByItselfWhenTheProxyGainsARow)
+{
+    const int rowsBefore = visualModel->rowCount();
+
+    db->addCard(makeCard("Late", {{"TST", 1}}));
+    waitForRebuild();
+
+    EXPECT_EQ(rowsBefore + 1, visualModel->rowCount());
+}
+
+TEST_F(CardDatabaseVisualDisplayModelTest, ReportsTheCardNameForDisplayAndAccessibleText)
+{
+    ASSERT_GT(visualModel->rowCount(), 0);
+    const QString expected = visualModel->cardAt(0).getName();
+
+    EXPECT_EQ(expected, visualModel->data(visualModel->index(0), Qt::DisplayRole).toString());
+    EXPECT_EQ(expected, visualModel->data(visualModel->index(0), Qt::AccessibleTextRole).toString());
+    EXPECT_FALSE(visualModel->data(QModelIndex(), Qt::DisplayRole).isValid());
+}
+} // namespace
diff --git a/tests/client_login_status_test.cpp b/tests/client_login_status_test.cpp
new file mode 100644
index 000000000..d8ea63550
--- /dev/null
+++ b/tests/client_login_status_test.cpp
@@ -0,0 +1,116 @@
+/** @file client_login_status_test.cpp
+ *  @brief The login response state machine must keep the session a forced password change needs.
+ *  @ingroup Tests
+ */
+
+#include "abstract_client.h"
+#include "libcockatrice/interfaces/interface_network_settings_provider.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/response_login.pb.h"
+#include "remote_client.h"
+
+#include <QCoreApplication>
+#include <QMetaObject>
+#include <QString>
+#include <gtest/gtest.h>
+
+namespace
+{
+
+class StubNetworkSettingsProvider : public INetworkSettingsProvider
+{
+public:
+    QString getClientID() override
+    {
+        return {};
+    }
+    [[nodiscard]] int getTimeOut() const override
+    {
+        return 1000;
+    }
+    [[nodiscard]] int getKeepAlive() const override
+    {
+        return 60;
+    }
+    [[nodiscard]] bool getNotifyAboutUpdates() const override
+    {
+        return false;
+    }
+    void setKnownMissingFeatures(const QString &) override
+    {
+    }
+    QString getKnownMissingFeatures() override
+    {
+        return {};
+    }
+};
+
+/**
+ * @brief Feeds a login response to RemoteClient without a socket.
+ *
+ * `loginResponse` is the slot the socket thread runs for the login command's answer, so
+ * invoking it directly exercises the status transition that decides whether `readData()`
+ * tears the connection down right after it.
+ */
+class ClientLoginStatusTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        client = new RemoteClient(nullptr, &provider);
+    }
+
+    void TearDown() override
+    {
+        delete client;
+        client = nullptr;
+    }
+
+    void deliverLoginResponse(Response::ResponseCode code)
+    {
+        Response response;
+        response.set_response_code(code);
+        response.MutableExtension(Response_Login::ext);
+        ASSERT_TRUE(
+            QMetaObject::invokeMethod(client, "loginResponse", Qt::DirectConnection, Q_ARG(Response, response)));
+    }
+
+    StubNetworkSettingsProvider provider;
+    RemoteClient *client = nullptr;
+};
+
+/**
+ * @brief A required password change is not a failed login.
+ *
+ * The server keeps the session open and accepts only ping and Command_AccountPassword until
+ * the password is replaced. StatusDisconnecting would make readData() close the socket right
+ * after this slot returns - before the dialog that collects the new password (queued to the
+ * UI thread) can send anything - and the pending command would never be answered because the
+ * ping timer that times it out dies with the connection. StatusLoggedIn would start the
+ * normal post-login flow for a session that cannot serve it.
+ */
+TEST_F(ClientLoginStatusTest, PasswordChangeRequiredKeepsTheSessionOpen)
+{
+    deliverLoginResponse(Response::RespPasswordChangeRequired);
+
+    EXPECT_EQ(client->getStatus(), StatusPasswordChangeRequired);
+    EXPECT_NE(client->getStatus(), StatusDisconnecting);
+    EXPECT_NE(client->getStatus(), StatusLoggedIn);
+}
+
+/** @brief Every other login error still ends the connection, as it did before. */
+TEST_F(ClientLoginStatusTest, OtherLoginErrorsDisconnect)
+{
+    deliverLoginResponse(Response::RespWrongPassword);
+
+    EXPECT_EQ(client->getStatus(), StatusDisconnecting);
+}
+
+} // namespace
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
index 95df74702..d4e44125c 100644
--- a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
+++ b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
@@ -278,6 +278,37 @@ TEST(DeckListModelCustomZones, SortPlainNodeDoesNotReorderCustomZones)
     EXPECT_EQ(mapping[1].second, 1);
 }
 
+TEST(DeckListModelCustomZones, ManaGroupsUseNumericOrderWithoutChangingOtherNodes)
+{
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    const QStringList original = {"10", "2", "0.5", "1000000", "1", "unknown", "nan"};
+    for (const auto &name : original) {
+        new InnerDecklistNode(name, board);
+    }
+    auto *custom = new DecklistModelSubZoneNode("1x", board);
+    new InnerDecklistNode("10", custom);
+    new InnerDecklistNode("2", custom);
+    root.setSortMethod(DeckSortMethod::ByName);
+
+    const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder, true);
+    EXPECT_EQ(childNames(board), (QStringList{"0.5", "1", "2", "10", "1000000", "nan", "unknown", "1x"}));
+    QStringList before = original;
+    before.append("1x");
+    for (const auto &move : mapping) {
+        EXPECT_EQ(board->at(move.second)->getName(), before.at(move.first));
+    }
+
+    (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::DescendingOrder, true);
+    EXPECT_EQ(childNames(board), (QStringList{"1000000", "10", "2", "1", "0.5", "unknown", "nan", "1x"}));
+
+    // The numeric flag only affects groups directly under a board.
+    (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, custom, Qt::AscendingOrder, true);
+    EXPECT_EQ(childNames(custom), (QStringList{"10", "2"}));
+    (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder);
+    EXPECT_EQ(childNames(board), (QStringList{"0.5", "1", "10", "1000000", "2", "nan", "unknown", "1x"}));
+}
+
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/deck_list_zones/deck_list_zones_test.cpp b/tests/deck_list_zones/deck_list_zones_test.cpp
index 1903b70df..a67e689cf 100644
--- a/tests/deck_list_zones/deck_list_zones_test.cpp
+++ b/tests/deck_list_zones/deck_list_zones_test.cpp
@@ -393,6 +393,28 @@ TEST(DeckListZones, MaybeboardCustomZoneCardsAreExcludedFromHash)
     EXPECT_EQ(deck.getDeckHash(), expected.getDeckHash());
 }
 
+TEST(DeckListZones, PlainExportPutsMainFirstWithoutReorderingSavedZones)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr);
+    tree->addCard("Side Card", 2, "Side Tech", -1);
+    tree->addCard("Token Card", 1, DECK_ZONE_TOKENS, -1);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Main Card", 3, "Removal", -1);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr);
+    tree->addCard("Maybe Card", 4, "Candidates", -1);
+
+    const QString native = deck.writeToString_Native();
+    EXPECT_EQ(deck.writeToString_Plain(true, false), QString("3 Main Card\nSB: 2 Side Card\n1 Token Card\n"));
+    EXPECT_EQ(deck.writeToString_Plain(false, false), QString("3 Main Card\n2 Side Card\n1 Token Card\n"));
+    EXPECT_EQ(deck.writeToString_Native(), native);
+
+    DeckList reopened(native);
+    EXPECT_EQ(reopened.getZoneNodes().first()->getName(), DECK_ZONE_SIDE);
+    EXPECT_EQ(reopened.writeToString_Plain(true, false), deck.writeToString_Plain(true, false));
+}
+
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/deck_state_manager_test.cpp b/tests/deck_state_manager_test.cpp
new file mode 100644
index 000000000..ddd17912c
--- /dev/null
+++ b/tests/deck_state_manager_test.cpp
@@ -0,0 +1,190 @@
+/** @file deck_state_manager_test.cpp
+ *  @brief Tests for DeckStateManager operations.
+ *  @ingroup Tests
+ */
+
+#include "libcockatrice/card/database/card_database.h"
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QStandardPaths>
+#include <client/settings/cache_settings.h>
+#include <deck_list_model.h>
+#include <gtest/gtest.h>
+#include <interface/widgets/deck_editor/deck_state_manager.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/card/printing/exact_card.h>
+#include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+
+namespace
+{
+
+/**
+ * @brief Assert that the DeckStateManager's deck list contains only the given zone,
+ * and that that zone only contains the given number of cards, all with the given card name.
+ *
+ * @param manager the DeckStateManager
+ * @param restrictToZones In which zones to look for the zone and cards. Empty means use the entire deck
+ * @param zone The only zone that should exist in the deck
+ * @param cardName The name of the only card that should exist in the deck
+ * @param cardNumber The number of cards that should be in the deck
+ */
+static void containsExactly(const DeckStateManager &manager,
+                            const QSet<QString> &restrictToZones,
+                            QString zone,
+                            QString cardName,
+                            int cardNumber)
+{
+    QList<const InnerDecklistNode *> zones = manager.getDeckList().getZoneNodes(restrictToZones);
+    ASSERT_EQ(zones.size(), 1);
+    ASSERT_EQ(zones[0]->getName(), zone);
+    ASSERT_EQ(zones[0]->size(), 1);
+    const DecklistCardNode *card = dynamic_cast<const DecklistCardNode *>((*zones[0])[0]);
+    ASSERT_NE(card, nullptr);
+    ASSERT_EQ(card->getName(), cardName);
+    ASSERT_EQ(card->getNumber(), cardNumber);
+}
+
+/** @brief Return CardInfo of a token with the given name. */
+static CardInfoPtr makeToken(QString name)
+{
+    return CardInfo::newInstance(name, "", true, {}, {}, {}, {}, {});
+}
+
+// =====================================================================================================================
+// addCard
+// =====================================================================================================================
+
+TEST(DeckStateManager, AddCards)
+{
+    DeckStateManager manager;
+    manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+    containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 1);
+    manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+    containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 2);
+}
+
+TEST(DeckStateManager, AddCardZones)
+{
+    DeckStateManager manager;
+    manager.addCard(ExactCard(CardInfo::newInstance("Grizzly Bears")), DECK_ZONE_MAIN);
+    manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_SIDE);
+    manager.addCard(ExactCard(CardInfo::newInstance("Swords to Plowshares")), DECK_ZONE_MAYBEBOARD);
+
+    // Check if the cards got put into the correct zones.
+    ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 3);
+    containsExactly(manager, {DECK_ZONE_MAIN}, DECK_ZONE_MAIN, "Grizzly Bears", 1);
+    containsExactly(manager, {DECK_ZONE_SIDE}, DECK_ZONE_SIDE, "Lightning Bolt", 1);
+    containsExactly(manager, {DECK_ZONE_MAYBEBOARD}, DECK_ZONE_MAYBEBOARD, "Swords to Plowshares", 1);
+}
+
+TEST(DeckStateManager, AddTokens)
+{
+    DeckStateManager manager;
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN);
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_SIDE);
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAYBEBOARD);
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_TOKENS);
+
+    // A token should always be put into the tokens zone.
+    containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 4);
+}
+
+// =====================================================================================================================
+// decrementCard
+// =====================================================================================================================
+
+TEST(DeckStateManager, DecrementCards)
+{
+    DeckStateManager manager;
+    manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+    manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+    containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 2);
+
+    // Removing from the sideboard should do nothing, as there is nothing in the side board.
+    manager.decrementCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_SIDE);
+    containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 2);
+
+    // Remove the first card.
+    manager.decrementCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+    containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 1);
+
+    // Removing the second card should also remove the zone.
+    manager.decrementCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+    ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 0);
+}
+
+TEST(DeckStateManager, DecrementTokens)
+{
+    DeckStateManager manager;
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN);
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_SIDE);
+    manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_TOKENS);
+    containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 3);
+
+    manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_TOKENS);
+    containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 2);
+
+    // Removing tokens from a given zone should remove them from the
+    // token zone if the given zone does not contain the token.
+    manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_SIDE);
+    containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 1);
+
+    manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN);
+    ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 0);
+}
+
+TEST(DeckStateManager, DecrementTokenMainboard)
+{
+    DeckStateManager manager;
+
+    // Add cards to the deck list directly so tokens are not
+    // automatically added to the token zone.
+    manager.getDeckListShared()->addCard("Beast", DECK_ZONE_MAIN);
+    manager.getDeckListShared()->addCard("Beast", DECK_ZONE_TOKENS);
+    ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 2);
+    containsExactly(manager, {DECK_ZONE_MAIN}, DECK_ZONE_MAIN, "Beast", 1);
+    containsExactly(manager, {DECK_ZONE_TOKENS}, DECK_ZONE_TOKENS, "Beast", 1);
+
+    // decrementCard uses the model to find the card, so we need to rebuild it.
+    manager.getModel()->rebuildTree();
+
+    // Tokens should be removed from the main zone first.
+    manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN);
+    ASSERT_EQ(manager.getDeckList().getZoneNodes({DECK_ZONE_MAIN}).size(), 0);
+    containsExactly(manager, {DECK_ZONE_TOKENS}, DECK_ZONE_TOKENS, "Beast", 1);
+
+    // If the main zone is empty they can be removed from the token zone.
+    manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN);
+    ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 0);
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    // Redirect SettingsCache reads/writes (app-data location) away from the real user profile.
+    QStandardPaths::setTestModeEnabled(true);
+    QCoreApplication app(argc, argv);
+    QCoreApplication::setOrganizationName(QStringLiteral("CockatriceTest"));
+    QCoreApplication::setApplicationName(
+        QStringLiteral("deck-state-manager-test-%1").arg(QCoreApplication::applicationPid()));
+
+    ::testing::InitGoogleTest(&argc, argv);
+
+    // Add cards to the card database
+    auto *db = CardDatabaseManager::getInstance();
+    db->addCard(CardInfo::newInstance("Lightning Bolt"));
+    db->addCard(CardInfo::newInstance("Grizzly Bears"));
+    db->addCard(CardInfo::newInstance("Swords to Plowshares"));
+    db->addCard(makeToken("Beast"));
+
+    int result = RUN_ALL_TESTS();
+
+    // Clean up the settings directory in ~/.qttest if the tests ran.
+    if (!::testing::GTEST_FLAG(list_tests)) {
+        QDir(SettingsCache::instance().getDataPath()).removeRecursively();
+        QDir(SettingsCache::instance().getCachePath()).removeRecursively();
+    }
+
+    return result;
+}
diff --git a/tests/font_config_test.cpp b/tests/font_config_test.cpp
new file mode 100644
index 000000000..c8b1fb10d
--- /dev/null
+++ b/tests/font_config_test.cpp
@@ -0,0 +1,195 @@
+#include "interface/theme_config.h"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFont>
+#include <QIODevice>
+#include <QString>
+#include <QStringLiteral>
+#include <QTemporaryDir>
+#include <QTextStream>
+#include <gtest/gtest.h>
+
+namespace
+{
+// Writes content to a file inside tmp, creating parents as needed.
+QString writeTempFile(QTemporaryDir &tmp, const QString &relativePath, const QString &content)
+{
+    const QString filePath = QDir(tmp.path()).absoluteFilePath(relativePath);
+    EXPECT_TRUE(QDir().mkpath(QFileInfo(filePath).absolutePath()));
+    QFile file(filePath);
+    EXPECT_TRUE(file.open(QIODevice::WriteOnly | QIODevice::Text));
+    QTextStream out(&file);
+    out << content;
+    file.close();
+    return filePath;
+}
+
+QFont makeFont(const QString &family, int pointSize)
+{
+    QFont font(family);
+    font.setPointSize(pointSize);
+    return font;
+}
+} // namespace
+
+TEST(FontConfigTest, FileNameIsFontsToml)
+{
+    EXPECT_EQ(FontConfig::fileName(), QStringLiteral("fonts.toml"));
+}
+
+TEST(FontConfigTest, EmptyByDefault)
+{
+    FontConfig cfg;
+    EXPECT_FALSE(cfg.hasFonts());
+    EXPECT_TRUE(cfg.toToml().isEmpty());
+    EXPECT_EQ(cfg, FontConfig());
+    EXPECT_EQ(cfg, FontConfig::fromFile("/nonexistent/path/fonts.toml"));
+    EXPECT_EQ(cfg, FontConfig::fromThemeDir(QString()));
+}
+
+TEST(FontConfigTest, RoundTripPreservesFamilyAndSize)
+{
+    QTemporaryDir tmp;
+    ASSERT_TRUE(tmp.isValid());
+
+    FontConfig cfg;
+    cfg.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 10);
+    cfg.fonts[AppFont::ChatLog] = makeFont("JetBrains Mono", 9);
+    cfg.fonts[AppFont::CardText] = makeFont("Noto Serif", 11);
+    cfg.fonts[AppFont::DeckList] = makeFont("Roboto", 12);
+    ASSERT_TRUE(cfg.hasFonts());
+
+    const QString filePath = writeTempFile(tmp, "fonts.toml", cfg.toToml());
+    const FontConfig loaded = FontConfig::fromFile(filePath);
+
+    EXPECT_EQ(loaded, cfg);
+    EXPECT_EQ(loaded.fonts[AppFont::InterfaceDefault].family(), QStringLiteral("Inter"));
+    EXPECT_EQ(loaded.fonts[AppFont::InterfaceDefault].pointSize(), 10);
+    EXPECT_EQ(loaded.fonts[AppFont::ChatLog].family(), QStringLiteral("JetBrains Mono"));
+    EXPECT_EQ(loaded.fonts[AppFont::ChatLog].pointSize(), 9);
+    EXPECT_EQ(loaded.fonts[AppFont::CardText].family(), QStringLiteral("Noto Serif"));
+    EXPECT_EQ(loaded.fonts[AppFont::CardText].pointSize(), 11);
+    EXPECT_EQ(loaded.fonts[AppFont::DeckList].family(), QStringLiteral("Roboto"));
+    EXPECT_EQ(loaded.fonts[AppFont::DeckList].pointSize(), 12);
+}
+
+TEST(FontConfigTest, RoundTripStripsWeightAndItalic)
+{
+    QTemporaryDir tmp;
+    ASSERT_TRUE(tmp.isValid());
+
+    QFont styled("Inter");
+    styled.setPointSize(10);
+    styled.setBold(true);
+    styled.setItalic(true);
+
+    FontConfig cfg;
+    cfg.fonts[AppFont::ChatLog] = styled;
+
+    const QString filePath = writeTempFile(tmp, "fonts.toml", cfg.toToml());
+    const FontConfig loaded = FontConfig::fromFile(filePath);
+
+    ASSERT_TRUE(loaded.fonts.contains(AppFont::ChatLog));
+    EXPECT_EQ(loaded.fonts[AppFont::ChatLog].family(), QStringLiteral("Inter"));
+    EXPECT_EQ(loaded.fonts[AppFont::ChatLog].pointSize(), 10);
+    EXPECT_FALSE(loaded.fonts[AppFont::ChatLog].bold());
+    EXPECT_FALSE(loaded.fonts[AppFont::ChatLog].italic());
+    EXPECT_EQ(loaded.fonts[AppFont::ChatLog], makeFont("Inter", 10));
+}
+
+TEST(FontConfigTest, ToTomlFormat)
+{
+    FontConfig cfg;
+    cfg.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 10);
+
+    const QString toml = cfg.toToml();
+    EXPECT_TRUE(toml.contains(QStringLiteral("[Fonts]")));
+    EXPECT_TRUE(toml.contains(QStringLiteral("InterfaceDefault")));
+    EXPECT_TRUE(toml.contains(QStringLiteral("\"Inter, 10\"")));
+}
+
+TEST(FontConfigTest, MalformedLinesAreSkipped)
+{
+    QTemporaryDir tmp;
+    ASSERT_TRUE(tmp.isValid());
+
+    const QString filePath = writeTempFile(tmp, "fonts.toml",
+                                           "# a comment\n"
+                                           "; another comment\n"
+                                           "\n"
+                                           "StrayBeforeSection = \"Inter, 10\"\n"
+                                           "\n"
+                                           "[Other]\n"
+                                           "ChatLog = \"ShouldBeIgnored, 10\"\n"
+                                           "\n"
+                                           "[Fonts]\n"
+                                           "InterfaceDefault = \"Inter, 10\"\n"
+                                           "ChatLog = \"JetBrains Mono\", 9 # inline comment\n"
+                                           "CardText = Noto Serif, 11\n"
+                                           "AppFont::DeckList = \"Roboto, 12\"\n"
+                                           "UnknownRole = \"Inter, 10\"\n"
+                                           "QPalette::Window = \"Inter, 10\"\n"
+                                           "NoComma = \"Inter\"\n"
+                                           "EmptyFamily = \", 10\"\n"
+                                           "ZeroSize = \"Inter, 0\"\n"
+                                           "NegativeSize = \"Inter, -3\"\n"
+                                           "NotANumber = \"Inter, big\"\n"
+                                           "NotAnEntry\n");
+
+    const FontConfig loaded = FontConfig::fromFile(filePath);
+
+    ASSERT_TRUE(loaded.hasFonts());
+    EXPECT_EQ(loaded.fonts.size(), 4);
+    EXPECT_EQ(loaded.fonts[AppFont::InterfaceDefault], makeFont("Inter", 10));
+    EXPECT_EQ(loaded.fonts[AppFont::ChatLog], makeFont("JetBrains Mono", 9));
+    EXPECT_EQ(loaded.fonts[AppFont::CardText], makeFont("Noto Serif", 11));
+    EXPECT_EQ(loaded.fonts[AppFont::DeckList], makeFont("Roboto", 12));
+}
+
+TEST(FontConfigTest, FromThemeDirReadsFontsToml)
+{
+    QTemporaryDir tmp;
+    ASSERT_TRUE(tmp.isValid());
+
+    const QString themeDir = QDir(tmp.path()).absoluteFilePath("MyTheme");
+    ASSERT_TRUE(QDir().mkpath(themeDir));
+
+    FontConfig cfg;
+    cfg.fonts[AppFont::CardText] = makeFont("Noto Serif", 11);
+    writeTempFile(tmp, "MyTheme/fonts.toml", cfg.toToml());
+
+    const FontConfig loaded = FontConfig::fromThemeDir(themeDir);
+    EXPECT_EQ(loaded, cfg);
+
+    // A theme directory without fonts.toml loads as empty.
+    const QString bareDir = QDir(tmp.path()).absoluteFilePath("BareTheme");
+    ASSERT_TRUE(QDir().mkpath(bareDir));
+    EXPECT_FALSE(FontConfig::fromThemeDir(bareDir).hasFonts());
+}
+
+TEST(FontConfigTest, InequalityComparesRoles)
+{
+    FontConfig left;
+    left.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 10);
+
+    FontConfig right = left;
+    EXPECT_EQ(left, right);
+    EXPECT_FALSE(left != right);
+
+    right.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 11);
+    EXPECT_NE(left, right);
+
+    right = left;
+    right.fonts[AppFont::ChatLog] = makeFont("Inter", 10);
+    EXPECT_NE(left, right);
+}
+
+// Every test brings its own main(): GTest is not guaranteed to be found on the build machines, and
+// the fallback then links the bare gtest library without gtest_main.
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/game/CMakeLists.txt b/tests/game/CMakeLists.txt
new file mode 100644
index 000000000..42c935c8f
--- /dev/null
+++ b/tests/game/CMakeLists.txt
@@ -0,0 +1,18 @@
+cockatrice_add_test(
+  NAME
+  game_logic_test
+  SOURCES
+  game_test_main.cpp
+  card_state_test.cpp
+  card_zone_logic_test.cpp
+  game_event_handler_test.cpp
+  player_actions_test.cpp
+  replay_test.cpp
+  ${VERSION_STRING_CPP}
+  LIBS
+  libcockatrice_game
+  INCLUDE_DIRS
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  DEFINITIONS
+  GAME_TEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data"
+)
diff --git a/tests/game/card_state_test.cpp b/tests/game/card_state_test.cpp
new file mode 100644
index 000000000..2f2c43bf4
--- /dev/null
+++ b/tests/game/card_state_test.cpp
@@ -0,0 +1,110 @@
+#include "gtest/gtest.h"
+#include <QMetaType>
+#include <QString>
+#include <QVariantList>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/utility/card_ref.h>
+
+namespace
+{
+
+CardRef cardRefFor(const QString &name)
+{
+    CardRef cardRef;
+    cardRef.name = name;
+    return cardRef;
+}
+
+} // namespace
+
+TEST(CardStateTest, AttachmentGraphKeepsBothEndsConsistent)
+{
+    CardState host(nullptr, nullptr, cardRefFor(QStringLiteral("Host")), 1);
+    CardState guest(nullptr, nullptr, cardRefFor(QStringLiteral("Guest")), 2);
+
+    guest.setAttachedTo(&host);
+    host.addAttachedCard(&guest);
+
+    EXPECT_EQ(guest.getAttachedTo(), &host);
+    ASSERT_EQ(host.getAttachedCards().size(), 1);
+    EXPECT_EQ(host.getAttachedCards().first(), &guest);
+
+    host.removeAttachedCard(&guest);
+    guest.setAttachedTo(nullptr);
+
+    EXPECT_TRUE(host.getAttachedCards().isEmpty());
+    EXPECT_EQ(guest.getAttachedTo(), nullptr);
+}
+
+TEST(CardStateTest, CountersAddUpdateAndClear)
+{
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 1);
+    int changes = 0;
+    QObject::connect(&card, &CardState::countersChanged, [&changes]() { ++changes; });
+
+    card.insertCounter(1, 2);
+    EXPECT_EQ(card.getCounters().value(1), 2);
+
+    card.setCounter(1, 3);
+    EXPECT_EQ(card.getCounters().value(1), 3);
+
+    card.setCounter(1, 0);
+    EXPECT_FALSE(card.getCounters().contains(1));
+
+    card.setCounter(2, 1);
+    card.clearCounters();
+    EXPECT_TRUE(card.getCounters().isEmpty());
+
+    EXPECT_EQ(changes, 5);
+}
+
+TEST(CardStateTest, TapFlipAttackingAndReset)
+{
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 1);
+    card.setTapped(true);
+    card.setFaceDown(true);
+    card.setAttacking(true);
+    card.setAnnotation(QStringLiteral("note"));
+    card.setPT(QStringLiteral("4/4"));
+    card.setDoesntUntap(true);
+    card.setDestroyOnZoneChange(true);
+    card.setColor(QStringLiteral("red"));
+    card.insertCounter(1, 2);
+
+    card.resetState(true);
+
+    EXPECT_FALSE(card.getTapped());
+    EXPECT_FALSE(card.getAttacking());
+    EXPECT_TRUE(card.getCounters().isEmpty());
+    EXPECT_TRUE(card.getPT().isEmpty());
+    EXPECT_FALSE(card.getDoesntUntap());
+    EXPECT_EQ(card.getAnnotation(), QStringLiteral("note"));
+    // resetState() deliberately leaves these three alone.
+    EXPECT_TRUE(card.getFaceDown());
+    EXPECT_EQ(card.getColor(), QStringLiteral("red"));
+    EXPECT_TRUE(card.getDestroyOnZoneChange());
+
+    card.setAnnotation(QStringLiteral("other"));
+    card.resetState(false);
+    EXPECT_TRUE(card.getAnnotation().isEmpty());
+}
+
+TEST(CardStateTest, ParsePT)
+{
+    const QVariantList plain = CardState::parsePT(QStringLiteral("3/3"));
+    ASSERT_EQ(plain.size(), 2);
+    EXPECT_EQ(plain.at(0).toString(), QStringLiteral("3"));
+    EXPECT_EQ(plain.at(1).toString(), QStringLiteral("3"));
+
+    const QVariantList negative = CardState::parsePT(QStringLiteral("-1/2"));
+    ASSERT_EQ(negative.size(), 2);
+    EXPECT_EQ(negative.at(0).typeId(), QMetaType::Int);
+    EXPECT_EQ(negative.at(0).toInt(), -1);
+    EXPECT_EQ(negative.at(1).toString(), QStringLiteral("2"));
+
+    const QVariantList star = CardState::parsePT(QStringLiteral("*"));
+    ASSERT_EQ(star.size(), 1);
+    EXPECT_EQ(star.at(0).toString(), QStringLiteral("*"));
+
+    EXPECT_TRUE(CardState::parsePT(QString()).isEmpty());
+}
diff --git a/tests/game/card_zone_logic_test.cpp b/tests/game/card_zone_logic_test.cpp
new file mode 100644
index 000000000..7f0c39b47
--- /dev/null
+++ b/tests/game/card_zone_logic_test.cpp
@@ -0,0 +1,107 @@
+#include "gtest/gtest.h"
+#include <QSignalSpy>
+#include <QString>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/zones/hand_zone_logic.h>
+#include <libcockatrice/game/zones/view_zone_logic.h>
+#include <libcockatrice/utility/card_ref.h>
+
+namespace
+{
+
+CardRef cardRefFor(const QString &name)
+{
+    CardRef cardRef;
+    cardRef.name = name;
+    return cardRef;
+}
+
+} // namespace
+
+TEST(CardZoneLogicTest, AddsAndTakesCardsWithoutAGraphicsSide)
+{
+    HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true);
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Lightning Bolt")), 7);
+
+    QSignalSpy cardAddedSpy(&zone, &CardZoneLogic::cardAdded);
+    QSignalSpy cardCountSpy(&zone, &CardZoneLogic::cardCountChanged);
+
+    zone.addCard(&card, false, 0);
+
+    ASSERT_EQ(zone.getCards().size(), 1);
+    EXPECT_EQ(zone.getCards().first(), &card);
+    EXPECT_EQ(card.getZone(), &zone);
+    EXPECT_EQ(cardAddedSpy.count(), 1);
+    EXPECT_GE(cardCountSpy.count(), 1);
+
+    EXPECT_EQ(zone.takeCard(0, 7), &card);
+    EXPECT_TRUE(zone.getCards().isEmpty());
+    EXPECT_EQ(card.getId(), 7);
+}
+
+TEST(CardZoneLogicTest, AsksTheGraphicsSideToCreateCards)
+{
+    HandZoneLogic zone(nullptr, QStringLiteral("library"), false, true, true);
+    // The graphics side owns the view logic and registers it on the zone it
+    // shows; adding a card then goes through prepareAddCard and the request
+    // signal instead of the test emitting the signal itself.
+    ZoneViewZoneLogic view(nullptr, &zone, 1, true, false, false);
+    zone.getViews().append(&view);
+
+    QSignalSpy requestSpy(&view, &CardZoneLogic::createCardRequested);
+
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Lightning Bolt")), 7);
+    zone.addCard(&card, true, 0, 0);
+
+    ASSERT_EQ(requestSpy.count(), 1);
+    const QList<QVariant> arguments = requestSpy.takeFirst();
+    const ServerInfo_Card cardInfo = arguments.at(0).value<ServerInfo_Card>();
+    EXPECT_EQ(cardInfo.id(), 7);
+    EXPECT_EQ(cardInfo.name(), "Lightning Bolt");
+    EXPECT_TRUE(arguments.at(1).toBool());
+    EXPECT_EQ(card.getZone(), &zone);
+    EXPECT_EQ(zone.getCards().size(), 1);
+}
+
+TEST(CardZoneLogicTest, MoveBetweenZonesUpdatesCardZone)
+{
+    HandZoneLogic first(nullptr, QStringLiteral("hand"), false, false, true);
+    HandZoneLogic second(nullptr, QStringLiteral("grave"), false, false, true);
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 7);
+
+    first.addCard(&card, false, 0);
+    ASSERT_EQ(first.getCards().size(), 1);
+
+    CardState *taken = first.takeCard(0, 7);
+    ASSERT_EQ(taken, &card);
+    EXPECT_TRUE(first.getCards().isEmpty());
+
+    second.addCard(taken, false, 0);
+    EXPECT_EQ(second.getCards().size(), 1);
+    EXPECT_EQ(card.getZone(), &second);
+}
+
+TEST(CardZoneLogicTest, GetCardFindsById)
+{
+    HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true);
+    CardState first(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 7);
+    CardState second(nullptr, nullptr, cardRefFor(QStringLiteral("Dog")), 8);
+
+    zone.addCard(&first, false, 0);
+    zone.addCard(&second, false, 0);
+
+    EXPECT_EQ(zone.getCard(7), &first);
+    EXPECT_EQ(zone.getCard(8), &second);
+    EXPECT_EQ(zone.getCard(99), nullptr);
+}
+
+TEST(CardZoneLogicTest, ReorganizeSignalFiresOnAdd)
+{
+    HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true);
+    CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 7);
+    QSignalSpy reorganizeSpy(&zone, &CardZoneLogic::reorganizeCards);
+
+    zone.addCard(&card, true, 0);
+
+    EXPECT_EQ(reorganizeSpy.count(), 1);
+}
diff --git a/tests/game/data/cards.xml b/tests/game/data/cards.xml
new file mode 100644
index 000000000..e315dbf48
--- /dev/null
+++ b/tests/game/data/cards.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cockatrice_carddatabase version="4">
+    <cards>
+        <card>
+            <name>Cat</name>
+            <set>CAT</set>
+            <tablerow>0</tablerow>
+            <text>Meow!</text>
+            <prop>
+                <muid>111</muid>
+                <colors>G</colors>
+                <manacost>2G</manacost>
+                <cmc>2</cmc>
+                <type>Creature — Cat</type>
+                <maintype>Creature</maintype>
+                <pt>3/3</pt>
+            </prop>
+        </card>
+        <card>
+            <name>Grizzly Bears</name>
+            <set>LEA</set>
+            <tablerow>0</tablerow>
+            <cipt>1</cipt>
+            <text></text>
+            <prop>
+                <muid>112</muid>
+                <colors>G</colors>
+                <manacost>1G</manacost>
+                <cmc>2</cmc>
+                <type>Creature — Bear</type>
+                <maintype>Creature</maintype>
+                <pt>2/2</pt>
+            </prop>
+        </card>
+        <card>
+            <name>Lightning Bolt</name>
+            <set>LEA</set>
+            <tablerow>3</tablerow>
+            <text>Lightning Bolt deals 3 damage to any target.</text>
+            <prop>
+                <muid>113</muid>
+                <colors>R</colors>
+                <manacost>R</manacost>
+                <cmc>1</cmc>
+                <type>Instant</type>
+                <maintype>Instant</maintype>
+            </prop>
+        </card>
+        <card>
+            <name>Forest</name>
+            <set>LEA</set>
+            <tablerow>2</tablerow>
+            <text>(Add G.)</text>
+            <prop>
+                <muid>114</muid>
+                <colors>G</colors>
+                <manacost></manacost>
+                <cmc>0</cmc>
+                <type>Land</type>
+                <maintype>Land</maintype>
+            </prop>
+        </card>
+    </cards>
+</cockatrice_carddatabase>
diff --git a/tests/game/data/spoilers.xml b/tests/game/data/spoilers.xml
new file mode 100644
index 000000000..414ae10d4
--- /dev/null
+++ b/tests/game/data/spoilers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cockatrice_carddatabase version="4">
+    <cards />
+</cockatrice_carddatabase>
diff --git a/tests/game/data/tokens.xml b/tests/game/data/tokens.xml
new file mode 100644
index 000000000..30edbb24c
--- /dev/null
+++ b/tests/game/data/tokens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cockatrice_carddatabase version="4">
+    <cards>
+        <card>
+            <name>Kitten</name>
+            <set>CAT</set>
+            <tablerow>0</tablerow>
+            <text></text>
+            <token>1</token>
+            <prop>
+                <muid>211</muid>
+                <colors>G</colors>
+                <manacost></manacost>
+                <cmc></cmc>
+                <type>Token</type>
+                <maintype>Token</maintype>
+                <pt>1/1</pt>
+            </prop>
+        </card>
+    </cards>
+</cockatrice_carddatabase>
diff --git a/tests/game/game_event_handler_test.cpp b/tests/game/game_event_handler_test.cpp
new file mode 100644
index 000000000..2db6a1660
--- /dev/null
+++ b/tests/game/game_event_handler_test.cpp
@@ -0,0 +1,566 @@
+#include "game_test_fixture.h"
+
+#include "gtest/gtest.h"
+#include <QList>
+#include <QObject>
+#include <QPoint>
+#include <QString>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/board/counter_state.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_meta_info.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
+#include <libcockatrice/protocol/pb/context_concede.pb.h>
+#include <libcockatrice/protocol/pb/event_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/event_change_zone_properties.pb.h>
+#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_create_token.pb.h>
+#include <libcockatrice/protocol/pb/event_del_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_destroy_card.pb.h>
+#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
+#include <libcockatrice/protocol/pb/event_flip_card.pb.h>
+#include <libcockatrice/protocol/pb/event_game_closed.pb.h>
+#include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
+#include <libcockatrice/protocol/pb/event_game_state_changed.pb.h>
+#include <libcockatrice/protocol/pb/event_kicked.pb.h>
+#include <libcockatrice/protocol/pb/event_leave.pb.h>
+#include <libcockatrice/protocol/pb/event_move_card.pb.h>
+#include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
+#include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
+#include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
+#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
+#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_set_counter.pb.h>
+#include <libcockatrice/protocol/pb/game_event_container.pb.h>
+#include <libcockatrice/protocol/pb/game_event_context.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
+#include <libcockatrice/utility/zone_names.h>
+#include <string>
+
+namespace
+{
+
+/**
+ * Wraps one player-scoped event in the container the server would send and
+ * pushes it through the real dispatcher, so the test exercises the same
+ * GameEventHandler -> PlayerEventHandler path as a live client.
+ */
+template <typename EventType>
+void sendGameEvent(GameHarness &harness,
+                   int playerId,
+                   const EventType &message,
+                   const GameEventContext *context = nullptr)
+{
+    GameEventContainer container;
+    container.set_game_id(42);
+    if (context != nullptr) {
+        container.mutable_context()->CopyFrom(*context);
+    }
+
+    GameEvent *event = container.add_event_list();
+    event->set_player_id(playerId);
+    event->MutableExtension(EventType::ext)->CopyFrom(message);
+
+    harness.game()->getGameEventHandler()->processGameEventContainer(container, harness.client(),
+                                                                     EventProcessingOptions());
+}
+
+Event_SetCardAttr cardAttrEvent(const char *zoneName, int cardId, CardAttribute attribute, const char *value)
+{
+    Event_SetCardAttr event;
+    event.set_zone_name(zoneName);
+    event.set_card_id(cardId);
+    event.set_attribute(attribute);
+    event.set_attr_value(value);
+    return event;
+}
+
+} // namespace
+
+TEST(GameEventHandlerTest, MoveCardMovesBetweenZones)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    Event_MoveCard event;
+    event.set_card_id(7);
+    event.set_start_player_id(1);
+    event.set_start_zone(ZoneNames::HAND);
+    event.set_position(0);
+    event.set_target_player_id(1);
+    event.set_target_zone(ZoneNames::TABLE);
+    event.set_x(0);
+    event.set_y(TableZoneLogic::tableRowToGridY(0));
+    event.set_new_card_id(7);
+    event.set_face_down(false);
+
+    sendGameEvent(harness, 1, event);
+
+    EXPECT_TRUE(harness.zone(ZoneNames::HAND)->getCards().isEmpty());
+    CardZoneLogic *table = harness.zone(ZoneNames::TABLE);
+    ASSERT_EQ(table->getCards().size(), 1);
+    EXPECT_EQ(table->getCards().first(), cat);
+    EXPECT_EQ(cat->getZone(), table);
+    EXPECT_EQ(cat->getId(), 7);
+    EXPECT_EQ(cat->getCardRef().name, QStringLiteral("Cat"));
+    EXPECT_FALSE(cat->getFaceDown());
+    EXPECT_EQ(cat->getPT(), QStringLiteral("3/3"));
+    EXPECT_EQ(cat->getGridPoint(), QPoint(0, TableZoneLogic::tableRowToGridY(0)));
+}
+
+TEST(GameEventHandlerTest, MoveCardFaceDownKeepsTheCardHidden)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    Event_MoveCard event;
+    event.set_card_id(7);
+    event.set_start_player_id(1);
+    event.set_start_zone(ZoneNames::HAND);
+    event.set_position(0);
+    event.set_target_player_id(1);
+    event.set_target_zone(ZoneNames::TABLE);
+    event.set_x(1);
+    event.set_y(TableZoneLogic::tableRowToGridY(2));
+    event.set_new_card_id(7);
+    event.set_face_down(true);
+
+    sendGameEvent(harness, 1, event);
+
+    ASSERT_EQ(harness.zone(ZoneNames::TABLE)->getCards().size(), 1);
+    EXPECT_TRUE(cat->getFaceDown());
+    // A face-down card keeps whatever P/T it had instead of picking up the
+    // printed one from the card database.
+    EXPECT_TRUE(cat->getPT().isEmpty());
+}
+
+TEST(GameEventHandlerTest, SetCardAttrUpdatesSingleCard)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrTapped, "1"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrAttacking, "1"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrPT, "5/5"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrAnnotation, "note"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrColor, "red"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrDoesntUntap, "1"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrFaceDown, "1"));
+
+    EXPECT_TRUE(cat->getTapped());
+    EXPECT_TRUE(cat->getAttacking());
+    EXPECT_EQ(cat->getPT(), QStringLiteral("5/5"));
+    EXPECT_EQ(cat->getAnnotation(), QStringLiteral("note"));
+    EXPECT_EQ(cat->getColor(), QStringLiteral("red"));
+    EXPECT_TRUE(cat->getDoesntUntap());
+    EXPECT_TRUE(cat->getFaceDown());
+}
+
+TEST(GameEventHandlerTest, SetCardAttrWithoutCardIdTouchesEveryCardInZone)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7);
+    CardState *bears = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9);
+    ASSERT_NE(cat, nullptr);
+    ASSERT_NE(bears, nullptr);
+
+    Event_SetCardAttr event;
+    event.set_zone_name(ZoneNames::TABLE);
+    event.set_attribute(AttrAnnotation);
+    event.set_attr_value("marked");
+
+    sendGameEvent(harness, 1, event);
+
+    EXPECT_EQ(cat->getAnnotation(), QStringLiteral("marked"));
+    EXPECT_EQ(bears->getAnnotation(), QStringLiteral("marked"));
+}
+
+TEST(GameEventHandlerTest, UntapAllLeavesDoesntUntapCardsTapped)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7);
+    CardState *bears = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9);
+    ASSERT_NE(cat, nullptr);
+    ASSERT_NE(bears, nullptr);
+    cat->setDoesntUntap(true);
+
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrTapped, "1"));
+    sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 9, AttrTapped, "1"));
+
+    Event_SetCardAttr untapAll;
+    untapAll.set_zone_name(ZoneNames::TABLE);
+    untapAll.set_attribute(AttrTapped);
+    untapAll.set_attr_value("0");
+
+    sendGameEvent(harness, 1, untapAll);
+
+    EXPECT_TRUE(cat->getTapped());
+    EXPECT_FALSE(bears->getTapped());
+}
+
+TEST(GameEventHandlerTest, SetCardCounterAddsAndRemoves)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    Event_SetCardCounter add;
+    add.set_zone_name(ZoneNames::HAND);
+    add.set_card_id(7);
+    add.set_counter_id(1);
+    add.set_counter_value(2);
+
+    sendGameEvent(harness, 1, add);
+
+    EXPECT_EQ(cat->getCounters().value(1), 2);
+
+    Event_SetCardCounter remove = add;
+    remove.set_counter_value(0);
+
+    sendGameEvent(harness, 1, remove);
+
+    EXPECT_FALSE(cat->getCounters().contains(1));
+}
+
+TEST(GameEventHandlerTest, AttachCardLinksBothEndsAndUnattachClearsThem)
+{
+    GameHarness harness;
+    CardState *host = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7);
+    CardState *guest = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9);
+    ASSERT_NE(host, nullptr);
+    ASSERT_NE(guest, nullptr);
+
+    Event_AttachCard attach;
+    attach.set_start_zone(ZoneNames::TABLE);
+    attach.set_card_id(9);
+    attach.set_target_player_id(1);
+    attach.set_target_zone(ZoneNames::TABLE);
+    attach.set_target_card_id(7);
+
+    sendGameEvent(harness, 1, attach);
+
+    EXPECT_EQ(guest->getAttachedTo(), host);
+    ASSERT_EQ(host->getAttachedCards().size(), 1);
+    EXPECT_EQ(host->getAttachedCards().first(), guest);
+
+    Event_AttachCard detach;
+    detach.set_start_zone(ZoneNames::TABLE);
+    detach.set_card_id(9);
+
+    sendGameEvent(harness, 1, detach);
+
+    EXPECT_EQ(guest->getAttachedTo(), nullptr);
+    EXPECT_TRUE(host->getAttachedCards().isEmpty());
+}
+
+TEST(GameEventHandlerTest, ChangeZonePropertiesUpdatesReveal)
+{
+    GameHarness harness;
+    CardZoneLogic *deck = harness.zone(ZoneNames::DECK);
+    ASSERT_NE(deck, nullptr);
+
+    Event_ChangeZoneProperties reveal;
+    reveal.set_zone_name(ZoneNames::DECK);
+    reveal.set_always_reveal_top_card(true);
+
+    sendGameEvent(harness, 1, reveal);
+    EXPECT_TRUE(deck->getAlwaysRevealTopCard());
+
+    reveal.set_always_reveal_top_card(false);
+    sendGameEvent(harness, 1, reveal);
+    EXPECT_FALSE(deck->getAlwaysRevealTopCard());
+}
+
+TEST(GameEventHandlerTest, DrawCardsMovesNamedCardsFromDeckToHand)
+{
+    GameHarness harness;
+    ASSERT_NE(harness.addCardToZone(ZoneNames::DECK, QStringLiteral("Cat"), 7), nullptr);
+
+    Event_DrawCards draw;
+    draw.set_number(1);
+    ServerInfo_Card *cardInfo = draw.add_cards();
+    cardInfo->set_id(7);
+    cardInfo->set_name("Cat");
+
+    sendGameEvent(harness, 1, draw);
+
+    EXPECT_TRUE(harness.zone(ZoneNames::DECK)->getCards().isEmpty());
+    ASSERT_EQ(harness.zone(ZoneNames::HAND)->getCards().size(), 1);
+    CardState *drawn = harness.zone(ZoneNames::HAND)->getCards().first();
+    EXPECT_EQ(drawn->getId(), 7);
+    EXPECT_EQ(drawn->getName(), QStringLiteral("Cat"));
+}
+
+TEST(GameEventHandlerTest, FlipCardHidesAndRevealsTheCard)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    Event_FlipCard flip;
+    flip.set_zone_name(ZoneNames::TABLE);
+    flip.set_card_id(7);
+    flip.set_face_down(true);
+
+    sendGameEvent(harness, 1, flip);
+
+    EXPECT_TRUE(cat->getFaceDown());
+    // Flipping face down does not touch the card reference: the client must not
+    // learn (or overwrite) the name of a card it is not allowed to see.
+    EXPECT_EQ(cat->getName(), QStringLiteral("Cat"));
+
+    // Turning it face up carries the real printing, so the state picks it up.
+    flip.set_face_down(false);
+    flip.set_card_name("Grizzly Bears");
+
+    sendGameEvent(harness, 1, flip);
+
+    EXPECT_FALSE(cat->getFaceDown());
+    EXPECT_EQ(cat->getName(), QStringLiteral("Grizzly Bears"));
+}
+
+TEST(GameEventHandlerTest, DestroyCardRemovesItAndDetachesAttachedCards)
+{
+    GameHarness harness;
+    CardState *host = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7);
+    CardState *guest = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9);
+    ASSERT_NE(host, nullptr);
+    ASSERT_NE(guest, nullptr);
+
+    guest->setAttachedTo(host);
+    ASSERT_EQ(guest->getAttachedTo(), host);
+    ASSERT_EQ(host->getAttachedCards().size(), 1);
+
+    Event_DestroyCard destroy;
+    destroy.set_zone_name(ZoneNames::TABLE);
+    destroy.set_card_id(7);
+
+    sendGameEvent(harness, 1, destroy);
+
+    CardZoneLogic *table = harness.zone(ZoneNames::TABLE);
+    ASSERT_EQ(table->getCards().size(), 1);
+    EXPECT_EQ(table->getCards().first(), guest);
+    EXPECT_FALSE(table->getCards().contains(host));
+
+    // The attached card survives the host and is left un-attached, ready to be
+    // laid out again by the zone.
+    EXPECT_EQ(guest->getAttachedTo(), nullptr);
+    EXPECT_TRUE(host->getAttachedCards().isEmpty());
+    EXPECT_EQ(guest->getZone(), table);
+}
+
+TEST(GameEventHandlerTest, CreateTokenUsesDatabasePTUnlessFaceDown)
+{
+    GameHarness harness;
+    CardZoneLogic *table = harness.zone(ZoneNames::TABLE);
+    ASSERT_NE(table, nullptr);
+
+    QList<ServerInfo_Card> created;
+    QObject::connect(table, &CardZoneLogic::createCardRequested, table,
+                     [&created](const ServerInfo_Card &cardInfo, bool) { created.append(cardInfo); });
+
+    Event_CreateToken token;
+    token.set_zone_name(ZoneNames::TABLE);
+    token.set_card_id(11);
+    token.set_card_name("Kitten");
+    token.set_x(2);
+    token.set_y(1);
+    token.set_color("green");
+    token.set_annotation("a kitten");
+    token.set_destroy_on_zone_change(true);
+
+    sendGameEvent(harness, 1, token);
+
+    ASSERT_EQ(created.size(), 1);
+    // The event carries no P/T, so the token takes the printed one.
+    EXPECT_EQ(created.first().pt(), "1/1");
+    EXPECT_EQ(created.first().name(), "Kitten");
+    EXPECT_EQ(created.first().x(), 2);
+    EXPECT_EQ(created.first().y(), 1);
+    EXPECT_EQ(created.first().color(), "green");
+    EXPECT_EQ(created.first().annotation(), "a kitten");
+    EXPECT_TRUE(created.first().destroy_on_zone_change());
+    EXPECT_FALSE(created.first().face_down());
+
+    // An explicit P/T always wins over the database.
+    Event_CreateToken explicitPt = token;
+    explicitPt.set_card_id(12);
+    explicitPt.set_pt("3/3");
+
+    sendGameEvent(harness, 1, explicitPt);
+
+    ASSERT_EQ(created.size(), 2);
+    EXPECT_EQ(created.last().pt(), "3/3");
+
+    // A face-down token must not leak the printed P/T.
+    Event_CreateToken faceDown = token;
+    faceDown.set_card_id(13);
+    faceDown.set_face_down(true);
+
+    sendGameEvent(harness, 1, faceDown);
+
+    ASSERT_EQ(created.size(), 3);
+    EXPECT_TRUE(created.last().face_down());
+    EXPECT_TRUE(created.last().pt().empty());
+}
+
+TEST(GameEventHandlerTest, ConcedeAndUnconcedeUpdatePlayerState)
+{
+    GameHarness harness;
+    ASSERT_NE(harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7), nullptr);
+    EXPECT_FALSE(harness.player()->getConceded());
+
+    Event_PlayerPropertiesChanged properties;
+    properties.mutable_player_properties()->set_player_id(1);
+    properties.mutable_player_properties()->set_conceded(true);
+
+    GameEventContext concedeContext;
+    concedeContext.MutableExtension(Context_Concede::ext);
+
+    sendGameEvent(harness, 1, properties, &concedeContext);
+
+    EXPECT_TRUE(harness.player()->getConceded());
+    // Conceding tears the board down for that player.
+    EXPECT_TRUE(harness.zone(ZoneNames::TABLE)->getCards().isEmpty());
+
+    Event_PlayerPropertiesChanged back = properties;
+    back.mutable_player_properties()->set_conceded(false);
+
+    GameEventContext unconcedeContext;
+    unconcedeContext.MutableExtension(Context_Unconcede::ext);
+
+    sendGameEvent(harness, 1, back, &unconcedeContext);
+
+    EXPECT_FALSE(harness.player()->getConceded());
+}
+
+TEST(GameEventHandlerTest, SetActivePlayerAndPhaseUpdateGameState)
+{
+    GameHarness harness;
+    GameState *state = harness.game()->getGameState();
+    ASSERT_NE(state, nullptr);
+    EXPECT_EQ(state->getActivePlayer(), -1);
+    EXPECT_EQ(state->getCurrentPhase(), -1);
+
+    Event_SetActivePlayer setPlayer;
+    setPlayer.set_active_player_id(1);
+
+    sendGameEvent(harness, 1, setPlayer);
+
+    EXPECT_EQ(state->getActivePlayer(), 1);
+
+    Event_SetActivePhase setPhase;
+    setPhase.set_phase(3);
+
+    sendGameEvent(harness, 1, setPhase);
+
+    EXPECT_EQ(state->getCurrentPhase(), 3);
+}
+
+TEST(GameEventHandlerTest, CreateSetAndDeletePlayerCounter)
+{
+    GameHarness harness;
+
+    ServerInfo_Counter counter;
+    counter.set_id(1);
+    counter.set_name("life");
+    counter.set_radius(1);
+    counter.set_count(20);
+
+    Event_CreateCounter create;
+    create.mutable_counter_info()->CopyFrom(counter);
+
+    sendGameEvent(harness, 1, create);
+
+    CounterState *state = harness.player()->getCounters().value(1);
+    ASSERT_NE(state, nullptr);
+    EXPECT_EQ(state->getName(), QStringLiteral("life"));
+    EXPECT_EQ(state->getValue(), 20);
+    EXPECT_EQ(harness.player()->getLifeCounter(), state);
+
+    Event_SetCounter set;
+    set.set_counter_id(1);
+    set.set_value(15);
+
+    sendGameEvent(harness, 1, set);
+
+    EXPECT_EQ(state->getValue(), 15);
+
+    // Updating a counter that does not exist is a no-op, not a crash.
+    Event_SetCounter unknown = set;
+    unknown.set_counter_id(99);
+    sendGameEvent(harness, 1, unknown);
+
+    EXPECT_FALSE(harness.player()->getCounters().contains(99));
+
+    Event_DelCounter remove;
+    remove.set_counter_id(1);
+
+    sendGameEvent(harness, 1, remove);
+
+    EXPECT_FALSE(harness.player()->getCounters().contains(1));
+    EXPECT_EQ(harness.player()->getLifeCounter(), nullptr);
+}
+
+TEST(GameEventHandlerTest, LeaveRemovesThePlayer)
+{
+    GameHarness harness;
+    ASSERT_NE(harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7), nullptr);
+    ASSERT_NE(harness.game()->getPlayerManager()->getPlayer(1), nullptr);
+
+    Event_Leave leave;
+    leave.set_reason(Event_Leave::USER_LEFT);
+
+    sendGameEvent(harness, 1, leave);
+
+    EXPECT_EQ(harness.game()->getPlayerManager()->getPlayer(1), nullptr);
+    EXPECT_TRUE(harness.game()->getPlayerManager()->getPlayers().isEmpty());
+}
+
+TEST(GameEventHandlerTest, KickedSignalsGameClosed)
+{
+    GameHarness harness;
+
+    bool closed = false;
+    QObject::connect(harness.game()->getGameEventHandler(), &GameEventHandler::gameClosed,
+                     [&closed] { closed = true; });
+
+    sendGameEvent(harness, 1, Event_Kicked());
+
+    EXPECT_TRUE(closed);
+}
+
+TEST(GameEventHandlerTest, GameClosedMarksTheSessionClosed)
+{
+    GameHarness harness;
+    ASSERT_FALSE(harness.game()->getGameState()->isGameClosed());
+
+    Event_GameStateChanged started;
+    started.set_game_started(true);
+    sendGameEvent(harness, 1, started);
+    ASSERT_TRUE(harness.game()->getGameMetaInfo()->started());
+
+    sendGameEvent(harness, 1, Event_GameClosed());
+
+    EXPECT_TRUE(harness.game()->getGameState()->isGameClosed());
+    EXPECT_FALSE(harness.game()->getGameMetaInfo()->started());
+}
+
+TEST(GameEventHandlerTest, GameHostChangedMovesTheHostRole)
+{
+    GameHarness harness;
+
+    ServerInfo_User bob;
+    bob.set_name("Bob");
+    bob.set_user_level(ServerInfo_User::IsUser);
+    ASSERT_NE(harness.game()->getPlayerManager()->addPlayer(2, bob), nullptr);
+
+    sendGameEvent(harness, 2, Event_GameHostChanged());
+
+    EXPECT_EQ(harness.game()->getGameState()->getHostId(), 2);
+}
diff --git a/tests/game/game_test_fixture.h b/tests/game/game_test_fixture.h
new file mode 100644
index 000000000..e4703c917
--- /dev/null
+++ b/tests/game/game_test_fixture.h
@@ -0,0 +1,129 @@
+/**
+ * @file game_test_fixture.h
+ *
+ * Fixtures for tests that need a complete game/player/zone graph without the
+ * client, a server or any graphics object. Commands are captured on a recording
+ * AbstractClient, which is the same seam the real client uses.
+ */
+
+#ifndef COCKATRICE_TESTS_GAME_TEST_FIXTURE_H
+#define COCKATRICE_TESTS_GAME_TEST_FIXTURE_H
+
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QtAlgorithms>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/game.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <memory>
+#include <utility>
+
+/**
+ * Captures every command the game logic sends, instead of writing it to a socket.
+ *
+ * AbstractClient::sendCommand uses a direct signal/slot connection in the same
+ * thread, so a command is in `sent` as soon as sendCommand returns.
+ */
+class RecordingClient : public AbstractClient
+{
+public:
+    QList<CommandContainer> sent;
+
+protected:
+    void sendCommandContainer(const CommandContainer &cont) override
+    {
+        sent.append(cont);
+    }
+};
+
+/**
+ * Owns a local, single-client Game with one local player, plus the cards added
+ * to its zones.
+ */
+class GameHarness
+{
+public:
+    explicit GameHarness(int playerId = 1) : playerId_(playerId), client_(std::make_unique<RecordingClient>())
+    {
+        Event_GameJoined event;
+        event.set_host_id(playerId_);
+        event.set_player_id(playerId_);
+        event.mutable_game_info()->set_game_id(42);
+        event.mutable_game_info()->set_started(true);
+
+        QList<AbstractClient *> clients{client_.get()};
+        QMap<int, QString> roomGameTypes;
+        game_ = std::make_unique<Game>(nullptr, true, clients, event, roomGameTypes);
+
+        ServerInfo_User user;
+        user.set_name("Alice");
+        user.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered);
+        game_->getPlayerManager()->addPlayer(playerId_, user);
+    }
+
+    ~GameHarness()
+    {
+        qDeleteAll(ownedCards_);
+        ownedCards_.clear();
+    }
+
+    GameHarness(const GameHarness &) = delete;
+    GameHarness &operator=(const GameHarness &) = delete;
+
+    [[nodiscard]] Game *game() const
+    {
+        return game_.get();
+    }
+
+    [[nodiscard]] RecordingClient *client() const
+    {
+        return client_.get();
+    }
+
+    [[nodiscard]] PlayerLogic *player() const
+    {
+        return game_->getPlayerManager()->getPlayer(playerId_);
+    }
+
+    [[nodiscard]] CardZoneLogic *zone(const QString &zoneName) const
+    {
+        return player()->getZones().value(zoneName);
+    }
+
+    CardState *addCardToZone(const QString &zoneName, const QString &cardName, int cardId)
+    {
+        CardZoneLogic *targetZone = zone(zoneName);
+        if (!targetZone) {
+            return nullptr;
+        }
+
+        auto *card = new CardState(nullptr, targetZone, CardRef{cardName, QString()}, cardId);
+        // The constructor only stores the ref; this is what fills in the card
+        // data (table row, P/T, ...) the actions read.
+        card->refreshCardInfo();
+        targetZone->addCard(card, false, 0);
+        ownedCards_.append(card);
+        return card;
+    }
+
+    [[nodiscard]] const CommandContainer &lastCommand() const
+    {
+        return client_->sent.last();
+    }
+
+private:
+    int playerId_;
+    std::unique_ptr<RecordingClient> client_;
+    std::unique_ptr<Game> game_;
+    QList<CardState *> ownedCards_;
+};
+
+#endif // COCKATRICE_TESTS_GAME_TEST_FIXTURE_H
diff --git a/tests/game/game_test_main.cpp b/tests/game/game_test_main.cpp
new file mode 100644
index 000000000..47b9a6b8e
--- /dev/null
+++ b/tests/game/game_test_main.cpp
@@ -0,0 +1,126 @@
+/**
+ * @file game_test_main.cpp
+ *
+ * Test entry point for the headless game-logic suite. The game library has no
+ * graphics dependency, so a QCoreApplication is enough; the only process-wide
+ * setup left is the card database, which the game logic still reaches through
+ * CardDatabaseManager and which therefore has to exist before the first zone is
+ * constructed.
+ */
+
+#include "gtest/gtest.h"
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QLoggingCategory>
+#include <QStandardPaths>
+#include <QTemporaryDir>
+#include <cstdio>
+#include <cstdlib>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
+
+namespace
+{
+
+class GameTestPathProvider : public ICardDatabasePathProvider
+{
+public:
+    explicit GameTestPathProvider(QString baseDir) : baseDir_(std::move(baseDir))
+    {
+    }
+
+    QString getCardDatabasePath() const override
+    {
+        return baseDir_ + QStringLiteral("/cards.xml");
+    }
+
+    QString getCustomCardDatabasePath() const override
+    {
+        return baseDir_ + QStringLiteral("/customsets/");
+    }
+
+    QString getTokenDatabasePath() const override
+    {
+        return baseDir_ + QStringLiteral("/tokens.xml");
+    }
+
+    QString getSpoilerCardDatabasePath() const override
+    {
+        return baseDir_ + QStringLiteral("/spoilers.xml");
+    }
+
+private:
+    QString baseDir_;
+};
+
+bool copyFixture(const QString &fileName, const QString &targetDir)
+{
+    const QString source = QString::fromUtf8(GAME_TEST_DATA_DIR) + QLatin1Char('/') + fileName;
+    const QString target = targetDir + QLatin1Char('/') + fileName;
+    if (QFile::copy(source, target)) {
+        return true;
+    }
+
+    std::fprintf(stderr, "Failed to copy test fixture %s to %s\n", qPrintable(source), qPrintable(target));
+    return false;
+}
+
+} // namespace
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+
+    // gtest_discover_tests runs the binary with --gtest_list_tests while the
+    // build is still in progress. No test runs there, and building the card
+    // database would leave process-lifetime allocations that the sanitizer
+    // leg's default leak detection reports at exit, failing discovery.
+    if (::testing::GTEST_FLAG(list_tests)) {
+        return RUN_ALL_TESTS();
+    }
+
+    QStandardPaths::setTestModeEnabled(true);
+
+    QTemporaryDir home;
+    if (!home.isValid()) {
+        std::fprintf(stderr, "Failed to create a temporary home directory\n");
+        return EXIT_FAILURE;
+    }
+    qputenv("HOME", home.path().toLocal8Bit());
+
+    QCoreApplication app(argc, argv);
+    QLoggingCategory::setFilterRules(QStringLiteral("card_database.loading=false\n"
+                                                    "card_database.loading.success_or_failure=false\n"
+                                                    "settings_cache.*=false"));
+
+    // Copy the fixtures so the database loader never writes its .cache file into
+    // the source tree, then point the singleton at the copy.
+    QTemporaryDir dataDir;
+    if (!dataDir.isValid() || !QDir().mkpath(dataDir.filePath(QStringLiteral("customsets")))) {
+        std::fprintf(stderr, "Failed to create a temporary card database directory\n");
+        return EXIT_FAILURE;
+    }
+    if (!copyFixture(QStringLiteral("cards.xml"), dataDir.path()) ||
+        !copyFixture(QStringLiteral("tokens.xml"), dataDir.path()) ||
+        !copyFixture(QStringLiteral("spoilers.xml"), dataDir.path())) {
+        return EXIT_FAILURE;
+    }
+
+    // Function-local static: constructed before the CardDatabase singleton below,
+    // so it is destroyed after it and the raw pointer stored in the manager stays
+    // valid for the database's lifetime.
+    static GameTestPathProvider pathProvider(dataDir.path());
+    CardDatabaseManager::setCardDatabasePathProvider(&pathProvider);
+
+    CardDatabase *database = CardDatabaseManager::getInstance();
+    database->loadCardDatabases();
+    if (database->getLoadStatus() != Ok) {
+        std::fprintf(stderr, "Failed to load the game test card database (status %d)\n",
+                     static_cast<int>(database->getLoadStatus()));
+        return EXIT_FAILURE;
+    }
+
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/game/player_actions_test.cpp b/tests/game/player_actions_test.cpp
new file mode 100644
index 000000000..11ae7338d
--- /dev/null
+++ b/tests/game/player_actions_test.cpp
@@ -0,0 +1,119 @@
+#include "game_test_fixture.h"
+
+#include "gtest/gtest.h"
+#include <QString>
+#include <libcockatrice/game/player/player_actions.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/utility/zone_names.h>
+#include <string>
+
+TEST(PlayerActionsTest, PlayCreatureSendsMoveToTable)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    harness.player()->getPlayerActions()->playCard(cat, false);
+
+    ASSERT_FALSE(harness.client()->sent.isEmpty());
+    const CommandContainer &container = harness.lastCommand();
+    ASSERT_EQ(container.game_command_size(), 1);
+    const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext);
+
+    EXPECT_EQ(command.start_player_id(), 1);
+    EXPECT_EQ(command.start_zone(), std::string(ZoneNames::HAND));
+    EXPECT_EQ(command.target_player_id(), 1);
+    EXPECT_EQ(command.target_zone(), std::string(ZoneNames::TABLE));
+    EXPECT_EQ(command.x(), -1);
+    EXPECT_EQ(command.y(), TableZoneLogic::tableRowToGridY(0));
+
+    ASSERT_EQ(command.cards_to_move().card_size(), 1);
+    const CardToMove &card = command.cards_to_move().card(0);
+    EXPECT_EQ(card.card_id(), 7);
+    EXPECT_TRUE(card.has_face_down());
+    EXPECT_FALSE(card.face_down());
+    EXPECT_TRUE(card.has_pt());
+    EXPECT_EQ(card.pt(), "3/3");
+    EXPECT_TRUE(card.has_tapped());
+    EXPECT_FALSE(card.tapped());
+}
+
+TEST(PlayerActionsTest, PlayInstantSendsMoveToStack)
+{
+    GameHarness harness;
+    CardState *bolt = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Lightning Bolt"), 8);
+    ASSERT_NE(bolt, nullptr);
+
+    harness.player()->getPlayerActions()->playCard(bolt, false);
+
+    ASSERT_FALSE(harness.client()->sent.isEmpty());
+    const CommandContainer &container = harness.lastCommand();
+    ASSERT_EQ(container.game_command_size(), 1);
+    const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext);
+
+    EXPECT_EQ(command.target_zone(), std::string(ZoneNames::STACK));
+    EXPECT_EQ(command.x(), -1);
+    EXPECT_EQ(command.y(), 0);
+
+    ASSERT_EQ(command.cards_to_move().card_size(), 1);
+    const CardToMove &card = command.cards_to_move().card(0);
+    EXPECT_EQ(card.card_id(), 8);
+    // The stack branch deliberately leaves the other attributes unset.
+    EXPECT_FALSE(card.has_face_down());
+    EXPECT_FALSE(card.has_pt());
+    EXPECT_FALSE(card.has_tapped());
+}
+
+TEST(PlayerActionsTest, PlayFaceDownCreatureUsesFaceDownRow)
+{
+    GameHarness harness;
+    CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7);
+    ASSERT_NE(cat, nullptr);
+
+    harness.player()->getPlayerActions()->playCard(cat, true);
+
+    ASSERT_FALSE(harness.client()->sent.isEmpty());
+    const CommandContainer &container = harness.lastCommand();
+    ASSERT_EQ(container.game_command_size(), 1);
+    const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext);
+
+    EXPECT_EQ(command.target_zone(), std::string(ZoneNames::TABLE));
+    EXPECT_EQ(command.x(), -1);
+    EXPECT_EQ(command.y(), TableZoneLogic::tableRowToGridY(2));
+
+    ASSERT_EQ(command.cards_to_move().card_size(), 1);
+    const CardToMove &card = command.cards_to_move().card(0);
+    EXPECT_EQ(card.card_id(), 7);
+    EXPECT_TRUE(card.has_face_down());
+    EXPECT_TRUE(card.face_down());
+    EXPECT_FALSE(card.has_pt());
+    EXPECT_TRUE(card.has_tapped());
+    EXPECT_FALSE(card.tapped());
+}
+
+TEST(PlayerActionsTest, PlayCiptCreatureSendsTapped)
+{
+    GameHarness harness;
+    CardState *bears = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Grizzly Bears"), 9);
+    ASSERT_NE(bears, nullptr);
+
+    harness.player()->getPlayerActions()->playCard(bears, false);
+
+    ASSERT_FALSE(harness.client()->sent.isEmpty());
+    const CommandContainer &container = harness.lastCommand();
+    ASSERT_EQ(container.game_command_size(), 1);
+    const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext);
+
+    EXPECT_EQ(command.target_zone(), std::string(ZoneNames::TABLE));
+
+    ASSERT_EQ(command.cards_to_move().card_size(), 1);
+    const CardToMove &card = command.cards_to_move().card(0);
+    EXPECT_EQ(card.card_id(), 9);
+    EXPECT_TRUE(card.has_face_down());
+    EXPECT_FALSE(card.face_down());
+    EXPECT_TRUE(card.has_pt());
+    EXPECT_EQ(card.pt(), "2/2");
+    EXPECT_TRUE(card.has_tapped());
+    EXPECT_TRUE(card.tapped());
+}
diff --git a/tests/game/replay_test.cpp b/tests/game/replay_test.cpp
new file mode 100644
index 000000000..218ffdf51
--- /dev/null
+++ b/tests/game/replay_test.cpp
@@ -0,0 +1,349 @@
+/**
+ * @file replay_test.cpp
+ *
+ * Replays a synthetic GameReplay through the real dispatcher. This is the only
+ * place that exercises PlayerLogic::processPlayerInfo / processCardAttachment
+ * end to end: the game state arrives as a GAME_STATE_CHANGED event and the
+ * graphics side is replaced by a small materializer that mirrors what
+ * CardZone::onCreateCardRequested does with the logic objects.
+ *
+ * The replay is built in code rather than from a .cor file: event application
+ * is deterministic (the client never shuffles on its own for a replay), and a
+ * checked-in binary fixture would be opaque about what it asserts.
+ */
+
+#include "gtest/gtest.h"
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QtAlgorithms>
+#include <libcockatrice/game/board/card_state.h>
+#include <libcockatrice/game/game_event_handler.h>
+#include <libcockatrice/game/game_state.h>
+#include <libcockatrice/game/player/event_processing_options.h>
+#include <libcockatrice/game/player/player_logic.h>
+#include <libcockatrice/game/player/player_manager.h>
+#include <libcockatrice/game/replay.h>
+#include <libcockatrice/game/zones/card_zone_logic.h>
+#include <libcockatrice/game/zones/table_zone_logic.h>
+#include <libcockatrice/protocol/pb/event_game_state_changed.pb.h>
+#include <libcockatrice/protocol/pb/event_move_card.pb.h>
+#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
+#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/game_event_container.pb.h>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <libcockatrice/utility/zone_names.h>
+#include <memory>
+#include <string>
+#include <utility>
+
+namespace
+{
+
+ServerInfo_Card makeCard(int id, const QString &name, int x = -1, int y = -1)
+{
+    ServerInfo_Card card;
+    card.set_id(id);
+    card.set_name(name.toStdString());
+    card.set_x(x);
+    card.set_y(y);
+    return card;
+}
+
+ServerInfo_Zone makeZone(const char *name,
+                         ServerInfo_Zone::ZoneType type,
+                         bool withCoords,
+                         const QList<ServerInfo_Card> &cards,
+                         int cardCount = 0)
+{
+    ServerInfo_Zone zone;
+    zone.set_name(name);
+    zone.set_type(type);
+    zone.set_with_coords(withCoords);
+    for (const auto &card : cards) {
+        zone.add_card_list()->CopyFrom(card);
+    }
+    if (cardCount > 0) {
+        zone.set_card_count(cardCount);
+    }
+    return zone;
+}
+
+ServerInfo_Player makePlayer(int playerId, const QString &name, const QList<ServerInfo_Zone> &zones)
+{
+    ServerInfo_Player player;
+    ServerInfo_PlayerProperties *properties = player.mutable_properties();
+    properties->set_player_id(playerId);
+    properties->mutable_user_info()->set_name(name.toStdString());
+    properties->mutable_user_info()->set_user_level(ServerInfo_User::IsUser);
+    for (const auto &zone : zones) {
+        player.add_zone_list()->CopyFrom(zone);
+    }
+    return player;
+}
+
+template <typename EventType> GameEventContainer makeContainer(int playerId, const EventType &message)
+{
+    GameEventContainer container;
+    container.set_game_id(42);
+
+    GameEvent *event = container.add_event_list();
+    event->set_player_id(playerId);
+    event->MutableExtension(EventType::ext)->CopyFrom(message);
+
+    return container;
+}
+
+/**
+ * Stands in for the graphics side of a replay: when the logic asks for a card
+ * item, create the CardState and add it to the zone, copying the state fields
+ * the real CardItem::processCardInfo applies.
+ *
+ * The production view owns the visual item; the state itself is all a headless
+ * test needs, and this is the smallest thing that lets processPlayerInfo build
+ * a real zone.
+ */
+class HeadlessZoneView : public QObject
+{
+public:
+    using QObject::QObject;
+
+    ~HeadlessZoneView() override
+    {
+        qDeleteAll(cards_);
+        cards_.clear();
+    }
+
+    void attach(PlayerLogic *player)
+    {
+        for (CardZoneLogic *zone : player->getZones()) {
+            connect(zone, &CardZoneLogic::createCardRequested, this,
+                    [this, zone](const ServerInfo_Card &cardInfo, bool reorganize) {
+                        materialize(zone, cardInfo, reorganize);
+                    });
+        }
+    }
+
+private:
+    void materialize(CardZoneLogic *zone, const ServerInfo_Card &info, bool reorganize)
+    {
+        const CardRef cardRef{QString::fromStdString(info.name()), QString::fromStdString(info.provider_id())};
+        auto *card = new CardState(nullptr, zone, cardRef, info.id());
+        // The real CardItem constructor refreshes the card info before
+        // processCardInfo overwrites the state fields.
+        card->refreshCardInfo();
+
+        card->clearCounters();
+        for (int i = 0; i < info.counter_list_size(); ++i) {
+            card->insertCounter(info.counter_list(i).id(), info.counter_list(i).value());
+        }
+        card->setAttacking(info.attacking());
+        card->setFaceDown(info.face_down());
+        card->setPT(QString::fromStdString(info.pt()));
+        card->setAnnotation(QString::fromStdString(info.annotation()));
+        card->setColor(QString::fromStdString(info.color()));
+        card->setTapped(info.tapped());
+        card->setDestroyOnZoneChange(info.destroy_on_zone_change());
+        card->setDoesntUntap(info.doesnt_untap());
+
+        zone->addCard(card, reorganize, info.x(), info.y());
+        cards_.append(card);
+    }
+
+    QList<CardState *> cards_;
+};
+
+/** Owns a Replay built from a GameReplay and feeds its containers through it. */
+class ReplayHarness
+{
+public:
+    explicit ReplayHarness(GameReplay replay)
+        : replayProto_(std::move(replay)), view_(std::make_unique<HeadlessZoneView>()),
+          replay_(std::make_unique<Replay>(nullptr, &replayProto_, false))
+    {
+        QObject::connect(replay_->getPlayerManager(), &PlayerManager::playerAdded, view_.get(),
+                         &HeadlessZoneView::attach);
+    }
+
+    ReplayHarness(const ReplayHarness &) = delete;
+    ReplayHarness &operator=(const ReplayHarness &) = delete;
+
+    void processAll()
+    {
+        for (const GameEventContainer &container : replayProto_.event_list()) {
+            replay_->getGameEventHandler()->processGameEventContainer(container, nullptr, EventProcessingOptions());
+        }
+    }
+
+    [[nodiscard]] Replay *replay() const
+    {
+        return replay_.get();
+    }
+
+    [[nodiscard]] PlayerLogic *player(int playerId) const
+    {
+        return replay_->getPlayerManager()->getPlayer(playerId);
+    }
+
+private:
+    GameReplay replayProto_;
+    std::unique_ptr<HeadlessZoneView> view_;
+    std::unique_ptr<Replay> replay_;
+};
+
+GameReplay makeReplay(const QList<GameEventContainer> &containers)
+{
+    GameReplay replay;
+    replay.mutable_game_info()->set_game_id(42);
+    replay.mutable_game_info()->set_started(true);
+    for (const auto &container : containers) {
+        replay.add_event_list()->CopyFrom(container);
+    }
+    return replay;
+}
+
+Event_GameStateChanged initialGameState()
+{
+    Event_GameStateChanged state;
+    state.set_game_started(true);
+    state.set_active_player_id(1);
+    state.set_active_phase(0);
+    return state;
+}
+
+} // namespace
+
+TEST(ReplayTest, MaterializesGameStateZonesAndAttachments)
+{
+    Event_GameStateChanged state = initialGameState();
+
+    ServerInfo_Card cat = makeCard(7, QStringLiteral("Cat"));
+    // Cross-player attachment: Alice's card is attached to Bob's creature.
+    cat.set_attach_player_id(2);
+    cat.set_attach_zone(ZoneNames::TABLE);
+    cat.set_attach_card_id(9);
+
+    const ServerInfo_Player alice = makePlayer(1, QStringLiteral("Alice"),
+                                               {makeZone(ZoneNames::HAND, ServerInfo_Zone::PrivateZone, false, {cat}),
+                                                makeZone(ZoneNames::TABLE, ServerInfo_Zone::PublicZone, true,
+                                                         {makeCard(9, QStringLiteral("Grizzly Bears"), 2, 1)}),
+                                                makeZone(ZoneNames::DECK, ServerInfo_Zone::HiddenZone, false, {}, 2)});
+    const ServerInfo_Player bob = makePlayer(2, QStringLiteral("Bob"),
+                                             {makeZone(ZoneNames::TABLE, ServerInfo_Zone::PublicZone, true,
+                                                       {makeCard(9, QStringLiteral("Grizzly Bears"), 1, 0)})});
+
+    state.add_player_list()->CopyFrom(alice);
+    state.add_player_list()->CopyFrom(bob);
+
+    ReplayHarness harness(makeReplay({makeContainer(-1, state)}));
+    harness.processAll();
+
+    PlayerLogic *aliceLogic = harness.player(1);
+    PlayerLogic *bobLogic = harness.player(2);
+    ASSERT_NE(aliceLogic, nullptr);
+    ASSERT_NE(bobLogic, nullptr);
+
+    CardZoneLogic *hand = aliceLogic->getZones().value(ZoneNames::HAND);
+    CardZoneLogic *table = aliceLogic->getZones().value(ZoneNames::TABLE);
+    CardZoneLogic *deck = aliceLogic->getZones().value(ZoneNames::DECK);
+    ASSERT_NE(hand, nullptr);
+    ASSERT_NE(table, nullptr);
+    ASSERT_NE(deck, nullptr);
+
+    ASSERT_EQ(hand->getCards().size(), 1);
+    CardState *catState = hand->getCards().first();
+    EXPECT_EQ(catState->getId(), 7);
+    EXPECT_EQ(catState->getName(), QStringLiteral("Cat"));
+
+    ASSERT_EQ(table->getCards().size(), 1);
+    CardState *host = table->getCards().first();
+    EXPECT_EQ(host->getName(), QStringLiteral("Grizzly Bears"));
+    EXPECT_EQ(host->getGridPoint(), QPoint(2, 1));
+
+    // The hidden deck only carries a count, and the view materializes that many
+    // unknown cards.
+    EXPECT_EQ(deck->getCards().size(), 2);
+    for (const CardState *hidden : deck->getCards()) {
+        EXPECT_EQ(hidden->getId(), -1);
+    }
+
+    // processCardAttachment links both sides after every player is materialized.
+    CardZoneLogic *bobTable = bobLogic->getZones().value(ZoneNames::TABLE);
+    ASSERT_NE(bobTable, nullptr);
+    ASSERT_EQ(bobTable->getCards().size(), 1);
+    CardState *bobHost = bobTable->getCards().first();
+    EXPECT_EQ(catState->getAttachedTo(), bobHost);
+    ASSERT_EQ(bobHost->getAttachedCards().size(), 1);
+    EXPECT_EQ(bobHost->getAttachedCards().first(), catState);
+    // The identically numbered card on Alice's own table is a different card.
+    EXPECT_TRUE(host->getAttachedCards().isEmpty());
+
+    EXPECT_TRUE(harness.replay()->getGameState()->isGameStateKnown());
+}
+
+TEST(ReplayTest, AppliesMovesAttributesAndCountersInOrder)
+{
+    Event_GameStateChanged state = initialGameState();
+    state.add_player_list()->CopyFrom(makePlayer(
+        1, QStringLiteral("Alice"),
+        {makeZone(ZoneNames::HAND, ServerInfo_Zone::PrivateZone, false, {makeCard(7, QStringLiteral("Cat"))}),
+         makeZone(ZoneNames::TABLE, ServerInfo_Zone::PublicZone, true,
+                  {makeCard(9, QStringLiteral("Grizzly Bears"), 0, TableZoneLogic::tableRowToGridY(0))}),
+         makeZone(ZoneNames::DECK, ServerInfo_Zone::HiddenZone, false, {}, 2)}));
+
+    Event_MoveCard move;
+    move.set_card_id(7);
+    move.set_start_player_id(1);
+    move.set_start_zone(ZoneNames::HAND);
+    move.set_position(0);
+    move.set_target_player_id(1);
+    move.set_target_zone(ZoneNames::TABLE);
+    move.set_x(3);
+    move.set_y(TableZoneLogic::tableRowToGridY(1));
+    move.set_new_card_id(7);
+    move.set_face_down(false);
+
+    Event_SetCardAttr tap;
+    tap.set_zone_name(ZoneNames::TABLE);
+    tap.set_card_id(7);
+    tap.set_attribute(AttrTapped);
+    tap.set_attr_value("1");
+
+    Event_SetCardCounter counter;
+    counter.set_zone_name(ZoneNames::TABLE);
+    counter.set_card_id(7);
+    counter.set_counter_id(1);
+    counter.set_counter_value(2);
+
+    ReplayHarness harness(makeReplay(
+        {makeContainer(-1, state), makeContainer(1, move), makeContainer(1, tap), makeContainer(1, counter)}));
+    harness.processAll();
+
+    PlayerLogic *alice = harness.player(1);
+    ASSERT_NE(alice, nullptr);
+    CardZoneLogic *hand = alice->getZones().value(ZoneNames::HAND);
+    CardZoneLogic *table = alice->getZones().value(ZoneNames::TABLE);
+    ASSERT_NE(hand, nullptr);
+    ASSERT_NE(table, nullptr);
+
+    EXPECT_TRUE(hand->getCards().isEmpty());
+    ASSERT_EQ(table->getCards().size(), 2);
+
+    CardState *moved = table->getCard(7);
+    ASSERT_NE(moved, nullptr);
+    EXPECT_EQ(moved->getGridPoint(), QPoint(3, TableZoneLogic::tableRowToGridY(1)));
+    EXPECT_EQ(moved->getPT(), QStringLiteral("3/3"));
+    EXPECT_TRUE(moved->getTapped());
+    EXPECT_EQ(moved->getCounters().value(1), 2);
+
+    // The untouched creature keeps its own position and state.
+    CardState *bears = table->getCard(9);
+    ASSERT_NE(bears, nullptr);
+    EXPECT_EQ(bears->getGridPoint(), QPoint(0, TableZoneLogic::tableRowToGridY(0)));
+    EXPECT_FALSE(bears->getTapped());
+}
diff --git a/tests/icon_assets/CMakeLists.txt b/tests/icon_assets/CMakeLists.txt
new file mode 100644
index 000000000..da9776f8e
--- /dev/null
+++ b/tests/icon_assets/CMakeLists.txt
@@ -0,0 +1,3 @@
+cockatrice_add_test(
+  NAME icon_assets_test SOURCES icon_assets_test.cpp DEFINITIONS COCKATRICE_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
+)
diff --git a/tests/icon_assets/icon_assets_test.cpp b/tests/icon_assets/icon_assets_test.cpp
new file mode 100644
index 000000000..f0b06d5cc
--- /dev/null
+++ b/tests/icon_assets/icon_assets_test.cpp
@@ -0,0 +1,241 @@
+#include <QColor>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QFileInfo>
+#include <QRegularExpression>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <QXmlStreamReader>
+#include <gtest/gtest.h>
+
+namespace
+{
+const QString ICONS_RELATIVE_PATH = QStringLiteral("cockatrice/resources/icons");
+
+QString iconsDir()
+{
+    return QDir(QStringLiteral(COCKATRICE_SOURCE_DIR)).absoluteFilePath(ICONS_RELATIVE_PATH);
+}
+
+/** @brief True for content art that is allowed to carry full color. */
+bool isContentArt(const QString &relativePath)
+{
+    return relativePath.startsWith(QStringLiteral("mana/"));
+}
+
+QString violation(const QString &rule, const QString &relativePath)
+{
+    return rule + QLatin1Char(' ') + relativePath;
+}
+
+/**
+ * @brief Reads one SVG and returns true when the root carries a usable viewBox.
+ *
+ * Also reports malformed XML and editor-only metadata through the out params.
+ */
+bool inspectSvg(const QString &absolutePath,
+                bool &validXml,
+                bool &hasViewBox,
+                bool &hasEditorMetadata,
+                bool &hasPhysicalSize)
+{
+    validXml = false;
+    hasViewBox = false;
+    hasEditorMetadata = false;
+    hasPhysicalSize = false;
+
+    QFile file(absolutePath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return false;
+    }
+
+    QXmlStreamReader reader(&file);
+    bool sawRoot = false;
+
+    while (!reader.atEnd()) {
+        reader.readNext();
+
+        if (reader.hasError()) {
+            return false;
+        }
+
+        if (!reader.isStartElement()) {
+            continue;
+        }
+
+        if (!sawRoot) {
+            sawRoot = true;
+            if (reader.name() != QStringLiteral("svg")) {
+                return false;
+            }
+            const QString viewBox = reader.attributes().value(QStringLiteral("viewBox")).toString().simplified();
+            hasViewBox = viewBox == QStringLiteral("0 0 24 24");
+            hasPhysicalSize = !reader.attributes().value(QStringLiteral("width")).isEmpty() ||
+                              !reader.attributes().value(QStringLiteral("height")).isEmpty();
+        }
+
+        if (reader.name() == QStringLiteral("metadata") || reader.name() == QStringLiteral("namedview")) {
+            hasEditorMetadata = true;
+        }
+
+        for (const QXmlStreamAttribute &attribute : reader.attributes()) {
+            const QString prefix = attribute.prefix().toString();
+            if (prefix == QStringLiteral("inkscape") || prefix == QStringLiteral("sodipodi") ||
+                prefix == QStringLiteral("dc") || prefix == QStringLiteral("cc") || prefix == QStringLiteral("rdf")) {
+                hasEditorMetadata = true;
+            }
+        }
+    }
+
+    validXml = sawRoot && !reader.hasError();
+    return validXml;
+}
+
+bool isAllowedPaintValue(const QString &value)
+{
+    const QString normalized = value.trimmed().toLower();
+    return normalized.isEmpty() || normalized == QStringLiteral("none") ||
+           normalized == QStringLiteral("currentcolor") || normalized == QStringLiteral("inherit") ||
+           normalized == QStringLiteral("context-fill") || normalized == QStringLiteral("context-stroke") ||
+           normalized.startsWith(QStringLiteral("url("));
+}
+
+QRegularExpression paintValuePattern()
+{
+    static const QRegularExpression pattern(
+        QStringLiteral(R"re((?:fill|stroke|stop-color|color)\s*[:=]\s*["']?\s*([^"'\s;>]+))re"),
+        QRegularExpression::CaseInsensitiveOption);
+    return pattern;
+}
+
+bool hasHardcodedColor(const QString &absolutePath)
+{
+    QFile file(absolutePath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return false;
+    }
+
+    const QString content = QString::fromUtf8(file.readAll());
+    auto matches = paintValuePattern().globalMatch(content);
+    while (matches.hasNext()) {
+        const QString value = matches.next().captured(1).trimmed();
+        if (isAllowedPaintValue(value)) {
+            continue;
+        }
+        const QString normalized = value.toLower();
+        if (normalized.startsWith(QLatin1Char('#')) || normalized.contains(QStringLiteral("rgb(")) ||
+            normalized.contains(QStringLiteral("hsl(")) || QColor(value).isValid()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool hasCurrentColorToken(const QString &absolutePath)
+{
+    QFile file(absolutePath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return false;
+    }
+
+    const QString content = QString::fromUtf8(file.readAll());
+    auto matches = paintValuePattern().globalMatch(content);
+    while (matches.hasNext()) {
+        if (matches.next().captured(1).trimmed().compare(QStringLiteral("currentColor"), Qt::CaseInsensitive) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool isSchemeVariant(const QString &fileName)
+{
+    return fileName.contains(QStringLiteral("-dark."), Qt::CaseInsensitive) ||
+           fileName.contains(QStringLiteral("-light."), Qt::CaseInsensitive);
+}
+
+bool hasColorInFilename(const QString &fileName)
+{
+    static const QRegularExpression colorSuffix(
+        QStringLiteral(R"(_(green|blue|red|yellow|black|white|gray|grey)\.svg$)"),
+        QRegularExpression::CaseInsensitiveOption);
+    return colorSuffix.match(fileName).hasMatch();
+}
+
+/** @brief Collects every current violation as "rule relative/path.svg". */
+QSet<QString> collectViolations()
+{
+    QSet<QString> violations;
+
+    QDirIterator it(iconsDir(), QDir::Files, QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        it.next();
+        const QFileInfo info = it.fileInfo();
+        const QString relativePath = QDir(iconsDir()).relativeFilePath(info.absoluteFilePath());
+        if (isContentArt(relativePath)) {
+            continue;
+        }
+        if (info.suffix().compare(QStringLiteral("svg"), Qt::CaseInsensitive) != 0) {
+            violations.insert(violation(QStringLiteral("raster"), relativePath));
+            continue;
+        }
+
+        bool validXml = false;
+        bool hasViewBox = false;
+        bool hasEditorMetadata = false;
+        bool hasPhysicalSize = false;
+        inspectSvg(info.absoluteFilePath(), validXml, hasViewBox, hasEditorMetadata, hasPhysicalSize);
+
+        if (!validXml) {
+            violations.insert(violation(QStringLiteral("xml"), relativePath));
+        }
+        if (validXml && !hasViewBox) {
+            violations.insert(violation(QStringLiteral("viewbox"), relativePath));
+        }
+        if (hasPhysicalSize) {
+            violations.insert(violation(QStringLiteral("physical-size"), relativePath));
+        }
+        if (hasEditorMetadata) {
+            violations.insert(violation(QStringLiteral("editor-metadata"), relativePath));
+        }
+        if (hasHardcodedColor(info.absoluteFilePath()) && !isSchemeVariant(info.fileName())) {
+            violations.insert(violation(QStringLiteral("hardcoded-color"), relativePath));
+        }
+        if (!hasCurrentColorToken(info.absoluteFilePath()) && !isSchemeVariant(info.fileName())) {
+            violations.insert(violation(QStringLiteral("no-token"), relativePath));
+        }
+        if (hasColorInFilename(info.fileName())) {
+            violations.insert(violation(QStringLiteral("color-filename"), relativePath));
+        }
+    }
+
+    return violations;
+}
+
+QString formatSet(const QSet<QString> &entries)
+{
+    QStringList lines(entries.begin(), entries.end());
+    lines.sort();
+    return lines.join(QLatin1Char('\n'));
+}
+
+} // namespace
+
+/**
+ * @brief Every UI glyph follows the palette-token rules.
+ *
+ * The legacy set was paid down icon by icon, so no baseline grandfathers
+ * violations: a new violation fails right here. Scheme variants
+ * (`*-dark.svg`/`*-light.svg`) and mana art are exempt inside collectViolations().
+ */
+TEST(IconAssets, AssetsFollowTheRules)
+{
+    ASSERT_TRUE(QDir::isAbsolutePath(iconsDir()));
+    ASSERT_TRUE(QDir(iconsDir()).exists()) << "Missing icon directory: " << iconsDir().toStdString();
+
+    const QSet<QString> violations = collectViolations();
+    EXPECT_TRUE(violations.isEmpty()) << "Icon rule violations. Fix the icon; do not add exceptions:\n"
+                                      << formatSet(violations).toStdString();
+}
diff --git a/tests/installer_close_server_test.cpp b/tests/installer_close_server_test.cpp
new file mode 100644
index 000000000..158d0ce47
--- /dev/null
+++ b/tests/installer_close_server_test.cpp
@@ -0,0 +1,101 @@
+#include "installer_close_name.h"
+#include "installer_close_server.h"
+
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QEventLoop>
+#include <QLocalSocket>
+#include <QString>
+#include <QTimer>
+#include <QtGlobal>
+#include <gtest/gtest.h>
+#include <libcockatrice/utility/installer_close_protocol.h>
+#include <string>
+
+namespace
+{
+constexpr int HANDSHAKE_TIMEOUT_MS = 5000;
+
+/// The bytes both ends exchange, from the header they both include. The separate
+/// WireCommandIsThePinnedBytes test is what catches an accidental change to the literal.
+const QByteArray CLOSE_COMMAND = QByteArray::fromRawData(INSTALLER_CLOSE_COMMAND, sizeof(INSTALLER_CLOSE_COMMAND) - 1);
+
+/// Scopes the socket to this test process, so a Cockatrice the developer happens to be
+/// running cannot claim the name and the test cannot close it. Kept short on purpose:
+/// QLocalServer on Unix puts the socket file under QDir::tempPath(), and macOS caps that
+/// path at 104 bytes (sun_path). A longer name passes on Linux (/tmp) and fails to listen
+/// on the macOS CI runners, whose temp directory is already ~48 characters.
+QByteArray testUserName()
+{
+    return QByteArrayLiteral("t") + QByteArray::number(QCoreApplication::applicationPid());
+}
+} // namespace
+
+// The probe builds the name from the process id and the account name it reads from the
+// environment; the client builds it with scopedLocalServerName(). They have to produce the
+// same string or the installer can never reach the instance it is trying to close.
+TEST(InstallerCloseServerTest, SocketNameMatchesTheProbeForTheSameProcessAndUser)
+{
+    constexpr unsigned long PROCESS_ID = 4242;
+    const QString userName = QStringLiteral("installer-test");
+    const QString expected = QStringLiteral("CockatriceInstallerClose-4242-installer-test");
+
+    EXPECT_EQ(expected, InstallerCloseServer::socketNameForUser(PROCESS_ID, userName));
+    EXPECT_EQ(expected.toStdWString(), installerCloseSocketName(PROCESS_ID, userName.toStdWString()));
+}
+
+TEST(InstallerCloseServerTest, SocketNameScopesTheProcessIdByTheCurrentUser)
+{
+    qputenv("USER", testUserName());
+
+    EXPECT_EQ(QStringLiteral("CockatriceInstallerClose-4242-") + QString::fromLatin1(testUserName()),
+              InstallerCloseServer::socketName(4242));
+}
+
+// The line is a wire format shared with the Windows-only probe, which cannot be compiled
+// into this test. Pinning the exact bytes here makes a change to the shared header a
+// deliberate protocol change rather than a typo that only shows up in the installer.
+TEST(InstallerCloseServerTest, WireCommandIsThePinnedBytes)
+{
+    EXPECT_EQ(QByteArrayLiteral("COCKATRICE_INSTALLER_CLOSE\n"), CLOSE_COMMAND);
+    EXPECT_EQ(27, CLOSE_COMMAND.size());
+}
+
+// The installer only writes the command; the listening instance is what turns it into a
+// close. Anything but that exact line must not be treated as a request.
+TEST(InstallerCloseServerTest, CloseRequestIsEmittedForTheProbeCommand)
+{
+    qputenv("USER", testUserName());
+
+    InstallerCloseServer server;
+    ASSERT_TRUE(server.listen()) << "the installer close socket could not be started";
+
+    int closeRequests = 0;
+    QObject::connect(&server, &InstallerCloseServer::closeRequested, &server, [&closeRequests]() { ++closeRequests; });
+
+    QLocalSocket socket;
+    socket.connectToServer(InstallerCloseServer::socketName(QCoreApplication::applicationPid()));
+    ASSERT_TRUE(socket.waitForConnected(HANDSHAKE_TIMEOUT_MS)) << "could not reach the installer close socket";
+    ASSERT_EQ(CLOSE_COMMAND.size(), socket.write(CLOSE_COMMAND)) << "the close request was not accepted";
+
+    // No waitForBytesWritten(): on Windows QLocalSocket completes the write through the
+    // event dispatcher, and this test runs the server in the same thread, so a blocking
+    // wait would hold the loop the server needs to accept and read. The loop below is the
+    // real handshake: it flushes the write and delivers the server's readyRead.
+    QEventLoop loop;
+    QTimer timeout;
+    timeout.setSingleShot(true);
+    QObject::connect(&timeout, &QTimer::timeout, &loop, &QEventLoop::quit);
+    QObject::connect(&server, &InstallerCloseServer::closeRequested, &loop, &QEventLoop::quit);
+    timeout.start(HANDSHAKE_TIMEOUT_MS);
+    loop.exec();
+
+    EXPECT_EQ(1, closeRequests) << "the probe's line must reach the close handler exactly once";
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/local_client_lifetime_test.cpp b/tests/local_client_lifetime_test.cpp
new file mode 100644
index 000000000..95a2b1380
--- /dev/null
+++ b/tests/local_client_lifetime_test.cpp
@@ -0,0 +1,149 @@
+/**
+ * @file local_client_lifetime_test.cpp
+ * @brief Tests that a LocalClient survives the death of the LocalServer it talks to.
+ * @ingroup Tests
+ */
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QMessageLogContext>
+#include <QString>
+#include <QStringList>
+#include <cstdio>
+#include <cstring>
+#include <gtest/gtest.h>
+#include <libcockatrice/network/client/local/local_client.h>
+#include <libcockatrice/network/server/local/local_server.h>
+#include <libcockatrice/network/server/local/local_server_interface.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/rng/rng_abstract.h>
+#include <memory>
+
+// The server library refers to this global; the real applications define it in main.cpp.
+RNG_Abstract *rng = nullptr;
+
+namespace
+{
+
+// GTest's main() creates no QCoreApplication, which QObject::deleteLater() needs.
+const QCoreApplication &application()
+{
+    static int argc = 1;
+    static char executable[] = "local_client_lifetime_test";
+    static char *argv[] = {executable, nullptr};
+    static const QCoreApplication app(argc, argv);
+    return app;
+}
+
+/// Collects the warnings one logging category emits while this object is alive.
+///
+/// The handler is process-global and Qt does not nest handlers, so only one capture can be
+/// installed at a time; GTest running one case at a time is what makes that safe.
+class CategoryWarningCapture
+{
+public:
+    explicit CategoryWarningCapture(const char *_category) : category(_category)
+    {
+        previousHandler = qInstallMessageHandler(captureMessage);
+        s_active = this;
+    }
+
+    ~CategoryWarningCapture()
+    {
+        qInstallMessageHandler(previousHandler);
+        s_active = nullptr;
+    }
+
+    CategoryWarningCapture(const CategoryWarningCapture &) = delete;
+    CategoryWarningCapture &operator=(const CategoryWarningCapture &) = delete;
+
+    const QStringList &warnings() const
+    {
+        return capturedWarnings;
+    }
+
+private:
+    static void captureMessage(QtMsgType type, const QMessageLogContext &context, const QString &message)
+    {
+        if (s_active != nullptr && type == QtWarningMsg && context.category != nullptr &&
+            std::strcmp(s_active->category, context.category) == 0) {
+            s_active->capturedWarnings.append(message);
+        }
+
+        // Forward everything else, so a failure elsewhere in the test is still visible.
+        if (previousHandler != nullptr) {
+            previousHandler(type, context, message);
+            return;
+        }
+        std::fprintf(stderr, "%s\n", qPrintable(qFormatLogMessage(type, context, message)));
+    }
+
+    const char *category;
+    QStringList capturedWarnings;
+
+    static CategoryWarningCapture *s_active;
+    static QtMessageHandler previousHandler;
+};
+
+CategoryWarningCapture *CategoryWarningCapture::s_active = nullptr;
+QtMessageHandler CategoryWarningCapture::previousHandler = nullptr;
+
+class LocalClientLifetimeTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        (void)application();
+
+        server = std::make_unique<LocalServer>();
+        LocalServerInterface *lsi = server->newConnection();
+        ASSERT_NE(lsi, nullptr);
+        // Building the client logs in and joins room 0 through that interface, exactly as
+        // MainWindow::startLocalGame() does.
+        client = std::make_unique<LocalClient>(lsi, QStringLiteral("lifetime-test-player"),
+                                               QStringLiteral("lifetime-test-client-id"));
+    }
+
+    void TearDown() override
+    {
+        // Either case may already have deleted one of these.
+        client.reset();
+        server.reset();
+    }
+
+    std::unique_ptr<LocalServer> server;
+    std::unique_ptr<LocalClient> client;
+};
+
+TEST_F(LocalClientLifetimeTest, SendAfterServerDeletedIsDropped)
+{
+    server.reset(); // also destroys the LocalServerInterface the client was built on
+
+    CategoryWarningCapture capture("local_client");
+    // A default container stands in for a command still queued when the local game ended.
+    client->sendCommandContainer(CommandContainer());
+
+    ASSERT_EQ(capture.warnings().size(), 1);
+    EXPECT_TRUE(capture.warnings().first().contains(QStringLiteral("dropping command")))
+        << capture.warnings().first().toStdString();
+
+    // The surviving client is intact: reading its state must not touch the deleted interface.
+    EXPECT_EQ(client->getUserName(), QStringLiteral("lifetime-test-player"));
+}
+
+TEST_F(LocalClientLifetimeTest, DestroyingClientAfterServerIsSafe)
+{
+    server.reset();
+
+    CategoryWarningCapture capture("local_client");
+    client.reset(); // must neither crash nor touch the destroyed interface
+
+    // The destructor itself must have been silent.
+    EXPECT_TRUE(capture.warnings().isEmpty());
+
+    // A working capture proves the emptiness above is real rather than a broken handler.
+    qCWarning(LocalClientLog) << "local_client_lifetime_test capture self-check";
+    EXPECT_EQ(capture.warnings().size(), 1);
+}
+
+} // namespace
diff --git a/tests/model_contract/CMakeLists.txt b/tests/model_contract/CMakeLists.txt
new file mode 100644
index 000000000..3251c1443
--- /dev/null
+++ b/tests/model_contract/CMakeLists.txt
@@ -0,0 +1,17 @@
+cockatrice_add_test(
+  NAME
+  model_contract_test
+  SOURCES
+  ${VERSION_STRING_CPP}
+  model_contract_test.cpp
+  LIBS
+  libcockatrice_models
+  libcockatrice_card
+  libcockatrice_deck_list
+  libcockatrice_settings
+  INCLUDE_DIRS
+  ${CMAKE_CURRENT_SOURCE_DIR}/../support
+  ${CMAKE_CURRENT_SOURCE_DIR}/../carddatabase
+  DEFINITIONS
+  CARDDB_DATADIR="${CMAKE_SOURCE_DIR}/tests/carddatabase/data/"
+)
diff --git a/tests/model_contract/model_contract_test.cpp b/tests/model_contract/model_contract_test.cpp
new file mode 100644
index 000000000..aefa26f3d
--- /dev/null
+++ b/tests/model_contract/model_contract_test.cpp
@@ -0,0 +1,137 @@
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/models/database/card_database_display_model.h"
+#include "libcockatrice/models/database/card_database_model.h"
+#include "libcockatrice/models/database/card_set/card_sets_model.h"
+#include "libcockatrice/models/deck_list/deck_list_model.h"
+#include "model_contract_checker.h"
+#include "test_card_database_path_provider.h"
+
+#include "gtest/gtest.h"
+#include <QAbstractItemModel>
+#include <QCoreApplication>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QSignalSpy>
+#include <QString>
+#include <QTemporaryDir>
+#include <QVariant>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/game_specific_terms.h>
+#include <libcockatrice/card/printing/exact_card.h>
+#include <libcockatrice/interfaces/noop_card_preference_provider.h>
+#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include <libcockatrice/settings/download_settings.h>
+
+namespace
+{
+QSharedPointer<DeckList> makeDeck()
+{
+    return QSharedPointer<DeckList>(new DeckList());
+}
+
+void loadCardDatabase(CardDatabase &database)
+{
+    database.loadCardDatabases();
+    ASSERT_EQ(database.getLoadStatus(), Ok);
+}
+
+TEST(ModelContract, DeckListModelKeepsContractWhileZonesAndCardsChange)
+{
+    const QSharedPointer<DeckList> deck = makeDeck();
+    DeckListModel model(nullptr, deck);
+
+    test_support::ModelContractChecker checker(&model);
+
+    ASSERT_NE(deck->getTree()->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    model.rebuildTree();
+
+    CardInfoPtr bolt = CardInfo::newInstance("Lightning Bolt");
+    const QModelIndex added = model.addCard(ExactCard(bolt), DECK_ZONE_MAIN);
+    ASSERT_TRUE(added.isValid());
+
+    CardInfoPtr bears = CardInfo::newInstance("Grizzly Bears");
+    bears->setProperty(Mtg::MainCardType, "Creature");
+    const QModelIndex grouped = model.addCard(ExactCard(bears), "Removal");
+    ASSERT_TRUE(grouped.isValid());
+
+    ASSERT_TRUE(model.removeRows(grouped.row(), 1, grouped.parent()));
+}
+
+TEST(ModelContract, DeckListModelEmitsCardAddedSignal)
+{
+    const QSharedPointer<DeckList> deck = makeDeck();
+    DeckListModel model(nullptr, deck);
+    QSignalSpy spy(&model, &DeckListModel::cardAddedAt);
+
+    const QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN);
+
+    ASSERT_TRUE(added.isValid());
+    EXPECT_EQ(spy.count(), 1);
+}
+
+TEST(ModelContract, CardDatabaseModelAndDisplayProxyKeepContract)
+{
+    CardDatabase database(nullptr, new NoopCardPreferenceProvider(), new TestCardDatabasePathProvider(),
+                          new NoopCardSetPriorityController());
+    ASSERT_NO_FATAL_FAILURE(loadCardDatabase(database));
+
+    CardDatabaseModel source(&database, false);
+    test_support::ModelContractChecker sourceChecker(&source);
+
+    CardDatabaseDisplayModel display;
+    display.setSourceModel(&source);
+    test_support::ModelContractChecker displayChecker(&display);
+
+    ASSERT_GT(source.rowCount(), 0);
+    EXPECT_EQ(display.rowCount(), source.rowCount());
+
+    // A card row is a leaf, so its index must not claim child columns. The
+    // tester does not check this, hence the explicit assertion.
+    const QModelIndex sourceCard = source.index(0, 0);
+    ASSERT_TRUE(sourceCard.isValid());
+    EXPECT_EQ(source.columnCount(sourceCard), 0);
+    const QModelIndex displayCard = display.index(0, 0);
+    ASSERT_TRUE(displayCard.isValid());
+    EXPECT_EQ(display.columnCount(displayCard), 0);
+
+    QSignalSpy dirtySpy(&display, &CardDatabaseDisplayModel::modelDirty);
+    display.setCardName("Do");
+    ASSERT_TRUE(dirtySpy.wait());
+    EXPECT_GT(display.rowCount(), 0);
+    EXPECT_LT(display.rowCount(), source.rowCount());
+}
+
+TEST(ModelContract, SetsModelKeepsContract)
+{
+    CardDatabase database(nullptr, new NoopCardPreferenceProvider(), new TestCardDatabasePathProvider(),
+                          new NoopCardSetPriorityController());
+    ASSERT_NO_FATAL_FAILURE(loadCardDatabase(database));
+
+    SetsModel model(&database);
+    test_support::ModelContractChecker checker(&model);
+
+    ASSERT_GT(model.rowCount(), 0);
+    ASSERT_GT(model.columnCount(), 0);
+}
+
+TEST(ModelContract, SettingsSignalIsObservableWithQSignalSpy)
+{
+    QTemporaryDir tempDir;
+    ASSERT_TRUE(tempDir.isValid());
+    DownloadSettings settings(tempDir.path() + "/", nullptr);
+    QSignalSpy spy(&settings, &DownloadSettings::downloadSpoilerStatusChanged);
+
+    settings.setDownloadSpoilerStatus(true);
+
+    ASSERT_EQ(spy.count(), 1);
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/movecard_tests/CMakeLists.txt b/tests/movecard_tests/CMakeLists.txt
index 68d8fc84c..35d7b44ed 100755
--- a/tests/movecard_tests/CMakeLists.txt
+++ b/tests/movecard_tests/CMakeLists.txt
@@ -9,3 +9,15 @@ cockatrice_add_test(
   LABELS
   server
 )
+
+cockatrice_add_test(
+  NAME
+  player_order_test
+  SOURCES
+  player_order_test.cpp
+  LIBS
+  libcockatrice_network_server_remote
+  libcockatrice_rng
+  LABELS
+  server
+)
diff --git a/tests/movecard_tests/player_order_test.cpp b/tests/movecard_tests/player_order_test.cpp
new file mode 100644
index 000000000..6e398af24
--- /dev/null
+++ b/tests/movecard_tests/player_order_test.cpp
@@ -0,0 +1,268 @@
+#include "game/game_config.h"
+#include "game/role_info.h"
+#include "game/server_abstract_participant.h"
+#include "game/server_game.h"
+#include "server_abstractuserinterface.h"
+#include "server_response_containers.h"
+#include "server_room.h"
+#include "server_test_helpers.h"
+
+#include <gtest/gtest.h>
+#include <libcockatrice/protocol/pb/game_event_container.pb.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pb/room_event.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/protocol/pb/session_event.pb.h>
+#include <libcockatrice/rng/rng_abstract.h>
+
+RNG_Abstract *rng = nullptr; // this needs to be defined due to other functions in server
+
+class ScriptedRng : public RNG_Abstract
+{
+public:
+    QList<unsigned int> values;
+
+    unsigned int rand(int min, int max) override
+    {
+        const unsigned int value = values.takeFirst();
+        EXPECT_GE(value, static_cast<unsigned int>(min));
+        EXPECT_LE(value, static_cast<unsigned int>(max));
+        return value;
+    }
+};
+
+class FakeUserInterface : public Server_AbstractUserInterface
+{
+public:
+    FakeUserInterface(Server *_server, const ServerInfo_User &_userInfo) : Server_AbstractUserInterface(_server)
+    {
+        setUserInfo(_userInfo);
+    }
+
+    int getLastCommandTime() const override
+    {
+        return 0;
+    }
+
+    bool addSaidMessageSize(int) override
+    {
+        return true;
+    }
+
+    void sendProtocolItem(const Response &) override
+    {
+    }
+
+    void sendProtocolItem(const SessionEvent &) override
+    {
+    }
+
+    void sendProtocolItem(const GameEventContainer &) override
+    {
+    }
+
+    void sendProtocolItem(const RoomEvent &) override
+    {
+    }
+};
+
+namespace
+{
+QStringList participantNamesInOrder(const Server_Game &game)
+{
+    QStringList names;
+    for (int id : game.getSeatOrder()) {
+        const auto *participant = game.getParticipants().value(id, nullptr);
+        if (participant) {
+            names.append(QString::fromStdString(participant->getUserInfo()->name()));
+        }
+    }
+    return names;
+}
+
+QList<int> participantIdsInOrder(const Server_Game &game)
+{
+    return game.getSeatOrder();
+}
+} // namespace
+
+class PlayerOrderTest : public ::testing::Test
+{
+protected:
+    ServerInfo_User creator;
+    ServerInfo_User userB;
+    ServerInfo_User userC;
+
+    PlayerOrderTest()
+    {
+        creator.set_name("A");
+        creator.set_user_level(ServerInfo_User::IsRegistered);
+        userB.set_name("B");
+        userB.set_user_level(ServerInfo_User::IsRegistered);
+        userC.set_name("C");
+        userC.set_user_level(ServerInfo_User::IsRegistered);
+    }
+};
+
+TEST_F(PlayerOrderTest, JoinOrderIsSeatOrder)
+{
+    FakeServer server;
+    Server_Room room(0, 0, "", "", "", "", false, "", {}, &server);
+    FakeUserInterface uiA(&server, creator);
+    FakeUserInterface uiB(&server, userB);
+    FakeUserInterface uiC(&server, userC);
+    GameConfig config{.creatorInfo = creator,
+                      .gameId = 1,
+                      .description = QString(),
+                      .password = QString(),
+                      .maxPlayers = 3,
+                      .gameTypes = QList<int>(),
+                      .onlyBuddies = false,
+                      .onlyRegistered = false,
+                      .spectatorsAllowed = false,
+                      .spectatorsNeedPassword = false,
+                      .spectatorsCanTalk = false,
+                      .spectatorsSeeEverything = false,
+                      .startingLifeTotal = 20,
+                      .shareDecklistsOnLoad = false,
+                      .shufflePlayers = false};
+    Server_Game game(config, &room);
+    ResponseContainer rc(0);
+
+    game.addPlayer(&uiA, rc, RoleInfo{}, false);
+    game.addPlayer(&uiB, rc, RoleInfo{}, false);
+    game.addPlayer(&uiC, rc, RoleInfo{}, false);
+
+    EXPECT_EQ(participantNamesInOrder(game), QStringList({"A", "B", "C"}));
+    EXPECT_EQ(participantIdsInOrder(game), QList<int>({0, 1, 2}));
+    EXPECT_EQ(game.getHostId(), 0);
+    EXPECT_EQ(game.getPlayerCount(), 3);
+}
+
+TEST_F(PlayerOrderTest, ReorderPlayerSeats)
+{
+    FakeServer server;
+    Server_Room room(0, 0, "", "", "", "", false, "", {}, &server);
+    FakeUserInterface uiA(&server, creator);
+    FakeUserInterface uiB(&server, userB);
+    FakeUserInterface uiC(&server, userC);
+    GameConfig config{.creatorInfo = creator,
+                      .gameId = 1,
+                      .description = QString(),
+                      .password = QString(),
+                      .maxPlayers = 3,
+                      .gameTypes = QList<int>(),
+                      .onlyBuddies = false,
+                      .onlyRegistered = false,
+                      .spectatorsAllowed = false,
+                      .spectatorsNeedPassword = false,
+                      .spectatorsCanTalk = false,
+                      .spectatorsSeeEverything = false,
+                      .startingLifeTotal = 20,
+                      .shareDecklistsOnLoad = false,
+                      .shufflePlayers = false};
+    Server_Game game(config, &room);
+    ResponseContainer rc(0);
+
+    game.addPlayer(&uiA, rc, RoleInfo{}, false);
+    game.addPlayer(&uiB, rc, RoleInfo{}, false);
+    game.addPlayer(&uiC, rc, RoleInfo{}, false);
+
+    game.reorderPlayerSeats({"C", "A", "B"});
+
+    // player ids are stable; only the seat order changes
+    EXPECT_EQ(participantNamesInOrder(game), QStringList({"C", "A", "B"}));
+    EXPECT_EQ(participantIdsInOrder(game), QList<int>({2, 0, 1}));
+    EXPECT_EQ(game.getParticipants().size(), 3);
+
+    // the host keeps its seat: creator A is still in the game, so host stays 0
+    EXPECT_EQ(game.getHostId(), 0);
+
+    // no re-keying means every mapping keyed by player id stays valid
+    const int gameId = game.getGameId();
+    EXPECT_EQ(uiA.getGames().value(gameId).second, 0);
+    EXPECT_EQ(uiB.getGames().value(gameId).second, 1);
+    EXPECT_EQ(uiC.getGames().value(gameId).second, 2);
+}
+
+TEST_F(PlayerOrderTest, ReorderPlayerSeatsKeepsPlayerCount)
+{
+    FakeServer server;
+    Server_Room room(0, 0, "", "", "", "", false, "", {}, &server);
+    FakeUserInterface uiA(&server, creator);
+    FakeUserInterface uiB(&server, userB);
+    FakeUserInterface uiC(&server, userC);
+    GameConfig config{.creatorInfo = creator,
+                      .gameId = 1,
+                      .description = QString(),
+                      .password = QString(),
+                      .maxPlayers = 3,
+                      .gameTypes = QList<int>(),
+                      .onlyBuddies = false,
+                      .onlyRegistered = false,
+                      .spectatorsAllowed = false,
+                      .spectatorsNeedPassword = false,
+                      .spectatorsCanTalk = false,
+                      .spectatorsSeeEverything = false,
+                      .startingLifeTotal = 20,
+                      .shareDecklistsOnLoad = false,
+                      .shufflePlayers = false};
+    Server_Game game(config, &room);
+    ResponseContainer rc(0);
+
+    game.addPlayer(&uiA, rc, RoleInfo{}, false);
+    game.addPlayer(&uiB, rc, RoleInfo{}, false);
+    game.addPlayer(&uiC, rc, RoleInfo{}, false);
+
+    // listing only a subset appends the remaining players in their current order
+    game.reorderPlayerSeats({"C"});
+
+    EXPECT_EQ(participantNamesInOrder(game), QStringList({"C", "A", "B"}));
+    EXPECT_EQ(participantIdsInOrder(game), QList<int>({2, 0, 1}));
+    EXPECT_EQ(game.getPlayerCount(), 3);
+    EXPECT_EQ(game.getHostId(), 0);
+}
+
+TEST_F(PlayerOrderTest, ShufflePlayerSeatsIsAPermutation)
+{
+    FakeServer server;
+    Server_Room room(0, 0, "", "", "", "", false, "", {}, &server);
+    FakeUserInterface uiA(&server, creator);
+    FakeUserInterface uiB(&server, userB);
+    FakeUserInterface uiC(&server, userC);
+    GameConfig config{.creatorInfo = creator,
+                      .gameId = 1,
+                      .description = QString(),
+                      .password = QString(),
+                      .maxPlayers = 3,
+                      .gameTypes = QList<int>(),
+                      .onlyBuddies = false,
+                      .onlyRegistered = false,
+                      .spectatorsAllowed = false,
+                      .spectatorsNeedPassword = false,
+                      .spectatorsCanTalk = false,
+                      .spectatorsSeeEverything = false,
+                      .startingLifeTotal = 20,
+                      .shareDecklistsOnLoad = false,
+                      .shufflePlayers = false};
+    Server_Game game(config, &room);
+    ResponseContainer rc(0);
+
+    game.addPlayer(&uiA, rc, RoleInfo{}, false);
+    game.addPlayer(&uiB, rc, RoleInfo{}, false);
+    game.addPlayer(&uiC, rc, RoleInfo{}, false);
+
+    // fisher-yates on [A, B, C]: rand(0, 2) -> 1 (take B), rand(0, 1) -> 0 (take A), rand(0, 0) -> 0 (take C)
+    auto *scriptedRng = new ScriptedRng;
+    scriptedRng->values = {1, 0, 0};
+    rng = scriptedRng;
+
+    game.shufflePlayerSeats();
+
+    EXPECT_EQ(participantNamesInOrder(game), QStringList({"B", "A", "C"}));
+    EXPECT_EQ(participantIdsInOrder(game), QList<int>({1, 0, 2}));
+    QSet<int> idSet(participantIdsInOrder(game).cbegin(), participantIdsInOrder(game).cend());
+    EXPECT_EQ(idSet.size(), 3); // ids are unique
+    // ids are stable, so the host (creator A, id 0) is unchanged
+    EXPECT_EQ(game.getHostId(), 0);
+}
diff --git a/tests/moxfield_signature_spells_test.cpp b/tests/moxfield_signature_spells_test.cpp
new file mode 100644
index 000000000..54346a934
--- /dev/null
+++ b/tests/moxfield_signature_spells_test.cpp
@@ -0,0 +1,84 @@
+#include "client/network/parsers/interface_json_deck_parser.h"
+
+#include <QJsonDocument>
+#include <gtest/gtest.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+
+TEST(MoxfieldImport, SignatureSpellIsAddedToMainWithoutReplacingCommanderBanner)
+{
+    // Moxfield v2 board objects map IDs to entries with quantity and card.
+    const auto input = QJsonDocument::fromJson(R"json({
+        "name": "Oathbreaker example", "description": "Notes retained",
+        "mainboard": {"land": {"quantity": 1, "card": {"name": "Island", "set": "abc", "cn": "1"}}},
+        "sideboard": {"side": {"quantity": 1, "card": {"name": "Mountain", "set": "abc", "cn": "2"}}},
+        "commanders": {"walker": {"quantity": 1, "card": {"name": "Jace", "set": "abc", "cn": "3", "scryfall_id": "walker-id"}}},
+        "signatureSpells": {"spell": {"quantity": 1, "card": {"name": "Lightning Bolt", "set": "xyz", "cn": "4", "scryfall_id": "spell-id"}}}
+    })json")
+                           .object();
+    MoxfieldJsonParser parser;
+    DeckList deck = parser.parse(input);
+    int mainSpellCount = 0;
+    int sideSpellCount = 0;
+    int mainLands = 0;
+    int sideLands = 0;
+    deck.forEachCard([&](InnerDecklistNode *zone, DecklistCardNode *card) {
+        if (card->getName() == "Island" && zone->getName() == DECK_ZONE_MAIN) {
+            mainLands += card->getNumber();
+        }
+        if (card->getName() == "Mountain" && zone->getName() == DECK_ZONE_SIDE) {
+            sideLands += card->getNumber();
+        }
+        if (card->getName() != "Lightning Bolt") {
+            return;
+        }
+        if (zone->getName() == DECK_ZONE_MAIN) {
+            mainSpellCount += card->getNumber();
+            EXPECT_EQ(card->getCardSetShortName(), "XYZ");
+            EXPECT_EQ(card->getCardCollectorNumber(), "4");
+            EXPECT_EQ(card->getCardProviderId(), "spell-id");
+        } else if (zone->getName() == DECK_ZONE_SIDE) {
+            sideSpellCount += card->getNumber();
+        }
+    });
+    EXPECT_EQ(mainSpellCount, 1);
+    EXPECT_EQ(sideSpellCount, 0);
+    EXPECT_EQ(mainLands, 1);
+    EXPECT_EQ(sideLands, 1);
+    EXPECT_EQ(deck.getName(), "Oathbreaker example");
+    EXPECT_EQ(deck.getComments(), "Notes retained");
+    EXPECT_EQ(deck.getBannerCard().name, "Jace");
+    EXPECT_EQ(deck.getBannerCard().providerId, "walker-id");
+}
+
+TEST(MoxfieldImport, QuantityAwareDeckInsertionRetainsCountAndPrinting)
+{
+    DeckList deck;
+    auto *card = deck.addCards("Island", 2, DECK_ZONE_MAIN, -1, "ABC", "4", "id");
+    ASSERT_NE(card, nullptr);
+    EXPECT_EQ(card->getNumber(), 2);
+    EXPECT_EQ(card->getCardProviderId(), "id");
+    EXPECT_EQ(deck.addCards("Island", 0, DECK_ZONE_MAIN), nullptr);
+}
+
+TEST(OnlineImport, ArchidektPreservesNameDescriptionAndCards)
+{
+    const auto input = QJsonDocument::fromJson(R"json({
+        "name": "Online deck", "description": "Deck notes",
+        "cards": [{"quantity": 2, "card": {
+            "oracleCard": {"name": "Island"}, "edition": {"editioncode": "abc"}, "collectorNumber": "1"
+        }}]
+    })json")
+                           .object();
+    ArchidektJsonParser parser;
+    const DeckList deck = parser.parse(input);
+    int count = 0;
+    deck.forEachCard([&](InnerDecklistNode *zone, DecklistCardNode *card) {
+        if (zone->getName() == DECK_ZONE_MAIN && card->getName() == "Island") {
+            count += card->getNumber();
+        }
+    });
+    EXPECT_EQ(count, 2);
+    EXPECT_EQ(deck.getName(), "Online deck");
+    EXPECT_EQ(deck.getComments(), "Deck notes");
+}
diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt
index 6958673f7..1cc1ad952 100644
--- a/tests/oracle/CMakeLists.txt
+++ b/tests/oracle/CMakeLists.txt
@@ -9,6 +9,7 @@ cockatrice_add_test(
   ../../oracle/src/oracleimporter.cpp
   ../../oracle/src/parsehelpers.cpp
   ../../oracle/src/raw_json_scanner.cpp
+  ../../oracle/src/database_writer.cpp
   oracle_importer_test.cpp
   LIBS
   libcockatrice_card
diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp
index 83d77d465..1b4e2d915 100644
--- a/tests/oracle/oracle_importer_test.cpp
+++ b/tests/oracle/oracle_importer_test.cpp
@@ -1,11 +1,14 @@
+#include "../../oracle/src/database_writer.h"
 #include "../../oracle/src/oracleimporter.h"
 #include "../../oracle/src/raw_json_scanner.h"
+#include "../support/scoped_file_size_limit.h"
 #include "libcockatrice/card/card_info.h"
 
 #include "gtest/gtest.h"
 #include <QByteArray>
 #include <QChar>
 #include <QDate>
+#include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -20,6 +23,7 @@
 #include <QRegularExpressionMatch>
 #include <QSharedPointer>
 #include <QString>
+#include <QTemporaryDir>
 #include <QUuid>
 #include <QVariant>
 #include <QVariantMap>
@@ -1140,6 +1144,208 @@ TEST_F(OracleImporterTest, StartImportAppliesLocalizedData)
     ASSERT_EQ(result->getLocalizedText("pt"), "Raio causa 3 de dano a qualquer alvo.");
 }
 
+namespace
+{
+QByteArray refreshSource(const QString &name = "New Card")
+{
+    QJsonObject card{{"name", name},       {"text", "Rules text."}, {"layout", "normal"},
+                     {"type", "Artifact"}, {"number", "1"},         {"rarity", "common"}};
+    QJsonObject set{{"code", "TST"}, {"name", "Test Set"}, {"type", "expansion"}, {"cards", QJsonArray{card}}};
+    return QJsonDocument(QJsonObject{{"data", QJsonObject{{"TST", set}}}}).toJson(QJsonDocument::Compact);
+}
+} // namespace
+
+TEST_F(OracleImporterTest, FailedLazyParseKeepsInstalledDatabase)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString path = dir.filePath("cards.xml");
+    QFile original(path);
+    ASSERT_TRUE(original.open(QIODevice::WriteOnly));
+    ASSERT_EQ(original.write("existing database"), 17);
+    original.close();
+
+    // The metadata scanner skips numeric values without converting them. Qt's
+    // per-set parser rejects an overflowing number after selection succeeds.
+    auto badSet = QJsonDocument::fromJson(refreshSource()).object().value("data").toObject().value("TST").toObject();
+    auto goodSet = badSet;
+    goodSet["code"] = "AAA";
+    goodSet["name"] = "A successful first set";
+    auto badCard = badSet.value("cards").toArray().first().toObject();
+    badCard["number"] = "overflow";
+    badSet["cards"] = QJsonArray{badCard};
+    QByteArray data = QJsonDocument(QJsonObject{{"data", QJsonObject{{"AAA", goodSet}, {"TST", badSet}}}})
+                          .toJson(QJsonDocument::Compact);
+    data.replace("\"number\":\"overflow\"", "\"number\":1e9999");
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    EXPECT_EQ(importer->startImport(), 0);
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    EXPECT_TRUE(importer->getImportError().contains("TST"));
+    EXPECT_TRUE(importer->getCardList().isEmpty());
+    EXPECT_FALSE(importer->saveToFile(path, {}, {}));
+    ASSERT_TRUE(original.open(QIODevice::ReadOnly));
+    EXPECT_EQ(original.readAll(), "existing database");
+}
+
+TEST_F(OracleImporterTest, EmptyImportCannotReplaceInstalledCards)
+{
+    const QByteArray source = R"({"data":{"TST":{"code":"TST","name":"Test","type":"expansion","cards":[]}}})";
+    ASSERT_TRUE(importer->readSetsFromByteArray(source));
+    EXPECT_EQ(importer->startImport(), 0);
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    EXPECT_FALSE(importer->getImportError().isEmpty());
+}
+
+TEST_F(OracleImporterTest, MissingSourceBytesCannotProduceSuccessfulImport)
+{
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource()));
+    const auto selected = importer->getSets();
+    importer->releaseSetData();
+    importer->getSets() = selected;
+    EXPECT_EQ(importer->startImport(), 0);
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    EXPECT_TRUE(importer->getImportError().contains("TST"));
+}
+
+TEST_F(OracleImporterTest, CancellationDuringFinalSetCannotSavePartialDatabase)
+{
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource()));
+    QObject::connect(
+        importer, &OracleImporter::setIndexChanged, importer,
+        [this](int, int, const QString &name) {
+            if (!name.isEmpty()) {
+                importer->cancelImport();
+            }
+        },
+        Qt::DirectConnection);
+    EXPECT_EQ(importer->startImport(), 0);
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    EXPECT_TRUE(importer->getCardList().isEmpty());
+}
+
+TEST_F(OracleImporterTest, CancellationBeforeWorkerStartsIsNotLost)
+{
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource()));
+    importer->prepareImport();
+    importer->cancelImport();
+    EXPECT_EQ(importer->startImport(), 0);
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    importer->prepareImport();
+    EXPECT_EQ(importer->startImport(), 1);
+    EXPECT_TRUE(importer->hasSuccessfulImport());
+}
+
+TEST_F(OracleImporterTest, NewImportReplacesPreviousInMemoryCards)
+{
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource("Old Card")));
+    ASSERT_EQ(importer->startImport(), 1);
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource("New Card")));
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    ASSERT_EQ(importer->startImport(), 1);
+    EXPECT_EQ(importer->getCardList().size(), 1);
+    EXPECT_FALSE(importer->getCardList().contains("Old Card"));
+    EXPECT_TRUE(importer->getCardList().contains("New Card"));
+}
+
+TEST_F(OracleImporterTest, FailedSourceLoadCannotReusePreviousSuccessfulImport)
+{
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource()));
+    ASSERT_EQ(importer->startImport(), 1);
+    ASSERT_FALSE(importer->readSetsFromByteArray("invalid JSON"));
+    EXPECT_FALSE(importer->hasSuccessfulImport());
+    EXPECT_EQ(importer->startImport(), 0);
+}
+
+TEST_F(OracleImporterTest, SuccessfulRefreshCommitsCompleteXml)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString path = dir.filePath("cards.xml");
+    ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource()));
+    ASSERT_EQ(importer->startImport(), 1);
+    importer->releaseSetData();
+    ASSERT_TRUE(importer->saveToFile(path, "test-source", "v1"));
+    QFile file(path);
+    ASSERT_TRUE(file.open(QIODevice::ReadOnly));
+    const QByteArray xml = file.readAll();
+    EXPECT_TRUE(xml.contains("New Card"));
+    EXPECT_TRUE(xml.contains("test-source"));
+    EXPECT_TRUE(xml.contains("</cockatrice_carddatabase>"));
+}
+
+TEST(OracleDatabaseWriter, AcceptsCompleteSupportedVersions)
+{
+    EXPECT_TRUE(OracleDatabase::validateXml(
+                    "<?xml version=\"1.0\"?><cockatrice_carddatabase version=\"3\"><cards/></cockatrice_carddatabase>")
+                    .isEmpty());
+    EXPECT_TRUE(OracleDatabase::validateXml("<cockatrice_carddatabase version=\"4\"><cards/></cockatrice_carddatabase>")
+                    .isEmpty());
+    EXPECT_FALSE(
+        OracleDatabase::validateXml("<cockatrice_carddatabase version=\"5\"><cards/></cockatrice_carddatabase>")
+            .isEmpty());
+}
+
+TEST(OracleDatabaseWriter, InvalidDownloadPreservesInstalledBytes)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString path = dir.filePath("tokens.xml");
+    QFile original(path);
+    ASSERT_TRUE(original.open(QIODevice::WriteOnly));
+    ASSERT_EQ(original.write("installed tokens"), 16);
+    original.close();
+    for (const QByteArray &payload : {QByteArray("<html>server error</html>"),
+                                      QByteArray("<cockatrice_carddatabase version=\"4\"><cards>"), QByteArray()}) {
+        QString error;
+        EXPECT_FALSE(OracleDatabase::saveXml(path, payload, &error));
+        EXPECT_FALSE(error.isEmpty());
+        ASSERT_TRUE(original.open(QIODevice::ReadOnly));
+        EXPECT_EQ(original.readAll(), "installed tokens");
+        original.close();
+    }
+}
+
+TEST(OracleDatabaseWriter, CompleteDownloadReplacesInstalledBytes)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString path = dir.filePath("cards.xml");
+    const QByteArray data("<cockatrice_carddatabase version=\"4\"><cards/></cockatrice_carddatabase>");
+    QString error = "previous failure";
+    ASSERT_TRUE(OracleDatabase::saveXml(path, data, &error));
+    EXPECT_TRUE(error.isEmpty());
+    QFile file(path);
+    ASSERT_TRUE(file.open(QIODevice::ReadOnly));
+    EXPECT_EQ(file.readAll(), data);
+}
+
+#ifdef Q_OS_UNIX
+TEST(OracleDatabaseWriter, ShortWriteKeepsPreviouslyInstalledDatabase)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString path = dir.filePath("cards.xml");
+    QFile original(path);
+    ASSERT_TRUE(original.open(QIODevice::WriteOnly));
+    ASSERT_EQ(original.write("installed database"), 18);
+    original.close();
+    const QByteArray data = "<cockatrice_carddatabase version=\"4\"><!--" + QByteArray(16384, 'x') +
+                            "--><cards/></cockatrice_carddatabase>";
+    // A real filesystem write failure: the soft file-size cap makes the writer's own
+    // flush fail without filling a disk. The cap is scoped rather than forked, because a
+    // death-test child under RLIMIT_FSIZE is killed by SIGSEGV on macOS.
+    test_support::ScopedFileSizeLimit fileSizeCap(128);
+    ASSERT_TRUE(fileSizeCap.isValid());
+
+    QString error;
+    EXPECT_FALSE(OracleDatabase::saveXml(path, data, &error));
+    EXPECT_FALSE(error.isEmpty());
+
+    ASSERT_TRUE(original.open(QIODevice::ReadOnly));
+    EXPECT_EQ(original.readAll(), "installed database");
+}
+#endif
+
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp
index 99f2e1400..8e7eded72 100644
--- a/tests/password_hash_test.cpp
+++ b/tests/password_hash_test.cpp
@@ -52,6 +52,17 @@ TEST(PasswordHashTest, DeriveKeyMatchesKnownVector)
     ASSERT_EQ(derived.toHex(), expected.toHex());
 }
 
+TEST(PasswordHashTest, DeriveKeyCoversTheWholeAcceptedRangeOfR)
+{
+    // costParamsAreSane accepts r up to 32. The memory budget handed to OpenSSL has to cover
+    // scrypt's XY array (256 * r bytes) on top of V and B, or derivation fails for r >= 17.
+    for (const int r : {17, 32}) {
+        const QByteArray derived = PasswordHasher::deriveKey("password", QByteArray("NaCl"), 1024, r, 1);
+        ASSERT_FALSE(derived.isEmpty()) << "deriveKey failed for accepted r=" << r;
+        ASSERT_EQ(derived.size(), SCRYPT_VERIFIER_LENGTH);
+    }
+}
+
 TEST(PasswordHashTest, PasswordVerifierRoundTrip)
 {
     const QString stored = PasswordHasher::generatePasswordVerifier("hunter2");
diff --git a/tests/payload_paths_test.cpp b/tests/payload_paths_test.cpp
new file mode 100644
index 000000000..c4576d751
--- /dev/null
+++ b/tests/payload_paths_test.cpp
@@ -0,0 +1,57 @@
+#include "payload_paths.h"
+
+#include <gtest/gtest.h>
+#include <string>
+
+namespace
+{
+/// The directory part of a path spelled with the same case as the install directory, which
+/// is the comparison the probe makes once both sides are folded - see isSameDirectory in
+/// restart_manager_holders.cpp. Kept as a plain string here so the shape of a path can be
+/// tested without Windows.
+bool runsFrom(const std::wstring &imagePath, const std::wstring &installDir)
+{
+    return parentDirectoryOf(imagePath) == installDir;
+}
+} // namespace
+
+TEST(PayloadPaths, SplitsAnImagePathIntoItsDirectoryAndName)
+{
+    EXPECT_EQ(fileNameOf(L"D:\\Games\\Cockatrice\\cockatrice.exe"), std::wstring(L"cockatrice.exe"));
+    EXPECT_EQ(parentDirectoryOf(L"D:\\Games\\Cockatrice\\cockatrice.exe"), std::wstring(L"D:\\Games\\Cockatrice"));
+    EXPECT_EQ(fileNameOf(L"cockatrice.exe"), std::wstring(L"cockatrice.exe"));
+    EXPECT_EQ(parentDirectoryOf(L"cockatrice.exe"), std::wstring());
+    EXPECT_EQ(parentDirectoryOf(L"D:/Games/Cockatrice/cockatrice.exe"), std::wstring(L"D:/Games/Cockatrice"));
+}
+
+TEST(PayloadPaths, OnlyAnImageInTheInstallDirectoryRunsFromIt)
+{
+    const std::wstring installDir = L"D:\\Games\\Cockatrice";
+    EXPECT_TRUE(runsFrom(L"D:\\Games\\Cockatrice\\cockatrice.exe", installDir));
+    // A folder the user keeps other applications in is not the installation, and neither is
+    // a sibling whose name merely begins with the same letters.
+    EXPECT_FALSE(runsFrom(L"D:\\Games\\Cockatrice\\old\\cockatrice.exe", installDir));
+    EXPECT_FALSE(runsFrom(L"D:\\Games\\Cockatrice-old\\cockatrice.exe", installDir));
+    EXPECT_FALSE(runsFrom(L"D:\\Games\\cockatrice.exe", installDir));
+}
+
+TEST(PayloadPaths, KnowsTheProgramsThePayloadInstalls)
+{
+    EXPECT_TRUE(isPayloadProgram(L"cockatrice.exe"));
+    EXPECT_TRUE(isPayloadProgram(L"oracle.exe"));
+    EXPECT_TRUE(isPayloadProgram(L"servatrice.exe"));
+    EXPECT_TRUE(isPayloadProgram(L"COCKATRICE.EXE"));
+    EXPECT_TRUE(isPayloadProgram(L"Servatrice.Exe"));
+}
+
+TEST(PayloadPaths, LeavesEveryOtherProgramAlone)
+{
+    // A program the user keeps in the install directory, the uninstaller, a service host and
+    // a name that only looks like a payload program are all not instances of the payload.
+    EXPECT_FALSE(isPayloadProgram(L"uninstall.exe"));
+    EXPECT_FALSE(isPayloadProgram(L"tool.exe"));
+    EXPECT_FALSE(isPayloadProgram(L"svchost.exe"));
+    EXPECT_FALSE(isPayloadProgram(L"cockatrice2.exe"));
+    EXPECT_FALSE(isPayloadProgram(L"mycockatrice.exe"));
+    EXPECT_FALSE(isPayloadProgram(L""));
+}
diff --git a/tests/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp
index 6308d80b9..6b884864d 100644
--- a/tests/server_card_counter_test.cpp
+++ b/tests/server_card_counter_test.cpp
@@ -8,10 +8,14 @@
 #include <gtest/gtest.h>
 #include <libcockatrice/network/server/remote/game/server_card.h>
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
+#include <libcockatrice/rng/rng_abstract.h>
 #include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/counter_limits.h>
 #include <string>
 
+// Referenced by other translation units in the server_remote library.
+RNG_Abstract *rng = nullptr;
+
 TEST(ServerCardCounter, IncrementNewCounter)
 {
     Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
diff --git a/tests/server_forced_password_change_test.cpp b/tests/server_forced_password_change_test.cpp
new file mode 100644
index 000000000..9717b610b
--- /dev/null
+++ b/tests/server_forced_password_change_test.cpp
@@ -0,0 +1,234 @@
+/** @file server_forced_password_change_test.cpp
+ *  @brief Tests for the restricted session a forced password change leaves behind at login.
+ *  @ingroup Tests
+ */
+
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/server_message.pb.h"
+#include "server.h"
+#include "server_database_interface.h"
+#include "server_protocolhandler.h"
+
+#include <QString>
+#include <gtest/gtest.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/room_commands.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <libcockatrice/rng/rng_abstract.h>
+
+RNG_Abstract *rng = nullptr; // referenced by the server_remote library
+
+namespace
+{
+
+class MockDatabaseInterface : public Server_DatabaseInterface
+{
+public:
+    AuthenticationResult checkUserPassword(Server_ProtocolHandler *,
+                                           const QString &,
+                                           const QString &,
+                                           const QString &,
+                                           QString &,
+                                           int &,
+                                           bool) override
+    {
+        return PasswordChangeRequired;
+    }
+    ServerInfo_User getUserData(const QString &name, bool withId) override
+    {
+        ServerInfo_User user;
+        user.set_name(name.toStdString());
+        user.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | ServerInfo_User::IsModerator);
+        if (withId) {
+            user.set_id(1);
+        }
+        return user;
+    }
+    int getNextReplayId() override
+    {
+        return 1;
+    }
+    int getNextGameId() override
+    {
+        return 1;
+    }
+    int getActiveUserCount(QString) override
+    {
+        return 0;
+    }
+};
+
+class FakeServer : public Server
+{
+public:
+    FakeServer()
+    {
+        setDatabaseInterface(new MockDatabaseInterface());
+    }
+};
+
+class TestHandler : public Server_ProtocolHandler
+{
+public:
+    TestHandler(Server *_server, Server_DatabaseInterface *_db) : Server_ProtocolHandler(_server, _db)
+    {
+    }
+
+    QString getAddress() const override
+    {
+        return {};
+    }
+    QString getConnectionType() const override
+    {
+        return {};
+    }
+
+    Response::ResponseCode lastResponseCode = Response::RespNothing;
+    int lastExtendedSessionCommand = -1;
+
+protected:
+    Response::ResponseCode
+    processExtendedSessionCommand(int cmdType, const SessionCommand & /*cmd*/, ResponseContainer & /*rc*/) override
+    {
+        lastExtendedSessionCommand = cmdType;
+        return Response::RespOk;
+    }
+
+    void transmitProtocolItem(const ServerMessage &item) override
+    {
+        if (item.message_type() == ServerMessage::RESPONSE) {
+            lastResponseCode = item.response().response_code();
+        }
+    }
+};
+
+class ForcedPasswordChangeTest : public ::testing::Test
+{
+protected:
+    FakeServer server;
+    TestHandler handler{&server, server.getDatabaseInterface()};
+
+    void login()
+    {
+        CommandContainer cont;
+        cont.set_cmd_id(1);
+        Command_Login cmd;
+        cmd.set_user_name("mod");
+        cont.add_session_command()->MutableExtension(Command_Login::ext)->CopyFrom(cmd);
+        handler.processCommandContainer(cont);
+    }
+
+    Response::ResponseCode sendPing()
+    {
+        CommandContainer cont;
+        cont.set_cmd_id(2);
+        cont.add_session_command()->MutableExtension(Command_Ping::ext);
+        handler.processCommandContainer(cont);
+        return handler.lastResponseCode;
+    }
+
+    Response::ResponseCode sendSessionCommand()
+    {
+        CommandContainer cont;
+        cont.set_cmd_id(3);
+        cont.add_session_command()->MutableExtension(Command_ListRooms::ext);
+        handler.processCommandContainer(cont);
+        return handler.lastResponseCode;
+    }
+
+    Response::ResponseCode sendRoomCommand()
+    {
+        CommandContainer cont;
+        cont.set_cmd_id(4);
+        cont.add_room_command()->MutableExtension(Command_RoomSay::ext)->set_message("hello");
+        handler.processCommandContainer(cont);
+        return handler.lastResponseCode;
+    }
+
+    Response::ResponseCode sendMixedSessionAndRoomCommand()
+    {
+        CommandContainer cont;
+        cont.set_cmd_id(5);
+        cont.add_session_command()->MutableExtension(Command_Ping::ext);
+        cont.add_room_command()->MutableExtension(Command_RoomSay::ext)->set_message("hello");
+        handler.processCommandContainer(cont);
+        return handler.lastResponseCode;
+    }
+
+    Response::ResponseCode sendAccountPassword()
+    {
+        CommandContainer cont;
+        cont.set_cmd_id(6);
+        Command_AccountPassword cmd;
+        cmd.set_old_password("temporary-password");
+        cmd.set_new_password("replacement-password");
+        cont.add_session_command()->MutableExtension(Command_AccountPassword::ext)->CopyFrom(cmd);
+        handler.processCommandContainer(cont);
+        return handler.lastResponseCode;
+    }
+};
+
+TEST_F(ForcedPasswordChangeTest, LoginReportsTheRequiredChange)
+{
+    login();
+
+    EXPECT_EQ(Response::RespPasswordChangeRequired, handler.lastResponseCode);
+    ASSERT_NE(nullptr, handler.getUserInfo());
+    EXPECT_EQ("mod", QString::fromStdString(handler.getUserInfo()->name()));
+}
+
+TEST_F(ForcedPasswordChangeTest, PendingSessionIsNotRegisteredAsAUser)
+{
+    login();
+    // The session may change its password, but it must not take a user slot or appear in
+    // the session table before the client reconnects with the new password.
+    EXPECT_FALSE(handler.getUserInfo()->has_session_id());
+    EXPECT_EQ(0, server.getUsersCount());
+}
+
+TEST_F(ForcedPasswordChangeTest, PendingModeratorIsNotReportedOnline)
+{
+    login();
+    server.addClient(&handler);
+
+    EXPECT_TRUE(server.getOnlineModeratorList().isEmpty());
+}
+
+TEST_F(ForcedPasswordChangeTest, OnlyPingAndPasswordChangeAreServed)
+{
+    login();
+
+    EXPECT_EQ(Response::RespOk, sendPing());
+    EXPECT_EQ(Response::RespFunctionNotAllowed, sendSessionCommand());
+    EXPECT_EQ(Response::RespFunctionNotAllowed, sendRoomCommand());
+    // Dispatch prefers game/room over session, so a container carrying both must not slip past
+    // the restriction by carrying a session command.
+    EXPECT_EQ(Response::RespFunctionNotAllowed, sendMixedSessionAndRoomCommand());
+}
+
+TEST_F(ForcedPasswordChangeTest, AccountPasswordReachesTheCommand)
+{
+    login();
+    // The forced change is useless if the gate refuses the command it needs. ACCOUNT_PASSWORD is
+    // served by the extended-command hook, so it must arrive there instead of being filtered.
+    EXPECT_EQ(Response::RespOk, sendAccountPassword());
+    EXPECT_EQ(SessionCommand::ACCOUNT_PASSWORD, handler.lastExtendedSessionCommand);
+}
+
+TEST_F(ForcedPasswordChangeTest, CompletedLoginIsStillReportedOnline)
+{
+    TestHandler loggedIn{&server, server.getDatabaseInterface()};
+    ServerInfo_User user;
+    user.set_name("online-mod");
+    user.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | ServerInfo_User::IsModerator);
+    user.set_session_id(7);
+    loggedIn.setUserInfo(user);
+    server.addClient(&loggedIn);
+
+    const QList<QString> moderators = server.getOnlineModeratorList();
+    ASSERT_EQ(1, moderators.size());
+    EXPECT_EQ("online-mod", moderators.first());
+}
+
+} // namespace
diff --git a/tests/server_game_join_test.cpp b/tests/server_game_join_test.cpp
index 8a2ae8c45..93895ab5c 100644
--- a/tests/server_game_join_test.cpp
+++ b/tests/server_game_join_test.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "game/game_config.h"
+#include "game/role_info.h"
 #include "game/server_game.h"
 #include "libcockatrice/protocol/pb/response.pb.h"
 #include "server.h"
@@ -119,13 +120,13 @@ TEST_F(GameJoinOverrideTest, StaffBypassPasswordRestriction)
     game = makeGame(true, false, false, true);
 
     // A plain user cannot override the password even with the override flag set.
-    EXPECT_EQ(game->checkJoin(&plainUser, "wrong", false, true, false), Response::RespWrongPassword);
+    EXPECT_EQ(game->checkJoin(&plainUser, "wrong", {}, true), Response::RespWrongPassword);
     // Moderators and judges may enter any game regardless of the password.
-    EXPECT_EQ(game->checkJoin(&moderator, "wrong", false, true, false), Response::RespOk);
-    EXPECT_EQ(game->checkJoin(&judge, "wrong", false, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&moderator, "wrong", {}, true), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, "wrong", {}, true), Response::RespOk);
     // Without the override flag judges are still subject to the password.
-    EXPECT_EQ(game->checkJoin(&judge, "wrong", false, false, true), Response::RespWrongPassword);
-    EXPECT_EQ(game->checkJoin(&judge, "secret", false, false, true), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, "wrong", {.isJudge = true}, false), Response::RespWrongPassword);
+    EXPECT_EQ(game->checkJoin(&judge, "secret", {.isJudge = true}, false), Response::RespOk);
 }
 
 TEST_F(GameJoinOverrideTest, StaffBypassRegisteredOnlyRestriction)
@@ -133,9 +134,9 @@ TEST_F(GameJoinOverrideTest, StaffBypassRegisteredOnlyRestriction)
     game = makeGame(false, true, false, true);
 
     // Without the override flag the only-registered restriction still applies.
-    EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, false, false), Response::RespUserLevelTooLow);
+    EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), {}, false), Response::RespUserLevelTooLow);
     // An unregistered judge may enter when overriding restrictions.
-    EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), {}, true), Response::RespOk);
 }
 
 TEST_F(GameJoinOverrideTest, StaffBypassBuddiesOnlyRestriction)
@@ -143,10 +144,10 @@ TEST_F(GameJoinOverrideTest, StaffBypassBuddiesOnlyRestriction)
     game = makeGame(false, false, true, true);
 
     // A plain user who is not on the creator's buddy list gets rejected.
-    EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, false), Response::RespOnlyBuddies);
+    EXPECT_EQ(game->checkJoin(&plainUser, QString(), {}, true), Response::RespOnlyBuddies);
     // Moderators and judges bypass the buddies-only restriction.
-    EXPECT_EQ(game->checkJoin(&moderator, QString(), false, true, false), Response::RespOk);
-    EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&moderator, QString(), {}, true), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, QString(), {}, true), Response::RespOk);
 }
 
 TEST_F(GameJoinOverrideTest, StaffBypassSpectatorsNotAllowedRestriction)
@@ -154,11 +155,11 @@ TEST_F(GameJoinOverrideTest, StaffBypassSpectatorsNotAllowedRestriction)
     game = makeGame(false, false, false, false);
 
     // A plain user cannot spectate when the game disallows spectators.
-    EXPECT_EQ(game->checkJoin(&plainUser, QString(), true, false, false), Response::RespSpectatorsNotAllowed);
+    EXPECT_EQ(game->checkJoin(&plainUser, QString(), {.isSpectator = true}, false), Response::RespSpectatorsNotAllowed);
     // Moderators and judges may spectate any game regardless of the password
     // and the spectator restriction.
-    EXPECT_EQ(game->checkJoin(&moderator, "wrong", true, true, false), Response::RespOk);
-    EXPECT_EQ(game->checkJoin(&judge, "wrong", true, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&moderator, "wrong", {.isSpectator = true}, true), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, "wrong", {.isSpectator = true}, true), Response::RespOk);
 }
 
 TEST_F(GameJoinOverrideTest, JudgeOverrideDoesNotGrantJudgeJoinToPlainUser)
@@ -166,8 +167,8 @@ TEST_F(GameJoinOverrideTest, JudgeOverrideDoesNotGrantJudgeJoinToPlainUser)
     game = makeGame(false, false, false, true);
 
     // joining with join_as_judge still requires the judge flag even when overriding.
-    EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, true), Response::RespUserLevelTooLow);
-    EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, true), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&plainUser, QString(), {.isJudge = true}, true), Response::RespUserLevelTooLow);
+    EXPECT_EQ(game->checkJoin(&judge, QString(), {.isJudge = true}, true), Response::RespOk);
 }
 
 } // namespace
diff --git a/tests/server_logger_test.cpp b/tests/server_logger_test.cpp
new file mode 100644
index 000000000..3c2d047cc
--- /dev/null
+++ b/tests/server_logger_test.cpp
@@ -0,0 +1,201 @@
+#include "server_logger.h"
+
+#include "gtest/gtest.h"
+#include <QFile>
+#include <QMetaObject>
+#include <QTemporaryDir>
+#include <iostream>
+#include <sstream>
+#include <streambuf>
+
+namespace
+{
+
+/**
+ * @brief Redirects std::cout for the lifetime of the object so the logger's console
+ *        sink can be asserted on.
+ */
+class CoutCapture
+{
+public:
+    CoutCapture() : previousBuffer(std::cout.rdbuf(captured.rdbuf()))
+    {
+    }
+    ~CoutCapture()
+    {
+        std::cout.rdbuf(previousBuffer);
+    }
+
+    QString text() const
+    {
+        return QString::fromStdString(captured.str());
+    }
+
+private:
+    std::ostringstream captured;
+    std::streambuf *previousBuffer;
+};
+
+// The console sink is written by the logger thread; drive it directly here, as the event
+// loop would in the server.
+void flushLogger(ServerLogger &logger)
+{
+    QMetaObject::invokeMethod(&logger, "flushBuffer", Qt::DirectConnection);
+}
+
+// Regression: --log-to-console used to be gated behind a successfully opened logfile, so an
+// empty server/logfile silenced every diagnostic, including critical startup errors.
+TEST(ServerLoggerTest, ConsoleSinkDoesNotDependOnLogFile)
+{
+    ServerLogger logger(true, true, QString());
+    logger.startLog(QString());
+
+    CoutCapture capture;
+    logger.logMessage("could not open the database");
+    flushLogger(logger);
+
+    EXPECT_TRUE(capture.text().contains("could not open the database")) << capture.text().toStdString();
+}
+
+// writelog only describes the logfile; disabling it must not silence the console.
+TEST(ServerLoggerTest, ConsoleSinkSurvivesDisabledFileLog)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+
+    ServerLogger logger(true, false, QString());
+    logger.startLog(dir.filePath("server.log"));
+
+    CoutCapture capture;
+    logger.logMessage("startup failed");
+    flushLogger(logger);
+
+    EXPECT_TRUE(capture.text().contains("startup failed")) << capture.text().toStdString();
+}
+
+// logfilters selects what goes into the logfile; the console is not filtered.
+TEST(ServerLoggerTest, ConsoleSinkIgnoresLogFilters)
+{
+    ServerLogger logger(true, true, "database");
+    logger.startLog(QString());
+
+    CoutCapture capture;
+    logger.logMessage("unrelated message");
+    flushLogger(logger);
+
+    EXPECT_TRUE(capture.text().contains("unrelated message")) << capture.text().toStdString();
+}
+
+TEST(ServerLoggerTest, StaysQuietWhenConsoleIsDisabled)
+{
+    ServerLogger logger(false, false, QString());
+    logger.startLog(QString());
+
+    CoutCapture capture;
+    logger.logMessage("not for the console");
+    flushLogger(logger);
+
+    EXPECT_TRUE(capture.text().isEmpty()) << capture.text().toStdString();
+}
+
+TEST(ServerLoggerTest, IsLoggingEnabledMirrorsTheSinks)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+
+    // The console is a sink of its own: messages must not be discarded for want of a logfile.
+    {
+        ServerLogger logger(true, false, QString());
+        EXPECT_TRUE(logger.isLoggingEnabled());
+    }
+
+    // The logfile sink needs an open file and writelog; reloadConfig() carries the SIGHUP change.
+    {
+        ServerLogger logger(false, true, QString());
+        EXPECT_FALSE(logger.isLoggingEnabled()) << "no logfile is open yet";
+        logger.startLog(dir.filePath("enabled.log"));
+        EXPECT_TRUE(logger.isLoggingEnabled());
+        logger.reloadConfig(false, QString());
+        EXPECT_FALSE(logger.isLoggingEnabled()) << "writelog=false leaves no sink enabled";
+    }
+}
+
+TEST(ServerLoggerTest, WritesMatchingFilteredMessagesToTheLogFile)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString logPath = dir.filePath("server.log");
+
+    {
+        ServerLogger logger(false, true, "database");
+        logger.startLog(logPath);
+        logger.logMessage("database is unavailable");
+        logger.logMessage("unrelated message");
+    }
+
+    QFile logFile(logPath);
+    ASSERT_TRUE(logFile.open(QIODevice::ReadOnly));
+    const QString contents = QString::fromUtf8(logFile.readAll());
+    EXPECT_TRUE(contents.contains("database is unavailable")) << contents.toStdString();
+    EXPECT_FALSE(contents.contains("unrelated message")) << contents.toStdString();
+}
+
+// SIGHUP reloads the configuration; the logger must pick up the new filter.
+TEST(ServerLoggerTest, ReloadConfigAppliesANewFilter)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString logPath = dir.filePath("server.log");
+
+    {
+        ServerLogger logger(false, true, "database");
+        logger.startLog(logPath);
+        logger.logMessage("filtered out");
+        logger.reloadConfig(true, QString());
+        logger.logMessage("kept after reload");
+    }
+
+    QFile logFile(logPath);
+    ASSERT_TRUE(logFile.open(QIODevice::ReadOnly));
+    const QString contents = QString::fromUtf8(logFile.readAll());
+    EXPECT_FALSE(contents.contains("filtered out")) << contents.toStdString();
+    EXPECT_TRUE(contents.contains("kept after reload")) << contents.toStdString();
+}
+
+TEST(ServerLoggerTest, DisabledFileLogLeavesTheLogFileEmpty)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString logPath = dir.filePath("server.log");
+
+    {
+        ServerLogger logger(false, false, QString());
+        logger.startLog(logPath);
+        logger.logMessage("not for the logfile");
+    }
+
+    QFile logFile(logPath);
+    ASSERT_TRUE(logFile.open(QIODevice::ReadOnly));
+    EXPECT_TRUE(logFile.readAll().isEmpty());
+}
+
+// A filter list consisting only of separators activates filtering with no entries; the old
+// trimmed-empty check suppressed the logfile in that case and this preserves it.
+TEST(ServerLoggerTest, DegenerateFilterSuppressesTheLogFile)
+{
+    QTemporaryDir dir;
+    ASSERT_TRUE(dir.isValid());
+    const QString logPath = dir.filePath("server.log");
+
+    {
+        ServerLogger logger(false, true, ",");
+        logger.startLog(logPath);
+        logger.logMessage("anything");
+    }
+
+    QFile logFile(logPath);
+    ASSERT_TRUE(logFile.open(QIODevice::ReadOnly));
+    EXPECT_TRUE(logFile.readAll().isEmpty());
+}
+
+} // namespace
diff --git a/tests/settings/CMakeLists.txt b/tests/settings/CMakeLists.txt
index 98bed1f4b..9dbda9d6b 100644
--- a/tests/settings/CMakeLists.txt
+++ b/tests/settings/CMakeLists.txt
@@ -1,5 +1,7 @@
 cockatrice_add_test(NAME settings_manager_test SOURCES settings_manager_test.cpp LIBS libcockatrice_settings)
 
+cockatrice_add_test(NAME servers_settings_test SOURCES servers_settings_test.cpp LIBS libcockatrice_settings)
+
 cockatrice_add_test(
   NAME
   settings_defaults_test
diff --git a/tests/settings/servers_settings_test.cpp b/tests/settings/servers_settings_test.cpp
new file mode 100644
index 000000000..5d5953999
--- /dev/null
+++ b/tests/settings/servers_settings_test.cpp
@@ -0,0 +1,228 @@
+#include "gtest/gtest.h"
+#include <QSettings>
+#include <QString>
+#include <QTemporaryDir>
+#include <libcockatrice/settings/servers_settings.h>
+
+namespace
+{
+class ServersSettingsTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir tempDir;
+    QString settingsPath;
+
+    void SetUp() override
+    {
+        settingsPath = tempDir.path() + "/";
+    }
+
+    QString settingsFile() const
+    {
+        return settingsPath + "servers.ini";
+    }
+
+    void writeLegacyServer(int index,
+                           const QString &saveName,
+                           const QString &host,
+                           const QString &port,
+                           const QString &username,
+                           const QString &password,
+                           bool savePassword,
+                           const QString &site)
+    {
+        QSettings settings(settingsFile(), QSettings::IniFormat);
+        const QString prefix = QStringLiteral("server/server_details/");
+        settings.setValue(prefix + QStringLiteral("saveName%1").arg(index), saveName);
+        settings.setValue(prefix + QStringLiteral("server%1").arg(index), host);
+        settings.setValue(prefix + QStringLiteral("port%1").arg(index), port);
+        settings.setValue(prefix + QStringLiteral("username%1").arg(index), username);
+        settings.setValue(prefix + QStringLiteral("password%1").arg(index), password);
+        settings.setValue(prefix + QStringLiteral("savePassword%1").arg(index), savePassword);
+        settings.setValue(prefix + QStringLiteral("site%1").arg(index), site);
+    }
+};
+
+TEST_F(ServersSettingsTest, AddServerStoresAllFields)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, "https://alpha.example");
+
+    const auto servers = settings.getServers();
+    ASSERT_EQ(servers.size(), 1);
+    EXPECT_EQ(servers.first().saveName, QString("Alpha"));
+    EXPECT_EQ(servers.first().host, QString("alpha.example"));
+    EXPECT_EQ(servers.first().port, QString("4748"));
+    EXPECT_EQ(servers.first().username, QString("alice"));
+    EXPECT_EQ(servers.first().password, QString("secret"));
+    EXPECT_TRUE(servers.first().savePassword);
+    EXPECT_EQ(servers.first().site, QString("https://alpha.example"));
+}
+
+TEST_F(ServersSettingsTest, AddExistingHostAndPortUpdatesInsteadOfDuplicating)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, "site-a");
+    settings.addNewServer("Renamed", "alpha.example", "4748", "bob", "new-secret", true, "site-b");
+
+    const auto servers = settings.getServers();
+    ASSERT_EQ(servers.size(), 1);
+    EXPECT_EQ(servers.first().saveName, QString("Renamed"));
+    EXPECT_EQ(servers.first().username, QString("bob"));
+    EXPECT_EQ(servers.first().password, QString("new-secret"));
+    EXPECT_EQ(servers.first().site, QString("site-b"));
+}
+
+TEST_F(ServersSettingsTest, RemoveServerRemovesOnlyMatchingHostAndKeepsOrder)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "a", true, "");
+    settings.addNewServer("Beta", "beta.example", "4748", "bob", "b", true, "");
+    settings.addNewServer("Gamma", "gamma.example", "4748", "carol", "c", true, "");
+
+    settings.removeServer("beta.example");
+
+    const auto servers = settings.getServers();
+    ASSERT_EQ(servers.size(), 2);
+    EXPECT_EQ(servers.at(0).saveName, QString("Alpha"));
+    EXPECT_EQ(servers.at(1).saveName, QString("Gamma"));
+}
+
+TEST_F(ServersSettingsTest, RemovingLastServerDropsItsStaleArraySlot)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "a", true, "");
+    settings.addNewServer("Beta", "beta.example", "4748", "bob", "b", true, "");
+    settings.addNewServer("Gamma", "gamma.example", "4748", "carol", "gamma-secret", true, "");
+
+    settings.removeServer("gamma.example");
+
+    QSettings raw(settingsFile(), QSettings::IniFormat);
+    EXPECT_FALSE(raw.contains("server/server_details/servers/3/password"));
+    EXPECT_FALSE(raw.contains("server/server_details/servers/3/saveName"));
+    ASSERT_EQ(settings.getServers().size(), 2);
+}
+
+TEST_F(ServersSettingsTest, UpdateWithoutLossKeepsCredentials)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, "");
+
+    EXPECT_TRUE(settings.updateExistingServerWithoutLoss("Renamed", "alpha.example", "1234", "site"));
+
+    const auto server = settings.getServer(settings.findServerIndex("alpha.example", "1234"));
+    ASSERT_TRUE(server.has_value());
+    EXPECT_EQ(server->saveName, QString("Renamed"));
+    EXPECT_EQ(server->username, QString("alice"));
+    EXPECT_EQ(server->password, QString("secret"));
+    EXPECT_TRUE(server->savePassword);
+    EXPECT_EQ(server->site, QString("site"));
+}
+
+TEST_F(ServersSettingsTest, SetServerPasswordUpdatesOnlyTheNamedProfile)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "old", true, "");
+    settings.addNewServer("Beta", "beta.example", "4748", "bob", "keep", true, "");
+
+    settings.setServerPassword("Beta", "new");
+
+    EXPECT_EQ(settings.getServer(0)->password, QString("old"));
+    EXPECT_EQ(settings.getServer(1)->password, QString("new"));
+}
+
+TEST_F(ServersSettingsTest, LegacyProfilesAreMigrated)
+{
+    {
+        QSettings settings(settingsFile(), QSettings::IniFormat);
+        settings.setValue("server/server_details/totalServers", 2);
+    }
+    writeLegacyServer(1, "Alpha", "alpha.example", "4748", "alice", "secret", true, "site-a");
+    writeLegacyServer(2, "Beta", "beta.example", "4748", "bob", "other", false, "site-b");
+
+    ServersSettings settings(settingsPath, nullptr);
+
+    const auto servers = settings.getServers();
+    ASSERT_EQ(servers.size(), 2);
+    EXPECT_EQ(servers.at(0).saveName, QString("Alpha"));
+    EXPECT_EQ(servers.at(0).host, QString("alpha.example"));
+    EXPECT_TRUE(servers.at(0).savePassword);
+    EXPECT_EQ(servers.at(1).saveName, QString("Beta"));
+    EXPECT_FALSE(servers.at(1).savePassword);
+
+    QSettings raw(settingsFile(), QSettings::IniFormat);
+    EXPECT_FALSE(raw.contains("server/server_details/totalServers"));
+    EXPECT_FALSE(raw.contains("server/server_details/saveName1"));
+    EXPECT_FALSE(raw.contains("server/server_details/server1"));
+}
+
+TEST_F(ServersSettingsTest, MigrationRunsOnce)
+{
+    writeLegacyServer(1, "Alpha", "alpha.example", "4748", "alice", "secret", true, "");
+    {
+        QSettings settings(settingsFile(), QSettings::IniFormat);
+        settings.setValue("server/server_details/totalServers", 1);
+    }
+
+    {
+        ServersSettings first(settingsPath, nullptr);
+        ASSERT_EQ(first.getServers().size(), 1);
+    }
+
+    ServersSettings second(settingsPath, nullptr);
+    ASSERT_EQ(second.getServers().size(), 1);
+}
+
+TEST_F(ServersSettingsTest, LegacyProfileAddedAfterMigrationIsMerged)
+{
+    {
+        ServersSettings first(settingsPath, nullptr);
+        first.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, "");
+    }
+
+    // An older build writes its own profile back in the legacy format after the
+    // array migration already happened.
+    writeLegacyServer(1, "Beta", "beta.example", "4748", "bob", "other", true, "site-b");
+    // A duplicate of a profile the array already holds must not be added twice.
+    writeLegacyServer(2, "Alpha duplicate", "alpha.example", "4748", "eve", "dupe", true, "");
+    {
+        QSettings settings(settingsFile(), QSettings::IniFormat);
+        settings.setValue("server/server_details/totalServers", 2);
+    }
+
+    ServersSettings settings(settingsPath, nullptr);
+
+    const auto servers = settings.getServers();
+    ASSERT_EQ(servers.size(), 2);
+    EXPECT_EQ(servers.at(0).saveName, QString("Alpha"));
+    EXPECT_EQ(servers.at(0).password, QString("secret"));
+    EXPECT_EQ(servers.at(1).saveName, QString("Beta"));
+    EXPECT_EQ(servers.at(1).host, QString("beta.example"));
+    EXPECT_EQ(servers.at(1).username, QString("bob"));
+    EXPECT_EQ(servers.at(1).password, QString("other"));
+    EXPECT_TRUE(servers.at(1).savePassword);
+    EXPECT_EQ(servers.at(1).site, QString("site-b"));
+
+    QSettings raw(settingsFile(), QSettings::IniFormat);
+    EXPECT_FALSE(raw.contains("server/server_details/totalServers"));
+    EXPECT_FALSE(raw.contains("server/server_details/saveName1"));
+    EXPECT_FALSE(raw.contains("server/server_details/server2"));
+
+    // The merge is persisted, so a further start adds nothing.
+    ServersSettings again(settingsPath, nullptr);
+    ASSERT_EQ(again.getServers().size(), 2);
+}
+
+TEST_F(ServersSettingsTest, OutOfRangeIndexReturnsNullopt)
+{
+    ServersSettings settings(settingsPath, nullptr);
+    EXPECT_FALSE(settings.getServer(-1).has_value());
+    EXPECT_FALSE(settings.getServer(0).has_value());
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/spoiler_file_test.cpp b/tests/spoiler_file_test.cpp
new file mode 100644
index 000000000..ecdc3285f
--- /dev/null
+++ b/tests/spoiler_file_test.cpp
@@ -0,0 +1,135 @@
+#include "client/network/update/card_spoiler/spoiler_file.h"
+#include "support/scoped_file_size_limit.h"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTemporaryDir>
+#include <gtest/gtest.h>
+
+namespace
+{
+class SpoilerFileTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir directory;
+    QString path;
+    QString error;
+    const QByteArray original = "<cockatrice_carddatabase version=\"4\"><cards/></cockatrice_carddatabase>";
+
+    void SetUp() override
+    {
+        ASSERT_TRUE(directory.isValid());
+        path = directory.filePath("spoiler.xml");
+        QFile file(path);
+        ASSERT_TRUE(file.open(QIODevice::WriteOnly));
+        ASSERT_EQ(file.write(original), original.size());
+    }
+
+    QByteArray read()
+    {
+        QFile file(path);
+        EXPECT_TRUE(file.open(QIODevice::ReadOnly));
+        return file.readAll();
+    }
+
+    SpoilerFile::SaveResult save(const QByteArray &data)
+    {
+        return SpoilerFile::save(path, data, [] { return true; }, error);
+    }
+};
+
+TEST_F(SpoilerFileTest, InvalidDocumentsPreserveExistingFile)
+{
+    for (const QByteArray &invalid :
+         {QByteArray(), QByteArray("<html><cards/></html>"),
+          QByteArray("<cockatrice_carddatabase version=\"2\"><cards/></cockatrice_carddatabase>"),
+          QByteArray("<cockatrice_carddatabase><cards/></cockatrice_carddatabase>"),
+          QByteArray("<cockatrice_carddatabase version=\"4\"><sets/></cockatrice_carddatabase>"),
+          QByteArray("<cockatrice_carddatabase version=\"4\"><cards>"),
+          QByteArray("<cockatrice_carddatabase version=\"4\"><cards/></cockatrice_carddatabase><extra/>")}) {
+        EXPECT_EQ(save(invalid), SpoilerFile::SaveResult::Failed);
+        EXPECT_FALSE(error.isEmpty());
+        EXPECT_EQ(read(), original);
+    }
+}
+
+TEST_F(SpoilerFileTest, SupportedVersionsAreAccepted)
+{
+    EXPECT_TRUE(SpoilerFile::validate(original).isEmpty());
+    EXPECT_TRUE(
+        SpoilerFile::validate("<cockatrice_carddatabase version=\"3\"><cards/></cockatrice_carddatabase>").isEmpty());
+}
+
+TEST_F(SpoilerFileTest, IdenticalFileIsUnchanged)
+{
+    EXPECT_EQ(save(original), SpoilerFile::SaveResult::Unchanged);
+    EXPECT_TRUE(error.isEmpty());
+    EXPECT_EQ(read(), original);
+}
+
+TEST_F(SpoilerFileTest, CompleteFileHashDetectsChangesAfterLargeCommonPrefix)
+{
+    QByteArray changed = "<cockatrice_carddatabase version=\"4\"><!--";
+    changed += QByteArray(100000, 'x');
+    changed += "--><cards/></cockatrice_carddatabase>";
+    ASSERT_EQ(save(changed), SpoilerFile::SaveResult::Written);
+    changed.replace("<cards/>", "<cards></cards>");
+    EXPECT_EQ(save(changed), SpoilerFile::SaveResult::Written);
+    EXPECT_EQ(read(), changed);
+    EXPECT_TRUE(error.isEmpty());
+}
+
+TEST_F(SpoilerFileTest, CancellationBeforeWritePreservesExistingFile)
+{
+    EXPECT_EQ(SpoilerFile::save(path, original, [] { return false; }, error), SpoilerFile::SaveResult::Failed);
+    EXPECT_FALSE(error.isEmpty());
+    EXPECT_EQ(read(), original);
+}
+
+TEST_F(SpoilerFileTest, CancellationBeforeCommitPreservesExistingFile)
+{
+    int checks = 0;
+    EXPECT_EQ(SpoilerFile::save(
+                  path, original + "\n", [&checks] { return ++checks == 1; }, error),
+              SpoilerFile::SaveResult::Failed);
+    EXPECT_EQ(checks, 2);
+    EXPECT_FALSE(error.isEmpty());
+    EXPECT_EQ(read(), original);
+    EXPECT_EQ(QDir(directory.path()).entryList(QDir::Files), QStringList{"spoiler.xml"});
+}
+
+TEST_F(SpoilerFileTest, MissingParentIsCreated)
+{
+    path = directory.filePath("nested/spoiler.xml");
+    EXPECT_EQ(save(original), SpoilerFile::SaveResult::Written);
+    EXPECT_EQ(read(), original);
+}
+
+TEST_F(SpoilerFileTest, FileInParentPathReportsFailureWithoutModifyingIt)
+{
+    EXPECT_EQ(SpoilerFile::save(
+                  QDir(path).filePath("spoiler.xml"), original, [] { return true; }, error),
+              SpoilerFile::SaveResult::Failed);
+    EXPECT_FALSE(error.isEmpty());
+    EXPECT_EQ(read(), original);
+}
+
+#ifdef Q_OS_UNIX
+TEST_F(SpoilerFileTest, ShortWriteLeavesExistingFileIntact)
+{
+    const QByteArray changed = "<cockatrice_carddatabase version=\"4\"><!--" + QByteArray(100000, 'x') +
+                               "--><cards/></cockatrice_carddatabase>";
+    // A real short write exercises QSaveFile's buffered flush failure without depending
+    // on disk capacity. The cap is scoped rather than forked, because a death-test child
+    // under RLIMIT_FSIZE is killed by SIGSEGV on macOS.
+    test_support::ScopedFileSizeLimit fileSizeCap(128);
+    ASSERT_TRUE(fileSizeCap.isValid());
+
+    EXPECT_EQ(save(changed), SpoilerFile::SaveResult::Failed);
+    EXPECT_FALSE(error.isEmpty());
+    EXPECT_EQ(read(), original);
+    EXPECT_EQ(QDir(directory.path()).entryList(QDir::Files), QStringList{"spoiler.xml"});
+}
+#endif
+} // namespace
diff --git a/tests/support/model_contract_checker.h b/tests/support/model_contract_checker.h
new file mode 100644
index 000000000..9b493ff6e
--- /dev/null
+++ b/tests/support/model_contract_checker.h
@@ -0,0 +1,35 @@
+#ifndef COCKATRICE_TEST_MODEL_CONTRACT_CHECKER_H
+#define COCKATRICE_TEST_MODEL_CONTRACT_CHECKER_H
+
+#include <QAbstractItemModel>
+#include <QAbstractItemModelTester>
+#include <memory>
+
+namespace test_support
+{
+/**
+ * @brief Keeps a QAbstractItemModelTester alive for the lifetime of a scope.
+ *
+ * The tester only observes the model while it exists, so construct this before
+ * the mutations a test wants to validate and keep it in scope until the end.
+ * Fatal reporting mode aborts on the first contract violation; a warning would
+ * let the test pass while printing a line nobody reads in CI.
+ */
+class ModelContractChecker
+{
+public:
+    explicit ModelContractChecker(QAbstractItemModel *model)
+        : tester(
+              std::make_unique<QAbstractItemModelTester>(model, QAbstractItemModelTester::FailureReportingMode::Fatal))
+    {
+    }
+
+    ModelContractChecker(const ModelContractChecker &) = delete;
+    ModelContractChecker &operator=(const ModelContractChecker &) = delete;
+
+private:
+    std::unique_ptr<QAbstractItemModelTester> tester;
+};
+} // namespace test_support
+
+#endif // COCKATRICE_TEST_MODEL_CONTRACT_CHECKER_H
diff --git a/tests/support/scoped_file_size_limit.h b/tests/support/scoped_file_size_limit.h
new file mode 100644
index 000000000..1c1f3d939
--- /dev/null
+++ b/tests/support/scoped_file_size_limit.h
@@ -0,0 +1,83 @@
+#ifndef COCKATRICE_TEST_SCOPED_FILE_SIZE_LIMIT_H
+#define COCKATRICE_TEST_SCOPED_FILE_SIZE_LIMIT_H
+
+#include <QtGlobal>
+
+#ifdef Q_OS_UNIX
+
+#include <algorithm>
+#include <csignal>
+#include <sys/resource.h>
+
+namespace test_support
+{
+/**
+ * @brief Caps how large a single file may grow, so a writer's short-write path is reachable.
+ *
+ * Lowering RLIMIT_FSIZE makes the next write past the cap fail with EFBIG instead of
+ * filling a filesystem, which is the only way to fail an install step mid-write without
+ * depending on free disk space or file ownership. Only the soft limit is lowered, so the
+ * destructor can hand the process back exactly as it found it: ctest runs one case per
+ * process, but a whole test binary must not carry the cap into its neighbours.
+ *
+ * Do not use this inside a gtest death test. A forked child under RLIMIT_FSIZE is killed
+ * by SIGSEGV on the macOS runners, while the same case passes on Linux, so the fork is
+ * what breaks - not the writer. The guard alone isolates the failure just as well.
+ */
+class ScopedFileSizeLimit
+{
+public:
+    explicit ScopedFileSizeLimit(rlim_t maxBytes)
+    {
+        if (getrlimit(RLIMIT_FSIZE, &previousLimit) != 0) {
+            return;
+        }
+
+        struct sigaction ignore = {};
+        ignore.sa_handler = SIG_IGN;
+        sigemptyset(&ignore.sa_mask);
+        if (sigaction(SIGXFSZ, &ignore, &previousAction) != 0) {
+            return;
+        }
+        actionSaved = true;
+
+        struct rlimit capped = previousLimit;
+        capped.rlim_cur = std::min(maxBytes, previousLimit.rlim_max);
+        if (setrlimit(RLIMIT_FSIZE, &capped) != 0) {
+            return;
+        }
+        active = true;
+    }
+
+    ~ScopedFileSizeLimit()
+    {
+        if (active) {
+            setrlimit(RLIMIT_FSIZE, &previousLimit);
+        }
+        if (actionSaved) {
+            sigaction(SIGXFSZ, &previousAction, nullptr);
+        }
+    }
+
+    ScopedFileSizeLimit(const ScopedFileSizeLimit &) = delete;
+    ScopedFileSizeLimit &operator=(const ScopedFileSizeLimit &) = delete;
+
+    /**
+     * @brief Whether the cap is in force; a test that needs the failure must assert this.
+     */
+    [[nodiscard]] bool isValid() const
+    {
+        return active;
+    }
+
+private:
+    bool active = false;
+    bool actionSaved = false;
+    struct rlimit previousLimit = {};
+    struct sigaction previousAction = {};
+};
+} // namespace test_support
+
+#endif // Q_OS_UNIX
+
+#endif // COCKATRICE_TEST_SCOPED_FILE_SIZE_LIMIT_H
diff --git a/tests/svg_recolor_test.cpp b/tests/svg_recolor_test.cpp
new file mode 100644
index 000000000..abe1e8d1a
--- /dev/null
+++ b/tests/svg_recolor_test.cpp
@@ -0,0 +1,66 @@
+#include "libcockatrice/utility/svg_recolor.h"
+
+#include <QByteArray>
+#include <gtest/gtest.h>
+
+namespace
+{
+
+TEST(SvgRecolor, ReplacesEverySentinel)
+{
+    const QByteArray svg = R"(<svg><path fill="currentColor"/><path stroke="currentColor"/></svg>)";
+    const QByteArray result = resolveSvgColorSentinel(svg, "#ff8800");
+
+    EXPECT_EQ(result.count("#ff8800"), 2);
+    EXPECT_FALSE(result.contains("currentColor"));
+}
+
+TEST(SvgRecolor, ReplacesSentinelRegardlessOfCase)
+{
+    const QByteArray svg = R"(<svg><path fill="CurrentColor"/><path stroke="CURRENTCOLOR"/></svg>)";
+
+    EXPECT_EQ(resolveSvgColorSentinel(svg, "#ff8800").count("#ff8800"), 2);
+}
+
+TEST(SvgRecolor, LeavesTheRestOfTheDocumentIntact)
+{
+    const QByteArray svg =
+        R"(<svg viewBox="0 0 24 24"><!-- an ordinary comment --><path d="M0 0h24v24" fill="currentColor"/></svg>)";
+    const QByteArray result = resolveSvgColorSentinel(svg, "#123456");
+
+    EXPECT_TRUE(result.contains(R"(viewBox="0 0 24 24")"));
+    EXPECT_TRUE(result.contains(R"(d="M0 0h24v24")"));
+    EXPECT_TRUE(result.contains("an ordinary comment"));
+}
+
+TEST(SvgRecolor, DoesNotModifyTheInput)
+{
+    const QByteArray svg = R"(<svg><path fill="currentColor"/></svg>)";
+    const QByteArray original = svg;
+
+    resolveSvgColorSentinel(svg, "#000000");
+
+    EXPECT_EQ(svg, original);
+}
+
+TEST(SvgRecolor, PreservesBytesThatAreNotValidUtf8)
+{
+    QByteArray svg = "<svg>";
+    svg.append("\xff\xfe");
+    svg.append(R"(<path fill="currentColor"/></svg>)");
+
+    const QByteArray result = resolveSvgColorSentinel(svg, "#ff8800");
+
+    EXPECT_TRUE(result.contains("\xff\xfe"));
+    EXPECT_FALSE(result.contains("currentColor"));
+    EXPECT_EQ(result.count("#ff8800"), 1);
+}
+
+TEST(SvgRecolor, NoSentinelIsANoOp)
+{
+    const QByteArray svg = R"(<svg><path fill="#abcdef"/></svg>)";
+
+    EXPECT_EQ(resolveSvgColorSentinel(svg, "#ffffff"), svg);
+}
+
+} // namespace
diff --git a/tests/theme_migration/CMakeLists.txt b/tests/theme_migration/CMakeLists.txt
index 93493ee5f..818c1bb16 100644
--- a/tests/theme_migration/CMakeLists.txt
+++ b/tests/theme_migration/CMakeLists.txt
@@ -5,12 +5,14 @@ cockatrice_add_test(
   ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_manager.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_config.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/pixel_map_generator.cpp
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_icon.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp
   ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp
   ${VERSION_STRING_CPP}
   theme_migration_test.cpp
+  theme_icon_render_test.cpp
   LIBS
   libcockatrice_settings
   libcockatrice_network
@@ -18,4 +20,6 @@ cockatrice_add_test(
   libcockatrice_protocol
   INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/cockatrice/src
+  DEFINITIONS
+  COCKATRICE_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
 )
diff --git a/tests/theme_migration/theme_icon_render_test.cpp b/tests/theme_migration/theme_icon_render_test.cpp
new file mode 100644
index 000000000..f12db5b16
--- /dev/null
+++ b/tests/theme_migration/theme_icon_render_test.cpp
@@ -0,0 +1,189 @@
+#include "interface/theme_icon.h"
+#include "interface/theme_manager.h"
+
+#include <QApplication>
+#include <QColor>
+#include <QDir>
+#include <QFile>
+#include <QGuiApplication>
+#include <QImage>
+#include <QPalette>
+#include <QPixmap>
+#include <QSize>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QTemporaryDir>
+#include <gtest/gtest.h>
+
+namespace
+{
+/**
+ * @brief Creates the GUI application QPixmap needs, using the offscreen plugin.
+ *
+ * The theme-migration binary is headless; creating this lazily keeps its other
+ * tests free of a display dependency.
+ */
+void ensureGuiApplication()
+{
+    static int argc = 1;
+    static char name[] = "theme_icon_test";
+    static char *argv[] = {name, nullptr};
+    // Leaked on purpose: a function-local static QApplication is destroyed before Qt's
+    // own library statics at exit, and the network module's destructors then run
+    // against a torn-down QObject layer (SEGV under AddressSanitizer).
+    static QApplication *app = new QApplication(argc, argv);
+    Q_UNUSED(app);
+}
+
+QString resourcesDir()
+{
+    return QDir(QStringLiteral(COCKATRICE_SOURCE_DIR)).absoluteFilePath(QStringLiteral("cockatrice/resources"));
+}
+
+int countOpaquePixels(const QPixmap &pixmap, const QColor &expected)
+{
+    const QImage image = pixmap.toImage();
+    int count = 0;
+    for (int y = 0; y < image.height(); ++y) {
+        for (int x = 0; x < image.width(); ++x) {
+            const QColor pixel = image.pixelColor(x, y);
+            if (pixel.alpha() > 200 && pixel.red() == expected.red() && pixel.green() == expected.green() &&
+                pixel.blue() == expected.blue()) {
+                ++count;
+            }
+        }
+    }
+    return count;
+}
+
+QByteArray svgWith(const QByteArray &colorToken)
+{
+    return QByteArrayLiteral(R"(<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill=")") +
+           colorToken + QByteArrayLiteral(R"(" d="M2 2h20v20H2z"/></svg>)");
+}
+
+/**
+ * @brief Restores the global theme search paths and palette after each test.
+ *
+ * The icon engine reads both process-wide values, so a failing assertion must
+ * not leak a temporary theme directory or palette into the next test.
+ */
+class ThemeIconRenderTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        qputenv("QT_QPA_PLATFORM", "offscreen");
+        ensureGuiApplication();
+        savedSearchPaths = QDir::searchPaths(QStringLiteral("theme"));
+        savedPalette = qApp->palette();
+        themeManager = new ThemeManager;
+        QDir::setSearchPaths(QStringLiteral("theme"), {resourcesDir()});
+    }
+
+    void TearDown() override
+    {
+        delete themeManager;
+        themeManager = nullptr;
+        QDir::setSearchPaths(QStringLiteral("theme"), savedSearchPaths);
+        qApp->setPalette(savedPalette);
+    }
+
+    QStringList savedSearchPaths; ///< Search paths captured before the test.
+    QPalette savedPalette;        ///< Application palette captured before the test.
+};
+
+/** @brief A non-square request must letterbox, not squash, a 24×24 glyph. */
+TEST_F(ThemeIconRenderTest, NonSquareRequestPreservesAspectRatio)
+{
+    const QIcon icon = loadThemedIcon(QStringLiteral("icons/player"));
+    ASSERT_FALSE(icon.isNull());
+
+    EXPECT_EQ(icon.actualSize(QSize(20, 15)), QSize(15, 15));
+
+    const QPixmap pixmap = icon.pixmap(QSize(20, 15));
+    ASSERT_FALSE(pixmap.isNull());
+    EXPECT_EQ(pixmap.deviceIndependentSize(), QSizeF(15, 15));
+}
+
+/** @brief The engine must follow palette flips, icon modes, and DPR. */
+TEST_F(ThemeIconRenderTest, ThemedIconFollowsPaletteModeAndDpr)
+{
+    QPalette palette = qApp->palette();
+    palette.setColor(QPalette::WindowText, QColor(QStringLiteral("#123456")));
+    qApp->setPalette(palette);
+
+    const QIcon icon = loadThemedIcon(QStringLiteral("icons/search"));
+    ASSERT_FALSE(icon.isNull());
+
+    const QPixmap normal = icon.pixmap(QSize(24, 24), 1.0);
+    ASSERT_FALSE(normal.isNull());
+    EXPECT_EQ(normal.size(), QSize(24, 24));
+    EXPECT_DOUBLE_EQ(normal.devicePixelRatio(), 1.0);
+    EXPECT_GT(countOpaquePixels(normal, QColor(QStringLiteral("#123456"))), 0);
+
+    const QPixmap hidpi = icon.pixmap(QSize(24, 24), 2.0);
+    ASSERT_FALSE(hidpi.isNull());
+    EXPECT_DOUBLE_EQ(hidpi.devicePixelRatio(), 2.0);
+    EXPECT_EQ(hidpi.deviceIndependentSize(), QSizeF(24, 24));
+
+    palette.setColor(QPalette::WindowText, QColor(QStringLiteral("#abcdef")));
+    qApp->setPalette(palette);
+    const QPixmap flipped = icon.pixmap(QSize(24, 24), 1.0);
+    EXPECT_GT(countOpaquePixels(flipped, QColor(QStringLiteral("#abcdef"))), 0);
+
+    QPalette selectedPalette = qApp->palette();
+    selectedPalette.setColor(QPalette::HighlightedText, QColor(QStringLiteral("#00ff00")));
+    qApp->setPalette(selectedPalette);
+    const QPixmap selected = icon.pixmap(QSize(24, 24), 1.0, QIcon::Selected, QIcon::Off);
+    EXPECT_GT(countOpaquePixels(selected, QColor(QStringLiteral("#00ff00"))), 0);
+}
+} // namespace
+
+TEST_F(ThemeIconRenderTest, SentinelUsesPaletteColor)
+{
+    QPalette palette;
+    palette.setColor(QPalette::WindowText, QColor(Qt::white));
+    qApp->setPalette(palette);
+
+    const QPixmap pixmap = loadSentinelSvgPixmap(QStringLiteral("icons/search.svg"));
+
+    ASSERT_FALSE(pixmap.isNull());
+    EXPECT_EQ(pixmap.size(), QSize(24, 24));
+    EXPECT_GT(countOpaquePixels(pixmap, Qt::white), 0);
+}
+
+TEST_F(ThemeIconRenderTest, NonSentinelSvgReturnsNull)
+{
+    QTemporaryDir themeDir;
+    ASSERT_TRUE(themeDir.isValid());
+    QFile file(QDir(themeDir.path()).absoluteFilePath(QStringLiteral("plain.svg")));
+    ASSERT_TRUE(file.open(QIODevice::WriteOnly));
+    file.write(svgWith("#000000"));
+    file.close();
+    QDir::addSearchPath(QStringLiteral("theme"), themeDir.path());
+
+    EXPECT_TRUE(loadSentinelSvgPixmap(QStringLiteral("plain.svg")).isNull());
+    EXPECT_TRUE(loadSentinelSvgPixmap(QStringLiteral("icons/search.png")).isNull());
+}
+
+TEST_F(ThemeIconRenderTest, LowercaseSentinelIsResolved)
+{
+    QTemporaryDir themeDir;
+    ASSERT_TRUE(themeDir.isValid());
+    QFile file(QDir(themeDir.path()).absoluteFilePath(QStringLiteral("lower.svg")));
+    ASSERT_TRUE(file.open(QIODevice::WriteOnly));
+    file.write(svgWith("currentcolor"));
+    file.close();
+
+    QDir::addSearchPath(QStringLiteral("theme"), themeDir.path());
+
+    QPalette palette;
+    palette.setColor(QPalette::WindowText, QColor(QStringLiteral("#123456")));
+    qApp->setPalette(palette);
+
+    const QPixmap pixmap = loadSentinelSvgPixmap(QStringLiteral("lower.svg"));
+
+    ASSERT_FALSE(pixmap.isNull());
+    EXPECT_GT(countOpaquePixels(pixmap, QColor(QStringLiteral("#123456"))), 0);
+}
diff --git a/tests/translation_loader_test.cpp b/tests/translation_loader_test.cpp
index 745cd04bc..7a59e1b9b 100644
--- a/tests/translation_loader_test.cpp
+++ b/tests/translation_loader_test.cpp
@@ -2,6 +2,7 @@
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QDir>
+#include <QFileInfo>
 #include <QLibraryInfo>
 #include <QList>
 #include <QSet>
@@ -19,6 +20,11 @@
 #define TRANSLATION_LOADER_TEST_DIR ""
 #endif
 
+// The client's translation files, whose language codes are the languages the language selector offers.
+#ifndef COCKATRICE_TRANSLATIONS_DIR
+#define COCKATRICE_TRANSLATIONS_DIR ""
+#endif
+
 namespace
 {
 const QString testContext = QStringLiteral("TranslationLoaderTest");
@@ -233,6 +239,49 @@ TEST(TranslationLoaderTest, AvailableLanguagesListsTheTranslationsThatCanBeLoade
     EXPECT_TRUE(TranslationLoader::availableLanguages(QStringLiteral("translation_loader_test"), {}).isEmpty());
 }
 
+TEST(TranslationLoaderTest, LanguageDisplayNamesDoNotNeedATranslationFile)
+{
+    // The regression this guards: the selector took every label from the language's own .qm file, so it
+    // went blank as soon as translators had not translated the "English" placeholder in the i18n context.
+    EXPECT_EQ(QStringLiteral("Deutsch (German)"), TranslationLoader::languageDisplayName(QStringLiteral("de")));
+    EXPECT_EQ(QStringLiteral("简体中文 (Chinese Simplified)"),
+              TranslationLoader::languageDisplayName(QStringLiteral("zh-Hans")));
+    EXPECT_EQ(QStringLiteral("English, arr! (Pirate English)"),
+              TranslationLoader::languageDisplayName(QStringLiteral("en@pirate")));
+}
+
+TEST(TranslationLoaderTest, EveryLanguageTheClientShipsHasItsOwnDisplayName)
+{
+    // The shipped translation files are what the selector offers, so each of them has to end up with a
+    // label: an empty one is what made the dropdown look broken, and two equal ones are a coin flip.
+    const QDir translations(QStringLiteral(COCKATRICE_TRANSLATIONS_DIR));
+    const QStringList files = translations.entryList({QStringLiteral("cockatrice_*.ts")}, QDir::Files);
+    ASSERT_FALSE(files.isEmpty());
+
+    QStringList languages;
+    QSet<QString> displayNames;
+    for (const QString &file : files) {
+        const QString language = QFileInfo(file).completeBaseName().section(QLatin1Char('_'), 1);
+        const QString displayName = TranslationLoader::languageDisplayName(language);
+        EXPECT_FALSE(displayName.isEmpty()) << language.toStdString();
+        languages << language;
+        displayNames.insert(displayName);
+    }
+
+    EXPECT_EQ(files.size(), displayNames.size());
+
+    // The selector preselects this one for an unset setting, so it has to be offered at all.
+    EXPECT_TRUE(languages.contains(TranslationLoader::defaultLanguageCode()));
+}
+
+TEST(TranslationLoaderTest, UnknownLanguagesFallBackToTheNativeNameThenTheCode)
+{
+    // A language added after the table, and a code Qt does not know either.
+    EXPECT_FALSE(TranslationLoader::languageDisplayName(QStringLiteral("sv_FI")).isEmpty());
+    EXPECT_EQ(QStringLiteral("zz_QQ"), TranslationLoader::languageDisplayName(QStringLiteral("zz_QQ")));
+    EXPECT_TRUE(TranslationLoader::languageDisplayName(QString()).isEmpty());
+}
+
 TEST(TranslationLoaderTest, LoadApplicationReportsAMissingTranslationDirectory)
 {
     QTemporaryDir emptyDir;
diff --git a/tests/user_games_model_test.cpp b/tests/user_games_model_test.cpp
new file mode 100644
index 000000000..33c29d6d4
--- /dev/null
+++ b/tests/user_games_model_test.cpp
@@ -0,0 +1,248 @@
+#include "interface/widgets/server/user/user_games_model.h"
+
+#include <QAbstractItemModelTester>
+#include <QCoreApplication>
+#include <QPersistentModelIndex>
+#include <QSignalSpy>
+#include <gtest/gtest.h>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/response.pb.h>
+#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
+#include <libcockatrice/protocol/pb/server_message.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/rng/rng_abstract.h>
+#include <memory>
+
+RNG_Abstract *rng = nullptr; // required by the transitive server library; this suite sends no game commands
+
+namespace
+{
+class GamesClient : public AbstractClient
+{
+public:
+    QList<CommandContainer> sent;
+
+    GamesClient()
+    {
+        setStatus(StatusLoggedIn);
+    }
+
+    ~GamesClient() override
+    {
+        qDeleteAll(pendingCommands);
+        pendingCommands.clear();
+    }
+
+    void changeStatus(ClientStatus status)
+    {
+        setStatus(status);
+    }
+
+    void answer(int request, Response response)
+    {
+        response.set_cmd_id(sent.at(request).cmd_id());
+        ServerMessage message;
+        message.set_message_type(ServerMessage::RESPONSE);
+        *message.mutable_response() = response;
+        processProtocolItem(message);
+    }
+
+protected:
+    void sendCommandContainer(const CommandContainer &command) override
+    {
+        sent.append(command);
+    }
+};
+
+Response gamesResponse(std::initializer_list<int> ids)
+{
+    Response response;
+    response.set_response_code(Response::RespOk);
+    auto *games = response.MutableExtension(Response_GetGamesOfUser::ext);
+    for (int id : ids) {
+        auto *game = games->add_game_list();
+        game->set_game_id(id);
+        game->set_room_id(7);
+    }
+    return response;
+}
+
+using State = UserGamesModel::State;
+
+TEST(UserGamesModel, OfflineUserDoesNotSendARequest)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", false);
+    model.refresh();
+    EXPECT_TRUE(client.sent.isEmpty());
+    EXPECT_EQ(State::Offline, model.getState());
+    EXPECT_FALSE(model.canRefresh());
+    EXPECT_EQ(0, model.rowCount());
+}
+
+TEST(UserGamesModel, PresenceLossInvalidatesTheOutstandingResponse)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", true);
+    EXPECT_EQ(State::Loading, model.getState());
+    EXPECT_FALSE(model.canRefresh());
+    model.setUser("Alice", false);
+    client.answer(0, gamesResponse({1}));
+    EXPECT_EQ(State::Offline, model.getState());
+    EXPECT_EQ(0, model.rowCount());
+
+    model.setUser("Alice", true);
+    client.answer(1, gamesResponse({2}));
+    EXPECT_EQ(State::Ready, model.getState());
+    EXPECT_TRUE(model.canRefresh());
+    EXPECT_EQ(2, model.data(model.index(0), UserGamesModel::GameRole).value<ServerInfo_Game>().game_id());
+}
+
+TEST(UserGamesModel, SwitchingBackToTheSameUserDoesNotAcceptTheirOldRequest)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", true);
+    model.setUser("Bob", true);
+    model.setUser("Alice", true);
+    client.answer(2, gamesResponse({3}));
+    client.answer(0, gamesResponse({1}));
+    client.answer(1, gamesResponse({2}));
+    EXPECT_EQ(1, model.rowCount());
+    EXPECT_EQ(3, model.data(model.index(0), UserGamesModel::GameRole).value<ServerInfo_Game>().game_id());
+}
+
+TEST(UserGamesModel, RefreshSupersedesThePreviousRequest)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", true);
+    model.refresh();
+    client.answer(0, gamesResponse({1}));
+    EXPECT_EQ(State::Loading, model.getState());
+    EXPECT_EQ(0, model.rowCount());
+    client.answer(1, gamesResponse({2}));
+    EXPECT_EQ(State::Ready, model.getState());
+    EXPECT_EQ(2, model.data(model.index(0), UserGamesModel::GameRole).value<ServerInfo_Game>().game_id());
+}
+
+TEST(UserGamesModel, EmptySuccessAndMissingPayloadAreDifferentStates)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", true);
+    client.answer(0, gamesResponse({}));
+    EXPECT_EQ(State::Empty, model.getState());
+    EXPECT_TRUE(model.canRefresh());
+
+    model.refresh();
+    Response missingPayload;
+    missingPayload.set_response_code(Response::RespOk);
+    client.answer(1, missingPayload);
+    EXPECT_EQ(State::Error, model.getState());
+    EXPECT_TRUE(model.canRefresh());
+}
+
+TEST(UserGamesModel, FailedRequestsCanBeRetried)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", true);
+    Response error;
+    error.set_response_code(Response::RespNameNotFound);
+    client.answer(0, error);
+    EXPECT_EQ(State::Error, model.getState());
+    model.refresh();
+    client.answer(1, gamesResponse({4}));
+    EXPECT_EQ(State::Ready, model.getState());
+}
+
+TEST(UserGamesModel, DisconnectRejectsLateRepliesAndReconnectFetchesAgain)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    model.setUser("Alice", true);
+    client.changeStatus(StatusDisconnecting);
+    client.answer(0, gamesResponse({1}));
+    EXPECT_EQ(State::Disconnected, model.getState());
+    EXPECT_FALSE(model.canRefresh());
+    model.refresh();
+    EXPECT_EQ(1, client.sent.size());
+    client.changeStatus(StatusLoggedIn);
+    client.answer(1, gamesResponse({2}));
+    EXPECT_EQ(State::Ready, model.getState());
+}
+
+TEST(UserGamesModel, ClientDestructionClearsGamesAndDisablesRefresh)
+{
+    auto client = std::make_unique<GamesClient>();
+    UserGamesModel model(client.get());
+    model.setUser("Alice", true);
+    client->answer(0, gamesResponse({1}));
+    client.reset();
+    EXPECT_EQ(State::Disconnected, model.getState());
+    EXPECT_EQ(0, model.rowCount());
+    EXPECT_FALSE(model.canRefresh());
+    model.refresh();
+    EXPECT_EQ(State::Disconnected, model.getState());
+}
+
+TEST(UserGamesModel, ResetInvalidatesAnOpenGameActionAndPreservesTheModelContract)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    QAbstractItemModelTester tester(&model, QAbstractItemModelTester::FailureReportingMode::Fatal);
+    model.setUser("Alice", true);
+    client.answer(0, gamesResponse({1, 2, 3}));
+    QPersistentModelIndex selected(model.index(1));
+    EXPECT_TRUE(selected.isValid());
+    model.refresh();
+    EXPECT_FALSE(selected.isValid());
+    EXPECT_EQ(0, model.rowCount());
+    client.answer(1, gamesResponse({4}));
+    EXPECT_EQ(1, model.rowCount());
+}
+
+TEST(UserGamesModel, StateListenerCanSelectAnotherUserBeforeTheRequestIsSent)
+{
+    GamesClient client;
+    UserGamesModel model(&client);
+    bool switched = false;
+    QObject::connect(&model, &UserGamesModel::stateChanged, &model, [&] {
+        if (!switched && model.getState() == State::Loading) {
+            switched = true;
+            model.setUser("Bob", false);
+        }
+    });
+    model.setUser("Alice", true);
+    EXPECT_TRUE(client.sent.isEmpty());
+    EXPECT_EQ(State::Offline, model.getState());
+}
+
+TEST(UserGamesModel, TimedOutResponseCannotReplaceARetry)
+{
+    GamesClient client;
+    UserGamesModel model(&client, 50);
+    model.setUser("Alice", true);
+    QSignalSpy changes(&model, &UserGamesModel::stateChanged);
+    ASSERT_TRUE(changes.wait(1000));
+    ASSERT_EQ(State::Error, model.getState());
+    EXPECT_TRUE(model.canRefresh());
+    model.refresh();
+    client.answer(0, gamesResponse({1}));
+    EXPECT_EQ(State::Loading, model.getState());
+    client.answer(1, gamesResponse({2}));
+    EXPECT_EQ(State::Ready, model.getState());
+    EXPECT_EQ(2, model.data(model.index(0), UserGamesModel::GameRole).value<ServerInfo_Game>().game_id());
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tools/installer-holder-probe/CMakeLists.txt b/tools/installer-holder-probe/CMakeLists.txt
index 3098669cc..99e7d5045 100644
--- a/tools/installer-holder-probe/CMakeLists.txt
+++ b/tools/installer-holder-probe/CMakeLists.txt
@@ -1,13 +1,28 @@
-# Windows-only. The installer runs this on the abort path of a failed purge to name the
-# applications and services holding the install directory open (Restart Manager); see
-# the LogProcessesUsingInstallDir function in cmake/NSIS.template.in. It ships inside
-# the installer and is extracted to $PLUGINSDIR there, never installed, so it links
-# nothing from this project: no Qt, and a static C runtime because the installed runtime
-# is exactly what the purge may have failed to replace.
-add_executable(installer-holder-probe holder_line.cpp main.cpp restart_manager_holders.cpp)
+# Windows-only. The installer runs this before anything is replaced (the running-instance
+# guard in .onInit) and on the abort path of a failed purge, to name the applications and
+# services holding the payload open (Restart Manager); see the GuardAppsNotRunning and
+# LogProcessesUsingInstallDir functions in cmake/NSIS.template.in. It ships inside the
+# installer and the uninstaller and is extracted to $PLUGINSDIR there, never installed, so
+# it links nothing from this project: no Qt, and a static C runtime because the installed
+# runtime is exactly what the purge may have failed to replace.
+add_executable(
+  installer-holder-probe
+  close_holders.cpp
+  holder_line.cpp
+  installer_close_name.cpp
+  installer_close_request.cpp
+  main.cpp
+  payload_locks.cpp
+  payload_paths.cpp
+  restart_manager_holders.cpp
+)
 
 target_link_libraries(installer-holder-probe PRIVATE rstrtmgr)
 
+# The close command is a header-only constant shared with the client. The probe still links
+# nothing from this project: the header is plain C++ and pulls in no library.
+target_include_directories(installer-holder-probe PRIVATE ${CMAKE_SOURCE_DIR}/libcockatrice_utility)
+
 # The NSIS template embeds the built file by the same relative path that resolves
 # NSIS.definitions.nsh, and that path points at the build root.
 set_target_properties(
diff --git a/tools/installer-holder-probe/close_holders.cpp b/tools/installer-holder-probe/close_holders.cpp
new file mode 100644
index 000000000..24fe7f0e7
--- /dev/null
+++ b/tools/installer-holder-probe/close_holders.cpp
@@ -0,0 +1,417 @@
+#include "close_holders.h"
+
+#include "installer_close_request.h"
+#include "payload_paths.h"
+#include "restart_manager_holders.h"
+
+// clang-format off
+// windows.h has to come before anything that pulls in a Windows type, as everywhere in
+// this tool.
+#include <windows.h>
+// clang-format on
+
+#include <cstddef>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace
+{
+/// How long one poll of the asked processes takes. One WaitForSingleObject per process
+/// and no enumeration, so polling costs nothing next to the seconds this is called on.
+constexpr unsigned long WAIT_POLL_MILLISECONDS = 200;
+
+/// How long the report line may get before it is cut. NSIS holds one string in 1024
+/// characters, and this one is written there verbatim; every holder is named, so normally
+/// the line stays far below it.
+constexpr std::size_t REPORT_CHAR_MAX = 900;
+
+/// The holder as the log has to name it to be actionable. Deliberately not
+/// formatHolder(): that one is worded for the dialog, where ", running" says something
+/// the line here continues after.
+std::wstring processLabel(const Holder &holder)
+{
+    std::wstring label = holder.imageName.empty() ? holder.appName : holder.imageName;
+    if (label.empty()) {
+        label = L"an unnamed process";
+    }
+    label += L" (pid ";
+    label += std::to_wstring(holder.processId);
+    label += L")";
+    return label;
+}
+
+/// Joins the per-holder lines into the one line the installer logs and cuts it to what one
+/// NSIS string holds.
+std::wstring joinReport(const std::vector<std::wstring> &lines)
+{
+    std::wstring report;
+    for (const std::wstring &line : lines) {
+        if (!report.empty()) {
+            report += L"; ";
+        }
+        report += line;
+    }
+    if (report.size() > REPORT_CHAR_MAX) {
+        report.erase(REPORT_CHAR_MAX);
+        report += L"...";
+    }
+    return report;
+}
+
+struct WindowSearch
+{
+    DWORD processId = 0;
+    std::vector<HWND> windows; ///< every top-level window of the process, in Z-order
+};
+
+BOOL CALLBACK collectProcessWindow(HWND window, LPARAM parameter)
+{
+    auto &search = *reinterpret_cast<WindowSearch *>(parameter);
+    DWORD processId = 0;
+    GetWindowThreadProcessId(window, &processId);
+    if (processId == search.processId) {
+        search.windows.push_back(window);
+    }
+    return TRUE;
+}
+
+/// Whether a window is one the user could be asked to answer.
+///
+/// Only a framed, non-empty window qualifies. Qt keeps hidden top-level windows of its own
+/// next to the application's: the tray icon creates one to receive the TaskbarCreated
+/// message, styled WS_OVERLAPPED - which is no frame at all - and titled
+/// QTrayIconMessageWindow. Showing one of those puts an empty white rectangle on the
+/// taskbar that nothing ever closes again: it has no window procedure of its own to hide it,
+/// and the process is busy in the loop this is meant to break, so it stays until the process
+/// dies. Posting a close to one is worse than useless too: Qt's tray window answers WM_CLOSE
+/// by asking the application to terminate, without going through the confirmation the close
+/// is supposed to reach.
+bool isAnswerableWindow(HWND window)
+{
+    if ((GetWindowLongPtr(window, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) != 0) {
+        return false;
+    }
+    if ((GetWindowLongPtr(window, GWL_STYLE) & WS_CAPTION) == 0) {
+        return false;
+    }
+    RECT bounds{};
+    if (GetWindowRect(window, &bounds) == FALSE) {
+        return false;
+    }
+    return bounds.right > bounds.left && bounds.bottom > bounds.top;
+}
+
+/// Picks the window to post the close to and the one the user should end up looking at.
+struct CloseTarget
+{
+    HWND main = nullptr;    ///< first answerable window without an owner: the application's own
+    HWND toRaise = nullptr; ///< topmost visible window: a dialog when one is up
+    bool hidden = false;    ///< the window being closed is not on screen (notification area)
+};
+
+/// Only the windows the user could be asked to answer are candidates - see isAnswerableWindow.
+///
+/// A hidden window is a candidate like a visible one: WM_CLOSE does not need a window on
+/// screen, so an instance that is only in the notification area answers it the way it answers
+/// its own close button, and the confirmation it raises then is a window Qt shows itself -
+/// painted, unlike one restored from outside. Nothing is shown from here. Qt's own bookkeeping
+/// windows stay excluded, because a close posted to the notification-area one terminates the
+/// instance without the confirmation and that is worse than no close at all.
+///
+/// @param windows every top-level window the process owns, in Z-order
+/// @param askHidden when false, only a window that is on screen is a target: the launcher
+///        mode reads "no window" as "past its own prompts and stuck", which stops being true
+///        the moment a hidden window is asked to close
+CloseTarget chooseCloseTarget(const std::vector<HWND> &windows, bool askHidden)
+{
+    CloseTarget target;
+    for (const HWND window : windows) {
+        if (!isAnswerableWindow(window)) {
+            continue;
+        }
+        const bool visible = IsWindowVisible(window) != FALSE;
+        if (visible && target.toRaise == nullptr) {
+            target.toRaise = window;
+        }
+        if (target.main == nullptr && GetWindow(window, GW_OWNER) == nullptr && (visible || askHidden)) {
+            target.main = window;
+            target.hidden = !visible;
+        }
+    }
+    return target;
+}
+
+/// What is left of the window the close was posted to, so a log line tells an instance that
+/// answered by hiding from one that never answered at all. A process that hid its window and
+/// stayed alive is the one the guard's end answer is for.
+///
+/// @param window the window the close was posted to, or null when there was none
+/// @param wasHidden whether that window was already off screen before the close
+std::wstring describeWindowState(HWND window, bool wasHidden)
+{
+    if (window == nullptr || IsWindow(window) == FALSE) {
+        return L", its window is gone";
+    }
+    // WM_NULL is the cheapest way to ask whether the thread behind the window still dispatches.
+    // A hung instance does not answer at all, which is a different problem from one that
+    // answered the close and stayed open, and the two want different words in the prompt.
+    DWORD_PTR ignored = 0;
+    const bool responding =
+        SendMessageTimeoutW(window, WM_NULL, 0, 0, SMTO_ABORTIFHUNG | SMTO_BLOCK, 1000, &ignored) != 0;
+    std::wstring state;
+    if (IsWindowVisible(window) != FALSE) {
+        state = L", window still open";
+    } else {
+        state = wasHidden ? L", window still hidden" : L", window hidden again";
+    }
+    if (!responding) {
+        state += L" and not responding";
+    }
+    return state;
+}
+
+/// Restores a minimized window and takes the foreground, so a confirmation Cockatrice
+/// answers the close with is in front of the installer instead of behind it.
+///
+/// A process in the background may not take the foreground on its own. Attaching to the
+/// thread that owns the foreground window lifts that restriction for the duration of the
+/// call; detaching afterwards leaves the two input queues as they were.
+bool bringForward(HWND window)
+{
+    if (IsIconic(window) != FALSE) {
+        ShowWindow(window, SW_RESTORE);
+    } else {
+        ShowWindow(window, SW_SHOW);
+    }
+
+    const HWND foreground = GetForegroundWindow();
+    const DWORD foregroundThread = foreground != nullptr ? GetWindowThreadProcessId(foreground, nullptr) : 0;
+    const DWORD currentThread = GetCurrentThreadId();
+    const bool attached = foregroundThread != 0 && foregroundThread != currentThread &&
+                          AttachThreadInput(currentThread, foregroundThread, TRUE) != FALSE;
+    BringWindowToTop(window);
+    SetForegroundWindow(window);
+    if (attached) {
+        AttachThreadInput(currentThread, foregroundThread, FALSE);
+    }
+    return GetForegroundWindow() == window;
+}
+
+/// Waits for @p processes to signal, up to @p waitMilliseconds. Returns whether they all
+/// exited and how long the wait took.
+bool waitForExit(const std::vector<HANDLE> &processes, unsigned long waitMilliseconds, unsigned long long &elapsed)
+{
+    const ULONGLONG start = GetTickCount64();
+    const ULONGLONG deadline = start + waitMilliseconds;
+    for (;;) {
+        bool allExited = true;
+        for (const HANDLE process : processes) {
+            if (WaitForSingleObject(process, 0) != WAIT_OBJECT_0) {
+                allExited = false;
+                break;
+            }
+        }
+        elapsed = GetTickCount64() - start;
+        if (allExited || GetTickCount64() >= deadline) {
+            return allExited;
+        }
+        Sleep(WAIT_POLL_MILLISECONDS);
+    }
+}
+} // namespace
+
+bool isCockatriceImage(const std::wstring &imageName)
+{
+    constexpr wchar_t COCKATRICE_IMAGE[] = L"cockatrice.exe";
+    return CompareStringOrdinal(imageName.c_str(), -1, COCKATRICE_IMAGE, -1, TRUE) == CSTR_EQUAL;
+}
+
+CloseHoldersResult
+closeCockatriceHolders(const std::vector<Holder> &holders, unsigned long waitMilliseconds, bool askHiddenWindows)
+{
+    CloseHoldersResult result;
+    std::vector<std::wstring> lines;
+    std::vector<HANDLE> asked;
+    std::vector<std::size_t> askedLines;
+    std::vector<HWND> askedWindows;
+    std::vector<bool> askedWasHidden;
+
+    for (const Holder &holder : holders) {
+        if (holder.isService || !isCockatriceImage(holder.imageName)) {
+            // Oracle and Servatrice are named by the prompt and close by hand: Oracle
+            // writes the card database in place. A service has no window to ask either.
+            lines.push_back(processLabel(holder) + L" left to you");
+            continue;
+        }
+
+        WindowSearch search;
+        search.processId = holder.processId;
+        EnumWindows(collectProcessWindow, reinterpret_cast<LPARAM>(&search));
+        CloseTarget target = chooseCloseTarget(search.windows, askHiddenWindows);
+        if (target.main == nullptr && !askHiddenWindows) {
+            // A launcher with no window on screen has already answered its own close and is
+            // stuck in shutdown (see the header): asking it again cannot reach a user who is
+            // not there, so it is named and the installer's wait ends it.
+            ++result.withoutWindow;
+            lines.push_back(processLabel(holder) + L" has no window of its own to close");
+            continue;
+        }
+
+        std::wstring line = processLabel(holder);
+        if (target.main == nullptr) {
+            // No window of the application's own at all: every window left is one of Qt's
+            // bookkeeping windows, which must never be asked to close. The installer socket
+            // below is the only thing that can reach it.
+        } else if (target.hidden) {
+            line += L" is hidden in the notification area";
+        } else {
+            if (target.toRaise == nullptr) {
+                target.toRaise = target.main;
+            }
+            line += bringForward(target.toRaise) ? L" brought forward" : L" could not be brought forward";
+        }
+
+        // Kept open across the wait so a pid reused after the process exits cannot be
+        // mistaken for the instance that was asked to close.
+        const HANDLE process = OpenProcess(SYNCHRONIZE, FALSE, holder.processId);
+        const DWORD openError = process == nullptr ? GetLastError() : ERROR_SUCCESS;
+
+        // Ask over the installer socket first. It is the same request as the window's close
+        // button - the application still answers its own confirmation - but it reaches an
+        // instance whose window is hidden in the notification area or is sitting on that
+        // confirmation, the two states a posted close cannot get through. A client from
+        // before the socket answers with a failed connect, so the posted close below stays
+        // the fallback and older versions keep behaving exactly as they did.
+        if (requestInstallerClose(holder.processId)) {
+            // "and" only when the line already says something about the instance's window.
+            line += target.main == nullptr ? L" asked to close over its installer socket"
+                                           : L" and asked to close over its installer socket";
+        } else if (target.main == nullptr) {
+            // Nothing of the application's own to post a close to, and no socket to ask: the
+            // instance is named and the guard's end answer is what can free its files.
+            if (process != nullptr) {
+                CloseHandle(process);
+            }
+            ++result.withoutWindow;
+            lines.push_back(line + L" has no window of its own to close");
+            continue;
+        } else if (PostMessageW(target.main, WM_CLOSE, 0, 0) == FALSE) {
+            // Posted to the instance's own window even when a question of its own is up. The
+            // close is what that window's close button does, and the application is the one
+            // that answers it: a current client refuses the close while its confirmation is
+            // pending, leaving the question in front, and only a client from before that guard
+            // accepts it and hides the window with the question. Withholding the request
+            // therefore protected nobody - it left the installer asking the user to close a
+            // program it had never asked - while the guard's end answer is what frees the files
+            // when the close cannot.
+            //
+            // Read the error before CloseHandle, which is free to reset it.
+            const DWORD postError = GetLastError();
+            if (process != nullptr) {
+                CloseHandle(process);
+            }
+            lines.push_back(line + L", and the close request could not be sent (win32 " + std::to_wstring(postError) +
+                            L")");
+            continue;
+        } else {
+            line += L" and asked to close";
+        }
+        ++result.askedToClose;
+        if (process == nullptr) {
+            line += L", but its exit could not be watched (win32 " + std::to_wstring(openError) + L")";
+        } else {
+            askedLines.push_back(lines.size());
+            asked.push_back(process);
+            askedWindows.push_back(target.main);
+            askedWasHidden.push_back(target.hidden);
+        }
+        lines.push_back(std::move(line));
+    }
+
+    if (!asked.empty() && waitMilliseconds > 0) {
+        unsigned long long elapsed = 0;
+        const bool allExited = waitForExit(asked, waitMilliseconds, elapsed);
+        for (std::size_t index = 0; index < asked.size(); ++index) {
+            const bool exited = allExited || WaitForSingleObject(asked[index], 0) == WAIT_OBJECT_0;
+            if (exited) {
+                lines[askedLines[index]] += L", exited after " + std::to_wstring(elapsed) + L" ms";
+            } else if (askedWindows[index] == nullptr) {
+                // Asked over the socket with no window of its own: there is no window state
+                // to describe, only that it is still there.
+                lines[askedLines[index]] += L", still running after " + std::to_wstring(elapsed) + L" ms";
+            } else {
+                lines[askedLines[index]] += L", still running after " + std::to_wstring(elapsed) + L" ms" +
+                                            describeWindowState(askedWindows[index], askedWasHidden[index]);
+            }
+        }
+    }
+    for (const HANDLE process : asked) {
+        CloseHandle(process);
+    }
+
+    if (lines.empty()) {
+        result.report = L"nothing is holding the files";
+        return result;
+    }
+    result.report = joinReport(lines);
+    return result;
+}
+
+EndHoldersResult endHolders(const std::vector<Holder> &holders, unsigned long waitMilliseconds)
+{
+    EndHoldersResult result;
+    std::vector<std::wstring> lines;
+    std::vector<HANDLE> ended;
+    std::vector<std::size_t> endedLines;
+
+    for (const Holder &holder : holders) {
+        if (!isPayloadProgram(holder.imageName)) {
+            // Not one of the programs the payload installs: a scanner that has a DLL open, or
+            // a program the user keeps in the install directory. It is named and left to the
+            // user, because ending it would destroy something this installer does not own.
+            lines.push_back(processLabel(holder) + L" left to you");
+            continue;
+        }
+
+        // Services included: the installer asked before getting here, and the Service
+        // Control Manager reports the terminated process as a stopped service afterwards.
+        const HANDLE process = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE, FALSE, holder.processId);
+        if (process == nullptr) {
+            lines.push_back(processLabel(holder) + L" could not be ended (win32 " + std::to_wstring(GetLastError()) +
+                            L")");
+            continue;
+        }
+        if (TerminateProcess(process, 1) == FALSE) {
+            // Read the error before CloseHandle, which is free to reset it.
+            const DWORD error = GetLastError();
+            CloseHandle(process);
+            lines.push_back(processLabel(holder) + L" could not be ended (win32 " + std::to_wstring(error) + L")");
+            continue;
+        }
+        ++result.ended;
+        endedLines.push_back(lines.size());
+        lines.push_back(processLabel(holder) + L" ended");
+        ended.push_back(process);
+    }
+
+    if (!ended.empty() && waitMilliseconds > 0) {
+        unsigned long long elapsed = 0;
+        const bool allExited = waitForExit(ended, waitMilliseconds, elapsed);
+        for (std::size_t index = 0; index < ended.size(); ++index) {
+            const bool exited = allExited || WaitForSingleObject(ended[index], 0) == WAIT_OBJECT_0;
+            lines[endedLines[index]] += exited ? L", exited after " + std::to_wstring(elapsed) + L" ms"
+                                               : L", still running after " + std::to_wstring(elapsed) + L" ms";
+        }
+    }
+    for (const HANDLE process : ended) {
+        CloseHandle(process);
+    }
+
+    if (lines.empty()) {
+        result.report = L"nothing is holding the files";
+        return result;
+    }
+    result.report = joinReport(lines);
+    return result;
+}
diff --git a/tools/installer-holder-probe/close_holders.h b/tools/installer-holder-probe/close_holders.h
new file mode 100644
index 000000000..3f6c889fd
--- /dev/null
+++ b/tools/installer-holder-probe/close_holders.h
@@ -0,0 +1,113 @@
+#ifndef CLOSE_HOLDERS_H
+#define CLOSE_HOLDERS_H
+
+#include "holder_line.h"
+
+#include <string>
+#include <vector>
+
+/**
+ * @brief What asking the holders to close did, in the form the installer logs.
+ *
+ * @c report is one line naming every holder, including the ones this deliberately
+ * leaves alone, because the installer repeats it in its log.
+ * @c withoutWindow counts the holders that had no window of their own to ask: they were
+ * named and left alone, and the launcher mode reads that count as "nothing to ask" rather
+ * than as a window the user still has to answer.
+ */
+struct CloseHoldersResult
+{
+    unsigned int askedToClose = 0;  ///< holders asked to close, over the socket or with WM_CLOSE
+    unsigned int withoutWindow = 0; ///< holders with no window of their own to ask
+    std::wstring report;            ///< one line, narrowed to ASCII when written
+};
+
+/**
+ * @brief Whether @p imageName is the client the update belongs to, matched without case.
+ *
+ * The close mode asks only this image to close, and the launcher mode is only allowed to
+ * report it as safe to end, so both read the answer from here.
+ *
+ * @param imageName the file name of a process image, empty when it could not be read
+ */
+bool isCockatriceImage(const std::wstring &imageName);
+
+/**
+ * @brief Brings every running Cockatrice holding an installer file forward and asks it
+ *        to close.
+ *
+ * The set is the Restart Manager answer, so it is exactly the processes holding a file of
+ * the previous version: nothing here has to guess at an executable path, and an
+ * application that merely shares the image name is never touched. Only cockatrice.exe is
+ * asked to close. Oracle and Servatrice are left to the user - Oracle writes the card
+ * database in place - and so is every service.
+ *
+ * One thing happens per instance: it is asked to close over the local socket it listens on,
+ * which is the same request as clicking its close button and is the only way to reach one
+ * whose window is hidden in the notification area or is sitting on its own confirmation. A
+ * client from before that socket is asked with WM_CLOSE on its own window instead, whether
+ * the window is on screen or only in the notification area, since the request does not need
+ * the window to be visible and the confirmation Cockatrice answers it with is a window Qt
+ * shows itself, painted, unlike one restored from outside. A window that is on screen is
+ * brought forward first, because that confirmation would otherwise open behind the
+ * installer's prompt; nothing is shown from here. Qt's own bookkeeping windows are never the
+ * target - posting a close to the notification-area one terminates the instance without its
+ * confirmation - so a process without a window of its own that does not answer the socket is
+ * named and left to the guard, which offers to end it. Stopping the process is never
+ * attempted here.
+ *
+ * Once the requests are out, this waits up to @c waitMilliseconds for the processes to
+ * exit, so the caller can measure the purge immediately afterwards instead of sleeping
+ * for a fixed time or re-asking a question this call already answered. A process that is
+ * still running is described further: whether its window is gone, still open, still
+ * hidden or hidden again, and whether it answers at all, so the log can tell an instance
+ * that refused the close from one that never received it.
+ *
+ * @param holders the Restart Manager answer, one entry per application or service
+ * @param waitMilliseconds how long to wait for the asked instances to exit, 0 to not wait
+ * @param askHiddenWindows whether a window that is not on screen is asked to close too.
+ *        The guard wants that: an instance in the notification area is the one this update
+ *        has no other way to reach. The launcher mode does not - a launcher without a
+ *        visible window has already answered its own close and is stuck in shutdown, and
+ *        the installer ends it instead of putting a question to a user who is not there.
+ */
+CloseHoldersResult
+closeCockatriceHolders(const std::vector<Holder> &holders, unsigned long waitMilliseconds, bool askHiddenWindows);
+
+/**
+ * @brief What ending the holders did, in the form the installer logs.
+ *
+ * @c report is one line naming every holder, including the ones this deliberately leaves
+ * alone, because the installer repeats it in its log.
+ */
+struct EndHoldersResult
+{
+    unsigned int ended = 0; ///< holders TerminateProcess was accepted for
+    std::wstring report;    ///< one line, narrowed to ASCII when written
+};
+
+/**
+ * @brief Ends every running Cockatrice, Oracle and Servatrice the probe named.
+ *
+ * This is the last resort behind the installer's "end it now" answer, never a first move: a
+ * client that is still running may have an unsaved deck, an open game or a settings write in
+ * flight, Oracle may be part-way through writing the card database, and Servatrice may be
+ * serving a game, so the caller only gets here after the user picked it from a prompt that
+ * says so.
+ *
+ * Every program the payload installs is ended, services included. A service is terminated
+ * like a process rather than stopped through the Service Control Manager: the installer has
+ * asked the user first, and the SCM notices the process exit and marks the service stopped
+ * afterwards, so it can be started again normally. Anything else the Restart Manager named -
+ * a scanner holding a DLL, a program the user keeps in the install directory - is left to
+ * the user, because ending it would destroy something this installer does not own.
+ *
+ * Waits up to @c waitMilliseconds for what it ended to be gone, so the caller can measure the
+ * purge immediately afterwards instead of racing a process that is still exiting.
+ *
+ * @param holders what the probe named, one entry per application or service
+ * @param waitMilliseconds how long to wait for the ended instances to be gone, 0 to not wait
+ */
+EndHoldersResult endHolders(const std::vector<Holder> &holders, unsigned long waitMilliseconds);
+
+#endif
diff --git a/tools/installer-holder-probe/holder_line.h b/tools/installer-holder-probe/holder_line.h
index 7fcc92375..675d79fc6 100644
--- a/tools/installer-holder-probe/holder_line.h
+++ b/tools/installer-holder-probe/holder_line.h
@@ -26,12 +26,15 @@ inline constexpr std::size_t HOLDER_LINE_MAX = 5;
 /**
  * @brief How many characters the summary may spend on the holders it names.
  *
- * The line is not the whole string: the abort dialog puts it after a fixed paragraph and
- * before the path of the installer log, inside an NSIS string of 1024 characters. Windows
- * caps one application or service name well below this budget, so it bounds the list
- * without ever cutting a single holder short.
+ * The line is not the whole string: every prompt puts it after a fixed paragraph and before
+ * the answers, and one NSIS string holds 1024 characters. Those paragraphs grew when the
+ * guard started spelling out what ending the programs costs and what is left to do by hand,
+ * so this budget is what keeps the longest message - the one with the longest listing, plus
+ * the "; and N more" the summary appends after the budget - complete, including the sentence
+ * that offers the other answer at its end. Windows caps one application or service name well
+ * below this, so it bounds the list without ever cutting a single holder short.
  */
-inline constexpr std::size_t HOLDER_LINE_CHAR_MAX = 400;
+inline constexpr std::size_t HOLDER_LINE_CHAR_MAX = 320;
 
 /**
  * @brief Renders one holder the way the user has to recognise it, e.g.
diff --git a/tools/installer-holder-probe/installer_close_name.cpp b/tools/installer-holder-probe/installer_close_name.cpp
new file mode 100644
index 000000000..74659e151
--- /dev/null
+++ b/tools/installer-holder-probe/installer_close_name.cpp
@@ -0,0 +1,12 @@
+#include "installer_close_name.h"
+
+#include <string>
+
+std::wstring installerCloseSocketName(unsigned long processId, const std::wstring &userName)
+{
+    std::wstring name = L"CockatriceInstallerClose-";
+    name += std::to_wstring(processId);
+    name += L"-";
+    name += userName;
+    return name;
+}
diff --git a/tools/installer-holder-probe/installer_close_name.h b/tools/installer-holder-probe/installer_close_name.h
new file mode 100644
index 000000000..b659f8b8f
--- /dev/null
+++ b/tools/installer-holder-probe/installer_close_name.h
@@ -0,0 +1,24 @@
+#ifndef INSTALLER_CLOSE_NAME_H
+#define INSTALLER_CLOSE_NAME_H
+
+#include <string>
+
+/**
+ * @brief The local-socket name a running instance listens on for the installer's close
+ *        request.
+ *
+ * The name carries the process id, so every instance of the payload has its own socket - a
+ * second Cockatrice that was started independently, an Oracle and a Servatrice - and the
+ * installer can ask each one instead of guessing which is the primary. It also carries the
+ * account name, so one user's installer cannot reach another user's session.
+ *
+ * This is the same string the client builds with scopedLocalServerName() in
+ * libcockatrice_utility/local_server_name.h: `CockatriceInstallerClose-<pid>-<user>`. It is
+ * plain C++ so the probe and the client can be tested against each other off Windows.
+ *
+ * @param processId the id of the process that listens on the socket
+ * @param userName the account name scopedLocalServerName() appends
+ */
+std::wstring installerCloseSocketName(unsigned long processId, const std::wstring &userName);
+
+#endif // INSTALLER_CLOSE_NAME_H
diff --git a/tools/installer-holder-probe/installer_close_request.cpp b/tools/installer-holder-probe/installer_close_request.cpp
new file mode 100644
index 000000000..0475aedf3
--- /dev/null
+++ b/tools/installer-holder-probe/installer_close_request.cpp
@@ -0,0 +1,96 @@
+#include "installer_close_request.h"
+
+#include "installer_close_name.h"
+
+// clang-format off
+// windows.h has to come before anything that pulls in a Windows type, as everywhere in
+// this tool.
+#include <windows.h>
+// clang-format on
+
+#include <cstddef>
+#include <libcockatrice/utility/installer_close_protocol.h>
+#include <string>
+#include <vector>
+
+namespace
+{
+/// How long a busy pipe may take before this gives up. The client answers in milliseconds;
+/// the wait only covers a machine under load.
+constexpr DWORD PIPE_WAIT_MILLISECONDS = 1000;
+
+std::wstring environmentVariable(const wchar_t *name)
+{
+    for (DWORD size = MAX_PATH; size <= 32768U; size *= 2) {
+        std::vector<wchar_t> buffer(size);
+        const DWORD length = GetEnvironmentVariableW(name, buffer.data(), size);
+        if (length == 0) {
+            return {};
+        }
+        if (length < size) {
+            return std::wstring(buffer.data(), length);
+        }
+    }
+    return {};
+}
+
+/// The account name scopedLocalServerName() appends: USER, then USERNAME, then the last
+/// component of the profile path - the same order and the same fallbacks the client uses.
+std::wstring currentUserName()
+{
+    for (const wchar_t *name : {L"USER", L"USERNAME"}) {
+        const std::wstring value = environmentVariable(name);
+        if (!value.empty()) {
+            return value;
+        }
+    }
+    const std::wstring profile = environmentVariable(L"USERPROFILE");
+    const std::size_t separator = profile.find_last_of(L"\\/");
+    if (separator == std::wstring::npos) {
+        return profile;
+    }
+    return profile.substr(separator + 1);
+}
+
+/// The named pipe QLocalServer creates for the client's socket, or empty when the account
+/// name could not be read and there is nothing to connect to.
+std::wstring pipePath(unsigned long processId)
+{
+    const std::wstring userName = currentUserName();
+    if (userName.empty()) {
+        return {};
+    }
+    return L"\\\\.\\pipe\\" + installerCloseSocketName(processId, userName);
+}
+} // namespace
+
+bool requestInstallerClose(unsigned long processId)
+{
+    const std::wstring path = pipePath(processId);
+    if (path.empty()) {
+        return false;
+    }
+    // A client that is still serving the previous connection answers ERROR_PIPE_BUSY; one
+    // retry covers that, while a client that is not listening at all (an older version, or
+    // one that has already exited) is answered with a plain failure and the caller falls
+    // back to WM_CLOSE.
+    for (int attempt = 0; attempt < 2; ++attempt) {
+        const HANDLE pipe = CreateFileW(path.c_str(), GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
+        if (pipe == INVALID_HANDLE_VALUE) {
+            if (GetLastError() == ERROR_PIPE_BUSY && WaitNamedPipeW(path.c_str(), PIPE_WAIT_MILLISECONDS) != FALSE) {
+                continue;
+            }
+            return false;
+        }
+        DWORD written = 0;
+        const BOOL ok =
+            WriteFile(pipe, INSTALLER_CLOSE_COMMAND, sizeof(INSTALLER_CLOSE_COMMAND) - 1, &written, nullptr);
+        CloseHandle(pipe);
+        // The request is in the pipe buffer, so the client reads it even though this handle
+        // is closed immediately. No acknowledgment is waited for: the caller only needs to
+        // know whether there was a listening instance to ask, and a hung client must not
+        // stall the guard.
+        return ok != FALSE && written == sizeof(INSTALLER_CLOSE_COMMAND) - 1;
+    }
+    return false;
+}
diff --git a/tools/installer-holder-probe/installer_close_request.h b/tools/installer-holder-probe/installer_close_request.h
new file mode 100644
index 000000000..f30c49b2c
--- /dev/null
+++ b/tools/installer-holder-probe/installer_close_request.h
@@ -0,0 +1,21 @@
+#ifndef INSTALLER_CLOSE_REQUEST_H
+#define INSTALLER_CLOSE_REQUEST_H
+
+/**
+ * @brief Asks one running payload instance to close over its installer socket.
+ *
+ * A 3.1.3 client (and later) listens on a local socket named by
+ * installerCloseSocketName(). Connecting to it and writing one line is the same request as
+ * the window's close button, but it reaches an instance whose window is hidden in the
+ * notification area or is sitting on its own confirmation - the two states WM_CLOSE cannot
+ * get through. Older clients have no socket, so the caller still falls back to WM_CLOSE.
+ *
+ * Best effort: a failed connect or write is not an error. The caller has the window close
+ * and the guard's force-close answer left.
+ *
+ * @param processId the process to ask, as the Restart Manager named it
+ * @return true when the request was written to a listening instance
+ */
+bool requestInstallerClose(unsigned long processId);
+
+#endif // INSTALLER_CLOSE_REQUEST_H
diff --git a/tools/installer-holder-probe/main.cpp b/tools/installer-holder-probe/main.cpp
index 3b5bb5d22..31901a0ec 100644
--- a/tools/installer-holder-probe/main.cpp
+++ b/tools/installer-holder-probe/main.cpp
@@ -1,6 +1,11 @@
+#include "close_holders.h"
 #include "holder_line.h"
+#include "payload_locks.h"
+#include "payload_paths.h"
 #include "restart_manager_holders.h"
 
+#include <algorithm>
+#include <cstdlib>
 #include <string>
 #include <vector>
 #include <windows.h>
@@ -12,16 +17,88 @@ namespace
 /// trailing backslash then never has to survive NSIS quoting or a command line.
 constexpr wchar_t INSTALL_DIR_VARIABLE[] = L"COCKATRICE_GUARD_DIR";
 
+/// The installer sets this to the process it waits on (/PID=), so the launcher mode reads
+/// the same process id the wait does instead of one that has to survive NSIS quoting.
+constexpr wchar_t LAUNCHER_PID_VARIABLE[] = L"COCKATRICE_LAUNCHER_PID";
+
+/// How long the close mode waits for the instance it asked to exit before it reports the
+/// process as still running. The installer measures the purge right after this call, so
+/// the wait belongs here: it is the only place that holds a handle on the process whose
+/// exit it is waiting for.
+constexpr unsigned long CLOSE_WAIT_MILLISECONDS = 30000;
+
+/// How long the end mode waits for what it terminated to be gone. TerminateProcess is
+/// asynchronous, and the installer measures the purge right after this returns, so a process
+/// that is still tearing down would otherwise be reported as a holder for one more round.
+constexpr unsigned long END_WAIT_MILLISECONDS = 5000;
+
 /// Exit codes the installer reads. "Something was found" is deliberately not 0, so an
 /// answer of "nothing holds the files" stays distinguishable from a probe that failed.
+/// In the close mode 1 means a close was actually sent and 0 that every holder was left
+/// to the user, which is what the report line next to the code spells out. 3 is for an
+/// answer that could not name what it found: a lookup that failed and named nobody, or the
+/// lookups naming nobody while a payload program refuses to be replaced, which is proof one
+/// runs from the directory. 4 is only the launcher mode: the process the installer waits on
+/// has no window a user could answer, which is the one answer the installer acts on by
+/// itself instead of asking the user.
 enum ExitCode
 {
     EXIT_NO_HOLDERS = 0,
     EXIT_HOLDERS_FOUND = 1,
     EXIT_NOT_CONFIGURED = 2,
     EXIT_PROBE_FAILED = 3,
+    EXIT_NO_WINDOW = 4,
 };
 
+/// The probe has four modes, selected by the first argument:
+///
+///   (none)           name what holds the payload, one line, for the guard prompt and the
+///                     abort dialog/log
+///   --close-holders  bring the running Cockatrice forward, ask it to close, and wait for
+///                     it to exit, for the offer to close after a failed purge
+///   --end-holders    end the running Cockatrice, Oracle and Servatrice and wait for them to
+///                     be gone, for the last resort the guard prompt offers when a close did
+///                     not free the files
+///   --close-launcher ask the one process the installer waits on (/PID=) to close and say
+///                     whether there was a window to ask at all, because an instance with
+///                     no window has answered its own close and is stuck in shutdown
+///
+/// The guard's three modes answer from three questions that cover each other's blind spots:
+/// the Restart Manager names whoever has a payload file open, every payload program running
+/// from the directory itself is named as well, because a running instance holds its own image
+/// and the modules it loaded as mappings rather than open files and the Restart Manager does
+/// not always report those, and a payload executable that refuses to be written is running
+/// even when neither lookup could name it (see payloadExecutablesInUse). No one of them is
+/// the guard's authority: an instance the process lookups do not name, while its executable
+/// is locked, is exactly the case that left a half-replaced install behind, so it is reported
+/// as a check that could not name what it found instead of as a free payload.
+/// A program in a folder below the directory is not named by the second lookup: it is not an
+/// instance of this payload, and the guard could neither close nor end it.
+enum class Mode
+{
+    Name,          ///< name the holders
+    Close,         ///< ask the holders to close
+    End,           ///< end the holders
+    CloseLauncher, ///< ask the one process the installer waits on to close
+};
+
+Mode requestedMode(int argumentCount, char **arguments)
+{
+    if (argumentCount > 1) {
+        const std::string mode(arguments[1]);
+        if (mode == "--close-holders") {
+            return Mode::Close;
+        }
+        if (mode == "--end-holders") {
+            return Mode::End;
+        }
+        if (mode == "--close-launcher") {
+            return Mode::CloseLauncher;
+        }
+    }
+    return Mode::Name;
+}
+
 /// Writes one line to the pipe nsExec reads. Narrowed to ASCII on purpose: the bytes
 /// come back to the installer as an ANSI string, so a non-ASCII process name would be
 /// mojibake in the log; a '?' at least stays honest. Control characters are dropped
@@ -38,11 +115,29 @@ void writeLine(const std::wstring &text)
     WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), narrow.data(), static_cast<DWORD>(narrow.size()), &written, nullptr);
 }
 
-std::wstring installDirFromEnvironment()
+/// The line for a payload executable that is in use while no lookup could name the program
+/// holding it: the answer the guard shows, so it names the file the user has to free and
+/// says that the program doing it is still to be closed by hand.
+std::wstring inUseLine(const std::vector<std::wstring> &files)
+{
+    std::wstring names;
+    for (const std::wstring &file : files) {
+        if (!names.empty()) {
+            names += L", ";
+        }
+        names += fileNameOf(file);
+    }
+    if (files.size() == 1) {
+        return names + L" is in use and the program holding it could not be identified";
+    }
+    return names + L" are in use and the programs holding them could not be identified";
+}
+
+std::wstring environmentVariable(const wchar_t *name)
 {
     for (DWORD size = MAX_PATH; size <= 32768U; size *= 2) {
         std::vector<wchar_t> buffer(size);
-        const DWORD length = GetEnvironmentVariableW(INSTALL_DIR_VARIABLE, buffer.data(), size);
+        const DWORD length = GetEnvironmentVariableW(name, buffer.data(), size);
         if (length == 0) {
             return {};
         }
@@ -52,9 +147,71 @@ std::wstring installDirFromEnvironment()
     }
     return {};
 }
+
+std::wstring installDirFromEnvironment()
+{
+    return environmentVariable(INSTALL_DIR_VARIABLE);
+}
+
+/// The process id the installer waits on, or false when it was not passed or is not a
+/// number. A pid of 0 is refused because the installer never passes one.
+bool launcherProcessIdFromEnvironment(unsigned long &processId)
+{
+    const std::wstring text = environmentVariable(LAUNCHER_PID_VARIABLE);
+    if (text.empty()) {
+        return false;
+    }
+    wchar_t *end = nullptr;
+    const unsigned long parsed = std::wcstoul(text.c_str(), &end, 10);
+    if (parsed == 0 || end == nullptr || *end != L'\0') {
+        return false;
+    }
+    processId = parsed;
+    return true;
+}
+
+/// Asks the one process the installer waits on to close and answers what it could do.
+///
+/// The guard closes a set and reports every holder; here there is exactly one process, and
+/// the installer needs an answer it can act on rather than a sentence: a launcher with no
+/// visible window has already answered its own close and is stuck in shutdown, so no answer
+/// the installer offers would ever reach it. A window that was asked - including one the
+/// instance is showing a question in - is still the user's decision.
+int closeLauncher(const std::wstring &installDir)
+{
+    unsigned long processId = 0;
+    if (!launcherProcessIdFromEnvironment(processId)) {
+        writeLine(L"the probe was not given the launcher process id");
+        return EXIT_NOT_CONFIGURED;
+    }
+
+    // Only an instance that still runs from the directory being replaced is asked: a bare
+    // process id names anything once it is reused, while a process running from the
+    // directory is the one the installer started this update from.
+    for (const Holder &holder : findProcessesRunningFrom(installDir)) {
+        if (holder.processId != processId) {
+            continue;
+        }
+        if (!isCockatriceImage(holder.imageName)) {
+            writeLine(L"the launcher is not cockatrice.exe, left to you");
+            return EXIT_PROBE_FAILED;
+        }
+        const CloseHoldersResult result = closeCockatriceHolders({holder}, CLOSE_WAIT_MILLISECONDS, false);
+        writeLine(result.report);
+        if (result.askedToClose > 0) {
+            return EXIT_HOLDERS_FOUND;
+        }
+        return result.withoutWindow > 0 ? EXIT_NO_WINDOW : EXIT_HOLDERS_FOUND;
+    }
+    // Not an answer: the lookup may have failed or refused the image, and the installer
+    // holds a live handle on that process, so "not found" must not read as "gone". The
+    // installer shows its dialog for this code instead of acting on it.
+    writeLine(L"the launcher is not running from the directory being replaced, left to you");
+    return EXIT_PROBE_FAILED;
+}
 } // namespace
 
-int main()
+int main(int argumentCount, char **arguments)
 {
     const std::wstring installDir = installDirFromEnvironment();
     if (installDir.empty()) {
@@ -62,17 +219,82 @@ int main()
         return EXIT_NOT_CONFIGURED;
     }
 
-    std::vector<Holder> holders;
-    const unsigned long error = findProcessesUsingFiles(collectProbeFiles(installDir), holders);
-    if (error != ERROR_SUCCESS) {
-        writeLine(L"the Restart Manager lookup failed with win32 error " + std::to_wstring(error));
-        return EXIT_PROBE_FAILED;
+    const Mode mode = requestedMode(argumentCount, arguments);
+    // The launcher mode answers about exactly one process, so the holder set below is what it
+    // does not need - and the Restart Manager call behind it is the slowest thing this tool
+    // does, which must not delay a wait that started with a ten-second grace.
+    if (mode == Mode::CloseLauncher) {
+        return closeLauncher(installDir);
     }
+
+    // The payload programs running from the directory first: they are the instance the user
+    // is asked to close, and the Restart Manager may not name any of them (see
+    // findProcessesRunningFrom). The file holders follow, deduplicated by process, so an
+    // instance that both runs from the directory and holds a payload file is named once.
+    // Neither lookup may name the probe or the process that started it, whichever one found
+    // it: an installer or uninstaller running from the directory it is replacing would
+    // otherwise be named as a holder, and closing it is a request nobody can answer.
+    std::vector<Holder> holders = findProcessesRunningFrom(installDir);
+    const std::vector<unsigned long> asking = askingProcessIds();
+    std::vector<Holder> fileHolders;
+    const unsigned long error = findProcessesUsingFiles(collectPayloadFiles(installDir), fileHolders);
+    for (const Holder &holder : fileHolders) {
+        if (std::find(asking.begin(), asking.end(), holder.processId) != asking.end()) {
+            continue;
+        }
+        const bool alreadyNamed = std::any_of(holders.begin(), holders.end(), [&holder](const Holder &named) {
+            return named.processId == holder.processId;
+        });
+        if (!alreadyNamed) {
+            holders.push_back(holder);
+        }
+    }
+
+    // Nobody was named. That is not yet the answer that nothing holds the payload: a lookup
+    // that failed only makes the probe unable to answer when it also named nobody, and a
+    // payload executable that refuses to be replaced is running even when neither lookup
+    // could name it.
     if (holders.empty()) {
-        // No output: the installer words the "nothing is holding them" case, and it
-        // owns the message either way.
+        // Neither process lookup is proof that the payload is free: the Restart Manager does
+        // not report every mapping, and a program running under another account cannot be
+        // read from here, so "nobody was named" is not the answer "nothing is running". The
+        // file cannot be missed - a running image refuses the write the replacement needs -
+        // and an answer of "nothing is holding them" over that locked file is what sent
+        // updates into an uninstall that could only fail halfway. Reported as a check that
+        // could not name what it found, so the guard asks the user to close it and retry
+        // instead of replacing a payload that is still running.
+        const std::vector<std::wstring> inUse = payloadExecutablesInUse(installDir);
+        if (!inUse.empty()) {
+            writeLine(inUseLine(inUse));
+            return EXIT_PROBE_FAILED;
+        }
+
+        if (error != ERROR_SUCCESS) {
+            writeLine(L"the Restart Manager lookup failed with win32 error " + std::to_wstring(error));
+            return EXIT_PROBE_FAILED;
+        }
+
+        // No output in the naming mode: the installer words the "nothing is holding them"
+        // case, and it owns the message either way. The acting modes say it themselves,
+        // because their line is logged verbatim next to what they were asked to do.
+        if (mode != Mode::Name) {
+            writeLine(L"nothing is holding the files");
+        }
         return EXIT_NO_HOLDERS;
     }
-    writeLine(formatHolders(holders));
-    return EXIT_HOLDERS_FOUND;
+    if (mode == Mode::Name) {
+        writeLine(formatHolders(holders));
+        return EXIT_HOLDERS_FOUND;
+    }
+    if (mode == Mode::End) {
+        const EndHoldersResult result = endHolders(holders, END_WAIT_MILLISECONDS);
+        writeLine(result.report);
+        return result.ended > 0 ? EXIT_HOLDERS_FOUND : EXIT_NO_HOLDERS;
+    }
+
+    // Hidden windows are asked to close here: an instance in the notification area is the one
+    // this update has no other way to reach, and the guard's end answer is behind that attempt.
+    const CloseHoldersResult result = closeCockatriceHolders(holders, CLOSE_WAIT_MILLISECONDS, true);
+    writeLine(result.report);
+    return result.askedToClose > 0 ? EXIT_HOLDERS_FOUND : EXIT_NO_HOLDERS;
 }
diff --git a/tools/installer-holder-probe/payload_locks.cpp b/tools/installer-holder-probe/payload_locks.cpp
new file mode 100644
index 000000000..83b77ac58
--- /dev/null
+++ b/tools/installer-holder-probe/payload_locks.cpp
@@ -0,0 +1,67 @@
+#include "payload_locks.h"
+
+#include "payload_paths.h"
+
+#include <windows.h>
+
+namespace
+{
+/// How long the second look waits before it re-tests the files that refused the write open.
+/// Only those are re-tested, so the one answer costs this at most once: a scanner, or a
+/// program that is only starting, holds a file without write sharing for a moment, and that
+/// must not turn a free payload into a run the user has to answer.
+constexpr DWORD RECHECK_DELAY_MILLISECONDS = 300;
+
+/// Whether @p path refuses an open that asks to write it.
+///
+/// Windows opens a program's image, and every module loaded into it, with read and delete
+/// sharing but not write sharing, so this is refused for as long as the program runs and by
+/// nothing else that merely reads the file. A read-only file is skipped: it refuses a write
+/// open for its own reason and would answer yes for a payload nobody is running, and the
+/// purge clears that attribute before it deletes anything. Any other error is no answer at
+/// all - access this probe does not have says nothing about whether the file is in use, and
+/// still answering "in use" would stop installs that could have finished.
+bool refusesWrite(const std::wstring &path)
+{
+    const DWORD attributes = GetFileAttributesW(path.c_str());
+    if (attributes == INVALID_FILE_ATTRIBUTES ||
+        (attributes & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY)) != 0) {
+        return false;
+    }
+    const HANDLE file = CreateFileW(path.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                    nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
+    if (file == INVALID_HANDLE_VALUE) {
+        return GetLastError() == ERROR_SHARING_VIOLATION;
+    }
+    // Nothing was written: the open is the whole test, and closing the handle leaves the
+    // file exactly as it was.
+    CloseHandle(file);
+    return false;
+}
+} // namespace
+
+std::vector<std::wstring> payloadExecutablesInUse(const std::wstring &installDir)
+{
+    std::vector<std::wstring> refused;
+    for (const wchar_t *name : PAYLOAD_PROGRAMS) {
+        const std::wstring path = installDir + L"\\" + name;
+        if (refusesWrite(path)) {
+            refused.push_back(path);
+        }
+    }
+    if (refused.empty()) {
+        return refused;
+    }
+
+    // One re-test of the files that refused, and only those: the answer is shown to a user
+    // who then has to close a program and run the installer again, so it has to be the
+    // settled state rather than a moment in which something happened to hold the file.
+    Sleep(RECHECK_DELAY_MILLISECONDS);
+    std::vector<std::wstring> settled;
+    for (const std::wstring &path : refused) {
+        if (refusesWrite(path)) {
+            settled.push_back(path);
+        }
+    }
+    return settled;
+}
diff --git a/tools/installer-holder-probe/payload_locks.h b/tools/installer-holder-probe/payload_locks.h
new file mode 100644
index 000000000..1d23648a2
--- /dev/null
+++ b/tools/installer-holder-probe/payload_locks.h
@@ -0,0 +1,36 @@
+#ifndef PAYLOAD_LOCKS_H
+#define PAYLOAD_LOCKS_H
+
+#include <string>
+#include <vector>
+
+/**
+ * @brief The payload executables in @p installDir that refuse to be written, as full paths:
+ *        the programs that are running from it right now.
+ *
+ * The guard asks two questions and both can come back empty for a running instance: the
+ * Restart Manager does not reliably report a program's own image or the modules it mapped,
+ * and the image path of a process running under another account cannot be read from here,
+ * so the process is not named either. The file itself is the evidence neither question
+ * depends on: a program's image is opened without write sharing for as long as it runs, so
+ * the write access replacing it needs is refused for exactly that long, while a file that is
+ * merely being read still accepts it.
+ *
+ * An installer that answers "nothing is holding the payload" from two lookups that both
+ * missed is what sent updates into an uninstall that could only fail halfway, leaving the
+ * previous version half removed. This answer is what keeps that from being said: a payload
+ * executable that refuses the write is running, whether or not this process may name it.
+ *
+ * Only the programs the payload installs are tested, not every file the purge removes. A
+ * payload executable refusing the write proves that it is running; a mapped module belongs
+ * to a running executable, which is tested. A DLL or qt.conf on its own can be held by the
+ * program that is asking - the uninstaller runs in place from the directory it empties - and
+ * naming that as a holder is the loop the guard already had.
+ *
+ * @return one full path per executable that still refused after the re-test, in the order
+ *         PAYLOAD_PROGRAMS names them; empty when every one of them can be written, or none
+ *         is installed.
+ */
+std::vector<std::wstring> payloadExecutablesInUse(const std::wstring &installDir);
+
+#endif
diff --git a/tools/installer-holder-probe/payload_paths.cpp b/tools/installer-holder-probe/payload_paths.cpp
new file mode 100644
index 000000000..8d6274e91
--- /dev/null
+++ b/tools/installer-holder-probe/payload_paths.cpp
@@ -0,0 +1,48 @@
+#include "payload_paths.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <iterator>
+
+namespace
+{
+/// Compares two file names the way the file system does, without a locale.
+///
+/// Only the names above are ever compared against, and all of them are ASCII, so folding
+/// the ASCII letters is the whole answer. The Windows ordinal comparison is not used here
+/// on purpose: this file is compiled into a test that runs everywhere, and the question
+/// "is this image a program the payload installs?" must be answerable without Windows.
+bool equalsIgnoringAsciiCase(const std::wstring &left, const std::wstring &right)
+{
+    if (left.size() != right.size()) {
+        return false;
+    }
+    return std::equal(left.begin(), left.end(), right.begin(), [](wchar_t a, wchar_t b) {
+        const wchar_t foldedA = a >= L'A' && a <= L'Z' ? static_cast<wchar_t>(a - L'A' + L'a') : a;
+        const wchar_t foldedB = b >= L'A' && b <= L'Z' ? static_cast<wchar_t>(b - L'A' + L'a') : b;
+        return foldedA == foldedB;
+    });
+}
+} // namespace
+
+std::wstring fileNameOf(const std::wstring &path)
+{
+    const std::size_t separator = path.find_last_of(L"\\/");
+    return separator == std::wstring::npos ? path : path.substr(separator + 1);
+}
+
+std::wstring parentDirectoryOf(const std::wstring &path)
+{
+    const std::size_t separator = path.find_last_of(L"\\/");
+    return separator == std::wstring::npos ? std::wstring() : path.substr(0, separator);
+}
+
+bool isPayloadProgram(const std::wstring &imageName)
+{
+    for (const wchar_t *program : PAYLOAD_PROGRAMS) {
+        if (equalsIgnoringAsciiCase(imageName, program)) {
+            return true;
+        }
+    }
+    return false;
+}
diff --git a/tools/installer-holder-probe/payload_paths.h b/tools/installer-holder-probe/payload_paths.h
new file mode 100644
index 000000000..ea63732f5
--- /dev/null
+++ b/tools/installer-holder-probe/payload_paths.h
@@ -0,0 +1,51 @@
+#ifndef PAYLOAD_PATHS_H
+#define PAYLOAD_PATHS_H
+
+#include <string>
+
+/**
+ * @brief The file names of the programs the payload installs, in the order the guard names
+ *        them.
+ *
+ * The single list behind isPayloadProgram(), so the guard acts on exactly the programs it
+ * names, and so a payload program added later is closed, ended and tested for a lock
+ * without a second list to update. A payload executable that refuses to be written is
+ * running, which is what makes this list the evidence the two process lookups cannot
+ * provide - see payloadExecutablesInUse().
+ */
+inline constexpr const wchar_t *PAYLOAD_PROGRAMS[] = {L"cockatrice.exe", L"oracle.exe", L"servatrice.exe"};
+
+/**
+ * @brief The last name in @p path: what follows its last separator, or @p path itself when
+ *        it has none.
+ *
+ * Empty for an empty path and for one that ends in a separator, which has no name of its
+ * own - a caller that hands in a directory there gets no name rather than the directory's
+ * own last component.
+ */
+std::wstring fileNameOf(const std::wstring &path);
+
+/**
+ * @brief The directory @p path lies in, without a trailing separator.
+ *
+ * Empty when @p path has no directory part. Used to tell where a process was started from:
+ * an image running directly in the install directory has that directory as its parent,
+ * while one started from a folder below it has that folder, and the two are not the same
+ * answer to "does this process belong to the installation being replaced?".
+ */
+std::wstring parentDirectoryOf(const std::wstring &path);
+
+/**
+ * @brief Whether @p imageName is one of the programs the payload installs.
+ *
+ * The single place that answers which images are Cockatrice's own, so the guard acts on the
+ * same set it names, and so a program a user happens to keep in the install directory is
+ * never treated as an instance of the application. Matched on the image name alone, without
+ * case: the names are the payload's own, and the comparison is deliberately free of Windows
+ * API so it can be exercised off Windows.
+ *
+ * @param imageName the file name of a process image, empty when it could not be read
+ */
+bool isPayloadProgram(const std::wstring &imageName);
+
+#endif
diff --git a/tools/installer-holder-probe/restart_manager_holders.cpp b/tools/installer-holder-probe/restart_manager_holders.cpp
index 39f6a0049..21ddd6988 100644
--- a/tools/installer-holder-probe/restart_manager_holders.cpp
+++ b/tools/installer-holder-probe/restart_manager_holders.cpp
@@ -5,10 +5,12 @@
 // here is a requirement; Regroup would sort them the other way round.
 #include <windows.h>
 #include <restartmanager.h>
+#include <tlhelp32.h>
 // clang-format on
 
 #include <algorithm>
 #include <iterator>
+#include <utility>
 
 namespace
 {
@@ -20,6 +22,11 @@ constexpr std::size_t MAX_PROBED_FILES = 2000;
 /// How deep the Plugins walk goes. Its real shape is Plugins\<category>\<plugin>.dll.
 constexpr int MAX_PLUGIN_DEPTH = 4;
 
+/// How many parents askingProcessIds() walks up before it stops on its own. A real chain
+/// is the probe, the installer or uninstaller, and the shell that started it; the bound
+/// only keeps a snapshot with a cycle in it from walking forever.
+constexpr int MAX_ASKER_LEVELS = 8;
+
 void collectFilesOf(const std::wstring &directory, int depth, int maxDepth, std::vector<std::wstring> &files)
 {
     if (files.size() >= MAX_PROBED_FILES) {
@@ -70,10 +77,30 @@ std::wstring imagePathOf(unsigned long processId)
     return imagePath;
 }
 
-std::wstring fileNameOf(const std::wstring &path)
+/// @p directory with exactly one trailing separator, so that two spellings of the same
+/// directory compare equal and a sibling whose name merely begins with the same letters
+/// ("Cockatrice-old" next to "Cockatrice") cannot pass for it.
+std::wstring directoryPrefixOf(const std::wstring &directory)
 {
-    const std::size_t separator = path.find_last_of(L"\\/");
-    return separator == std::wstring::npos ? path : path.substr(separator + 1);
+    std::wstring prefix = directory;
+    while (!prefix.empty() && (prefix.back() == L'\\' || prefix.back() == L'/')) {
+        prefix.pop_back();
+    }
+    prefix += L'\\';
+    return prefix;
+}
+
+/// Whether @p left and @p right name the same directory, compared the way the file system
+/// does: a difference in case is not a difference in directory, and a trailing separator
+/// changes nothing.
+bool isSameDirectory(const std::wstring &left, const std::wstring &right)
+{
+    if (left.empty() || right.empty()) {
+        return false;
+    }
+    const std::wstring leftPrefix = directoryPrefixOf(left);
+    const std::wstring rightPrefix = directoryPrefixOf(right);
+    return CompareStringOrdinal(leftPrefix.c_str(), -1, rightPrefix.c_str(), -1, TRUE) == CSTR_EQUAL;
 }
 
 /// Copies a fixed-size, NUL-terminated WCHAR array the API filled in.
@@ -96,13 +123,44 @@ Holder holderOf(const RM_PROCESS_INFO &info)
 }
 } // namespace
 
-std::vector<std::wstring> collectProbeFiles(const std::wstring &installDir)
+std::vector<std::wstring> collectPayloadFiles(const std::wstring &installDir)
 {
     std::vector<std::wstring> files;
-    // depth 0, maxDepth 0: the install root's files and nothing below it. Its data
-    // directory holds downloaded pictures, which the purge does not touch and which
-    // would turn this into a walk over thousands of files.
-    collectFilesOf(installDir, 0, 0, files);
+    // The programs the payload installs, by name, plus the configuration file next to
+    // them: what the purge deletes by name, and therefore what an instance can have
+    // mapped.
+    std::vector<std::wstring> replaced(std::begin(PAYLOAD_PROGRAMS), std::end(PAYLOAD_PROGRAMS));
+    replaced.emplace_back(L"qt.conf");
+    for (const std::wstring &name : replaced) {
+        const std::wstring path = installDir + L"\\" + name;
+        const DWORD attributes = GetFileAttributesW(path.c_str());
+        if (attributes != INVALID_FILE_ATTRIBUTES && (attributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+            files.push_back(path);
+        }
+    }
+
+    // Every top-level DLL: the set the purge deletes and therefore the set a running
+    // instance can have mapped. Matched by mask rather than by a list of expected names,
+    // so a transitive dependency nobody thought of is covered as well.
+    WIN32_FIND_DATAW entry{};
+    const HANDLE dlls = FindFirstFileW((installDir + L"\\*.dll").c_str(), &entry);
+    if (dlls != INVALID_HANDLE_VALUE) {
+        do {
+            if (files.size() >= MAX_PROBED_FILES) {
+                break;
+            }
+            if ((entry.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0 ||
+                (entry.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
+                continue;
+            }
+            files.push_back(installDir + L"\\" + entry.cFileName);
+        } while (FindNextFileW(dlls, &entry) != 0);
+        FindClose(dlls);
+    }
+
+    // Plugins is the other tree the purge removes. Its data directory is not: it holds
+    // downloaded pictures, which the purge does not touch and which would turn this into
+    // a walk over thousands of files.
     if (files.size() < MAX_PROBED_FILES) {
         collectFilesOf(installDir + L"\\Plugins", 0, MAX_PLUGIN_DEPTH, files);
     }
@@ -158,3 +216,90 @@ unsigned long findProcessesUsingFiles(const std::vector<std::wstring> &files, st
     RmEndSession(session);
     return error;
 }
+
+std::vector<unsigned long> askingProcessIds()
+{
+    std::vector<unsigned long> asking;
+    asking.push_back(GetCurrentProcessId());
+
+    // One snapshot for the whole walk: the parent ids come from it, so a level costs no
+    // second lookup.
+    std::vector<PROCESSENTRY32W> processes;
+    const HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snapshot == INVALID_HANDLE_VALUE) {
+        return asking;
+    }
+    PROCESSENTRY32W entry{};
+    entry.dwSize = sizeof(entry);
+    if (Process32FirstW(snapshot, &entry) != FALSE) {
+        do {
+            processes.push_back(entry);
+        } while (Process32NextW(snapshot, &entry) != FALSE);
+    }
+    CloseHandle(snapshot);
+
+    unsigned long current = asking.back();
+    for (int level = 0; level < MAX_ASKER_LEVELS; ++level) {
+        const auto named = std::find_if(processes.begin(), processes.end(), [current](const PROCESSENTRY32W &process) {
+            return process.th32ProcessID == current;
+        });
+        if (named == processes.end() || named->th32ParentProcessID == 0) {
+            break;
+        }
+        const unsigned long parent = named->th32ParentProcessID;
+        if (isPayloadProgram(fileNameOf(imagePathOf(parent)))) {
+            break;
+        }
+        asking.push_back(parent);
+        current = parent;
+    }
+    return asking;
+}
+
+std::vector<Holder> findProcessesRunningFrom(const std::wstring &installDir)
+{
+    std::vector<Holder> holders;
+    if (installDir.empty()) {
+        return holders;
+    }
+
+    // Never the probe, and never the installer or uninstaller that started it: either can
+    // run from the directory being replaced, and naming one asks the user to close the
+    // program that is asking (see askingProcessIds).
+    const std::vector<unsigned long> asking = askingProcessIds();
+
+    const HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (snapshot == INVALID_HANDLE_VALUE) {
+        return holders;
+    }
+    PROCESSENTRY32W entry{};
+    entry.dwSize = sizeof(entry);
+    if (Process32FirstW(snapshot, &entry) != FALSE) {
+        do {
+            if (std::find(asking.begin(), asking.end(), entry.th32ProcessID) != asking.end()) {
+                continue;
+            }
+            // One process at a time, because the path is per process; a process that
+            // refuses to be read is not named here and is still named by Restart
+            // Manager when it holds a handle. The idle process has no image at all.
+            const std::wstring imagePath = imagePathOf(entry.th32ProcessID);
+            const std::wstring imageName = fileNameOf(imagePath);
+            // Only the programs the payload installs, and only those started from the
+            // directory itself: a folder a user installs into can hold other applications,
+            // each in its own subfolder, and one of those is not an instance of this
+            // payload. Naming it would ask for a close the probe cannot send and an end it
+            // would refuse to perform, so the guard could only ever abort. A program below
+            // the directory that really does hold a payload file is named by
+            // findProcessesUsingFiles, which is the lookup for that question.
+            if (!isPayloadProgram(imageName) || !isSameDirectory(parentDirectoryOf(imagePath), installDir)) {
+                continue;
+            }
+            Holder holder;
+            holder.processId = entry.th32ProcessID;
+            holder.imageName = imageName;
+            holders.push_back(std::move(holder));
+        } while (Process32NextW(snapshot, &entry) != FALSE);
+    }
+    CloseHandle(snapshot);
+    return holders;
+}
diff --git a/tools/installer-holder-probe/restart_manager_holders.h b/tools/installer-holder-probe/restart_manager_holders.h
index d69fc0259..e966b70b8 100644
--- a/tools/installer-holder-probe/restart_manager_holders.h
+++ b/tools/installer-holder-probe/restart_manager_holders.h
@@ -2,22 +2,25 @@
 #define RESTART_MANAGER_HOLDERS_H
 
 #include "holder_line.h"
+#include "payload_paths.h"
 
 #include <string>
 #include <vector>
 
 /**
- * @brief Lists the files a failed purge can be holding up, as full paths.
+ * @brief Lists the payload files, as full paths.
  *
- * Everything directly in @p installDir plus everything below its Plugins directory:
- * those are the two things the purge removes, so they are the two sets of files a
- * holder can be holding. Restart Manager refuses a directory with ERROR_ACCESS_DENIED,
- * which is why the probe registers files and this has to name them first.
+ * The set is what the installer replaces and the purge removes: the three executables,
+ * qt.conf, every top-level DLL and everything below Plugins. A document, a log or a
+ * screenshot the user happens to have open in the install directory is not part of it,
+ * so it cannot be mistaken for a running instance and block an upgrade.
  *
- * Missing or unreadable directories are skipped rather than reported, and the list is
- * capped: this runs on the abort path and must not walk a tree of downloaded pictures.
+ * Restart Manager refuses a directory with ERROR_ACCESS_DENIED, which is why the probe
+ * registers files and this has to name them first. Missing files and unreadable
+ * directories are skipped rather than reported, and the list is capped: this runs before
+ * the first page and on the abort path, and must not walk a tree of downloaded pictures.
  */
-std::vector<std::wstring> collectProbeFiles(const std::wstring &installDir);
+std::vector<std::wstring> collectPayloadFiles(const std::wstring &installDir);
 
 /**
  * @brief Names the applications and services that have one of @p files open or mapped.
@@ -32,4 +35,54 @@ std::vector<std::wstring> collectProbeFiles(const std::wstring &installDir);
  */
 unsigned long findProcessesUsingFiles(const std::vector<std::wstring> &files, std::vector<Holder> &holders);
 
+/**
+ * @brief Lists every payload program whose image lies in @p installDir itself.
+ *
+ * Restart Manager answers the question "who has this file open", and a running instance
+ * does not necessarily have one open: its own image and the modules it loaded are mapped
+ * into it, not opened by it, and RmGetList does not reliably report a mapping. That is
+ * the state the failed updates this probe exists for were in - every DLL still on disk,
+ * an instance running from the directory, and "nothing is holding them any more" as the
+ * answer - so an answer built on file handles alone cannot be the guard's authority.
+ *
+ * Only the programs the payload installs are named, and only when the image lies directly
+ * in @p installDir. A folder a user installs into can hold other applications, each in its
+ * own subfolder, and those are not instances of this one: they hold none of the payload,
+ * neither closing nor ending them would free a file the purge removes, and naming them
+ * leaves the guard with an answer that can never be carried out. A program below the
+ * directory that does hold a payload file is still named, by findProcessesUsingFiles.
+ *
+ * Reading the image path needs PROCESS_QUERY_LIMITED_INFORMATION and
+ * QueryFullProcessImageNameW, neither of which depends on the bitness of either process,
+ * so a 64-bit instance is named from this 32-bit stub. The comparison is on the directory,
+ * not on an image name alone, so a program that merely shares a name with a payload program
+ * is never named.
+ *
+ * @param installDir the directory being replaced, as a full path.
+ * @return one entry per payload program running from it, in snapshot order, without the
+ *         processes named by askingProcessIds(); empty when the directory is empty or no
+ *         payload program runs from it.
+ */
+std::vector<Holder> findProcessesRunningFrom(const std::wstring &installDir);
+
+/**
+ * @brief The processes that must never be named as holders: the probe and the ones that
+ *        started it.
+ *
+ * The installer or uninstaller doing the asking can legitimately run from the directory it
+ * is replacing - the old uninstaller is started with _?= so it stays in $INSTDIR, and an
+ * installer can be downloaded into the folder - and naming it asks the user to close the
+ * program that is asking. That cannot be answered: the close skips it, the end offer skips
+ * it, and the guard loops until the user cancels, which is what a run that named itself
+ * did.
+ *
+ * The walk up the parent chain stops at the first program the payload installs, because in
+ * an in-app update the installer's own parent is the Cockatrice instance being replaced -
+ * the one the guard exists to name.
+ *
+ * @return process ids, the probe first, then its ancestors while they are not payload
+ *         programs; only the probe itself when the snapshot fails.
+ */
+std::vector<unsigned long> askingProcessIds();
+
 #endif
diff --git a/vcpkg b/vcpkg
index 9e593bb18..9eec002df 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 9e593bb18ea69cc5095e012465dcd675a822ed0d
+Subproject commit 9eec002df1cd109f8f104cd966a763daf9751489
diff --git a/vcpkg.json b/vcpkg.json
index f12227024..8c9c64161 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-  "builtin-baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d",
+  "builtin-baseline": "9eec002df1cd109f8f104cd966a763daf9751489",
   "dependencies": [
     "gtest",
     "liblzma",