From a23f0b43a698b3bb75dbc350b1bbfcde5e83523a Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:26:50 +0100
Subject: [PATCH 01/14] [Replay] Build a compact event history index (#7611)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Turn replay protocol events into short localized summaries with an actor, badge, and time so the history UI can render them without retaining the replay or duplicating the chat log.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 cockatrice/CMakeLists.txt                     |   1 +
 .../widgets/replay/replay_event_index.cpp     | 876 ++++++++++++++++++
 .../widgets/replay/replay_event_index.h       |  43 +
 3 files changed, 920 insertions(+)
 create mode 100644 cockatrice/src/interface/widgets/replay/replay_event_index.cpp
 create mode 100644 cockatrice/src/interface/widgets/replay/replay_event_index.h

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index b76783167..cf195fb5f 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -252,6 +252,7 @@ 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_manager.cpp
     src/interface/widgets/replay/replay_quick_settings_widget.cpp
     src/interface/widgets/replay/replay_timeline_widget.cpp
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

From fc27cb7a59266f63463d3fd54b6d0fe25fc92c96 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:26:50 +0100
Subject: [PATCH 02/14] [Replay] Add a clickable replay history sidebar (#7612)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Render the event index as a scrollable list of event boxes. Selecting an entry seeks the replay to that event and keeps the current event highlighted while playback advances.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 cockatrice/CMakeLists.txt                     |   1 +
 .../widgets/replay/replay_event_sidebar.cpp   | 284 ++++++++++++++++++
 .../widgets/replay/replay_event_sidebar.h     |  50 +++
 3 files changed, 335 insertions(+)
 create mode 100644 cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp
 create mode 100644 cockatrice/src/interface/widgets/replay/replay_event_sidebar.h

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index cf195fb5f..e99735bf7 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -253,6 +253,7 @@ set(cockatrice_SOURCES
     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
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

From 7b4827dadd65c8b7a45c2cd721f232423bc8d537 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:26:51 +0100
Subject: [PATCH 03/14] [Replay] Show the history sidebar in replay tabs
 (#7613)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add the Game History dock to the left of replay tabs, wire it to the replay timeline, and register it with the View menu and layout reset.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../interface/widgets/replay/replay_manager.h | 10 +++++
 .../widgets/replay/replay_widget.cpp          |  5 +++
 .../interface/widgets/replay/replay_widget.h  |  5 +++
 .../src/interface/widgets/tabs/tab_game.cpp   | 40 ++++++++++++++++++-
 .../src/interface/widgets/tabs/tab_game.h     |  3 +-
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h
index 34bae5f9a..e3745778e 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.h
@@ -66,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);
 
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
index 3f0bf35d9..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)
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.h b/cockatrice/src/interface/widgets/replay/replay_widget.h
index 5d23b358d..cbb676288 100644
--- a/cockatrice/src/interface/widgets/replay/replay_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.h
@@ -38,6 +38,11 @@ public:
 
     [[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);
 
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index 34d6f8a51..ac9edd1ba 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -27,6 +27,7 @@
 #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"
@@ -98,7 +99,7 @@ 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
@@ -115,6 +116,7 @@ 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);
@@ -158,6 +160,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     createPlayAreaWidget();
     createDeckViewContainerWidget();
     replayDock = nullptr;
+    historyDock = nullptr;
 
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
@@ -353,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()));
     }
@@ -429,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"));
     }
@@ -1291,6 +1300,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});
     }
@@ -1360,6 +1373,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);
@@ -1368,6 +1387,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);
@@ -1422,6 +1444,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 412529dc2..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,7 +90,7 @@ 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;

From b04d8b88ac52849784efd9f5cdac8c466c531e22 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:39:40 +0100
Subject: [PATCH 04/14] [Icons] Add SVG currentColor sentinel resolver (#7593)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Qt's SVG renderer has no CSS cascade, so a `currentColor` fill has to be
substituted before the bytes reach QSvgRenderer.

- Match and replace on bytes: both the sentinel and the replacement are
  ASCII, so the document never goes through a UTF-16 round trip, and files
  that are not valid UTF-8 survive unchanged.
- Document that the match is a plain case-insensitive substring, so an
  identifier that merely starts with the sentinel gets rewritten too.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 libcockatrice_utility/CMakeLists.txt          |  2 +
 .../libcockatrice/utility/svg_recolor.cpp     | 44 +++++++++++++
 .../libcockatrice/utility/svg_recolor.h       | 31 +++++++++
 tests/CMakeLists.txt                          |  1 +
 tests/svg_recolor_test.cpp                    | 66 +++++++++++++++++++
 5 files changed, 144 insertions(+)
 create mode 100644 libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp
 create mode 100644 libcockatrice_utility/libcockatrice/utility/svg_recolor.h
 create mode 100644 tests/svg_recolor_test.cpp

diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt
index 8d2cb5b92..98ad40e69 100644
--- a/libcockatrice_utility/CMakeLists.txt
+++ b/libcockatrice_utility/CMakeLists.txt
@@ -8,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
@@ -34,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/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/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5b7e06c20..8b904d30a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -177,6 +177,7 @@ 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)
 cockatrice_add_test(
   NAME
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

From 020d9e8dcb0da71a1588c51fbd947d7c45fb9ad3 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:39:41 +0100
Subject: [PATCH 05/14] [Icons] Add palette-aware themed icon engine (#7594)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A QPixmap snapshot cannot follow palette changes, so expose a QIcon whose
engine resolves the `currentColor` sentinel from the live palette on every
pixmap request. Icons stay legible across light/dark switches without
recreating actions or buttons.

- Resolve the asset, its bytes and its intrinsic size once, and drop them on
  ThemeManager::themeChanged/paletteChanged. A repaint does no file I/O and
  no theme.cfg parse; the palette color stays part of the render cache key.
- Centre the glyph on QRectF(rect).center(): QRect::center() floors and uses
  right = left + width - 1, which shifted every 16x16 item-view glyph up and
  left by a logical pixel and clipped its last row and column.
- Take a raster override's intrinsic size from QImageReader instead of the
  24x24 SVG default, so a non-square override reports the box it draws.
- Set the device pixel ratio before inserting into the render cache, so a
  cache hit no longer detaches the pixmap on every paint.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 cockatrice/CMakeLists.txt               |   1 +
 cockatrice/src/interface/theme_icon.cpp | 300 ++++++++++++++++++++++++
 cockatrice/src/interface/theme_icon.h   |  50 ++++
 oracle/CMakeLists.txt                   |   1 +
 4 files changed, 352 insertions(+)
 create mode 100644 cockatrice/src/interface/theme_icon.cpp
 create mode 100644 cockatrice/src/interface/theme_icon.h

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index e99735bf7..f34961b0b 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -151,6 +151,7 @@ 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
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/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index f68f51f23..4ca2acd07 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -31,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}
 )

From 627c7a83aafee46f51ca7f5e58affb55af561424 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:39:41 +0100
Subject: [PATCH 06/14] [Icons] Migrate UI glyphs to palette-token SVGs (#7595)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Icons] Migrate UI glyphs to palette-token SVGs

Runtime inversion is not a theming system: it rotates hue, breaks duotone art
and mishandles alpha, and a QPixmap snapshot cannot follow a palette change.
Redraw the top-level UI glyph set on a 24x24 grid with `currentColor` as the
paint token, drop Inkscape/Sodipodi cruft, and delete the icons whose metaphor
was duplicated (cogwheel/gear -> settings, scale_balanced -> scales,
update.png -> reload).

Load the glyphs through `loadThemedIcon` so the engine resolves the token from
the palette on every request, and let `themePixmap` use the same resolution for
one-shot pixmaps. `loadColorAdjustedPixmap` is gone; every caller now keeps a
QIcon, which `SettingsButtonWidget::setButtonIcon` accepts instead of a QPixmap.

Content art (mana, counters, countries) keeps its authored colors.

Add a render test covering aspect ratio, palette flips, icon modes and
high-DPI pixmaps.

* [Tests] Keep the icon render test QApplication alive until exit

Creating it as a function-local static tears it down before Qt's library statics
at exit, and libQt6Network then runs QObject destructors against freed memory —
a SEGV the sanitizer leg reports after the tests have already passed. Leak the
application instead, the usual pattern for a test binary.

* [Icons] Render lock and dropdown glyphs through the icon engine

Both generators rendered the sentinel SVG to a fixed height x height pixmap
at DPR 1. The pre-migration path rendered larger and let QIcon scale it, so
on a 2x display the games-list lock (13px) and the banner dropdown arrow
(24px) came back crisp; the new path hands the widget a DPR-1 bitmap that
gets upscaled and blurred.

- The games list asks the themed engine for `icons/lock` directly, so the
  item view paints it at the device pixel ratio and the lock also follows
  HighlightedText on a selected row.
- The dropdown goes through `loadThemedIcon(...).pixmap(size, dpr)`, which
  keeps the glyph's aspect ratio and renders at the requested ratio.
- LockPixmapGenerator has no consumer left, so it and its cache are gone.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 cockatrice/cockatrice.qrc                     |  18 +-
 .../resources/icons/arrow_bottom_green.svg    | 793 ------------------
 cockatrice/resources/icons/arrow_down.svg     |   4 +
 .../resources/icons/arrow_down_green.svg      | 793 ------------------
 cockatrice/resources/icons/arrow_history.svg  |  13 +-
 cockatrice/resources/icons/arrow_left.svg     |   4 +
 .../resources/icons/arrow_left_green.svg      | 791 -----------------
 cockatrice/resources/icons/arrow_redo.svg     |  44 +-
 cockatrice/resources/icons/arrow_right.svg    |   4 +
 .../resources/icons/arrow_right_blue.svg      | 789 -----------------
 .../resources/icons/arrow_right_green.svg     | 789 -----------------
 .../resources/icons/arrow_right_sideboard.svg |   5 +
 .../resources/icons/arrow_to_bottom.svg       |   5 +
 cockatrice/resources/icons/arrow_to_top.svg   |   5 +
 .../resources/icons/arrow_top_green.svg       | 793 ------------------
 cockatrice/resources/icons/arrow_undo.svg     |  44 +-
 cockatrice/resources/icons/arrow_up.svg       |   4 +
 cockatrice/resources/icons/arrow_up_green.svg | 792 -----------------
 .../resources/icons/circle_half_stroke.svg    |   5 +-
 cockatrice/resources/icons/clearsearch.svg    | 278 +-----
 cockatrice/resources/icons/cogwheel.svg       |  29 -
 cockatrice/resources/icons/conceded.svg       | 105 +--
 cockatrice/resources/icons/decrement.svg      | 206 +----
 cockatrice/resources/icons/delete.svg         | 360 +-------
 cockatrice/resources/icons/dragon.svg         |   7 +-
 .../resources/icons/dropdown_collapsed.svg    |  11 +-
 .../resources/icons/dropdown_expanded.svg     |  11 +-
 cockatrice/resources/icons/filter.svg         |  15 +-
 cockatrice/resources/icons/floppy_disk.svg    |   6 +-
 .../resources/icons/forgot_password.svg       |  10 +-
 cockatrice/resources/icons/gear.svg           |   1 -
 cockatrice/resources/icons/increment.svg      | 201 +----
 cockatrice/resources/icons/info.svg           |  46 +-
 cockatrice/resources/icons/lock.svg           | 752 +----------------
 .../resources/icons/not_ready_start.svg       | 370 +-------
 cockatrice/resources/icons/pen_to_square.svg  |   5 +-
 cockatrice/resources/icons/pencil.svg         | 125 +--
 cockatrice/resources/icons/pin.svg            |  26 +-
 cockatrice/resources/icons/player.svg         | 148 +---
 cockatrice/resources/icons/ready_start.svg    |  82 +-
 cockatrice/resources/icons/reload.svg         |  11 +-
 cockatrice/resources/icons/remove_row.svg     | 358 +-------
 cockatrice/resources/icons/rename.svg         |  15 +-
 cockatrice/resources/icons/scale_balanced.svg |   1 -
 cockatrice/resources/icons/scales.svg         |  11 +-
 cockatrice/resources/icons/scroll.svg         |   7 +-
 cockatrice/resources/icons/search.svg         | 202 +----
 cockatrice/resources/icons/settings.svg       | 282 +------
 cockatrice/resources/icons/share.svg          |  30 +-
 .../resources/icons/sort_arrow_down.svg       |   8 +-
 cockatrice/resources/icons/spectator.svg      | 108 +--
 cockatrice/resources/icons/swap.svg           |  18 +-
 cockatrice/resources/icons/sync.svg           |  10 +-
 cockatrice/resources/icons/tab_changed.svg    | 118 +--
 cockatrice/resources/icons/update.png         | Bin 7262 -> 0 bytes
 cockatrice/resources/icons/view.svg           |  33 +-
 cockatrice/src/filters/filter_builder.cpp     |   4 +-
 .../player/player_list_widget.cpp             |  15 +-
 .../game_graphics/zones/view_zone_widget.cpp  |   5 +-
 .../src/interface/pixel_map_generator.cpp     |  54 +-
 .../src/interface/pixel_map_generator.h       |  23 +-
 .../abstract_analytics_panel_widget.cpp       |   4 +-
 .../deck_editor_database_display_widget.cpp   |  10 +-
 .../deck_editor_deck_dock_widget.cpp          |  10 +-
 .../deck_editor_filter_dock_widget.cpp        |   6 +-
 .../deck_list_history_manager_widget.cpp      |   8 +-
 .../interface/widgets/dialogs/dlg_connect.cpp |   8 +-
 .../widgets/dialogs/dlg_edit_tokens.cpp       |   6 +-
 .../widgets/dialogs/dlg_manage_sets.cpp       |  12 +-
 .../widgets/dialogs/dlg_register.cpp          |   6 +-
 .../widgets/dialogs/settings_view.cpp         |   4 +-
 .../quick_settings/settings_button_widget.cpp |  10 +-
 .../quick_settings/settings_button_widget.h   |   4 +-
 .../widgets/server/game_selector.cpp          |   6 +-
 .../interface/widgets/server/games_model.cpp  |   8 +-
 .../interface/widgets/server/games_model.h    |   2 +
 .../remote/remote_replay_list_tree_widget.cpp |   4 +-
 .../deck_editor_settings_page.cpp             |  10 +-
 .../settings_page/messages_settings_page.cpp  |   8 +-
 .../settings_page/shortcut_settings_page.cpp  |   6 +-
 .../tabs/api/archidekt/tab_archidekt.cpp      |   4 +-
 .../commander_bracket_widget.cpp              |   4 +-
 .../widgets/tabs/tab_deck_storage.cpp         |  20 +-
 .../widgets/tabs/tab_public_decks.cpp         |   7 +-
 .../interface/widgets/tabs/tab_replays.cpp    |  20 +-
 .../src/interface/widgets/tabs/tab_room.cpp   |   4 +-
 .../interface/widgets/tabs/tab_supervisor.cpp |   3 +-
 .../widgets/utility/sequence_edit.cpp         |   6 +-
 ...database_display_filter_toolbar_widget.cpp |  20 +-
 .../visual_database_display_widget.cpp        |  10 +-
 .../visual_deck_display_options_widget.cpp    |   8 +-
 .../visual_deck_editor_widget.cpp             |   4 +-
 .../visual_deck_storage_search_widget.cpp     |   6 +-
 .../visual_deck_storage_widget.cpp            |   6 +-
 cockatrice/src/interface/window_main.cpp      |   5 +-
 tests/theme_migration/CMakeLists.txt          |   4 +
 .../theme_icon_render_test.cpp                | 189 +++++
 97 files changed, 543 insertions(+), 9711 deletions(-)
 delete mode 100644 cockatrice/resources/icons/arrow_bottom_green.svg
 create mode 100644 cockatrice/resources/icons/arrow_down.svg
 delete mode 100644 cockatrice/resources/icons/arrow_down_green.svg
 create mode 100644 cockatrice/resources/icons/arrow_left.svg
 delete mode 100644 cockatrice/resources/icons/arrow_left_green.svg
 create mode 100644 cockatrice/resources/icons/arrow_right.svg
 delete mode 100644 cockatrice/resources/icons/arrow_right_blue.svg
 delete mode 100644 cockatrice/resources/icons/arrow_right_green.svg
 create mode 100644 cockatrice/resources/icons/arrow_right_sideboard.svg
 create mode 100644 cockatrice/resources/icons/arrow_to_bottom.svg
 create mode 100644 cockatrice/resources/icons/arrow_to_top.svg
 delete mode 100644 cockatrice/resources/icons/arrow_top_green.svg
 create mode 100644 cockatrice/resources/icons/arrow_up.svg
 delete mode 100644 cockatrice/resources/icons/arrow_up_green.svg
 delete mode 100644 cockatrice/resources/icons/cogwheel.svg
 delete mode 100644 cockatrice/resources/icons/gear.svg
 delete mode 100644 cockatrice/resources/icons/scale_balanced.svg
 delete mode 100644 cockatrice/resources/icons/update.png
 create mode 100644 tests/theme_migration/theme_icon_render_test.cpp

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/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 825c0aee757322230b41bc9ef0be3ed08260a5d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7262
zcmV-k9HHZhP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00004XF*Lt006O$eEU(800001
zb5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#000}c
zNkl<Zc-rk<33MFQm3`G}?dn!bwq;q?*0K%qibEJ6#3nXyAT~Z`n-OtxSTZvVb7mmt
zWD-siVq)pABw?E{naO|+nUDl01`_OK27HVy%QD^o*?7@r?TfYVyINA${8wGws^$Nx
zYIV03t3G^Jb@ig|y7#|#-}_bX1DMThW;2`F%w{&TnaylwGn?7WX14j#xLNjn!bp!L
z-9~!2xF1D&r1&^ed`$%DR>kj_AbmvK$L*N79VLB$^l{SrNbeV4Yql9C0D@>IeUZ40
z6}OzmcjOHG1|yFLL^5D+BfVQBi%EbG1HORtWN{lCB5?hAEIl?zdOPVYVjnRH5O|9t
zeF^DHNspgFaHm2rv<~&8H;~?A62O1ZQ$)~1F|tG98niwW$xwGSk|9_GKtZ;c^fc0w
zrg>yf_h+J;s3g6Sbk}?*0Qzw!>8YYhpN%6sR0KlsYe+8>Ba3-OfJD->L_x>RB5*?i
zzTWrdMb}VHdh69r01VSsh(11K;oA1?+mr6T`|jmgSy{;o7A#1Njg7V2Y&J(sOpGHe
zEG!~AIvTg(%0DnPG}P%PZD3%av%kN;x390Sr@p?vskODW=lJpC4F?V!Xd4_HoCqOd
z&@Egbz0>FkeRSV9a)0ySA9H6r0npT6D*|r`=E!~U!3USzb=O_XSFc{3m6n#aoB*B{
z5fNbz#g82yA0KINZ?7YysIIB0X?XL^H!mDHa-=H+772;)nGx6U=)MPeaC3RT*)cOD
z&?5lG?%ATa<AQOLl9Q7oo__l2>o#uOxZde>UKbx9zjP)|Ah8myRaI3N3kwS`KL7ml
z=Ltc^g5++{HB^)SIe4;>)b<D=0BQK@yx;D4H+MD>AX7B=k--@0Kl#Z|R_@rb<BsLa
zm)~NwTBBy8KXkcVL)F#Q=ihnfo&4vXd#*G{dIrVfc~LC7l`neuk2$<R6%d}y`|Y=;
zmjoQc&#w`MUO?jMi6@@O`u4ZKy*WEO`xfHA7tAGbgk(5>{``sEyLTTWuA(jot^vcx
zGo*LO2=Ip-0e-;>2wN`i_tQuMC5v&?Un7QeQ&z^gxw$JJd+f1qq@<)=cQqtSh-N4z
zL^wcPL}`Go0WH8e(u=*;00|&60E8XU9sK^G_j9L{0GPe|66jCHX#PktQf_(Rfd{_f
za5&Q8Ds0`|-Oc;<?fc;S-~aw+Vl**T*MP#afb`yn&;oeD2kDl}+dB;;;6#D9O3da>
zN#woy>Z{j3{P4ryBno~x%!Ag|)z!FX&z|>w_`@H55r8#7vH9skd;hN73%cijaVuJa
zy^s7kq$I$(^^Ia^=QsFIKKW$Ud+)vX1PSAEh>u?g^Q1*bN82}S*zlD{9(e=_-+JcE
zneHjL1{`qd*FCWM9u@fBFoJ_kYwlZVz4Srp(NGfL8iU~bj$tVG(MKQU5I_GNV(!y8
zj<di#YzYYoi|@Si&JDNUetUF&etuPNZ|}IjnrYqrgaBU9eOpgpAX<T2*W8<Jy|lmV
z=yVc*`2&c+TeWxZ-e*><SaAyhJ`Bue$;il9L86_%2@el%E-WnU@W+y_yMNU^qW+hG
zFN#60F1U5=z1iHQ17!uFAi%Xoz$fv06k++_=j7!4Q)FbM!^B-0y755HN!;emo4>kk
z+qT4G$Btd@?Cdm@P+Cg};1hr1=lMt=6NRv8^*z^Giw~3^4TS~JWb31kKAQUOyYK$k
z>2%&aU(G!WeC4qvOO|91L3|5|7|M%^ihA|V?YjF{ZU+hY>5I~#XRuckf<8WYx5OO;
zmjp@zsJ<Wxdv5>14}S1;TwGj|3A-A6sTJ_Hh=_>jEnBwSx_<q77a2H}T9$R)eXF+n
zL?7wvvplJj?tvcp=T2^KU9~;iTJo3Rkiep2`hl4I@66WJ?QFFI!pS6-a{Kn}IeMB(
z>G$!!jKvv{xi}Mi@c^&X2kxDJyL;QS!6bmuD8K}rGU92+3?|^@;7Z<}u{d2If*O3@
zs}FbH|Hig}a|Bl1FF4Oz%Rn<+>1%|>-a2R<Y=x%Y1{ib=!GNm|T;pRP6>yXg4j%eL
z&aY{iK3}p&A^N05LMwo~wJo)iVInUh-LCsz-x~JkfBx{9KnTE@;7>L;KLMrfC2+Cz
z3n=d>6~I@IQpJ`5zRY(kf_<OW0FZ+#u>!c8nVcc))il*k5=2TA9(LaQ`c~LKMG{#3
z%wAo!ZFp=5j@2E7(+$U=xxaZ5Fr^7rf-k|0mmw;34J!O6!RM8Pkh&3xC2#}OG}p*e
z#o)^x?!5O`Ux)qwa`2fz2{7-#9~~csk1GEHg#`Q|*Pv>YD#2BYa>)T+GCHLOfab>)
z$sReCBt#HjlDQ;<Y~6w-;3>@Gr$_?pd^P=UGNew_AA^r7{tDeAUDQ#^OGO?HD5(!u
z=JKWPf|2RdvnZ3+LbL=+oWgE(Q;mA!Ncc_s&h5Ya`ov$JJZM-PTIQqa?;P%ce?R>*
z*n8=>67bbPfnt<u`h5oYaz^n?<u3=Hm$N`Zip-Qufe1V(EspoGd)M~=yz^Oq2oMnX
z4Gj%2Ha0eAz(3!57G5~M3o5%R=%dt#-&dJ(V2VD~3?J2<NYy{Z4M>lWLry{h>^yA>
z87+aE-?{BS?s(Q83ozx8-_z3rm6ervvBa!5`F}2Z7xonW7Yq@>r!`7>L!(p*B+c(@
z&hW9_iP8Wttb#MeDRf@(;>qvI?cDYYeG*s=CoD7?T7dfcdVvJV$;l8C6Eo|;|J{YR
z;7sF5-BGFpH#$5995L}=kB*1vh)9UEMuWvS9U>KplRzj(t}JOJ6L)OUr}~$2+_^MU
z_$}2}YCM8f;i^dBuygCHx50=1mjBFDM4;c+ps%k_=m`l4uz2xeh>D7u72v;7^h+VG
z*Bhl?pyH$KkYrm7@dWe;YdEL^G+qg_pWs8_;Cl~dE_IUMNQ7ZywJOmhJm9#UTVJ_t
z;=}Ld=T4gl?CR=*l9Cdrt*ynYYiAVvcP{=9Tx>fp!HuoX7sMvQ+NEn@_0l!4$hJrV
zzS15m;N!K^#;SM7j)OM%DjBGD6IrR5LYG-JiLT%|*!A_7Z+q6L2n?Ru?(Bq1moCBO
z%a@_Ix7VLsc~IJc^7r9X;|bkNUSwDVtX#4RvXisH7G<M@%mQC7(WU@C)!Qq4y5c>&
z`aRCnEaDQJD#7V{Imhq3^W{y?8qokjC4}4U7Qjcb7#SG}iHV7jl$0dwhg$6)sW~K1
zx=>QGsg9+jr-H>|(FU1k<mq_h;H!7(dVs0~^=tz#CkT!37G7N&X<AdkBO@bl<;oRk
zY-|*SB5DOBL$I|1#`(Xy@M}W837P2grCrH>7#9Z1l9m&*zd(P4^J){UCHh$4)6%?J
zieFm~$VrGApsJyoPI$op@OcNHD##7G2y{3cg76z3ANLESp`jrd92^v)hv?{Nu-olI
z$IlDII-uWw`-?rEP>&({tVG3UC$A*t-mU>Mbxist`dHuxBKl~y1;MWt!B-L9b5f|_
zYlVS^M?Q{TtJMnq{rv){Q?(4(+uPgmLJFbB#l;Dqjby+c5fLFg#^=Jr!v&MAJn<+v
zk2f5J%I*rf8N?q<-nS}wHN-~7DZpoV;b4e9@I&<R4C%)M?NbEcu~Tyq0{9#O|7fmW
z7#NVL4+{%}`1p7MC?rClnL+$9_&M0Ugb==@WGmfAoq^rucEQ2k|6}?<e8)9O**@?!
z47SQ8Ob~a{J=hIBgFV9KS|hFz!Nt(>`^p(UY6emAy`-7E&0pS3QT%EO@lx;=0?{WN
z1@QB8^%6lr^ZVYBik4ttV8Cy;5U}tYE`p(n0cx@b|4B<o7h-!B$TYt{PC#zxY=D;T
z7I00B$?oAZI>V=xURI`Y)e$E>N)W(rtY(TnBj6hmfm3Se)6rZ{ClOrkQK%RxRpizu
z@wZ3XVX0%Ov9M13XJ~8~itCGE*fkv33?F6gfLG4|%ZS5k1d2ZJ6%$O8uP_F_o(K$>
z5J&{H3ZtW=g5bk#s9O1GDU9(h>O4ID2<O5qanA_&0R6-LP<*8XTw|^v&G1p?4ph;J
zzUZrI^nfq@+w#vN;D65;_<9;3DAoXdwAVGDB^Vwa7A(WWMDWV>;;E?^DPfM%<oKl!
z6A?odeKh~?8Xtw?Mgso0OLy+T`*GScd}`OAxU5STd=SC+gnEo*kDuTNB?|CYEXKyh
z3ON82im3e2G6b3-Y;rX~-$WmElw!P(i5^P8MoshL6iUgJQXlw1nc>qAeJV0A6u&3V
zuTlMNiN*07{Gf|Kzy2@@9gz&^CIkgfLO8S#NDO@JPpccPVUE&;wnakdry15sj(7BR
zLEmtnT2=FGzi;G%5heJlh|X(9D5B2?KJY;WU&{haD;dx-AQ8Ob9gYNa5l9H!M?&CZ
z&y**xvKXyn&CF4{#GY(e@#ChxvtIkMF8zD>WMLai^vO&=Ps<gk!3V17n>zR*ivoh7
z8!*{}T`v#NIobi;&7DkjezxJ9-<NZ1%^f(b4p<qx2GXN5A<k-tn{T{X^Cl6y-Tt_i
z&bs$kTmD;00x7kH3}0gnb%sy;iUENilvMCcx3-ZML*N=2rOGs#ln@r)0yjA}z{<Ea
zV3Ax%W$+Fmja$RymcaXsyx_~Mn*1vU48B$rFlR0bZ5wU{{mZ(59hzxg&g})CgF6;(
zh4iRQ&FrO-W2*DZt8>H%{3Q5PzaJFvu~}e_UlH6j+R470TM>8D)HxWqoEt~JQSd2N
zK==Gg-{S$lTK*j*;B!F)-%Efw3qH2?p;omj_ai0C1Yg`b!V(0tZ*&gBU%4X<0eRo0
zUGzi~g8yL<!KV=b<{BYJ+#?#{QQ-IRWyh|T`FyR>J0&eZu~6#U#ULc$D+w?sUBSRu
ze@O4)OOJN?mz6XQKBxNI%J1L>-_3^vd?^9u?43Zulxzs^;fu4{{07}9_#iVrJk{@q
z5`0!Ba8428nJ>TKyB@%sFw%OgJQnDjgqGhIpYsoViQf-3_$&=z7KaFc2s+h5DCd@^
zi@s?9-$)c-k|8j^uNws@6HemcX#xML5P`E1d<G#HA`lemX9E6r59dzT_qWW|@Nc#g
z!ua{*XAJzSA_|!8RzO!|^D_s&mjI^e5AulD(E^<MwKD_05fNy%;8+0-9WZm?>xn><
z5IXHl=ShF80M*jYB=}k)&;;KA_@9zK#fqV`=G@N9B2l3PpJ4@N?fJBrU<Uv`4@PnT
zvwCpprGiazXpDT;oxz5#1e&D;FabAe_IZ8Kbuxjo;(VK_U<2(_5&TJHDcARFTY*^{
zVVNS(0Qj<Sk8&-4K<fp}aI?<lFE`Wev#!%{ri%hTP;T#H3&DT}*KIFs;ANMv0ch45
zP!+n?EPTnEQGgcsr#nAk-^0h#YXkW?C9HYwH~oB5DhvF{2NFS|Rps2fRcIG;y#SWk
z$C0mf51)<@^nX^6;-B4P+hm_Yy(L`21+6OQvQlE+t-HlC-@&Gh{7<`1>E6Sqx}(>B
zA*en2b2nLeH#{!?4hk+Zt|jz6sefg3kGW`+(&u-cpqqN3ENdpUI=2BK=(lCHSjYa6
zY}PC9SM=wycik%JJXdKk!S}S!rQlQiK7#LDlBo&4K`o$rZtr+@!yP;aFUcx@(dqz6
z{64#85xY`}n};$p3J}3RO#|P%dRK}Ud{C8U*RlePC_vNf<H(=jcmzLA>Gy$k0|^CO
z)opQ<%i=A-6<g;!_@8!RlIN6sh)DLG!U`Rks?n{g;cF}xKy?M1Ufh&ynHam5<HsK-
zqjJ40;l!x_Clh_N+u;<VPrl}$_xZ7dv!X!6jQM;5ycc|0!6pIxluTLiMkV-<?%lyI
z{6yMaFK_xKwQkTP5U=q<6*Z3XJjh%?Y-}8CxcL?ZR~f}6vDV_i02CG$GVX=s%RYap
zxMkj^f<Nsz38y-aGvj+T_@FWmw0rne)|PQ+5^I!d`TeX6r}}$nl$md+uV>dl0PcNh
z9$;RX{xj_-;ADFtvtSb)d|vI2DWg=Cl~XW6YmFjSrVm@Z-408VljR_5l$*s>O&c1o
zFteB(5Br2@W4=WJr`nFgiMC_(DxKnjOqnT8W^G>9J$!zLX1uym2}|^ag<0WC>(+bf
zCm8@ATUA9BjE#>`Y9I*zlzsm4g-f(d;8hL&CoRX|M9VQ|mCnqR3=w=r$tE7C_wdnD
zvdjvhtk8^+>_PCaziz!yc~!l56i~q*7#xJ^+8UbQ7sEgP9q)VRO)B_=4}5x+PAT}n
z0N>|CnN>O!eqR-u(NnUlWKVQ-3|znNI*5z2sfxzZtD1W@mx_ylce^Py5QKk6ED-TJ
zjQ~>u-)6H3^?-v}`7`JvzqtSkn~nmjN~aHe)*>!4lg~=YD)IsvqL1qLCE$lyERdd>
z0n40Dp@beq_o)=WcfW>={Em(eb`1nK|K{0Oi#k{q!0(ZdrU}cyVrh3Q13TN=aRU6Y
zEBU~x(kTO<2fcN@bp1Yn@szChJ8+x@VxprUAwB^T5*(1UAPK^(VN?^ZwQNjBM>~|2
zl~ZaU_z2&_aS?ga^AnUP02gn-^#YI#NQ9YODNNc53GfA1jsUAlCnk6Vwa=){D+AM;
zrv1uoGO%gu2CCK`FtmVFV5^AWsx4>FegSTwpe9gP6(u15yy%t5(eEWdP}d8<j>VvZ
zv2a8nt)THR<TrfGtkQ|#dzN1XD){PJ{S;u;b~!Nc!H;!<BnLZ*$uBy4j+}27RrHB}
z>$J_*{|n`LLOZio3w)>3*|}!Tn$={KTaBK4tni6TzM%g?YoJy8S70V%B@m;>q$Omr
zAFV$ON9qqTFXoVguO<4x*wS(Ig~8a%#xT;wJkJj6RG%X5)YR3%`3o0d0?X<ulRcB~
z9Uy1x?o&U#+@eJQYCd59{{3~AFJJzA^XARh#Kgon{27I)4X_|IZl(2pLrH-Ax{u*V
z-9dF}c99I3DH8BCmtYHU-9Vj-Mro#>u|y<A@nbFJakx}cEUeqi%Vz%6gy%W#k+ZK{
zETCbeMF8L9;^N}|ef##E+PHCJTuMrc(_eFp76D7dV@JJ!MWDS_A=m_{>aKw5-YTZ(
zbHv4i!<GPAOR!C4-9XR)Uw2tKjdcTQ6h)Q)Sy7Q-`lXQu?RrJB`PsQwF22UX#!CP_
z9l-VW_Kxq~z55HI^owu0>85Pr>*Mr*SH{Tb5>O-H@^Dxk93P`jm{h}o6Cl%`<*B&Y
zQ$<bobociNKh6>7&{g~lq;*9f3w&+Sr?2>XdV8R>v<%A1%VEsrqR#Ni3D5sA-nQ_`
z+JaiQ76I1zlMFg>;zZ|LZ@pD;!wok;dV2aYGNQw@z-JKx!N;fp$$)wR*AKvsmcd`E
zpws|J0+5hEd1X&`e>X0#4heRLrs8M&_vsRSJh7Hz(A?4jB_*X$QBeVX{rwu%PGxL5
zJUYyO>$8_W8_^o1N)f08oT>|m%6Gs0_S>aRO-)}AftZ+(kdVv*U#ohSbmXIDK&yac
zz~qv5nHh8+NDOa6M7ds|mjKe|@b%X$%od)j?7U3Ng$pFWodkP=fn{V2iatIt(dTlF
z!0_-0baZt>3jw{NvI2@rN}##5l^h>3Q03hB!S9a_yLS}-s(3)pN+ZC_NdL0IkdXTL
zx#yl+`}pIJ=PX>fFkKJqK%evXGY(w(6MS&-eX1qE$GG6Ku;{Wu(f9EuhuPQVQzm(|
zX82U||J1nyUVot}>FDR-b(^j4y9K$mBS!QY4l5iA4WuWL9_=sq*z)u9+g^I<rK5?7
ziA^h3tVkmx*%k=EM%{>!&$xEcN?}{xT1pF#pu3M~0*(iVJ;9LTud1sK$_yW^Jgw2W
z1I7&B0PlAH!`W9a{<OBB$M8CRUjL2jxmA)rCK4e`Cp}Dc4F?Y%Y<ls<7mtjLjFb@~
zB*w?bFA6olMm{4uX_asi%i2moS)Ch?cM)-g&7%pl6@PVIRlqZR@@on-s+?;Tx|Uz2
zewqMsPthwE5BnRTDS^hg0<R*#GZ8x#Yv2`%uf6u#N#e)O6Mf(!mSG|B<xznEJQcSf
zeNG?&`Icp^CF=D9$hN1~qX|5gfUWqe>Z=2q;nS)Mtarf(rOG+twaXUU_pc{kC~uld
z##Afqn=J~&sHx}z<*}!pdMZ07C+Dj~G~P%AU3e({zSgn*L=Wu0_$T`Hcc=+cosgC0
zWQaZ<4jn(Nd+|po?%`8tg%PrSljp5@%G`dS7C>nYszd@Lh`@4FaSiy-$&)8L_Uzen
z?u|FzI7DLqYNGOoV`F1uNGKRPoo?aUB#$O2Yb#Mz>BMb!uNWf6Cr}l?&jlE~tV?F|
z1GtAzbPcuS-`9Azbw|-F=l;}us(A<kY(^)3ux9%8q^Iiu?)T&S?z=B}^XAQ&YuB#L
zNKH+3E?TrGg@k`Gp|Apkc%$v@?M?Nh{k7_Y1r2=d8rCR9E8tAelFSKsb`BMOY;=^W
z#U7I^?Ay4It7Lnc>>h}Tar|#VZb48NV)l3DFHv+089@M_X+5@V*^;zr)26g#%a$!6
z8p3X~+2TmIlZL}Gj988Y67yS>CwXviuzO-+!rkBB-`z)APft%@U0q#UYin!oxpU`Q
z3knL_$uZvvyz#O1cQ0JEU@MDAS!r32g(Q#&!b8VCHV~SDf7c3nc3Q}`gFLDvPgHWe
zyL{Z@KK=O%o@@6))uuZ2i;==AiA4w${D24(hy}XgvGrRQtxVji9Hm}Rv(lX+3A_Y2
zBzs-{)1Q1tbd?uKZ-hD4!lwAXLDFl{C5k6CUh!F6h`|rq<EFDM6^=9;#4L<iLA$c2
zONb7L>2oA_CYx%jWuv$zzu}u??;`1aFb7*$fbVySVPlzi0wP4c5KN##@fot`o6fdY
z*wbvBj06%BEs%h06C8<9g(6V$d~JTik6;eBupoU7&Ng+4$)p-Fu@p&q%q$q`hThYB
zuC*dQRU`o=B=eAf{K%eenVu&E$TJBbZwP*iXcel($5CRMIn=HppwDbR*Ctwm=oPfk
ztgEL>mFzJIV4Mu4Vs2qvv<{IoA^J2PqYJBVIoGz&`L*;u&H@{a+`~8531FSZzcnJd
zhZ^y5v=~;Vh^c4nb}+t(MId1JiXDe^gSZ_MT^StNdHlzB{Pfl_;P_p-$(}jhtTXtx
zheZK-MPZS=WC$0xQKFUz7fFKziKRpx6XIv`BH6qhf$bOf5p;Cox|b^-{!w8rApvq?
zm+lOoNr0d=1hG@>Gv1H{w>`fB>9vbB!#CHP1<a<|@_+nEE<rm_1wPMT6(leTV2}j7
zo6nn!40y(kBPIc^+E(z)NslE^&G4B7m{%m=crNd1iULdm_)CIa#1a7H@$^fHO#;k^
sR=DeQF6SeG+2(EAkb7h9T>lOK59&?$x`>0gr2qf`07*qoM6N<$f^ByXwEzGB

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/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/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/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
index b1ca42ee1..3c6cf9d02 100644
--- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
@@ -3,6 +3,7 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../filters/syntax_help.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"
@@ -93,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); });
 
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/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_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 30fde1595..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"
@@ -248,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);
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/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index 853a00828..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"
@@ -38,7 +38,7 @@ DlgConnect::DlgConnect(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);
 
@@ -46,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);
 
@@ -121,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);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index 3845029f7..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"
@@ -108,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_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index caca5da92..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"
@@ -58,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);
@@ -89,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);
 
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/settings_view.cpp b/cockatrice/src/interface/widgets/dialogs/settings_view.cpp
index 005824995..b1a80c86b 100644
--- a/cockatrice/src/interface/widgets/dialogs/settings_view.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/settings_view.cpp
@@ -6,7 +6,7 @@
 #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"
@@ -135,7 +135,7 @@ 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");
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/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 2702a527d..2c0050afe 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);
diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp
index 8fed95833..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")))
 {
 }
 
@@ -191,7 +193,9 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
                     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/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
index 79370f512..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,7 +1,7 @@
 #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"
 
@@ -80,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;
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/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/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
index 9f7369435..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"
@@ -282,7 +282,7 @@ void TabArchidekt::setupFilterWidgets()
     // 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);
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 9adda008e..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"
 
@@ -49,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);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
index 3dfdc956b..8af9d5e6e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -2,7 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.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"
@@ -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_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
index dc14b6e4a..dfde08f8e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
@@ -2,6 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
+#include "../../theme_icon.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../interface/theme_manager.h"
@@ -63,8 +64,8 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c
     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);
@@ -79,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_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 cf71dd7ed..45c320852 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -7,6 +7,7 @@
 #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"
@@ -1360,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/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/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 6037418ad..af5c74969 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,9 @@
 #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"
 #include "../deck_editor/card_database_view.h"
 #include "../general/layout_containers/flow_widget.h"
@@ -79,8 +81,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(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);
     connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
 
     setFocusProxy(searchEdit);
@@ -154,7 +156,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
 
     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);
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_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/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_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
index 4e1d6293f..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);
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 79a802234..715505926 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -50,6 +50,7 @@
 #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"
@@ -387,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 */
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);
+}

From e22a75974a49b64beddf7189e35914c812facade Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:39:42 +0100
Subject: [PATCH 07/14] [Icons] Add an icon asset ratchet test (#7596)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Icons] Add an icon asset ratchet test

The icon rules were enforced by review only, so the next Inkscape export could
reintroduce a baked fill or a physical size without anyone noticing.

Add a test that rejects non-24 viewBoxes, physical sizes, editor metadata,
hardcoded paints, missing tokens, color-coded filenames, and rasters. Keep the
legacy baseline empty so the ratchet can only tighten.

* [Tests] Drop the empty icon baseline

The legacy icon set is fully paid down, so the ratchet had nothing left to
ratchet: BaselineIsWellFormed required the baseline to be empty, which made
the baseline file, the stale-entry diff and the entry-format regex
unreachable. The rules are enforced directly now.

- AssetsFollowTheRules fails on any violation of collectViolations().
- tests/icon_assets/icon-baseline.txt is gone with its reader.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 tests/CMakeLists.txt                   |   1 +
 tests/icon_assets/CMakeLists.txt       |   3 +
 tests/icon_assets/icon_assets_test.cpp | 241 +++++++++++++++++++++++++
 3 files changed, 245 insertions(+)
 create mode 100644 tests/icon_assets/CMakeLists.txt
 create mode 100644 tests/icon_assets/icon_assets_test.cpp

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8b904d30a..84b9f02bf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -566,6 +566,7 @@ 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)
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();
+}

From ada0cccfbfdbd36dfc14f493eee0fbc959e5047a Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:39:42 +0100
Subject: [PATCH 08/14] [Game] Follow the palette in judge message tags (#7597)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Settings] Delete update channels at shutdown

SettingsCache owns the stable and beta update channels as raw pointers, and
each owns a QNetworkAccessManager, so the process leaves QtNetwork objects
alive past QApplication teardown.

Delete them from a QCoreApplication::aboutToQuit handler instead of the
destructor: SettingsCache is a Q_GLOBAL_STATIC, so ~SettingsCache() runs
during static teardown, after QApplication is gone, and destroying the
network managers at that point is the post-application window that ASan
reports. The hook is installed on the first instance() call that has an
application object, since the first access may predate it.

* [Game] Follow the palette in judge message tags

Judge tags hardcoded a black prefix and a `theme:icons/scales` image inside rich
text, where `currentColor` cannot resolve and a palette change leaves the tag
unreadable. Render the scales glyph through the themed icon engine, register it
as a document image resource, and repaint the log when the palette or theme
changes.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../src/client/settings/cache_settings.cpp    | 28 +++++++++++++++-
 .../src/client/settings/cache_settings.h      |  5 +++
 .../game_graphics/log/message_log_widget.cpp  | 32 +++++++++++++++++--
 .../game_graphics/log/message_log_widget.h    |  2 ++
 4 files changed, 64 insertions(+), 3 deletions(-)

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 9aeb88a18..8ccf6f76b 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -90,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/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
index 8b351e022..d526766af 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -4,6 +4,8 @@
 #include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.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"
@@ -12,8 +14,12 @@
 #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>
@@ -120,6 +126,7 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
 void MessageLogWidget::containerProcessingDone()
 {
     currentContext = MessageContext_None;
+    contextJudgeName.clear();
     messageSuffix = messagePrefix = QString();
 }
 
@@ -855,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)
@@ -905,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 5632f5af8..3ec5ff93c 100644
--- a/cockatrice/src/game_graphics/log/message_log_widget.h
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -39,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);

From df74917cb0d902371ce6eb4d334dbbc9c667ab66 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Wed, 4 Nov 2026 18:39:43 +0100
Subject: [PATCH 09/14] [PrintingSelector] Load the pin badge through the
 themed icon engine (#7598)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The badge rendered `theme:icons/pin` through the pixmap generator, which
resolved `currentColor` once and cached the result, so the glyph stayed at its
first palette and was rasterized at DPR 1.

- Render the glyph through `loadThemedIcon`, at the label's device pixel ratio,
  and re-render it on palette and theme changes.
- Compose it onto a rounded backdrop filled with `Window` and outlined with
  `WindowText`. The badge floats on card art rather than on a palette surface,
  so a bare outline vanishes into art of the same lightness; the backdrop keeps
  it readable on every printing, and both roles still follow the palette.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../printing_selector_card_overlay_widget.cpp | 90 ++++++++++++++-----
 1 file changed, 67 insertions(+), 23 deletions(-)

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) {

From 64c780933212c5a753013edaa09800af4a455cc1 Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2026 07:49:20 +0100
Subject: [PATCH 10/14] [DlgCreateGame] Heap-allocate create game dialog to
 prevent crash on parent deletion (#7777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [DlgCreateGame] Heap-allocate create game dialog to prevent crash on parent deletion

* [Tests] Run the short-write cases without forking a death test

The three cases that force a write failure - CardDatabaseTest.Xml4ShortWriteKeepsInstalledFile,
OracleDatabaseWriter.ShortWriteKeepsPreviouslyInstalledDatabase and
SpoilerFileTest.ShortWriteLeavesExistingFileIntact - all forked a child, lowered
RLIMIT_FSIZE and ignored SIGXFSZ. That child is killed by SIGSEGV on the macOS
runners, so all three have been red on every macOS leg of master since they landed,
while the same cases pass on Linux.

Cap the soft limit in the test process instead: ctest already runs one case per
process, and the guard restores the limit and the SIGXFSZ handler, so a whole binary
keeps working. Same real EFBIG failure, no fork, and macOS keeps its coverage of the
writers.

* [CI] Derive DEBUG_TEST and RUN_TESTS in the nightly job

The shared steps gate on both, but build-linux-nightly never set them, so its
coverage leg skipped "Build debug and test" and then failed collecting a report
from an empty build/ directory on every nightly and tag run. continue-on-error
kept the run green, so the coverage artifact silently never existed.

Derive both exactly as the pull request job does.

---------

Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com>
Co-authored-by: Lukas Brübach <44814898+BruebachL@users.noreply.github.com>
---
 .github/workflows/desktop-build.yml           |  6 ++
 .../widgets/server/game_selector.cpp          | 15 ++--
 .../src/interface/widgets/tabs/tab_game.cpp   |  6 +-
 tests/carddatabase/carddatabase_test.cpp      | 30 ++-----
 tests/oracle/oracle_importer_test.cpp         | 31 +++----
 tests/spoiler_file_test.cpp                   | 32 ++-----
 tests/support/scoped_file_size_limit.h        | 83 +++++++++++++++++++
 7 files changed, 132 insertions(+), 71 deletions(-)
 create mode 100644 tests/support/scoped_file_size_limit.h

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 4ac28d3a5..5a306e023 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -518,6 +518,12 @@ jobs:
       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:
diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 2c0050afe..468095adb 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@@ -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/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index ac9edd1ba..01d021907 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -570,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()
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index b54205f30..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"
@@ -36,12 +37,6 @@
 #include <libcockatrice/utility/card_ref.h>
 #include <string>
 
-#ifdef Q_OS_UNIX
-#include <csignal>
-#include <sys/resource.h>
-#include <unistd.h>
-#endif
-
 namespace
 {
 
@@ -247,21 +242,14 @@ TEST(CardDatabaseTest, Xml4ShortWriteKeepsInstalledFile)
     ASSERT_EQ(installed.write("installed database"), 18);
     installed.close();
 
-    // A real filesystem write failure, isolated in the death-test child so the
-    // process-wide file limit never affects other cases or the parent runner.
-    ASSERT_EXIT(
-        {
-            std::signal(SIGXFSZ, SIG_IGN);
-            struct rlimit limit;
-            limit.rlim_cur = 128;
-            limit.rlim_max = 128;
-            if (setrlimit(RLIMIT_FSIZE, &limit) != 0) {
-                _exit(2);
-            }
-            CockatriceXml4Parser writer(&controller);
-            _exit(writer.saveToFile({}, sets, cards, fileName) ? 1 : 0);
-        },
-        ::testing::ExitedWithCode(0), "");
+    // 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");
diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp
index 259bae087..1b4e2d915 100644
--- a/tests/oracle/oracle_importer_test.cpp
+++ b/tests/oracle/oracle_importer_test.cpp
@@ -1,6 +1,7 @@
 #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"
@@ -33,12 +34,6 @@
 #include <string>
 #include <utility>
 
-#ifdef Q_OS_UNIX
-#include <csignal>
-#include <sys/resource.h>
-#include <unistd.h>
-#endif
-
 class OracleImporterTest : public ::testing::Test
 {
 protected:
@@ -1336,20 +1331,16 @@ TEST(OracleDatabaseWriter, ShortWriteKeepsPreviouslyInstalledDatabase)
     original.close();
     const QByteArray data = "<cockatrice_carddatabase version=\"4\"><!--" + QByteArray(16384, 'x') +
                             "--><cards/></cockatrice_carddatabase>";
-    // A real filesystem write failure, isolated in the death-test child so the
-    // process-wide file limit never affects other cases or the parent runner.
-    ASSERT_EXIT(
-        {
-            std::signal(SIGXFSZ, SIG_IGN);
-            struct rlimit limit;
-            limit.rlim_cur = 128;
-            limit.rlim_max = 128;
-            if (setrlimit(RLIMIT_FSIZE, &limit) != 0) {
-                _exit(2);
-            }
-            _exit(OracleDatabase::saveXml(path, data) ? 1 : 0);
-        },
-        ::testing::ExitedWithCode(0), "");
+    // 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");
 }
diff --git a/tests/spoiler_file_test.cpp b/tests/spoiler_file_test.cpp
index 9944f95bd..ecdc3285f 100644
--- a/tests/spoiler_file_test.cpp
+++ b/tests/spoiler_file_test.cpp
@@ -1,4 +1,5 @@
 #include "client/network/update/card_spoiler/spoiler_file.h"
+#include "support/scoped_file_size_limit.h"
 
 #include <QDir>
 #include <QFile>
@@ -6,12 +7,6 @@
 #include <QTemporaryDir>
 #include <gtest/gtest.h>
 
-#ifdef Q_OS_UNIX
-#include <csignal>
-#include <sys/resource.h>
-#include <unistd.h>
-#endif
-
 namespace
 {
 class SpoilerFileTest : public ::testing::Test
@@ -123,25 +118,16 @@ TEST_F(SpoilerFileTest, FileInParentPathReportsFailureWithoutModifyingIt)
 #ifdef Q_OS_UNIX
 TEST_F(SpoilerFileTest, ShortWriteLeavesExistingFileIntact)
 {
-    // Limit only the child process: a real short write exercises QSaveFile's
-    // buffered flush failure without depending on disk capacity or file ownership.
     const QByteArray changed = "<cockatrice_carddatabase version=\"4\"><!--" + QByteArray(100000, 'x') +
                                "--><cards/></cockatrice_carddatabase>";
-    EXPECT_EXIT(
-        {
-            struct rlimit limit;
-            if (getrlimit(RLIMIT_FSIZE, &limit) != 0) {
-                _exit(2);
-            }
-            limit.rlim_cur = 128;
-            if (setrlimit(RLIMIT_FSIZE, &limit) != 0) {
-                _exit(3);
-            }
-            std::signal(SIGXFSZ, SIG_IGN);
-            const auto result = save(changed);
-            _exit(result == SpoilerFile::SaveResult::Failed && !error.isEmpty() ? 0 : 1);
-        },
-        ::testing::ExitedWithCode(0), "");
+    // 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"});
 }
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

From 74686d173637a287895149f009a8c35dfd0366df Mon Sep 17 00:00:00 2001
From: Jurriaan <jurriaanvdberg@gmail.com>
Date: Thu, 5 Nov 2026 12:40:32 +0100
Subject: [PATCH 11/14] [Client] Added an exclude and color identity filter for
 the visual database display (#7587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Client] Add exclude and color identity filters to the visual database display

* [Filters] Extract the color filter mode derivation into libcockatrice_filters

The mode table and the 'which mode produced this filter set' derivation are
filter semantics, not widget code, so they belong next to CardFilter rather
than in an anonymous namespace in the client. Moving them also makes them
testable: filter_mode_test pins every mode, the Custom fallback and the
'keep the live mode when it still fits' rule.

* [Tests] Cover the negated color identity query

ci! read the camelCase colorIdentity property instead of the lowercase
coloridentity key, so it matched the empty string and rejected every card.
The new case uses a card whose colors and color identity differ, so it fails
on the old lookup and passes on the fixed one.

---------

Co-authored-by: Lukas Brübach <44814898+BruebachL@users.noreply.github.com>
---
 ...l_database_display_color_filter_widget.cpp | 206 +++++++++---------
 ...ual_database_display_color_filter_widget.h |  13 +-
 .../visual_database_display_widget.cpp        |   1 +
 .../libcockatrice/card/card_info.cpp          |   4 +
 .../libcockatrice/card/card_info.h            |   1 +
 libcockatrice_filters/CMakeLists.txt          |   8 +-
 .../libcockatrice/filters/filter_card.cpp     |   2 +
 .../libcockatrice/filters/filter_card.h       |   1 +
 .../libcockatrice/filters/filter_mode.cpp     |  77 +++++++
 .../libcockatrice/filters/filter_mode.h       |  62 ++++++
 .../libcockatrice/filters/filter_string.cpp   |   4 +-
 .../libcockatrice/filters/filter_tree.cpp     |  60 +++--
 .../libcockatrice/filters/filter_tree.h       |   1 +
 tests/carddatabase/CMakeLists.txt             |  34 ++-
 tests/carddatabase/filter_mode_test.cpp       | 147 +++++++++++++
 tests/carddatabase/filter_string_test.cpp     |  19 ++
 tests/carddatabase/filter_tree_test.cpp       | 204 +++++++++++++++++
 17 files changed, 703 insertions(+), 141 deletions(-)
 create mode 100644 libcockatrice_filters/libcockatrice/filters/filter_mode.cpp
 create mode 100644 libcockatrice_filters/libcockatrice/filters/filter_mode.h
 create mode 100644 tests/carddatabase/filter_mode_test.cpp
 create mode 100644 tests/carddatabase/filter_tree_test.cpp

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_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
index af5c74969..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
@@ -160,6 +160,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     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);
diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp
index 90bfd3f44..36f0cdeb8 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -316,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 5452ef98b..075b5b264 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ b/libcockatrice_card/libcockatrice/card/card_info.h
@@ -469,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;
diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt
index 070c04637..1b4303fc9 100644
--- a/libcockatrice_filters/CMakeLists.txt
+++ b/libcockatrice_filters/CMakeLists.txt
@@ -1,10 +1,10 @@
-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
 )
 
 add_library(
-  libcockatrice_filters STATIC ${HEADERS} libcockatrice/filters/filter_card.cpp libcockatrice/filters/filter_string.cpp
-                               libcockatrice/filters/filter_tree.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
 )
 
 add_dependencies(libcockatrice_filters libcockatrice_card)
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 dbeffd18f..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,
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/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 7d83640a1..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
@@ -36,6 +38,34 @@ if(WITH_ORACLE OR WITH_CLIENT)
     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
   # ------------------------
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();
+}

From 3339cc9d722d5d357328909453d2a56c450e366e Mon Sep 17 00:00:00 2001
From: SlightlyCircuitous
 <71394296+SlightlyCircuitous@users.noreply.github.com>
Date: Fri, 6 Nov 2026 03:04:50 -0500
Subject: [PATCH 12/14] Add Fedora 45 build and drop Fedora 43 build (#7774)

* Create Dockerfile

* Delete .ci/Fedora43 directory

* Update release_template.md

* Update desktop-build.yml
---
 .ci/{Fedora43 => Fedora45}/Dockerfile |  2 +-
 .ci/release_template.md               |  2 +-
 .github/workflows/desktop-build.yml   | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename .ci/{Fedora43 => Fedora45}/Dockerfile (96%)

diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora45/Dockerfile
similarity index 96%
rename from .ci/Fedora43/Dockerfile
rename to .ci/Fedora45/Dockerfile
index 8aa345651..a7c49b249 100644
--- a/.ci/Fedora43/Dockerfile
+++ b/.ci/Fedora45/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:43
+FROM fedora:45
 
 RUN dnf install -y \
         ca-certificates \
diff --git a/.ci/release_template.md b/.ci/release_template.md
index 23b475150..8eb4c7ebd 100644
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -21,8 +21,8 @@ Available pre-compiled binaries for installation:
    • <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub>
    • <kbd>Debian 13</kbd> <sub><i>Trixie</i></sub>
    • <kbd>Debian 12</kbd> <sub><i>Bookworm</i></sub>
+   • <kbd>Fedora 45</kbd>
    • <kbd>Fedora 44</kbd>
-   • <kbd>Fedora 43</kbd>
 
    <sub>General Linux support is available via a <kbd>flatpak</kbd> package hosted at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a> (x86 & ARM)!</sub>
    <sub>Thanks to courtesy of @FFY00, the app is also available in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>.</sub>
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 5a306e023..002255fda 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -149,7 +149,7 @@ jobs:
 
             allow-failure: yes
             package: skip    # We are packaged in Arch already
-            debug_test: yes    # see the note on Fedora 44 below
+            debug_test: yes    # see the note on Fedora 45 below
 
           - distro: Servatrice_Debian
             version: 12
@@ -166,10 +166,10 @@ jobs:
             ccache_size: 850M    # the Release build plus the suite it runs
 
           - distro: Fedora
-            version: 44
+            version: 45
 
             package: RPM
-            # Arch and Fedora 44 are the two newest toolchains, and the -Wno-error= exceptions
+            # Arch and Fedora 45 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.
@@ -183,7 +183,7 @@ jobs:
             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
+          # UndefinedBehaviorSanitizer. Debian 13 and Fedora 45 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
@@ -223,7 +223,7 @@ jobs:
       # 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
+      # leg states the size it needs instead: one configuration for most, two for Fedora 45
       # (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.
@@ -466,7 +466,7 @@ jobs:
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Fedora
-            version: 43    # previous release, still covered by the nightly
+            version: 44    # previous release, still covered by the nightly
 
             package: RPM
             test: skip    # Running tests on all distros is superfluous
@@ -1167,7 +1167,7 @@ jobs:
           # (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'
+          LIVE_CCACHE_KEYS: 'ccache-Arch ccache-Servatrice_Debian12 ccache-Debian13 ccache-Fedora45 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"

From 06e3d96308fd4c7f267b5fd2e3e9adcaf1cc14a3 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Fri, 6 Nov 2026 10:41:53 +0100
Subject: [PATCH 13/14] [CI] Size compiler caches for one configuration and
 split the Fedora leg (#7772)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The bounds in #7667 were set below what one build configuration writes, so
ccache filled to its limit and evicted the entries the next build was about to
ask for. The probe measured what that costs: a 6G cache on one leg served 1059
of 1059 calls and the 700M bound on the same leg served 14%. The quota also
went to legs that finish under the Windows leg, which has no compiler cache.

Debug information is most of an object's size. A measured Arch Debug
configuration is 1.2 GB with the built-in flags and 660 MB at -g1; Debian 13
Release is 1.1 GB and 614 MB. CI therefore builds every non-tag leg at level 1
through a new COCKATRICE_DEBUG_INFO_LEVEL option, which stays empty by default
so local, distro and release builds are unchanged. Level 1 keeps file and line,
which is what a failing test or a sanitizer backtrace reports. Tags and the
nightly legs keep full DWARF for the Sentry symbols.

With one configuration at half the size, the quota goes to fewer legs at a size
that holds one whole configuration, and the legs that duplicate another leg's
coverage give their cache up: Servatrice, Ubuntu 26.04 behind the sanitize leg
of the same distro, macOS 15 and macOS 27 Debug behind macOS 14. Their keys
leave LIVE_CCACHE_KEYS, so prune-caches reclaims the existing entries.

The single Fedora leg built Debug for the suite and Release for the package in
one job (measured on Fedora 44: 30.8 min, the only leg above Windows), so the
package compile queued behind the debug one while one 1.6 GB cache held two
configurations. Fedora 45 now runs as two legs with one cache each, in
parallel.

The option reaches compile.sh inside the container through docker.sh, and
compile.sh turns it into the CMake flag.

Bounds: Arch 850M, Debian 13 800M, Fedora 45 debug 850M and release 800M,
Ubuntu 26.04 sanitize 1200M, macOS 14 800M. That is 5.3 GB of compiler cache
on top of roughly 4.5 GB of buildkit, vcpkg, Qt and CodeQL entries.

Windows still sets the pull-request wall clock: 29.5 min, 23.7 of it compiling
with no compiler cache, because ccache and sccache cannot store the 711 of 1054
translation units that use PCH under MSVC (#7381). That is a separate trial.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .ci/compile.sh                      |   5 ++
 .ci/docker.sh                       |   5 ++
 .github/workflows/desktop-build.yml | 132 +++++++++++++++++++---------
 CMakeLists.txt                      |  21 +++++
 4 files changed, 122 insertions(+), 41 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index 569ae9f6b..7414b2dc3 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -203,6 +203,11 @@ if [[ ${WITH_CRASH_REPORTING:-} == "ON" ]]; then
   # developer builds never reach Sentry.
   flags+=("-DWITH_CRASH_REPORTING=ON")
 fi
+if [[ ${COCKATRICE_DEBUG_INFO_LEVEL:-} ]]; then
+  # CI lowers the DWARF level so one build configuration fits its compiler-cache bound;
+  # see the option in CMakeLists.txt. Empty keeps the built-in flags.
+  flags+=("-DCOCKATRICE_DEBUG_INFO_LEVEL=$COCKATRICE_DEBUG_INFO_LEVEL")
+fi
 if [[ ${BUILDTYPE:-Release} == "Release" && -n ${COCKATRICE_SENTRY_DSN:-} ]]; then
   # Release-only: Debug builds stay DSN-free so crashes from developer builds
   # never reach Sentry. Empty (local builds, forks without the secret, and non-tag
diff --git a/.ci/docker.sh b/.ci/docker.sh
index 64ea6baa7..c78ba3c31 100644
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -181,6 +181,11 @@ function RUN ()
     if [[ ${WITH_CRASH_REPORTING:-} ]]; then
       args+=(--env "WITH_CRASH_REPORTING=${WITH_CRASH_REPORTING}")
     fi
+    # Same reason: the DWARF level reaches compile.sh only if it is handed to the container,
+    # and without it CI would cache objects twice the size its bounds were measured for.
+    if [[ ${COCKATRICE_DEBUG_INFO_LEVEL:-} ]]; then
+      args+=(--env "COCKATRICE_DEBUG_INFO_LEVEL=${COCKATRICE_DEBUG_INFO_LEVEL}")
+    fi
     # shellcheck disable=2086
     docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
     return $?
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 002255fda..b859556aa 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -150,6 +150,7 @@ jobs:
             allow-failure: yes
             package: skip    # We are packaged in Arch already
             debug_test: yes    # see the note on Fedora 45 below
+            ccache_size: 850M    # Debug plus the suite: 660 MB of objects at -g1
 
           - distro: Servatrice_Debian
             version: 12
@@ -157,30 +158,46 @@ jobs:
             package: DEB
             server_only: yes
             test: skip
-            ccache_size: 400M    # server only, no client to compile
+            # 4.7 min and the server alone: nothing here for a compiler cache to save.
+            persist_ccache: 'false'
 
           - distro: Debian
             version: 13
 
             package: DEB
-            ccache_size: 850M    # the Release build plus the suite it runs
+            ccache_size: 800M    # Release plus the suite: 614 MB of objects at -g1
+
+          # The single Fedora leg used to build Debug for the suite and Release for the
+          # package in one job (measured on Fedora 44: 30.8 min, the only leg slower than
+          # Windows), so the package compile waited behind the Debug one. Two legs run in
+          # parallel and each keeps a cache that holds exactly one configuration.
+          #
+          # Arch and Fedora 45 are the two newest toolchains, and the -Wno-error= exceptions
+          # in CMakeLists.txt exist for exactly their warnings. This leg compiles Debug
+          # because only Debug passes -Werror, so it is where a new warning still fails.
+          - distro: Fedora
+            version: 45
+            variant: debug    # separate image and ccache from the release leg below
+
+            package: skip
+            debug_test: yes
+            ccache_size: 850M    # Debug plus the suite: 660 MB of objects at -g1
 
           - distro: Fedora
             version: 45
+            variant: release    # separate image and ccache from the debug leg above
 
             package: RPM
-            # Arch and Fedora 45 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
+            test: skip    # The debug leg above runs this distro's suite
+            ccache_size: 800M    # Release plus the package: 614 MB of objects at -g1
 
           - distro: Ubuntu
             version: 26.04
 
             package: DEB
             test: skip    # The sanitizer leg below runs this distro's suite
+            # 18.1 min, and the same distro as the sanitize leg below, which runs this suite.
+            persist_ccache: 'false'
 
           # The one leg that runs the suite under AddressSanitizer and
           # UndefinedBehaviorSanitizer. Debian 13 and Fedora 45 keep covering the
@@ -196,7 +213,7 @@ jobs:
 
             package: skip
             sanitize: yes
-            ccache_size: 800M    # instrumented objects are larger
+            ccache_size: 1200M    # instrumented objects are larger than the 614 MB measured; estimated
 
     name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }}
     needs: configure
@@ -211,25 +228,47 @@ jobs:
       CCACHE_EVICTION_AGE: 7d
       # 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.
+      # not against what one leg would like: the quota also holds about 0.9 GB of buildkit
+      # layers (mode=min in docker-release.yml), 0.8 GB of vcpkg, 0.7 GB of Qt and the CodeQL
+      # trap caches (about 1 GB each, which prune-caches below does not manage).
       #
-      # 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 45
-      # (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.
+      # Measured 2026-11-04: one configuration costs 1.2 GB with full DWARF and 660 MB with
+      # -g1 (COCKATRICE_DEBUG_INFO_LEVEL below), and the size of the cache decides the hit
+      # rate far more sharply than its fill suggests. A 6G cache served 1059 of 1059 calls;
+      # the 700M bound on the same leg served 14%, because ccache fills to the limit and then
+      # evicts the entries the next build is about to ask for. A cache that cannot hold a
+      # whole configuration therefore buys almost nothing, and the quota goes to fewer legs
+      # at a size that holds one:
+      #
+      #   Arch                 Debug + suite       660 MB working set   850M
+      #   Debian 13            Release + suite     614 MB               800M
+      #   Fedora 45 debug      Debug + suite       660 MB               850M
+      #   Fedora 45 release    Release + package   614 MB               800M
+      #   Ubuntu 26.04 sanitize                     ~1.0 GB             1200M
+      #
+      # That is about 5.3 GB of bounds, and with the fixed entries above it puts the quota at
+      # roughly 9.8 GB of 10 - so only legs worth their share get one. A leg keeps no cache
+      # when it duplicates another leg's coverage (Ubuntu 26.04 behind the sanitize leg of
+      # the same distro; macOS 15 and macOS 27 Debug behind macOS 14; Servatrice covers the
+      # server alone and finishes in 4.7 min). Those four run cold: 4.7, 18.1, 16.5 and
+      # 15.8 min. The five that stay compile the client on the toolchains a change can break
+      # and are the ones a cache shortens by the most. Measured job totals on master
+      # 2026-11-04 also show the ceiling this leaves: Windows 10 is 29.5 min and compiles for
+      # 23.7 of it with no compiler cache at all, so Windows still sets the pull-request
+      # wall clock no matter how warm these legs are (see build-vcpkg).
+      #
+      # Re-add a leg only with a bound that holds its whole configuration: a smaller one is
+      # worse than none.
       #
       # Every key listed in LIVE_CCACHE_KEYS in prune-caches below must match this matrix.
       CCACHE_SIZE: ${{ matrix.ccache_size || '700M' }}
+      # Debug information dominates a cached object: with the built-in flags one
+      # configuration is 1.2 GB and no per-leg bound can hold it, so CI lowers the level to
+      # 1 (file and line, which is what a failing test or a sanitizer backtrace reports) and
+      # one configuration halves. Empty on tags and on the nightly legs, which ship binaries
+      # and keep full DWARF for the Sentry symbols; a tag restores a cache it cannot use and
+      # is slower, which is accepted because a tag is rare and only pull requests gate.
+      COCKATRICE_DEBUG_INFO_LEVEL: ${{ github.ref_type != 'tag' && '1' || '' }}
       CMAKE_GENERATOR: 'Ninja'
       NAME: ${{ matrix.distro }}${{ matrix.version }}
       IMAGE_SUFFIX: ${{ matrix.variant }}
@@ -242,11 +281,13 @@ jobs:
       #               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'
+      # Whether this leg restores and saves its compiler cache. Not every pull-request leg
+      # keeps one: a cache only pays for itself when its bound holds a whole configuration
+      # (see the sizing comment above), and a leg that duplicates another leg's coverage
+      # spends quota without adding any. The nightly-only legs keep none either. Fedora 45
+      # states it per leg: its two configurations have their own job and key, so neither
+      # bound is shared with a build whose objects it would evict.
+      PERSIST_CCACHE: ${{ matrix.persist_ccache || 'true' }}
 
     # Shared with build-linux-nightly so the two leg sets run the same steps.
     steps: &linux-steps
@@ -540,6 +581,7 @@ jobs:
             make_package: 1
             override_target: 14
             package_suffix: "-macOS14"
+            ccache_size: 800M    # one Release configuration plus the suite at -g1
             qt_version: 6.11.*
             qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
             soc: Apple
@@ -558,6 +600,7 @@ jobs:
             make_package: 1
             override_target: 15
             package_suffix: "-macOS15"
+            persist_ccache: 'false'    # 16.5 min: shorter than the Windows leg
             qt_version: 6.11.*
             qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
             soc: Apple
@@ -572,6 +615,7 @@ jobs:
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
+            persist_ccache: 'false'    # 15.8 min: shorter than the Windows leg
             qt_version: 6.11.*
             qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
             soc: Apple
@@ -609,13 +653,17 @@ jobs:
     timeout-minutes: 100
     env:
       CCACHE_DIR: ${{ github.workspace }}/.cache/
-      # 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'
+      # One macOS configuration is about 600 MB of objects at -g1, so its bound needs to be
+      # 800M to hold one whole; a smaller cache serves a few percent and is worthless (see
+      # the sizing comment in build-linux). macOS 14 keeps the one macOS cache: it runs the
+      # suite against the shipping Release build and is the longest of the three at 24.2 min.
+      # macOS 15 (16.5) and macOS 27 Debug (15.8) duplicate its coverage and are shorter, so
+      # they run cold.
+      CCACHE_SIZE: ${{ matrix.ccache_size || '700M' }}
+      PERSIST_CCACHE: ${{ matrix.persist_ccache || 'true' }}
+      # MSVC has no -g level, so the Windows leg does not ask for one; it has no compiler
+      # cache to shrink anyway (see the sizing comment in build-linux).
+      COCKATRICE_DEBUG_INFO_LEVEL: ${{ matrix.os != 'Windows' && github.ref_type != 'tag' && '1' || '' }}
 
     # Shared with build-vcpkg-nightly so the two leg sets run the same steps.
     steps: &vcpkg-steps
@@ -1165,9 +1213,10 @@ jobs:
           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-Fedora45 ccache-Ubuntu26.04 ccache-Ubuntu26.04sanitize ccache-macOS14-xcode-27 ccache-macOS15-xcode-27 ccache-macOS-xcode-27'
+          # The nightly legs and the pull-request legs that finish under the Windows leg
+          # keep none, so their leftover entries are reclaimed here instead of waiting out
+          # the age rule.
+          LIVE_CCACHE_KEYS: 'ccache-Arch ccache-Debian13 ccache-Fedora45debug ccache-Fedora45release ccache-Ubuntu26.04sanitize ccache-macOS14-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"
@@ -1191,8 +1240,9 @@ jobs:
             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
+              # An exact token compare, because one key can be a prefix of another:
+              # ccache-Ubuntu26.04 is a prefix of ccache-Ubuntu26.04sanitize, and only
+              # the sanitize entry is live.
               if [[ $live_ccache != *" $key "* ]]; then
                 reason="no pull-request leg keeps it"
               fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9044bc005..53508fcd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,6 +238,27 @@ include(Sanitizers)
 include(Coverage)
 include(CrashReporting)
 
+# Debug information is what makes a cached object large, and a build configuration needs more
+# room than a per-leg cache bound can spare when it carries full DWARF: ccache then fills to
+# its limit and evicts the entries the next build is about to ask for, so it serves a few
+# percent of calls while holding most of a build. CI sets a lower level so one whole
+# configuration fits; level 1 keeps file and line, which is what a failing test or a sanitizer
+# backtrace reports. Empty (the default) leaves local, distro and release builds exactly as
+# they were. This comes after CrashReporting, so the -g it adds for Sentry symbols cannot
+# raise the level again.
+set(COCKATRICE_DEBUG_INFO_LEVEL
+    ""
+    CACHE STRING "DWARF level for Debug and Release objects (empty keeps the built-in flags)"
+)
+if(NOT COCKATRICE_DEBUG_INFO_LEVEL STREQUAL "")
+  if(MSVC)
+    message(WARNING "COCKATRICE_DEBUG_INFO_LEVEL is ignored on MSVC")
+  else()
+    string(APPEND CMAKE_CXX_FLAGS_DEBUG " -g${COCKATRICE_DEBUG_INFO_LEVEL}")
+    string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g${COCKATRICE_DEBUG_INFO_LEVEL}")
+  endif()
+endif()
+
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   add_definitions("-DSFMT_MEXP=19937")

From daa8671b4d401646e6cef0337889737afabf0343 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Fri, 6 Nov 2026 10:47:47 +0100
Subject: [PATCH 14/14] [Update] Make the update download atomic and its temp
 path unpredictable (#7627)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The downloader wrote to a predictable /tmp/<url-basename> path, ignored the
result of write(), and leaked the previous reply when a check was retried. It
also connected no error handler to the reply and had no transfer timeout.

Create the file inside a private QTemporaryDir, write it with QSaveFile and
commit it only after every byte was accepted, report reply errors, give the
request a 30 s transfer timeout, and delete the superseded reply. Ignore a
queued finished()/errorOccurred() from a reply that has already been replaced,
and drop the manual redirect branch because Qt follows redirects by default.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../update/client/update_downloader.cpp       | 111 ++++++++++++++----
 .../network/update/client/update_downloader.h |   3 +
 2 files changed, 93 insertions(+), 21 deletions(-)

diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp
index 8868876fa..8b5ef3d6c 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.cpp
+++ b/cockatrice/src/client/network/update/client/update_downloader.cpp
@@ -1,15 +1,16 @@
 #include "update_downloader.h"
 
-#include <QByteArray>
-#include <QChar>
 #include <QDir>
-#include <QFile>
+#include <QFileInfo>
 #include <QIODevice>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
+#include <QSaveFile>
+#include <QTemporaryDir>
 #include <QUrl>
 #include <QVariant>
 #include <libcockatrice/network/network_manager.h>
+#include <utility>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)
 {
@@ -23,48 +24,116 @@ void UpdateDownloader::beginDownload(QUrl downloadUrl)
         originalUrl = downloadUrl;
     }
 
+    if (auto *old = std::exchange(response, nullptr)) {
+        old->abort();
+        old->deleteLater();
+    }
+
+    errorReported = false;
+    cancelRequested = false;
+
+    // The transfer timeout comes from the manager (NetworkManagerFactory).
     response = netMan->get(QNetworkRequest(downloadUrl));
     connect(response, &QNetworkReply::finished, this, &UpdateDownloader::fileFinished);
+    connect(response, &QNetworkReply::errorOccurred, this, &UpdateDownloader::downloadError);
     connect(response, &QNetworkReply::downloadProgress, this, &UpdateDownloader::downloadProgress);
-    connect(this, &UpdateDownloader::stopDownload, response, &QNetworkReply::abort);
+    connect(this, &UpdateDownloader::stopDownload, this, &UpdateDownloader::cancelDownload);
 }
 
-void UpdateDownloader::downloadError(QNetworkReply::NetworkError)
+void UpdateDownloader::downloadError(QNetworkReply::NetworkError networkError)
 {
-    if (response == nullptr) {
+    // A reply that was superseded by beginDownload() can still deliver a
+    // queued error; it must not be reported against the current reply.
+    if (response == nullptr || sender() != response || errorReported) {
         return;
     }
 
-    emit error(response->errorString().toUtf8());
+    // A transfer timeout aborts the reply, so it arrives as OperationCanceledError.
+    // Only an abort the user asked for is suppressed; every other cancel is a
+    // stalled transfer and has to be reported.
+    if (networkError == QNetworkReply::OperationCanceledError) {
+        if (cancelRequested) {
+            return;
+        }
+
+        errorReported = true;
+        emit error(tr("The download timed out. Check your connection and try again."));
+        return;
+    }
+
+    errorReported = true;
+    emit error(response->errorString());
+}
+
+void UpdateDownloader::cancelDownload()
+{
+    cancelRequested = true;
+    if (response != nullptr) {
+        response->abort();
+    }
 }
 
 void UpdateDownloader::fileFinished()
 {
-    // If we finished but there's a redirect, follow it
-    QVariant redirect = response->attribute(QNetworkRequest::RedirectionTargetAttribute);
-    if (!redirect.isNull()) {
-        beginDownload(redirect.toUrl());
+    // An aborted, superseded reply also emits finished(). Only the reply
+    // currently stored in response may be consumed.
+    if (response == nullptr || sender() != response) {
         return;
     }
 
-    // Handle any errors we had
-    if (response->error()) {
-        emit error(response->errorString());
+    // errorOccurred normally reports this first; keep the check for errors that
+    // only surface when the reply finishes.
+    if (response->error() != QNetworkReply::NoError) {
+        downloadError(response->error());
+        response->deleteLater();
+        response = nullptr;
         return;
     }
 
-    // Work out the file name of the download
-    QString fileName = QDir::temp().path() + QDir::separator() + originalUrl.toString().section('/', -1);
+    // Give the update its own private directory. The name is unpredictable, so a
+    // local user cannot pre-create or symlink the path, and the original file
+    // name (including the installer suffix) is preserved inside it.
+    QTemporaryDir downloadDir(QDir::temp().filePath(QStringLiteral("cockatrice-update-XXXXXX")));
+    if (!downloadDir.isValid()) {
+        emit error(tr("Could not create a temporary directory for the download."));
+        response->deleteLater();
+        response = nullptr;
+        return;
+    }
+    downloadDir.setAutoRemove(false);
 
-    // Save the build in a temporary directory
-    QFile file(fileName);
+    const QString remoteName = QFileInfo(originalUrl.path()).fileName();
+    const QString fileName = downloadDir.filePath(remoteName.isEmpty() ? QStringLiteral("update") : remoteName);
+
+    QSaveFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
-        emit error(tr("Could not open the file for reading."));
+        downloadDir.remove();
+        emit error(tr("Could not open the file for writing: %1").arg(file.errorString()));
+        response->deleteLater();
+        response = nullptr;
         return;
     }
 
-    file.write(response->readAll());
-    file.close();
+    const QByteArray data = response->readAll();
+    if (file.write(data) != data.size()) {
+        file.cancelWriting();
+        downloadDir.remove();
+        emit error(tr("Could not write the downloaded file to disk."));
+        response->deleteLater();
+        response = nullptr;
+        return;
+    }
+
+    if (!file.commit()) {
+        downloadDir.remove();
+        emit error(tr("Could not save the downloaded file: %1").arg(file.errorString()));
+        response->deleteLater();
+        response = nullptr;
+        return;
+    }
+
+    response->deleteLater();
+    response = nullptr;
 
     // Emit the success signal with a URL to the download file
     emit downloadSuccessful(QUrl::fromLocalFile(fileName));
diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h
index 8aeefb22a..7704eca38 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.h
+++ b/cockatrice/src/client/network/update/client/update_downloader.h
@@ -32,10 +32,13 @@ private:
     QUrl originalUrl;
     QNetworkAccessManager *netMan;
     QNetworkReply *response;
+    bool errorReported = false;
+    bool cancelRequested = false;
 private slots:
     void fileFinished();
     void downloadProgress(qint64 bytesRead, qint64 totalBytes);
     void downloadError(QNetworkReply::NetworkError);
+    void cancelDownload();
 };
 
 #endif // COCKATRICE_UPDATEDOWNLOADER_H