diff --git a/config.py b/config.py
index 2cf8a04..c0ca6b3 100644
--- a/config.py
+++ b/config.py
@@ -9,7 +9,7 @@ DATA_PATH = BASE_DIR / "data" / "entries.csv"
 DEFAULT_DATABASE_URL = f"sqlite:///{BASE_DIR / 'data' / 'boker-dev.sqlite3'}"
 
 ELIGIBLE_MIN_SESSIONS = 3
-APP_VERSION = "2.5.18"
+APP_VERSION = "2.5.19"
 
 
 def load_local_env(env_path: Path) -> None:
diff --git a/templates/account_settings.html b/templates/account_settings.html
index e205e82..fb4eddc 100644
--- a/templates/account_settings.html
+++ b/templates/account_settings.html
@@ -80,7 +80,8 @@
 <div class="modal-backdrop" id="modal-delete-account" hidden>
     <div class="modal-card">
         <div class="modal-card__head">
-            <h2 style="font-size:18px;margin:0;">Delete account</h2>
+            <span class="kicker" style="margin:0;">Account</span>
+            <h2 class="panel__title">Delete account</h2>
         </div>
         <p class="modal-card__text">
             Your account will be <strong>permanently disabled</strong> and all leagues you own will be archived. This cannot be undone.<br><br>
@@ -88,7 +89,7 @@
         </p>
         <form method="post" action="{{ url_for('account.delete_account') }}">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-            <div style="padding:0 20px 16px;display:grid;gap:10px;">
+            <div class="form-card" style="padding:0 20px 4px;gap:10px;">
                 <input
                     class="modal-confirm-input"
                     type="text"
diff --git a/templates/league_seasons.html b/templates/league_seasons.html
index 0f00152..1384b57 100644
--- a/templates/league_seasons.html
+++ b/templates/league_seasons.html
@@ -167,30 +167,28 @@
 <div class="modal-backdrop" id="modal-edit-season" hidden>
     <div class="modal-card" role="dialog" aria-modal="true" aria-labelledby="modal-edit-season-title">
         <div class="modal-card__head">
-            <h2 class="modal-card__title" id="modal-edit-season-title">Edit season</h2>
-            <button class="modal-card__close" type="button" data-close-modal aria-label="Close">&times;</button>
+            <span class="kicker" style="margin:0;">Season</span>
+            <h2 class="panel__title" id="modal-edit-season-title">Edit season</h2>
         </div>
         <form method="post" id="form-edit-season" action="">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-            <div class="modal-card__body">
-                <div class="form-card" style="padding:0;gap:14px;">
-                    <label>
-                        <span>Name</span>
-                        <input type="text" name="name" id="edit-season-name" required>
-                    </label>
-                    <label>
-                        <span>Start date <span class="form-opt-hint">(optional)</span></span>
-                        <input type="date" name="start_date" id="edit-season-start">
-                    </label>
-                    <label>
-                        <span>End date <span class="form-opt-hint">(optional)</span></span>
-                        <input type="date" name="end_date" id="edit-season-end">
-                    </label>
-                </div>
+            <div class="form-card" style="padding:0 20px 4px;gap:12px;">
+                <label>
+                    <span>Name</span>
+                    <input type="text" name="name" id="edit-season-name" required>
+                </label>
+                <label>
+                    <span>Start date <span class="form-opt-hint">(optional)</span></span>
+                    <input type="date" name="start_date" id="edit-season-start">
+                </label>
+                <label>
+                    <span>End date <span class="form-opt-hint">(optional)</span></span>
+                    <input type="date" name="end_date" id="edit-season-end">
+                </label>
             </div>
-            <div class="modal-card__foot">
-                <button class="btn btn--primary" type="submit">Save changes</button>
-                <button class="btn btn--ghost" type="button" data-close-modal>Cancel</button>
+            <div class="modal-card__actions">
+                <button class="btn btn--ghost btn--sm" type="button" data-close-modal>Cancel</button>
+                <button class="btn btn--primary btn--sm" type="submit">Save changes</button>
             </div>
         </form>
     </div>
@@ -200,17 +198,15 @@
 <div class="modal-backdrop" id="modal-delete-season" hidden>
     <div class="modal-card" role="dialog" aria-modal="true" aria-labelledby="modal-delete-season-title">
         <div class="modal-card__head">
-            <h2 class="modal-card__title" id="modal-delete-season-title">Delete season</h2>
-            <button class="modal-card__close" type="button" data-close-modal aria-label="Close">&times;</button>
-        </div>
-        <div class="modal-card__body">
-            <p>Permanently delete <strong id="delete-season-name"></strong>? Sessions assigned to this season will not be deleted — they will simply become unassigned. This cannot be undone.</p>
+            <span class="kicker" style="margin:0;">Season</span>
+            <h2 class="panel__title" id="modal-delete-season-title">Delete season</h2>
         </div>
+        <p class="modal-card__text">Permanently delete <strong id="delete-season-name"></strong>? Sessions assigned to this season will not be deleted — they will simply become unassigned. This cannot be undone.</p>
         <form method="post" id="form-delete-season" action="">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-            <div class="modal-card__foot">
-                <button class="btn btn--destructive" type="submit">Delete season</button>
-                <button class="btn btn--ghost" type="button" data-close-modal>Cancel</button>
+            <div class="modal-card__actions">
+                <button class="btn btn--ghost btn--sm" type="button" data-close-modal>Cancel</button>
+                <button class="btn btn--destructive btn--sm" type="submit">Delete season</button>
             </div>
         </form>
     </div>
diff --git a/templates/league_settings.html b/templates/league_settings.html
index 738bcbd..ee72203 100644
--- a/templates/league_settings.html
+++ b/templates/league_settings.html
@@ -204,7 +204,8 @@
 <div class="modal-backdrop" id="modal-archive" hidden>
     <div class="modal-card">
         <div class="modal-card__head">
-            <h2 style="font-size:18px;margin:0;">Archive league</h2>
+            <span class="kicker" style="margin:0;">Danger zone</span>
+            <h2 class="panel__title">Archive league</h2>
         </div>
         <p class="modal-card__text">
             <strong>{{ league.name }}</strong> will be hidden from your dashboard. All data is preserved and can be recovered by contacting support. This does not delete any sessions or ledger events.<br><br>
@@ -212,7 +213,7 @@
         </p>
         <form method="post" action="{{ url_for('leagues.archive_league', league_ref=league.url_ref) }}">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-            <div style="padding:0 20px 16px;">
+            <div class="form-card" style="padding:0 20px 4px;">
                 <input
                     class="modal-confirm-input"
                     type="text"