diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
index 676e6b7a3..953f09b72 100644
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Build and push (${{ matrix.platform }})
         id: build
-        uses: docker/build-push-action@v6.18.0
+        uses: docker/build-push-action@v6.19.2
         with:
           context: .
           file: Dockerfile
diff --git a/AGENTS.md b/AGENTS.md
index d1c837079..64c69151a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -50,6 +50,14 @@ bin/jobs                     # Manage Solid Queue jobs
 bin/kamal deploy             # Deploy (requires 1Password CLI for secrets)
 ```
 
+## Deploy
+
+Default branch: `main`
+Pre-deploy: `bin/rails saas:enable`
+Deploy: `bin/kamal deploy -d <destination>`
+Destinations: production, staging, beta, beta1, beta2, beta3, beta4
+Note: `beta` is a template requiring `BETA_NUMBER` env var; typical targets are `beta1`-`beta4`.
+
 ## Architecture Overview
 
 ### Multi-Tenancy (URL-Based)
@@ -140,7 +148,7 @@ Key recurring tasks (via `config/recurring.yml`):
 ### Imports and exports
 
 Allow people to move between OSS and SAAS Fizzy instances:
-- Exports/Imports can be wirtten to/read from local or S3 storage depending on the config of the instance (both myst be supported)
+- Exports/Imports can be written to/read from local or S3 storage depending on the config of the instance (both must be supported)
 - Must be able to handle very large ZIP files (500+GB)
 - Models in `app/models/account/data_transfer/`, `app/models/zip_file`
 
diff --git a/Gemfile b/Gemfile
index c524ee3c1..17e7496c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,10 +16,10 @@ gem "kamal", require: false
 gem "puma", ">= 5.0"
 gem "solid_cable", ">= 3.0"
 gem "solid_cache", "~> 1.0"
-gem "solid_queue", "~> 1.2"
+gem "solid_queue", "~> 1.3"
 gem "sqlite3", ">= 2.0"
 gem "thruster", require: false
-gem "trilogy", "~> 2.9"
+gem "trilogy", "~> 2.10"
 
 # Features
 gem "bcrypt", "~> 3.1.7"
@@ -54,7 +54,7 @@ group :development, :test do
 end
 
 group :development do
-  gem "web-console"
+  gem "web-console", github: "rails/web-console"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 559b2990b..4e3653aeb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/basecamp/lexxy
-  revision: 4bcf8d0213971560e90734493f8bd835addc3642
+  revision: b7f0f1429df5fa425eac043191ae2b65edee7488
   specs:
-    lexxy (0.7.4.beta)
+    lexxy (0.7.6.beta)
       rails (>= 8.0.2)
 
 GIT
@@ -13,7 +13,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 60d92e4e7dfe923528ccdccc18820ccfe841b7b8
+  revision: 12e24eaf2f0a9613e015653f013dd131317d9bf5
   branch: main
   specs:
     actioncable (8.2.0.alpha)
@@ -47,7 +47,7 @@ GIT
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
     actiontext (8.2.0.alpha)
-      action_text-trix (~> 2.1.15)
+      action_text-trix (~> 2.1.16)
       actionpack (= 8.2.0.alpha)
       activerecord (= 8.2.0.alpha)
       activestorage (= 8.2.0.alpha)
@@ -113,18 +113,27 @@ GIT
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
 
+GIT
+  remote: https://github.com/rails/web-console.git
+  revision: 90e3474306f2367cfeaf2875e91e2bc2d71b5f0f
+  specs:
+    web-console (4.3.0)
+      actionview (>= 8.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 8.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
     action_text-trix (2.1.16)
       railties
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     autotuner (1.1.0)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1203.0)
-    aws-sdk-core (3.241.3)
+    aws-partitions (1.1218.0)
+    aws-sdk-core (3.242.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -132,11 +141,11 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.120.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-kms (1.122.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.211.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-s3 (1.213.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -147,9 +156,9 @@ GEM
     benchmark (0.5.0)
     bigdecimal (4.0.1)
     bindex (0.8.1)
-    bootsnap (1.22.0)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
-    brakeman (8.0.1)
+    brakeman (8.0.2)
       racc
     builder (3.3.0)
     bundler-audit (0.9.3)
@@ -180,7 +189,7 @@ GEM
     dotenv (3.2.0)
     drb (2.2.3)
     ed25519 (1.4.0)
-    erb (6.0.1)
+    erb (6.0.2)
     erubi (1.13.1)
     et-orbi (1.4.0)
       tzinfo
@@ -208,20 +217,21 @@ GEM
     image_processing (1.14.0)
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.2.2)
+    importmap-rails (2.2.3)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.14.1)
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
     jmespath (1.6.2)
-    json (2.18.0)
+    json (2.18.1)
     jwt (3.1.2)
       base64
     kamal (2.10.1)
@@ -258,7 +268,8 @@ GEM
     mini_magick (5.3.1)
       logger
     mini_mime (1.1.5)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     mission_control-jobs (1.1.0)
       actioncable (>= 7.1)
@@ -271,12 +282,12 @@ GEM
       stimulus-rails
       turbo-rails
     mittens (0.3.1)
-    mocha (3.0.1)
+    mocha (3.0.2)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.8.0)
     net-http-persistent (4.0.8)
       connection_pool (>= 2.2.4, < 4)
-    net-imap (0.6.2)
+    net-imap (0.6.3)
       date
       net-protocol
     net-pop (0.1.2)
@@ -291,21 +302,21 @@ GEM
       net-protocol
     net-ssh (7.3.0)
     nio4r (2.7.5)
-    nokogiri (1.19.0-aarch64-linux-gnu)
+    nokogiri (1.19.1-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.0-aarch64-linux-musl)
+    nokogiri (1.19.1-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.0-arm-linux-gnu)
+    nokogiri (1.19.1-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.0-arm-linux-musl)
+    nokogiri (1.19.1-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-musl)
+    nokogiri (1.19.1-x86_64-linux-musl)
       racc (~> 1.4)
     openssl (4.0.0)
     ostruct (0.6.3)
@@ -319,7 +330,7 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.8.0)
+    prism (1.9.0)
     propshaft (1.3.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -327,12 +338,12 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.2)
+    puma (7.2.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-session (2.1.1)
@@ -346,12 +357,12 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.3.1)
-    rdoc (7.0.3)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -399,7 +410,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (3.2.2)
     securerandom (0.4.1)
-    selenium-webdriver (4.40.0)
+    selenium-webdriver (4.41.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -414,21 +425,21 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    solid_queue (1.2.4)
+    solid_queue (1.3.2)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
       fugit (~> 1.11)
       railties (>= 7.1)
       thor (>= 1.3.1)
-    sqlite3 (2.8.0-aarch64-linux-gnu)
-    sqlite3 (2.8.0-aarch64-linux-musl)
-    sqlite3 (2.8.0-arm-linux-gnu)
-    sqlite3 (2.8.0-arm-linux-musl)
-    sqlite3 (2.8.0-arm64-darwin)
-    sqlite3 (2.8.0-x86_64-darwin)
-    sqlite3 (2.8.0-x86_64-linux-gnu)
-    sqlite3 (2.8.0-x86_64-linux-musl)
+    sqlite3 (2.9.0-aarch64-linux-gnu)
+    sqlite3 (2.9.0-aarch64-linux-musl)
+    sqlite3 (2.9.0-arm-linux-gnu)
+    sqlite3 (2.9.0-arm-linux-musl)
+    sqlite3 (2.9.0-arm64-darwin)
+    sqlite3 (2.9.0-x86_64-darwin)
+    sqlite3 (2.9.0-x86_64-linux-gnu)
+    sqlite3 (2.9.0-x86_64-linux-musl)
     sshkit (1.25.0)
       base64
       logger
@@ -436,20 +447,21 @@ GEM
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
       ostruct
-    stackprof (0.2.27)
+    stackprof (0.2.28)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.2.0)
     thor (1.5.0)
-    thruster (0.1.17)
-    thruster (0.1.17-aarch64-linux)
-    thruster (0.1.17-arm64-darwin)
-    thruster (0.1.17-x86_64-darwin)
-    thruster (0.1.17-x86_64-linux)
+    thruster (0.1.18)
+    thruster (0.1.18-aarch64-linux)
+    thruster (0.1.18-arm64-darwin)
+    thruster (0.1.18-x86_64-darwin)
+    thruster (0.1.18-x86_64-linux)
     timeout (0.6.0)
-    trilogy (2.9.0)
+    trilogy (2.10.0)
+      bigdecimal
     tsort (0.2.0)
-    turbo-rails (2.0.21)
+    turbo-rails (2.0.23)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
@@ -459,11 +471,6 @@ GEM
     unicode-emoji (4.1.0)
     uri (1.1.1)
     vcr (6.4.0)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
     web-push (3.1.0)
       jwt (~> 3.0)
       openssl (>= 3.0)
@@ -478,7 +485,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
     zip_kit (6.3.4)
 
 PLATFORMS
@@ -488,7 +495,7 @@ PLATFORMS
   arm-linux-gnu
   arm-linux-musl
   arm64-darwin
-  x86_64-darwin-25
+  x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu
   x86_64-linux-musl
@@ -526,16 +533,16 @@ DEPENDENCIES
   selenium-webdriver
   solid_cable (>= 3.0)
   solid_cache (~> 1.0)
-  solid_queue (~> 1.2)
+  solid_queue (~> 1.3)
   sqlite3 (>= 2.0)
   stackprof
   stimulus-rails
   thruster
-  trilogy (~> 2.9)
+  trilogy (~> 2.10)
   turbo-rails
   useragent!
   vcr
-  web-console
+  web-console!
   web-push
   webmock
   zip_kit
diff --git a/Gemfile.saas b/Gemfile.saas
index b93efb1ee..39aa49a71 100644
--- a/Gemfile.saas
+++ b/Gemfile.saas
@@ -4,12 +4,16 @@ eval_gemfile "Gemfile"
 git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 
 gem "activeresource", require: "active_resource"
+gem "actionpack-xml_parser" # needed by queenbee for XML request body parsing
 gem "stripe", "~> 18.0"
 gem "queenbee", bc: "queenbee-plugin"
 gem "fizzy-saas", path: "saas"
 gem "console1984", bc: "console1984"
 gem "audits1984", bc: "audits1984", branch: "flavorjones/coworker-api"
 
+# Native push notifications (iOS/Android)
+gem "action_push_native"
+
 # Telemetry
 gem "rails_structured_logging", bc: "rails-structured-logging"
 gem "sentry-ruby"
diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock
index b09872738..0e35effac 100644
--- a/Gemfile.saas.lock
+++ b/Gemfile.saas.lock
@@ -23,9 +23,9 @@ GIT
 
 GIT
   remote: https://github.com/basecamp/lexxy
-  revision: 4bcf8d0213971560e90734493f8bd835addc3642
+  revision: b7f0f1429df5fa425eac043191ae2b65edee7488
   specs:
-    lexxy (0.7.4.beta)
+    lexxy (0.7.6.beta)
       rails (>= 8.0.2)
 
 GIT
@@ -39,9 +39,9 @@ GIT
 
 GIT
   remote: https://github.com/basecamp/rails-structured-logging
-  revision: 76960cb5c15fc2b6b5f7542e05d7dcc031cef9e6
+  revision: f6633fd8fee5906d8affa2329c61de7a3450eb7e
   specs:
-    rails_structured_logging (0.2.1)
+    rails_structured_logging (0.3.0)
       json
       rails (>= 6.0.0)
 
@@ -62,7 +62,7 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 60d92e4e7dfe923528ccdccc18820ccfe841b7b8
+  revision: 12e24eaf2f0a9613e015653f013dd131317d9bf5
   branch: main
   specs:
     actioncable (8.2.0.alpha)
@@ -96,7 +96,7 @@ GIT
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
     actiontext (8.2.0.alpha)
-      action_text-trix (~> 2.1.15)
+      action_text-trix (~> 2.1.16)
       actionpack (= 8.2.0.alpha)
       activerecord (= 8.2.0.alpha)
       activestorage (= 8.2.0.alpha)
@@ -162,6 +162,15 @@ GIT
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
 
+GIT
+  remote: https://github.com/rails/web-console.git
+  revision: 90e3474306f2367cfeaf2875e91e2bc2d71b5f0f
+  specs:
+    web-console (4.3.0)
+      actionview (>= 8.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 8.0.0)
+
 PATH
   remote: saas
   specs:
@@ -186,8 +195,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    action_push_native (0.3.1)
+      activejob (>= 8.0)
+      activerecord (>= 8.0)
+      googleauth (~> 1.14)
+      httpx (~> 1.6)
+      jwt (>= 2)
+      railties (>= 8.0)
     action_text-trix (2.1.16)
       railties
+    actionpack-xml_parser (2.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
     activemodel-serializers-xml (1.0.3)
       activemodel (>= 5.0.0.a)
       activesupport (>= 5.0.0.a)
@@ -196,15 +215,15 @@ GEM
       activemodel (>= 7.0)
       activemodel-serializers-xml (~> 1.0)
       activesupport (>= 7.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     anyway_config (2.7.2)
       ruby-next-core (~> 1.0)
     ast (2.4.3)
     autotuner (1.1.0)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1203.0)
-    aws-sdk-core (3.241.3)
+    aws-partitions (1.1218.0)
+    aws-sdk-core (3.242.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -212,11 +231,11 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.120.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-kms (1.122.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.211.0)
-      aws-sdk-core (~> 3, >= 3.241.3)
+    aws-sdk-s3 (1.213.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -227,9 +246,9 @@ GEM
     benchmark (0.5.0)
     bigdecimal (4.0.1)
     bindex (0.8.1)
-    bootsnap (1.22.0)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
-    brakeman (8.0.1)
+    brakeman (8.0.2)
       racc
     builder (3.3.0)
     bundler-audit (0.9.3)
@@ -261,17 +280,24 @@ GEM
     drb (2.2.3)
     dry-initializer (3.2.0)
     ed25519 (1.4.0)
-    erb (6.0.1)
+    erb (6.0.2)
     erubi (1.13.1)
     et-orbi (1.4.0)
       tzinfo
     faker (3.6.0)
       i18n (>= 1.8.11, < 2)
+    faraday (2.14.0)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-aarch64-linux-musl)
     ffi (1.17.2-arm-linux-gnu)
     ffi (1.17.2-arm-linux-musl)
     ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
     ffi (1.17.2-x86_64-linux-musl)
     fugit (1.12.1)
@@ -282,27 +308,43 @@ GEM
       addressable (>= 2.5.0)
     globalid (1.3.0)
       activesupport (>= 6.1)
+    google-cloud-env (2.3.1)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-logging-utils (0.2.0)
+    googleauth (1.16.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
     gvltools (0.4.0)
     hashdiff (1.2.1)
+    http-2 (1.1.1)
+    httpx (1.7.1)
+      http-2 (>= 1.0.0)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     image_processing (1.14.0)
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.2.2)
+    importmap-rails (2.2.3)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.14.1)
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
     jmespath (1.6.2)
-    json (2.18.0)
+    json (2.18.1)
     jwt (3.1.2)
       base64
     kamal (2.10.1)
@@ -339,7 +381,8 @@ GEM
     mini_magick (5.3.1)
       logger
     mini_mime (1.1.5)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     mission_control-jobs (1.1.0)
       actioncable (>= 7.1)
@@ -352,12 +395,15 @@ GEM
       stimulus-rails
       turbo-rails
     mittens (0.3.1)
-    mocha (3.0.1)
+    mocha (3.0.2)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.8.0)
+    multi_json (1.19.1)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     net-http-persistent (4.0.8)
       connection_pool (>= 2.2.4, < 4)
-    net-imap (0.6.2)
+    net-imap (0.6.3)
       date
       net-protocol
     net-pop (0.1.2)
@@ -372,21 +418,24 @@ GEM
       net-protocol
     net-ssh (7.3.0)
     nio4r (2.7.5)
-    nokogiri (1.19.0-aarch64-linux-gnu)
+    nokogiri (1.19.1-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.0-aarch64-linux-musl)
+    nokogiri (1.19.1-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.0-arm-linux-gnu)
+    nokogiri (1.19.1-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.0-arm-linux-musl)
+    nokogiri (1.19.1-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-musl)
+    nokogiri (1.19.1-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.1-x86_64-linux-musl)
       racc (~> 1.4)
     openssl (4.0.0)
+    os (1.1.4)
     ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.10.0)
@@ -398,7 +447,7 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.8.0)
+    prism (1.9.0)
     prometheus-client-mmap (1.4.0)
       base64
       bigdecimal
@@ -419,6 +468,11 @@ GEM
       bigdecimal
       logger
       rb_sys (~> 0.9.117)
+    prometheus-client-mmap (1.4.0-x86_64-darwin)
+      base64
+      bigdecimal
+      logger
+      rb_sys (~> 0.9.117)
     prometheus-client-mmap (1.4.0-x86_64-linux-gnu)
       base64
       bigdecimal
@@ -436,12 +490,12 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.2)
+    puma (7.2.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-session (2.1.1)
@@ -455,15 +509,15 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.3.1)
     rake-compiler-dock (1.9.1)
     rb_sys (0.9.117)
       rake-compiler-dock (= 1.9.1)
-    rdoc (7.0.3)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -513,7 +567,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (3.2.2)
     securerandom (0.4.1)
-    selenium-webdriver (4.40.0)
+    selenium-webdriver (4.41.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -525,6 +579,11 @@ GEM
     sentry-ruby (6.2.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+    signet (0.21.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 4.0)
+      multi_json (~> 1.10)
     sniffer (0.5.0)
       anyway_config (>= 1.0)
       dry-initializer (~> 3)
@@ -537,20 +596,21 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    solid_queue (1.2.4)
+    solid_queue (1.3.2)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
       fugit (~> 1.11)
       railties (>= 7.1)
       thor (>= 1.3.1)
-    sqlite3 (2.8.0-aarch64-linux-gnu)
-    sqlite3 (2.8.0-aarch64-linux-musl)
-    sqlite3 (2.8.0-arm-linux-gnu)
-    sqlite3 (2.8.0-arm-linux-musl)
-    sqlite3 (2.8.0-arm64-darwin)
-    sqlite3 (2.8.0-x86_64-linux-gnu)
-    sqlite3 (2.8.0-x86_64-linux-musl)
+    sqlite3 (2.9.0-aarch64-linux-gnu)
+    sqlite3 (2.9.0-aarch64-linux-musl)
+    sqlite3 (2.9.0-arm-linux-gnu)
+    sqlite3 (2.9.0-arm-linux-musl)
+    sqlite3 (2.9.0-arm64-darwin)
+    sqlite3 (2.9.0-x86_64-darwin)
+    sqlite3 (2.9.0-x86_64-linux-gnu)
+    sqlite3 (2.9.0-x86_64-linux-musl)
     sshkit (1.25.0)
       base64
       logger
@@ -558,20 +618,22 @@ GEM
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
       ostruct
-    stackprof (0.2.27)
+    stackprof (0.2.28)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.2.0)
     stripe (18.0.1)
     thor (1.5.0)
-    thruster (0.1.17)
-    thruster (0.1.17-aarch64-linux)
-    thruster (0.1.17-arm64-darwin)
-    thruster (0.1.17-x86_64-linux)
+    thruster (0.1.18)
+    thruster (0.1.18-aarch64-linux)
+    thruster (0.1.18-arm64-darwin)
+    thruster (0.1.18-x86_64-darwin)
+    thruster (0.1.18-x86_64-linux)
     timeout (0.6.0)
-    trilogy (2.9.0)
+    trilogy (2.10.0)
+      bigdecimal
     tsort (0.2.0)
-    turbo-rails (2.0.21)
+    turbo-rails (2.0.23)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
@@ -581,11 +643,6 @@ GEM
     unicode-emoji (4.1.0)
     uri (1.1.1)
     vcr (6.4.0)
-    web-console (4.2.1)
-      actionview (>= 6.0.0)
-      activemodel (>= 6.0.0)
-      bindex (>= 0.4.0)
-      railties (>= 6.0.0)
     web-push (3.1.0)
       jwt (~> 3.0)
       openssl (>= 3.0)
@@ -628,7 +685,7 @@ GEM
       anyway_config (>= 1.3, < 3)
       railties
       yabeda (~> 0.8)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
     zip_kit (6.3.4)
 
 PLATFORMS
@@ -638,11 +695,14 @@ PLATFORMS
   arm-linux-gnu
   arm-linux-musl
   arm64-darwin
+  x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu
   x86_64-linux-musl
 
 DEPENDENCIES
+  action_push_native
+  actionpack-xml_parser
   activeresource
   audits1984!
   autotuner
@@ -685,17 +745,17 @@ DEPENDENCIES
   sentry-ruby
   solid_cable (>= 3.0)
   solid_cache (~> 1.0)
-  solid_queue (~> 1.2)
+  solid_queue (~> 1.3)
   sqlite3 (>= 2.0)
   stackprof
   stimulus-rails
   stripe (~> 18.0)
   thruster
-  trilogy (~> 2.9)
+  trilogy (~> 2.10)
   turbo-rails
   useragent!
   vcr
-  web-console
+  web-console!
   web-push
   webmock
   webrick
diff --git a/app/assets/images/menu-dots-horizontal.svg b/app/assets/images/menu-dots-horizontal.svg
index 4e60fdd40..cb0f0124a 100644
--- a/app/assets/images/menu-dots-horizontal.svg
+++ b/app/assets/images/menu-dots-horizontal.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="3.25" cy="12" r="3.25"/><circle cx="12" cy="12" r="3.25"/><circle cx="20.75" cy="12" r="3.25"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><circle cx="4" cy="12" r="3"/><circle cx="20" cy="12" r="3"/></svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css
index 5f15dc278..a4e500139 100644
--- a/app/assets/stylesheets/buttons.css
+++ b/app/assets/stylesheets/buttons.css
@@ -18,6 +18,7 @@
     padding: var(--btn-padding, 0.5em 1.1em);
     pointer-events: auto;
     position: relative;
+    text-decoration: none;
     transition: 100ms ease-out;
     transition-property: background-color, border, box-shadow, color, opacity, scale;
 
@@ -127,7 +128,7 @@
   }
 
   @media (min-width: 640px) {
-    .btn--circle-mobile .icon--mobile-only {
+    .btn .icon--mobile-only {
       display: none !important;
     }
   }
@@ -271,4 +272,26 @@
       inline-size: 100%;
     }
   }
+
+  /* Button utilities
+  /* ------------------------------------------------------------------------ */
+
+  :is([data-platform~=mobile], [data-platform~=native]) {
+    .btn--ensure-tap-target-size {
+      --tap-target-z-index: 1;
+      --tap-target-min-size: 44px;
+
+      z-index: var(--tap-target-z-index);
+
+      &::before {
+        content: "";
+        display: block;
+        block-size: var(--tap-target-min-size);
+        inline-size: var(--tap-target-min-size);
+        inset: calc(50% - var(--tap-target-min-size) / 2) auto auto calc(50% - var(--tap-target-min-size) / 2);
+        opacity: 0;
+        position: absolute;
+      }
+    }
+  }
 }
diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css
index e2b576058..871e61a59 100644
--- a/app/assets/stylesheets/card-columns.css
+++ b/app/assets/stylesheets/card-columns.css
@@ -286,6 +286,7 @@
       inset-inline-end: 0;
       position: absolute;
       translate: 100%;
+      z-index: 2;
     }
 
     @media (min-width: 640px) {
@@ -769,13 +770,16 @@
     --panel-padding: 2ch;
     --panel-size: 100%;
 
-    display: flex;
     flex-wrap: wrap;
     gap: var(--gap);
     inset-block-start: 0;
     justify-content: center;
     position: absolute;
     z-index: 1;
+
+    &[open] {
+      display: flex;
+    }
   }
 
   /* On Deck (Not Now)
@@ -819,6 +823,10 @@
       position: absolute;
       translate: 20% -20%;
       z-index: 1;
+
+      @media (max-width: 639px) {
+        translate: 20% 0%;
+      }
     }
 
     /* Maybe column: position bubble relative to the title, not the container */
diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css
index 68d0cb2db..3dc16d5a2 100644
--- a/app/assets/stylesheets/card-perma.css
+++ b/app/assets/stylesheets/card-perma.css
@@ -36,20 +36,10 @@
 
     @media (max-width: 639px) {
       &:has(.card__closed) {
-        padding-block-start: 2rem;
-      }
+        padding-block-start: 4.5rem;
 
-      &:has(.reactions .reaction) {
-        .card__meta-avatars--assignees {
-          margin-inline-end: unset;
-        }
-      }
-
-      &:not(:has(.reactions .reaction)) {
-        &:has(.card__closed) {
-          .card__meta-text--assignees {
-            margin-inline-end: calc(var(--btn-size) + var(--meta-spacer-block));
-          }
+        .card-perma__bg {
+          box-shadow: 0 -2rem 0 0 var(--color-container);
         }
       }
     }
@@ -110,6 +100,7 @@
       @media (max-width: 639px) {
         flex-direction: column;
         padding-block: var(--card-padding-block) calc(var(--card-padding-block) * 1.5);
+        position: static;
       }
     }
 
@@ -186,7 +177,7 @@
         }
 
         .card__meta-avatars--assignees {
-          margin-inline: 0 calc(var(--btn-size) + var(--meta-spacer-block));
+          margin-inline: 0;
           margin-block-start: var(--meta-spacer-block);
         }
 
@@ -232,6 +223,14 @@
       }
     }
 
+    .card__closed {
+      @media (max-width: 639px) {
+        inset: auto 0 100% auto;
+        translate: 0 30%;
+        scale: 75%;
+      }
+    }
+
     .card__footer {
       --btn-size: 2.5rem;
 
@@ -251,8 +250,12 @@
       }
 
       @media (max-width: 639px) {
+        display: grid;
         font-size: var(--text-x-small);
-        position: relative;
+        grid-template-columns: 1fr auto;
+        grid-template-areas:
+          "meta bg-zoom"
+          "meta reactions";
       }
     }
 
@@ -286,17 +289,11 @@
       }
 
       &:not(:has(.reaction)) {
+        margin: 0;
+
         .reactions__trigger {
           --btn-border-color: var(--color-ink-light);
         }
-
-        @media (max-width: 639px) {
-          inset-inline-end: 0;
-        }
-
-        @media (min-width: 640px) {
-          position: static;
-        }
       }
     }
 
diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css
index 27dbb2c46..76f08fdc5 100644
--- a/app/assets/stylesheets/cards.css
+++ b/app/assets/stylesheets/cards.css
@@ -207,6 +207,10 @@
     line-height: 1.15;
     text-wrap: balance;
 
+    &.overflow-line-clamp {
+      text-wrap: unset; /* text-wrap: balance breaks -webkit-line-clamp in Safari */
+    }
+
     .card-field__title {
       overflow: hidden; /* prevent scrolling on windows */
       padding-block: var(--autosize-block-padding);
@@ -398,6 +402,7 @@
     position: absolute;
     rotate: 5deg;
     transform-origin: top right;
+    z-index: 2;
 
     .cards & {
       display: none;
@@ -409,12 +414,6 @@
         }
       }
     }
-
-    @media (max-width: 639px) {
-      inset: auto calc(var(--card-padding-inline) * -0.5) 100% auto;
-      translate: 0 40%;
-      scale: 75%;
-    }
   }
 
   .card:has(.card__closed),
diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 01a9fbe91..2369d62b3 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -84,6 +84,17 @@
     .reactions {
       margin-block-start: var(--block-space-half);
       margin-inline: calc(var(--column-gap) / -1);
+
+      &:not(:has(.reaction)) {
+        inset-block-end: var(--comment-padding-block);
+        inset-inline-end: calc(var(--comment-padding-inline) / 2);
+        margin: 0;
+        position: absolute;
+
+        @media (max-width: 640px) {
+          inset-inline-end: calc(var(--comment-padding-inline) / 3);
+        }
+      }
     }
   }
 
diff --git a/app/assets/stylesheets/flash.css b/app/assets/stylesheets/flash.css
index c57e9b6a4..0d369dfbb 100644
--- a/app/assets/stylesheets/flash.css
+++ b/app/assets/stylesheets/flash.css
@@ -1,7 +1,7 @@
 @layer components {
   .flash {
     display: flex;
-    inset-block-start: var(--block-space);
+    inset-block-start: calc(var(--block-space) + var(--custom-safe-inset-top));
     inset-inline-start: 50%;
     justify-content: center;
     position: fixed;
@@ -16,7 +16,9 @@
     color: var(--flash-color, var(--color-ink-inverted));
     display: inline-flex;
     font-size: var(--font-size-medium);
+    inline-size: max-content;
     margin: 0 auto;
+    max-inline-size: 90vw;
     padding: 0.7em 1.4em;
   }
 }
diff --git a/app/assets/stylesheets/lexxy.css b/app/assets/stylesheets/lexxy.css
index 0b33162fb..8fb7658ee 100644
--- a/app/assets/stylesheets/lexxy.css
+++ b/app/assets/stylesheets/lexxy.css
@@ -12,10 +12,10 @@
 
   --lexxy-color-canvas: var(--color-canvas);
 
-  --lexxy-color-accent-dark: var(--color-accent-dark);
-  --lexxy-color-accent-medium: var(--color-accent-medium);
-  --lexxy-color-accent-light: var(--color-accent-light);
-  --lexxy-color-accent-lightest: var(--color-accent-lightest);
+  --lexxy-color-accent-dark: var(--color-ink-dark);
+  --lexxy-color-accent-medium: var(--color-ink-medium);
+  --lexxy-color-accent-light: var(--color-ink-light);
+  --lexxy-color-accent-lightest: var(--color-ink-lighter);
 
   --lexxy-color-red: oklch(var(--lch-red-medium));
   --lexxy-color-green: oklch(var(--lch-green-medium));
@@ -38,6 +38,8 @@
   --lexxy-color-table-cell-selected-bg: var(--lexxy-color-selected);
   --lexxy-color-table-cell-toggle: var(--lexxy-color-selected);
   --lexxy-color-table-cell-remove: oklch(var(--lch-red-medium) / 20%);
+
+  --lexxy-focus-ring-offset: 2px;
 }
 
 @layer components {
@@ -139,7 +141,9 @@
     }
 
     ol, ul {
-      padding-inline-start: 1ch;
+      &:not(.lexxy-prompt-menu) {
+        padding-inline-start: 1ch;
+      }
     }
 
     blockquote {
diff --git a/app/assets/stylesheets/native.css b/app/assets/stylesheets/native.css
index 34259e9c6..591ce8890 100644
--- a/app/assets/stylesheets/native.css
+++ b/app/assets/stylesheets/native.css
@@ -20,6 +20,16 @@
     /* Header
     /* ------------------------------------------------------------------------ */
 
+    .header {
+      padding-block-start: var(--custom-safe-inset-top);
+    }
+
+    .header--mobile-actions-stack {
+      .header__title {
+        margin-block-start: 0;
+      }
+    }
+
     .header:is(
       :not(:has(.header__title, .header__actions)),
       :not(:has(.header__title, .header__actions--end)):has(.header__actions--start .btn--back:only-child)
@@ -68,13 +78,32 @@
 
     .card-perma--draft {
       .card-perma__bg {
-        box-shadow: 0 calc(100vh + 100px) 0 100vh var(--color-container);
+        padding-inline: 0;
+        padding-block-start: 0;
+        background-color: unset;
+      }
+
+      .card {
+        background: linear-gradient(to bottom, var(--color-canvas), var(--card-bg-color));
+        box-shadow: 0 101vh 0 100vh var(--card-bg-color);
+      }
+
+      .card__board {
+        border-radius: 0 var(--border-radius) var(--border-radius) 0;
+      }
+
+      .card-perma__notch--bottom {
+        z-index: 1;
       }
     }
 
     /* Search
     /* ------------------------------------------------------------------------ */
 
+    .search {
+      overscroll-behavior: auto;
+    }
+
     .search__title {
       text-decoration: none;
     }
diff --git a/app/assets/stylesheets/nav.css b/app/assets/stylesheets/nav.css
index 6af8da7b7..83bc7bbaa 100644
--- a/app/assets/stylesheets/nav.css
+++ b/app/assets/stylesheets/nav.css
@@ -69,11 +69,11 @@
                 0 0.2em 0.2em oklch(var(--lch-blue-medium) / 5%),
                 0 0.4em 0.4em oklch(var(--lch-blue-medium) / 5%),
                 0 0.8em 0.8em oklch(var(--lch-blue-medium) / 5%);
-    grid-template-rows: auto 1fr auto;
     gap: var(--nav-section-gap);
+    grid-template-rows: auto 1fr auto;
     inset: 0 0 auto 0;
     margin-inline: auto;
-    max-block-size: calc(100vh - var(--block-space) - var(--footer-height));
+    max-block-size: calc(100dvh - var(--block-space) - var(--footer-height));
     overflow: hidden;
     padding-block-end: 0;
     scrollbar-gutter: stable both-edges;
@@ -82,7 +82,7 @@
     z-index: var(--z-nav);
 
     @media (max-height: 668px) {
-      max-block-size: calc(100vh - var(--block-space));
+      max-block-size: calc(100dvh - var(--block-space));
     }
   }
 
diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css
index cd55b5196..7ced7b3a1 100644
--- a/app/assets/stylesheets/print.css
+++ b/app/assets/stylesheets/print.css
@@ -232,8 +232,7 @@
   /* Settings
   /* ------------------------------------------------------------------------ */
 
-  .settings__user-filter .input,
-  .settings__user-list-tips {
+  .settings__user-filter .input {
     display: none;
   }
 
diff --git a/app/assets/stylesheets/reactions.css b/app/assets/stylesheets/reactions.css
index efd487f64..508809273 100644
--- a/app/assets/stylesheets/reactions.css
+++ b/app/assets/stylesheets/reactions.css
@@ -10,6 +10,7 @@
     flex-wrap: wrap;
     gap: var(--inline-space-half);
     inline-size: 100%;
+    z-index: 3;
 
     &:has([open]) {
       z-index: var(--z-popup);
@@ -17,14 +18,6 @@
 
     &:not(:has(.reaction)) {
       inline-size: auto;
-      inset-block-end: var(--comment-padding-block);
-      inset-inline-end: calc(var(--comment-padding-inline) / 2);
-      margin: 0;
-      position: absolute;
-
-      @media (max-width: 640px) {
-        inset-inline-end: calc(var(--comment-padding-inline) / 3);
-      }
 
       .reactions__list {
         display: none;
diff --git a/app/assets/stylesheets/search.css b/app/assets/stylesheets/search.css
index 5691ac5e5..724d00f1a 100644
--- a/app/assets/stylesheets/search.css
+++ b/app/assets/stylesheets/search.css
@@ -117,7 +117,7 @@ summary {
 
   .search-perma {
     .search__form > label,
-    .search__reset {
+    .search__form:has(.search__input:placeholder-shown) .search__reset {
       display: none;
     }
 
diff --git a/app/assets/stylesheets/settings.css b/app/assets/stylesheets/settings.css
index 2a2d0c9cd..bd12916fc 100644
--- a/app/assets/stylesheets/settings.css
+++ b/app/assets/stylesheets/settings.css
@@ -3,13 +3,20 @@
     --settings-spacer: var(--block-space);
     --settings-item-padding-inline: 0.5ch;
 
-    display: grid;
+    align-items: start;
+    display: flex;
     gap: calc(var(--settings-spacer) * 2);
+    flex-direction: column;
+    justify-content: center;
     margin: 0 auto;
     max-inline-size: min(100ch, 100%);
 
     @media (min-width: 960px) {
-      grid-template-columns: repeat(2, 1fr);
+      flex-direction: row;
+
+      .settings__panel {
+        max-inline-size: 50%;
+      }
     }
   }
 
@@ -55,10 +62,7 @@
     }
   }
 
-  /* Users
-  /* ------------------------------------------------------------------------ */
-
-  .settings__section--users {
+  .settings__section:has(.settings__scrollable-list) {
     @media (min-width: 640px) {
       display: flex;
       flex: 1;
@@ -66,24 +70,8 @@
       min-height: 0;
     }
   }
-  .settings__user-filter {
-    --btn-size: 3.5ch;
-    --avatar-size: var(--btn-size);
 
-    display: flex;
-    flex-direction: column;
-    gap: calc(var(--settings-spacer) / 2);
-    min-height: 0;
-  }
-
-  .settings__user-filter--bg {
-    background-color: var(--color-ink-lightest);
-    border-radius: 0.5em;
-    margin-block: 0;
-    padding: var(--settings-spacer);
-  }
-
-  .settings__user-list {
+  .settings__scrollable-list {
     flex: 1 1 auto;
     list-style: none;
     margin: calc(var(--settings-spacer) / -4) calc(-1 * var(--settings-item-padding-inline));
@@ -116,15 +104,23 @@
     }
   }
 
-  .settings__user-list-tips {
-    border-top: 1px solid var(--color-ink-light);
-    color: var(--color-ink-dark);
-    font-size: var(--text-small);
-    padding-block-start: var(--settings-spacer);
+  /* Users
+  /* ------------------------------------------------------------------------ */
 
-    .settings__user-filter--bg & {
-      margin-inline: calc(-1 * var(--settings-spacer));
-      padding-inline: var(--settings-spacer);
-    }
+  .settings__user-filter {
+    --btn-size: 3.5ch;
+    --avatar-size: var(--btn-size);
+
+    display: flex;
+    flex-direction: column;
+    gap: calc(var(--settings-spacer) / 2);
+    min-height: 0;
+  }
+
+  .settings__user-filter--bg {
+    background-color: var(--color-ink-lightest);
+    border-radius: 0.5em;
+    margin-block: 0;
+    padding: var(--settings-spacer);
   }
 }
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 5b8763b71..604938deb 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -5,7 +5,8 @@ class BoardsController < ApplicationController
   before_action :ensure_permission_to_admin_board, only: %i[ update destroy ]
 
   def index
-    set_page_and_extract_portion_from Current.user.boards
+    set_page_and_extract_portion_from Current.user.boards.ordered_by_recently_accessed.includes(creator: :identity)
+    fresh_when etag: @page.records
   end
 
   def show
diff --git a/app/controllers/client_configurations_controller.rb b/app/controllers/client_configurations_controller.rb
new file mode 100644
index 000000000..0b0f2f670
--- /dev/null
+++ b/app/controllers/client_configurations_controller.rb
@@ -0,0 +1,15 @@
+class ClientConfigurationsController < ApplicationController
+  skip_before_action :require_account, :require_authentication
+  allow_unauthorized_access
+
+  def show
+    expires_in 1.minute, public: true
+
+    render action: client_configuration_name
+  end
+
+  private
+    def client_configuration_name
+      "#{params.require(:platform)}_v#{params.require(:version)}"
+    end
+end
diff --git a/app/controllers/concerns/request_forgery_protection.rb b/app/controllers/concerns/request_forgery_protection.rb
index fdff7ba8f..acfc4dbf1 100644
--- a/app/controllers/concerns/request_forgery_protection.rb
+++ b/app/controllers/concerns/request_forgery_protection.rb
@@ -7,14 +7,10 @@ module RequestForgeryProtection
 
   private
     def verified_via_header_only?
-      super || allowed_api_request? || allowed_insecure_context_request?
+      super || allowed_api_request?
     end
 
     def allowed_api_request?
       sec_fetch_site_value.nil? && request.format.json?
     end
-
-    def allowed_insecure_context_request?
-      sec_fetch_site_value.nil? && !request.ssl? && !Rails.configuration.force_ssl
-    end
 end
diff --git a/app/controllers/notifications/trays_controller.rb b/app/controllers/notifications/trays_controller.rb
index 0adc0e17b..46dc445cf 100644
--- a/app/controllers/notifications/trays_controller.rb
+++ b/app/controllers/notifications/trays_controller.rb
@@ -1,9 +1,27 @@
 class Notifications::TraysController < ApplicationController
+  MAX_ENTRIES_LIMIT = 100
+
   def show
-    @notifications = Current.user.notifications.unread.preloaded.ordered.limit(100)
+    @notifications = unread_notifications
+    if include_read?
+      @notifications += read_notifications
+    end
 
     # Invalidate on the whole set instead of the unread set since the max updated at in the unread set
     # can stay the same when reading old notifications.
-    fresh_when Current.user.notifications
+    fresh_when etag: [ Current.user.notifications, include_read? ]
   end
+
+  private
+    def unread_notifications
+      Current.user.notifications.unread.preloaded.ordered.limit(MAX_ENTRIES_LIMIT)
+    end
+
+    def read_notifications
+      Current.user.notifications.read.preloaded.ordered.limit(MAX_ENTRIES_LIMIT)
+    end
+
+    def include_read?
+      ActiveModel::Type::Boolean.new.cast(params[:include_read])
+    end
 end
diff --git a/app/controllers/searches_controller.rb b/app/controllers/searches_controller.rb
index 5176cea02..b1ec5a0d2 100644
--- a/app/controllers/searches_controller.rb
+++ b/app/controllers/searches_controller.rb
@@ -2,10 +2,12 @@ class SearchesController < ApplicationController
   include Turbo::DriveHelper
 
   def show
-    if card = Current.user.accessible_cards.find_by_id(params[:q])
+    @query = params[:q].blank? ? nil : params[:q]
+
+    if card = Current.user.accessible_cards.find_by_id(@query)
       @card = card
     else
-      set_page_and_extract_portion_from Current.user.search(params[:q])
+      set_page_and_extract_portion_from Current.user.search(@query)
       @recent_search_queries = Current.user.search_queries.order(updated_at: :desc).limit(10)
     end
   end
diff --git a/app/controllers/signups/completions_controller.rb b/app/controllers/signups/completions_controller.rb
index 0d45f2f8a..de3d81b63 100644
--- a/app/controllers/signups/completions_controller.rb
+++ b/app/controllers/signups/completions_controller.rb
@@ -29,7 +29,7 @@ class Signups::CompletionsController < ApplicationController
           redirect_to landing_url(script_name: @signup.account.slug)
         end
 
-        format.json { render json: { account_id: @signup.account.id }, status: :created }
+        format.json { head :created }
       end
     end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 54c18704c..7062b85e5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,7 +3,7 @@ class UsersController < ApplicationController
   before_action :ensure_permission_to_change_user, only: %i[ update destroy ]
 
   def index
-    set_page_and_extract_portion_from Current.account.users.active.alphabetically
+    set_page_and_extract_portion_from Current.account.users.active.alphabetically.includes(:identity)
   end
 
   def show
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 8ae4346ac..d80685349 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -1,13 +1,6 @@
-require "zlib"
-
 module AvatarsHelper
-  AVATAR_COLORS = %w[
-    #AF2E1B #CC6324 #3B4B59 #BFA07A #ED8008 #ED3F1C #BF1B1B #736B1E #D07B53
-    #736356 #AD1D1D #BF7C2A #C09C6F #698F9C #7C956B #5D618F #3B3633 #67695E
-  ]
-
   def avatar_background_color(user)
-    AVATAR_COLORS[Zlib.crc32(user.to_param) % AVATAR_COLORS.size]
+    user.avatar_background_color
   end
 
   def avatar_tag(user, hidden_for_screen_reader: false, **options)
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index eae2f3665..5f12b9259 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -9,12 +9,4 @@ module BoardsHelper
       icon_tag("settings") + tag.span("Settings for #{board.name}", class: "for-screen-reader")
     end
   end
-
-  def bridged_button_to_board(board)
-    link_to "Go to #{board.name}", board, hidden: true, data: {
-      bridge__buttons_target: "button",
-      bridge_icon_url: bridge_icon("board"),
-      bridge_title: "Go to #{board.name}"
-    }
-  end
 end
diff --git a/app/helpers/bridge_helper.rb b/app/helpers/bridge_helper.rb
index 5fb4508b6..ffebe6459 100644
--- a/app/helpers/bridge_helper.rb
+++ b/app/helpers/bridge_helper.rb
@@ -2,4 +2,36 @@ module BridgeHelper
   def bridge_icon(name)
     asset_url("#{name}.svg")
   end
+
+  def bridged_button_to_board(board)
+    link_to "Go to #{board.name}", board, hidden: true, data: {
+      bridge__buttons_target: "button",
+      bridge_icon_url: bridge_icon("board"),
+      bridge_title: "Go to #{board.name}"
+    }
+  end
+
+  def bridged_share_url_button(description = nil)
+    tag.button "Share", hidden: true, data: {
+      controller: "bridge--share",
+      action: "bridge--share#shareUrl",
+      bridge__overflow_menu_target: "item",
+      bridge_title: "Share",
+      bridge_share_description: description
+    }
+  end
+
+  def bridge_share_card_description(card)
+    date_added = card.created_at.strftime("%b %e")
+    date_updated = card.last_active_at.strftime("%b %e")
+    author = card.creator.familiar_name
+    assignees = card.assignees.any? ? "assigned to #{card.assignees.map { |assignee| h assignee.familiar_name }.to_sentence}" : "not assigned"
+    "Added #{date_added} by #{author} and #{assignees}. Updated #{date_updated}"
+  end
+
+  def bridge_share_board_description(board)
+    count_open = board.cards.active.count
+    count_in_stream = board.cards.awaiting_triage.count
+    "#{count_open} open cards, #{count_in_stream} in MAYBE?"
+  end
 end
diff --git a/app/helpers/my/menu_helper.rb b/app/helpers/my/menu_helper.rb
index 753bad6a2..7cad2a25f 100644
--- a/app/helpers/my/menu_helper.rb
+++ b/app/helpers/my/menu_helper.rb
@@ -11,6 +11,7 @@ module My::MenuHelper
       aria: { activedescendant: "" },
       data: {
         "1p-ignore": "true",
+        dialog_target: "focusMouse",
         filter_target: "input",
         nav_section_expander_target: "input",
         navigable_list_target: "input",
diff --git a/app/javascript/controllers/bar_controller.js b/app/javascript/controllers/bar_controller.js
index e83bce9a9..70f63990f 100644
--- a/app/javascript/controllers/bar_controller.js
+++ b/app/javascript/controllers/bar_controller.js
@@ -22,15 +22,6 @@ export default class extends Controller {
     this.#hideItem(this.searchTarget)
   }
 
-  clearInput() {
-    if (this.searchInputTarget.value) {
-      this.searchInputTarget.value = ""
-      this.searchInputTarget.focus()
-    } else {
-      this.reset()
-    }
-  }
-
   showModalAndSubmit(event) {
     this.showModal()
     this.formTarget.requestSubmit()
diff --git a/app/javascript/controllers/bridge/buttons_controller.js b/app/javascript/controllers/bridge/buttons_controller.js
index 47d09a158..3e3aa4a60 100644
--- a/app/javascript/controllers/bridge/buttons_controller.js
+++ b/app/javascript/controllers/bridge/buttons_controller.js
@@ -5,6 +5,26 @@ export default class extends BridgeComponent {
   static component = "buttons"
   static targets = [ "button" ]
 
+  connect() {
+    super.connect()
+
+    if (!this.beforeUnloadHandler) {
+      this.beforeUnloadHandler = this.handleBeforeUnload.bind(this)
+    }
+
+    window.addEventListener("beforeunload", this.beforeUnloadHandler)
+  }
+
+  disconnect() {
+    super.disconnect()
+
+    if (this.beforeUnloadHandler) {
+      window.removeEventListener("beforeunload", this.beforeUnloadHandler)
+    }
+
+    this.notifyBridgeOfDisconnect()
+  }
+
   buttonTargetConnected() {
     this.notifyBridgeOfConnect()
   }
@@ -27,6 +47,14 @@ export default class extends BridgeComponent {
     })
   }
 
+  notifyBridgeOfDisconnect() {
+    this.send("disconnect")
+  }
+
+  handleBeforeUnload() {
+    this.notifyBridgeOfDisconnect()
+  }
+
   #clickButton(message) {
     const selectedIndex = message.data.selectedIndex
     this.#enabledButtonTargets[selectedIndex].click()
diff --git a/app/javascript/controllers/bridge/form_controller.js b/app/javascript/controllers/bridge/form_controller.js
index a3c780e62..4ebb3022c 100644
--- a/app/javascript/controllers/bridge/form_controller.js
+++ b/app/javascript/controllers/bridge/form_controller.js
@@ -6,13 +6,31 @@ export default class extends BridgeComponent {
   static targets = [ "submit", "cancel" ]
   static values = { submitTitle: String }
 
+  connect() {
+    super.connect()
+
+    if (!this.beforeUnloadHandler) {
+      this.beforeUnloadHandler = this.handleBeforeUnload.bind(this)
+    }
+
+    window.addEventListener("beforeunload", this.beforeUnloadHandler)
+  }
+
+  disconnect() {
+    super.disconnect()
+
+    if (this.beforeUnloadHandler) {
+      window.removeEventListener("beforeunload", this.beforeUnloadHandler)
+    }
+  }
+
   submitTargetConnected() {
     this.notifyBridgeOfConnect()
     this.#observeSubmitTarget()
   }
 
   submitTargetDisconnected() {
-    this.notifyBridgeOfDisonnect()
+    this.notifyBridgeOfDisconnect()
     this.submitObserver?.disconnect()
   }
 
@@ -37,7 +55,7 @@ export default class extends BridgeComponent {
     }
   }
 
-  notifyBridgeOfDisonnect() {
+  notifyBridgeOfDisconnect() {
     this.send("disconnect")
   }
 
@@ -49,6 +67,10 @@ export default class extends BridgeComponent {
     this.send("submitEnd")
   }
 
+  handleBeforeUnload() {
+    this.notifyBridgeOfDisconnect()
+  }
+
   #observeSubmitTarget() {
     this.submitObserver = new MutationObserver(() => {
       this.send(this.submitTarget.disabled ? "submitDisabled" : "submitEnabled")
diff --git a/app/javascript/controllers/bridge/share_controller.js b/app/javascript/controllers/bridge/share_controller.js
new file mode 100644
index 000000000..75f0241cf
--- /dev/null
+++ b/app/javascript/controllers/bridge/share_controller.js
@@ -0,0 +1,14 @@
+import { BridgeComponent } from "@hotwired/hotwire-native-bridge"
+
+export default class extends BridgeComponent {
+  static component = "share"
+
+  shareUrl() {
+    const description = this.bridgeElement.bridgeAttribute("share-description")
+    this.send("shareUrl", {
+      title: document.title,
+      url: window.location.href,
+      description: description
+    })
+  }
+}
diff --git a/app/javascript/controllers/search_form_controller.js b/app/javascript/controllers/search_form_controller.js
new file mode 100644
index 000000000..d48741cd5
--- /dev/null
+++ b/app/javascript/controllers/search_form_controller.js
@@ -0,0 +1,14 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["searchInput"]
+
+  clearInput() {
+    if (this.searchInputTarget.value) {
+      this.searchInputTarget.value = ""
+      this.searchInputTarget.focus()
+    } else {
+      this.dispatch("reset")
+    }
+  }
+}
diff --git a/app/javascript/initializers/bridge/bridge_element.js b/app/javascript/initializers/bridge/bridge_element.js
index 7ddeb1b33..438cf22e1 100644
--- a/app/javascript/initializers/bridge/bridge_element.js
+++ b/app/javascript/initializers/bridge/bridge_element.js
@@ -3,7 +3,9 @@ import { BridgeElement } from "@hotwired/hotwire-native-bridge"
 BridgeElement.prototype.getButton = function() {
   return {
     title: this.title,
-    icon: this.getIcon()
+    icon: this.getIcon(),
+    displayTitle: this.getDisplayTitle(),
+    displayAsPrimaryAction: this.getDisplayAsPrimaryAction()
   }
 }
 
@@ -16,3 +18,11 @@ BridgeElement.prototype.getIcon = function() {
 
   return null
 }
+
+BridgeElement.prototype.getDisplayTitle = function() {
+  return !!this.bridgeAttribute(`display-title`)
+}
+
+BridgeElement.prototype.getDisplayAsPrimaryAction = function() {
+  return !!this.bridgeAttribute(`display-as-primary-action`)
+}
diff --git a/app/jobs/notification/push_job.rb b/app/jobs/notification/push_job.rb
new file mode 100644
index 000000000..233762b37
--- /dev/null
+++ b/app/jobs/notification/push_job.rb
@@ -0,0 +1,5 @@
+class Notification::PushJob < ApplicationJob
+  def perform(notification)
+    notification.push
+  end
+end
diff --git a/app/jobs/push_notification_job.rb b/app/jobs/push_notification_job.rb
index c912e141d..862564927 100644
--- a/app/jobs/push_notification_job.rb
+++ b/app/jobs/push_notification_job.rb
@@ -2,6 +2,6 @@ class PushNotificationJob < ApplicationJob
   discard_on ActiveJob::DeserializationError
 
   def perform(notification)
-    NotificationPusher.new(notification).push
+    notification.push
   end
 end
diff --git a/app/models/account/data_transfer/account_record_set.rb b/app/models/account/data_transfer/account_record_set.rb
index b7869eb73..a5151f05f 100644
--- a/app/models/account/data_transfer/account_record_set.rb
+++ b/app/models/account/data_transfer/account_record_set.rb
@@ -31,7 +31,7 @@ class Account::DataTransfer::AccountRecordSet < Account::DataTransfer::RecordSet
       account_data = load(files.first)
       join_code_data = account_data.delete("join_code")
 
-      account.update!(name: account_data.fetch("name"))
+      account.update!(name: account_data.fetch("name"), cards_count: account_data.fetch("cards_count", 0))
       account.join_code.update!(join_code_data.slice("usage_count", "usage_limit"))
       account.join_code.update(code: join_code_data.fetch("code"))
     end
diff --git a/app/models/account/data_transfer/action_text_rich_text_record_set.rb b/app/models/account/data_transfer/action_text/rich_text_record_set.rb
similarity index 53%
rename from app/models/account/data_transfer/action_text_rich_text_record_set.rb
rename to app/models/account/data_transfer/action_text/rich_text_record_set.rb
index fa1a23cb9..01e046dbe 100644
--- a/app/models/account/data_transfer/action_text_rich_text_record_set.rb
+++ b/app/models/account/data_transfer/action_text/rich_text_record_set.rb
@@ -1,4 +1,4 @@
-class Account::DataTransfer::ActionTextRichTextRecordSet < Account::DataTransfer::RecordSet
+class Account::DataTransfer::ActionText::RichTextRecordSet < Account::DataTransfer::RecordSet
   ATTRIBUTES = %w[
     account_id
     body
@@ -11,16 +11,16 @@ class Account::DataTransfer::ActionTextRichTextRecordSet < Account::DataTransfer
   ].freeze
 
   def initialize(account)
-    super(account: account, model: ActionText::RichText)
+    super(account: account, model: ::ActionText::RichText)
   end
 
   private
     def records
-      ActionText::RichText.where(account: account)
+      ::ActionText::RichText.where(account: account)
     end
 
     def export_record(rich_text)
-      data = rich_text.as_json.merge("body" => convert_sgids_to_gids(rich_text.body))
+      data = rich_text.as_json.merge("body" => transform_body_for_export(rich_text.body))
       zip.add_file "data/action_text_rich_texts/#{rich_text.id}.json", data.to_json
     end
 
@@ -31,11 +31,11 @@ class Account::DataTransfer::ActionTextRichTextRecordSet < Account::DataTransfer
     def import_batch(files)
       batch_data = files.map do |file|
         data = load(file)
-        data["body"] = convert_gids_to_sgids(data["body"])
+        data["body"] = transform_body_for_import(data["body"])
         data.slice(*ATTRIBUTES).merge("account_id" => account.id)
       end
 
-      ActionText::RichText.insert_all!(batch_data)
+      ::ActionText::RichText.insert_all!(batch_data)
     end
 
     def check_record(file_path)
@@ -54,11 +54,16 @@ class Account::DataTransfer::ActionTextRichTextRecordSet < Account::DataTransfer
       check_associations_dont_exist(data)
     end
 
-    def convert_sgids_to_gids(content)
+    def transform_body_for_export(content)
       return nil if content.blank?
 
+      html = convert_sgids_to_gids(content)
+      relativize_urls(html)
+    end
+
+    def convert_sgids_to_gids(content)
       content.send(:attachment_nodes).each do |node|
-        sgid = SignedGlobalID.parse(node["sgid"], for: ActionText::Attachable::LOCATOR_NAME)
+        sgid = SignedGlobalID.parse(node["sgid"], for: ::ActionText::Attachable::LOCATOR_NAME)
 
         record = begin
           sgid&.find
@@ -75,11 +80,35 @@ class Account::DataTransfer::ActionTextRichTextRecordSet < Account::DataTransfer
       content.fragment.source.to_html
     end
 
-    def convert_gids_to_sgids(html)
-      return html if html.blank?
+    def relativize_urls(html)
+      host = Rails.application.routes.default_url_options[:host]
+      return html unless host
 
       fragment = Nokogiri::HTML.fragment(html)
 
+      fragment.css("a[href]").each do |link|
+        uri = URI.parse(link["href"]) rescue nil
+
+        if uri.respond_to?(:host) && uri.host == host
+          link["href"] = uri.path
+          link["href"] += "?#{uri.query}" if uri.query
+          link["href"] += "##{uri.fragment}" if uri.fragment
+        end
+      end
+
+      fragment.to_html
+    end
+
+    def transform_body_for_import(body)
+      return body if body.blank?
+
+      Nokogiri::HTML.fragment(body)
+        .then { convert_gids_to_sgids(it) }
+        .then { replace_account_slugs(it) }
+        .to_html
+    end
+
+    def convert_gids_to_sgids(fragment)
       fragment.css("action-text-attachment[gid]").each do |node|
         gid = GlobalID.parse(node["gid"])
 
@@ -97,6 +126,20 @@ class Account::DataTransfer::ActionTextRichTextRecordSet < Account::DataTransfer
         end
       end
 
-      fragment.to_html
+      fragment
+    end
+
+    def replace_account_slugs(fragment)
+      fragment.css("a[href]").each do |link|
+        match = link["href"].match(AccountSlug::PATH_INFO_MATCH)
+
+        if match
+          path = match.post_match.presence || "/"
+          valid_path = Rails.application.routes.recognize_path(path) rescue nil
+          link["href"] = "#{account.slug}#{path}" if valid_path
+        end
+      end
+
+      fragment
     end
 end
diff --git a/app/models/account/data_transfer/active_storage_blob_record_set.rb b/app/models/account/data_transfer/active_storage/blob_record_set.rb
similarity index 55%
rename from app/models/account/data_transfer/active_storage_blob_record_set.rb
rename to app/models/account/data_transfer/active_storage/blob_record_set.rb
index 10ee326ad..1637768f3 100644
--- a/app/models/account/data_transfer/active_storage_blob_record_set.rb
+++ b/app/models/account/data_transfer/active_storage/blob_record_set.rb
@@ -1,9 +1,9 @@
-class Account::DataTransfer::ActiveStorageBlobRecordSet < Account::DataTransfer::RecordSet
+class Account::DataTransfer::ActiveStorage::BlobRecordSet < Account::DataTransfer::RecordSet
   def initialize(account)
     super(
       account: account,
-      model: ActiveStorage::Blob,
-      attributes: ActiveStorage::Blob.column_names - %w[service_name]
+      model: ::ActiveStorage::Blob,
+      attributes: ::ActiveStorage::Blob.column_names - %w[service_name]
     )
   end
 
@@ -13,7 +13,7 @@ class Account::DataTransfer::ActiveStorageBlobRecordSet < Account::DataTransfer:
         data = load(file)
         data.slice(*attributes).merge(
           "account_id" => account.id,
-          "service_name" => ActiveStorage::Blob.service.name
+          "service_name" => ::ActiveStorage::Blob.service.name
         )
       end
 
diff --git a/app/models/account/data_transfer/blob_file_record_set.rb b/app/models/account/data_transfer/active_storage/file_record_set.rb
similarity index 72%
rename from app/models/account/data_transfer/blob_file_record_set.rb
rename to app/models/account/data_transfer/active_storage/file_record_set.rb
index 4bbfcba10..15d359353 100644
--- a/app/models/account/data_transfer/blob_file_record_set.rb
+++ b/app/models/account/data_transfer/active_storage/file_record_set.rb
@@ -1,11 +1,11 @@
-class Account::DataTransfer::BlobFileRecordSet < Account::DataTransfer::RecordSet
+class Account::DataTransfer::ActiveStorage::FileRecordSet < Account::DataTransfer::RecordSet
   def initialize(account)
-    super(account: account, model: ActiveStorage::Blob)
+    super(account: account, model: ::ActiveStorage::Blob)
   end
 
   private
     def records
-      ActiveStorage::Blob.where(account: account)
+      ::ActiveStorage::Blob.where(account: account)
     end
 
     def export_record(blob)
@@ -23,7 +23,7 @@ class Account::DataTransfer::BlobFileRecordSet < Account::DataTransfer::RecordSe
     def import_batch(files)
       files.each do |file|
         key = File.basename(file)
-        blob = ActiveStorage::Blob.find_by(key: key, account: account)
+        blob = ::ActiveStorage::Blob.find_by(key: key, account: account)
         next unless blob
 
         zip.read(file) do |stream|
@@ -35,7 +35,7 @@ class Account::DataTransfer::BlobFileRecordSet < Account::DataTransfer::RecordSe
     def check_record(file_path)
       key = File.basename(file_path)
 
-      unless zip.exists?("data/active_storage_blobs/#{key}.json") || ActiveStorage::Blob.exists?(key: key, account: account)
+      unless zip.exists?("data/active_storage_blobs/#{key}.json") || ::ActiveStorage::Blob.exists?(key: key, account: account)
         # File exists without corresponding blob record - could be orphaned or blob not yet imported
         # We allow this since blob metadata is imported before files
       end
diff --git a/app/models/account/data_transfer/manifest.rb b/app/models/account/data_transfer/manifest.rb
index b5976e3d5..2159926d5 100644
--- a/app/models/account/data_transfer/manifest.rb
+++ b/app/models/account/data_transfer/manifest.rb
@@ -35,10 +35,10 @@ class Account::DataTransfer::Manifest
           ::Filter, ::Webhook::DelinquencyTracker, ::Event,
           ::Notification, ::Notification::Bundle, ::Webhook::Delivery
         ),
-        Account::DataTransfer::ActiveStorageBlobRecordSet.new(account),
+        Account::DataTransfer::ActiveStorage::BlobRecordSet.new(account),
         *build_record_sets(::ActiveStorage::Attachment),
-        Account::DataTransfer::ActionTextRichTextRecordSet.new(account),
-        Account::DataTransfer::BlobFileRecordSet.new(account)
+        Account::DataTransfer::ActionText::RichTextRecordSet.new(account),
+        Account::DataTransfer::ActiveStorage::FileRecordSet.new(account)
       ]
     end
 
diff --git a/app/models/account/import.rb b/app/models/account/import.rb
index 14ee376ea..50ec3769d 100644
--- a/app/models/account/import.rb
+++ b/app/models/account/import.rb
@@ -48,6 +48,7 @@ class Account::Import < ApplicationRecord
     end
 
     add_importer_to_all_access_boards
+    reconcile_cards_count
     reconcile_account_storage
 
     mark_completed
@@ -78,6 +79,10 @@ class Account::Import < ApplicationRecord
       ImportMailer.failed(self).deliver_later
     end
 
+    def reconcile_cards_count
+      account.update_column :cards_count, [ account.cards_count, account.cards.maximum(:number).to_i ].max
+    end
+
     def add_importer_to_all_access_boards
       importer = account.users.find_by!(identity: identity)
 
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index df8563ba3..5f7dc99ce 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -17,11 +17,11 @@ module Mentions
     rich_text_associations.collect { send(it.name)&.to_plain_text }.compact.join(" ")
   end
 
-  private
-    def scan_mentionees
-      mentionees_from_attachments & mentionable_users
-    end
+  def scan_mentionees
+    mentionees_from_attachments & mentionable_users
+  end
 
+  private
     def mentionees_from_attachments
       rich_text_associations.flat_map { send(it.name)&.body&.attachments&.collect { it.attachable } }.compact
     end
diff --git a/app/models/concerns/push_notifiable.rb b/app/models/concerns/push_notifiable.rb
deleted file mode 100644
index e7bfdc56a..000000000
--- a/app/models/concerns/push_notifiable.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module PushNotifiable
-  extend ActiveSupport::Concern
-
-  included do
-    after_create_commit :push_notification_later
-    after_update_commit :push_notification_later, if: :source_id_previously_changed?
-  end
-
-  private
-    def push_notification_later
-      PushNotificationJob.perform_later(self)
-    end
-end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index 7495e37c3..18f4e3163 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -28,6 +28,10 @@ class Identity < ApplicationRecord
     end
   end
 
+  def users_with_active_accounts
+    users.joins(:account).merge(Account.active).includes(:account)
+  end
+
   private
     def deactivate_users
       users.find_each(&:deactivate)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3d7df5885..a5eab3ccd 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,5 +1,5 @@
 class Notification < ApplicationRecord
-  include PushNotifiable
+  include Notification::Pushable
 
   belongs_to :account, default: -> { user.account }
   belongs_to :user
@@ -10,7 +10,13 @@ class Notification < ApplicationRecord
   scope :unread, -> { where(read_at: nil) }
   scope :read, -> { where.not(read_at: nil) }
   scope :ordered, -> { order(read_at: :desc, updated_at: :desc) }
-  scope :preloaded, -> { preload(:card, :creator, :account, source: [ :board, :creator, { eventable: [ :closure, :board, :assignments ] } ]) }
+  scope :preloaded, -> {
+    preload(
+      :creator, :account,
+      card: [ :board, :column, :closure, :not_now ],
+      source: [ :board, :creator, { eventable: [ :closure, :board, :assignments ] } ]
+    )
+  }
 
   before_validation :set_card
   after_create :bundle
@@ -21,6 +27,7 @@ class Notification < ApplicationRecord
   after_destroy_commit -> { broadcast_remove_to user, :notifications }
 
   delegate :notifiable_target, to: :source
+  delegate :identity, to: :user
 
   class << self
     def read_all
diff --git a/app/models/notification/default_payload.rb b/app/models/notification/default_payload.rb
new file mode 100644
index 000000000..98f104856
--- /dev/null
+++ b/app/models/notification/default_payload.rb
@@ -0,0 +1,57 @@
+class Notification::DefaultPayload
+  attr_reader :notification
+
+  delegate :card, to: :notification
+
+  def initialize(notification)
+    @notification = notification
+  end
+
+  def to_h
+    { title: title, body: body, url: url }
+  end
+
+  def title
+    "New notification"
+  end
+
+  def body
+    "You have a new notification"
+  end
+
+  def url
+    notifications_url
+  end
+
+  def category
+    "default"
+  end
+
+  def high_priority?
+    false
+  end
+
+  def base_url
+    Rails.application.routes.url_helpers.root_url(**url_options.except(:script_name)).chomp("/")
+  end
+
+  def avatar_url
+    Rails.application.routes.url_helpers.user_avatar_url(notification.creator, **url_options)
+  end
+
+  private
+    def card_url(card)
+      Rails.application.routes.url_helpers.card_url(card, **url_options)
+    end
+
+    def notifications_url
+      Rails.application.routes.url_helpers.notifications_url(**url_options)
+    end
+
+    def url_options
+      base_options = Rails.application.routes.default_url_options.presence ||
+        Rails.application.config.action_mailer.default_url_options ||
+        {}
+      base_options.merge(script_name: notification.account.slug)
+    end
+end
diff --git a/app/models/notification/event_payload.rb b/app/models/notification/event_payload.rb
new file mode 100644
index 000000000..0154625e5
--- /dev/null
+++ b/app/models/notification/event_payload.rb
@@ -0,0 +1,107 @@
+class Notification::EventPayload < Notification::DefaultPayload
+  include ExcerptHelper
+
+  def title
+    case event.action
+    when "comment_created"
+      "RE: #{card_title}"
+    else
+      card_title
+    end
+  end
+
+  def body
+    case event.action
+    when "comment_created"
+      format_excerpt(event.eventable.body, length: 200)
+    when "card_assigned"
+      "Assigned to you by #{event.creator.name}"
+    when "card_published"
+      "Added by #{event.creator.name}"
+    when "card_closed"
+      card.closure ? "Moved to Done by #{event.creator.name}" : "Closed by #{event.creator.name}"
+    when "card_reopened"
+      "Reopened by #{event.creator.name}"
+    when "card_triaged"
+      if column_name.present?
+        "Moved to #{column_name} by #{event.creator.name}"
+      else
+        "Moved by #{event.creator.name}"
+      end
+    when "card_sent_back_to_triage"
+      "Moved back to Maybe? by #{event.creator.name}"
+    when "card_board_changed", "card_collection_changed"
+      if new_location_name.present?
+        "Moved to #{new_location_name} by #{event.creator.name}"
+      else
+        "Moved by #{event.creator.name}"
+      end
+    when "card_title_changed"
+      if new_title.present?
+        "Renamed to #{new_title} by #{event.creator.name}"
+      else
+        "Renamed by #{event.creator.name}"
+      end
+    when "card_postponed"
+      "Moved to Not Now by #{event.creator.name}"
+    when "card_auto_postponed"
+      "Moved to Not Now due to inactivity"
+    else
+      "Updated by #{event.creator.name}"
+    end
+  end
+
+  def url
+    case event.action
+    when "comment_created"
+      card_url_with_comment_anchor(event.eventable)
+    else
+      card_url(card)
+    end
+  end
+
+  def category
+    case event.action
+    when "card_assigned" then "assignment"
+    when "comment_created" then "comment"
+    else "card"
+    end
+  end
+
+  def high_priority?
+    event.action.card_assigned?
+  end
+
+  private
+    def event
+      notification.source
+    end
+
+    def card_title
+      card.title.presence || "Card #{card.number}"
+    end
+
+    def event_particulars
+      event.particulars.dig("particulars") || {}
+    end
+
+    def column_name
+      event_particulars["column"]
+    end
+
+    def new_location_name
+      event_particulars["new_board"] || event_particulars["new_collection"]
+    end
+
+    def new_title
+      event_particulars["new_title"]
+    end
+
+    def card_url_with_comment_anchor(comment)
+      Rails.application.routes.url_helpers.card_url(
+        comment.card,
+        anchor: ActionView::RecordIdentifier.dom_id(comment),
+        **url_options
+      )
+    end
+end
diff --git a/app/models/notification/mention_payload.rb b/app/models/notification/mention_payload.rb
new file mode 100644
index 000000000..480771c15
--- /dev/null
+++ b/app/models/notification/mention_payload.rb
@@ -0,0 +1,28 @@
+class Notification::MentionPayload < Notification::DefaultPayload
+  include ExcerptHelper
+
+  def title
+    "#{mention.mentioner.first_name} mentioned you"
+  end
+
+  def body
+    format_excerpt(mention.source.mentionable_content, length: 200)
+  end
+
+  def url
+    card_url(card)
+  end
+
+  def category
+    "mention"
+  end
+
+  def high_priority?
+    true
+  end
+
+  private
+    def mention
+      notification.source
+    end
+end
diff --git a/app/models/notification/push_target.rb b/app/models/notification/push_target.rb
new file mode 100644
index 000000000..1fc250259
--- /dev/null
+++ b/app/models/notification/push_target.rb
@@ -0,0 +1,17 @@
+class Notification::PushTarget
+  attr_reader :notification
+
+  delegate :card, to: :notification
+
+  def self.process(notification)
+    new(notification).process
+  end
+
+  def initialize(notification)
+    @notification = notification
+  end
+
+  def process
+    raise NotImplementedError
+  end
+end
diff --git a/app/models/notification/push_target/web.rb b/app/models/notification/push_target/web.rb
new file mode 100644
index 000000000..9bf839906
--- /dev/null
+++ b/app/models/notification/push_target/web.rb
@@ -0,0 +1,12 @@
+class Notification::PushTarget::Web < Notification::PushTarget
+  def process
+    if subscriptions.any?
+      Rails.configuration.x.web_push_pool.queue(notification.payload.to_h, subscriptions)
+    end
+  end
+
+  private
+    def subscriptions
+      @subscriptions ||= notification.user.push_subscriptions
+    end
+end
diff --git a/app/models/notification/pushable.rb b/app/models/notification/pushable.rb
new file mode 100644
index 000000000..e02f3a8de
--- /dev/null
+++ b/app/models/notification/pushable.rb
@@ -0,0 +1,52 @@
+module Notification::Pushable
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :push_targets, default: []
+
+    after_save_commit :push_later, if: :source_id_previously_changed?
+  end
+
+  class_methods do
+    def register_push_target(target)
+      target = resolve_push_target(target)
+      push_targets << target unless push_targets.include?(target)
+    end
+
+    private
+      def resolve_push_target(target)
+        if target.is_a?(Symbol)
+          "Notification::PushTarget::#{target.to_s.classify}".constantize
+        else
+          target
+        end
+      end
+  end
+
+  def push_later
+    Notification::PushJob.perform_later(self)
+  end
+
+  def push
+    return unless pushable?
+
+    self.class.push_targets.each { |target| push_to(target) }
+  end
+
+  def payload
+    "Notification::#{payload_type}Payload".constantize.new(self)
+  end
+
+  private
+    def pushable?
+      !creator.system? && user.active? && account.active?
+    end
+
+    def push_to(target)
+      target.process(self)
+    end
+
+    def payload_type
+      source_type.presence_in(%w[ Event Mention ]) || "Default"
+    end
+end
diff --git a/app/models/notification_pusher.rb b/app/models/notification_pusher.rb
deleted file mode 100644
index d6425e561..000000000
--- a/app/models/notification_pusher.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-class NotificationPusher
-  include Rails.application.routes.url_helpers
-  include ExcerptHelper
-
-  attr_reader :notification
-
-  def initialize(notification)
-    @notification = notification
-  end
-
-  def push
-    return unless should_push?
-
-    build_payload.tap do |payload|
-      push_to_user(payload)
-    end
-  end
-
-  private
-    def should_push?
-      notification.user.push_subscriptions.any? &&
-        !notification.creator.system? &&
-        notification.user.active? &&
-        notification.account.active?
-    end
-
-    def build_payload
-      case notification.source_type
-      when "Event"
-        build_event_payload
-      when "Mention"
-        build_mention_payload
-      else
-        build_default_payload
-      end
-    end
-
-    def build_event_payload
-      event = notification.source
-      card = event.card
-
-      base_payload = {
-        title: card_notification_title(card),
-        path: card_path(card)
-      }
-
-      case event.action
-      when "comment_created"
-        base_payload.merge(
-          title: "RE: #{base_payload[:title]}",
-          body: comment_notification_body(event),
-          path: card_path_with_comment_anchor(event.eventable)
-        )
-      when "card_assigned"
-        base_payload.merge(
-          body: "Assigned to you by #{event.creator.name}"
-        )
-      when "card_published"
-        base_payload.merge(
-          body: "Added by #{event.creator.name}"
-        )
-      when "card_closed"
-        base_payload.merge(
-          body: card.closure ? "Moved to Done by #{event.creator.name}" : "Closed by #{event.creator.name}"
-        )
-      when "card_reopened"
-        base_payload.merge(
-          body: "Reopened by #{event.creator.name}"
-        )
-      else
-        base_payload.merge(
-          body: event.creator.name
-        )
-      end
-    end
-
-    def build_mention_payload
-      mention = notification.source
-      card = mention.card
-
-      {
-        title: "#{mention.mentioner.first_name} mentioned you",
-        body: format_excerpt(mention.source.mentionable_content, length: 200),
-        path: card_path(card)
-      }
-    end
-
-    def build_default_payload
-      {
-        title: "New notification",
-        body: "You have a new notification",
-        path: notifications_path(script_name: notification.account.slug)
-      }
-    end
-
-    def push_to_user(payload)
-      subscriptions = notification.user.push_subscriptions
-      enqueue_payload_for_delivery(payload, subscriptions)
-    end
-
-    def enqueue_payload_for_delivery(payload, subscriptions)
-      Rails.configuration.x.web_push_pool.queue(payload, subscriptions)
-    end
-
-    def card_notification_title(card)
-      card.title.presence || "Card #{card.number}"
-    end
-
-    def comment_notification_body(event)
-      format_excerpt(event.eventable.body, length: 200)
-    end
-
-    def card_path(card)
-      Rails.application.routes.url_helpers.card_path(card, script_name: notification.account.slug)
-    end
-
-    def card_path_with_comment_anchor(comment)
-      Rails.application.routes.url_helpers.card_path(
-        comment.card,
-        anchor: ActionView::RecordIdentifier.dom_id(comment),
-        script_name: notification.account.slug
-      )
-    end
-end
diff --git a/app/models/notifier/card_event_notifier.rb b/app/models/notifier/card_event_notifier.rb
index 6179a4404..11e6ee8a0 100644
--- a/app/models/notifier/card_event_notifier.rb
+++ b/app/models/notifier/card_event_notifier.rb
@@ -8,9 +8,9 @@ class Notifier::CardEventNotifier < Notifier
       when "card_assigned"
         source.assignees.excluding(creator)
       when "card_published"
-        board.watchers.without(creator, *card.mentionees).including(*card.assignees).uniq
+        board.watchers.without(creator, *card.scan_mentionees).including(*card.assignees).uniq
       when "comment_created"
-        card.watchers.without(creator, *source.eventable.mentionees)
+        card.watchers.without(creator, *source.eventable.scan_mentionees)
       else
         board.watchers.without(creator)
       end
diff --git a/app/models/notifier/comment_event_notifier.rb b/app/models/notifier/comment_event_notifier.rb
index ee342748b..7a108a701 100644
--- a/app/models/notifier/comment_event_notifier.rb
+++ b/app/models/notifier/comment_event_notifier.rb
@@ -3,7 +3,7 @@ class Notifier::CommentEventNotifier < Notifier
 
   private
     def recipients
-      card.watchers.without(creator, *source.eventable.mentionees)
+      card.watchers.without(creator, *source.eventable.scan_mentionees)
     end
 
     def card
diff --git a/app/models/search/stemmer.rb b/app/models/search/stemmer.rb
index f6a6c56d4..21cb75f97 100644
--- a/app/models/search/stemmer.rb
+++ b/app/models/search/stemmer.rb
@@ -5,7 +5,7 @@ module Search::Stemmer
 
   def stem(value)
     if value.present?
-      value.gsub(/[^\w\s]/, "").split(/\s+/).map { |word| STEMMER.stem(word.downcase) }.join(" ")
+      value.gsub(/[^\w\s]/, " ").split(/\s+/).map { |word| STEMMER.stem(word.downcase) }.join(" ")
     else
       value
     end
diff --git a/app/models/user/avatar.rb b/app/models/user/avatar.rb
index c62d87e09..970104d6f 100644
--- a/app/models/user/avatar.rb
+++ b/app/models/user/avatar.rb
@@ -1,8 +1,14 @@
+require "zlib"
+
 module User::Avatar
   extend ActiveSupport::Concern
 
   ALLOWED_AVATAR_CONTENT_TYPES = %w[ image/jpeg image/png image/gif image/webp ].freeze
   MAX_AVATAR_DIMENSIONS = { width: 4096, height: 4096 }.freeze
+  AVATAR_COLORS = %w[
+    #AF2E1B #CC6324 #3B4B59 #BFA07A #ED8008 #ED3F1C #BF1B1B #736B1E #D07B53
+    #736356 #AD1D1D #BF7C2A #C09C6F #698F9C #7C956B #5D618F #3B3633 #67695E
+  ].freeze
 
   included do
     has_one_attached :avatar do |attachable|
@@ -22,6 +28,10 @@ module User::Avatar
     avatar.variable? ? avatar.variant(:thumb) : avatar
   end
 
+  def avatar_background_color
+    AVATAR_COLORS[Zlib.crc32(to_param) % AVATAR_COLORS.size]
+  end
+
   # Avatars are always publicly accessible
   def publicly_accessible?
     true
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index 3b34af041..f008aa934 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -36,6 +36,7 @@ class Webhook < ApplicationRecord
   after_create :create_delinquency_tracker!
 
   normalizes :subscribed_actions, with: ->(value) { Array.wrap(value).map(&:to_s).uniq & PERMITTED_ACTIONS }
+  normalizes :url, with: -> { it.strip }
 
   validates :name, presence: true
   validate :validate_url
diff --git a/app/models/zip_file/reader.rb b/app/models/zip_file/reader.rb
index 2dc563f96..12ddd6fae 100644
--- a/app/models/zip_file/reader.rb
+++ b/app/models/zip_file/reader.rb
@@ -2,7 +2,7 @@ class ZipFile::Reader
   def initialize(io)
     @io = io
     @reader = ZipKit::FileReader.read_zip_structure(io: io)
-  rescue ZipKit::FileReader::InvalidStructure => e
+  rescue ZipKit::FileReader::ReadError, ZipKit::FileReader::MissingEOCD, ZipKit::FileReader::UnsupportedFeature => e
     raise ZipFile::InvalidFileError, e.message
   end
 
diff --git a/app/views/account/settings/_cancellation.html.erb b/app/views/account/settings/_cancellation.html.erb
index 5c493edd5..49f87512f 100644
--- a/app/views/account/settings/_cancellation.html.erb
+++ b/app/views/account/settings/_cancellation.html.erb
@@ -1,26 +1,28 @@
 <% if Current.account.cancellable? && Current.user.owner? %>
-  <header class="margin-block-start-double">
-    <h2 class="divider txt-large txt-negative">Cancel account</h2>
-    <p class="margin-none-block">Delete your Fizzy account</p>
-  </header>
+  <section class="settings__section">
+    <header>
+      <h2 class="divider txt-negative">Cancel account</h2>
+      <div>Delete your Fizzy account.</div>
+    </header>
 
-  <div data-controller="dialog" data-dialog-modal-value="true">
-    <button type="button" class="btn btn--negative" data-action="dialog#open">Delete account</button>
+    <div data-controller="dialog" data-dialog-modal-value="true">
+      <button type="button" class="btn btn--negative" data-action="dialog#open">Delete account</button>
 
-    <dialog class="dialog panel panel--wide shadow" data-dialog-target="dialog">
-      <h2 class="margin-none txt-large txt-negative">Delete your account?</h2>
-      <ul class="txt-align-start">
-        <li>All users, including you, will lose access</li>
-        <% if Current.account.try(:active_subscription) %>
-          <li>Your subscription will be canceled</li>
-        <% end %>
-        <li>After 30 days your data will be permanently deleted</li>
-      </ul>
+      <dialog class="dialog panel panel--wide shadow" data-dialog-target="dialog" style="--panel-size: 48ch;">
+        <h2 class="margin-none txt-large txt-negative">Delete your account?</h2>
+        <ul class="txt-align-start">
+          <li>All users, including you, will lose access</li>
+          <% if Current.account.try(:active_subscription) %>
+            <li>Your subscription will be canceled</li>
+          <% end %>
+          <li>After 30 days, your data will be permanently deleted</li>
+        </ul>
 
-      <div class="flex gap justify-center">
-        <button type="button" class="btn" data-action="dialog#close">Cancel</button>
-        <%= button_to "Delete my account", account_cancellation_path, method: :post, class: "btn btn--negative", form: { data: { action: "submit->dialog#close", turbo: false } } %>
-      </div>
-    </dialog>
-  </div>
+        <div class="flex gap justify-center">
+          <button type="button" class="btn" data-action="dialog#close">Cancel</button>
+          <%= button_to "Delete my account", account_cancellation_path, method: :post, class: "btn btn--negative", form: { data: { action: "submit->dialog#close", turbo: false } } %>
+        </div>
+      </dialog>
+    </div>
+  </section>
 <% end %>
diff --git a/app/views/account/settings/_users.html.erb b/app/views/account/settings/_users.html.erb
index ceb17ff23..137532d75 100644
--- a/app/views/account/settings/_users.html.erb
+++ b/app/views/account/settings/_users.html.erb
@@ -1,4 +1,4 @@
-<section class="settings__section settings__section--users">
+<section class="settings__section">
   <header>
     <h2 class="divider">People on this account</h2>
   </header>
@@ -13,7 +13,7 @@
     <div class="settings__user-filter">
       <input placeholder="Filter…" class="input input--transparent full-width txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-filter-target="input" data-action="input->filter#filter">
 
-      <ul class="settings__user-list margin-block-half" data-filter-target="list" role="listbox">
+      <ul class="settings__scrollable-list margin-block-half" data-filter-target="list" role="listbox">
         <%= render partial: "account/settings/user", collection: users %>
       </ul>
     </div>
diff --git a/app/views/boards/edit.html.erb b/app/views/boards/edit.html.erb
index cd28b29a4..5895ef65f 100644
--- a/app/views/boards/edit.html.erb
+++ b/app/views/boards/edit.html.erb
@@ -16,13 +16,13 @@
 <section class="settings">
   <div class="settings__panel settings__panel--users panel shadow">
     <%= form_with model: @board, class: "display-contents", data: {
-          controller: "form boards-form",
+          controller: "form boards-form bridge--form",
           boards_form_self_removal_prompt_message_value: "Are you sure you want to remove yourself from this board? You won’t be able to get back in unless someone invites you.",
           action: "turbo:submit-start->boards-form#submitWithWarning" } do |form| %>
       <%= render "boards/edit/name", form: form, board: @board %>
       <%= render "boards/edit/users", board: @board, selected_users: @selected_users, unselected_users: @unselected_users, form: form %>
 
-      <button type="submit" id="log_in" class="btn btn--link center txt-normal" <%= "disabled" unless Current.user.can_administer_board?(@board) %>>
+      <button type="submit" id="log_in" class="btn btn--link center txt-normal" data-bridge--form-target="submit" <%= "disabled" unless Current.user.can_administer_board?(@board) %>>
         <span>Save changes</span>
       </button>
 
diff --git a/app/views/boards/edit/_users.html.erb b/app/views/boards/edit/_users.html.erb
index d8c16484a..eeb7d94a1 100644
--- a/app/views/boards/edit/_users.html.erb
+++ b/app/views/boards/edit/_users.html.erb
@@ -33,7 +33,7 @@
     </div>
   </div>
 
-  <ul class="settings__user-list" data-filter-target="list">
+  <ul class="settings__scrollable-list" data-filter-target="list">
     <%= access_toggles_for selected_users, selected: true, disabled: %>
     <%= access_toggles_for unselected_users, selected: false, disabled: %>
   </ul>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index bcccf4512..93c1447bb 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -30,3 +30,5 @@
     <%= render "boards/show/columns", page: @page, board: @board %>
   <% end %>
 <% end %>
+
+<%= bridged_share_url_button(bridge_share_board_description(@board)) %>
diff --git a/app/views/boards/show/_columns.html.erb b/app/views/boards/show/_columns.html.erb
index 191d18cbc..6d700f47e 100644
--- a/app/views/boards/show/_columns.html.erb
+++ b/app/views/boards/show/_columns.html.erb
@@ -13,6 +13,7 @@
       navigable_list_auto_select_value: false,
       navigable_list_auto_scroll_value: false,
       card_hotkeys_navigable_list_outlet: ".cards__transition-container",
+      native_prevent_pull_to_refresh: true,
       action: "
         keydown->navigable-list#navigate
         keydown->card-hotkeys#handleKeydown
diff --git a/app/views/cards/_card.json.jbuilder b/app/views/cards/_card.json.jbuilder
index f8e727732..bccf51d6e 100644
--- a/app/views/cards/_card.json.jbuilder
+++ b/app/views/cards/_card.json.jbuilder
@@ -8,6 +8,7 @@ json.cache! card do
   json.tags card.tags.pluck(:title).sort
 
   json.closed card.closed?
+  json.postponed card.postponed?
   json.golden card.golden?
   json.last_active_at card.last_active_at.utc
   json.created_at card.created_at.utc
diff --git a/app/views/cards/columns/edit.html.erb b/app/views/cards/columns/edit.html.erb
index 162bfbbeb..8aea6f09e 100644
--- a/app/views/cards/columns/edit.html.erb
+++ b/app/views/cards/columns/edit.html.erb
@@ -24,13 +24,16 @@
       <%= button_to_set_column @card, column %>
     <% end %>
 
-    <%= button_to "Done", card_closure_path(@card),
+    <%= button_to card_closure_path(@card),
         class: [ "card__column-name btn", { "card__column-name--current": @card.closed? } ],
         style: "--column-color: var(--color-card-complete)",
         disabled: @card.closed?,
         role: "radio",
         aria: { checked: @card.closed? },
         data: { scroll_to_target: @card.closed? ? "target" : nil },
-        form_class: "flex gap-half" %>
+        form_class: "flex gap-half" do %>
+          <%= icon_tag "check", class: "icon--mobile-only" %>
+          Done
+    <% end %>
   </div>
 <% end %>
diff --git a/app/views/cards/comments/_comment.json.jbuilder b/app/views/cards/comments/_comment.json.jbuilder
index eaf1805d6..58e2f6290 100644
--- a/app/views/cards/comments/_comment.json.jbuilder
+++ b/app/views/cards/comments/_comment.json.jbuilder
@@ -13,9 +13,9 @@ json.cache! comment do
 
   json.card do
     json.id comment.card_id
-    json.url card_url(comment.card_id)
+    json.url card_url(comment.card)
   end
 
-  json.reactions_url card_comment_reactions_url(comment.card_id, comment.id)
-  json.url card_comment_url(comment.card_id, comment.id)
+  json.reactions_url card_comment_reactions_url(comment.card, comment)
+  json.url card_comment_url(comment.card, comment)
 end
diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb
index d2de939a5..ed7d6ff44 100644
--- a/app/views/cards/comments/_new.html.erb
+++ b/app/views/cards/comments/_new.html.erb
@@ -4,7 +4,7 @@
   </figure>
 
   <div class="comment__content flex-inline flex-column full-width">
-    <div class="comment__body lexxy-content" data-turbo-permanent>
+    <div class="comment__body" data-turbo-permanent>
       <%= form_with model: Comment.new, url: card_comments_path(card), class: "flex flex-column gap full-width",
             data: { controller: "form local-save",
                   local_save_key_value: "comment-#{card.id}",
diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb
index 15e3cbd4a..c37b36b4e 100644
--- a/app/views/cards/comments/edit.html.erb
+++ b/app/views/cards/comments/edit.html.erb
@@ -5,7 +5,7 @@
     </figure>
 
     <div class="comment__content flex flex-column flex-item-grow full-width">
-      <div class="comment__body lexxy-content" data-turbo-permanent>
+      <div class="comment__body" data-turbo-permanent>
         <%= form_with model: [ @card, @comment ], class: "flex flex-column gap full-width",
               data: { controller: "form", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do |form| %>
           <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) do %>
diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb
index 1afbaaaac..6da99c7ee 100644
--- a/app/views/cards/container/_closure.html.erb
+++ b/app/views/cards/container/_closure.html.erb
@@ -5,6 +5,7 @@
       <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %>
         <span class="pad-inline-end">Undo</span>
       <% end %>
+      <%= bridged_button_to_board(card.board) %>
     </div>
   <% else %>
     <div class="card-perma__notch card-perma__notch--bottom">
diff --git a/app/views/cards/container/_closure_buttons.html.erb b/app/views/cards/container/_closure_buttons.html.erb
index 990a17982..27db6590e 100644
--- a/app/views/cards/container/_closure_buttons.html.erb
+++ b/app/views/cards/container/_closure_buttons.html.erb
@@ -7,10 +7,12 @@
   <% end %>
 
   <%= button_to card_closure_path(card), class: "btn btn--circle-mobile borderless",
-        data: { controller: "hotkey", form_target: "submit", bridge__buttons_target: "button", bridge_title: "Mark as Done", bridge_icon_url: bridge_icon("check"), action: "keydown.d@document->hotkey#click" },
+        data: { controller: "hotkey", form_target: "submit", bridge__buttons_target: "button", bridge_title: "Mark done", bridge_display_as_primary_action: true, bridge_display_title: true, bridge_icon_url: bridge_icon("check"), action: "keydown.d@document->hotkey#click" },
         form: { data: { controller: "form" } } do %>
     <%= icon_tag "check", class: "icon--mobile-only" %>
     <span class="overflow-ellipsis">Mark as Done</span>
     <kbd class="txt-x-small hide-on-touch">d</kbd>
   <% end %>
+
+  <%= bridged_button_to_board(card.board) %>
 </div>
diff --git a/app/views/cards/container/_image.html.erb b/app/views/cards/container/_image.html.erb
index e044b9b0c..c8892f0d4 100644
--- a/app/views/cards/container/_image.html.erb
+++ b/app/views/cards/container/_image.html.erb
@@ -1,12 +1,12 @@
 <% if card.image.attached? %>
-  <%= button_to card_image_path(card), method: :delete, class: "btn",
-        data: { controller: "tooltip", bridge__overflow_menu_target: "item", bridge_title: "Remove background image" } do %>
+  <%= button_to card_image_path(card), method: :delete, class: "btn hide-on-native",
+        data: { controller: "tooltip" } do %>
     <%= icon_tag "picture-remove" %>
     <span class="for-screen-reader">Remove background image</span>
   <% end %>
 <% elsif !card.closed? %>
   <%= form_with model: card, data: { controller: "form" } do |form| %>
-    <label class="card-perma__image-btn btn input--file btn--circle-mobile" data-controller="tooltip" data-bridge--overflow-menu-target="item" data-bridge-title="Add background image">
+    <label class="card-perma__image-btn btn input--file btn--circle-mobile hide-on-native" data-controller="tooltip">
       <%= icon_tag "picture-add" %>
       <span class="for-screen-reader">Add background image</span>
 
diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb
index cdfede474..2ec3b248e 100644
--- a/app/views/cards/display/perma/_tags.html.erb
+++ b/app/views/cards/display/perma/_tags.html.erb
@@ -1,7 +1,7 @@
 <div id="<%= dom_id(card, :tags) %>" class="card__tags">
   <div data-controller="dialog"
         data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside mouseenter->dialog#loadLazyFrames" <%= "hidden" if card.closed? %>>
-    <button class="card__tag-picker-button btn card__hide-on-index" style="--btn-background: var(--card-bg-color);"
+    <button class="card__tag-picker-button btn btn--ensure-tap-target-size card__hide-on-index" style="--btn-background: var(--card-bg-color);"
         data-controller="tooltip hotkey" data-action="click->dialog#open:stop keydown.t@document->hotkey#click">
       <%= icon_tag "tag" %>
       <span class="for-screen-reader">Add a tag</span>
diff --git a/app/views/cards/pins/_pin_button.html.erb b/app/views/cards/pins/_pin_button.html.erb
index 4dd96d8e5..a36bca03a 100644
--- a/app/views/cards/pins/_pin_button.html.erb
+++ b/app/views/cards/pins/_pin_button.html.erb
@@ -1,8 +1,8 @@
 <div id="<%= dom_id(card, :pin_button) %>">
   <% if card.pinned_by? Current.user %>
     <%= button_to card_pin_path(card), method: :delete, class: "btn btn--reversed btn--circle-mobile",
-          data: { controller: "tooltip hotkey", action: "keydown.shift+p@document->hotkey#click", bridge__overflow_menu_target: "item", bridge_title: "Un-pin this card" } do %>
-      <%= icon_tag "pinned" %> <span class="for-screen-reader">Un-pin this card (shift+p)</span>
+          data: { controller: "tooltip hotkey", action: "keydown.shift+p@document->hotkey#click", bridge__overflow_menu_target: "item", bridge_title: "Unpin this card" } do %>
+      <%= icon_tag "pinned" %> <span class="for-screen-reader">Unpin this card (shift+p)</span>
     <% end %>
   <% else %>
     <%= button_to card_pin_path(card), class: "btn btn--circle-mobile",
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index cf6d239db..fabd2ad02 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -9,7 +9,6 @@
   <div class="header__actions header__actions--start">
     <%= link_back_to_board(@card.board) %>
   </div>
-  <%= bridged_button_to_board(@card.board) %>
 <% end %>
 
 <%= turbo_stream_from @card %>
@@ -23,3 +22,5 @@
     <%= button_to_remove_card_image(@card) if @card.image.attached? %>
   <% end %>
 </div>
+
+<%= bridged_share_url_button(bridge_share_card_description(@card)) %>
diff --git a/app/views/client_configurations/android_v1.json b/app/views/client_configurations/android_v1.json
new file mode 100644
index 000000000..9a1b51f34
--- /dev/null
+++ b/app/views/client_configurations/android_v1.json
@@ -0,0 +1,100 @@
+{
+  "settings": {},
+  "rules": [
+    {
+      "patterns": [
+        ".*"
+      ],
+      "properties": {
+        "context": "default",
+        "presentation": "default",
+        "query_string_presentation": "replace",
+        "uri": "hotwire://fragment/web",
+        "fallback_uri": "hotwire://fragment/web",
+        "pull_to_refresh_enabled": true
+      }
+    },
+    {
+      "patterns": [
+        "/new$",
+        "/new\\?.+$",
+        "/edit$",
+        "/edit\\?.+$",
+        "/cards/[0-9]+/draft",
+        "/notifications/settings",
+        "/account/settings",
+        "/account/join_code"
+      ],
+      "properties": {
+        "context": "modal",
+        "pull_to_refresh_enabled": false
+      }
+    },
+    {
+      "patterns": [
+        "/devices$"
+      ],
+      "properties": {
+        "context": "modal",
+        "pull_to_refresh_enabled": false,
+        "allow_untenanted_navigation": true
+      }
+    },
+    {
+      "patterns": [
+        "/native/login/blank"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/login/blank"
+      }
+    },
+    {
+      "patterns": [
+        "/native/login/email"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/login/email"
+      }
+    },
+    {
+      "patterns": [
+        "/native/login/magic_code"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/login/magic_code"
+      }
+    },
+    {
+      "patterns": [
+        "/native/login/signup_completion"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/login/signup_completion"
+      }
+    },
+    {
+      "patterns": [
+        "/native/settings"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/settings"
+      }
+    },
+    {
+      "patterns": [
+        "/my/pins"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/pins"
+      }
+    },
+    {
+      "patterns": [
+        "/notifications$"
+      ],
+      "properties": {
+        "uri": "hotwire://fragment/notifications"
+      }
+    }
+  ]
+}
diff --git a/app/views/client_configurations/ios_v1.json b/app/views/client_configurations/ios_v1.json
new file mode 100644
index 000000000..2285e9bc7
--- /dev/null
+++ b/app/views/client_configurations/ios_v1.json
@@ -0,0 +1,89 @@
+{
+  "settings": {
+  },
+  "rules": [
+    {
+      "patterns": [
+        ".*"
+      ],
+      "properties": {
+        "context": "default",
+        "query_string_presentation": "replace",
+        "pull_to_refresh_enabled": true
+      }
+    },
+    {
+      "patterns": [
+        "/new$",
+        "/new\\?.+$",
+        "/edit$",
+        "/edit\\?.+$",
+        "/accounts$",
+        "/cards/[0-9]+/draft"
+      ],
+      "properties": {
+        "context": "modal",
+        "pull_to_refresh_enabled": false
+      }
+    },
+    {
+      "patterns": [
+        "/native/my_menu$"
+      ],
+      "properties": {
+        "context": "modal",
+        "view_controller": "main_menu"
+      }
+    },
+    {
+      "patterns": [
+        "/native/add_account$"
+      ],
+      "properties": {
+        "context": "modal",
+        "view_controller": "login"
+      }
+    },
+    {
+      "patterns": [
+        "/native/login$"
+      ],
+      "properties": {
+        "view_controller": "login"
+      }
+    },
+    {
+      "patterns": [
+        "/my/pins$"
+      ],
+      "properties": {
+        "view_controller": "pinned"
+      }
+    },
+    {
+      "patterns": [
+        "/notifications/tray$"
+      ],
+      "properties": {
+        "view_controller": "notifications"
+      }
+    },
+    {
+      "patterns": [
+        "internal/devtools/enable*"
+      ],
+      "properties": {
+        "context": "modal",
+        "view_controller": "dev_settings_launcher"
+      }
+    },
+    {
+      "patterns": [
+        "/native/settings$"
+      ],
+      "properties": {
+        "view_controller": "settings"
+      }
+    }
+  ]
+}
diff --git a/app/views/columns/show/_add_card_button.html.erb b/app/views/columns/show/_add_card_button.html.erb
index 040fd55d3..ee2f87196 100644
--- a/app/views/columns/show/_add_card_button.html.erb
+++ b/app/views/columns/show/_add_card_button.html.erb
@@ -1,7 +1,7 @@
 <div class="board-tools card">
   <%= button_to board_cards_path(board), method: :post, class: "btn btn--link",
         form: { data: { turbo_frame: "_top" } },
-        data: { controller: "hotkey", action: "keydown.c@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Add card", bridge_icon_url: bridge_icon("add") } do %>
+        data: { controller: "hotkey", action: "keydown.c@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Add card", bridge_display_as_primary_action: true, bridge_display_title: true, bridge_icon_url: bridge_icon("add") } do %>
     <%= icon_tag "add", class: "show-on-touch" %>
     <span>Add a card</span>
     <kbd class="hide-on-touch">C</kbd>
diff --git a/app/views/events/index/_add_board_button.html.erb b/app/views/events/index/_add_board_button.html.erb
index a534626d4..b8134266a 100644
--- a/app/views/events/index/_add_board_button.html.erb
+++ b/app/views/events/index/_add_board_button.html.erb
@@ -1,7 +1,7 @@
 <div class="header__actions header__actions--end">
   <div>
     <%= link_to new_board_path, class: "btn btn--link btn--circle-mobile",
-          data: { controller: "hotkey", action: "keydown.b@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Add a board", bridge_icon_url: bridge_icon("board") } do %>
+          data: { controller: "hotkey", action: "keydown.b@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Add board", bridge_display_title: true, bridge_icon_url: bridge_icon("board") } do %>
       <%= icon_tag "board" %>
       <span class="overflow-ellipsis">Add a board</span>
       <kbd class="hide-on-touch">B</kbd>
diff --git a/app/views/events/index/_add_card_button.html.erb b/app/views/events/index/_add_card_button.html.erb
index f865e5403..31caef555 100644
--- a/app/views/events/index/_add_card_button.html.erb
+++ b/app/views/events/index/_add_card_button.html.erb
@@ -1,7 +1,7 @@
 <div class="header__actions header__actions--start">
   <% if board = user_filtering.single_board_or_first %>
     <%= button_to board_cards_path(board), method: :post, class: "btn btn--link btn--circle-mobile",
-          data: { controller: "hotkey", action: "keydown.c@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Add a card", bridge_icon_url: bridge_icon("add") } do %>
+          data: { controller: "hotkey", action: "keydown.c@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Add card", bridge_display_as_primary_action: true, bridge_display_title: true, bridge_icon_url: bridge_icon("add") } do %>
       <%= icon_tag "add" %>
       <span class="overflow-ellipsis">Add a card</span>
       <kbd class="hide-on-touch">C</kbd>
diff --git a/app/views/layouts/public.html.erb b/app/views/layouts/public.html.erb
index e728cc8d4..9f34c1706 100644
--- a/app/views/layouts/public.html.erb
+++ b/app/views/layouts/public.html.erb
@@ -2,7 +2,7 @@
 <html lang="en">
   <%= render "layouts/shared/head" %>
 
-  <body class="public <%= @body_class %>" data-controller="local-time timezone-cookie" data-action="turbo:morph@window->local-time#refreshAll">
+  <body class="public <%= @body_class %>" data-controller="local-time timezone-cookie bridge--title bridge--text-size bridge--insets" data-action="turbo:morph@window->local-time#refreshAll" data-platform="<%= platform.type %>" data-bridge--title-title-value="<%= @page_title %>">
     <div id="global-container">
       <header class="header" id="header">
         <a href="#main" class="header__skip-navigation btn" data-turbo="false">Skip to main content</a>
diff --git a/app/views/my/identities/show.json.jbuilder b/app/views/my/identities/show.json.jbuilder
index a36569e41..8db250846 100644
--- a/app/views/my/identities/show.json.jbuilder
+++ b/app/views/my/identities/show.json.jbuilder
@@ -1,4 +1,6 @@
-json.accounts @identity.users do |user|
+json.id @identity.id
+
+json.accounts @identity.users_with_active_accounts do |user|
   json.partial! "my/identities/account", account: user.account
   json.user user, partial: "users/user", as: :user
 end
diff --git a/app/views/my/menus/_jump.html.erb b/app/views/my/menus/_jump.html.erb
index f22bedf23..cc1000770 100644
--- a/app/views/my/menus/_jump.html.erb
+++ b/app/views/my/menus/_jump.html.erb
@@ -1,6 +1,6 @@
 <div class="flex gap">
   <div class="flex flex-column full-width justify-center gap-half">
-    <div class="nav__header">
+    <div class="nav__header" tabindex="-1" data-dialog-target="focusTouch">
       <% if Current.identity.accounts.many? %>
         <div class="nav__header-title max-width">
           <div class="overflow-ellipsis"><strong><%= Current.account.name %></strong></div>
diff --git a/app/views/my/pins/_pin.html.erb b/app/views/my/pins/_pin.html.erb
index 69d6f8a40..00a831ebf 100644
--- a/app/views/my/pins/_pin.html.erb
+++ b/app/views/my/pins/_pin.html.erb
@@ -1,6 +1,6 @@
 <div class="tray__item tray__item--pin" id="<%= dom_id pin %>" data-navigable-list-target="item">
   <%= render "cards/display/preview", card: pin.card %>
   <%= button_to card_pin_path(pin.card), method: :delete, class: "tray__remove-pin-btn btn btn--circle borderless" do %>
-    <%= icon_tag "pinned" %> <span class="for-screen-reader">Un-pin this card</span>
+    <%= icon_tag "pinned" %> <span class="for-screen-reader">Unpin this card</span>
   <% end %>
 </div>
diff --git a/app/views/notifications/_notification.json.jbuilder b/app/views/notifications/_notification.json.jbuilder
index d2fadfa1b..ae166f44a 100644
--- a/app/views/notifications/_notification.json.jbuilder
+++ b/app/views/notifications/_notification.json.jbuilder
@@ -3,14 +3,19 @@ json.cache! notification do
   json.read notification.read?
   json.read_at notification.read_at&.utc
   json.created_at notification.created_at.utc
+  json.source_type notification.source_type.underscore
 
   json.partial! "notifications/notification/#{notification.source_type.underscore}/body", notification: notification
 
   json.creator notification.creator, partial: "users/user", as: :user
 
   json.card do
-    json.(notification.card, :id, :title, :status)
+    json.(notification.card, :id, :number, :title, :status)
+    json.board_name notification.card.board.name
+    json.closed notification.card.closed?
+    json.postponed notification.card.postponed?
     json.url card_url(notification.card)
+    json.column notification.card.column, partial: "columns/column", as: :column if notification.card.column
   end
 
   json.url notification_url(notification)
diff --git a/app/views/notifications/settings/show.html.erb b/app/views/notifications/settings/show.html.erb
index 916013ed7..dc43bafd8 100644
--- a/app/views/notifications/settings/show.html.erb
+++ b/app/views/notifications/settings/show.html.erb
@@ -8,7 +8,7 @@
   <div class="settings__panel settings__panel--users panel shadow">
     <section class="settings__section">
       <h2 class="divider">Boards</h2>
-      <div class="settings__user-list flex flex-column gap-half">
+      <div class="settings__scrollable-list flex flex-column gap-half">
         <%= render partial: "notifications/settings/board", collection: @boards, locals: { user: Current.user } %>
       </div>
     </section>
@@ -16,6 +16,7 @@
 
   <div class="settings__panel panel shadow">
     <%= render "notifications/settings/push_notifications" %>
+    <%= render "notifications/settings/native_devices" if Fizzy.saas? %>
     <%= render "notifications/settings/email", settings: @settings %>
   </div>
 </section>
diff --git a/app/views/notifications/trays/show.json.jbuilder b/app/views/notifications/trays/show.json.jbuilder
new file mode 100644
index 000000000..0c2928cef
--- /dev/null
+++ b/app/views/notifications/trays/show.json.jbuilder
@@ -0,0 +1 @@
+json.array! @notifications, partial: "notifications/notification", as: :notification
diff --git a/app/views/pwa/service_worker.js b/app/views/pwa/service_worker.js
index 1216c550d..91903e735 100644
--- a/app/views/pwa/service_worker.js
+++ b/app/views/pwa/service_worker.js
@@ -25,7 +25,7 @@ async function updateBadgeCount({ data: { badge } }) {
 self.addEventListener("notificationclick", (event) => {
   event.notification.close()
 
-  const url = new URL(event.notification.data.path, self.location.origin).href
+  const url = new URL(event.notification.data.url, self.location.origin).href
   event.waitUntil(openURL(url))
 })
 
diff --git a/app/views/searches/_form.html.erb b/app/views/searches/_form.html.erb
index 0ea00678f..88bcafee0 100644
--- a/app/views/searches/_form.html.erb
+++ b/app/views/searches/_form.html.erb
@@ -1,4 +1,10 @@
-<%= form_with url: search_path, method: :get, class: "search__form flex align-center justify-center gap-half", data: { bar_target: "form", turbo_frame: defined?(target_turbo_frame) ? target_turbo_frame : nil } do |form| %>
+<%= form_with url: search_path, method: :get,
+  class: "search__form flex align-center justify-center gap-half",
+  data: {
+    controller: "search-form",
+    action: "search-form:reset->bar#reset",
+    bar_target: "form",
+    turbo_frame: defined?(target_turbo_frame) ? target_turbo_frame : nil } do |form| %>
   <%= form.label :q, "Search Fizzy", class: "font-weight-black txt-nowrap" %>
   <%= text_field_tag :q, query_terms,
         class: "search__input input",
@@ -7,9 +13,11 @@
         autocomplete: "off",
         autofocus: true,
         data: {
+          search_form_target: "searchInput",
           bar_target: "searchInput",
           action: "keydown.enter->bar#showModalAndSubmit:prevent keydown.esc->bar#reset" } %>
-  <button class="search__reset btn btn--circle borderless" data-action="bar#clearInput">
+  <button hidden>Search</button>
+  <button class="search__reset btn btn--circle borderless" data-action="search-form#clearInput">
     <%= icon_tag "close" %>
     <span class="for-screen-reader">Close search</span>
   </button>
diff --git a/app/views/searches/_results.html.erb b/app/views/searches/_results.html.erb
index 0b622e95d..19c5b90fb 100644
--- a/app/views/searches/_results.html.erb
+++ b/app/views/searches/_results.html.erb
@@ -1,6 +1,6 @@
 <section class="search">
   <div class="search__results">
-    <% unless page.used? %>
+    <% if !page.used? && query %>
       <div class="search__blank-slate blank-slate">
         No matches
       </div>
diff --git a/app/views/searches/show.html.erb b/app/views/searches/show.html.erb
index 776ab9d38..8a802a3bd 100644
--- a/app/views/searches/show.html.erb
+++ b/app/views/searches/show.html.erb
@@ -1,4 +1,4 @@
-<% @page_title = params.has_key?(:q) ? "Search results for \"#{params[:q]}\"" : "Search" %>
+<% @page_title = @query ? "Search results for \"#{@query}\"" : "Search" %>
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
@@ -9,12 +9,12 @@
 <% end %>
 
 <div class="search-perma margin-block-start">
-  <%= render "form", query_terms: params[:q] %>
+  <%= render "form", query_terms: @query %>
   <%= turbo_frame_tag "bar_content" do %>
     <% if @card %>
       <%= auto_submit_form_with url: card_path(@card), method: :get, data: { turbo_action: "advance", turbo_frame: "_top", search_redirect: true } %>
     <% else %>
-      <%= render "results", page: @page %>
+      <%= render "results", page: @page, query: @query %>
     <% end %>
   <% end %>
 </div>
diff --git a/app/views/users/_user.json.jbuilder b/app/views/users/_user.json.jbuilder
index 0884f225a..ed05bc67f 100644
--- a/app/views/users/_user.json.jbuilder
+++ b/app/views/users/_user.json.jbuilder
@@ -5,4 +5,5 @@ json.cache! user do
   json.created_at user.created_at.utc
 
   json.url user_url(user)
+  json.avatar_url user_avatar_url(user)
 end
diff --git a/app/views/users/email_addresses/new.html.erb b/app/views/users/email_addresses/new.html.erb
index 589dca937..e348f07db 100644
--- a/app/views/users/email_addresses/new.html.erb
+++ b/app/views/users/email_addresses/new.html.erb
@@ -6,7 +6,7 @@
   </div>
 <% end %>
 
-<div class="panel panel--centered flex flex-column gap-half" style="--panel-size: 45ch;">
+<div class="panel panel--centered flex flex-column gap-half">
   <h1 class="txt-x-large font-weight-black margin-none">
     <%= @page_title %>
   </h1>
@@ -18,7 +18,7 @@
       </label>
     </div>
 
-    <p class="margin-none-block-start margin-block-end-half">Enter your new email address, then check your email to confirm the change.</p>
+    <p class="margin-none-block-start margin-block-end-half">Enter your new email address, then check your&nbsp;email to confirm the change.</p>
 
     <button type="submit" class="btn btn--link center" data-form-target="submit">
       <span>Continue</span>
diff --git a/bin/dev b/bin/dev
index 05032e7c3..24923069d 100755
--- a/bin/dev
+++ b/bin/dev
@@ -2,13 +2,31 @@
 
 PORT=3006
 USE_TAILSCALE=0
+USE_PUSH=0
 
 for arg in "$@"; do
   case $arg in
     --tailscale) USE_TAILSCALE=1 ;;
+    --push) USE_PUSH=1 ;;
   esac
 done
 
+if [ "$USE_PUSH" = "1" ]; then
+  if [ ! -f tmp/saas.txt ]; then
+    echo "Enabling SaaS mode for push notifications..."
+    ./bin/rails saas:enable
+  fi
+  echo "Loading push credentials from 1Password..."
+  if ! eval "$(BUNDLE_GEMFILE=Gemfile.saas bundle exec push-dev)"; then
+    echo "Error: failed to load push credentials. Are you signed into 1Password?" >&2
+    exit 1
+  fi
+  if [ -z "$APNS_ENCRYPTION_KEY_B64" ] || [ -z "$APNS_KEY_ID" ]; then
+    echo "Error: Push credentials not set. Missing APNS_ENCRYPTION_KEY_B64 or APNS_KEY_ID." >&2
+    exit 1
+  fi
+fi
+
 if [ ! -f tmp/solid-queue.txt ]; then
   export SOLID_QUEUE_IN_PUMA=false
 fi
diff --git a/config/initializers/push_notifications.rb b/config/initializers/push_notifications.rb
new file mode 100644
index 000000000..fa82a46a7
--- /dev/null
+++ b/config/initializers/push_notifications.rb
@@ -0,0 +1,3 @@
+Rails.application.config.to_prepare do
+  Notification.register_push_target(:web)
+end
diff --git a/config/routes.rb b/config/routes.rb
index 979d2a86b..0ca383dda 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -245,6 +245,10 @@ Rails.application.routes.draw do
   get "manifest" => "rails/pwa#manifest", as: :pwa_manifest
   get "service-worker" => "pwa#service_worker"
 
+  # Mobile clients
+  get "client_configurations/(:platform)_v(:version)" => "client_configurations#show",
+    platform: /android|ios/, version: /\d+/
+
   namespace :admin do
     mount MissionControl::Jobs::Engine, at: "/jobs"
   end
diff --git a/db/migrate/20260218120000_restore_unique_index_on_board_publication_key.rb b/db/migrate/20260218120000_restore_unique_index_on_board_publication_key.rb
new file mode 100644
index 000000000..dfcd5edaf
--- /dev/null
+++ b/db/migrate/20260218120000_restore_unique_index_on_board_publication_key.rb
@@ -0,0 +1,7 @@
+class RestoreUniqueIndexOnBoardPublicationKey < ActiveRecord::Migration[8.2]
+  def change
+    add_index :board_publications, :key, unique: true
+    add_index :board_publications, :account_id
+    remove_index :board_publications, [:account_id, :key]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e74a97212..20cb0d161 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
+ActiveRecord::Schema[8.2].define(version: 2026_02_18_120000) do
   create_table "accesses", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.datetime "accessed_at"
     t.uuid "account_id", null: false
@@ -147,8 +147,9 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
     t.datetime "created_at", null: false
     t.string "key"
     t.datetime "updated_at", null: false
-    t.index ["account_id", "key"], name: "index_board_publications_on_account_id_and_key"
+    t.index ["account_id"], name: "index_board_publications_on_account_id"
     t.index ["board_id"], name: "index_board_publications_on_board_id"
+    t.index ["key"], name: "index_board_publications_on_key", unique: true
   end
 
   create_table "boards", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
diff --git a/db/schema_sqlite.rb b/db/schema_sqlite.rb
index 6ea0a137d..c8ce19e07 100644
--- a/db/schema_sqlite.rb
+++ b/db/schema_sqlite.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
+ActiveRecord::Schema[8.2].define(version: 2026_02_18_120000) do
   create_table "accesses", id: :uuid, force: :cascade do |t|
     t.datetime "accessed_at"
     t.uuid "account_id", null: false
@@ -42,7 +42,7 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
     t.uuid "account_id"
     t.datetime "completed_at"
     t.datetime "created_at", null: false
-    t.string "failure_reason"
+    t.string "failure_reason", limit: 255
     t.uuid "identity_id", null: false
     t.string "status", limit: 255, default: "pending", null: false
     t.datetime "updated_at", null: false
@@ -147,8 +147,9 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
     t.datetime "created_at", null: false
     t.string "key", limit: 255
     t.datetime "updated_at", null: false
-    t.index ["account_id", "key"], name: "index_board_publications_on_account_id_and_key"
+    t.index ["account_id"], name: "index_board_publications_on_account_id"
     t.index ["board_id"], name: "index_board_publications_on_board_id"
+    t.index ["key"], name: "index_board_publications_on_key", unique: true
   end
 
   create_table "boards", id: :uuid, force: :cascade do |t|
@@ -299,7 +300,7 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
     t.datetime "completed_at"
     t.datetime "created_at", null: false
     t.string "status", limit: 255, default: "pending", null: false
-    t.string "type"
+    t.string "type", limit: 255
     t.datetime "updated_at", null: false
     t.uuid "user_id", null: false
     t.index ["account_id"], name: "index_exports_on_account_id"
@@ -495,7 +496,7 @@ ActiveRecord::Schema[8.2].define(version: 2026_02_13_170100) do
     t.string "operation", limit: 255, null: false
     t.uuid "recordable_id"
     t.string "recordable_type", limit: 255
-    t.string "request_id"
+    t.string "request_id", limit: 255
     t.uuid "user_id"
     t.index ["account_id"], name: "index_storage_entries_on_account_id"
     t.index ["blob_id"], name: "index_storage_entries_on_blob_id"
diff --git a/docs/API.md b/docs/API.md
index 47965372c..21bd24b86 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -539,6 +539,7 @@ __Response:__
     "description": "Hello, World!",
     "description_html": "<div class=\"action-text-content\"><p>Hello, World!</p></div>",
     "image_url": null,
+    "has_attachments": false,
     "tags": ["programming"],
     "golden": false,
     "last_active_at": "2025-12-05T19:38:48.553Z",
@@ -590,6 +591,7 @@ __Response:__
   "description": "Hello, World!",
   "description_html": "<div class=\"action-text-content\"><p>Hello, World!</p></div>",
   "image_url": null,
+  "has_attachments": false,
   "tags": ["programming"],
   "closed": false,
   "golden": false,
@@ -747,7 +749,7 @@ Returns `204 No Content` on success.
 
 ### `POST /:account_slug/cards/:card_number/triage`
 
-Moves a card from triage into a column.
+Moves a card into a column.
 
 | Parameter | Type | Required | Description |
 |-----------|------|----------|-------------|
@@ -857,6 +859,7 @@ __Response:__
     "description": "Hello, World!",
     "description_html": "<div class=\"action-text-content\"><p>Hello, World!</p></div>",
     "image_url": null,
+    "has_attachments": false,
     "tags": ["programming"],
     "golden": false,
     "last_active_at": "2025-12-05T19:38:48.553Z",
diff --git a/docs/docker-deployment.md b/docs/docker-deployment.md
index bc0ff0f04..c74efe291 100644
--- a/docs/docker-deployment.md
+++ b/docs/docker-deployment.md
@@ -74,6 +74,8 @@ docker run --publish 80:80 --env DISABLE_SSL=true ...
 
 Fizzy needs to be able to send email for its sign up/sign in flow, and for its regular summary emails.
 The easiest way to set this up is to use a 3rd-party email provider (such as Postmark, Sendgrid, and so on).
+If email is not configured, you can still sign in by finding the 6-character verification code in your Docker container's logs.
+
 You can then plug all your SMTP settings from that provider into Fizzy via the following environment variables:
 
 - `MAILER_FROM_ADDRESS` - the "from" address that Fizzy should use to send email
@@ -132,6 +134,7 @@ Then set the following as appropriate for your S3 bucket:
 - `S3_REGION`
 - `S3_ACCESS_KEY_ID`
 - `S3_SECRET_ACCESS_KEY`
+- `CSP_CONNECT_SRC`
 
 If you're using a provider other than AWS, you will also need some of the following:
 
diff --git a/docs/kamal-deployment.md b/docs/kamal-deployment.md
index 19aa208c8..c50c51299 100644
--- a/docs/kamal-deployment.md
+++ b/docs/kamal-deployment.md
@@ -11,7 +11,7 @@ The steps to configure your very own Fizzy are:
 
 1. Fork the repo
 2. Initialize Kamal by running `kamal init`. This command generates the `.kamal` directory along with the required configuration files, including `.kamal/secrets`.
-3. Edit few things in config/deploy.yml and .kamal/secrets
+3. Edit a few things in config/deploy.yml and .kamal/secrets
 4. Run `kamal setup` to do your first deploy.
 
 We'll go through each of these in turn.
@@ -103,6 +103,7 @@ To use the included `s3` service, set:
 - `S3_BUCKET` (defaults to `fizzy-#{Rails.env}-activestorage`)
 - `S3_REGION` (defaults to `us-east-1`)
 - `S3_SECRET_ACCESS_KEY`
+- `CSP_CONNECT_SRC`
 
 Optional for S3-compatible endpoints:
 
diff --git a/lib/rails_ext/active_record_replica_support.rb b/lib/rails_ext/active_record_replica_support.rb
index 8b9e63a98..d533c6dd2 100644
--- a/lib/rails_ext/active_record_replica_support.rb
+++ b/lib/rails_ext/active_record_replica_support.rb
@@ -49,4 +49,6 @@ module ActiveRecordReplicaSupport
   end
 end
 
-ActiveRecord::Base.include ActiveRecordReplicaSupport
+ActiveSupport.on_load(:active_record) do
+  include ActiveRecordReplicaSupport
+end
diff --git a/lib/rails_ext/active_storage_analyze_job_skip_detached.rb b/lib/rails_ext/active_storage_analyze_job_skip_detached.rb
new file mode 100644
index 000000000..0df49f0cf
--- /dev/null
+++ b/lib/rails_ext/active_storage_analyze_job_skip_detached.rb
@@ -0,0 +1,14 @@
+# Skip analysis for blobs whose attachments have already been destroyed.
+#   e.g. when a user uploads a file but deletes it before the analysis runs.
+# Avoids `Aws::S3::Errors::NoSuchKey` when an upload is deleted before AnalyzeJob runs.
+module ActiveStorageAnalyzeJobSkipDetached
+  def perform(blob)
+    return unless blob.attachments.exists?
+
+    super
+  end
+end
+
+ActiveSupport.on_load :active_storage_blob do
+  ActiveStorage::AnalyzeJob.prepend ActiveStorageAnalyzeJobSkipDetached
+end
diff --git a/lib/web_push/notification.rb b/lib/web_push/notification.rb
index 4c873fb48..0d2e54c8d 100644
--- a/lib/web_push/notification.rb
+++ b/lib/web_push/notification.rb
@@ -1,6 +1,6 @@
 class WebPush::Notification
-  def initialize(title:, body:, path:, badge:, endpoint:, endpoint_ip:, p256dh_key:, auth_key:)
-    @title, @body, @path, @badge = title, body, path, badge
+  def initialize(title:, body:, url:, badge:, endpoint:, endpoint_ip:, p256dh_key:, auth_key:)
+    @title, @body, @url, @badge = title, body, url, badge
     @endpoint, @endpoint_ip, @p256dh_key, @auth_key = endpoint, endpoint_ip, p256dh_key, auth_key
   end
 
@@ -20,7 +20,7 @@ class WebPush::Notification
     end
 
     def encoded_message
-      JSON.generate title: @title, options: { body: @body, icon: icon_path, data: { path: @path, badge: @badge } }
+      JSON.generate title: @title, options: { body: @body, icon: icon_path, data: { url: @url, path: @url, badge: @badge } }
     end
 
     def icon_path
diff --git a/saas/.kamal/secrets.beta b/saas/.kamal/secrets.beta
index 423ef11fb..2e955054b 100644
--- a/saas/.kamal/secrets.beta
+++ b/saas/.kamal/secrets.beta
@@ -1,4 +1,4 @@
-SECRETS=$(kamal secrets fetch --adapter 1password --account 23QPQDKZC5BKBIIG7UGT5GR5RM --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Beta/RAILS_MASTER_KEY Beta/MYSQL_ALTER_PASSWORD Beta/MYSQL_ALTER_USER Beta/MYSQL_APP_PASSWORD Beta/MYSQL_APP_USER Beta/MYSQL_READONLY_PASSWORD Beta/MYSQL_READONLY_USER Beta/SECRET_KEY_BASE Beta/VAPID_PUBLIC_KEY Beta/VAPID_PRIVATE_KEY Beta/ACTIVE_STORAGE_ACCESS_KEY_ID Beta/ACTIVE_STORAGE_SECRET_ACCESS_KEY Beta/QUEENBEE_API_TOKEN Beta/SIGNAL_ID_SECRET Beta/SENTRY_DSN Beta/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Beta/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Beta/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Beta/STRIPE_MONTHLY_V1_PRICE_ID Beta/STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID Beta/STRIPE_SECRET_KEY Beta/STRIPE_WEBHOOK_SECRET)
+SECRETS=$(kamal secrets fetch --adapter 1password --account 23QPQDKZC5BKBIIG7UGT5GR5RM --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Beta/RAILS_MASTER_KEY Beta/MYSQL_ALTER_PASSWORD Beta/MYSQL_ALTER_USER Beta/MYSQL_APP_PASSWORD Beta/MYSQL_APP_USER Beta/MYSQL_READONLY_PASSWORD Beta/MYSQL_READONLY_USER Beta/SECRET_KEY_BASE Beta/VAPID_PUBLIC_KEY Beta/VAPID_PRIVATE_KEY Beta/ACTIVE_STORAGE_ACCESS_KEY_ID Beta/ACTIVE_STORAGE_SECRET_ACCESS_KEY Beta/QUEENBEE_API_TOKEN Beta/SIGNAL_ID_SECRET Beta/SENTRY_DSN Beta/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Beta/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Beta/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Beta/STRIPE_MONTHLY_V1_PRICE_ID Beta/STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID Beta/STRIPE_SECRET_KEY Beta/STRIPE_WEBHOOK_SECRET Beta/APNS_KEY_ID Beta/APNS_ENCRYPTION_KEY_B64 Beta/FCM_ENCRYPTION_KEY_B64)
 
 GITHUB_TOKEN=$(gh config get -h github.com oauth_token)
 BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS)
@@ -25,3 +25,6 @@ STRIPE_MONTHLY_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_V1_PRICE_ID $S
 STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID $SECRETS)
 STRIPE_SECRET_KEY=$(kamal secrets extract STRIPE_SECRET_KEY $SECRETS)
 STRIPE_WEBHOOK_SECRET=$(kamal secrets extract STRIPE_WEBHOOK_SECRET $SECRETS)
+APNS_KEY_ID=$(kamal secrets extract APNS_KEY_ID $SECRETS)
+APNS_ENCRYPTION_KEY_B64=$(kamal secrets extract APNS_ENCRYPTION_KEY_B64 $SECRETS)
+FCM_ENCRYPTION_KEY_B64=$(kamal secrets extract FCM_ENCRYPTION_KEY_B64 $SECRETS)
diff --git a/saas/.kamal/secrets.production b/saas/.kamal/secrets.production
index 46d7abfbc..1c6577dc8 100644
--- a/saas/.kamal/secrets.production
+++ b/saas/.kamal/secrets.production
@@ -1,4 +1,4 @@
-SECRETS=$(kamal secrets fetch --adapter 1password --account 23QPQDKZC5BKBIIG7UGT5GR5RM --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Production/RAILS_MASTER_KEY Production/MYSQL_ALTER_PASSWORD Production/MYSQL_ALTER_USER Production/MYSQL_APP_PASSWORD Production/MYSQL_APP_USER Production/MYSQL_READONLY_PASSWORD Production/MYSQL_READONLY_USER Production/SECRET_KEY_BASE Production/VAPID_PUBLIC_KEY Production/VAPID_PRIVATE_KEY Production/ACTIVE_STORAGE_ACCESS_KEY_ID Production/ACTIVE_STORAGE_SECRET_ACCESS_KEY Production/QUEENBEE_API_TOKEN Production/SIGNAL_ID_SECRET Production/SENTRY_DSN Production/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Production/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Production/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Production/STRIPE_MONTHLY_V1_PRICE_ID Production/STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID Production/STRIPE_SECRET_KEY Production/STRIPE_WEBHOOK_SECRET)
+SECRETS=$(kamal secrets fetch --adapter 1password --account 23QPQDKZC5BKBIIG7UGT5GR5RM --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Production/RAILS_MASTER_KEY Production/MYSQL_ALTER_PASSWORD Production/MYSQL_ALTER_USER Production/MYSQL_APP_PASSWORD Production/MYSQL_APP_USER Production/MYSQL_READONLY_PASSWORD Production/MYSQL_READONLY_USER Production/SECRET_KEY_BASE Production/VAPID_PUBLIC_KEY Production/VAPID_PRIVATE_KEY Production/ACTIVE_STORAGE_ACCESS_KEY_ID Production/ACTIVE_STORAGE_SECRET_ACCESS_KEY Production/QUEENBEE_API_TOKEN Production/SIGNAL_ID_SECRET Production/SENTRY_DSN Production/ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY Production/ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY Production/ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT Production/STRIPE_MONTHLY_V1_PRICE_ID Production/STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID Production/STRIPE_SECRET_KEY Production/STRIPE_WEBHOOK_SECRET Production/APNS_KEY_ID Production/APNS_ENCRYPTION_KEY_B64 Production/FCM_ENCRYPTION_KEY_B64)
 
 GITHUB_TOKEN=$(gh config get -h github.com oauth_token)
 BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS)
@@ -25,3 +25,6 @@ STRIPE_MONTHLY_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_V1_PRICE_ID $S
 STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID=$(kamal secrets extract STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID $SECRETS)
 STRIPE_SECRET_KEY=$(kamal secrets extract STRIPE_SECRET_KEY $SECRETS)
 STRIPE_WEBHOOK_SECRET=$(kamal secrets extract STRIPE_WEBHOOK_SECRET $SECRETS)
+APNS_KEY_ID=$(kamal secrets extract APNS_KEY_ID $SECRETS)
+APNS_ENCRYPTION_KEY_B64=$(kamal secrets extract APNS_ENCRYPTION_KEY_B64 $SECRETS)
+FCM_ENCRYPTION_KEY_B64=$(kamal secrets extract FCM_ENCRYPTION_KEY_B64 $SECRETS)
diff --git a/saas/Gemfile b/saas/Gemfile
deleted file mode 100644
index bb3829719..000000000
--- a/saas/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
-
-# 37id and Queenbee integration
-gem "queenbee", bc: "queenbee-plugin", ref: "14312a940471e20617b38cdec7c092a01567d18b"
-gem "rails_structured_logging", bc: "rails-structured-logging"
-gem "activeresource", require: "active_resource" # needed by queenbee
-
-gem "rubocop-rails-omakase", require: false
diff --git a/saas/Gemfile.lock b/saas/Gemfile.lock
deleted file mode 100644
index 16c647b27..000000000
--- a/saas/Gemfile.lock
+++ /dev/null
@@ -1,291 +0,0 @@
-GIT
-  remote: https://github.com/basecamp/queenbee-plugin
-  revision: 14312a940471e20617b38cdec7c092a01567d18b
-  ref: 14312a940471e20617b38cdec7c092a01567d18b
-  specs:
-    queenbee (3.2.0)
-      activeresource
-      builder
-      rexml
-
-GIT
-  remote: https://github.com/basecamp/rails-structured-logging
-  revision: 76960cb5c15fc2b6b5f7542e05d7dcc031cef9e6
-  specs:
-    rails_structured_logging (0.2.1)
-      json
-      rails (>= 6.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    action_text-trix (2.1.15)
-      railties
-    actioncable (8.1.1)
-      actionpack (= 8.1.1)
-      activesupport (= 8.1.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (8.1.1)
-      actionpack (= 8.1.1)
-      activejob (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      mail (>= 2.8.0)
-    actionmailer (8.1.1)
-      actionpack (= 8.1.1)
-      actionview (= 8.1.1)
-      activejob (= 8.1.1)
-      activesupport (= 8.1.1)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (8.1.1)
-      actionview (= 8.1.1)
-      activesupport (= 8.1.1)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.1.1)
-      action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (8.1.1)
-      activesupport (= 8.1.1)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (8.1.1)
-      activesupport (= 8.1.1)
-      globalid (>= 0.3.6)
-    activemodel (8.1.1)
-      activesupport (= 8.1.1)
-    activemodel-serializers-xml (1.0.3)
-      activemodel (>= 5.0.0.a)
-      activesupport (>= 5.0.0.a)
-      builder (~> 3.1)
-    activerecord (8.1.1)
-      activemodel (= 8.1.1)
-      activesupport (= 8.1.1)
-      timeout (>= 0.4.0)
-    activeresource (6.1.4)
-      activemodel (>= 6.0)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 6.0)
-    activestorage (8.1.1)
-      actionpack (= 8.1.1)
-      activejob (= 8.1.1)
-      activerecord (= 8.1.1)
-      activesupport (= 8.1.1)
-      marcel (~> 1.0)
-    activesupport (8.1.1)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      json
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    ast (2.4.3)
-    base64 (0.3.0)
-    bigdecimal (3.2.3)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
-    crass (1.0.6)
-    date (3.5.0)
-    drb (2.2.3)
-    erb (6.0.0)
-    erubi (1.13.1)
-    globalid (1.3.0)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.1)
-    irb (1.15.3)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.16.0)
-    language_server-protocol (3.17.0.5)
-    lint_roller (1.1.0)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.9.0)
-      logger
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.1.0)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.12)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.5)
-    nokogiri (1.18.10-aarch64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.10-aarch64-linux-musl)
-      racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-musl)
-      racc (~> 1.4)
-    nokogiri (1.18.10-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
-      racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-musl)
-      racc (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.0)
-      ast (~> 2.4.1)
-      racc
-    pp (0.6.3)
-      prettyprint
-    prettyprint (0.2.0)
-    prism (1.6.0)
-    psych (5.2.6)
-      date
-      stringio
-    racc (1.8.1)
-    rack (3.2.4)
-    rack-session (2.1.1)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (2.2.1)
-      rack (>= 3)
-    rails (8.1.1)
-      actioncable (= 8.1.1)
-      actionmailbox (= 8.1.1)
-      actionmailer (= 8.1.1)
-      actionpack (= 8.1.1)
-      actiontext (= 8.1.1)
-      actionview (= 8.1.1)
-      activejob (= 8.1.1)
-      activemodel (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      bundler (>= 1.15.0)
-      railties (= 8.1.1)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.1.1)
-      actionpack (= 8.1.1)
-      activesupport (= 8.1.1)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.3.1)
-    rdoc (6.15.1)
-      erb
-      psych (>= 4.0.0)
-      tsort
-    regexp_parser (2.11.3)
-    reline (0.6.3)
-      io-console (~> 0.5)
-    rexml (3.4.4)
-    rubocop (1.81.7)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.26.1)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.34.2)
-      activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
-      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rails-omakase (1.1.0)
-      rubocop (>= 1.72)
-      rubocop-performance (>= 1.24)
-      rubocop-rails (>= 2.30)
-    ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
-    stringio (3.1.8)
-    thor (1.4.0)
-    timeout (0.4.4)
-    tsort (0.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
-    uri (1.0.3)
-    useragent (0.16.11)
-    websocket-driver (0.8.0)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.7.3)
-
-PLATFORMS
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  arm-linux-gnu
-  arm-linux-musl
-  arm64-darwin
-  x86_64-darwin
-  x86_64-linux
-  x86_64-linux-gnu
-  x86_64-linux-musl
-
-DEPENDENCIES
-  activeresource
-  queenbee!
-  rails_structured_logging!
-  rubocop-rails-omakase
-
-BUNDLED WITH
-   2.7.0
diff --git a/saas/README.md b/saas/README.md
index 69697ded4..bec3b279f 100644
--- a/saas/README.md
+++ b/saas/README.md
@@ -14,7 +14,7 @@ To go back to open source mode:
 bin/rails saas:disable
 ```
 
-Then you can work do [Fizzy development as usual](https://github.com/basecamp/fizzy).
+Then you can do [Fizzy development as usual](https://github.com/basecamp/fizzy).
 
 ## How to update Fizzy
 
@@ -46,6 +46,16 @@ This will ask for your 1password authorization to read and set the environment v
 * [Staging](https://dashboard.stripe.com/acct_1SdTbuRvb8txnPBR/test/dashboard)
 * [Production](https://dashboard.stripe.com/acct_1SNy97RwChFE4it8/dashboard)
 
+## Working with Push Notifications
+
+To test native push notifications (APNs and FCM) locally, start the dev server with the `--push` flag:
+
+```sh
+bin/dev --push
+```
+
+This will ask for your 1Password authorization to fetch the push credentials. Note that this loads the **production** APNs and FCM credentials into your environment.
+
 ## Environments
 
 Fizzy is deployed with [Kamal](https://kamal-deploy.org/). You'll need to have the 1Password CLI set up in order to access the secrets that are used when deploying. Provided you have that, it should be as simple as `bin/kamal deploy` to the correct environment.
diff --git a/saas/app/controllers/my/devices_controller.rb b/saas/app/controllers/my/devices_controller.rb
new file mode 100644
index 000000000..ee4044a1f
--- /dev/null
+++ b/saas/app/controllers/my/devices_controller.rb
@@ -0,0 +1,33 @@
+class My::DevicesController < ApplicationController
+  disallow_account_scope
+  before_action :set_device, only: :destroy
+
+  layout "public"
+
+  def index
+    @devices = Current.identity.devices.order(created_at: :desc)
+  end
+
+  def create
+    ApplicationPushDevice.register(session: Current.session, **device_params)
+    head :created
+  end
+
+  def destroy
+    @device.destroy
+    respond_to do |format|
+      format.html { redirect_to saas.my_devices_path, notice: "Device removed" }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    def set_device
+      @device = Current.identity.devices.find_by(token: params[:id]) || Current.identity.devices.find(params[:id])
+    end
+
+    def device_params
+      params.require([ :token, :platform ])
+      params.permit(:token, :platform, :name).to_h.symbolize_keys
+    end
+end
diff --git a/saas/app/jobs/application_push_notification_job.rb b/saas/app/jobs/application_push_notification_job.rb
new file mode 100644
index 000000000..5db7811c2
--- /dev/null
+++ b/saas/app/jobs/application_push_notification_job.rb
@@ -0,0 +1,2 @@
+class ApplicationPushNotificationJob < ActionPushNative::NotificationJob
+end
diff --git a/saas/app/models/account/billing.rb b/saas/app/models/account/billing.rb
index 02886581a..c124fd64c 100644
--- a/saas/app/models/account/billing.rb
+++ b/saas/app/models/account/billing.rb
@@ -27,7 +27,7 @@ module Account::Billing
   end
 
   def uncomp
-    billing_waiver&.destroy
+    billing_waiver&.destroy!
     reload_billing_waiver
   end
 
diff --git a/saas/app/models/account/limited.rb b/saas/app/models/account/limited.rb
index 8e846a117..2918e90a3 100644
--- a/saas/app/models/account/limited.rb
+++ b/saas/app/models/account/limited.rb
@@ -21,11 +21,11 @@ module Account::Limited
   end
 
   def nearing_plan_cards_limit?
-    plan.limit_cards? && remaining_cards_count < NEAR_CARD_LIMIT_THRESHOLD
+    plan.limit_cards? && remaining_cards_count <= NEAR_CARD_LIMIT_THRESHOLD
   end
 
   def exceeding_card_limit?
-    plan.limit_cards? && billed_cards_count > plan.card_limit
+    plan.limit_cards? && billed_cards_count >= plan.card_limit
   end
 
   def nearing_plan_storage_limit?
diff --git a/saas/app/models/application_push_device.rb b/saas/app/models/application_push_device.rb
new file mode 100644
index 000000000..7d9aad4e7
--- /dev/null
+++ b/saas/app/models/application_push_device.rb
@@ -0,0 +1,9 @@
+class ApplicationPushDevice < ActionPushNative::Device
+  belongs_to :session, optional: true
+
+  def self.register(session:, token:, platform:, name: nil)
+    session.identity.devices.find_or_initialize_by(token: token).tap do |device|
+      device.update!(session: session, platform: platform.downcase, name: name)
+    end
+  end
+end
diff --git a/saas/app/models/application_push_notification.rb b/saas/app/models/application_push_notification.rb
new file mode 100644
index 000000000..a0b5e3ee5
--- /dev/null
+++ b/saas/app/models/application_push_notification.rb
@@ -0,0 +1,4 @@
+class ApplicationPushNotification < ActionPushNative::Notification
+  queue_as :default
+  self.enabled = Fizzy.saas? && (!Rails.env.local? || ENV["ENABLE_NATIVE_PUSH"] == "true")
+end
diff --git a/saas/app/models/identity/devices.rb b/saas/app/models/identity/devices.rb
new file mode 100644
index 000000000..ce7eec457
--- /dev/null
+++ b/saas/app/models/identity/devices.rb
@@ -0,0 +1,7 @@
+module Identity::Devices
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :devices, class_name: "ApplicationPushDevice", as: :owner, dependent: :destroy
+  end
+end
diff --git a/saas/app/models/notification/push_target/native.rb b/saas/app/models/notification/push_target/native.rb
new file mode 100644
index 000000000..5366ed032
--- /dev/null
+++ b/saas/app/models/notification/push_target/native.rb
@@ -0,0 +1,59 @@
+class Notification::PushTarget::Native < Notification::PushTarget
+  def process
+    if devices.any?
+      native_notification.deliver_later_to(devices)
+    end
+  end
+
+  private
+    def devices
+      @devices ||= notification.identity.devices
+    end
+
+    def payload
+      @payload ||= notification.payload
+    end
+
+    def native_notification
+      ApplicationPushNotification
+        .with_apple(
+          aps: {
+            category: payload.category,
+            "mutable-content": 1,
+            "interruption-level": interruption_level
+          }
+        )
+        .with_google(
+          android: { notification: nil }
+        )
+        .with_data(
+          title: payload.title,
+          body: payload.body,
+          url: payload.url,
+          base_url: payload.base_url,
+          account_id: notification.account.id,
+          account_slug: notification.account.slug,
+          avatar_url: payload.avatar_url,
+          card_id: card&.id,
+          card_title: card&.title,
+          creator_id: notification.creator.id,
+          creator_name: notification.creator.name,
+          creator_familiar_name: notification.creator.familiar_name,
+          creator_initials: notification.creator.initials,
+          creator_avatar_color: notification.creator.avatar_background_color,
+          category: payload.category
+        )
+        .new(
+          title: payload.title,
+          body: payload.body,
+          badge: notification.user.notifications.unread.count,
+          sound: "default",
+          thread_id: card&.id,
+          high_priority: payload.high_priority?
+        )
+    end
+
+    def interruption_level
+      payload.high_priority? ? "time-sensitive" : "active"
+    end
+end
diff --git a/saas/app/models/session/devices.rb b/saas/app/models/session/devices.rb
new file mode 100644
index 000000000..c159ada72
--- /dev/null
+++ b/saas/app/models/session/devices.rb
@@ -0,0 +1,7 @@
+module Session::Devices
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :devices, class_name: "ApplicationPushDevice", dependent: :destroy
+  end
+end
diff --git a/saas/app/views/account/settings/_subscription_panel.html.erb b/saas/app/views/account/settings/_subscription_panel.html.erb
index 5a5f0eace..1cfcda4d8 100644
--- a/saas/app/views/account/settings/_subscription_panel.html.erb
+++ b/saas/app/views/account/settings/_subscription_panel.html.erb
@@ -1,5 +1,5 @@
 <% if Current.user.admin? && !Current.account.comped? %>
-  <section class="panel panel--wide settings-subscription__panel shadow center margin-block-double">
+  <section class="panel panel--wide settings-subscription__panel shadow center margin-block-double hide-on-native">
     <h2 id="subscription" class="divider settings-subscription__divider txt-small txt-uppercase margin-none">Subscription</h2>
 
     <% if Current.account.plan.free? %>
diff --git a/saas/app/views/my/devices/index.html.erb b/saas/app/views/my/devices/index.html.erb
new file mode 100644
index 000000000..59956020e
--- /dev/null
+++ b/saas/app/views/my/devices/index.html.erb
@@ -0,0 +1,35 @@
+<% @page_title = "Registered devices" %>
+
+<section class="panel panel--centered flex flex-column gap" style="--panel-size: auto;">
+  <% if @devices.any? %>
+    <h1 class="txt-x-large font-weight-black txt-tight-lines margin-none">
+      Registered devices
+    </h1>
+    <ul class="flex flex-column gap list-style-none full-width pad border-radius border" style="--inline-space: var(--block-space);">
+      <% @devices.each do |device| %>
+        <li class="flex align-center gap txt-medium txt-align-start">
+          <div class="flex-1 flex flex-column">
+            <span>
+              <strong><%= device.name || "Unnamed device" %></strong>
+              (<%= device.platform == "apple" ? "iOS" : "Android" %>)
+            </span>
+            <span class="txt-subtle txt-x-small">
+              Added <%= local_datetime_tag(device.created_at, style: :daysago) %>
+            </span>
+          </div>
+          <%= button_to saas.my_device_path(device), method: :delete, class: "btn btn--circle-mobile txt-small", data: { confirm: "Remove this device?" }, form: { class: "flex-item-no-shrink" } do %>
+            <%= icon_tag "trash", class: "icon--mobile-only" %>
+            <span class="overflow-ellipsis">Remove</span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  <% else %>
+    <h1 class="txt-x-large font-weight-black margin-none">No devices registered</h1>
+    <p class="margin-none-block-start">Mobile devices registered with the mobile app will receive push notifications and will be listed here.</p>
+  <% end %>
+
+  <%= link_to session_menu_path(script_name: nil), class: "btn center txt-small margin-block-start hide-on-native", data: { turbo_prefetch: false } do %>
+    <span>Your Fizzy accounts</span>
+  <% end %>
+</section>
diff --git a/saas/app/views/notifications/settings/_native_devices.html.erb b/saas/app/views/notifications/settings/_native_devices.html.erb
new file mode 100644
index 000000000..f136c9e95
--- /dev/null
+++ b/saas/app/views/notifications/settings/_native_devices.html.erb
@@ -0,0 +1,14 @@
+<div class="native-devices margin-block-start">
+  <h3 class="txt-small txt-uppercase divider">Mobile Devices</h3>
+
+  <% if Current.identity.devices.any? %>
+    <p class="txt-small">
+      You have <%= pluralize(Current.identity.devices.count, "mobile device") %> registered for push notifications.
+    </p>
+    <%= link_to "Manage devices", saas.my_devices_path, class: "btn txt-small" %>
+  <% else %>
+    <p class="txt-small color-secondary">
+      No mobile devices registered. Install the iOS or Android app to receive push notifications on your phone.
+    </p>
+  <% end %>
+</div>
diff --git a/saas/bin/rails b/saas/bin/rails
deleted file mode 100755
index 42a0e5bce..000000000
--- a/saas/bin/rails
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path("..", __dir__)
-ENGINE_PATH = File.expand_path("../lib/fizzy/saas/engine", __dir__)
-APP_PATH = File.expand_path("../test/dummy/config/application", __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-
-require "rails/all"
-require "rails/engine/commands"
diff --git a/saas/bin/rubocop b/saas/bin/rubocop
deleted file mode 100755
index 40330c0ff..000000000
--- a/saas/bin/rubocop
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require "rubygems"
-require "bundler/setup"
-
-# explicit rubocop config increases performance slightly while avoiding config confusion.
-ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
-
-load Gem.bin_path("rubocop", "rubocop")
diff --git a/saas/config/deploy.beta.yml b/saas/config/deploy.beta.yml
index d5fce9d32..ddb67e16c 100644
--- a/saas/config/deploy.beta.yml
+++ b/saas/config/deploy.beta.yml
@@ -106,6 +106,9 @@ env:
     - STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID
     - STRIPE_SECRET_KEY
     - STRIPE_WEBHOOK_SECRET
+    - APNS_KEY_ID
+    - APNS_ENCRYPTION_KEY_B64
+    - FCM_ENCRYPTION_KEY_B64
   tags:
     df_iad:
       PRIMARY_DATACENTER: true
diff --git a/saas/config/deploy.production.yml b/saas/config/deploy.production.yml
index eadb66e7f..7865b95a6 100644
--- a/saas/config/deploy.production.yml
+++ b/saas/config/deploy.production.yml
@@ -55,6 +55,9 @@ env:
     - STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID
     - STRIPE_SECRET_KEY
     - STRIPE_WEBHOOK_SECRET
+    - APNS_KEY_ID
+    - APNS_ENCRYPTION_KEY_B64
+    - FCM_ENCRYPTION_KEY_B64
   tags:
     sc_chi:
       MYSQL_SOLID_CACHE_HOST: fizzy-solidcache-db-01.sc-chi-int.37signals.com
diff --git a/saas/config/push.yml b/saas/config/push.yml
new file mode 100644
index 000000000..4db9ae2c9
--- /dev/null
+++ b/saas/config/push.yml
@@ -0,0 +1,10 @@
+shared:
+  apple:
+    key_id: <%= ENV["APNS_KEY_ID"] %>
+    encryption_key: <%= Base64.decode64(ENV["APNS_ENCRYPTION_KEY_B64"] || "").dump %>
+    team_id: <%= ENV["APNS_TEAM_ID"] || "2WNYUYRS7G" %>
+    topic: <%= ENV["APNS_TOPIC"] || "do.fizzy.app.ios" %>
+    connect_to_development_server: <%= Rails.env.local? %>
+  google:
+    encryption_key: <%= Base64.decode64(ENV["FCM_ENCRYPTION_KEY_B64"] || "").dump %>
+    project_id: fizzy-a148c
diff --git a/saas/config/routes.rb b/saas/config/routes.rb
index ece9fef17..f53928043 100644
--- a/saas/config/routes.rb
+++ b/saas/config/routes.rb
@@ -1,6 +1,15 @@
 Fizzy::Saas::Engine.routes.draw do
   Queenbee.routes(self)
 
+  namespace :my do
+    resources :devices, only: [ :index, :create, :destroy ]
+  end
+
+  # Legacy /devices routes for mobile apps not yet updated to /my/devices
+  get "/devices", to: redirect("/my/devices")
+  post "/devices", to: "my/devices#create"
+  delete "/devices/:id", to: "my/devices#destroy"
+
   namespace :admin do
     mount Audits1984::Engine, at: "/console"
     get "stats", to: "stats#show"
diff --git a/saas/db/migrate/20260114203313_create_action_push_native_devices.rb b/saas/db/migrate/20260114203313_create_action_push_native_devices.rb
new file mode 100644
index 000000000..c696a35bc
--- /dev/null
+++ b/saas/db/migrate/20260114203313_create_action_push_native_devices.rb
@@ -0,0 +1,15 @@
+class CreateActionPushNativeDevices < ActiveRecord::Migration[8.0]
+  def change
+    create_table :action_push_native_devices do |t|
+      t.string :name
+      t.string :platform, null: false
+      t.string :token, null: false
+      t.belongs_to :owner, polymorphic: true, type: :uuid, index: false
+      t.belongs_to :session, type: :uuid
+
+      t.timestamps
+    end
+
+    add_index :action_push_native_devices, [ :owner_type, :owner_id, :token ], unique: true
+  end
+end
diff --git a/saas/db/saas_schema.rb b/saas/db/saas_schema.rb
index 980e952ac..298cc033a 100644
--- a/saas/db/saas_schema.rb
+++ b/saas/db/saas_schema.rb
@@ -43,6 +43,19 @@ ActiveRecord::Schema[8.2].define(version: 2026_01_26_230838) do
     t.index ["stripe_subscription_id"], name: "index_account_subscriptions_on_stripe_subscription_id", unique: true
   end
 
+  create_table "action_push_native_devices", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.string "name"
+    t.uuid "owner_id"
+    t.string "owner_type"
+    t.string "platform", null: false
+    t.uuid "session_id"
+    t.string "token", null: false
+    t.datetime "updated_at", null: false
+    t.index ["owner_type", "owner_id", "token"], name: "idx_on_owner_type_owner_id_token_95a4008c64", unique: true
+    t.index ["session_id"], name: "index_action_push_native_devices_on_session_id"
+  end
+
   create_table "audits1984_auditor_tokens", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.uuid "auditor_id", null: false
     t.datetime "created_at", null: false
diff --git a/saas/exe/push-dev b/saas/exe/push-dev
new file mode 100755
index 000000000..cac878fae
--- /dev/null
+++ b/saas/exe/push-dev
@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+#
+# Fetches push notification credentials from 1Password for development.
+# Uses the same 1Password items as production (Deploy/Fizzy Production).
+#
+# Usage: eval "$(bundle exec push-dev)"
+
+OP_ACCOUNT = "23QPQDKZC5BKBIIG7UGT5GR5RM"
+OP_VAULT = "Deploy"
+OP_ITEM = "Fizzy"
+
+def op_read(field)
+  `op read "op://#{OP_VAULT}/#{OP_ITEM}/Production/#{field}" --account #{OP_ACCOUNT} 2>/dev/null`.strip
+end
+
+apns_key_id = op_read("APNS_KEY_ID")
+apns_encryption_key_b64 = op_read("APNS_ENCRYPTION_KEY_B64")
+fcm_encryption_key_b64 = op_read("FCM_ENCRYPTION_KEY_B64")
+
+if apns_key_id.empty? || apns_encryption_key_b64.empty?
+  warn "Error: Could not fetch APNs credentials from 1Password"
+  warn "Make sure you're signed in: op signin --account #{OP_ACCOUNT}"
+  exit 1
+end
+
+if fcm_encryption_key_b64.empty?
+  warn "Warning: Could not fetch FCM credentials from 1Password"
+  warn "Android push notifications will not work"
+end
+
+puts %Q(export APNS_KEY_ID="#{apns_key_id}")
+puts %Q(export APNS_TEAM_ID="#{apns_team_id}")
+puts %Q(export APNS_ENCRYPTION_KEY_B64="#{apns_encryption_key_b64}")
+puts %Q(export FCM_ENCRYPTION_KEY_B64="#{fcm_encryption_key_b64}")
+puts %Q(export ENABLE_NATIVE_PUSH="true")
+
+warn ""
+warn "Push notification credentials loaded for development"
+warn "  APNs Key ID: #{apns_key_id}"
+warn "  APNs: #{apns_encryption_key_b64.empty? ? "not configured" : "configured"}"
+warn "  FCM: #{fcm_encryption_key_b64.empty? ? "not configured" : "configured"}"
+warn "  Native push: enabled"
diff --git a/saas/fizzy-saas.gemspec b/saas/fizzy-saas.gemspec
index 1368ef63c..7cc1f90a8 100644
--- a/saas/fizzy-saas.gemspec
+++ b/saas/fizzy-saas.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.bindir = "exe"
-  spec.executables = [ "stripe-dev" ]
+  spec.executables = [ "push-dev", "stripe-dev" ]
 
   spec.add_dependency "rails", ">= 8.1.0.beta1"
   spec.add_dependency "queenbee"
diff --git a/saas/lib/fizzy/saas/engine.rb b/saas/lib/fizzy/saas/engine.rb
index 3d20f9df8..b90113544 100644
--- a/saas/lib/fizzy/saas/engine.rb
+++ b/saas/lib/fizzy/saas/engine.rb
@@ -10,6 +10,11 @@ module Fizzy
       # moved from config/initializers/queenbee.rb
       Queenbee.host_app = Fizzy
 
+      # Configure ActionPushNative to use the saas database
+      ActiveSupport.on_load(:action_push_native_record) do
+        connects_to database: { writing: :saas, reading: :saas }
+      end
+
       initializer "fizzy_saas.content_security_policy", before: :load_config_initializers do |app|
         app.config.x.content_security_policy.form_action = "https://checkout.stripe.com https://billing.stripe.com"
       end
@@ -23,6 +28,10 @@ module Fizzy
           headers: app.config.public_file_server.headers
       end
 
+      initializer "fizzy_saas.push_config", after: "action_push_native.config" do |app|
+        app.paths["config/push"].unshift(root.join("config/push.yml").to_s)
+      end
+
       initializer "fizzy.saas.routes", after: :add_routing_paths do |app|
         # Routes that rely on the implicit account tenant should go here instead of in +routes.rb+.
         app.routes.prepend do
@@ -148,10 +157,15 @@ module Fizzy
       config.to_prepare do
         ::Account.include Account::Billing, Account::Limited
         ::User.include User::NotifiesAccountOfEmailChange
-        ::Signup.prepend Fizzy::Saas::Signup
+        ::Identity.include Authorization::Identity, Identity::Devices
+        ::Session.include Session::Devices
+        ::Signup.prepend Signup
+        ApplicationController.include Authorization::Controller
         CardsController.include(Card::LimitedCreation)
         Cards::PublishesController.include(Card::LimitedPublishing)
 
+        Notification.register_push_target(:native)
+
         Queenbee::Subscription.short_names = Subscription::SHORT_NAMES
 
         # Default to local dev QB token if not set
@@ -162,9 +176,6 @@ module Fizzy
           ::Object.send(:remove_const, const_name) if ::Object.const_defined?(const_name)
           ::Object.const_set const_name, Subscription.const_get(short_name, false)
         end
-
-        ::ApplicationController.include Fizzy::Saas::Authorization::Controller
-        ::Identity.include Fizzy::Saas::Authorization::Identity
       end
     end
   end
diff --git a/saas/test/controllers/my/devices_controller_test.rb b/saas/test/controllers/my/devices_controller_test.rb
new file mode 100644
index 000000000..5ba2172f1
--- /dev/null
+++ b/saas/test/controllers/my/devices_controller_test.rb
@@ -0,0 +1,257 @@
+require "test_helper"
+
+class My::DevicesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @identity = identities(:david)
+    sign_in_as :david
+  end
+
+  test "index shows identity's devices" do
+    @identity.devices.create!(token: "test_token_123", platform: "apple", name: "iPhone 15 Pro")
+
+    untenanted { get saas.my_devices_path }
+
+    assert_response :success
+    assert_select "strong", "iPhone 15 Pro"
+    assert_select "li", /iOS/
+  end
+
+  test "index shows empty state when no devices" do
+    @identity.devices.delete_all
+
+    untenanted { get saas.my_devices_path }
+
+    assert_response :success
+    assert_select "h1", /No devices registered/
+  end
+
+  test "show notification settings with registered devices" do
+    @identity.devices.create!(token: "test_token", platform: "apple", name: "iPhone 15 Pro")
+
+    get notifications_settings_path
+
+    assert_response :success
+  end
+
+  test "index requires authentication" do
+    sign_out
+
+    untenanted { get saas.my_devices_path }
+
+    assert_response :redirect
+  end
+
+  test "creates a new device via api" do
+    token = SecureRandom.hex(32)
+
+    assert_difference -> { ApplicationPushDevice.count }, 1 do
+      untenanted do
+        post saas.my_devices_path, params: {
+          token: token,
+          platform: "apple",
+          name: "iPhone 15 Pro"
+        }, as: :json
+      end
+    end
+
+    assert_response :created
+
+    device = ApplicationPushDevice.last
+    assert_equal token, device.token
+    assert_equal "apple", device.platform
+    assert_equal "iPhone 15 Pro", device.name
+    assert_equal @identity, device.owner
+  end
+
+  test "creates android device" do
+    untenanted do
+      post saas.my_devices_path, params: {
+        token: SecureRandom.hex(32),
+        platform: "google",
+        name: "Pixel 8"
+      }, as: :json
+    end
+
+    assert_response :created
+
+    device = ApplicationPushDevice.last
+    assert_equal "google", device.platform
+  end
+
+  test "same token can be registered by multiple identities" do
+    shared_token = "shared_push_token_123"
+    other_identity = identities(:kevin)
+
+    # Other identity registers the token first
+    other_device = other_identity.devices.create!(
+      token: shared_token,
+      platform: "apple",
+      name: "Kevin's iPhone"
+    )
+
+    # Current identity registers the same token with their own device
+    assert_difference -> { ApplicationPushDevice.count }, 1 do
+      untenanted do
+        post saas.my_devices_path, params: {
+          token: shared_token,
+          platform: "apple",
+          name: "David's iPhone"
+        }, as: :json
+      end
+    end
+
+    assert_response :created
+
+    # Both identities have their own device records
+    assert_equal shared_token, other_device.reload.token
+    assert_equal other_identity, other_device.owner
+
+    davids_device = @identity.devices.last
+    assert_equal shared_token, davids_device.token
+    assert_equal @identity, davids_device.owner
+  end
+
+  test "rejects invalid platform" do
+    untenanted do
+      post saas.my_devices_path, params: {
+        token: SecureRandom.hex(32),
+        platform: "windows",
+        name: "Surface"
+      }, as: :json
+    end
+
+    assert_response :unprocessable_entity
+  end
+
+  test "rejects missing token" do
+    untenanted do
+      post saas.my_devices_path, params: {
+        platform: "apple",
+        name: "iPhone"
+      }, as: :json
+    end
+
+    assert_response :bad_request
+  end
+
+  test "create requires authentication" do
+    sign_out
+
+    untenanted do
+      post saas.my_devices_path, params: {
+        token: SecureRandom.hex(32),
+        platform: "apple"
+      }, as: :json
+    end
+
+    assert_response :redirect
+  end
+
+  test "destroys device by id" do
+    device = @identity.devices.create!(
+      token: "token_to_delete",
+      platform: "apple",
+      name: "iPhone"
+    )
+
+    assert_difference -> { ApplicationPushDevice.count }, -1 do
+      untenanted { delete saas.my_device_path(device) }
+    end
+
+    assert_redirected_to saas.my_devices_path(script_name: nil)
+    assert_not ApplicationPushDevice.exists?(device.id)
+  end
+
+  test "returns not found when device not found by id" do
+    assert_no_difference "ApplicationPushDevice.count" do
+      untenanted { delete saas.my_device_path(id: "nonexistent") }
+    end
+
+    assert_response :not_found
+  end
+
+  test "returns not found for another identity's device by id" do
+    other_identity = identities(:kevin)
+    device = other_identity.devices.create!(
+      token: "other_identity_token",
+      platform: "apple",
+      name: "Other iPhone"
+    )
+
+    assert_no_difference "ApplicationPushDevice.count" do
+      untenanted { delete saas.my_device_path(device) }
+    end
+
+    assert_response :not_found
+    assert ApplicationPushDevice.exists?(device.id)
+  end
+
+  test "destroy by id requires authentication" do
+    device = @identity.devices.create!(
+      token: "my_token",
+      platform: "apple",
+      name: "iPhone"
+    )
+
+    sign_out
+
+    untenanted { delete saas.my_device_path(device) }
+
+    assert_response :redirect
+    assert ApplicationPushDevice.exists?(device.id)
+  end
+
+  test "destroys device by token" do
+    device = @identity.devices.create!(
+      token: "token_to_unregister",
+      platform: "apple",
+      name: "iPhone"
+    )
+
+    assert_difference -> { ApplicationPushDevice.count }, -1 do
+      untenanted { delete saas.my_device_path("token_to_unregister"), as: :json }
+    end
+
+    assert_response :no_content
+    assert_not ApplicationPushDevice.exists?(device.id)
+  end
+
+  test "returns not found when device not found by token" do
+    assert_no_difference "ApplicationPushDevice.count" do
+      untenanted { delete saas.my_device_path("nonexistent_token"), as: :json }
+    end
+
+    assert_response :not_found
+  end
+
+  test "returns not found for another identity's device by token" do
+    other_identity = identities(:kevin)
+    device = other_identity.devices.create!(
+      token: "other_identity_token",
+      platform: "apple",
+      name: "Other iPhone"
+    )
+
+    assert_no_difference "ApplicationPushDevice.count" do
+      untenanted { delete saas.my_device_path("other_identity_token"), as: :json }
+    end
+
+    assert_response :not_found
+    assert ApplicationPushDevice.exists?(device.id)
+  end
+
+  test "destroy by token requires authentication" do
+    device = @identity.devices.create!(
+      token: "my_token",
+      platform: "apple",
+      name: "iPhone"
+    )
+
+    sign_out
+
+    untenanted { delete saas.my_device_path("my_token"), as: :json }
+
+    assert_response :redirect
+    assert ApplicationPushDevice.exists?(device.id)
+  end
+end
diff --git a/saas/test/fixtures/application_push_devices.yml b/saas/test/fixtures/application_push_devices.yml
new file mode 100644
index 000000000..7601d5284
--- /dev/null
+++ b/saas/test/fixtures/application_push_devices.yml
@@ -0,0 +1,17 @@
+davids_iphone:
+  name: iPhone 15 Pro
+  token: abc123def456abc123def456abc123def456abc123def456abc123def456abcd
+  platform: apple
+  owner: david (User)
+
+davids_pixel:
+  name: Pixel 8
+  token: def456abc123def456abc123def456abc123def456abc123def456abc123defg
+  platform: google
+  owner: david (User)
+
+kevins_iphone:
+  name: iPhone 14
+  token: 789xyz789xyz789xyz789xyz789xyz789xyz789xyz789xyz789xyz789xyz7890
+  platform: apple
+  owner: kevin (User)
diff --git a/saas/test/models/account/limited_test.rb b/saas/test/models/account/limited_test.rb
index 828386023..fff154451 100644
--- a/saas/test/models/account/limited_test.rb
+++ b/saas/test/models/account/limited_test.rb
@@ -10,10 +10,11 @@ class Account::LimitedTest < ActiveSupport::TestCase
     accounts(:initech).update_column(:cards_count, 899)
     assert_not accounts(:initech).nearing_plan_cards_limit?
 
-    # Free plan near limit
+    # Free plan at exactly the threshold (remaining = 100)
     accounts(:initech).update_column(:cards_count, 900)
-    assert_not accounts(:initech).nearing_plan_cards_limit?
+    assert accounts(:initech).nearing_plan_cards_limit?
 
+    # Free plan over the threshold
     accounts(:initech).update_column(:cards_count, 901)
     assert accounts(:initech).nearing_plan_cards_limit?
   end
@@ -27,6 +28,10 @@ class Account::LimitedTest < ActiveSupport::TestCase
     accounts(:initech).update_column(:cards_count, 999)
     assert_not accounts(:initech).exceeding_card_limit?
 
+    # Free plan at exactly the limit
+    accounts(:initech).update_column(:cards_count, 1000)
+    assert accounts(:initech).exceeding_card_limit?
+
     # Free plan over limit
     accounts(:initech).update_column(:cards_count, 1001)
     assert accounts(:initech).exceeding_card_limit?
diff --git a/saas/test/models/notification/push_target/native_test.rb b/saas/test/models/notification/push_target/native_test.rb
new file mode 100644
index 000000000..c6e1c9d4f
--- /dev/null
+++ b/saas/test/models/notification/push_target/native_test.rb
@@ -0,0 +1,222 @@
+require "test_helper"
+
+class Notification::PushTarget::NativeTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:kevin)
+    @identity = @user.identity
+    @notification = notifications(:logo_assignment_kevin)
+
+    # Ensure user has no web push subscriptions (we want to test native push independently)
+    @user.push_subscriptions.delete_all
+  end
+
+  test "payload category returns assignment for card_assigned" do
+    notification = notifications(:logo_assignment_kevin)
+
+    assert_equal "assignment", notification.payload.category
+  end
+
+  test "payload category returns comment for comment_created" do
+    notification = notifications(:layout_commented_kevin)
+
+    assert_equal "comment", notification.payload.category
+  end
+
+  test "payload category returns mention for mentions" do
+    notification = notifications(:logo_mentioned_david)
+
+    assert_equal "mention", notification.payload.category
+  end
+
+  test "payload category returns card for other card events" do
+    @notification.update!(source: events(:logo_published))
+
+    assert_equal "card", @notification.payload.category
+  end
+
+
+  test "pushes to native devices when user has devices" do
+    stub_push_services
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    assert_native_push_delivery(count: 1) do
+      Notification::PushTarget::Native.new(@notification).process
+    end
+  end
+
+  test "does not push when user has no devices" do
+    @identity.devices.delete_all
+
+    assert_no_native_push_delivery do
+      Notification::PushTarget::Native.new(@notification).process
+    end
+  end
+
+  test "pushes to multiple devices" do
+    stub_push_services
+    @identity.devices.delete_all
+    @identity.devices.create!(token: "token1", platform: "apple", name: "iPhone")
+    @identity.devices.create!(token: "token2", platform: "google", name: "Pixel")
+
+    assert_native_push_delivery(count: 2) do
+      Notification::PushTarget::Native.new(@notification).process
+    end
+  end
+
+  test "native notification includes required fields" do
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_not_nil native.title
+    assert_not_nil native.body
+    assert_equal "default", native.sound
+  end
+
+  test "native notification sets thread_id from card" do
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_equal @notification.card.id, native.thread_id
+  end
+
+  test "native notification sets high_priority for assignments" do
+    notification = notifications(:logo_assignment_kevin)
+    notification.user.identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(notification)
+    native = push.send(:native_notification)
+
+    assert native.high_priority
+  end
+
+  test "native notification sets high_priority for mentions" do
+    notification = notifications(:logo_mentioned_david)
+    notification.user.identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(notification)
+    native = push.send(:native_notification)
+
+    assert native.high_priority
+  end
+
+  test "native notification sets normal priority for comments" do
+    notification = notifications(:layout_commented_kevin)
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(notification)
+    native = push.send(:native_notification)
+
+    assert_not native.high_priority
+  end
+
+  test "native notification sets normal priority for other card events" do
+    @notification.update!(source: events(:logo_published))
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_not native.high_priority
+  end
+
+  test "native notification includes apple-specific fields" do
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_equal 1, native.apple_data.dig(:aps, :"mutable-content")
+    assert_not_nil native.apple_data.dig(:aps, :category)
+  end
+
+  test "native notification sets time-sensitive interruption level for assignments" do
+    notification = notifications(:logo_assignment_kevin)
+    notification.user.identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(notification)
+    native = push.send(:native_notification)
+
+    assert_equal "time-sensitive", native.apple_data.dig(:aps, :"interruption-level")
+  end
+
+  test "native notification sets time-sensitive interruption level for mentions" do
+    notification = notifications(:logo_mentioned_david)
+    notification.user.identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(notification)
+    native = push.send(:native_notification)
+
+    assert_equal "time-sensitive", native.apple_data.dig(:aps, :"interruption-level")
+  end
+
+  test "native notification sets active interruption level for comments" do
+    notification = notifications(:layout_commented_kevin)
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(notification)
+    native = push.send(:native_notification)
+
+    assert_equal "active", native.apple_data.dig(:aps, :"interruption-level")
+  end
+
+  test "native notification sets active interruption level for other card events" do
+    @notification.update!(source: events(:logo_published))
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_equal "active", native.apple_data.dig(:aps, :"interruption-level")
+  end
+
+  test "native notification sets android notification to nil for data-only" do
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_nil native.google_data.dig(:android, :notification)
+  end
+
+  test "native notification includes data payload" do
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_not_nil native.data[:url]
+    assert_equal @notification.account.id, native.data[:account_id]
+    assert_equal @notification.account.slug, native.data[:account_slug]
+    assert_equal @notification.creator.name, native.data[:creator_name]
+  end
+
+  test "native notification includes base_url without account slug" do
+    @identity.devices.create!(token: "test123", platform: "apple", name: "Test iPhone")
+
+    push = Notification::PushTarget::Native.new(@notification)
+    native = push.send(:native_notification)
+
+    assert_equal "http://example.com", native.data[:base_url]
+  end
+
+  private
+    def assert_native_push_delivery(count: 1, &block)
+      assert_enqueued_jobs count, only: ApplicationPushNotificationJob do
+        perform_enqueued_jobs only: Notification::PushJob, &block
+      end
+    end
+
+    def assert_no_native_push_delivery(&block)
+      assert_enqueued_jobs 0, only: ApplicationPushNotificationJob do
+        perform_enqueued_jobs only: Notification::PushJob, &block
+      end
+    end
+
+    def stub_push_services
+      ActionPushNative.stubs(:service_for).returns(stub(push: true))
+    end
+end
diff --git a/saas/test/models/session/devices_test.rb b/saas/test/models/session/devices_test.rb
new file mode 100644
index 000000000..00874895d
--- /dev/null
+++ b/saas/test/models/session/devices_test.rb
@@ -0,0 +1,40 @@
+require "test_helper"
+
+class Session::DevicesTest < ActiveSupport::TestCase
+  setup do
+    @session = sessions(:david)
+    @identity = @session.identity
+  end
+
+  test "destroying session destroys associated devices" do
+    device = ApplicationPushDevice.register(
+      session: @session,
+      token: "test_token",
+      platform: "apple",
+      name: "Test iPhone"
+    )
+
+    assert_difference -> { ApplicationPushDevice.count }, -1 do
+      @session.destroy
+    end
+
+    assert_nil ApplicationPushDevice.find_by(id: device.id)
+  end
+
+  test "destroying session does not destroy devices from other sessions" do
+    other_session = sessions(:kevin)
+
+    device = ApplicationPushDevice.register(
+      session: other_session,
+      token: "other_token",
+      platform: "apple",
+      name: "Other iPhone"
+    )
+
+    assert_no_difference -> { ApplicationPushDevice.count } do
+      @session.destroy
+    end
+
+    assert ApplicationPushDevice.exists?(device.id)
+  end
+end
diff --git a/test/controllers/boards_controller_test.rb b/test/controllers/boards_controller_test.rb
index 094cca56b..6c171b6b2 100644
--- a/test/controllers/boards_controller_test.rb
+++ b/test/controllers/boards_controller_test.rb
@@ -207,6 +207,43 @@ class BoardsControllerTest < ActionDispatch::IntegrationTest
     assert_equal users(:kevin).boards.count, @response.parsed_body.count
   end
 
+  test "index as JSON paginates and preserves recently-accessed order" do
+    account = accounts("37s")
+    kevin = users(:kevin)
+    baseline_accessed_at = 3.days.ago.change(usec: 0)
+
+    kevin.accesses.order(:id).each_with_index do |access, index|
+      access.update!(accessed_at: baseline_accessed_at + index.seconds)
+    end
+
+    200.times do |index|
+      board = Board.create!(
+        name: "Recent board #{index}",
+        creator: kevin,
+        account: account,
+        all_access: false
+      )
+      board.access_for(kevin).update!(accessed_at: baseline_accessed_at + (index + 1).minutes)
+    end
+
+    expected_ids = kevin.boards.ordered_by_recently_accessed.pluck(:id)
+    actual_ids = []
+    next_page = boards_path(format: :json)
+    page_count = 0
+
+    while next_page
+      get next_page, as: :json
+      assert_response :success
+
+      page_count += 1
+      actual_ids.concat(@response.parsed_body.map { |board| board["id"] })
+      next_page = next_page_from_link_header(@response.headers["Link"])
+    end
+
+    assert_equal expected_ids, actual_ids
+    assert_operator page_count, :>, 1
+  end
+
   test "show as JSON" do
     get board_path(boards(:writebook)), as: :json
     assert_response :success
@@ -240,4 +277,24 @@ class BoardsControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :no_content
   end
+
+  test "index avoids N+1 queries on creator and identity" do
+    assert_queries_match(/FROM [`"]users[`"].* IN \(/, count: 1) do
+      assert_queries_match(/FROM [`"]identities[`"].* IN \(/, count: 1) do
+        get boards_path, as: :json
+        assert_response :success
+      end
+    end
+
+    json = @response.parsed_body
+    first_board = json.first
+    assert first_board["creator"].present?
+    assert first_board["creator"]["email_address"].present?
+  end
+
+  private
+    def next_page_from_link_header(link_header)
+      url = link_header&.match(/<([^>]+)>;\s*rel="next"/)&.captures&.first
+      URI.parse(url).request_uri if url
+    end
 end
diff --git a/test/controllers/cards/comments_controller_test.rb b/test/controllers/cards/comments_controller_test.rb
index 26761d22e..a6e83cbef 100644
--- a/test/controllers/cards/comments_controller_test.rb
+++ b/test/controllers/cards/comments_controller_test.rb
@@ -78,9 +78,9 @@ class Cards::CommentsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_equal comment.id, @response.parsed_body["id"]
     assert_equal comment.card.id, @response.parsed_body.dig("card", "id")
-    assert_equal card_url(comment.card.id), @response.parsed_body.dig("card", "url")
-    assert_equal card_comment_reactions_url(comment.card_id, comment.id), @response.parsed_body["reactions_url"]
-    assert_equal card_comment_url(comment.card_id, comment.id), @response.parsed_body["url"]
+    assert_equal card_url(comment.card), @response.parsed_body.dig("card", "url")
+    assert_equal card_comment_reactions_url(comment.card, comment), @response.parsed_body["reactions_url"]
+    assert_equal card_comment_url(comment.card, comment), @response.parsed_body["url"]
   end
 
   test "update as JSON" do
diff --git a/test/controllers/cards_controller_test.rb b/test/controllers/cards_controller_test.rb
index 3a97f3166..42e24d927 100644
--- a/test/controllers/cards_controller_test.rb
+++ b/test/controllers/cards_controller_test.rb
@@ -176,6 +176,7 @@ class CardsControllerTest < ActionDispatch::IntegrationTest
 
     assert_equal card.title, @response.parsed_body["title"]
     assert_equal card.closed?, @response.parsed_body["closed"]
+    assert_equal card.postponed?, @response.parsed_body["postponed"]
     assert_equal 2, @response.parsed_body["steps"].size
     assert_equal card_comments_url(card), @response.parsed_body["comments_url"]
     assert_equal card_reactions_url(card), @response.parsed_body["reactions_url"]
diff --git a/test/controllers/client_configurations_controller_test.rb b/test/controllers/client_configurations_controller_test.rb
new file mode 100644
index 000000000..b2aa00e6d
--- /dev/null
+++ b/test/controllers/client_configurations_controller_test.rb
@@ -0,0 +1,47 @@
+require "test_helper"
+
+class ClientConfigurationsControllerTest < ActionDispatch::IntegrationTest
+  test "android" do
+    assert_ok "/client_configurations/android_v1.json"
+  end
+
+  test "ios" do
+    assert_ok "/client_configurations/ios_v1.json"
+  end
+
+  test "bad platform" do
+    assert_no_route "/client_configurations/blackberry_v1.json"
+  end
+
+  test "bad version" do
+    assert_no_route "/client_configurations/android_va.json"
+  end
+
+  test "nonexistent version" do
+    assert_missing "/client_configurations/android_v2000.json"
+    assert_missing "/client_configurations/ios_v2000.json"
+  end
+
+  private
+    def assert_ok(url, cache_control: { public: true, max_age: "60" })
+      get url
+      assert_response :ok
+
+      assert_kind_of Hash, response.parsed_body["settings"]
+      assert_kind_of Array, response.parsed_body["rules"]
+
+      assert_equal cache_control, response.cache_control
+    end
+
+    def assert_no_route(url)
+      without_action_dispatch_exception_handling do
+        assert_raises(ActionController::RoutingError) { get url }
+      end
+    end
+
+    def assert_missing(url)
+      without_action_dispatch_exception_handling do
+        assert_raises(ActionView::MissingTemplate) { get url }
+      end
+    end
+end
diff --git a/test/controllers/concerns/request_forgery_protection_test.rb b/test/controllers/concerns/request_forgery_protection_test.rb
index db1a84e63..9f50e353e 100644
--- a/test/controllers/concerns/request_forgery_protection_test.rb
+++ b/test/controllers/concerns/request_forgery_protection_test.rb
@@ -8,11 +8,13 @@ class RequestForgeryProtectionTest < ActionDispatch::IntegrationTest
     ActionController::Base.allow_forgery_protection = true
 
     @original_force_ssl = Rails.configuration.force_ssl
+    @original_secure_protocol = ActionDispatch::Http::URL.secure_protocol
   end
 
   teardown do
     ActionController::Base.allow_forgery_protection = @original_allow_forgery_protection
     Rails.configuration.force_ssl = @original_force_ssl
+    ActionDispatch::Http::URL.secure_protocol = @original_secure_protocol
   end
 
   test "JSON request succeeds with missing Sec-Fetch-Site header" do
@@ -38,6 +40,7 @@ class RequestForgeryProtectionTest < ActionDispatch::IntegrationTest
 
   test "HTTP request fails with missing Sec-Fetch-Site header when force_ssl is enabled" do
     Rails.configuration.force_ssl = true
+    ActionDispatch::Http::URL.secure_protocol = true
 
     assert_no_difference -> { Board.count } do
       post boards_path,
diff --git a/test/controllers/my/identities_controller_test.rb b/test/controllers/my/identities_controller_test.rb
index 29e17cb85..3771d5396 100644
--- a/test/controllers/my/identities_controller_test.rb
+++ b/test/controllers/my/identities_controller_test.rb
@@ -7,11 +7,35 @@ class My::IdentitiesControllerTest < ActionDispatch::IntegrationTest
 
   test "show as JSON" do
     identity = identities(:kevin)
+    expected_count = identity.users_with_active_accounts.count
 
     untenanted do
       get my_identity_path, as: :json
       assert_response :success
-      assert_equal identity.accounts.count, @response.parsed_body["accounts"].count
+      assert_equal identity.id, @response.parsed_body["id"]
+      assert_equal expected_count, @response.parsed_body["accounts"].count
+    end
+  end
+
+  test "show as JSON includes users from active accounts only" do
+    identity = identities(:kevin)
+
+    active_account = Account.create!(external_account_id: 9999981, name: "Active Account")
+    cancelled_account = Account.create!(external_account_id: 9999982, name: "Cancelled Account")
+
+    identity.users.create!(account: active_account, name: "Kevin", role: :owner)
+
+    cancelling_user = identity.users.create!(account: cancelled_account, name: "Kevin", role: :owner)
+    cancelled_account.cancel(initiated_by: cancelling_user)
+
+    untenanted do
+      get my_identity_path, as: :json
+      assert_response :success
+
+      account_ids = @response.parsed_body["accounts"].map { |account| account["id"] }
+
+      assert_includes account_ids, active_account.id
+      assert_not_includes account_ids, cancelled_account.id
     end
   end
 end
diff --git a/test/controllers/notifications/trays_controller_test.rb b/test/controllers/notifications/trays_controller_test.rb
index 07034fff0..b6efa200b 100644
--- a/test/controllers/notifications/trays_controller_test.rb
+++ b/test/controllers/notifications/trays_controller_test.rb
@@ -11,4 +11,24 @@ class Notifications::TraysControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_select "div", text: /Layout is broken/
   end
+
+  test "show as JSON" do
+    expected_ids = users(:kevin).notifications.unread.ordered.limit(100).pluck(:id)
+
+    get tray_notifications_path(format: :json)
+
+    assert_response :success
+    assert_equal expected_ids, @response.parsed_body.map { |s| s["id"] }
+  end
+
+  test "show as JSON with include_read includes read notifications" do
+    notifications = users(:kevin).notifications
+    expected_ids = notifications.unread.ordered.limit(100).pluck(:id) +
+      notifications.read.ordered.limit(100).pluck(:id)
+
+    get tray_notifications_path(format: :json, include_read: true)
+
+    assert_response :success
+    assert_equal expected_ids, @response.parsed_body.map { |s| s["id"] }
+  end
 end
diff --git a/test/controllers/notifications_controller_test.rb b/test/controllers/notifications_controller_test.rb
index 0d0565f24..29b454ebd 100644
--- a/test/controllers/notifications_controller_test.rb
+++ b/test/controllers/notifications_controller_test.rb
@@ -22,5 +22,13 @@ class NotificationsControllerTest < ActionDispatch::IntegrationTest
     assert_not_nil notification["card"]
     assert_not_nil notification["creator"]
     assert_not_nil notification["unread_count"]
+    assert_not_nil notification.dig("creator", "avatar_url")
+    assert_not_nil notification.dig("card", "number")
+    assert_not_nil notification.dig("card", "board_name")
+    assert_not_nil notification.dig("card", "column")
+
+    card = notifications(:logo_assignment_kevin).card
+    assert_equal card.closed?, notification.dig("card", "closed")
+    assert_equal card.postponed?, notification.dig("card", "postponed")
   end
 end
diff --git a/test/controllers/searches_controller_test.rb b/test/controllers/searches_controller_test.rb
index 2493fe43f..11bac3bc9 100644
--- a/test/controllers/searches_controller_test.rb
+++ b/test/controllers/searches_controller_test.rb
@@ -15,6 +15,10 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "search" do
+    # Search query is blank
+    get search_path(q: "", script_name: "/#{@account.external_account_id}")
+    assert @query.nil?
+
     # Searching by card title
     get search_path(q: "broken", script_name: "/#{@account.external_account_id}")
     assert_select "li .search__title", text: /Layout is broken/
diff --git a/test/controllers/signup/completions_controller_test.rb b/test/controllers/signup/completions_controller_test.rb
index fd90a6c1c..9fd3ba440 100644
--- a/test/controllers/signup/completions_controller_test.rb
+++ b/test/controllers/signup/completions_controller_test.rb
@@ -68,7 +68,6 @@ class Signup::CompletionsControllerTest < ActionDispatch::IntegrationTest
     end
 
     assert_response :created
-    assert_equal Account.last.id, @response.parsed_body["account_id"]
   end
 
   test "create via JSON with blank name" do
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index ab91a4ab6..094a2310c 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -144,4 +144,16 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :no_content
   end
+
+  test "index avoids N+1 queries on identity" do
+    sign_in_as :kevin
+
+    assert_queries_match(/FROM [`"]identities[`"].* IN \(/, count: 1) do
+      get users_path, as: :json
+      assert_response :success
+    end
+
+    json = @response.parsed_body
+    assert json.first["email_address"].present?
+  end
 end
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index b7ae167cd..8fa4404d5 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -5,6 +5,7 @@ logo_assignment_kevin:
   card: logo_uuid
   unread_count: 2
   created_at: <%= 1.week.ago %>
+  updated_at: <%= 1.week.ago + 1.second %>
   creator: david_uuid
   account: 37s_uuid
 
@@ -15,6 +16,7 @@ layout_commented_kevin:
   card: layout_uuid
   unread_count: 1
   created_at: <%= 1.week.ago %>
+  updated_at: <%= 1.week.ago + 2.seconds %>
   creator: david_uuid
   account: 37s_uuid
 
@@ -25,5 +27,6 @@ logo_mentioned_david:
   card: logo_uuid
   unread_count: 2
   created_at: <%= 1.week.ago %>
+  updated_at: <%= 1.week.ago + 3.seconds %>
   creator: david_uuid
   account: 37s_uuid
diff --git a/test/integration/notifications_test.rb b/test/integration/notifications_test.rb
new file mode 100644
index 000000000..f581fb5e9
--- /dev/null
+++ b/test/integration/notifications_test.rb
@@ -0,0 +1,172 @@
+require "test_helper"
+
+class NotificationDeliveryTest < ActiveSupport::TestCase
+  setup do
+    @assigner = users(:david)
+    @assignee = users(:kevin)
+    @card = cards(:logo)
+
+    @card.assignments.destroy_all
+    @assignee.notifications.destroy_all
+
+    stub_web_push_pool
+
+    @original_targets = Notification.push_targets.dup
+    Notification.push_targets = []
+    Notification.register_push_target(:web)
+    Notification.register_push_target(push_target_with_tracking)
+
+    # Give assignee a web push subscription
+    @assignee.push_subscriptions.create!(
+      endpoint: "https://fcm.googleapis.com/fcm/send/test123",
+      p256dh_key: "test_key",
+      auth_key: "test_auth"
+    )
+
+    Current.user = @assigner
+  end
+
+  teardown do
+    Notification.push_targets = @original_targets
+    @assignee.push_subscriptions.delete_all
+  end
+
+  test "card assignment creates notification and triggers push" do
+    assert_difference -> { Notification.count }, 1 do
+      perform_enqueued_jobs only: [ NotifyRecipientsJob, Notification::PushJob ] do
+        @card.toggle_assignment(@assignee)
+      end
+    end
+
+    notification = Notification.last
+    assert_equal @assignee, notification.user
+    assert_equal @assigner, notification.creator
+    assert_equal "card_assigned", notification.source.action
+
+    assert_push_delivered_for notification
+    assert_web_push_delivered
+  end
+
+  test "card assignment notification is bundled for email delivery when bundling enabled" do
+    @assignee.settings.update!(bundle_email_frequency: :every_few_hours)
+
+    assert_difference -> { Notification.count }, 1 do
+      perform_enqueued_jobs only: NotifyRecipientsJob do
+        @card.toggle_assignment(@assignee)
+      end
+    end
+
+    notification = @assignee.notifications.reload.last
+    assert_not_nil notification, "Notification should be created for assignee"
+
+    bundle = @assignee.notification_bundles.pending.last
+    assert_not_nil bundle, "Bundle should be created when bundling is enabled"
+    assert_includes bundle.notifications, notification
+  end
+
+  test "comment creates notification for card watchers and triggers push" do
+    @card.watch_by(@assignee)
+
+    assert_difference -> { Notification.count }, 1 do
+      perform_enqueued_jobs only: [ NotifyRecipientsJob, Notification::PushJob ] do
+        @card.comments.create!(body: "Great work on this!", creator: @assigner)
+      end
+    end
+
+    notification = Notification.last
+    assert_equal @assignee, notification.user
+    assert_equal "comment_created", notification.source.action
+
+    assert_push_delivered
+    assert_web_push_delivered
+  end
+
+  test "mention creates notification and triggers push" do
+    mention_html = ActionText::Attachment.from_attachable(@assignee).to_html
+
+    perform_enqueued_jobs only: [ Mention::CreateJob, NotifyRecipientsJob, Notification::PushJob ] do
+      @card.comments.create!(
+        body: "#{mention_html} check this out",
+        creator: @assigner
+      )
+    end
+
+    mention_notification = @assignee.notifications.find_by(source_type: "Mention")
+    assert_not_nil mention_notification
+
+    assert_push_delivered_for mention_notification
+    assert_web_push_delivered
+  end
+
+  test "system user actions do not create notifications" do
+    Current.user = users(:system)
+
+    assert_no_difference -> { Notification.count } do
+      perform_enqueued_jobs only: [ NotifyRecipientsJob, Notification::PushJob ] do
+        @card.toggle_assignment(@assignee)
+      end
+    end
+
+    assert_no_push_delivered
+    assert_no_web_push_delivered
+  end
+
+  test "notifications for inactive users are created but do not trigger push" do
+    @assignee.deactivate
+
+    assert_difference -> { Notification.count }, 1 do
+      perform_enqueued_jobs only: [ NotifyRecipientsJob, Notification::PushJob ] do
+        @card.toggle_assignment(@assignee)
+      end
+    end
+
+    assert_no_push_delivered
+    assert_no_web_push_delivered
+  end
+
+  private
+    def stub_web_push_pool
+      @web_push_calls = []
+      web_push_pool = stub("web_push_pool")
+      web_push_pool.stubs(:queue).with do |payload, subs|
+        @web_push_calls << { payload: payload, subscriptions: subs }
+      end
+
+      Rails.configuration.x.stubs(:web_push_pool).returns(web_push_pool)
+    end
+
+    def push_target_with_tracking
+      @push_target_calls = []
+      fake_push_target = Class.new(Notification::PushTarget) do
+        class << self
+          attr_accessor :calls
+        end
+
+        def self.process(notification)
+          calls << notification
+        end
+      end
+
+      fake_push_target.tap { it.calls = @push_target_calls }
+    end
+
+    def assert_push_delivered
+      assert_not_empty @push_target_calls, "Expected push to be delivered"
+    end
+
+    def assert_push_delivered_for(notification)
+      assert_includes @push_target_calls, notification, "Expected push to be delivered for notification"
+    end
+
+    def assert_no_push_delivered
+      assert_empty @push_target_calls, "Expected no push to be delivered"
+    end
+
+    def assert_web_push_delivered
+      assert_not_empty @web_push_calls, "Expected web push to be delivered"
+    end
+
+    def assert_no_web_push_delivered
+      assert_empty @web_push_calls, "Expected no web push to be delivered"
+    end
+end
diff --git a/test/lib/rails_ext/active_storage_analyze_job_skip_detached_test.rb b/test/lib/rails_ext/active_storage_analyze_job_skip_detached_test.rb
new file mode 100644
index 000000000..5ab5edaff
--- /dev/null
+++ b/test/lib/rails_ext/active_storage_analyze_job_skip_detached_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class ActiveStorageAnalyzeJobSkipDetachedTest < ActiveSupport::TestCase
+  test "skips analysis when blob has no attachments" do
+    blob = ActiveStorage::Blob.create_and_upload!(
+      io: StringIO.new("x" * 1024), filename: "orphan.txt", content_type: "text/plain"
+    )
+
+    blob.expects(:analyze).never
+
+    ActiveStorage::AnalyzeJob.perform_now(blob)
+  end
+
+  test "performs analysis when blob has attachments" do
+    card = cards(:logo)
+    card.image.attach io: StringIO.new("x" * 1024), filename: "test.png", content_type: "image/png"
+    blob = card.image.blob
+
+    blob.expects(:analyze).once
+
+    ActiveStorage::AnalyzeJob.perform_now(blob)
+  end
+end
diff --git a/test/lib/web_push/persistent_request_test.rb b/test/lib/web_push/persistent_request_test.rb
index 2cf8a6c7c..649e27b75 100644
--- a/test/lib/web_push/persistent_request_test.rb
+++ b/test/lib/web_push/persistent_request_test.rb
@@ -12,7 +12,7 @@ class WebPush::PersistentRequestTest < ActiveSupport::TestCase
     notification = WebPush::Notification.new(
       title: "Test",
       body: "Test notification",
-      path: "/test",
+      url: "/test",
       badge: 0,
       endpoint: ENDPOINT,
       endpoint_ip: PUBLIC_TEST_IP,
diff --git a/test/models/account/data_transfer/action_text/rich_text_record_set_test.rb b/test/models/account/data_transfer/action_text/rich_text_record_set_test.rb
new file mode 100644
index 000000000..a28935a3e
--- /dev/null
+++ b/test/models/account/data_transfer/action_text/rich_text_record_set_test.rb
@@ -0,0 +1,181 @@
+require "test_helper"
+
+class Account::DataTransfer::ActionText::RichTextRecordSetTest < ActiveSupport::TestCase
+  test "check rejects ActionText record referencing existing card in another account" do
+    importing_account = Account.create!(name: "Importing Account", external_account_id: 99999999)
+
+    victim_card = cards(:logo)
+    assert_not_equal importing_account.id, victim_card.account_id, "Card must belong to a different account"
+
+    # Create a malicious ActionText record that points to the victim's card
+    malicious_action_text_data = {
+      "id" => "malicious_action_text_id_12345",
+      "account_id" => importing_account.id,
+      "record_type" => "Card",
+      "record_id" => victim_card.id,
+      "name" => "description",
+      "body" => "<p>Injected content from attacker</p>",
+      "created_at" => Time.current.iso8601,
+      "updated_at" => Time.current.iso8601
+    }
+
+    tempfile = Tempfile.new([ "malicious_import", ".zip" ])
+    tempfile.binmode
+
+    writer = ZipFile::Writer.new(tempfile)
+    writer.add_file("data/action_text_rich_texts/#{malicious_action_text_data['id']}.json", malicious_action_text_data.to_json)
+    writer.close
+    tempfile.rewind
+
+    reader = ZipFile::Reader.new(tempfile)
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(importing_account)
+
+    error = assert_raises(Account::DataTransfer::RecordSet::IntegrityError) do
+      record_set.check(from: reader)
+    end
+
+    assert_match(/references existing record.*Card.*#{victim_card.id}/i, error.message)
+  ensure
+    tempfile&.close
+    tempfile&.unlink
+    importing_account&.destroy
+  end
+
+  test "transform_body_for_import skips GIDs belonging to another account" do
+    victim_tag = tags(:web)
+    attacker_account = accounts(:initech)
+    assert_not_equal attacker_account.id, victim_tag.account_id
+
+    cross_tenant_gid = victim_tag.to_global_id.to_s
+    html = %(<action-text-attachment gid="#{cross_tenant_gid}"></action-text-attachment>)
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(attacker_account)
+    result = record_set.send(:transform_body_for_import, html)
+
+    assert_no_match(/sgid=/, result, "Cross-tenant GID must not be converted to SGID")
+    assert_match(/gid=/, result, "Original GID should remain unconverted")
+  end
+
+  test "transform_body_for_import converts GIDs belonging to the same account" do
+    own_tag = tags(:web)
+    own_account = accounts(:"37s")
+    assert_equal own_account.id, own_tag.account_id
+
+    same_account_gid = own_tag.to_global_id.to_s
+    html = %(<action-text-attachment gid="#{same_account_gid}"></action-text-attachment>)
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(own_account)
+    result = record_set.send(:transform_body_for_import, html)
+
+    assert_match(/sgid=/, result, "Same-account GID should be converted to SGID")
+    assert_no_match(/ gid=/, result, "GID should be removed after SGID conversion")
+  end
+
+  test "transform_body_for_import handles non-existent record GIDs gracefully" do
+    nonexistent_gid = "gid://fizzy/Tag/00000000000000000000000000"
+    html = %(<action-text-attachment gid="#{nonexistent_gid}"></action-text-attachment>)
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(accounts(:"37s"))
+    result = record_set.send(:transform_body_for_import, html)
+
+    assert_no_match(/sgid=/, result, "Non-existent record should not produce SGID")
+  end
+
+  test "replace_account_slugs rewrites relative URLs with account slug" do
+    target_account = accounts(:"37s")
+    source_slug = "9999999"
+    target_slug = AccountSlug.encode(target_account.external_account_id)
+
+    html = %(<p>See <a href="/#{source_slug}/cards/42">card 42</a></p>)
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(target_account)
+    result = record_set.send(:transform_body_for_import, html)
+
+    assert_includes result, "/#{target_slug}/cards/42"
+    assert_not_includes result, source_slug
+  end
+
+  test "replace_account_slugs leaves absolute URLs alone" do
+    target_account = accounts(:"37s")
+
+    html = %(<p>See <a href="https://fizzy.app/9999999/boards/7">board</a></p>)
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(target_account)
+    result = record_set.send(:transform_body_for_import, html)
+
+    assert_includes result, "https://fizzy.app/9999999/boards/7"
+  end
+
+  test "replace_account_slugs leaves plain text alone" do
+    target_account = accounts(:"37s")
+
+    html = "<p>Nothing to rewrite here</p>"
+
+    record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(target_account)
+    result = record_set.send(:transform_body_for_import, html)
+
+    assert_equal html, result
+  end
+
+  test "relativize_urls strips instance host from absolute URLs" do
+    with_default_url_host("fizzy.example.com") do
+      record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(accounts(:"37s"))
+
+      html = %(<p>See <a href="https://fizzy.example.com/123/cards/42">card</a></p>)
+      result = record_set.send(:relativize_urls, html)
+
+      assert_includes result, %(/123/cards/42)
+      assert_not_includes result, "fizzy.example.com"
+    end
+  end
+
+  test "relativize_urls preserves query and fragment" do
+    with_default_url_host("fizzy.example.com") do
+      record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(accounts(:"37s"))
+
+      html = %(<p><a href="https://fizzy.example.com/123/cards/42?tab=comments#comment_1">link</a></p>)
+      result = record_set.send(:relativize_urls, html)
+
+      assert_includes result, "/123/cards/42?tab=comments#comment_1"
+      assert_not_includes result, "fizzy.example.com"
+    end
+  end
+
+  test "relativize_urls leaves external URLs alone" do
+    with_default_url_host("fizzy.example.com") do
+      record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(accounts(:"37s"))
+
+      html = %(<p><a href="https://github.com/some/repo">link</a></p>)
+      result = record_set.send(:relativize_urls, html)
+
+      assert_includes result, "https://github.com/some/repo"
+    end
+  end
+
+  test "relativize_urls is a no-op when host is not configured" do
+    with_default_url_host(nil) do
+      record_set = Account::DataTransfer::ActionText::RichTextRecordSet.new(accounts(:"37s"))
+
+      html = %(<p><a href="https://fizzy.example.com/123/cards/42">link</a></p>)
+      result = record_set.send(:relativize_urls, html)
+
+      assert_includes result, "https://fizzy.example.com/123/cards/42"
+    end
+  end
+
+  private
+    def with_default_url_host(host)
+      options = Rails.application.routes.default_url_options
+      had_key = options.key?(:host)
+      original = options[:host]
+      options[:host] = host
+      yield
+    ensure
+      if had_key
+        options[:host] = original
+      else
+        options.delete(:host)
+      end
+    end
+end
diff --git a/test/models/account/data_transfer/action_text_rich_text_record_set_test.rb b/test/models/account/data_transfer/action_text_rich_text_record_set_test.rb
deleted file mode 100644
index 14a7aeb9c..000000000
--- a/test/models/account/data_transfer/action_text_rich_text_record_set_test.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-require "test_helper"
-
-class Account::DataTransfer::ActionTextRichTextRecordSetTest < ActiveSupport::TestCase
-  test "check rejects ActionText record referencing existing card in another account" do
-    importing_account = Account.create!(name: "Importing Account", external_account_id: 99999999)
-
-    victim_card = cards(:logo)
-    assert_not_equal importing_account.id, victim_card.account_id, "Card must belong to a different account"
-
-    # Create a malicious ActionText record that points to the victim's card
-    malicious_action_text_data = {
-      "id" => "malicious_action_text_id_12345",
-      "account_id" => importing_account.id,
-      "record_type" => "Card",
-      "record_id" => victim_card.id,
-      "name" => "description",
-      "body" => "<p>Injected content from attacker</p>",
-      "created_at" => Time.current.iso8601,
-      "updated_at" => Time.current.iso8601
-    }
-
-    tempfile = Tempfile.new([ "malicious_import", ".zip" ])
-    tempfile.binmode
-
-    writer = ZipFile::Writer.new(tempfile)
-    writer.add_file("data/action_text_rich_texts/#{malicious_action_text_data['id']}.json", malicious_action_text_data.to_json)
-    writer.close
-    tempfile.rewind
-
-    reader = ZipFile::Reader.new(tempfile)
-
-    record_set = Account::DataTransfer::ActionTextRichTextRecordSet.new(importing_account)
-
-    error = assert_raises(Account::DataTransfer::RecordSet::IntegrityError) do
-      record_set.check(from: reader)
-    end
-
-    assert_match(/references existing record.*Card.*#{victim_card.id}/i, error.message)
-  ensure
-    tempfile&.close
-    tempfile&.unlink
-    importing_account&.destroy
-  end
-
-  test "convert_gids_to_sgids skips GIDs belonging to another account" do
-    victim_tag = tags(:web)
-    attacker_account = accounts(:initech)
-    assert_not_equal attacker_account.id, victim_tag.account_id
-
-    cross_tenant_gid = victim_tag.to_global_id.to_s
-    html = %(<action-text-attachment gid="#{cross_tenant_gid}"></action-text-attachment>)
-
-    record_set = Account::DataTransfer::ActionTextRichTextRecordSet.new(attacker_account)
-    result = record_set.send(:convert_gids_to_sgids, html)
-
-    assert_no_match(/sgid=/, result, "Cross-tenant GID must not be converted to SGID")
-    assert_match(/gid=/, result, "Original GID should remain unconverted")
-  end
-
-  test "convert_gids_to_sgids converts GIDs belonging to the same account" do
-    own_tag = tags(:web)
-    own_account = accounts(:"37s")
-    assert_equal own_account.id, own_tag.account_id
-
-    same_account_gid = own_tag.to_global_id.to_s
-    html = %(<action-text-attachment gid="#{same_account_gid}"></action-text-attachment>)
-
-    record_set = Account::DataTransfer::ActionTextRichTextRecordSet.new(own_account)
-    result = record_set.send(:convert_gids_to_sgids, html)
-
-    assert_match(/sgid=/, result, "Same-account GID should be converted to SGID")
-    assert_no_match(/ gid=/, result, "GID should be removed after SGID conversion")
-  end
-
-  test "convert_gids_to_sgids handles non-existent record GIDs gracefully" do
-    nonexistent_gid = "gid://fizzy/Tag/00000000000000000000000000"
-    html = %(<action-text-attachment gid="#{nonexistent_gid}"></action-text-attachment>)
-
-    record_set = Account::DataTransfer::ActionTextRichTextRecordSet.new(accounts(:"37s"))
-    result = record_set.send(:convert_gids_to_sgids, html)
-
-    assert_no_match(/sgid=/, result, "Non-existent record should not produce SGID")
-  end
-end
diff --git a/test/models/account/import_test.rb b/test/models/account/import_test.rb
index a377f69c2..7bf407041 100644
--- a/test/models/account/import_test.rb
+++ b/test/models/account/import_test.rb
@@ -62,6 +62,36 @@ class Account::ImportTest < ActiveSupport::TestCase
     export_tempfile&.unlink
   end
 
+  test "import reconciles cards count so new cards get correct numbers" do
+    source_account = accounts("37s")
+    exporter = users(:david)
+    identity = exporter.identity
+    max_card_number = source_account.cards.maximum(:number)
+
+    export = Account::Export.create!(account: source_account, user: exporter)
+    export.build
+
+    export_tempfile = Tempfile.new([ "export", ".zip" ])
+    export.file.open { |f| FileUtils.cp(f.path, export_tempfile.path) }
+
+    source_account.destroy!
+
+    target_account = Account.create_with_owner(account: { name: "Import Test" }, owner: { identity: identity, name: exporter.name })
+    import = Account::Import.create!(identity: identity, account: target_account)
+    Current.set(account: target_account) do
+      import.file.attach(io: File.open(export_tempfile.path), filename: "export.zip", content_type: "application/zip")
+    end
+
+    import.check
+    import.process
+
+    target_account.reload
+    assert_operator target_account.cards_count, :>=, max_card_number
+  ensure
+    export_tempfile&.close
+    export_tempfile&.unlink
+  end
+
   test "check sets no failure_reason for unexpected errors" do
     import = Account::Import.create!(identity: identities(:david), account: Account.create!(name: "Import Test"))
 
@@ -96,6 +126,27 @@ class Account::ImportTest < ActiveSupport::TestCase
     tempfile&.unlink
   end
 
+  test "check sets failure_reason to invalid_export for non-ZIP file" do
+    target_account = Account.create!(name: "Import Test")
+    import = Account::Import.create!(identity: identities(:david), account: target_account)
+
+    tempfile = Tempfile.new([ "not_a_zip", ".zip" ])
+    tempfile.write("this is not a zip file at all")
+    tempfile.rewind
+
+    Current.set(account: target_account) do
+      import.file.attach(io: tempfile, filename: "export.zip", content_type: "application/zip")
+    end
+
+    assert_raises(ZipFile::InvalidFileError) { import.check }
+
+    assert import.failed?
+    assert_equal "invalid_export", import.failure_reason
+  ensure
+    tempfile&.close
+    tempfile&.unlink
+  end
+
   test "check sets failure_reason to conflict when records already exist" do
     source_account = accounts("37s")
     exporter = users(:david)
diff --git a/test/models/concerns/mentions_test.rb b/test/models/concerns/mentions_test.rb
index fca379bf1..c26d37632 100644
--- a/test/models/concerns/mentions_test.rb
+++ b/test/models/concerns/mentions_test.rb
@@ -81,6 +81,18 @@ class MentionsTest < ActiveSupport::TestCase
     end
   end
 
+  test "notify new mentionees when editing a comment to add a mention" do
+    card = boards(:writebook).cards.create title: "Fresh card", description: "Some content", status: :published
+
+    perform_enqueued_jobs do
+      comment = card.comments.create!(body: "Initial thought")
+
+      assert_difference -> { users(:kevin).notifications.count }, +1 do
+        comment.update!(body: "Actually, #{mention_html_for(users(:kevin))}, what do you think?")
+      end
+    end
+  end
+
   test "mentionees are added as watchers of the card" do
     perform_enqueued_jobs only: Mention::CreateJob do
       card = boards(:writebook).cards.create title: "Cleanup", description: "Did you finish up with the cleanup #{mention_html_for(users(:kevin))}?"
diff --git a/test/models/notification/push_target/web_test.rb b/test/models/notification/push_target/web_test.rb
new file mode 100644
index 000000000..37f23b557
--- /dev/null
+++ b/test/models/notification/push_target/web_test.rb
@@ -0,0 +1,279 @@
+require "test_helper"
+
+class Notification::PushTarget::WebTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:david)
+    @notification = notifications(:logo_mentioned_david)
+
+    @user.push_subscriptions.create!(
+      endpoint: "https://fcm.googleapis.com/fcm/send/test123",
+      p256dh_key: "test_key",
+      auth_key: "test_auth"
+    )
+
+    @web_push_pool = mock("web_push_pool")
+    Rails.configuration.x.stubs(:web_push_pool).returns(@web_push_pool)
+  end
+
+  test "pushes to web when user has subscriptions" do
+    @web_push_pool.expects(:queue).once.with do |payload, subscriptions|
+      payload.is_a?(Hash) &&
+        payload[:title].present? &&
+        payload[:body].present? &&
+        payload[:url].present? &&
+        subscriptions.count == 1
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "does not push when user has no subscriptions" do
+    @user.push_subscriptions.delete_all
+    @web_push_pool.expects(:queue).never
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload includes card title for card events" do
+    @notification.update!(source: events(:logo_published))
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:title] == @notification.card.title
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for comment includes RE prefix" do
+    event = events(:layout_commented)
+    notification = @user.notifications.create!(source: event, creator: event.creator)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:title].start_with?("RE:")
+    end
+
+    Notification::PushTarget::Web.new(notification).process
+  end
+
+  test "payload for assignment includes assigned message" do
+    @notification.update!(source: events(:logo_assignment_david))
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body].include?("Assigned to you")
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for triage includes column name" do
+    event = events(:logo_published)
+    event.update!(action: "card_triaged", particulars: { "particulars" => { "column" => "In Progress" } })
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved to In Progress by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for triage falls back when column name is missing" do
+    event = events(:logo_published)
+    event.update!(action: "card_triaged", particulars: {})
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for triage falls back when column name is blank" do
+    event = events(:logo_published)
+    event.update!(action: "card_triaged", particulars: { "particulars" => { "column" => "" } })
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for sent back to triage includes Maybe?" do
+    event = events(:logo_published)
+    event.update!(action: "card_sent_back_to_triage")
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved back to Maybe? by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for board change includes new board name" do
+    event = events(:logo_published)
+    event.update!(
+      action: "card_board_changed",
+      particulars: { "particulars" => { "old_board" => "Old Board", "new_board" => "New Board" } }
+    )
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved to New Board by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for board change falls back when board name is missing" do
+    event = events(:logo_published)
+    event.update!(action: "card_board_changed", particulars: {})
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for board change falls back when board name is blank" do
+    event = events(:logo_published)
+    event.update!(
+      action: "card_board_changed",
+      particulars: { "particulars" => { "new_board" => "" } }
+    )
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for collection change includes new collection name" do
+    event = events(:logo_published)
+    event.update!(
+      action: "card_collection_changed",
+      particulars: { "particulars" => { "new_collection" => "New Collection" } }
+    )
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved to New Collection by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for collection change falls back when collection name is missing" do
+    event = events(:logo_published)
+    event.update!(action: "card_collection_changed", particulars: {})
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for collection change falls back when collection name is blank" do
+    event = events(:logo_published)
+    event.update!(action: "card_collection_changed", particulars: { "particulars" => { "new_collection" => "" } })
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for title change includes new title" do
+    event = events(:logo_published)
+    event.update!(
+      action: "card_title_changed",
+      particulars: { "particulars" => { "old_title" => "Old Title", "new_title" => "New Title" } }
+    )
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Renamed to New Title by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for title change falls back when title is missing" do
+    event = events(:logo_published)
+    event.update!(action: "card_title_changed", particulars: {})
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Renamed by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for title change falls back when title is blank" do
+    event = events(:logo_published)
+    event.update!(action: "card_title_changed", particulars: { "particulars" => { "new_title" => "" } })
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Renamed by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for postponed includes Not Now" do
+    event = events(:logo_published)
+    event.update!(action: "card_postponed")
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved to Not Now by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for auto postponed includes inactivity message" do
+    event = events(:logo_published)
+    event.update!(action: "card_auto_postponed")
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Moved to Not Now due to inactivity"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for unhandled action uses updated fallback message" do
+    event = events(:logo_published)
+    event.update!(action: "card_unassigned")
+    @notification.update!(source: event)
+
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:body] == "Updated by #{event.creator.name}"
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+
+  test "payload for mention includes mentioner name" do
+    @web_push_pool.expects(:queue).once.with do |payload, _|
+      payload[:title].include?("mentioned you")
+    end
+
+    Notification::PushTarget::Web.new(@notification).process
+  end
+end
diff --git a/test/models/notification/pushable_test.rb b/test/models/notification/pushable_test.rb
new file mode 100644
index 000000000..9036453bd
--- /dev/null
+++ b/test/models/notification/pushable_test.rb
@@ -0,0 +1,97 @@
+require "test_helper"
+
+class Notification::PushableTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:david)
+    @notification = notifications(:logo_mentioned_david)
+  end
+
+  test "push_later enqueues Notification::PushJob" do
+    assert_enqueued_with(job: Notification::PushJob, args: [ @notification ]) do
+      @notification.push_later
+    end
+  end
+
+  test "push calls process on all registered targets" do
+    target_class = mock("push_target_class")
+    target_class.expects(:process).with(@notification)
+
+    original_targets = Notification.push_targets
+    Notification.push_targets = [ target_class ]
+
+    @notification.push
+  ensure
+    Notification.push_targets = original_targets
+  end
+
+  test "push_later is called after notification is created" do
+    assert_enqueued_with(job: Notification::PushJob) do
+      @user.notifications.create!(
+        source: events(:layout_published),
+        creator: users(:jason)
+      )
+    end
+  end
+
+  test "push_later is called when notification source changes" do
+    assert_enqueued_with(job: Notification::PushJob) do
+      @notification.update!(source: events(:logo_published))
+    end
+  end
+
+  test "push_later is not called for other updates" do
+    assert_no_enqueued_jobs only: Notification::PushJob do
+      @notification.update!(unread_count: 5)
+    end
+  end
+
+  test "register_push_target accepts symbols" do
+    original_targets = Notification.push_targets.dup
+
+    Notification.register_push_target(:web)
+
+    assert_includes Notification.push_targets, Notification::PushTarget::Web
+  ensure
+    Notification.push_targets = original_targets
+  end
+
+  test "push processes targets for normal notifications" do
+    target_class = mock("push_target_class")
+    target_class.expects(:process).with(@notification)
+
+    original_targets = Notification.push_targets
+    Notification.push_targets = [ target_class ]
+
+    @notification.push
+  ensure
+    Notification.push_targets = original_targets
+  end
+
+  test "push skips targets when creator is system user" do
+    @notification.update!(creator: users(:system))
+
+    target_class = mock("push_target_class")
+    target_class.expects(:process).never
+
+    original_targets = Notification.push_targets
+    Notification.push_targets = [ target_class ]
+
+    @notification.push
+  ensure
+    Notification.push_targets = original_targets
+  end
+
+  test "push skips targets for cancelled accounts" do
+    @user.account.cancel(initiated_by: @user)
+
+    target_class = mock("push_target_class")
+    target_class.expects(:process).never
+
+    original_targets = Notification.push_targets
+    Notification.push_targets = [ target_class ]
+
+    @notification.push
+  ensure
+    Notification.push_targets = original_targets
+  end
+end
diff --git a/test/models/notification_pusher_test.rb b/test/models/notification_pusher_test.rb
deleted file mode 100644
index 53380effe..000000000
--- a/test/models/notification_pusher_test.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "test_helper"
-
-class NotificationPusherTest < ActiveSupport::TestCase
-  setup do
-    @user = users(:david)
-    @notification = notifications(:logo_mentioned_david)
-    @pusher = NotificationPusher.new(@notification)
-
-    @user.push_subscriptions.create!(
-      endpoint: "https://fcm.googleapis.com/fcm/send/test123",
-      p256dh_key: "test_key",
-      auth_key: "test_auth"
-    )
-  end
-
-  test "push does not send notifications for cancelled accounts" do
-    @user.account.cancel(initiated_by: @user)
-
-    result = @pusher.push
-
-    assert_nil result, "Should not push notifications for cancelled accounts"
-  end
-
-  test "push sends notifications for active accounts with subscriptions" do
-    result = @pusher.push
-
-    assert_not_nil result, "Should push notifications for active accounts with subscriptions"
-  end
-end
diff --git a/test/models/notifier/event_notifier_test.rb b/test/models/notifier/event_notifier_test.rb
index 6393ddb99..2ded4539e 100644
--- a/test/models/notifier/event_notifier_test.rb
+++ b/test/models/notifier/event_notifier_test.rb
@@ -93,6 +93,22 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase
     end
   end
 
+  test "don't create notifications on comment for mentionees even before mention records exist" do
+    comment = cards(:layout).comments.create!(
+      body: "Hey #{mention_html_for(users(:kevin))}, what do you think?",
+      creator: users(:david)
+    )
+    event = boards(:writebook).events.create!(
+      action: "comment_created", creator: users(:david), eventable: comment
+    )
+
+    assert_empty comment.mentionees, "Mention records should not exist yet"
+
+    notifications = Notifier.for(event).notify
+
+    assert_not_includes notifications.map(&:user), users(:kevin)
+  end
+
   test "assignment events notify assignees regardless of involvement level" do
     boards(:writebook).access_for(users(:jz)).access_only!
 
@@ -100,4 +116,9 @@ class Notifier::EventNotifierTest < ActiveSupport::TestCase
 
     assert_equal [ users(:jz) ], notifications.map(&:user)
   end
+
+  private
+    def mention_html_for(user)
+      ActionText::Attachment.from_attachable(user).to_html
+    end
 end
diff --git a/test/models/search/stemmer_test.rb b/test/models/search/stemmer_test.rb
index 858ed2dca..33334ada4 100644
--- a/test/models/search/stemmer_test.rb
+++ b/test/models/search/stemmer_test.rb
@@ -12,4 +12,16 @@ class Search::StemmerTest < ActiveSupport::TestCase
 
     assert_equal "test run jump walk", result
   end
+
+  test "stem hyphenated words" do
+    result = Search::Stemmer.stem("BC3-IOS-1D8B")
+
+    assert_equal "bc3 io 1d8b", result
+  end
+
+  test "stem words separated by repeated punctuation" do
+    result = Search::Stemmer.stem("foo---bar")
+
+    assert_equal "foo bar", result
+  end
 end
diff --git a/test/models/search_test.rb b/test/models/search_test.rb
index 44996404b..c52a397f4 100644
--- a/test/models/search_test.rb
+++ b/test/models/search_test.rb
@@ -35,4 +35,11 @@ class SearchTest < ActiveSupport::TestCase
     results = Search::Record.for(user_without_access.account_id).search("anything", user: user_without_access)
     assert_empty results
   end
+
+  test "search for hyphenated strings" do
+    card = @board.cards.create!(title: "BC3-IOS-1D8B", creator: @user, status: "published")
+
+    results = Search::Record.for(@user.account_id).search("BC3-IOS-1D8B", user: @user)
+    assert results.find { |it| it.card_id == card.id }
+  end
 end
diff --git a/test/models/webhook_test.rb b/test/models/webhook_test.rb
index 52c43383d..121c1a651 100644
--- a/test/models/webhook_test.rb
+++ b/test/models/webhook_test.rb
@@ -35,6 +35,10 @@ class WebhookTest < ActiveSupport::TestCase
 
     webhook = Webhook.new name: "HTTPS", board: boards(:writebook), url: "https://example.com/webhook"
     assert webhook.valid?
+
+    webhook = Webhook.new name: "TRAILING SPACE", board: boards(:writebook), url: "https://example.com/webhook "
+    assert webhook.valid?
+    assert_equal "https://example.com/webhook", webhook.url
   end
 
   test "deactivate" do
diff --git a/test/models/zip_file_test.rb b/test/models/zip_file_test.rb
index 42db30f9e..3484f9f92 100644
--- a/test/models/zip_file_test.rb
+++ b/test/models/zip_file_test.rb
@@ -119,6 +119,17 @@ class ZipFileTest < ActiveSupport::TestCase
     end
   end
 
+  test "reader raises InvalidFileError for non-zip file" do
+    tempfile = Tempfile.new([ "not_a_zip", ".zip" ])
+    tempfile.write("this is not a zip file at all")
+    tempfile.rewind
+
+    assert_raises(ZipFile::InvalidFileError) { ZipFile::Reader.new(tempfile) }
+  ensure
+    tempfile&.close
+    tempfile&.unlink
+  end
+
   private
     def create_test_zip(files)
       tempfile = Tempfile.new([ "test", ".zip" ])