better error handling

tighten dispose
add extra cancellation check
2026-01-23 18:08:54 -08:00 · 2026-01-23 14:55:01 -05:00 · 2026-01-23 14:50:27 -05:00 · 2026-01-23 14:44:36 -05:00 · 2026-01-23 14:39:30 -05:00 · 2026-01-23 02:10:39 -05:00
163 changed files with 2725 additions and 2555 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -504,22 +504,16 @@ jobs:
          CI: true
        run: npx playwright test --project=chromium
        if: ${{ !cancelled() }}
-      - name: Archive web results
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        if: success() || failure()
-        with:
-          name: e2e-web-test-results-${{ matrix.runner }}
-          path: e2e/playwright-report/
      - name: Run ui tests (web)
        env:
          CI: true
        run: npx playwright test --project=ui
        if: ${{ !cancelled() }}
-      - name: Archive ui results
+      - name: Archive test results
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        if: success() || failure()
        with:
-          name: e2e-ui-test-results-${{ matrix.runner }}
+          name: e2e-web-test-results-${{ matrix.runner }}
          path: e2e/playwright-report/
  success-check-e2e:
    name: End-to-End Tests Success
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,298 +0,0 @@
-
-# v2.5.0
-
-# v2.4.0
-
-## Highlights
-
-Welcome to the release `v2.4.0` of Immich. This release focuses on bug fixes, QoL improvements, and polished UI components across mobile and the web. Let's dive right in.
-
-* Show the owner's name in the shared album
-* Command palette
-* Change search type directly in the search bar
-* Better action button placement in the mobile asset viewer
-* Notable fix: fix an issue where metadata extraction could fail on high concurrency
-
-### Show the owner's name in the shared album.
-
-On the web, in shared albums, you can now toggle an option to display the asset's owner name at the bottom right corner of the thumbnail.
-
- ![](/api/attachments.redirect?id=3e4d661e-4015-4b04-b8f3-a055e9d4db01 " =1071x758")
-
-### Command palette
-
-The web app now has an integrated command palette, which can be opened  with `ctrl + k` on Windows/Linux or `cmd + k` on macOS. The first iteration of this lets you quickly navigate between administration pages by typing the name of the page you want to go to. It also already supports some common actions when on the respective admin pages, many of which also support shortcuts. Have a look around and check them out! 
-
- ![](/api/attachments.redirect?id=d6bc1387-f2cb-45c1-9287-4ee8176dfb41 " =748x652")
-
-### Change search type directly in the search bar
-
-You can now click on the pill from the search bar to select a different search type without opening the search filter panel.
-
- ![](/api/attachments.redirect?id=97a90b16-8b08-4292-bcb5-46aa75c01043 " =1033x199")
-
-
-### Better placement of action buttons in the mobile asset viewer
-
-Previously, to perform a specific action on the asset, you needed first to swipe up to open the detail panel, then swipe all the way to the right and tap the action. It limits the discoverability of some actions. To help resolve that issue, all the action buttons in the detail panel are now moved to the drop-down menu when tapping on the vertical dot icon (or kebab menu), along with some buttons that used to be on the top bar, clearing up space to display more useful information when viewing the asset.
-
-
- ![](/api/attachments.redirect?id=f68f8af5-2aaf-4625-821f-6c129da7fed3 " =342x741")
-
-## What's Changed
-
-### 🫥 Deprecated Changes
-
-* feat: queues by @jrasm91 in <https://github.com/immich-app/immich/pull/24142>
-
-### 🚀 Features
-
-* feat: improve performance: don't sort timeline buckets from server by @midzelis in <https://github.com/immich-app/immich/pull/24032>
-* feat: command palette by @danieldietzler in <https://github.com/immich-app/immich/pull/23693>
-* feat(web): Shared album owner labels by @xCJPECKOVERx and @idubnori in <https://github.com/immich-app/immich/pull/21171>
-* feat(mobile): persist album sorting & layout in settings by @YarosMallorca in <https://github.com/immich-app/immich/pull/22133>
-* feat: queue detail page by @jrasm91 in <https://github.com/immich-app/immich/pull/24352>
-* chore(mobile): add kebabu menu in asset viewer by @idubnori in <https://github.com/immich-app/immich/pull/24387>
-* feat(mobile): create new album from add to modal by @YarosMallorca in <https://github.com/immich-app/immich/pull/24431>
-* feat(mobile): move buttons in the bottom sheet to the kebabu menu by @idubnori in <https://github.com/immich-app/immich/pull/24175>
-
-### 🌟 Enhancements
-
-* feat(web): allow navigating the map with arrow keys by @lukashass in <https://github.com/immich-app/immich/pull/24080>
-* feat: separate camera and lens info in detail panel by @fabianbees in <https://github.com/immich-app/immich/pull/23670>
-* feat(web): shared link card tweaks by @jrasm91 in <https://github.com/immich-app/immich/pull/24192>
-* feat(server): exclude syncthing folders from external libraries by @SaphuA in <https://github.com/immich-app/immich/pull/24240>
-* feat(web): search type selection dropdown by @YarosMallorca in <https://github.com/immich-app/immich/pull/24091>
-* feat: header context menu by @jrasm91 in <https://github.com/immich-app/immich/pull/24374>
-* feat(mobile): move top bar buttons into kebabu menu in AssetViewer by @idubnori in <https://github.com/immich-app/immich/pull/24461>
-* feat(web): asset selection bar in tags view by @YarosMallorca in <https://github.com/immich-app/immich/pull/24522>
-* feat(web): slideshow feature on shared albums by @YarosMallorca in <https://github.com/immich-app/immich/pull/24598>
-* feat: replace heart icons to thumbs-up across activity by @idubnori in <https://github.com/immich-app/immich/pull/24590>
-
-### 🐛 Bug fixes
-
-* fix: effect loop by @jrasm91 in <https://github.com/immich-app/immich/pull/24014>
-* fix: do not clear hash on updated_at change by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24039>
-* fix: disable animation "add to" action menu by @bwees in <https://github.com/immich-app/immich/pull/24040>
-* fix: Use correct app store link by @Mraedis in <https://github.com/immich-app/immich/pull/24062>
-* fix: show archived assets in favorite page by @bwees in <https://github.com/immich-app/immich/pull/24052>
-* fix(mobile): first video memory on page doesn't play by @YarosMallorca in <https://github.com/immich-app/immich/pull/23906>
-* feat(web): show detected faces in spherical photos by @meesfrensel in <https://github.com/immich-app/immich/pull/23974>
-* fix: add users to album by @danieldietzler in <https://github.com/immich-app/immich/pull/24133>
-* fix(server): sanitize DB_URL for pg_dumpall to remove unknown query params by @lutostag in <https://github.com/immich-app/immich/pull/23333>
-* fix: use proper updatedAt value in local assets by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24137>
-* fix: albums page reactivity loops by @danieldietzler in <https://github.com/immich-app/immich/pull/24046>
-* fix: getAspectRatio fallback to db width and height by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24131>
-* fix(web): fix support & feedback modal wrapping by @Snowknight26 in <https://github.com/immich-app/immich/pull/24018>
-* fix: don't get OCR data in shared link by @alextran1502 in <https://github.com/immich-app/immich/pull/24152>
-* fix: duration extraction by @jrasm91 in <https://github.com/immich-app/immich/pull/24178>
-* fix(ml): Upgrade ONNX Runtime to v1.22.1 to fix ROCm build failures by @LukaPrebil in <https://github.com/immich-app/immich/pull/24045>
-* fix: update timeline-manager after archive actions by @midzelis in <https://github.com/immich-app/immich/pull/24010>
-* fix: theme switcher by @jrasm91 in <https://github.com/immich-app/immich/pull/24209>
-* fix: label 'for' attributes in user-api-key-grid by @kimsey0 in <https://github.com/immich-app/immich/pull/24232>
-* fix(mobile): enable backup text overflows by @YarosMallorca in <https://github.com/immich-app/immich/pull/24227>
-* fix(web): integrate zoom toggle button into panorama photo viewer by @meesfrensel in <https://github.com/immich-app/immich/pull/24189>
-* fix(web): use full tag path when creating nested subtags by @NiklasvonM in <https://github.com/immich-app/immich/pull/24249>
-* fix: only generate memory based on users assets by @alextran1502 in <https://github.com/immich-app/immich/pull/24151>
-* fix(mobile): docs link by @mmomjian in <https://github.com/immich-app/immich/pull/24277>
-* fix(server): use bigrams for cjk by @mertalev in <https://github.com/immich-app/immich/pull/24285>
-* fix(ml): do not upscale preview by @mertalev in <https://github.com/immich-app/immich/pull/24322>
-* fix(web): open onboarding documentation link in new tab by @carbonemys in <https://github.com/immich-app/immich/pull/24289>
-* fix(mobile): use correct timezone displayed in the info sheet by @kao-byte in <https://github.com/immich-app/immich/pull/24310>
-* fix(web): folder view sort oder by @etnoy in <https://github.com/immich-app/immich/pull/24337>
-* fix(server): do not delete offline assets by @mertalev in <https://github.com/immich-app/immich/pull/24355>
-* fix: exposure info and better readability by @alextran1502 in <https://github.com/immich-app/immich/pull/24344>
-* fix: Adjust the zoom level by @jforseth210 in <https://github.com/immich-app/immich/pull/24353>
-* fix: local full sync on Android on resume by @alextran1502 in <https://github.com/immich-app/immich/pull/24348>
-* fix(web): Add minimum content size to logo for consistent visual on small screens by @kiloomar in <https://github.com/immich-app/immich/pull/24372>
-* fix: use adjustment time in iOS for hash reset by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24047>
-* fix(server): update exiftool-vendored to v34 for more robust metadata extraction by @skatsubo in <https://github.com/immich-app/immich/pull/24424>
-* fix(mobile): cannot create album while name field is focused by @YarosMallorca in <https://github.com/immich-app/immich/pull/24449>
-* fix(web): \[album table view\] long album title overflows table row by @simonkub in <https://github.com/immich-app/immich/pull/24450>
-* fix(mobile): fix overflow text in backup card by @YarosMallorca in <https://github.com/immich-app/immich/pull/24448>
-* fix(mobile): timeline bottom padding on selection by @YarosMallorca in <https://github.com/immich-app/immich/pull/24480>
-* feat(mobile): Localized backup upload details page by @ArnyminerZ in <https://github.com/immich-app/immich/pull/21136>
-* fix(mobile): iOS local permission dialog extra whitespace by @kurtmckee in <https://github.com/immich-app/immich/pull/24491>
-* fix(mobile): versionStatus.message text overflow by @idubnori in <https://github.com/immich-app/immich/pull/24504>
-* fix(server): prevent metadata extraction failures on large video files by @hubert-taieb in <https://github.com/immich-app/immich/pull/24094>
-* fix(web): show inferred timezone in date editor by @skatsubo in <https://github.com/immich-app/immich/pull/24513>
-* fix(mobile): local videos with '#' don't play on android by @YarosMallorca in <https://github.com/immich-app/immich/pull/24373>
-* fix: refresh appear in list after asset is added to a current or new album by @alextran1502 in <https://github.com/immich-app/immich/pull/24523>
-* fix(mobile): birthday off by one day on remote by @YarosMallorca in <https://github.com/immich-app/immich/pull/24527>
-* fix(web): download panel being hidden by admin sidebar by @diogotcorreia in <https://github.com/immich-app/immich/pull/24583>
-* fix(web): recent search doesn't use search type by @YarosMallorca in <https://github.com/immich-app/immich/pull/24578>
-* fix(server): only extract image's duration if format supports animation by @meesfrensel in <https://github.com/immich-app/immich/pull/24587>
-* fix(mobile): local delete missing from sheet on some routes  by @YarosMallorca in <https://github.com/immich-app/immich/pull/24505>
-* fix(mobile): better UI for metadata panel by @kao-byte in <https://github.com/immich-app/immich/pull/24428>
-* fix: shared link expiration and small styling by @alextran1502 in <https://github.com/immich-app/immich/pull/24566>
-
-### 📚 Documentation
-
-* docs: DB_STORAGE_TYPE is only used by the database container by @dionysius in <https://github.com/immich-app/immich/pull/24215>
-* fix(docs): build `cli` for e2e tests by @roschaefer in <https://github.com/immich-app/immich/pull/24184>
-* docs(faq): add more info on archiving by @etnoy in <https://github.com/immich-app/immich/pull/24326>
-* fix(docs): server and machine-learning use IMMICH_HOST and IMMICH_PORT by @dionysius in <https://github.com/immich-app/immich/pull/24335>
-* fix: prevent OOM on nginx reverse proxy servers by @NicholasFlamy in <https://github.com/immich-app/immich/pull/24351>
-* fix(docs): obsolete docs about rootless docker by @roschaefer in <https://github.com/immich-app/immich/pull/24376>
-* fix(docs): websockets in nginx example by @fourthwall in <https://github.com/immich-app/immich/pull/24411>
-* fix(docs): slow upload speed with example nginx reverse proxy config by @goalie2002 in <https://github.com/immich-app/immich/pull/24490>
-* fix(docs): typo in maintenance mode command by @bartvanvelden in <https://github.com/immich-app/immich/pull/24518>
-
-### 🌐 Translations
-
-* chore: add new language requests by @danieldietzler in <https://github.com/immich-app/immich/pull/23991>
-
-## New Contributors
-
-* @ujjwal123123 made their first contribution in <https://github.com/immich-app/immich/pull/24101>
-* @lutostag made their first contribution in <https://github.com/immich-app/immich/pull/23333>
-* @LukaPrebil made their first contribution in <https://github.com/immich-app/immich/pull/24045>
-* @kimsey0 made their first contribution in <https://github.com/immich-app/immich/pull/24232>
-* @SaphuA made their first contribution in <https://github.com/immich-app/immich/pull/24240>
-* @dionysius made their first contribution in <https://github.com/immich-app/immich/pull/24215>
-* @NiklasvonM made their first contribution in <https://github.com/immich-app/immich/pull/24249>
-* @kao-byte made their first contribution in <https://github.com/immich-app/immich/pull/24098>
-* @carbonemys made their first contribution in <https://github.com/immich-app/immich/pull/24289>
-* @kiloomar made their first contribution in <https://github.com/immich-app/immich/pull/24372>
-* @fourthwall made their first contribution in <https://github.com/immich-app/immich/pull/24411>
-* @simonkub made their first contribution in <https://github.com/immich-app/immich/pull/24450>
-* @ArnyminerZ made their first contribution in <https://github.com/immich-app/immich/pull/21136>
-* @kurtmckee made their first contribution in <https://github.com/immich-app/immich/pull/24491>
-* @hubert-taieb made their first contribution in <https://github.com/immich-app/immich/pull/24094>
-* @bartvanvelden made their first contribution in <https://github.com/immich-app/immich/pull/24518>
-
-**Full Changelog**: <https://github.com/immich-app/immich/compare/v2.3.1...v2.4.0>
-
-<!-- Release notes generated using configuration in .github/release.yml at main -->
-
-## What's Changed
-### 🚀 Features
-* feat: workflow ui by @alextran1502 in https://github.com/immich-app/immich/pull/24190
-* feat: disable admin setup by @jrasm91 in https://github.com/immich-app/immich/pull/24628
-* feat: free up space by @alextran1502 in https://github.com/immich-app/immich/pull/24999
-* feat: use fastlane sigh to manage signing profiles by @alextran1502 in https://github.com/immich-app/immich/pull/25089
-* feat: image editing by @bwees in https://github.com/immich-app/immich/pull/24155
-* feat: add cloud id during native sync by @shenlong-tanwen in https://github.com/immich-app/immich/pull/20418
-* chore: web editor improvements by @bwees in https://github.com/immich-app/immich/pull/25169
-* feat: restore database backups by @insertish in https://github.com/immich-app/immich/pull/23978
-* feat(mobile): star rating by @YarosMallorca in https://github.com/immich-app/immich/pull/24457
-* feat: generate progressive JPEGs for thumbnails by @midzelis in https://github.com/immich-app/immich/pull/25463
-### 🌟 Enhancements
-* feat: focus jumped-to item in timeline by @bo0tzz in https://github.com/immich-app/immich/pull/24738
-* feat: modal routes by @jrasm91 in https://github.com/immich-app/immich/pull/24726
-* feat: prefer admin settings page over users page by @jrasm91 in https://github.com/immich-app/immich/pull/24780
-* feat: shared link edit by @jrasm91 in https://github.com/immich-app/immich/pull/24783
-* feat(mobile): use tabular figures in backup info card by @wrbl606 in https://github.com/immich-app/immich/pull/24820
-* feat(mobile): album options to kebab menu by @idubnori in https://github.com/immich-app/immich/pull/24204
-* feat: Hide/show controls when zoom state changes by @Lauritz-Tieste in https://github.com/immich-app/immich/pull/24784
-* feat(server): Support camera `make`, `model`, and `lensModel` in Storage Template by @rahul-kumar-saini in https://github.com/immich-app/immich/pull/24650
-* feat(ml): update ONNX Runtime, OpenVINO and ROCm stack by @savely-krasovsky in https://github.com/immich-app/immich/pull/23458
-* chore(server): Vchord 1.0 support by @mmomjian in https://github.com/immich-app/immich/pull/23845
-* feat(web): Add coordinate pair location searching. by @GustavJones in https://github.com/immich-app/immich/pull/24799
-* feat: show asset owners for editors in shared albums by @ama156 in https://github.com/immich-app/immich/pull/24890
-* feat(web): undo delete single asset by @YarosMallorca in https://github.com/immich-app/immich/pull/24439
-* feat(server): implement switchable logging formats (console/json) by @DanielRamosAcosta in https://github.com/immich-app/immich/pull/24791
-* chore(web): bump immich/ui for tooltips by @jrasm91 in https://github.com/immich-app/immich/pull/24632
-* feat(web): star rating keyboard shortcut by @cbochs in https://github.com/immich-app/immich/pull/24620
-* feat: bulk asset metadata endpoints by @jrasm91 in https://github.com/immich-app/immich/pull/25133
-* feat(mobile): 2026 font by @alextran1502 in https://github.com/immich-app/immich/pull/25213
-* feat(web): search albums by description by @YarosMallorca in https://github.com/immich-app/immich/pull/25244
-* feat(web): 2026 font by @alextran1502 in https://github.com/immich-app/immich/pull/25174
-* chore: dart http foreground upload by @alextran1502 in https://github.com/immich-app/immich/pull/24883
-* feat: update intel compute driver by @savely-krasovsky in https://github.com/immich-app/immich/pull/25259
-* feat: download original asset by @danieldietzler in https://github.com/immich-app/immich/pull/25302
-* feat: allow /memory?id= in AndroidManifest by @arne182 in https://github.com/immich-app/immich/pull/25373
-* fix: add scoped API permissions to map endpoints by @meesfrensel in https://github.com/immich-app/immich/pull/25423
-* fix(server): scoped permissions for more endpoints by @meesfrensel in https://github.com/immich-app/immich/pull/25452
-### 🐛 Bug fixes
-* fix(maintenance): prevent enable/disable maintenance CLI hanging on occasion by @insertish in https://github.com/immich-app/immich/pull/24713
-* fix(web): display jxl original by @mertalev in https://github.com/immich-app/immich/pull/24766
-* fix(web): stale album info by @jrasm91 in https://github.com/immich-app/immich/pull/24787
-* fix: album card timezone by @danieldietzler in https://github.com/immich-app/immich/pull/24855
-* fix(web): let slideshow videos play (#19601) by @keanucz in https://github.com/immich-app/immich/pull/24914
-* fix(server): update exiftool-vendored to v34.3 for correct colon-less timezone parsing by @dosten in https://github.com/immich-app/immich/pull/24979
-* fix(mobile): hide delete action for remote-only assets by @skrmc in https://github.com/immich-app/immich/pull/25010
-* fix: import config from json by @MontejoJorge in https://github.com/immich-app/immich/pull/25030
-* fix: search input has incorrect focus state after closing the search filter modal by @alextran1502 in https://github.com/immich-app/immich/pull/24886
-* fix(web): duplicate key error and enable expiration editing for expired shared links by @timonrieger in https://github.com/immich-app/immich/pull/24686
-* fix: shared-link-mapper by @jrasm91 in https://github.com/immich-app/immich/pull/24794
-* fix(server): migrate motion part of live photo by @NikhilAlapati in https://github.com/immich-app/immich/pull/24688
-* fix(web): use asset date for change date popup when single asset selected by @majiayu000 in https://github.com/immich-app/immich/pull/25076
-* fix(web): long text taking more width than expected in duplicate manager by @HemendraSinghShekhawat in https://github.com/immich-app/immich/pull/24547
-* fix(web): broken asset urls if shared link has photos in name by @YarosMallorca in https://github.com/immich-app/immich/pull/24451
-* fix(server): search statistics with personIds returns 500 by @majiayu000 in https://github.com/immich-app/immich/pull/25074
-* fix(web): server stats layout by @meesfrensel in https://github.com/immich-app/immich/pull/25085
-* fix: enter now submits the date modals by @fabb in https://github.com/immich-app/immich/pull/25053
-* fix(web): improve text contrast in minimized upload panel by @majiayu000 in https://github.com/immich-app/immich/pull/25075
-* fix: propagate iCloud Shared Album flag by @alextran1502 in https://github.com/immich-app/immich/pull/25060
-* fix: description does not rerender when navigating between assets by @alextran1502 in https://github.com/immich-app/immich/pull/25137
-* fix(server): avoid upserting empty metadata array by @timonrieger in https://github.com/immich-app/immich/pull/25143
-* fix(server): Document HTTP 200 response for duplicate uploads in OpenAPI by @timonrieger in https://github.com/immich-app/immich/pull/25148
-* fix(web): person asset count doesn't update when navigating by @YarosMallorca in https://github.com/immich-app/immich/pull/24438
-* fix(mobile): remove weird zooming behaviour on videos and play/pause button delay by @goalie2002 in https://github.com/immich-app/immich/pull/24006
-* fix: unlock properties after successful sidecar write by @danieldietzler in https://github.com/immich-app/immich/pull/25168
-* fix(web): show relevant navbar options for partner assets by @YarosMallorca in https://github.com/immich-app/immich/pull/24832
-* fix(web): added background gradient for video time visibility by @HemendraSinghShekhawat in https://github.com/immich-app/immich/pull/25138
-* feat(mobile): do not restore locally deleted assets during trash sync (Android) by @PeterOmbodi in https://github.com/immich-app/immich/pull/24218
-* fix: asset local type casting by @alextran1502 in https://github.com/immich-app/immich/pull/25214
-* fix(web): ocr button not clickable for stacked assets by @YarosMallorca in https://github.com/immich-app/immich/pull/25210
-* fix(web): Handle upload failures from public users by @juliancarrivick in https://github.com/immich-app/immich/pull/24826
-* fix(mobile): prevent system UI from hiding on drag down gesture by @goalie2002 in https://github.com/immich-app/immich/pull/25240
-* fix: migration order by @jrasm91 in https://github.com/immich-app/immich/pull/25249
-* fix(web): redirect to login by @jrasm91 in https://github.com/immich-app/immich/pull/25254
-* fix(mobile): improve asset transition back to timeline by @goalie2002 in https://github.com/immich-app/immich/pull/24485
-* fix: dark mode appbar color by @akashKarmakar02 in https://github.com/immich-app/immich/pull/24976
-* fix(web): add min-width to setting input field by @K0lin in https://github.com/immich-app/immich/pull/25317
-* fix(server): api key update checks by @jrasm91 in https://github.com/immich-app/immich/pull/25363
-* fix(mobile): album selector icon visibility by @ByteSizedMarius in https://github.com/immich-app/immich/pull/25311
-* fix(mobile): indicators not showing on thumbnail tile after asset change in viewer by @goalie2002 in https://github.com/immich-app/immich/pull/25297
-* fix(web): handle deletion from asset viewer on map page by @meesfrensel in https://github.com/immich-app/immich/pull/25393
-* fix: tag update race condition by @danieldietzler in https://github.com/immich-app/immich/pull/25371
-* fix(web): allow exiting pin setup flow by @meesfrensel in https://github.com/immich-app/immich/pull/25413
-* fix: upload file without extension by @alextran1502 in https://github.com/immich-app/immich/pull/25419
-* fix: incorrect asset viewer scale on image frame update by @shenlong-tanwen in https://github.com/immich-app/immich/pull/25430
-* fix(mobile): bring back map settings by @shenlong-tanwen in https://github.com/immich-app/immich/pull/25448
-* fix(web): fix badge value in queues page by @beinganukul in https://github.com/immich-app/immich/pull/25445
-* fix(mobile): backfill asset dimensions to exif table by @bwees in https://github.com/immich-app/immich/pull/25483
-### 📚 Documentation
-* fix: product keys wording in commercial guidelines faq by @bo0tzz in https://github.com/immich-app/immich/pull/24765
-* docs: config options for hardware transcoding by @Javex in https://github.com/immich-app/immich/pull/24853
-* fix: use my.immich.app as url placeholder in docs by @bo0tzz in https://github.com/immich-app/immich/pull/25153
-* chore:  update Thai README (remove "under active development" lines) by @ppnplus in https://github.com/immich-app/immich/pull/25208
-* fix(docs): add missing mermaid dependency and configuration by @bdoerfchen in https://github.com/immich-app/immich/pull/25247
-* chore(docs): update RAM req by @mmomjian in https://github.com/immich-app/immich/pull/25344
-* feat(docs): add Free Up Space section by @aviv926 in https://github.com/immich-app/immich/pull/25253
-* docs: update README_de_DE.md by @solluh in https://github.com/immich-app/immich/pull/25443
-* fix(docs): document that fullsize thumbnail might redirect to original by @meesfrensel in https://github.com/immich-app/immich/pull/25416
-
-## New Contributors
-* @wrbl606 made their first contribution in https://github.com/immich-app/immich/pull/24820
-* @keanucz made their first contribution in https://github.com/immich-app/immich/pull/24914
-* @rahul-kumar-saini made their first contribution in https://github.com/immich-app/immich/pull/24650
-* @dosten made their first contribution in https://github.com/immich-app/immich/pull/24979
-* @GustavJones made their first contribution in https://github.com/immich-app/immich/pull/24799
-* @skrmc made their first contribution in https://github.com/immich-app/immich/pull/25010
-* @ama156 made their first contribution in https://github.com/immich-app/immich/pull/24890
-* @DanielRamosAcosta made their first contribution in https://github.com/immich-app/immich/pull/24791
-* @NikhilAlapati made their first contribution in https://github.com/immich-app/immich/pull/24688
-* @flpcury made their first contribution in https://github.com/immich-app/immich/pull/24867
-* @Javex made their first contribution in https://github.com/immich-app/immich/pull/24853
-* @majiayu000 made their first contribution in https://github.com/immich-app/immich/pull/25076
-* @HemendraSinghShekhawat made their first contribution in https://github.com/immich-app/immich/pull/24547
-* @cbochs made their first contribution in https://github.com/immich-app/immich/pull/24620
-* @fabb made their first contribution in https://github.com/immich-app/immich/pull/25053
-* @ppnplus made their first contribution in https://github.com/immich-app/immich/pull/25208
-* @juliancarrivick made their first contribution in https://github.com/immich-app/immich/pull/24826
-* @bdoerfchen made their first contribution in https://github.com/immich-app/immich/pull/25247
-* @akashKarmakar02 made their first contribution in https://github.com/immich-app/immich/pull/24976
-* @K0lin made their first contribution in https://github.com/immich-app/immich/pull/25317
-* @NAM-MAN made their first contribution in https://github.com/immich-app/immich/pull/25320
-* @ByteSizedMarius made their first contribution in https://github.com/immich-app/immich/pull/25311
-* @arne182 made their first contribution in https://github.com/immich-app/immich/pull/25373
-* @solluh made their first contribution in https://github.com/immich-app/immich/pull/25443
-* @beinganukul made their first contribution in https://github.com/immich-app/immich/pull/25445
-
-**Full Changelog**: https://github.com/immich-app/immich/compare/v2.4.1...v2.5.0
-
---
-
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.106",
+  "version": "2.2.105",
  "description": "Command Line Interface (CLI) for Immich",
  "type": "module",
  "exports": "./dist/index.js",
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v2.5.0",
-    "url": "https://docs.v2.5.0.archive.immich.app"
-  },
  {
    "label": "v2.4.1",
    "url": "https://docs.v2.4.1.archive.immich.app"
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "2.5.0",
+  "version": "2.4.1",
  "description": "",
  "main": "index.js",
  "type": "module",
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -104,8 +104,6 @@
    "image_preview_description": "Medium-size image with stripped metadata, used when viewing a single asset and for machine learning",
    "image_preview_quality_description": "Preview quality from 1-100. Higher is better, but produces larger files and can reduce app responsiveness. Setting a low value may affect machine learning quality.",
    "image_preview_title": "Preview Settings",
-    "image_progressive": "Progressive",
-    "image_progressive_description": "Encode JPEG images progressively for gradual loading display. This has no effect on WebP images.",
    "image_quality": "Quality",
    "image_resolution": "Resolution",
    "image_resolution_description": "Higher resolutions can preserve more detail but take longer to encode, have larger file sizes and can reduce app responsiveness.",
@@ -451,6 +449,9 @@
  "admin_password": "Admin Password",
  "administration": "Administration",
  "advanced": "Advanced",
+  "advanced_settings_clear_image_cache": "Clear Image Cache",
+  "advanced_settings_clear_image_cache_error": "Failed to clear image cache",
+  "advanced_settings_clear_image_cache_success": "Successfully cleared {size}",
  "advanced_settings_enable_alternate_media_filter_subtitle": "Use this option to filter media during sync based on alternate criteria. Only try this if you have issues with the app detecting all albums.",
  "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Use alternate device album sync filter",
  "advanced_settings_log_level_title": "Log level: {level}",
@@ -1913,7 +1914,6 @@
  "search_filter_media_type_title": "Select media type",
  "search_filter_ocr": "Search by OCR",
  "search_filter_people_title": "Select people",
-  "search_filter_star_rating": "Star Rating",
  "search_for": "Search for",
  "search_for_existing_person": "Search for existing person",
  "search_no_more_result": "No more results",
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.5.0"
+version = "2.4.1"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.11,<4.0"
--- a/mobile/android/app/CMakeLists.txt
+++ b/mobile/android/app/CMakeLists.txt
@@ -8,3 +8,5 @@ project(native_buffer LANGUAGES C)
 add_library(native_buffer SHARED
    src/main/cpp/native_buffer.c
 )
+
+target_link_libraries(native_buffer jnigraphics)
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {

 android {
  compileSdkVersion 35
-  ndkVersion = "28.1.13356709"
+  ndkVersion = "28.2.13676358"

  compileOptions {
    sourceCompatibility JavaVersion.VERSION_17
@@ -48,6 +48,7 @@ android {
  }

  buildFeatures {
+    buildConfig true
    compose true
  }

@@ -105,8 +106,11 @@ dependencies {
  def serialization_version = '1.8.1'
  def compose_version = '1.1.1'
  def gson_version = '2.10.1'
+  def okhttp_version = '4.12.0'

  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+  implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
+  implementation 'org.chromium.net:cronet-embedded:143.7445.0'
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
  implementation "androidx.work:work-runtime-ktx:$work_version"
  implementation "androidx.concurrent:concurrent-futures:$concurrent_version"
--- a/mobile/android/app/src/main/cpp/native_buffer.c
+++ b/mobile/android/app/src/main/cpp/native_buffer.c
@@ -1,40 +1,38 @@
 #include <jni.h>
 #include <stdlib.h>
+#include <string.h>

 JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_allocateNative(
-        JNIEnv *env, jclass clazz, jint size) {
-    void *ptr = malloc(size);
-    return (jlong) ptr;
-}
-
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_allocateNative(
+Java_app_alextran_immich_NativeBuffer_allocate(
        JNIEnv *env, jclass clazz, jint size) {
    void *ptr = malloc(size);
    return (jlong) ptr;
 }

 JNIEXPORT void JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_freeNative(
+Java_app_alextran_immich_NativeBuffer_free(
        JNIEnv *env, jclass clazz, jlong address) {
    free((void *) address);
 }

+JNIEXPORT jlong JNICALL
+Java_app_alextran_immich_NativeBuffer_realloc(
+        JNIEnv *env, jclass clazz, jlong address, jint size) {
+    void *ptr = realloc((void *) address, size);
+    return (jlong) ptr;
+}
+
+JNIEXPORT jobject JNICALL
+Java_app_alextran_immich_NativeBuffer_wrap(
+        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
+    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
+}
+
 JNIEXPORT void JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_freeNative(
-        JNIEnv *env, jclass clazz, jlong address) {
-    free((void *) address);
-}
-
-JNIEXPORT jobject JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_wrapAsBuffer(
-        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
-    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
-}
-
-JNIEXPORT jobject JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_wrapAsBuffer(
-        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
-    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
+Java_app_alextran_immich_NativeBuffer_copy(
+        JNIEnv *env, jclass clazz, jobject buffer, jlong destAddress, jint offset, jint length) {
+    void *src = (*env)->GetDirectBufferAddress(env, buffer);
+    if (src != NULL) {
+        memcpy((void *) destAddress, (char *) src + offset, length);
+    }
 }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/HttpSSLOptionsPlugin.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/HttpSSLOptionsPlugin.kt
@@ -2,6 +2,7 @@ package app.alextran.immich

 import android.annotation.SuppressLint
 import android.content.Context
+import app.alextran.immich.core.SSLConfig
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
@@ -51,15 +52,18 @@ class HttpSSLOptionsPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
      when (call.method) {
        "apply" -> {
          val args = call.arguments<ArrayList<*>>()!!
+          val allowSelfSigned = args[0] as Boolean
+          val serverHost = args[1] as? String
+          val clientCertHash = (args[2] as? ByteArray)

          var tm: Array<TrustManager>? = null
-          if (args[0] as Boolean) {
-            tm = arrayOf(AllowSelfSignedTrustManager(args[1] as? String))
+          if (allowSelfSigned) {
+            tm = arrayOf(AllowSelfSignedTrustManager(serverHost))
          }

          var km: Array<KeyManager>? = null
-          if (args[2] != null) {
-            val cert = ByteArrayInputStream(args[2] as ByteArray)
+          if (clientCertHash != null) {
+            val cert = ByteArrayInputStream(clientCertHash)
            val password = (args[3] as String).toCharArray()
            val keyStore = KeyStore.getInstance("PKCS12")
            keyStore.load(cert, password)
@@ -69,6 +73,9 @@ class HttpSSLOptionsPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
            km = keyManagerFactory.keyManagers
          }

+          // Update shared SSL config for OkHttp and other HTTP clients
+          SSLConfig.apply(km, tm, allowSelfSigned, serverHost, clientCertHash?.contentHashCode() ?: 0)
+
          val sslContext = SSLContext.getInstance("TLS")
          sslContext.init(km, tm, null)
          HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory)
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt
@@ -10,8 +10,10 @@ import app.alextran.immich.background.BackgroundWorkerLockApi
 import app.alextran.immich.connectivity.ConnectivityApi
 import app.alextran.immich.connectivity.ConnectivityApiImpl
 import app.alextran.immich.core.ImmichPlugin
-import app.alextran.immich.images.ThumbnailApi
-import app.alextran.immich.images.ThumbnailsImpl
+import app.alextran.immich.images.LocalImageApi
+import app.alextran.immich.images.LocalImagesImpl
+import app.alextran.immich.images.RemoteImageApi
+import app.alextran.immich.images.RemoteImagesImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -36,7 +38,9 @@ class MainActivity : FlutterFragmentActivity() {
          NativeSyncApiImpl30(ctx)
        }
      NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
-      ThumbnailApi.setUp(messenger, ThumbnailsImpl(ctx))
+      LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
+      RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
+
      BackgroundWorkerFgHostApi.setUp(messenger, BackgroundWorkerApiImpl(ctx))
      ConnectivityApi.setUp(messenger, ConnectivityApiImpl(ctx))

--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/NativeBuffer.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/NativeBuffer.kt
@@ -0,0 +1,52 @@
+package app.alextran.immich
+
+import java.nio.ByteBuffer
+
+const val INITIAL_BUFFER_SIZE = 32 * 1024
+
+object NativeBuffer {
+  init {
+    System.loadLibrary("native_buffer")
+  }
+
+  @JvmStatic
+  external fun allocate(size: Int): Long
+
+  @JvmStatic
+  external fun free(address: Long)
+
+  @JvmStatic
+  external fun realloc(address: Long, size: Int): Long
+
+  @JvmStatic
+  external fun wrap(address: Long, capacity: Int): ByteBuffer
+
+  @JvmStatic
+  external fun copy(buffer: ByteBuffer, destAddress: Long, offset: Int, length: Int)
+}
+
+class NativeByteBuffer(initialCapacity: Int) {
+  var pointer = NativeBuffer.allocate(initialCapacity)
+  var capacity = initialCapacity
+  var offset = 0
+
+  inline fun ensureHeadroom() {
+    if (offset == capacity) {
+      capacity *= 2
+      pointer = NativeBuffer.realloc(pointer, capacity)
+    }
+  }
+
+  inline fun wrapRemaining() = NativeBuffer.wrap(pointer + offset, capacity - offset)
+
+  inline fun advance(bytesRead: Int) {
+    offset += bytesRead
+  }
+
+  inline fun free() {
+    if (pointer != 0L) {
+      NativeBuffer.free(pointer)
+      pointer = 0L
+    }
+  }
+}
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/core/SSLConfig.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/core/SSLConfig.kt
@@ -0,0 +1,73 @@
+package app.alextran.immich.core
+
+import java.security.KeyStore
+import javax.net.ssl.KeyManager
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.TrustManager
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
+
+/**
+ * Shared SSL configuration for OkHttp and HttpsURLConnection.
+ * Stores the SSLSocketFactory and X509TrustManager configured by HttpSSLOptionsPlugin.
+ */
+object SSLConfig {
+  var sslSocketFactory: SSLSocketFactory? = null
+    private set
+
+  var trustManager: X509TrustManager? = null
+    private set
+
+  var requiresCustomSSL: Boolean = false
+    private set
+
+  private val listeners = mutableListOf<() -> Unit>()
+  private var configHash: Int = 0
+
+  fun addListener(listener: () -> Unit) {
+    listeners.add(listener)
+  }
+
+  fun apply(
+    keyManagers: Array<KeyManager>?,
+    trustManagers: Array<TrustManager>?,
+    allowSelfSigned: Boolean,
+    serverHost: String?,
+    clientCertHash: Int
+  ) {
+    synchronized(this) {
+      val newHash = computeHash(allowSelfSigned, serverHost, clientCertHash)
+      val newRequiresCustomSSL = allowSelfSigned || keyManagers != null
+      if (newHash == configHash && sslSocketFactory != null && requiresCustomSSL == newRequiresCustomSSL) {
+        return  // Config unchanged, skip
+      }
+
+      val sslContext = SSLContext.getInstance("TLS")
+      sslContext.init(keyManagers, trustManagers, null)
+      sslSocketFactory = sslContext.socketFactory
+      trustManager = trustManagers?.filterIsInstance<X509TrustManager>()?.firstOrNull()
+        ?: getDefaultTrustManager()
+      requiresCustomSSL = newRequiresCustomSSL
+      configHash = newHash
+      notifyListeners()
+    }
+  }
+
+  private fun computeHash(allowSelfSigned: Boolean, serverHost: String?, clientCertHash: Int): Int {
+    var result = allowSelfSigned.hashCode()
+    result = 31 * result + (serverHost?.hashCode() ?: 0)
+    result = 31 * result + clientCertHash
+    return result
+  }
+
+  private fun notifyListeners() {
+    listeners.forEach { it() }
+  }
+
+  private fun getDefaultTrustManager(): X509TrustManager {
+    val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+    factory.init(null as KeyStore?)
+    return factory.trustManagers.filterIsInstance<X509TrustManager>().first()
+  }
+}
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImages.g.kt
@@ -13,7 +13,7 @@ import io.flutter.plugin.common.StandardMethodCodec
 import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
-private object ThumbnailsPigeonUtils {
+private object LocalImagesPigeonUtils {

  fun wrapResult(result: Any?): List<Any?> {
    return listOf(result)
@@ -47,7 +47,7 @@ class FlutterError (
  override val message: String? = null,
  val details: Any? = null
 ) : Throwable()
-private open class ThumbnailsPigeonCodec : StandardMessageCodec() {
+private open class LocalImagesPigeonCodec : StandardMessageCodec() {
  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
    return     super.readValueOfType(type, buffer)
  }
@@ -58,22 +58,22 @@ private open class ThumbnailsPigeonCodec : StandardMessageCodec() {


 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface ThumbnailApi {
-  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>>) -> Unit)
-  fun cancelImageRequest(requestId: Long)
+interface LocalImageApi {
+  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>?>) -> Unit)
+  fun cancelRequest(requestId: Long)
  fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit)

  companion object {
-    /** The codec used by ThumbnailApi. */
+    /** The codec used by LocalImageApi. */
    val codec: MessageCodec<Any?> by lazy {
-      ThumbnailsPigeonCodec()
+      LocalImagesPigeonCodec()
    }
-    /** Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`. */
+    /** Sets up an instance of `LocalImageApi` to handle messages through the `binaryMessenger`. */
    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
+    fun setUp(binaryMessenger: BinaryMessenger, api: LocalImageApi?, messageChannelSuffix: String = "") {
      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage$separatedMessageChannelSuffix", codec)
        if (api != null) {
          channel.setMessageHandler { message, reply ->
            val args = message as List<Any?>
@@ -82,13 +82,13 @@ interface ThumbnailApi {
            val widthArg = args[2] as Long
            val heightArg = args[3] as Long
            val isVideoArg = args[4] as Boolean
-            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>> ->
+            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>?> ->
              val error = result.exceptionOrNull()
              if (error != null) {
-                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
+                reply.reply(LocalImagesPigeonUtils.wrapError(error))
              } else {
                val data = result.getOrNull()
-                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
+                reply.reply(LocalImagesPigeonUtils.wrapResult(data))
              }
            }
          }
@@ -97,16 +97,16 @@ interface ThumbnailApi {
        }
      }
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest$separatedMessageChannelSuffix", codec)
        if (api != null) {
          channel.setMessageHandler { message, reply ->
            val args = message as List<Any?>
            val requestIdArg = args[0] as Long
            val wrapped: List<Any?> = try {
-              api.cancelImageRequest(requestIdArg)
+              api.cancelRequest(requestIdArg)
              listOf(null)
            } catch (exception: Throwable) {
-              ThumbnailsPigeonUtils.wrapError(exception)
+              LocalImagesPigeonUtils.wrapError(exception)
            }
            reply.reply(wrapped)
          }
@@ -115,7 +115,7 @@ interface ThumbnailApi {
        }
      }
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash$separatedMessageChannelSuffix", codec)
        if (api != null) {
          channel.setMessageHandler { message, reply ->
            val args = message as List<Any?>
@@ -123,10 +123,10 @@ interface ThumbnailApi {
            api.getThumbhash(thumbhashArg) { result: Result<Map<String, Long>> ->
              val error = result.exceptionOrNull()
              if (error != null) {
-                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
+                reply.reply(LocalImagesPigeonUtils.wrapError(error))
              } else {
                val data = result.getOrNull()
-                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
+                reply.reply(LocalImagesPigeonUtils.wrapResult(data))
              }
            }
          }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImagesImpl.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImagesImpl.kt
@@ -11,7 +11,8 @@ import android.os.OperationCanceledException
 import android.provider.MediaStore.Images
 import android.provider.MediaStore.Video
 import android.util.Size
-import java.nio.ByteBuffer
+import androidx.annotation.RequiresApi
+import app.alextran.immich.NativeBuffer
 import kotlin.math.*
 import java.util.concurrent.Executors
 import com.bumptech.glide.Glide
@@ -26,10 +27,42 @@ import java.util.concurrent.Future
 data class Request(
  val taskFuture: Future<*>,
  val cancellationSignal: CancellationSignal,
-  val callback: (Result<Map<String, Long>>) -> Unit
+  val callback: (Result<Map<String, Long>?>) -> Unit
 )

-class ThumbnailsImpl(context: Context) : ThumbnailApi {
+@RequiresApi(Build.VERSION_CODES.Q)
+inline fun ImageDecoder.Source.decodeBitmap(target: Size = Size(0, 0)): Bitmap {
+  return ImageDecoder.decodeBitmap(this) { decoder, info, _ ->
+    if (target.width > 0 && target.height > 0) {
+      val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
+      decoder.setTargetSampleSize(sample)
+    }
+    decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+    decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
+  }
+}
+
+fun Bitmap.toNativeBuffer(): Map<String, Long>  {
+  val size = width * height * 4
+  val pointer = NativeBuffer.allocate(size)
+  try {
+    val buffer = NativeBuffer.wrap(pointer, size)
+    copyPixelsToBuffer(buffer)
+    recycle()
+    return mapOf(
+      "pointer" to pointer,
+      "width" to width.toLong(),
+      "height" to height.toLong(),
+      "rowBytes" to (width * 4).toLong()
+    )
+  } catch (e: Exception) {
+    NativeBuffer.free(pointer)
+    recycle()
+    throw e
+  }
+}
+
+class LocalImagesImpl(context: Context) : LocalImageApi {
  private val ctx: Context = context.applicationContext
  private val resolver: ContentResolver = ctx.contentResolver
  private val requestThread = Executors.newSingleThreadExecutor()
@@ -38,21 +71,8 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
  private val requestMap = ConcurrentHashMap<Long, Request>()

  companion object {
-    val CANCELLED = Result.success<Map<String, Long>>(mapOf())
+    val CANCELLED = Result.success<Map<String, Long>?>(null)
    val OPTIONS = BitmapFactory.Options().apply { inPreferredConfig = Bitmap.Config.ARGB_8888 }
-
-    init {
-      System.loadLibrary("native_buffer")
-    }
-
-    @JvmStatic
-    external fun allocateNative(size: Int): Long
-
-    @JvmStatic
-    external fun freeNative(pointer: Long)
-
-    @JvmStatic
-    external fun wrapAsBuffer(address: Long, capacity: Int): ByteBuffer
  }

  override fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit) {
@@ -63,7 +83,8 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
        val res = mapOf(
          "pointer" to image.pointer,
          "width" to image.width.toLong(),
-          "height" to image.height.toLong()
+          "height" to image.height.toLong(),
+          "rowBytes" to (image.width * 4).toLong()
        )
        callback(Result.success(res))
      } catch (e: Exception) {
@@ -78,7 +99,7 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
    width: Long,
    height: Long,
    isVideo: Boolean,
-    callback: (Result<Map<String, Long>>) -> Unit
+    callback: (Result<Map<String, Long>?>) -> Unit
  ) {
    val signal = CancellationSignal()
    val task = threadPool.submit {
@@ -98,7 +119,7 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
    requestMap[requestId] = request
  }

-  override fun cancelImageRequest(requestId: Long) {
+  override fun cancelRequest(requestId: Long) {
    val request = requestMap.remove(requestId) ?: return
    request.taskFuture.cancel(false)
    request.cancellationSignal.cancel()
@@ -117,7 +138,7 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
    width: Long,
    height: Long,
    isVideo: Boolean,
-    callback: (Result<Map<String, Long>>) -> Unit,
+    callback: (Result<Map<String, Long>?>) -> Unit,
    signal: CancellationSignal
  ) {
    signal.throwIfCanceled()
@@ -131,31 +152,12 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
      decodeImage(id, size, signal)
    }

-    processBitmap(bitmap, callback, signal)
-  }
-
-  private fun processBitmap(
-    bitmap: Bitmap, callback: (Result<Map<String, Long>>) -> Unit, signal: CancellationSignal
-  ) {
-    signal.throwIfCanceled()
-    val actualWidth = bitmap.width
-    val actualHeight = bitmap.height
-
-    val size = actualWidth * actualHeight * 4
-    val pointer = allocateNative(size)
-
    try {
      signal.throwIfCanceled()
-      val buffer = wrapAsBuffer(pointer, size)
-      bitmap.copyPixelsToBuffer(buffer)
-      bitmap.recycle()
+      val res = bitmap.toNativeBuffer()
      signal.throwIfCanceled()
-      val res = mapOf(
-        "pointer" to pointer, "width" to actualWidth.toLong(), "height" to actualHeight.toLong()
-      )
      callback(Result.success(res))
    } catch (e: Exception) {
-      freeNative(pointer)
      callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
    }
  }
@@ -191,16 +193,7 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
  private fun decodeSource(uri: Uri, target: Size, signal: CancellationSignal): Bitmap {
    signal.throwIfCanceled()
    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      val source = ImageDecoder.createSource(resolver, uri)
-      signal.throwIfCanceled()
-      ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
-        if (target.width > 0 && target.height > 0) {
-          val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
-          decoder.setTargetSampleSize(sample)
-        }
-        decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
-        decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
-      }
+      ImageDecoder.createSource(resolver, uri).decodeBitmap(target)
    } else {
      val ref =
        Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri).disallowHardwareConfig()
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImages.g.kt
@@ -0,0 +1,123 @@
+// Autogenerated from Pigeon (v26.0.2), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
+
+package app.alextran.immich.images
+
+import android.util.Log
+import io.flutter.plugin.common.BasicMessageChannel
+import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
+import io.flutter.plugin.common.StandardMessageCodec
+import java.io.ByteArrayOutputStream
+import java.nio.ByteBuffer
+private object RemoteImagesPigeonUtils {
+
+  fun wrapResult(result: Any?): List<Any?> {
+    return listOf(result)
+  }
+
+  fun wrapError(exception: Throwable): List<Any?> {
+    return if (exception is FlutterError) {
+      listOf(
+        exception.code,
+        exception.message,
+        exception.details
+      )
+    } else {
+      listOf(
+        exception.javaClass.simpleName,
+        exception.toString(),
+        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
+      )
+    }
+  }
+}
+private open class RemoteImagesPigeonCodec : StandardMessageCodec() {
+  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
+    return     super.readValueOfType(type, buffer)
+  }
+  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
+    super.writeValue(stream, value)
+  }
+}
+
+
+/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
+interface RemoteImageApi {
+  fun requestImage(url: String, headers: Map<String, String>, requestId: Long, callback: (Result<Map<String, Long>?>) -> Unit)
+  fun cancelRequest(requestId: Long)
+  fun clearCache(callback: (Result<Long>) -> Unit)
+
+  companion object {
+    /** The codec used by RemoteImageApi. */
+    val codec: MessageCodec<Any?> by lazy {
+      RemoteImagesPigeonCodec()
+    }
+    /** Sets up an instance of `RemoteImageApi` to handle messages through the `binaryMessenger`. */
+    @JvmOverloads
+    fun setUp(binaryMessenger: BinaryMessenger, api: RemoteImageApi?, messageChannelSuffix: String = "") {
+      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val urlArg = args[0] as String
+            val headersArg = args[1] as Map<String, String>
+            val requestIdArg = args[2] as Long
+            api.requestImage(urlArg, headersArg, requestIdArg) { result: Result<Map<String, Long>?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(RemoteImagesPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(RemoteImagesPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val requestIdArg = args[0] as Long
+            val wrapped: List<Any?> = try {
+              api.cancelRequest(requestIdArg)
+              listOf(null)
+            } catch (exception: Throwable) {
+              RemoteImagesPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.clearCache$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            api.clearCache{ result: Result<Long> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(RemoteImagesPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(RemoteImagesPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+    }
+  }
+}
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt
@@ -0,0 +1,530 @@
+package app.alextran.immich.images
+
+import android.content.Context
+import android.os.CancellationSignal
+import android.os.OperationCanceledException
+import app.alextran.immich.BuildConfig
+import app.alextran.immich.INITIAL_BUFFER_SIZE
+import app.alextran.immich.NativeBuffer
+import app.alextran.immich.NativeByteBuffer
+import app.alextran.immich.core.SSLConfig
+import kotlinx.coroutines.*
+import okhttp3.Cache
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.ConnectionPool
+import okhttp3.Dispatcher
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.chromium.net.CronetEngine
+import org.chromium.net.CronetException
+import org.chromium.net.UrlRequest
+import org.chromium.net.UrlResponseInfo
+import java.io.EOFException
+import java.io.File
+import java.io.IOException
+import java.nio.ByteBuffer
+import java.nio.file.FileVisitResult
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.SimpleFileVisitor
+import java.nio.file.attribute.BasicFileAttributes
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import javax.net.ssl.SSLSocketFactory
+import javax.net.ssl.X509TrustManager
+
+
+private const val USER_AGENT = "Immich_Android_${BuildConfig.VERSION_NAME}"
+private const val MAX_REQUESTS_PER_HOST = 64
+private const val KEEP_ALIVE_CONNECTIONS = 10
+private const val KEEP_ALIVE_DURATION_MINUTES = 5L
+private const val CACHE_SIZE_BYTES = 1024L * 1024 * 1024
+
+private class RemoteRequest(val cancellationSignal: CancellationSignal)
+
+class RemoteImagesImpl(context: Context) : RemoteImageApi {
+  private val requestMap = ConcurrentHashMap<Long, RemoteRequest>()
+
+  init {
+    ImageFetcherManager.initialize(context)
+  }
+
+  companion object {
+    val CANCELLED = Result.success<Map<String, Long>?>(null)
+  }
+
+  override fun requestImage(
+    url: String,
+    headers: Map<String, String>,
+    requestId: Long,
+    callback: (Result<Map<String, Long>?>) -> Unit
+  ) {
+    val signal = CancellationSignal()
+    requestMap[requestId] = RemoteRequest(signal)
+
+    ImageFetcherManager.fetch(
+      url,
+      headers,
+      signal,
+      onSuccess = { buffer ->
+        requestMap.remove(requestId)
+        if (signal.isCanceled) {
+          NativeBuffer.free(buffer.pointer)
+          return@fetch callback(CANCELLED)
+        }
+
+        callback(
+          Result.success(
+            mapOf(
+              "pointer" to buffer.pointer,
+              "length" to buffer.offset.toLong()
+            )
+          )
+        )
+      },
+      onFailure = { e ->
+        requestMap.remove(requestId)
+        val result = if (signal.isCanceled) CANCELLED else Result.failure(e)
+        callback(result)
+      }
+    )
+  }
+
+  override fun cancelRequest(requestId: Long) {
+    requestMap.remove(requestId)?.cancellationSignal?.cancel()
+  }
+
+  override fun clearCache(callback: (Result<Long>) -> Unit) {
+    CoroutineScope(Dispatchers.IO).launch {
+      try {
+        ImageFetcherManager.clearCache(callback)
+      } catch (e: Exception) {
+        callback(Result.failure(e))
+      }
+    }
+  }
+}
+
+private object ImageFetcherManager {
+  private lateinit var appContext: Context
+  private lateinit var cacheDir: File
+  private lateinit var fetcher: ImageFetcher
+  private var initialized = false
+
+  fun initialize(context: Context) {
+    if (initialized) return
+    synchronized(this) {
+      if (initialized) return
+      appContext = context.applicationContext
+      cacheDir = context.cacheDir
+      fetcher = build()
+      SSLConfig.addListener(::invalidate)
+      initialized = true
+    }
+  }
+
+  fun fetch(
+    url: String,
+    headers: Map<String, String>,
+    signal: CancellationSignal,
+    onSuccess: (NativeByteBuffer) -> Unit,
+    onFailure: (Exception) -> Unit,
+  ) {
+    fetcher.fetch(url, headers, signal, onSuccess, onFailure)
+  }
+
+  fun clearCache(onCleared: (Result<Long>) -> Unit) {
+    fetcher.clearCache(onCleared)
+  }
+
+  private fun invalidate() {
+    synchronized(this) {
+      val oldFetcher = fetcher
+      if (oldFetcher is OkHttpImageFetcher && SSLConfig.requiresCustomSSL) {
+        fetcher = oldFetcher.reconfigure(SSLConfig.sslSocketFactory, SSLConfig.trustManager)
+        return
+      }
+      fetcher = build()
+      oldFetcher.drain()
+    }
+  }
+
+  private fun build(): ImageFetcher {
+    return if (SSLConfig.requiresCustomSSL) {
+      OkHttpImageFetcher.create(cacheDir, SSLConfig.sslSocketFactory, SSLConfig.trustManager)
+    } else {
+      CronetImageFetcher(appContext, cacheDir)
+    }
+  }
+}
+
+private sealed interface ImageFetcher {
+  fun fetch(
+    url: String,
+    headers: Map<String, String>,
+    signal: CancellationSignal,
+    onSuccess: (NativeByteBuffer) -> Unit,
+    onFailure: (Exception) -> Unit,
+  )
+
+  fun drain()
+
+  fun clearCache(onCleared: (Result<Long>) -> Unit)
+}
+
+private class CronetImageFetcher(context: Context, cacheDir: File) : ImageFetcher {
+  private val ctx = context
+  private var engine: CronetEngine
+  private val executor = Executors.newFixedThreadPool(4)
+  private val stateLock = Any()
+  private var activeCount = 0
+  private var draining = false
+  private var onCacheCleared: ((Result<Long>) -> Unit)? = null
+  private val storageDir = File(cacheDir, "cronet").apply { mkdirs() }
+
+  init {
+    engine = build(context)
+  }
+
+  override fun fetch(
+    url: String,
+    headers: Map<String, String>,
+    signal: CancellationSignal,
+    onSuccess: (NativeByteBuffer) -> Unit,
+    onFailure: (Exception) -> Unit,
+  ) {
+    synchronized(stateLock) {
+      if (draining) {
+        onFailure(IllegalStateException("Engine is draining"))
+        return
+      }
+      activeCount++
+    }
+
+    val callback = FetchCallback(onSuccess, onFailure, ::onComplete)
+    val requestBuilder = engine.newUrlRequestBuilder(url, callback, executor)
+    headers.forEach { (key, value) -> requestBuilder.addHeader(key, value) }
+    val request = requestBuilder.build()
+    signal.setOnCancelListener(request::cancel)
+    request.start()
+  }
+
+  private fun build(ctx: Context): CronetEngine {
+    return CronetEngine.Builder(ctx)
+      .enableHttp2(true)
+      .enableQuic(true)
+      .enableBrotli(true)
+      .setStoragePath(storageDir.absolutePath)
+      .setUserAgent(USER_AGENT)
+      .enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, CACHE_SIZE_BYTES)
+      .build()
+  }
+
+  private fun onComplete() {
+    val didDrain = synchronized(stateLock) {
+      activeCount--
+      draining && activeCount == 0
+    }
+    if (didDrain) {
+      onDrained()
+    }
+  }
+
+  override fun drain() {
+    val didDrain = synchronized(stateLock) {
+      if (draining) return
+      draining = true
+      activeCount == 0
+    }
+    if (didDrain) {
+      onDrained()
+    }
+  }
+
+  private fun onDrained() {
+    engine.shutdown()
+    val onCacheCleared = synchronized(stateLock) {
+      val onCacheCleared = onCacheCleared
+      this.onCacheCleared = null
+      onCacheCleared
+    }
+    if (onCacheCleared == null) {
+      executor.shutdown()
+    } else {
+      CoroutineScope(Dispatchers.IO).launch {
+        val result = runCatching { deleteFolderAndGetSize(storageDir.toPath()) }
+        // Cronet is very good at self-repair, so it shouldn't fail here regardless of clear result
+        engine = build(ctx)
+        synchronized(stateLock) { draining = false }
+        onCacheCleared(result)
+      }
+    }
+  }
+
+  override fun clearCache(onCleared: (Result<Long>) -> Unit) {
+    synchronized(stateLock) {
+      if (onCacheCleared != null) {
+        return onCleared(Result.success(-1))
+      }
+      onCacheCleared = onCleared
+    }
+    drain()
+  }
+
+  private class FetchCallback(
+    private val onSuccess: (NativeByteBuffer) -> Unit,
+    private val onFailure: (Exception) -> Unit,
+    private val onComplete: () -> Unit,
+  ) : UrlRequest.Callback() {
+    private var buffer: NativeByteBuffer? = null
+    private var wrapped: ByteBuffer? = null
+    private var error: Exception? = null
+
+    override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newUrl: String) {
+      request.followRedirect()
+    }
+
+    override fun onResponseStarted(request: UrlRequest, info: UrlResponseInfo) {
+      if (info.httpStatusCode !in 200..299) {
+        error = IOException("HTTP ${info.httpStatusCode}: ${info.httpStatusText}")
+        return request.cancel()
+      }
+
+      try {
+        val contentLength = info.allHeaders["content-length"]?.firstOrNull()?.toIntOrNull() ?: 0
+        if (contentLength > 0) {
+          buffer = NativeByteBuffer(contentLength + 1)
+          wrapped = NativeBuffer.wrap(buffer!!.pointer, contentLength + 1)
+          request.read(wrapped)
+        } else {
+          buffer = NativeByteBuffer(INITIAL_BUFFER_SIZE)
+          request.read(buffer!!.wrapRemaining())
+        }
+      } catch (e: Exception) {
+        error = e
+        return request.cancel()
+      }
+    }
+
+    override fun onReadCompleted(
+      request: UrlRequest,
+      info: UrlResponseInfo,
+      byteBuffer: ByteBuffer
+    ) {
+      try {
+        val buf = if (wrapped == null) {
+          buffer!!.run {
+            advance(byteBuffer.position())
+            ensureHeadroom()
+            wrapRemaining()
+          }
+        } else {
+          wrapped
+        }
+        request.read(buf)
+      } catch (e: Exception) {
+        error = e
+        return request.cancel()
+      }
+    }
+
+    override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
+      wrapped?.let { buffer!!.advance(it.position()) }
+      onSuccess(buffer!!)
+      onComplete()
+    }
+
+    override fun onFailed(request: UrlRequest, info: UrlResponseInfo?, error: CronetException) {
+      buffer?.free()
+      onFailure(error)
+      onComplete()
+    }
+
+    override fun onCanceled(request: UrlRequest, info: UrlResponseInfo?) {
+      buffer?.free()
+      onFailure(error ?: OperationCanceledException())
+      onComplete()
+    }
+  }
+
+  suspend fun deleteFolderAndGetSize(root: Path): Long = withContext(Dispatchers.IO) {
+    var totalSize = 0L
+
+    Files.walkFileTree(root, object : SimpleFileVisitor<Path>() {
+      override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
+        totalSize += attrs.size()
+        Files.delete(file)
+        return FileVisitResult.CONTINUE
+      }
+
+      override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult {
+        if (dir != root) {
+          Files.delete(dir)
+        }
+        return FileVisitResult.CONTINUE
+      }
+    })
+
+    totalSize
+  }
+}
+
+private class OkHttpImageFetcher private constructor(
+  private val client: OkHttpClient,
+) : ImageFetcher {
+  private val stateLock = Any()
+  private var activeCount = 0
+  private var draining = false
+
+  companion object {
+    fun create(
+      cacheDir: File,
+      sslSocketFactory: SSLSocketFactory?,
+      trustManager: X509TrustManager?,
+    ): OkHttpImageFetcher {
+      val dir = File(cacheDir, "okhttp")
+      val connectionPool = ConnectionPool(
+        maxIdleConnections = KEEP_ALIVE_CONNECTIONS,
+        keepAliveDuration = KEEP_ALIVE_DURATION_MINUTES,
+        timeUnit = TimeUnit.MINUTES
+      )
+
+      val builder = OkHttpClient.Builder()
+        .addInterceptor { chain ->
+          chain.proceed(
+            chain.request().newBuilder()
+              .header("User-Agent", USER_AGENT)
+              .build()
+          )
+        }
+        .dispatcher(Dispatcher().apply { maxRequestsPerHost = MAX_REQUESTS_PER_HOST })
+        .connectionPool(connectionPool)
+        .cache(Cache(File(dir, "thumbnails"), CACHE_SIZE_BYTES))
+
+      if (sslSocketFactory != null && trustManager != null) {
+        builder.sslSocketFactory(sslSocketFactory, trustManager)
+      }
+
+      return OkHttpImageFetcher(builder.build())
+    }
+  }
+
+  fun reconfigure(
+    sslSocketFactory: SSLSocketFactory?,
+    trustManager: X509TrustManager?,
+  ): OkHttpImageFetcher {
+    val builder = client.newBuilder()
+    if (sslSocketFactory != null && trustManager != null) {
+      builder.sslSocketFactory(sslSocketFactory, trustManager)
+    }
+    // Evict idle connections using old SSL config
+    client.connectionPool.evictAll()
+    return OkHttpImageFetcher(builder.build())
+  }
+
+  private fun onComplete() {
+    val shouldClose = synchronized(stateLock) {
+      activeCount--
+      draining && activeCount == 0
+    }
+    if (shouldClose) {
+      client.cache?.close()
+    }
+  }
+
+  override fun fetch(
+    url: String,
+    headers: Map<String, String>,
+    signal: CancellationSignal,
+    onSuccess: (NativeByteBuffer) -> Unit,
+    onFailure: (Exception) -> Unit,
+  ) {
+    synchronized(stateLock) {
+      if (draining) {
+        return onFailure(IllegalStateException("Client is draining"))
+      }
+      activeCount++
+    }
+
+    val requestBuilder = Request.Builder().url(url)
+    headers.forEach { (key, value) -> requestBuilder.addHeader(key, value) }
+    val call = client.newCall(requestBuilder.build())
+    signal.setOnCancelListener(call::cancel)
+
+    call.enqueue(object : Callback {
+      override fun onFailure(call: Call, e: IOException) {
+        onFailure(e)
+        onComplete()
+      }
+
+      override fun onResponse(call: Call, response: Response) {
+        response.use {
+          if (!response.isSuccessful) {
+            return onFailure(IOException("HTTP ${response.code}: ${response.message}")).also { onComplete() }
+          }
+
+          val body = response.body
+            ?: return onFailure(IOException("Empty response body")).also { onComplete() }
+
+          if (call.isCanceled()) {
+            onFailure(OperationCanceledException())
+            return onComplete()
+          }
+
+          body.source().use { source ->
+            val length = body.contentLength().toInt()
+            val buffer = NativeByteBuffer(if (length > 0) length else INITIAL_BUFFER_SIZE)
+            try {
+              if (length > 0) {
+                val wrapped = NativeBuffer.wrap(buffer.pointer, length)
+                while (wrapped.hasRemaining()) {
+                  if (call.isCanceled()) throw OperationCanceledException()
+                  if (source.read(wrapped) == -1) throw EOFException()
+                }
+                buffer.advance(length)
+              } else {
+                while (true) {
+                  if (call.isCanceled()) throw OperationCanceledException()
+                  val bytesRead = source.read(buffer.wrapRemaining())
+                  if (bytesRead == -1) break
+                  buffer.advance(bytesRead)
+                  buffer.ensureHeadroom()
+                }
+              }
+              onSuccess(buffer)
+            } catch (e: Exception) {
+              buffer.free()
+              onFailure(e)
+            }
+            onComplete()
+          }
+        }
+      }
+    })
+  }
+
+  override fun drain() {
+    val shouldClose = synchronized(stateLock) {
+      if (draining) return
+      draining = true
+      activeCount == 0
+    }
+    client.connectionPool.evictAll()
+    if (shouldClose) {
+      client.cache?.close()
+    }
+  }
+
+  override fun clearCache(onCleared: (Result<Long>) -> Unit) {
+    try {
+      val size = client.cache!!.size()
+      client.cache!!.evictAll()
+      onCleared(Result.success(size))
+    } catch (e: Exception) {
+      onCleared(Result.failure(e))
+    }
+  }
+}
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbHash.java
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbHash.java
@@ -7,6 +7,8 @@ package app.alextran.immich.images;

 import java.nio.ByteBuffer;

+import app.alextran.immich.NativeBuffer;
+
 // modified to use native allocations
 public final class ThumbHash {
  /**
@@ -56,8 +58,8 @@ public final class ThumbHash {
    int w = Math.round(ratio > 1.0f ? 32.0f : 32.0f * ratio);
    int h = Math.round(ratio > 1.0f ? 32.0f / ratio : 32.0f);
    int size = w * h * 4;
-    long pointer = ThumbnailsImpl.allocateNative(size);
-    ByteBuffer rgba = ThumbnailsImpl.wrapAsBuffer(pointer, size);
+    long pointer = NativeBuffer.allocate(size);
+    ByteBuffer rgba = NativeBuffer.wrap(pointer, size);
    int cx_stop = Math.max(lx, hasAlpha ? 5 : 3);
    int cy_stop = Math.max(ly, hasAlpha ? 5 : 3);
    float[] fx = new float[cx_stop];
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 3031,
-        "android.injected.version.name" => "2.5.0",
+        "android.injected.version.code" => 3030,
+        "android.injected.version.name" => "2.4.1",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -6,6 +6,9 @@ PODS:
    - FlutterMacOS
  - connectivity_plus (0.0.1):
    - Flutter
+  - cupertino_http (0.0.1):
+    - Flutter
+    - FlutterMacOS
  - device_info_plus (0.0.1):
    - Flutter
  - DKImagePickerController/Core (4.3.9):
@@ -136,6 +139,7 @@ DEPENDENCIES:
  - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
  - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - file_picker (from `.symlinks/plugins/file_picker/ios`)
  - Flutter (from `Flutter`)
@@ -184,6 +188,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/bonsoir_darwin/darwin"
  connectivity_plus:
    :path: ".symlinks/plugins/connectivity_plus/ios"
+  cupertino_http:
+    :path: ".symlinks/plugins/cupertino_http/darwin"
  device_info_plus:
    :path: ".symlinks/plugins/device_info_plus/ios"
  file_picker:
@@ -249,6 +255,7 @@ SPEC CHECKSUMS:
  background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
  bonsoir_darwin: 29c7ccf356646118844721f36e1de4b61f6cbd0e
  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -29,9 +29,11 @@
 		FAC6F89B2D287C890078CB2F /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = FAC6F8902D287C890078CB2F /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		FAC6F8B72D287F120078CB2F /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC6F8B52D287F120078CB2F /* ShareViewController.swift */; };
 		FAC6F8B92D287F120078CB2F /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FAC6F8B32D287F120078CB2F /* MainInterface.storyboard */; };
+		FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F12F1197D8006016CB /* LocalImages.g.swift */; };
+		FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F22F1197D8006016CB /* RemoteImages.g.swift */; };
+		FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F52F11980E006016CB /* LocalImagesImpl.swift */; };
+		FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */; };
 		FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */; };
-		FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */; };
-		FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */; };
 		FEE084F82EC172460045228E /* SQLiteData in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084F72EC172460045228E /* SQLiteData */; };
 		FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */; };
 		FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FC2EC1725A0045228E /* StructuredFieldValues */; };
@@ -118,9 +120,11 @@
 		FAC6F8B42D287F120078CB2F /* ShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShareExtension.entitlements; sourceTree = "<group>"; };
 		FAC6F8B52D287F120078CB2F /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
+		FE5499F12F1197D8006016CB /* LocalImages.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImages.g.swift; sourceTree = "<group>"; };
+		FE5499F22F1197D8006016CB /* RemoteImages.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImages.g.swift; sourceTree = "<group>"; };
+		FE5499F52F11980E006016CB /* LocalImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImagesImpl.swift; sourceTree = "<group>"; };
+		FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImagesImpl.swift; sourceTree = "<group>"; };
 		FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbhash.swift; sourceTree = "<group>"; };
-		FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbnails.g.swift; sourceTree = "<group>"; };
-		FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailsImpl.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -136,15 +140,11 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -158,8 +158,6 @@
 		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -321,9 +319,11 @@
 		FED3B1952E253E9B0030FD97 /* Images */ = {
 			isa = PBXGroup;
 			children = (
+				FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */,
+				FE5499F52F11980E006016CB /* LocalImagesImpl.swift */,
+				FE5499F12F1197D8006016CB /* LocalImages.g.swift */,
+				FE5499F22F1197D8006016CB /* RemoteImages.g.swift */,
 				FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */,
-				FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */,
-				FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */,
 			);
 			path = Images;
 			sourceTree = "<group>";
@@ -549,10 +549,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -581,10 +585,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -600,12 +608,14 @@
 				65F32F31299BD2F800CE9261 /* BackgroundServicePlugin.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */,
+				FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */,
+				FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */,
+				FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */,
 				B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */,
+				FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */,
 				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
 				B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */,
-				FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */,
 				B21E34AA2E5AFD2B0031FDB9 /* BackgroundWorkerApiImpl.swift in Sources */,
-				FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 				B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */,
 				65F32F33299D349D00CE9261 /* BackgroundSyncWorker.swift in Sources */,
--- a/mobile/ios/Runner/AppDelegate.swift
+++ b/mobile/ios/Runner/AppDelegate.swift
@@ -53,7 +53,8 @@ import UIKit
  
  public static func registerPlugins(with engine: FlutterEngine) {
    NativeSyncApiImpl.register(with: engine.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    ThumbnailApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ThumbnailApiImpl())
+    LocalImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: LocalImageApiImpl())
+    RemoteImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: RemoteImageApiImpl())
    BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: BackgroundWorkerApiImpl())
    ConnectivityApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ConnectivityApiImpl())
  }
--- a/mobile/ios/Runner/Images/LocalImages.g.swift
+++ b/mobile/ios/Runner/Images/LocalImages.g.swift
@@ -47,41 +47,41 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
 }


-private class ThumbnailsPigeonCodecReader: FlutterStandardReader {
+private class LocalImagesPigeonCodecReader: FlutterStandardReader {
 }

-private class ThumbnailsPigeonCodecWriter: FlutterStandardWriter {
+private class LocalImagesPigeonCodecWriter: FlutterStandardWriter {
 }

-private class ThumbnailsPigeonCodecReaderWriter: FlutterStandardReaderWriter {
+private class LocalImagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
  override func reader(with data: Data) -> FlutterStandardReader {
-    return ThumbnailsPigeonCodecReader(data: data)
+    return LocalImagesPigeonCodecReader(data: data)
  }

  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return ThumbnailsPigeonCodecWriter(data: data)
+    return LocalImagesPigeonCodecWriter(data: data)
  }
 }

-class ThumbnailsPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = ThumbnailsPigeonCodec(readerWriter: ThumbnailsPigeonCodecReaderWriter())
+class LocalImagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
+  static let shared = LocalImagesPigeonCodec(readerWriter: LocalImagesPigeonCodecReaderWriter())
 }


 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol ThumbnailApi {
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], Error>) -> Void)
-  func cancelImageRequest(requestId: Int64) throws
+protocol LocalImageApi {
+  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64]?, Error>) -> Void)
+  func cancelRequest(requestId: Int64) throws
  func getThumbhash(thumbhash: String, completion: @escaping (Result<[String: Int64], Error>) -> Void)
 }

 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class ThumbnailApiSetup {
-  static var codec: FlutterStandardMessageCodec { ThumbnailsPigeonCodec.shared }
-  /// Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
+class LocalImageApiSetup {
+  static var codec: FlutterStandardMessageCodec { LocalImagesPigeonCodec.shared }
+  /// Sets up an instance of `LocalImageApi` to handle messages through the `binaryMessenger`.
+  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: LocalImageApi?, messageChannelSuffix: String = "") {
    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
    if let api = api {
      requestImageChannel.setMessageHandler { message, reply in
        let args = message as! [Any?]
@@ -102,22 +102,22 @@ class ThumbnailApiSetup {
    } else {
      requestImageChannel.setMessageHandler(nil)
    }
-    let cancelImageRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
    if let api = api {
-      cancelImageRequestChannel.setMessageHandler { message, reply in
+      cancelRequestChannel.setMessageHandler { message, reply in
        let args = message as! [Any?]
        let requestIdArg = args[0] as! Int64
        do {
-          try api.cancelImageRequest(requestId: requestIdArg)
+          try api.cancelRequest(requestId: requestIdArg)
          reply(wrapResult(nil))
        } catch {
          reply(wrapError(error))
        }
      }
    } else {
-      cancelImageRequestChannel.setMessageHandler(nil)
+      cancelRequestChannel.setMessageHandler(nil)
    }
-    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
    if let api = api {
      getThumbhashChannel.setMessageHandler { message, reply in
        let args = message as! [Any?]
--- a/mobile/ios/Runner/Images/LocalImagesImpl.swift
+++ b/mobile/ios/Runner/Images/LocalImagesImpl.swift
@@ -1,19 +1,19 @@
-import CryptoKit
+import Accelerate
 import Flutter
 import MobileCoreServices
 import Photos

-class Request {
+class LocalImageRequest {
  weak var workItem: DispatchWorkItem?
  var isCancelled = false
-  let callback: (Result<[String: Int64], any Error>) -> Void
+  let callback: (Result<[String: Int64]?, any Error>) -> Void
  
-  init(callback: @escaping (Result<[String: Int64], any Error>) -> Void) {
+  init(callback: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
    self.callback = callback
  }
 }

-class ThumbnailApiImpl: ThumbnailApi {
+class LocalImageApiImpl: LocalImageApi {
  private static let imageManager = PHImageManager.default()
  private static let fetchOptions = {
    let fetchOptions = PHFetchOptions()
@@ -36,47 +36,39 @@ class ThumbnailApiImpl: ThumbnailApi {
  private static let cancelQueue = DispatchQueue(label: "thumbnail.cancellation", qos: .default)
  private static let processingQueue = DispatchQueue(label: "thumbnail.processing", qos: .userInteractive, attributes: .concurrent)
  
-  private static let rgbColorSpace = CGColorSpaceCreateDeviceRGB()
-  private static let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue).rawValue
-  private static var requests = [Int64: Request]()
-  private static let cancelledResult = Result<[String: Int64], any Error>.success([:])
+  private static var rgbaFormat = vImage_CGImageFormat(
+    bitsPerComponent: 8,
+    bitsPerPixel: 32,
+    colorSpace: CGColorSpaceCreateDeviceRGB(),
+    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
+    renderingIntent: .defaultIntent
+  )!
+  private static var requests = [Int64: LocalImageRequest]()
+  private static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
  private static let concurrencySemaphore = DispatchSemaphore(value: ProcessInfo.processInfo.activeProcessorCount * 2)
  private static let assetCache = {
    let assetCache = NSCache<NSString, PHAsset>()
    assetCache.countLimit = 10000
    return assetCache
  }()
-  private static let activitySemaphore = DispatchSemaphore(value: 1)
-  private static let willResignActiveObserver = NotificationCenter.default.addObserver(
-    forName: UIApplication.willResignActiveNotification,
-    object: nil,
-    queue: .main
-  ) { _ in
-    processingQueue.suspend()
-    activitySemaphore.wait()
-  }
-  private static let didBecomeActiveObserver = NotificationCenter.default.addObserver(
-    forName: UIApplication.didBecomeActiveNotification,
-    object: nil,
-    queue: .main
-  ) { _ in
-    processingQueue.resume()
-    activitySemaphore.signal()
-  }
  
  func getThumbhash(thumbhash: String, completion: @escaping (Result<[String : Int64], any Error>) -> Void) {
    Self.processingQueue.async {
      guard let data = Data(base64Encoded: thumbhash)
      else { return completion(.failure(PigeonError(code: "", message: "Invalid base64 string: \(thumbhash)", details: nil)))}
-
+      
      let (width, height, pointer) = thumbHashToRGBA(hash: data)
-      self.waitForActiveState()
-      completion(.success(["pointer": Int64(Int(bitPattern: pointer.baseAddress)), "width": Int64(width), "height": Int64(height)]))
+      completion(.success([
+        "pointer": Int64(Int(bitPattern: pointer.baseAddress)),
+        "width": Int64(width),
+        "height": Int64(height),
+        "rowBytes": Int64(width * 4)
+      ]))
    }
  }
  
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], any Error>) -> Void) {
-    let request = Request(callback: completion)
+  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
+    let request = LocalImageRequest(callback: completion)
    let item = DispatchWorkItem {
      if request.isCancelled {
        return completion(Self.cancelledResult)
@@ -93,7 +85,7 @@ class ThumbnailApiImpl: ThumbnailApi {
      
      guard let asset = Self.requestAsset(assetId: assetId)
      else {
-        Self.removeRequest(requestId: requestId)
+        Self.remove(requestId: requestId)
        completion(.failure(PigeonError(code: "", message: "Could not get asset data for \(assetId)", details: nil)))
        return
      }
@@ -119,70 +111,54 @@ class ThumbnailApiImpl: ThumbnailApi {
      
      guard let image = image,
            let cgImage = image.cgImage else {
-        Self.removeRequest(requestId: requestId)
+        Self.remove(requestId: requestId)
        return completion(.failure(PigeonError(code: "", message: "Could not get pixel data for \(assetId)", details: nil)))
      }
      
-      let pointer = UnsafeMutableRawPointer.allocate(
-        byteCount: Int(cgImage.width) * Int(cgImage.height) * 4,
-        alignment: MemoryLayout<UInt8>.alignment
-      )
-      
      if request.isCancelled {
-        pointer.deallocate()
        return completion(Self.cancelledResult)
      }
      
-      guard let context = CGContext(
-        data: pointer,
-        width: cgImage.width,
-        height: cgImage.height,
-        bitsPerComponent: 8,
-        bytesPerRow: cgImage.width * 4,
-        space: Self.rgbColorSpace,
-        bitmapInfo: Self.bitmapInfo
-      ) else {
-        pointer.deallocate()
-        Self.removeRequest(requestId: requestId)
-        return completion(.failure(PigeonError(code: "", message: "Could not create context for \(assetId)", details: nil)))
+      do {
+        let buffer = try vImage_Buffer(cgImage: cgImage, format: Self.rgbaFormat)
+        
+        if request.isCancelled {
+          buffer.free()
+          return completion(Self.cancelledResult)
+        }
+        
+        request.callback(.success([
+          "pointer": Int64(Int(bitPattern: buffer.data)),
+          "width": Int64(buffer.width),
+          "height": Int64(buffer.height),
+          "rowBytes": Int64(buffer.rowBytes)
+        ]))
+        print("Successful response for \(requestId)")
+        Self.remove(requestId: requestId)
+      } catch {
+        Self.remove(requestId: requestId)
+        return completion(.failure(PigeonError(code: "", message: "Failed to convert image for \(assetId): \(error)", details: nil)))
      }
-      
-      if request.isCancelled {
-        pointer.deallocate()
-        return completion(Self.cancelledResult)
-      }
-      
-      context.interpolationQuality = .none
-      context.draw(cgImage, in: CGRect(x: 0, y: 0, width: cgImage.width, height: cgImage.height))
-      
-      if request.isCancelled {
-        pointer.deallocate()
-        return completion(Self.cancelledResult)
-      }
-      
-      self.waitForActiveState()
-      completion(.success(["pointer": Int64(Int(bitPattern: pointer)), "width": Int64(cgImage.width), "height": Int64(cgImage.height)]))
-      Self.removeRequest(requestId: requestId)
    }
    
    request.workItem = item
-    Self.addRequest(requestId: requestId, request: request)
+    Self.add(requestId: requestId, request: request)
    Self.processingQueue.async(execute: item)
  }
  
-  func cancelImageRequest(requestId: Int64) {
-    Self.cancelRequest(requestId: requestId)
+  func cancelRequest(requestId: Int64) {
+    Self.cancel(requestId: requestId)
  }
  
-  private static func addRequest(requestId: Int64, request: Request) -> Void {
+  private static func add(requestId: Int64, request: LocalImageRequest) -> Void {
    requestQueue.sync { requests[requestId] = request }
  }
  
-  private static func removeRequest(requestId: Int64) -> Void {
+  private static func remove(requestId: Int64) -> Void {
    requestQueue.sync { requests[requestId] = nil }
  }
  
-  private static func cancelRequest(requestId: Int64) -> Void {
+  private static func cancel(requestId: Int64) -> Void {
    requestQueue.async {
      guard let request = requests.removeValue(forKey: requestId) else { return }
      request.isCancelled = true
@@ -203,9 +179,4 @@ class ThumbnailApiImpl: ThumbnailApi {
    assetQueue.async { assetCache.setObject(asset, forKey: assetId as NSString) }
    return asset
  }
-  
-  func waitForActiveState() {
-    Self.activitySemaphore.wait()
-    Self.activitySemaphore.signal()
-  }
 }
--- a/mobile/ios/Runner/Images/RemoteImages.g.swift
+++ b/mobile/ios/Runner/Images/RemoteImages.g.swift
@@ -0,0 +1,134 @@
+// Autogenerated from Pigeon (v26.0.2), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+
+import Foundation
+
+#if os(iOS)
+  import Flutter
+#elseif os(macOS)
+  import FlutterMacOS
+#else
+  #error("Unsupported platform.")
+#endif
+
+private func wrapResult(_ result: Any?) -> [Any?] {
+  return [result]
+}
+
+private func wrapError(_ error: Any) -> [Any?] {
+  if let pigeonError = error as? PigeonError {
+    return [
+      pigeonError.code,
+      pigeonError.message,
+      pigeonError.details,
+    ]
+  }
+  if let flutterError = error as? FlutterError {
+    return [
+      flutterError.code,
+      flutterError.message,
+      flutterError.details,
+    ]
+  }
+  return [
+    "\(error)",
+    "\(type(of: error))",
+    "Stacktrace: \(Thread.callStackSymbols)",
+  ]
+}
+
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
+private func nilOrValue<T>(_ value: Any?) -> T? {
+  if value is NSNull { return nil }
+  return value as! T?
+}
+
+
+private class RemoteImagesPigeonCodecReader: FlutterStandardReader {
+}
+
+private class RemoteImagesPigeonCodecWriter: FlutterStandardWriter {
+}
+
+private class RemoteImagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
+  override func reader(with data: Data) -> FlutterStandardReader {
+    return RemoteImagesPigeonCodecReader(data: data)
+  }
+
+  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
+    return RemoteImagesPigeonCodecWriter(data: data)
+  }
+}
+
+class RemoteImagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
+  static let shared = RemoteImagesPigeonCodec(readerWriter: RemoteImagesPigeonCodecReaderWriter())
+}
+
+
+/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
+protocol RemoteImageApi {
+  func requestImage(url: String, headers: [String: String], requestId: Int64, completion: @escaping (Result<[String: Int64]?, Error>) -> Void)
+  func cancelRequest(requestId: Int64) throws
+  func clearCache(completion: @escaping (Result<Int64, Error>) -> Void)
+}
+
+/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
+class RemoteImageApiSetup {
+  static var codec: FlutterStandardMessageCodec { RemoteImagesPigeonCodec.shared }
+  /// Sets up an instance of `RemoteImageApi` to handle messages through the `binaryMessenger`.
+  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: RemoteImageApi?, messageChannelSuffix: String = "") {
+    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
+    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      requestImageChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let urlArg = args[0] as! String
+        let headersArg = args[1] as! [String: String]
+        let requestIdArg = args[2] as! Int64
+        api.requestImage(url: urlArg, headers: headersArg, requestId: requestIdArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      requestImageChannel.setMessageHandler(nil)
+    }
+    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      cancelRequestChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let requestIdArg = args[0] as! Int64
+        do {
+          try api.cancelRequest(requestId: requestIdArg)
+          reply(wrapResult(nil))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      cancelRequestChannel.setMessageHandler(nil)
+    }
+    let clearCacheChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.clearCache\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      clearCacheChannel.setMessageHandler { _, reply in
+        api.clearCache { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      clearCacheChannel.setMessageHandler(nil)
+    }
+  }
+}
--- a/mobile/ios/Runner/Images/RemoteImagesImpl.swift
+++ b/mobile/ios/Runner/Images/RemoteImagesImpl.swift
@@ -0,0 +1,185 @@
+import Accelerate
+import Flutter
+import MobileCoreServices
+import Photos
+
+class RemoteImageRequest {
+  weak var task: URLSessionDataTask?
+  let id: Int64
+  var isCancelled = false
+  var data: CFMutableData?
+  let completion: (Result<[String: Int64]?, any Error>) -> Void
+  
+  init(id: Int64, task: URLSessionDataTask, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
+    self.id = id
+    self.task = task
+    self.data = nil
+    self.completion = completion
+  }
+}
+
+class RemoteImageApiImpl: NSObject, RemoteImageApi {
+  private static let delegate = RemoteImageApiDelegate()
+  static let cacheDir = FileManager.default.temporaryDirectory.appendingPathComponent(
+    "thumbnails", isDirectory: true)
+  static let session = {
+    let config = URLSessionConfiguration.default
+    let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "unknown"
+    config.httpAdditionalHeaders = ["User-Agent": "Immich_iOS_\(version)"]
+    try! FileManager.default.createDirectory(at: cacheDir, withIntermediateDirectories: true)
+    config.urlCache = URLCache(
+      memoryCapacity: 0,
+      diskCapacity: 1 << 30,
+      directory: cacheDir
+    )
+    config.httpMaximumConnectionsPerHost = 16
+    return URLSession(configuration: config, delegate: delegate, delegateQueue: nil)
+  }()
+  
+  func requestImage(url: String, headers: [String : String], requestId: Int64, completion: @escaping (Result<[String : Int64]?, any Error>) -> Void) {
+    var urlRequest = URLRequest(url: URL(string: url)!)
+    for (key, value) in headers {
+      urlRequest.setValue(value, forHTTPHeaderField: key)
+    }
+    let task = Self.session.dataTask(with: urlRequest)
+    
+    let imageRequest = RemoteImageRequest(id: requestId, task: task, completion: completion)
+    Self.delegate.add(taskId: task.taskIdentifier, request: imageRequest)
+    
+    task.resume()
+  }
+  
+  func cancelRequest(requestId: Int64) {
+    Self.delegate.cancel(requestId: requestId)
+  }
+  
+  func clearCache(completion: @escaping (Result<Int64, any Error>) -> Void) {
+    Task {
+      let cache = Self.session.configuration.urlCache!
+      let cacheSize = Int64(cache.currentDiskUsage)
+      cache.removeAllCachedResponses()
+      completion(.success(cacheSize))
+    }
+  }
+}
+
+class RemoteImageApiDelegate: NSObject, URLSessionDataDelegate {
+  private static let requestQueue = DispatchQueue(label: "thumbnail.requests", qos: .userInitiated, attributes: .concurrent)
+  private static var rgbaFormat = vImage_CGImageFormat(
+    bitsPerComponent: 8,
+    bitsPerPixel: 32,
+    colorSpace: CGColorSpaceCreateDeviceRGB(),
+    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
+    renderingIntent: .perceptual
+  )!
+  private static var requestByTaskId = [Int: RemoteImageRequest]()
+  private static var taskIdByRequestId = [Int64: Int]()
+  private static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
+  private static let decodeOptions = [
+    kCGImageSourceShouldCache: false,
+    kCGImageSourceShouldCacheImmediately: true,
+    kCGImageSourceCreateThumbnailWithTransform: true,
+  ] as CFDictionary
+  
+  func urlSession(
+    _ session: URLSession, dataTask: URLSessionDataTask,
+    didReceive response: URLResponse,
+    completionHandler: @escaping (URLSession.ResponseDisposition) -> Void
+  ) {
+    guard let request = get(taskId: dataTask.taskIdentifier)
+    else {
+      return completionHandler(.cancel)
+    }
+    
+    let capacity = max(Int(response.expectedContentLength), 0)
+    request.data = CFDataCreateMutable(nil, capacity)
+    
+    completionHandler(.allow)
+  }
+  
+  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask,
+                  didReceive data: Data) {
+    guard let request = get(taskId: dataTask.taskIdentifier) else { return }
+    
+    data.withUnsafeBytes { bytes in
+      CFDataAppendBytes(request.data, bytes.bindMemory(to: UInt8.self).baseAddress, data.count)
+    }
+  }
+  
+  func urlSession(_ session: URLSession, task: URLSessionTask,
+                  didCompleteWithError error: Error?) {
+    guard let request = get(taskId: task.taskIdentifier) else { return }
+        
+    defer { remove(taskId: task.taskIdentifier, requestId: request.id) }
+    
+    if let error = error {
+      if request.isCancelled || (error as NSError).code == NSURLErrorCancelled {
+        return request.completion(Self.cancelledResult)
+      }
+      return request.completion(.failure(error))
+    }
+    
+    if request.isCancelled {
+      return request.completion(Self.cancelledResult)
+    }
+    
+    guard let data = request.data else {
+      return request.completion(.failure(PigeonError(code: "", message: "No data received", details: nil)))
+    }
+    
+    guard let imageSource = CGImageSourceCreateWithData(data, nil),
+          let cgImage = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, Self.decodeOptions) else {
+      return request.completion(.failure(PigeonError(code: "", message: "Failed to decode image for request", details: nil)))
+    }
+    
+    if request.isCancelled {
+      return request.completion(Self.cancelledResult)
+    }
+    
+    do {
+      let buffer = try vImage_Buffer(cgImage: cgImage, format: Self.rgbaFormat)
+      
+      if request.isCancelled {
+        buffer.free()
+        return request.completion(Self.cancelledResult)
+      }
+      
+      request.completion(
+        .success([
+          "pointer": Int64(Int(bitPattern: buffer.data)),
+          "width": Int64(buffer.width),
+          "height": Int64(buffer.height),
+          "rowBytes": Int64(buffer.rowBytes),
+        ]))
+    } catch {
+      return request.completion(.failure(PigeonError(code: "", message: "Failed to convert image for request: \(error)", details: nil)))
+    }
+  }
+  
+  @inline(__always) func get(taskId: Int) -> RemoteImageRequest? {
+    Self.requestQueue.sync { Self.requestByTaskId[taskId] }
+  }
+  
+  @inline(__always) func add(taskId: Int, request: RemoteImageRequest) -> Void {
+    Self.requestQueue.async(flags: .barrier) {
+      Self.requestByTaskId[taskId] = request
+      Self.taskIdByRequestId[request.id] = taskId
+    }
+  }
+  
+  @inline(__always) func remove(taskId: Int, requestId: Int64) -> Void {
+    Self.requestQueue.async(flags: .barrier) {
+      Self.taskIdByRequestId[requestId] = nil
+      Self.requestByTaskId[taskId] = nil
+    }
+  }
+  
+  @inline(__always) func cancel(requestId: Int64) -> Void {
+    guard let request: RemoteImageRequest = (Self.requestQueue.sync {
+      guard let taskId = Self.taskIdByRequestId[requestId] else { return nil }
+      return Self.requestByTaskId[taskId]
+    }) else { return }
+    request.isCancelled = true
+    request.task?.cancel()
+  }
+}
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -80,7 +80,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -6,7 +6,6 @@ class ExifInfo {
  final String? orientation;
  final String? timeZone;
  final DateTime? dateTimeOriginal;
-  final int? rating;

  // GPS
  final double? latitude;
@@ -47,7 +46,6 @@ class ExifInfo {
    this.orientation,
    this.timeZone,
    this.dateTimeOriginal,
-    this.rating,
    this.isFlipped = false,
    this.latitude,
    this.longitude,
@@ -73,7 +71,6 @@ class ExifInfo {
        other.orientation == orientation &&
        other.timeZone == timeZone &&
        other.dateTimeOriginal == dateTimeOriginal &&
-        other.rating == rating &&
        other.latitude == latitude &&
        other.longitude == longitude &&
        other.city == city &&
@@ -97,7 +94,6 @@ class ExifInfo {
        isFlipped.hashCode ^
        timeZone.hashCode ^
        dateTimeOriginal.hashCode ^
-        rating.hashCode ^
        latitude.hashCode ^
        longitude.hashCode ^
        city.hashCode ^
@@ -122,7 +118,6 @@ orientation: ${orientation ?? 'NA'},
 isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
-rating: ${rating ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
 longitude: ${longitude ?? 'NA'},
 city: ${city ?? 'NA'},
@@ -145,7 +140,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
    String? orientation,
    String? timeZone,
    DateTime? dateTimeOriginal,
-    int? rating,
    double? latitude,
    double? longitude,
    String? city,
@@ -167,7 +161,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
      orientation: orientation ?? this.orientation,
      timeZone: timeZone ?? this.timeZone,
      dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
-      rating: rating ?? this.rating,
      isFlipped: isFlipped ?? this.isFlipped,
      latitude: latitude ?? this.latitude,
      longitude: longitude ?? this.longitude,
--- a/mobile/lib/infrastructure/entities/exif.entity.dart
+++ b/mobile/lib/infrastructure/entities/exif.entity.dart
@@ -151,7 +151,6 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
  domain.ExifInfo toDto() => domain.ExifInfo(
    fileSize: fileSize,
    dateTimeOriginal: dateTimeOriginal,
-    rating: rating,
    timeZone: timeZone,
    make: make,
    model: model,
--- a/mobile/lib/infrastructure/loaders/image_request.dart
+++ b/mobile/lib/infrastructure/loaders/image_request.dart
@@ -1,15 +1,12 @@
 import 'dart:async';
 import 'dart:ffi';
-import 'dart:io';
 import 'dart:ui' as ui;

 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:ffi/ffi.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:logging/logging.dart';

 part 'local_image_request.dart';
 part 'thumbhash_image_request.dart';
@@ -37,27 +34,61 @@ abstract class ImageRequest {

  void _onCancelled();

-  Future<ui.FrameInfo?> _fromPlatformImage(Map<String, int> info) async {
-    final address = info['pointer'];
-    if (address == null) {
-      return null;
-    }
-
+  Future<ui.FrameInfo?> _fromEncodedPlatformImage(int address, int length) async {
    final pointer = Pointer<Uint8>.fromAddress(address);
    if (_isCancelled) {
      malloc.free(pointer);
      return null;
    }

-    final int actualWidth;
-    final int actualHeight;
-    final int actualSize;
    final ui.ImmutableBuffer buffer;
    try {
-      actualWidth = info['width']!;
-      actualHeight = info['height']!;
-      actualSize = actualWidth * actualHeight * 4;
-      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(actualSize));
+      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(length));
+    } finally {
+      malloc.free(pointer);
+    }
+
+    if (_isCancelled) {
+      buffer.dispose();
+      return null;
+    }
+
+    final descriptor = await ui.ImageDescriptor.encoded(buffer);
+    if (_isCancelled) {
+      buffer.dispose();
+      descriptor.dispose();
+      return null;
+    }
+
+    final codec = await descriptor.instantiateCodec();
+    buffer.dispose();
+    descriptor.dispose();
+    if (_isCancelled) {
+      codec.dispose();
+      return null;
+    }
+
+    final frame = await codec.getNextFrame();
+    codec.dispose();
+    if (_isCancelled) {
+      frame.image.dispose();
+      return null;
+    }
+
+    return frame;
+  }
+
+  Future<ui.FrameInfo?> _fromDecodedPlatformImage(int address, int width, int height, int rowBytes) async {
+    final pointer = Pointer<Uint8>.fromAddress(address);
+    if (_isCancelled) {
+      malloc.free(pointer);
+      return null;
+    }
+
+    final size = rowBytes * height;
+    final ui.ImmutableBuffer buffer;
+    try {
+      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(size));
    } finally {
      malloc.free(pointer);
    }
@@ -69,18 +100,27 @@ abstract class ImageRequest {

    final descriptor = ui.ImageDescriptor.raw(
      buffer,
-      width: actualWidth,
-      height: actualHeight,
+      width: width,
+      height: height,
+      rowBytes: rowBytes,
      pixelFormat: ui.PixelFormat.rgba8888,
    );
    final codec = await descriptor.instantiateCodec();
+
+    buffer.dispose();
+    descriptor.dispose();
    if (_isCancelled) {
-      buffer.dispose();
-      descriptor.dispose();
      codec.dispose();
      return null;
    }

-    return await codec.getNextFrame();
+    final frame = await codec.getNextFrame();
+    codec.dispose();
+    if (_isCancelled) {
+      frame.image.dispose();
+      return null;
+    }
+
+    return frame;
  }
 }
--- a/mobile/lib/infrastructure/loaders/local_image_request.dart
+++ b/mobile/lib/infrastructure/loaders/local_image_request.dart
@@ -16,20 +16,23 @@ class LocalImageRequest extends ImageRequest {
      return null;
    }

-    final Map<String, int> info = await thumbnailApi.requestImage(
+    final info = await localImageApi.requestImage(
      localId,
      requestId: requestId,
      width: width,
      height: height,
      isVideo: assetType == AssetType.video,
    );
+    if (info == null) {
+      return null;
+    }

-    final frame = await _fromPlatformImage(info);
+    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
  }

  @override
  Future<void> _onCancelled() {
-    return thumbnailApi.cancelImageRequest(requestId);
+    return localImageApi.cancelRequest(requestId);
  }
 }
--- a/mobile/lib/infrastructure/loaders/remote_image_request.dart
+++ b/mobile/lib/infrastructure/loaders/remote_image_request.dart
@@ -1,14 +1,10 @@
 part of 'image_request.dart';

 class RemoteImageRequest extends ImageRequest {
-  static final log = Logger('RemoteImageRequest');
-  static final client = HttpClient()..maxConnectionsPerHost = 16;
-  final RemoteCacheManager? cacheManager;
  final String uri;
  final Map<String, String> headers;
-  HttpClientRequest? _request;

-  RemoteImageRequest({required this.uri, required this.headers, this.cacheManager});
+  RemoteImageRequest({required this.uri, required this.headers});

  @override
  Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
@@ -16,164 +12,18 @@ class RemoteImageRequest extends ImageRequest {
      return null;
    }

-    // TODO: the cache manager makes everything sequential with its DB calls and its operations cannot be cancelled,
-    //  so it ends up being a bottleneck.  We only prefer fetching from it when it can skip the DB call.
-    final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: true);
-    if (cachedFileImage != null) {
-      return cachedFileImage;
-    }
-
-    try {
-      final buffer = await _downloadImage(uri);
-      if (buffer == null) {
-        return null;
-      }
-
-      return await _decodeBuffer(buffer, decode, scale);
-    } catch (e) {
-      if (_isCancelled) {
-        return null;
-      }
-
-      final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: false);
-      if (cachedFileImage != null) {
-        return cachedFileImage;
-      }
-
-      rethrow;
-    } finally {
-      _request = null;
-    }
-  }
-
-  Future<ImmutableBuffer?> _downloadImage(String url) async {
-    if (_isCancelled) {
-      return null;
-    }
-
-    final request = _request = await client.getUrl(Uri.parse(url));
-    if (_isCancelled) {
-      request.abort();
-      return _request = null;
-    }
-
-    for (final entry in headers.entries) {
-      request.headers.set(entry.key, entry.value);
-    }
-    final response = await request.close();
-    if (_isCancelled) {
-      return null;
-    }
-
-    final cacheManager = this.cacheManager;
-    final streamController = StreamController<List<int>>(sync: true);
-    final Stream<List<int>> stream;
-    unawaited(cacheManager?.putStreamedFile(url, streamController.stream));
-    stream = response.map((chunk) {
-      if (_isCancelled) {
-        throw StateError('Cancelled request');
-      }
-      if (cacheManager != null) {
-        streamController.add(chunk);
-      }
-      return chunk;
-    });
-
-    try {
-      final Uint8List bytes = await _downloadBytes(stream, response.contentLength);
-      unawaited(streamController.close());
-      return await ImmutableBuffer.fromUint8List(bytes);
-    } catch (e) {
-      streamController.addError(e);
-      unawaited(streamController.close());
-      if (_isCancelled) {
-        return null;
-      }
-      rethrow;
-    }
-  }
-
-  Future<Uint8List> _downloadBytes(Stream<List<int>> stream, int length) async {
-    final Uint8List bytes;
-    int offset = 0;
-    if (length > 0) {
-      // Known content length - use pre-allocated buffer
-      bytes = Uint8List(length);
-      await stream.listen((chunk) {
-        bytes.setAll(offset, chunk);
-        offset += chunk.length;
-      }, cancelOnError: true).asFuture();
-    } else {
-      // Unknown content length - collect chunks dynamically
-      final chunks = <List<int>>[];
-      int totalLength = 0;
-      await stream.listen((chunk) {
-        chunks.add(chunk);
-        totalLength += chunk.length;
-      }, cancelOnError: true).asFuture();
-
-      bytes = Uint8List(totalLength);
-      for (final chunk in chunks) {
-        bytes.setAll(offset, chunk);
-        offset += chunk.length;
-      }
-    }
-
-    return bytes;
-  }
-
-  Future<ImageInfo?> _loadCachedFile(
-    String url,
-    ImageDecoderCallback decode,
-    double scale, {
-    required bool inMemoryOnly,
-  }) async {
-    final cacheManager = this.cacheManager;
-    if (_isCancelled || cacheManager == null) {
-      return null;
-    }
-
-    final file = await (inMemoryOnly ? cacheManager.getFileFromMemory(url) : cacheManager.getFileFromCache(url));
-    if (_isCancelled || file == null) {
-      return null;
-    }
-
-    try {
-      final buffer = await ImmutableBuffer.fromFilePath(file.file.path);
-      return await _decodeBuffer(buffer, decode, scale);
-    } catch (e) {
-      log.severe('Failed to decode cached image', e);
-      unawaited(_evictFile(url));
-      return null;
-    }
-  }
-
-  Future<void> _evictFile(String url) async {
-    try {
-      await cacheManager?.removeFile(url);
-    } catch (e) {
-      log.severe('Failed to remove cached image', e);
-    }
-  }
-
-  Future<ImageInfo?> _decodeBuffer(ImmutableBuffer buffer, ImageDecoderCallback decode, scale) async {
-    if (_isCancelled) {
-      buffer.dispose();
-      return null;
-    }
-    final codec = await decode(buffer);
-    if (_isCancelled) {
-      buffer.dispose();
-      codec.dispose();
-      return null;
-    }
-    final frame = await codec.getNextFrame();
-    return ImageInfo(image: frame.image, scale: scale);
+    final info = await remoteImageApi.requestImage(uri, headers: headers, requestId: requestId);
+    final frame = switch (info) {
+      {'pointer': int pointer, 'length': int length} => await _fromEncodedPlatformImage(pointer, length),
+      {'pointer': int pointer, 'width': int width, 'height': int height, 'rowBytes': int rowBytes} =>
+        await _fromDecodedPlatformImage(pointer, width, height, rowBytes),
+      _ => null,
+    };
+    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
  }

  @override
-  void _onCancelled() {
-    _request?.abort();
-    _request = null;
+  Future<void> _onCancelled() {
+    return remoteImageApi.cancelRequest(requestId);
  }
 }
--- a/mobile/lib/infrastructure/loaders/thumbhash_image_request.dart
+++ b/mobile/lib/infrastructure/loaders/thumbhash_image_request.dart
@@ -11,8 +11,8 @@ class ThumbhashImageRequest extends ImageRequest {
      return null;
    }

-    final Map<String, int> info = await thumbnailApi.getThumbhash(thumbhash);
-    final frame = await _fromPlatformImage(info);
+    final Map<String, int> info = await localImageApi.getThumbhash(thumbhash);
+    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
  }

--- a/mobile/lib/infrastructure/repositories/network.repository.dart
+++ b/mobile/lib/infrastructure/repositories/network.repository.dart
@@ -0,0 +1,67 @@
+import 'dart:io';
+
+import 'package:cronet_http/cronet_http.dart';
+import 'package:cupertino_http/cupertino_http.dart';
+import 'package:http/http.dart' as http;
+import 'package:immich_mobile/utils/user_agent.dart';
+import 'package:path_provider/path_provider.dart';
+
+class NetworkRepository {
+  static late Directory _cachePath;
+  static late String _userAgent;
+  static final _clients = <String, http.Client>{};
+
+  static Future<void> init() {
+    return (
+      getTemporaryDirectory().then((cachePath) => _cachePath = cachePath),
+      getUserAgentString().then((userAgent) => _userAgent = userAgent),
+    ).wait;
+  }
+
+  static void reset() {
+    Future.microtask(init);
+    for (final client in _clients.values) {
+      client.close();
+    }
+    _clients.clear();
+  }
+
+  const NetworkRepository();
+
+  /// Note: when disk caching is enabled, only one client may use a given directory at a time.
+  /// Different isolates or engines must use different directories.
+  http.Client getHttpClient(
+    String directoryName, {
+    CacheMode cacheMode = CacheMode.memory,
+    int diskCapacity = 0,
+    int maxConnections = 6,
+    int memoryCapacity = 10 << 20,
+  }) {
+    final cachedClient = _clients[directoryName];
+    if (cachedClient != null) {
+      return cachedClient;
+    }
+
+    final directory = Directory('${_cachePath.path}/$directoryName');
+    directory.createSync(recursive: true);
+    if (Platform.isAndroid) {
+      final engine = CronetEngine.build(
+        cacheMode: cacheMode,
+        cacheMaxSize: diskCapacity,
+        storagePath: directory.path,
+        userAgent: _userAgent,
+      );
+      return _clients[directoryName] = CronetClient.fromCronetEngine(engine, closeEngine: true);
+    }
+
+    final config = URLSessionConfiguration.defaultSessionConfiguration()
+      ..httpMaximumConnectionsPerHost = maxConnections
+      ..cache = URLCache.withCapacity(
+        diskCapacity: diskCapacity,
+        memoryCapacity: memoryCapacity,
+        directory: directory.uri,
+      )
+      ..httpAdditionalHeaders = {'User-Agent': _userAgent};
+    return _clients[directoryName] = CupertinoClient.fromSessionConfiguration(config);
+  }
+}
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -255,12 +255,6 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
    );
  }

-  Future<void> updateRating(String assetId, int rating) async {
-    await (_db.remoteExifEntity.update()..where((row) => row.assetId.equals(assetId))).write(
-      RemoteExifEntityCompanion(rating: Value(rating)),
-    );
-  }
-
  Future<int> getCount() {
    return _db.managers.remoteAssetEntity.count();
  }
--- a/mobile/lib/infrastructure/repositories/search_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/search_api.repository.dart
@@ -31,7 +31,6 @@ class SearchApiRepository extends ApiRepository {
          takenAfter: filter.date.takenAfter,
          takenBefore: filter.date.takenBefore,
          visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-          rating: filter.rating.rating,
          isFavorite: filter.display.isFavorite ? true : null,
          isNotInAlbum: filter.display.isNotInAlbum ? true : null,
          personIds: filter.people.map((e) => e.id).toList(),
@@ -55,7 +54,6 @@ class SearchApiRepository extends ApiRepository {
        takenAfter: filter.date.takenAfter,
        takenBefore: filter.date.takenBefore,
        visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-        rating: filter.rating.rating,
        isFavorite: filter.display.isFavorite ? true : null,
        isNotInAlbum: filter.display.isNotInAlbum ? true : null,
        personIds: filter.people.map((e) => e.id).toList(),
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -240,8 +240,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            rating: Value(exif.rating),
            projectionType: Value(exif.projectionType),
            lens: Value(exif.lensModel),
-            width: Value(exif.exifImageWidth),
-            height: Value(exif.exifImageHeight),
          );

          batch.insert(
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -19,6 +19,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/intl_keys.g.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
@@ -237,6 +238,14 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
    super.dispose();
  }

+  @override
+  void reassemble() {
+    if (kDebugMode) {
+      NetworkRepository.reset();
+    }
+    super.reassemble();
+  }
+
  @override
  Widget build(BuildContext context) {
    final router = ref.watch(appRouterProvider);
--- a/mobile/lib/models/search/search_filter.model.dart
+++ b/mobile/lib/models/search/search_filter.model.dart
@@ -126,41 +126,6 @@ class SearchDateFilter {
  int get hashCode => takenBefore.hashCode ^ takenAfter.hashCode;
 }

-class SearchRatingFilter {
-  int? rating;
-  SearchRatingFilter({this.rating});
-
-  SearchRatingFilter copyWith({int? rating}) {
-    return SearchRatingFilter(rating: rating ?? this.rating);
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{'rating': rating};
-  }
-
-  factory SearchRatingFilter.fromMap(Map<String, dynamic> map) {
-    return SearchRatingFilter(rating: map['rating'] != null ? map['rating'] as int : null);
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchRatingFilter.fromJson(String source) =>
-      SearchRatingFilter.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'SearchRatingFilter(rating: $rating)';
-
-  @override
-  bool operator ==(covariant SearchRatingFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.rating == rating;
-  }
-
-  @override
-  int get hashCode => rating.hashCode;
-}
-
 class SearchDisplayFilters {
  bool isNotInAlbum = false;
  bool isArchive = false;
@@ -218,7 +183,6 @@ class SearchFilter {
  SearchLocationFilter location;
  SearchCameraFilter camera;
  SearchDateFilter date;
-  SearchRatingFilter rating;
  SearchDisplayFilters display;

  // Enum
@@ -236,7 +200,6 @@ class SearchFilter {
    required this.camera,
    required this.date,
    required this.display,
-    required this.rating,
    required this.mediaType,
  });

@@ -257,7 +220,6 @@ class SearchFilter {
        display.isNotInAlbum == false &&
        display.isArchive == false &&
        display.isFavorite == false &&
-        rating.rating == null &&
        mediaType == AssetType.other;
  }

@@ -273,7 +235,6 @@ class SearchFilter {
    SearchCameraFilter? camera,
    SearchDateFilter? date,
    SearchDisplayFilters? display,
-    SearchRatingFilter? rating,
    AssetType? mediaType,
  }) {
    return SearchFilter(
@@ -288,14 +249,13 @@ class SearchFilter {
      camera: camera ?? this.camera,
      date: date ?? this.date,
      display: display ?? this.display,
-      rating: rating ?? this.rating,
      mediaType: mediaType ?? this.mediaType,
    );
  }

  @override
  String toString() {
-    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, rating: $rating, mediaType: $mediaType, assetId: $assetId)';
+    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, mediaType: $mediaType, assetId: $assetId)';
  }

  @override
@@ -313,7 +273,6 @@ class SearchFilter {
        other.camera == camera &&
        other.date == date &&
        other.display == display &&
-        other.rating == rating &&
        other.mediaType == mediaType;
  }

@@ -330,7 +289,6 @@ class SearchFilter {
        camera.hashCode ^
        date.hashCode ^
        display.hashCode ^
-        rating.hashCode ^
        mediaType.hashCode;
  }
 }
--- a/mobile/lib/pages/library/places/places_collection.page.dart
+++ b/mobile/lib/pages/library/places/places_collection.page.dart
@@ -113,7 +113,6 @@ class PlaceTile extends StatelessWidget {
            camera: SearchCameraFilter(),
            date: SearchDateFilter(),
            display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-            rating: SearchRatingFilter(),
            mediaType: AssetType.other,
          ),
        ),
--- a/mobile/lib/pages/search/search.page.dart
+++ b/mobile/lib/pages/search/search.page.dart
@@ -43,7 +43,6 @@ class SearchPage extends HookConsumerWidget {
        date: prefilter?.date ?? SearchDateFilter(),
        display: prefilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
        mediaType: prefilter?.mediaType ?? AssetType.other,
-        rating: prefilter?.rating ?? SearchRatingFilter(),
        language: "${context.locale.languageCode}-${context.locale.countryCode}",
      ),
    );
--- a/mobile/lib/platform/local_image_api.g.dart
+++ b/mobile/lib/platform/local_image_api.g.dart
@@ -0,0 +1,137 @@
+// Autogenerated from Pigeon (v26.0.2), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
+
+import 'dart:async';
+import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
+
+import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
+import 'package:flutter/services.dart';
+
+PlatformException _createConnectionError(String channelName) {
+  return PlatformException(
+    code: 'channel-error',
+    message: 'Unable to establish connection on channel: "$channelName".',
+  );
+}
+
+class _PigeonCodec extends StandardMessageCodec {
+  const _PigeonCodec();
+  @override
+  void writeValue(WriteBuffer buffer, Object? value) {
+    if (value is int) {
+      buffer.putUint8(4);
+      buffer.putInt64(value);
+    } else {
+      super.writeValue(buffer, value);
+    }
+  }
+
+  @override
+  Object? readValueOfType(int type, ReadBuffer buffer) {
+    switch (type) {
+      default:
+        return super.readValueOfType(type, buffer);
+    }
+  }
+}
+
+class LocalImageApi {
+  /// Constructor for [LocalImageApi].  The [binaryMessenger] named argument is
+  /// available for dependency injection.  If it is left null, the default
+  /// BinaryMessenger will be used which routes to the host platform.
+  LocalImageApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+    : pigeonVar_binaryMessenger = binaryMessenger,
+      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+  final BinaryMessenger? pigeonVar_binaryMessenger;
+
+  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
+
+  final String pigeonVar_messageChannelSuffix;
+
+  Future<Map<String, int>?> requestImage(
+    String assetId, {
+    required int requestId,
+    required int width,
+    required int height,
+    required bool isVideo,
+  }) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[
+      assetId,
+      requestId,
+      width,
+      height,
+      isVideo,
+    ]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)?.cast<String, int>();
+    }
+  }
+
+  Future<void> cancelRequest(int requestId) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[requestId]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return;
+    }
+  }
+
+  Future<Map<String, int>> getThumbhash(String thumbhash) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[thumbhash]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, int>();
+    }
+  }
+}
--- a/mobile/lib/platform/remote_image_api.g.dart
+++ b/mobile/lib/platform/remote_image_api.g.dart
@@ -0,0 +1,129 @@
+// Autogenerated from Pigeon (v26.0.2), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
+
+import 'dart:async';
+import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
+
+import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
+import 'package:flutter/services.dart';
+
+PlatformException _createConnectionError(String channelName) {
+  return PlatformException(
+    code: 'channel-error',
+    message: 'Unable to establish connection on channel: "$channelName".',
+  );
+}
+
+class _PigeonCodec extends StandardMessageCodec {
+  const _PigeonCodec();
+  @override
+  void writeValue(WriteBuffer buffer, Object? value) {
+    if (value is int) {
+      buffer.putUint8(4);
+      buffer.putInt64(value);
+    } else {
+      super.writeValue(buffer, value);
+    }
+  }
+
+  @override
+  Object? readValueOfType(int type, ReadBuffer buffer) {
+    switch (type) {
+      default:
+        return super.readValueOfType(type, buffer);
+    }
+  }
+}
+
+class RemoteImageApi {
+  /// Constructor for [RemoteImageApi].  The [binaryMessenger] named argument is
+  /// available for dependency injection.  If it is left null, the default
+  /// BinaryMessenger will be used which routes to the host platform.
+  RemoteImageApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+    : pigeonVar_binaryMessenger = binaryMessenger,
+      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+  final BinaryMessenger? pigeonVar_binaryMessenger;
+
+  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
+
+  final String pigeonVar_messageChannelSuffix;
+
+  Future<Map<String, int>?> requestImage(
+    String url, {
+    required Map<String, String> headers,
+    required int requestId,
+  }) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[url, headers, requestId]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)?.cast<String, int>();
+    }
+  }
+
+  Future<void> cancelRequest(int requestId) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[requestId]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return;
+    }
+  }
+
+  Future<int> clearCache() async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.RemoteImageApi.clearCache$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as int?)!;
+    }
+  }
+}
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -18,7 +18,6 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_s
 import 'package:immich_mobile/presentation/widgets/search/quick_date_picker.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/feature_check.dart';
@@ -31,7 +30,6 @@ import 'package:immich_mobile/widgets/search/search_filter/media_type_picker.dar
 import 'package:immich_mobile/widgets/search/search_filter/people_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_chip.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_utils.dart';
-import 'package:immich_mobile/widgets/search/search_filter/star_rating_picker.dart';

@RoutePage()
 class DriftSearchPage extends HookConsumerWidget {
@@ -50,7 +48,6 @@ class DriftSearchPage extends HookConsumerWidget {
        camera: preFilter?.camera ?? SearchCameraFilter(),
        date: preFilter?.date ?? SearchDateFilter(),
        display: preFilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-        rating: preFilter?.rating ?? SearchRatingFilter(),
        mediaType: preFilter?.mediaType ?? AssetType.other,
        language: "${context.locale.languageCode}-${context.locale.countryCode}",
        assetId: preFilter?.assetId,
@@ -65,15 +62,10 @@ class DriftSearchPage extends HookConsumerWidget {
    final cameraCurrentFilterWidget = useState<Widget?>(null);
    final locationCurrentFilterWidget = useState<Widget?>(null);
    final mediaTypeCurrentFilterWidget = useState<Widget?>(null);
-    final ratingCurrentFilterWidget = useState<Widget?>(null);
    final displayOptionCurrentFilterWidget = useState<Widget?>(null);

    final isSearching = useState(false);

-    final isRatingEnabled = ref
-        .watch(userMetadataPreferencesProvider)
-        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);
-
    SnackBar searchInfoSnackBar(String message) {
      return SnackBar(
        content: Text(message, style: context.textTheme.labelLarge),
@@ -377,35 +369,6 @@ class DriftSearchPage extends HookConsumerWidget {
      );
    }

-    // STAR RATING PICKER
-    showStarRatingPicker() {
-      handleOnSelected(SearchRatingFilter rating) {
-        filter.value = filter.value.copyWith(rating: rating);
-
-        ratingCurrentFilterWidget.value = Text(
-          'rating_count'.t(args: {'count': rating.rating!}),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(rating: SearchRatingFilter(rating: null));
-        ratingCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        child: FilterBottomSheetScaffold(
-          title: 'rating'.t(context: context),
-          onSearch: search,
-          onClear: handleClear,
-          child: StarRatingPicker(onSelect: handleOnSelected, filter: filter.value.rating),
-        ),
-      );
-    }
-
    // DISPLAY OPTION
    showDisplayOptionPicker() {
      handleOnSelect(Map<DisplayOption, bool> value) {
@@ -666,14 +629,6 @@ class DriftSearchPage extends HookConsumerWidget {
                      label: 'search_filter_media_type'.t(context: context),
                      currentFilter: mediaTypeCurrentFilterWidget.value,
                    ),
-                    if (isRatingEnabled) ...[
-                      SearchFilterChip(
-                        icon: Icons.star_outline_rounded,
-                        onTap: showStarRatingPicker,
-                        label: 'search_filter_star_rating'.t(context: context),
-                        currentFilter: ratingCurrentFilterWidget.value,
-                      ),
-                    ],
                    SearchFilterChip(
                      icon: Icons.display_settings_outlined,
                      onTap: showDisplayOptionPicker,
--- a/mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart
@@ -34,7 +34,6 @@ class SimilarPhotosActionButton extends ConsumerWidget {
            camera: SearchCameraFilter(),
            date: SearchDateFilter(),
            display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-            rating: SearchRatingFilter(),
            mediaType: AssetType.image,
          ),
        );
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -16,13 +16,11 @@ import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/rating_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/sheet_tile.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -206,9 +204,6 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
    final cameraTitle = _getCameraInfoTitle(exifInfo);
    final lensTitle = exifInfo?.lens != null && exifInfo!.lens!.isNotEmpty ? exifInfo.lens : null;
    final isOwner = ref.watch(currentUserProvider)?.id == (asset is RemoteAsset ? asset.ownerId : null);
-    final isRatingEnabled = ref
-        .watch(userMetadataPreferencesProvider)
-        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);

    // Build file info tile based on asset type
    Widget buildFileInfoTile() {
@@ -288,38 +283,6 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
          ),
        ],
-        // Rating bar
-        if (isRatingEnabled) ...[
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0, top: 16.0),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 8,
-              children: [
-                Text(
-                  'rating'.t(context: context).toUpperCase(),
-                  style: context.textTheme.labelMedium?.copyWith(
-                    color: context.textTheme.labelMedium?.color?.withAlpha(200),
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-                RatingBar(
-                  initialRating: exifInfo?.rating?.toDouble() ?? 0,
-                  filledColor: context.themeData.colorScheme.primary,
-                  unfilledColor: context.themeData.colorScheme.onSurface.withAlpha(100),
-                  itemSize: 40,
-                  onRatingUpdate: (rating) async {
-                    await ref.read(actionProvider.notifier).updateRating(ActionSource.viewer, rating.round());
-                  },
-                  onClearRating: () async {
-                    await ref.read(actionProvider.notifier).updateRating(ActionSource.viewer, 0);
-                  },
-                ),
-              ],
-            ),
-          ),
-        ],
        // Appears in (Albums)
        Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
        // padding at the bottom to avoid cut-off
--- a/mobile/lib/presentation/widgets/asset_viewer/rating_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/rating_bar.widget.dart
@@ -1,125 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-
-class RatingBar extends StatefulWidget {
-  final double initialRating;
-  final int itemCount;
-  final double itemSize;
-  final Color filledColor;
-  final Color unfilledColor;
-  final ValueChanged<int>? onRatingUpdate;
-  final VoidCallback? onClearRating;
-  final Widget? itemBuilder;
-  final double starPadding;
-
-  const RatingBar({
-    super.key,
-    this.initialRating = 0.0,
-    this.itemCount = 5,
-    this.itemSize = 40.0,
-    this.filledColor = Colors.amber,
-    this.unfilledColor = Colors.grey,
-    this.onRatingUpdate,
-    this.onClearRating,
-    this.itemBuilder,
-    this.starPadding = 4.0,
-  });
-
-  @override
-  State<RatingBar> createState() => _RatingBarState();
-}
-
-class _RatingBarState extends State<RatingBar> {
-  late double _currentRating;
-
-  @override
-  void initState() {
-    super.initState();
-    _currentRating = widget.initialRating;
-  }
-
-  void _updateRating(Offset localPosition, bool isRTL, {bool isTap = false}) {
-    final totalWidth = widget.itemCount * widget.itemSize + (widget.itemCount - 1) * widget.starPadding;
-    double dx = localPosition.dx;
-
-    if (isRTL) dx = totalWidth - dx;
-
-    double newRating;
-
-    if (dx <= 0) {
-      newRating = 0;
-    } else if (dx >= totalWidth) {
-      newRating = widget.itemCount.toDouble();
-    } else {
-      double starWithPadding = widget.itemSize + widget.starPadding;
-      int tappedIndex = (dx / starWithPadding).floor().clamp(0, widget.itemCount - 1);
-      newRating = tappedIndex + 1.0;
-
-      if (isTap && newRating == _currentRating && _currentRating != 0) {
-        newRating = 0;
-      }
-    }
-
-    if (_currentRating != newRating) {
-      setState(() {
-        _currentRating = newRating;
-      });
-      widget.onRatingUpdate?.call(newRating.round());
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isRTL = Directionality.of(context) == TextDirection.rtl;
-    final double visualAlignmentOffset = 5.0;
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Transform.translate(
-          offset: Offset(isRTL ? visualAlignmentOffset : -visualAlignmentOffset, 0),
-          child: GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onTapDown: (details) => _updateRating(details.localPosition, isRTL, isTap: true),
-            onPanUpdate: (details) => _updateRating(details.localPosition, isRTL, isTap: false),
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              textDirection: isRTL ? TextDirection.rtl : TextDirection.ltr,
-              children: List.generate(widget.itemCount * 2 - 1, (i) {
-                if (i.isOdd) {
-                  return SizedBox(width: widget.starPadding);
-                }
-                int index = i ~/ 2;
-                bool filled = _currentRating > index;
-                return widget.itemBuilder ??
-                    Icon(
-                      Icons.star_rounded,
-                      size: widget.itemSize,
-                      color: filled ? widget.filledColor : widget.unfilledColor,
-                    );
-              }),
-            ),
-          ),
-        ),
-        if (_currentRating > 0)
-          Padding(
-            padding: const EdgeInsets.only(top: 12.0),
-            child: GestureDetector(
-              onTap: () {
-                setState(() {
-                  _currentRating = 0;
-                });
-                widget.onClearRating?.call();
-              },
-              child: Text(
-                'rating_clear'.t(context: context),
-                style: TextStyle(color: context.themeData.colorScheme.primary),
-              ),
-            ),
-          ),
-      ],
-    );
-  }
-}
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:async/async.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -53,14 +51,14 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
  Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* {
    if (isCancelled) {
      this.request = null;
-      unawaited(evict());
+      PaintingBinding.instance.imageCache.evict(this);
      return;
    }

    try {
      final image = await request.load(decode);
      if (image == null || isCancelled) {
-        unawaited(evict());
+        PaintingBinding.instance.imageCache.evict(this);
        return;
      }
      yield image;
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:ui';

 import 'package:flutter/foundation.dart';
@@ -85,7 +84,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
    yield* initialImageStream();

    if (isCancelled) {
-      unawaited(evict());
+      PaintingBinding.instance.imageCache.evict(this);
      return;
    }

@@ -103,7 +102,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
    }

    if (isCancelled) {
-      unawaited(evict());
+      PaintingBinding.instance.imageCache.evict(this);
      return;
    }

--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
@@ -7,14 +5,12 @@ import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
-import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';

 class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
    with CancellableImageProviderMixin<RemoteThumbProvider> {
-  static final cacheManager = RemoteThumbnailCacheManager();
  final String assetId;
  final String thumbhash;

@@ -41,7 +37,6 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
    final request = this.request = RemoteImageRequest(
      uri: getThumbnailUrlForRemoteId(key.assetId, thumbhash: key.thumbhash),
      headers: ApiService.getRequestHeaders(),
-      cacheManager: cacheManager,
    );
    return loadRequest(request, decode);
  }
@@ -62,7 +57,6 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>

 class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImageProvider>
    with CancellableImageProviderMixin<RemoteFullImageProvider> {
-  static final cacheManager = RemoteThumbnailCacheManager();
  final String assetId;
  final String thumbhash;

@@ -90,7 +84,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
    yield* initialImageStream();

    if (isCancelled) {
-      unawaited(evict());
+      PaintingBinding.instance.imageCache.evict(this);
      return;
    }

@@ -98,12 +92,11 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
    final request = this.request = RemoteImageRequest(
      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
      headers: headers,
-      cacheManager: cacheManager,
    );
    yield* loadRequest(request, decode);

    if (isCancelled) {
-      unawaited(evict());
+      PaintingBinding.instance.imageCache.evict(this);
      return;
    }

--- a/mobile/lib/presentation/widgets/timeline/constants.dart
+++ b/mobile/lib/presentation/widgets/timeline/constants.dart
@@ -2,9 +2,11 @@ import 'dart:ui';

 const double kTimelineHeaderExtent = 80.0;
 const Size kTimelineFixedTileExtent = Size.square(256);
-const Size kThumbnailResolution = Size.square(320); // TODO: make the resolution vary based on actual tile size
 const double kTimelineSpacing = 2.0;
 const int kTimelineColumnCount = 3;

 const Duration kTimelineScrubberFadeInDuration = Duration(milliseconds: 300);
 const Duration kTimelineScrubberFadeOutDuration = Duration(milliseconds: 800);
+
+const Size kThumbnailResolution = Size.square(320); // TODO: make the resolution vary based on actual tile size
+const kThumbnailDiskCacheSize = 1024 << 20; // 1GiB
--- a/mobile/lib/providers/image/cache/remote_image_cache_manager.dart
+++ b/mobile/lib/providers/image/cache/remote_image_cache_manager.dart
@@ -1,148 +1,25 @@
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-// ignore: implementation_imports
-import 'package:flutter_cache_manager/src/cache_store.dart';
-import 'package:logging/logging.dart';
-import 'package:uuid/uuid.dart';

-abstract class RemoteCacheManager extends CacheManager {
-  static final _log = Logger('RemoteCacheManager');
-
-  RemoteCacheManager.custom(super.config, CacheStore store)
-    // Unfortunately, CacheStore is not a public API
-    // ignore: invalid_use_of_visible_for_testing_member
-    : super.custom(cacheStore: store);
-
-  Future<void> putStreamedFile(
-    String url,
-    Stream<List<int>> source, {
-    String? key,
-    String? eTag,
-    Duration maxAge = const Duration(days: 30),
-    String fileExtension = 'file',
-  });
-
-  // Unlike `putFileStream`, this method handles request cancellation,
-  // does not make a (slow) DB call checking if the file is already cached,
-  // does not synchronously check if a file exists,
-  // and deletes the file on cancellation without making these checks again.
-  Future<void> putStreamedFileToStore(
-    CacheStore store,
-    String url,
-    Stream<List<int>> source, {
-    String? key,
-    String? eTag,
-    Duration maxAge = const Duration(days: 30),
-    String fileExtension = 'file',
-  }) async {
-    final path = '${const Uuid().v1()}.$fileExtension';
-    final file = await store.fileSystem.createFile(path);
-    final sink = file.openWrite();
-    try {
-      await source.listen(sink.add, cancelOnError: true).asFuture();
-    } catch (e) {
-      try {
-        await sink.close();
-        await file.delete();
-      } catch (e) {
-        _log.severe('Failed to delete incomplete cache file: $e');
-      }
-      return;
-    }
-
-    try {
-      await sink.flush();
-      await sink.close();
-    } catch (e) {
-      try {
-        await file.delete();
-      } catch (e) {
-        _log.severe('Failed to delete incomplete cache file: $e');
-      }
-      return;
-    }
-
-    final cacheObject = CacheObject(
-      url,
-      key: key,
-      relativePath: path,
-      validTill: DateTime.now().add(maxAge),
-      eTag: eTag,
-    );
-    try {
-      await store.putFile(cacheObject);
-    } catch (e) {
-      try {
-        await file.delete();
-      } catch (e) {
-        _log.severe('Failed to delete untracked cache file: $e');
-      }
-    }
-  }
-}
-
-class RemoteImageCacheManager extends RemoteCacheManager {
+class RemoteImageCacheManager extends CacheManager {
  static const key = 'remoteImageCacheKey';
  static final RemoteImageCacheManager _instance = RemoteImageCacheManager._();
  static final _config = Config(key, maxNrOfCacheObjects: 500, stalePeriod: const Duration(days: 30));
-  static final _store = CacheStore(_config);

  factory RemoteImageCacheManager() {
    return _instance;
  }

-  RemoteImageCacheManager._() : super.custom(_config, _store);
-
-  @override
-  Future<void> putStreamedFile(
-    String url,
-    Stream<List<int>> source, {
-    String? key,
-    String? eTag,
-    Duration maxAge = const Duration(days: 30),
-    String fileExtension = 'file',
-  }) {
-    return putStreamedFileToStore(
-      _store,
-      url,
-      source,
-      key: key,
-      eTag: eTag,
-      maxAge: maxAge,
-      fileExtension: fileExtension,
-    );
-  }
+  RemoteImageCacheManager._() : super(_config);
 }

-/// The cache manager for full size images [ImmichRemoteImageProvider]
-class RemoteThumbnailCacheManager extends RemoteCacheManager {
+class RemoteThumbnailCacheManager extends CacheManager {
  static const key = 'remoteThumbnailCacheKey';
  static final RemoteThumbnailCacheManager _instance = RemoteThumbnailCacheManager._();
  static final _config = Config(key, maxNrOfCacheObjects: 5000, stalePeriod: const Duration(days: 30));
-  static final _store = CacheStore(_config);

  factory RemoteThumbnailCacheManager() {
    return _instance;
  }

-  RemoteThumbnailCacheManager._() : super.custom(_config, _store);
-
-  @override
-  Future<void> putStreamedFile(
-    String url,
-    Stream<List<int>> source, {
-    String? key,
-    String? eTag,
-    Duration maxAge = const Duration(days: 30),
-    String fileExtension = 'file',
-  }) {
-    return putStreamedFileToStore(
-      _store,
-      url,
-      source,
-      key: key,
-      eTag: eTag,
-      maxAge: maxAge,
-      fileExtension: fileExtension,
-    );
-  }
+  RemoteThumbnailCacheManager._() : super(_config);
 }
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -359,22 +359,6 @@ class ActionNotifier extends Notifier<void> {
    }
  }

-  Future<ActionResult> updateRating(ActionSource source, int rating) async {
-    final ids = _getRemoteIdsForSource(source);
-    if (ids.length != 1) {
-      _logger.warning('updateRating called with multiple assets, expected single asset');
-      return ActionResult(count: ids.length, success: false, error: 'Expected single asset for rating update');
-    }
-
-    try {
-      final isUpdated = await _service.updateRating(ids.first, rating);
-      return ActionResult(count: 1, success: isUpdated);
-    } catch (error, stack) {
-      _logger.severe('Failed to update rating for asset', error, stack);
-      return ActionResult(count: 1, success: false, error: error.toString());
-    }
-  }
-
  Future<ActionResult> stack(String userId, ActionSource source) async {
    final ids = _getOwnedRemoteIdsForSource(source);
    try {
--- a/mobile/lib/providers/infrastructure/platform.provider.dart
+++ b/mobile/lib/providers/infrastructure/platform.provider.dart
@@ -4,7 +4,8 @@ import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/platform/thumbnail_api.g.dart';
+import 'package:immich_mobile/platform/local_image_api.g.dart';
+import 'package:immich_mobile/platform/remote_image_api.g.dart';

 final backgroundWorkerFgServiceProvider = Provider((_) => BackgroundWorkerFgService(BackgroundWorkerFgHostApi()));

@@ -16,4 +17,6 @@ final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());

 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());

-final thumbnailApi = ThumbnailApi();
+final localImageApi = LocalImageApi();
+
+final remoteImageApi = RemoteImageApi();
--- a/mobile/lib/providers/infrastructure/user_metadata.provider.dart
+++ b/mobile/lib/providers/infrastructure/user_metadata.provider.dart
@@ -1,22 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';

 final userMetadataRepository = Provider<DriftUserMetadataRepository>(
  (ref) => DriftUserMetadataRepository(ref.watch(driftProvider)),
 );
-
-final userMetadataProvider = FutureProvider<List<UserMetadata>>((ref) async {
-  final repository = ref.watch(userMetadataRepository);
-  final user = ref.watch(currentUserProvider);
-  if (user == null) return [];
-  return repository.getUserMetadata(user.id);
-});
-
-final userMetadataPreferencesProvider = FutureProvider<Preferences?>((ref) async {
-  final metadataList = await ref.watch(userMetadataProvider.future);
-  final metadataWithPrefs = metadataList.firstWhere((meta) => meta.preferences != null);
-  return metadataWithPrefs.preferences;
-});
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -101,10 +101,6 @@ class AssetApiRepository extends ApiRepository {
  Future<void> updateDescription(String assetId, String description) {
    return _api.updateAsset(assetId, UpdateAssetDto(description: description));
  }
-
-  Future<void> updateRating(String assetId, int rating) {
-    return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
-  }
 }

 extension on StackResponseDto {
--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -214,14 +214,6 @@ class ActionService {
    return true;
  }

-  Future<bool> updateRating(String assetId, int rating) async {
-    // update remote first, then local to ensure consistency
-    await _assetApiRepository.updateRating(assetId, rating);
-    await _remoteAssetRepository.updateRating(assetId, rating);
-
-    return true;
-  }
-
  Future<void> stack(String userId, List<String> remoteIds) async {
    final stack = await _assetApiRepository.stack(remoteIds);
    await _remoteAssetRepository.stack(userId, stack);
--- a/mobile/lib/utils/bootstrap.dart
+++ b/mobile/lib/utils/bootstrap.dart
@@ -21,6 +21,7 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:isar/isar.dart';
 import 'package:path_provider/path_provider.dart';
@@ -106,5 +107,7 @@ abstract final class Bootstrap {
      storeRepository: storeRepo,
      shouldBuffer: shouldBufferLogs,
    );
+
+    await NetworkRepository.init();
  }
 }
--- a/mobile/lib/utils/bytes_units.dart
+++ b/mobile/lib/utils/bytes_units.dart
@@ -19,7 +19,7 @@ String formatBytes(int bytes) {

 String formatHumanReadableBytes(int bytes, int decimals) {
  if (bytes <= 0) return "0 B";
-  const suffixes = ["B", "KB", "MB", "GB", "TB"];
+  const suffixes = ["B", "KiB", "MiB", "GiB", "TiB"];
  var i = (log(bytes) / log(1024)).floor();
  return '${(bytes / pow(1024, i)).toStringAsFixed(decimals)} ${suffixes[i]}';
 }
--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -88,7 +88,6 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {

  if (version < 20 && Store.isBetaTimelineEnabled) {
    await _syncLocalAlbumIsIosSharedAlbum(drift);
-    await _backfillAssetExifWidthHeight(drift);
  }

  if (targetVersion >= 12) {
@@ -282,22 +281,6 @@ Future<void> _syncLocalAlbumIsIosSharedAlbum(Drift db) async {
  }
 }

-Future<void> _backfillAssetExifWidthHeight(Drift db) async {
-  try {
-    await db.customStatement('''
-      UPDATE remote_exif_entity AS remote_exif
-      SET width = asset.width,
-          height = asset.height
-      FROM remote_asset_entity AS asset
-      WHERE remote_exif.asset_id = asset.id;
-    ''');
-
-    dPrint(() => "[MIGRATION] Successfully backfilled asset exif width and height");
-  } catch (error) {
-    dPrint(() => "[MIGRATION] Error while backfilling asset exif width and height: $error");
-  }
-}
-
 Future<void> migrateDeviceAssetToSqlite(Isar db, Drift drift) async {
  try {
    final isarDeviceAssets = await db.deviceAssetEntitys.where().findAll();
--- a/mobile/lib/widgets/search/explore_grid.dart
+++ b/mobile/lib/widgets/search/explore_grid.dart
@@ -55,7 +55,6 @@ class ExploreGrid extends StatelessWidget {
                        camera: SearchCameraFilter(),
                        date: SearchDateFilter(),
                        display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-                        rating: SearchRatingFilter(),
                        mediaType: AssetType.other,
                      ),
                    ),
--- a/mobile/lib/widgets/search/search_filter/star_rating_picker.dart
+++ b/mobile/lib/widgets/search/search_filter/star_rating_picker.dart
@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/models/search/search_filter.model.dart';
-
-class StarRatingPicker extends HookWidget {
-  const StarRatingPicker({super.key, required this.onSelect, this.filter});
-  final Function(SearchRatingFilter) onSelect;
-  final SearchRatingFilter? filter;
-
-  @override
-  Widget build(BuildContext context) {
-    final selectedRating = useState(filter);
-
-    return RadioGroup(
-      groupValue: selectedRating.value?.rating,
-      onChanged: (int? newValue) {
-        if (newValue == null) return;
-        final newFilter = SearchRatingFilter(rating: newValue);
-        selectedRating.value = newFilter;
-        onSelect(newFilter);
-      },
-      child: Column(
-        children: List.generate(
-          6,
-          (index) => RadioListTile<int>(
-            key: Key("star_$index"),
-            title: Text('rating_count'.t(args: {'count': (index)})),
-            value: index,
-          ),
-        ),
-      ),
-    );
-  }
-}
--- a/mobile/lib/widgets/settings/advanced_settings.dart
+++ b/mobile/lib/widgets/settings/advanced_settings.dart
@@ -8,10 +8,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/widgets/settings/beta_timeline_list_tile.dart';
@@ -153,6 +155,43 @@ class AdvancedSettings extends HookConsumerWidget {
            );
          },
        ),
+      ListTile(
+        title: Text("advanced_settings_clear_image_cache".tr(), style: const TextStyle(fontWeight: FontWeight.w500)),
+        leading: const Icon(Icons.playlist_remove_rounded),
+        onTap: () async {
+          final int clearedBytes;
+          try {
+            clearedBytes = await remoteImageApi.clearCache();
+          } catch (e) {
+            context.scaffoldMessenger.showSnackBar(
+              SnackBar(
+                duration: const Duration(seconds: 2),
+                content: Text(
+                  "advanced_settings_clear_image_cache_error".tr(),
+                  style: context.textTheme.bodyLarge?.copyWith(color: context.themeData.colorScheme.error),
+                ),
+              ),
+            );
+            return;
+          }
+
+          if (clearedBytes < 0) {
+            return;
+          }
+
+          // iOS always returns a small non-zero value
+          final clearedMB = clearedBytes < (256 * 1024) ? "0 MiB" : formatHumanReadableBytes(clearedBytes, 2);
+          context.scaffoldMessenger.showSnackBar(
+            SnackBar(
+              duration: const Duration(seconds: 2),
+              content: Text(
+                "advanced_settings_clear_image_cache_success".tr(namedArgs: {'size': clearedMB}),
+                style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
+              ),
+            ),
+          );
+        },
+      ),
    ];

    return SettingsSubPageScaffold(settings: advancedSettings);
--- a/mobile/makefile
+++ b/mobile/makefile
@@ -7,12 +7,14 @@ build:

 pigeon:
 	dart run pigeon --input pigeon/native_sync_api.dart
-	dart run pigeon --input pigeon/thumbnail_api.dart
+	dart run pigeon --input pigeon/local_image_api.dart
+	dart run pigeon --input pigeon/remote_image_api.dart
 	dart run pigeon --input pigeon/background_worker_api.dart
 	dart run pigeon --input pigeon/background_worker_lock_api.dart
 	dart run pigeon --input pigeon/connectivity_api.dart
 	dart format lib/platform/native_sync_api.g.dart
-	dart format lib/platform/thumbnail_api.g.dart
+	dart format lib/platform/local_image_api.g.dart
+	dart format lib/platform/remote_image_api.g.dart
 	dart format lib/platform/background_worker_api.g.dart
 	dart format lib/platform/background_worker_lock_api.g.dart
 	dart format lib/platform/connectivity_api.g.dart
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 2.5.0
+- API version: 2.4.1
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

--- a/mobile/openapi/lib/api/assets_api.dart
+++ b/mobile/openapi/lib/api/assets_api.dart
@@ -1691,7 +1691,7 @@ class AssetsApi {

  /// View asset thumbnail
  ///
-  /// Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.
+  /// Retrieve the thumbnail image for the specified asset.
  ///
  /// Note: This method returns the HTTP [Response].
  ///
@@ -1747,7 +1747,7 @@ class AssetsApi {

  /// View asset thumbnail
  ///
-  /// Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.
+  /// Retrieve the thumbnail image for the specified asset.
  ///
  /// Parameters:
  ///
--- a/mobile/openapi/lib/model/asset_media_size.dart
+++ b/mobile/openapi/lib/model/asset_media_size.dart
@@ -23,14 +23,12 @@ class AssetMediaSize {

  String toJson() => value;

-  static const original = AssetMediaSize._(r'original');
  static const fullsize = AssetMediaSize._(r'fullsize');
  static const preview = AssetMediaSize._(r'preview');
  static const thumbnail = AssetMediaSize._(r'thumbnail');

  /// List of all possible values in this [enum][AssetMediaSize].
  static const values = <AssetMediaSize>[
-    original,
    fullsize,
    preview,
    thumbnail,
@@ -72,7 +70,6 @@ class AssetMediaSizeTypeTransformer {
  AssetMediaSize? decode(dynamic data, {bool allowNull = true}) {
    if (data != null) {
      switch (data) {
-        case r'original': return AssetMediaSize.original;
        case r'fullsize': return AssetMediaSize.fullsize;
        case r'preview': return AssetMediaSize.preview;
        case r'thumbnail': return AssetMediaSize.thumbnail;
--- a/mobile/openapi/lib/model/permission.dart
+++ b/mobile/openapi/lib/model/permission.dart
@@ -72,7 +72,6 @@ class Permission {
  static const facePeriodRead = Permission._(r'face.read');
  static const facePeriodUpdate = Permission._(r'face.update');
  static const facePeriodDelete = Permission._(r'face.delete');
-  static const folderPeriodRead = Permission._(r'folder.read');
  static const jobPeriodCreate = Permission._(r'job.create');
  static const jobPeriodRead = Permission._(r'job.read');
  static const libraryPeriodCreate = Permission._(r'library.create');
@@ -231,7 +230,6 @@ class Permission {
    facePeriodRead,
    facePeriodUpdate,
    facePeriodDelete,
-    folderPeriodRead,
    jobPeriodCreate,
    jobPeriodRead,
    libraryPeriodCreate,
@@ -425,7 +423,6 @@ class PermissionTypeTransformer {
        case r'face.read': return Permission.facePeriodRead;
        case r'face.update': return Permission.facePeriodUpdate;
        case r'face.delete': return Permission.facePeriodDelete;
-        case r'folder.read': return Permission.folderPeriodRead;
        case r'job.create': return Permission.jobPeriodCreate;
        case r'job.read': return Permission.jobPeriodRead;
        case r'library.create': return Permission.libraryPeriodCreate;
--- a/mobile/openapi/lib/model/system_config_generated_fullsize_image_dto.dart
+++ b/mobile/openapi/lib/model/system_config_generated_fullsize_image_dto.dart
@@ -15,7 +15,6 @@ class SystemConfigGeneratedFullsizeImageDto {
  SystemConfigGeneratedFullsizeImageDto({
    required this.enabled,
    required this.format,
-    required this.progressive,
    required this.quality,
  });

@@ -23,8 +22,6 @@ class SystemConfigGeneratedFullsizeImageDto {

  ImageFormat format;

-  bool progressive;
-
  /// Minimum value: 1
  /// Maximum value: 100
  int quality;
@@ -33,7 +30,6 @@ class SystemConfigGeneratedFullsizeImageDto {
  bool operator ==(Object other) => identical(this, other) || other is SystemConfigGeneratedFullsizeImageDto &&
    other.enabled == enabled &&
    other.format == format &&
-    other.progressive == progressive &&
    other.quality == quality;

  @override
@@ -41,17 +37,15 @@ class SystemConfigGeneratedFullsizeImageDto {
    // ignore: unnecessary_parenthesis
    (enabled.hashCode) +
    (format.hashCode) +
-    (progressive.hashCode) +
    (quality.hashCode);

  @override
-  String toString() => 'SystemConfigGeneratedFullsizeImageDto[enabled=$enabled, format=$format, progressive=$progressive, quality=$quality]';
+  String toString() => 'SystemConfigGeneratedFullsizeImageDto[enabled=$enabled, format=$format, quality=$quality]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
      json[r'enabled'] = this.enabled;
      json[r'format'] = this.format;
-      json[r'progressive'] = this.progressive;
      json[r'quality'] = this.quality;
    return json;
  }
@@ -67,7 +61,6 @@ class SystemConfigGeneratedFullsizeImageDto {
      return SystemConfigGeneratedFullsizeImageDto(
        enabled: mapValueOfType<bool>(json, r'enabled')!,
        format: ImageFormat.fromJson(json[r'format'])!,
-        progressive: mapValueOfType<bool>(json, r'progressive')!,
        quality: mapValueOfType<int>(json, r'quality')!,
      );
    }
@@ -118,7 +111,6 @@ class SystemConfigGeneratedFullsizeImageDto {
  static const requiredKeys = <String>{
    'enabled',
    'format',
-    'progressive',
    'quality',
  };
 }
--- a/mobile/openapi/lib/model/system_config_generated_image_dto.dart
+++ b/mobile/openapi/lib/model/system_config_generated_image_dto.dart
@@ -14,15 +14,12 @@ class SystemConfigGeneratedImageDto {
  /// Returns a new [SystemConfigGeneratedImageDto] instance.
  SystemConfigGeneratedImageDto({
    required this.format,
-    required this.progressive,
    required this.quality,
    required this.size,
  });

  ImageFormat format;

-  bool progressive;
-
  /// Minimum value: 1
  /// Maximum value: 100
  int quality;
@@ -33,7 +30,6 @@ class SystemConfigGeneratedImageDto {
  @override
  bool operator ==(Object other) => identical(this, other) || other is SystemConfigGeneratedImageDto &&
    other.format == format &&
-    other.progressive == progressive &&
    other.quality == quality &&
    other.size == size;

@@ -41,17 +37,15 @@ class SystemConfigGeneratedImageDto {
  int get hashCode =>
    // ignore: unnecessary_parenthesis
    (format.hashCode) +
-    (progressive.hashCode) +
    (quality.hashCode) +
    (size.hashCode);

  @override
-  String toString() => 'SystemConfigGeneratedImageDto[format=$format, progressive=$progressive, quality=$quality, size=$size]';
+  String toString() => 'SystemConfigGeneratedImageDto[format=$format, quality=$quality, size=$size]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
      json[r'format'] = this.format;
-      json[r'progressive'] = this.progressive;
      json[r'quality'] = this.quality;
      json[r'size'] = this.size;
    return json;
@@ -67,7 +61,6 @@ class SystemConfigGeneratedImageDto {

      return SystemConfigGeneratedImageDto(
        format: ImageFormat.fromJson(json[r'format'])!,
-        progressive: mapValueOfType<bool>(json, r'progressive')!,
        quality: mapValueOfType<int>(json, r'quality')!,
        size: mapValueOfType<int>(json, r'size')!,
      );
@@ -118,7 +111,6 @@ class SystemConfigGeneratedImageDto {
  /// The list of required keys that must be present in a JSON.
  static const requiredKeys = <String>{
    'format',
-    'progressive',
    'quality',
    'size',
  };
--- a/mobile/packages/ui/pubspec.lock
+++ b/mobile/packages/ui/pubspec.lock
@@ -34,10 +34,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
  sky_engine:
    dependency: transitive
    description: flutter
--- a/mobile/pigeon/local_image_api.dart
+++ b/mobile/pigeon/local_image_api.dart
@@ -2,20 +2,20 @@ import 'package:pigeon/pigeon.dart';

@ConfigurePigeon(
  PigeonOptions(
-    dartOut: 'lib/platform/thumbnail_api.g.dart',
-    swiftOut: 'ios/Runner/Images/Thumbnails.g.swift',
+    dartOut: 'lib/platform/local_image_api.g.dart',
+    swiftOut: 'ios/Runner/Images/LocalImages.g.swift',
    swiftOptions: SwiftOptions(includeErrorClass: false),
    kotlinOut:
-        'android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt',
+        'android/app/src/main/kotlin/app/alextran/immich/images/LocalImages.g.kt',
    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.images'),
    dartOptions: DartOptions(),
    dartPackageName: 'immich_mobile',
  ),
 )
@HostApi()
-abstract class ThumbnailApi {
+abstract class LocalImageApi {
  @async
-  Map<String, int> requestImage(
+  Map<String, int>? requestImage(
    String assetId, {
    required int requestId,
    required int width,
@@ -23,7 +23,7 @@ abstract class ThumbnailApi {
    required bool isVideo,
  });

-  void cancelImageRequest(int requestId);
+  void cancelRequest(int requestId);

  @async
  Map<String, int> getThumbhash(String thumbhash);
--- a/mobile/pigeon/remote_image_api.dart
+++ b/mobile/pigeon/remote_image_api.dart
@@ -0,0 +1,28 @@
+import 'package:pigeon/pigeon.dart';
+
+@ConfigurePigeon(
+  PigeonOptions(
+    dartOut: 'lib/platform/remote_image_api.g.dart',
+    swiftOut: 'ios/Runner/Images/RemoteImages.g.swift',
+    swiftOptions: SwiftOptions(includeErrorClass: false),
+    kotlinOut:
+        'android/app/src/main/kotlin/app/alextran/immich/images/RemoteImages.g.kt',
+    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.images', includeErrorClass: false),
+    dartOptions: DartOptions(),
+    dartPackageName: 'immich_mobile',
+  ),
+)
+@HostApi()
+abstract class RemoteImageApi {
+  @async
+  Map<String, int>? requestImage(
+    String url, {
+    required Map<String, String> headers,
+    required int requestId,
+  });
+
+  void cancelRequest(int requestId);
+
+  @async
+  int clearCache();
+}
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -297,6 +297,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.2"
+  code_assets:
+    dependency: transitive
+    description:
+      name: code_assets
+      sha256: ae0db647e668cbb295a3527f0938e4039e004c80099dce2f964102373f5ce0b5
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.10"
  code_builder:
    dependency: transitive
    description:
@@ -337,6 +345,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.1.2"
+  cronet_http:
+    dependency: "direct main"
+    description:
+      name: cronet_http
+      sha256: "1fff7f26ac0c4cda97fe2a9aa082494baee4775f167c27ba45f6c8e88571e3ab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.7.0"
  crop_image:
    dependency: "direct main"
    description:
@@ -369,6 +385,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.2"
+  cupertino_http:
+    dependency: "direct main"
+    description:
+      name: cupertino_http
+      sha256: "82cbec60c90bf785a047a9525688b6dacac444e177e1d5a5876963d3c50369e8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
  custom_lint:
    dependency: "direct dev"
    description:
@@ -888,6 +912,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.8.1"
+  hooks:
+    dependency: transitive
+    description:
+      name: hooks
+      sha256: "5410b9f4f6c9f01e8ff0eb81c9801ea13a3c3d39f8f0b1613cda08e27eab3c18"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.5"
  hooks_riverpod:
    dependency: "direct main"
    description:
@@ -936,6 +968,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.1.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
  image:
    dependency: transitive
    description:
@@ -1077,6 +1117,14 @@ packages:
      url: "https://github.com/immich-app/isar"
    source: git
    version: "3.1.8"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: "8706a77e94c76fe9ec9315e18949cc9479cc03af97085ca9c1077b61323ea12d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.2"
  js:
    dependency: transitive
    description:
@@ -1217,10 +1265,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
  mime:
    dependency: transitive
    description:
@@ -1237,6 +1285,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.4"
+  native_toolchain_c:
+    dependency: transitive
+    description:
+      name: native_toolchain_c
+      sha256: f8872ea6c7a50ce08db9ae280ca2b8efdd973157ce462826c82f3c3051d154ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.17.2"
  native_video_player:
    dependency: "direct main"
    description:
@@ -1270,6 +1326,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.5.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "55eb67ede1002d9771b3f9264d2c9d30bc364f0267bc1c6cc0883280d5f0c7cb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.2.2"
  octo_image:
    dependency: "direct main"
    description:
@@ -1902,10 +1966,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.6"
+    version: "0.7.7"
  thumbhash:
    dependency: "direct main"
    description:
@@ -2195,5 +2259,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.9.0 <4.0.0"
+  dart: ">=3.10.0 <4.0.0"
  flutter: ">=3.35.7"
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 2.5.0+3031
+version: 2.4.1+3030

 environment:
  sdk: '>=3.8.0 <4.0.0'
@@ -86,6 +86,8 @@ dependencies:
  uuid: ^4.5.1
  wakelock_plus: ^1.3.0
  worker_manager: ^7.2.7
+  cronet_http: ^1.7.0
+  cupertino_http: ^2.4.0

 dev_dependencies:
  auto_route_generator: ^9.0.0
--- a/open-api/bin/generate-open-api.sh
+++ b/open-api/bin/generate-open-api.sh
@@ -27,7 +27,7 @@ function dart {
 }

 function typescript {
-  pnpm dlx oazapfts --optimistic --argumentStyle=object --useEnumType --allSchemas immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
+  pnpm dlx oazapfts --optimistic --argumentStyle=object --useEnumType immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
  pnpm --filter @immich/sdk install --frozen-lockfile
  pnpm --filter @immich/sdk build
 }
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -3173,7 +3173,6 @@
            "state": "Stable"
          }
        ],
-        "x-immich-permission": "asset.upload",
        "x-immich-state": "Stable"
      }
    },
@@ -3226,7 +3225,6 @@
            "state": "Stable"
          }
        ],
-        "x-immich-permission": "job.create",
        "x-immich-state": "Stable"
      }
    },
@@ -4279,7 +4277,7 @@
    },
    "/assets/{id}/thumbnail": {
      "get": {
-        "description": "Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.",
+        "description": "Retrieve the thumbnail image for the specified asset.",
        "operationId": "viewAsset",
        "parameters": [
          {
@@ -14620,7 +14618,6 @@
            "state": "Stable"
          }
        ],
-        "x-immich-permission": "folder.read",
        "x-immich-state": "Stable"
      }
    },
@@ -14673,7 +14670,6 @@
            "state": "Stable"
          }
        ],
-        "x-immich-permission": "folder.read",
        "x-immich-state": "Stable"
      }
    },
@@ -14951,7 +14947,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "2.5.0",
+    "version": "2.4.1",
    "contact": {}
  },
  "tags": [
@@ -16305,7 +16301,6 @@
      },
      "AssetMediaSize": {
        "enum": [
-          "original",
          "fullsize",
          "preview",
          "thumbnail"
@@ -18963,7 +18958,6 @@
          "face.read",
          "face.update",
          "face.delete",
-          "folder.read",
          "job.create",
          "job.read",
          "library.create",
@@ -22624,9 +22618,6 @@
              }
            ]
          },
-          "progressive": {
-            "type": "boolean"
-          },
          "quality": {
            "maximum": 100,
            "minimum": 1,
@@ -22636,7 +22627,6 @@
        "required": [
          "enabled",
          "format",
-          "progressive",
          "quality"
        ],
        "type": "object"
@@ -22650,9 +22640,6 @@
              }
            ]
          },
-          "progressive": {
-            "type": "boolean"
-          },
          "quality": {
            "maximum": 100,
            "minimum": 1,
@@ -22665,7 +22652,6 @@
        },
        "required": [
          "format",
-          "progressive",
          "quality",
          "size"
        ],
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "2.5.0",
+  "version": "2.4.1",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "type": "module",
  "main": "./build/index.js",
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 2.5.0
+ * 2.4.1
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
@@ -1538,12 +1538,10 @@ export type SystemConfigFFmpegDto = {
 export type SystemConfigGeneratedFullsizeImageDto = {
    enabled: boolean;
    format: ImageFormat;
-    progressive: boolean;
    quality: number;
 };
 export type SystemConfigGeneratedImageDto = {
    format: ImageFormat;
-    progressive: boolean;
    quality: number;
    size: number;
 };
@@ -1877,210 +1875,6 @@ export type WorkflowUpdateDto = {
    name?: string;
    triggerType?: PluginTriggerType;
 };
-export type SyncAckV1 = {};
-export type SyncAlbumDeleteV1 = {
-    albumId: string;
-};
-export type SyncAlbumToAssetDeleteV1 = {
-    albumId: string;
-    assetId: string;
-};
-export type SyncAlbumToAssetV1 = {
-    albumId: string;
-    assetId: string;
-};
-export type SyncAlbumUserDeleteV1 = {
-    albumId: string;
-    userId: string;
-};
-export type SyncAlbumUserV1 = {
-    albumId: string;
-    role: AlbumUserRole;
-    userId: string;
-};
-export type SyncAlbumV1 = {
-    createdAt: string;
-    description: string;
-    id: string;
-    isActivityEnabled: boolean;
-    name: string;
-    order: AssetOrder;
-    ownerId: string;
-    thumbnailAssetId: string | null;
-    updatedAt: string;
-};
-export type SyncAssetDeleteV1 = {
-    assetId: string;
-};
-export type SyncAssetExifV1 = {
-    assetId: string;
-    city: string | null;
-    country: string | null;
-    dateTimeOriginal: string | null;
-    description: string | null;
-    exifImageHeight: number | null;
-    exifImageWidth: number | null;
-    exposureTime: string | null;
-    fNumber: number | null;
-    fileSizeInByte: number | null;
-    focalLength: number | null;
-    fps: number | null;
-    iso: number | null;
-    latitude: number | null;
-    lensModel: string | null;
-    longitude: number | null;
-    make: string | null;
-    model: string | null;
-    modifyDate: string | null;
-    orientation: string | null;
-    profileDescription: string | null;
-    projectionType: string | null;
-    rating: number | null;
-    state: string | null;
-    timeZone: string | null;
-};
-export type SyncAssetFaceDeleteV1 = {
-    assetFaceId: string;
-};
-export type SyncAssetFaceV1 = {
-    assetId: string;
-    boundingBoxX1: number;
-    boundingBoxX2: number;
-    boundingBoxY1: number;
-    boundingBoxY2: number;
-    id: string;
-    imageHeight: number;
-    imageWidth: number;
-    personId: string | null;
-    sourceType: string;
-};
-export type SyncAssetMetadataDeleteV1 = {
-    assetId: string;
-    key: string;
-};
-export type SyncAssetMetadataV1 = {
-    assetId: string;
-    key: string;
-    value: object;
-};
-export type SyncAssetV1 = {
-    checksum: string;
-    deletedAt: string | null;
-    duration: string | null;
-    fileCreatedAt: string | null;
-    fileModifiedAt: string | null;
-    height: number | null;
-    id: string;
-    isEdited: boolean;
-    isFavorite: boolean;
-    libraryId: string | null;
-    livePhotoVideoId: string | null;
-    localDateTime: string | null;
-    originalFileName: string;
-    ownerId: string;
-    stackId: string | null;
-    thumbhash: string | null;
-    "type": AssetTypeEnum;
-    visibility: AssetVisibility;
-    width: number | null;
-};
-export type SyncAuthUserV1 = {
-    avatarColor: (UserAvatarColor) | null;
-    deletedAt: string | null;
-    email: string;
-    hasProfileImage: boolean;
-    id: string;
-    isAdmin: boolean;
-    name: string;
-    oauthId: string;
-    pinCode: string | null;
-    profileChangedAt: string;
-    quotaSizeInBytes: number | null;
-    quotaUsageInBytes: number;
-    storageLabel: string | null;
-};
-export type SyncCompleteV1 = {};
-export type SyncMemoryAssetDeleteV1 = {
-    assetId: string;
-    memoryId: string;
-};
-export type SyncMemoryAssetV1 = {
-    assetId: string;
-    memoryId: string;
-};
-export type SyncMemoryDeleteV1 = {
-    memoryId: string;
-};
-export type SyncMemoryV1 = {
-    createdAt: string;
-    data: object;
-    deletedAt: string | null;
-    hideAt: string | null;
-    id: string;
-    isSaved: boolean;
-    memoryAt: string;
-    ownerId: string;
-    seenAt: string | null;
-    showAt: string | null;
-    "type": MemoryType;
-    updatedAt: string;
-};
-export type SyncPartnerDeleteV1 = {
-    sharedById: string;
-    sharedWithId: string;
-};
-export type SyncPartnerV1 = {
-    inTimeline: boolean;
-    sharedById: string;
-    sharedWithId: string;
-};
-export type SyncPersonDeleteV1 = {
-    personId: string;
-};
-export type SyncPersonV1 = {
-    birthDate: string | null;
-    color: string | null;
-    createdAt: string;
-    faceAssetId: string | null;
-    id: string;
-    isFavorite: boolean;
-    isHidden: boolean;
-    name: string;
-    ownerId: string;
-    updatedAt: string;
-};
-export type SyncResetV1 = {};
-export type SyncStackDeleteV1 = {
-    stackId: string;
-};
-export type SyncStackV1 = {
-    createdAt: string;
-    id: string;
-    ownerId: string;
-    primaryAssetId: string;
-    updatedAt: string;
-};
-export type SyncUserDeleteV1 = {
-    userId: string;
-};
-export type SyncUserMetadataDeleteV1 = {
-    key: UserMetadataKey;
-    userId: string;
-};
-export type SyncUserMetadataV1 = {
-    key: UserMetadataKey;
-    userId: string;
-    value: object;
-};
-export type SyncUserV1 = {
-    avatarColor: (UserAvatarColor) | null;
-    deletedAt: string | null;
-    email: string;
-    hasProfileImage: boolean;
-    id: string;
-    name: string;
-    profileChangedAt: string;
-};
 /**
 * List all activities
 */
@@ -5730,7 +5524,6 @@ export enum Permission {
    FaceRead = "face.read",
    FaceUpdate = "face.update",
    FaceDelete = "face.delete",
-    FolderRead = "folder.read",
    JobCreate = "job.create",
    JobRead = "job.read",
    LibraryCreate = "library.create",
@@ -5867,7 +5660,6 @@ export enum MirrorAxis {
    Vertical = "vertical"
 }
 export enum AssetMediaSize {
-    Original = "original",
    Fullsize = "fullsize",
    Preview = "preview",
    Thumbnail = "thumbnail"
@@ -6145,8 +5937,3 @@ export enum OAuthTokenEndpointAuthMethod {
    ClientSecretPost = "client_secret_post",
    ClientSecretBasic = "client_secret_basic"
 }
-export enum UserMetadataKey {
-    Preferences = "preferences",
-    License = "license",
-    Onboarding = "onboarding"
-}
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -489,7 +489,7 @@ importers:
        version: 3.0.0(kysely@0.28.2)(postgres@3.4.8)
      lodash:
        specifier: ^4.17.21
-        version: 4.17.23
+        version: 4.17.21
      luxon:
        specifier: ^3.4.2
        version: 3.7.2
@@ -742,7 +742,7 @@ importers:
        version: link:../open-api/typescript-sdk
      '@immich/ui':
        specifier: ^0.59.0
-        version: 0.59.0(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)
+        version: 0.59.0(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)
      '@mapbox/mapbox-gl-rtl-text':
        specifier: 0.2.3
        version: 0.2.3(mapbox-gl@1.13.3)
@@ -775,7 +775,7 @@ importers:
        version: 0.41.4
      '@zoom-image/svelte':
        specifier: ^0.3.0
-        version: 0.3.8(svelte@5.48.0)
+        version: 0.3.8(svelte@5.46.4)
      dom-to-image:
        specifier: ^2.6.0
        version: 2.6.0
@@ -826,16 +826,16 @@ importers:
        version: 5.2.2
      svelte-i18n:
        specifier: ^4.0.1
-        version: 4.0.1(svelte@5.48.0)
+        version: 4.0.1(svelte@5.46.4)
      svelte-jsoneditor:
        specifier: ^3.10.0
-        version: 3.11.0(svelte@5.48.0)
+        version: 3.11.0(svelte@5.46.4)
      svelte-maplibre:
        specifier: ^1.2.5
-        version: 1.2.5(svelte@5.48.0)
+        version: 1.2.5(svelte@5.46.4)
      svelte-persisted-store:
        specifier: ^0.12.0
-        version: 0.12.0(svelte@5.48.0)
+        version: 0.12.0(svelte@5.46.4)
      tabbable:
        specifier: ^6.2.0
        version: 6.4.0
@@ -860,16 +860,16 @@ importers:
        version: 3.1.2
      '@sveltejs/adapter-static':
        specifier: ^3.0.8
-        version: 3.0.10(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))
+        version: 3.0.10(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))
      '@sveltejs/enhanced-img':
        specifier: ^0.9.0
-        version: 0.9.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(rollup@4.55.1)(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+        version: 0.9.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(rollup@4.55.1)(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      '@sveltejs/kit':
        specifier: ^2.27.1
-        version: 2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+        version: 2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      '@sveltejs/vite-plugin-svelte':
        specifier: 6.2.4
-        version: 6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+        version: 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      '@tailwindcss/vite':
        specifier: ^4.1.7
        version: 4.1.18(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
@@ -878,7 +878,7 @@ importers:
        version: 6.9.1
      '@testing-library/svelte':
        specifier: ^5.2.8
-        version: 5.3.1(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(happy-dom@20.3.0)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+        version: 5.3.1(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(happy-dom@20.3.0)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      '@testing-library/user-event':
        specifier: ^14.5.2
        version: 14.6.1(@testing-library/dom@10.4.1)
@@ -917,7 +917,7 @@ importers:
        version: 6.0.2(eslint@9.39.2(jiti@2.6.1))
      eslint-plugin-svelte:
        specifier: ^3.12.4
-        version: 3.14.0(eslint@9.39.2(jiti@2.6.1))(svelte@5.48.0)
+        version: 3.14.0(eslint@9.39.2(jiti@2.6.1))(svelte@5.46.4)
      eslint-plugin-unicorn:
        specifier: ^62.0.0
        version: 62.0.0(eslint@9.39.2(jiti@2.6.1))
@@ -938,19 +938,19 @@ importers:
        version: 4.2.0(prettier@3.8.0)
      prettier-plugin-svelte:
        specifier: ^3.3.3
-        version: 3.4.1(prettier@3.8.0)(svelte@5.48.0)
+        version: 3.4.1(prettier@3.8.0)(svelte@5.46.4)
      rollup-plugin-visualizer:
        specifier: ^6.0.0
        version: 6.0.5(rollup@4.55.1)
      svelte:
-        specifier: 5.48.0
-        version: 5.48.0
+        specifier: 5.46.4
+        version: 5.46.4
      svelte-check:
        specifier: ^4.1.5
-        version: 4.3.5(picomatch@4.0.3)(svelte@5.48.0)(typescript@5.9.3)
+        version: 4.3.5(picomatch@4.0.3)(svelte@5.46.4)(typescript@5.9.3)
      svelte-eslint-parser:
        specifier: ^1.3.3
-        version: 1.4.1(svelte@5.48.0)
+        version: 1.4.1(svelte@5.46.4)
      tailwindcss:
        specifier: ^4.1.7
        version: 4.1.18
@@ -8964,9 +8964,6 @@ packages:
  lodash@4.17.21:
    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}

-  lodash@4.17.23:
-    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
-
  log-symbols@4.1.0:
    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
    engines: {node: '>=10'}
@@ -11608,8 +11605,8 @@ packages:
    peerDependencies:
      svelte: ^5.30.2

-  svelte@5.48.0:
-    resolution: {integrity: sha512-+NUe82VoFP1RQViZI/esojx70eazGF4u0O/9ucqZ4rPcOZD+n5EVp17uYsqwdzjUjZyTpGKunHbDziW6AIAVkQ==}
+  svelte@5.46.4:
+    resolution: {integrity: sha512-VJwdXrmv9L8L7ZasJeWcCjoIuMRVbhuxbss0fpVnR8yorMmjNDwcjIH08vS6wmSzzzgAG5CADQ1JuXPS2nwt9w==}
    engines: {node: '>=18'}

  svg-parser@2.0.4:
@@ -14545,7 +14542,7 @@ snapshots:
      html-tags: 3.3.1
      html-webpack-plugin: 5.6.5(webpack@5.104.1)
      leven: 3.1.0
-      lodash: 4.17.23
+      lodash: 4.17.21
      open: 8.4.2
      p-map: 4.0.0
      prompts: 2.4.2
@@ -14662,7 +14659,7 @@ snapshots:
      cheerio: 1.0.0-rc.12
      feed: 4.2.2
      fs-extra: 11.3.2
-      lodash: 4.17.23
+      lodash: 4.17.21
      react: 18.3.1
      react-dom: 18.3.1(react@18.3.1)
      schema-dts: 1.1.5
@@ -14704,7 +14701,7 @@ snapshots:
      combine-promises: 1.2.0
      fs-extra: 11.3.2
      js-yaml: 4.1.1
-      lodash: 4.17.23
+      lodash: 4.17.21
      react: 18.3.1
      react-dom: 18.3.1(react@18.3.1)
      schema-dts: 1.1.5
@@ -15017,7 +15014,7 @@ snapshots:
      '@mdx-js/react': 3.1.1(@types/react@19.2.8)(react@18.3.1)
      clsx: 2.1.1
      infima: 0.2.0-alpha.45
-      lodash: 4.17.23
+      lodash: 4.17.21
      nprogress: 0.2.0
      postcss: 8.5.6
      prism-react-renderer: 2.4.1(react@18.3.1)
@@ -15115,7 +15112,7 @@ snapshots:
      clsx: 2.1.1
      eta: 2.2.0
      fs-extra: 11.3.2
-      lodash: 4.17.23
+      lodash: 4.17.21
      react: 18.3.1
      react-dom: 18.3.1(react@18.3.1)
      tslib: 2.8.1
@@ -15190,7 +15187,7 @@ snapshots:
      fs-extra: 11.3.2
      joi: 17.13.3
      js-yaml: 4.1.1
-      lodash: 4.17.23
+      lodash: 4.17.21
      tslib: 2.8.1
    transitivePeerDependencies:
      - '@swc/core'
@@ -15215,7 +15212,7 @@ snapshots:
      gray-matter: 4.0.3
      jiti: 1.21.7
      js-yaml: 4.1.1
-      lodash: 4.17.23
+      lodash: 4.17.21
      micromatch: 4.0.8
      p-queue: 6.6.2
      prompts: 2.4.2
@@ -15600,7 +15597,7 @@ snapshots:
    dependencies:
      '@nestjs/common': 11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
      '@nestjs/core': 11.1.12(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.12)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      lodash: 4.17.23
+      lodash: 4.17.21

  '@grpc/grpc-js@1.14.3':
    dependencies:
@@ -15744,19 +15741,19 @@ snapshots:

  '@immich/justified-layout-wasm@0.4.3': {}

-  '@immich/svelte-markdown-preprocess@0.1.0(svelte@5.48.0)':
+  '@immich/svelte-markdown-preprocess@0.1.0(svelte@5.46.4)':
    dependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4

-  '@immich/ui@0.59.0(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)':
+  '@immich/ui@0.59.0(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)':
    dependencies:
-      '@immich/svelte-markdown-preprocess': 0.1.0(svelte@5.48.0)
+      '@immich/svelte-markdown-preprocess': 0.1.0(svelte@5.46.4)
      '@internationalized/date': 3.10.0
      '@mdi/js': 7.4.47
-      bits-ui: 2.14.4(@internationalized/date@3.10.0)(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)
+      bits-ui: 2.14.4(@internationalized/date@3.10.0)(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)
      luxon: 3.7.2
      simple-icons: 16.4.0
-      svelte: 5.48.0
+      svelte: 5.46.4
      svelte-highlight: 7.9.0
      tailwind-merge: 3.4.0
      tailwind-variants: 3.2.2(tailwind-merge@3.4.0)(tailwindcss@4.1.18)
@@ -17483,17 +17480,17 @@ snapshots:
    dependencies:
      acorn: 8.15.0

-  '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))':
+  '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))':
    dependencies:
-      '@sveltejs/kit': 2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@sveltejs/kit': 2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))

-  '@sveltejs/enhanced-img@0.9.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(rollup@4.55.1)(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@sveltejs/enhanced-img@0.9.2(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(rollup@4.55.1)(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
    dependencies:
-      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      magic-string: 0.30.21
      sharp: 0.34.5
-      svelte: 5.48.0
-      svelte-parse-markup: 0.1.5(svelte@5.48.0)
+      svelte: 5.46.4
+      svelte-parse-markup: 0.1.5(svelte@5.46.4)
      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
      vite-imagetools: 9.0.2(rollup@4.55.1)
      zimmerframe: 1.1.4
@@ -17501,11 +17498,11 @@ snapshots:
      - rollup
      - supports-color

-  '@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
    dependencies:
      '@standard-schema/spec': 1.1.0
      '@sveltejs/acorn-typescript': 1.0.8(acorn@8.15.0)
-      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      '@types/cookie': 0.6.0
      acorn: 8.15.0
      cookie: 0.6.0
@@ -17517,28 +17514,28 @@ snapshots:
      sade: 1.8.1
      set-cookie-parser: 2.7.2
      sirv: 3.0.2
-      svelte: 5.48.0
+      svelte: 5.46.4
      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
    optionalDependencies:
      '@opentelemetry/api': 1.9.0
      typescript: 5.9.3

-  '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
    dependencies:
-      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@sveltejs/vite-plugin-svelte': 6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      debug: 4.4.3
-      svelte: 5.48.0
+      svelte: 5.46.4
      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
    transitivePeerDependencies:
      - supports-color

-  '@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
    dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
      deepmerge: 4.3.1
      magic-string: 0.30.21
      obug: 2.1.1
-      svelte: 5.48.0
+      svelte: 5.46.4
      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
      vitefu: 1.1.1(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
    transitivePeerDependencies:
@@ -17786,15 +17783,15 @@ snapshots:
      picocolors: 1.1.1
      redent: 3.0.0

-  '@testing-library/svelte-core@1.0.0(svelte@5.48.0)':
+  '@testing-library/svelte-core@1.0.0(svelte@5.46.4)':
    dependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4

-  '@testing-library/svelte@5.3.1(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(happy-dom@20.3.0)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@testing-library/svelte@5.3.1(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(happy-dom@20.3.0)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
    dependencies:
      '@testing-library/dom': 10.4.1
-      '@testing-library/svelte-core': 1.0.0(svelte@5.48.0)
-      svelte: 5.48.0
+      '@testing-library/svelte-core': 1.0.0(svelte@5.46.4)
+      svelte: 5.46.4
    optionalDependencies:
      vite: 7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@25.0.9)(happy-dom@20.3.0)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
@@ -18676,10 +18673,10 @@ snapshots:
    dependencies:
      '@namnode/store': 0.1.0

-  '@zoom-image/svelte@0.3.8(svelte@5.48.0)':
+  '@zoom-image/svelte@0.3.8(svelte@5.46.4)':
    dependencies:
      '@zoom-image/core': 0.41.4
-      svelte: 5.48.0
+      svelte: 5.46.4

  abab@2.0.6:
    optional: true
@@ -18845,7 +18842,7 @@ snapshots:
      graceful-fs: 4.2.11
      is-stream: 2.0.1
      lazystream: 1.0.1
-      lodash: 4.17.23
+      lodash: 4.17.21
      normalize-path: 3.0.0
      readable-stream: 4.7.0

@@ -19040,15 +19037,15 @@ snapshots:

  binary-extensions@2.3.0: {}

-  bits-ui@2.14.4(@internationalized/date@3.10.0)(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0):
+  bits-ui@2.14.4(@internationalized/date@3.10.0)(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4):
    dependencies:
      '@floating-ui/core': 1.7.3
      '@floating-ui/dom': 1.7.4
      '@internationalized/date': 3.10.0
      esm-env: 1.2.2
-      runed: 0.35.1(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)
-      svelte: 5.48.0
-      svelte-toolbelt: 0.10.6(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)
+      runed: 0.35.1(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)
+      svelte: 5.46.4
+      svelte-toolbelt: 0.10.6(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)
      tabbable: 6.4.0
    transitivePeerDependencies:
      - '@sveltejs/kit'
@@ -20578,7 +20575,7 @@ snapshots:
      '@types/eslint': 9.6.1
      eslint-config-prettier: 10.1.8(eslint@9.39.2(jiti@2.6.1))

-  eslint-plugin-svelte@3.14.0(eslint@9.39.2(jiti@2.6.1))(svelte@5.48.0):
+  eslint-plugin-svelte@3.14.0(eslint@9.39.2(jiti@2.6.1))(svelte@5.46.4):
    dependencies:
      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1))
      '@jridgewell/sourcemap-codec': 1.5.5
@@ -20590,9 +20587,9 @@ snapshots:
      postcss-load-config: 3.1.4(postcss@8.5.6)
      postcss-safe-parser: 7.0.1(postcss@8.5.6)
      semver: 7.7.3
-      svelte-eslint-parser: 1.4.1(svelte@5.48.0)
+      svelte-eslint-parser: 1.4.1(svelte@5.46.4)
    optionalDependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4
    transitivePeerDependencies:
      - ts-node

@@ -21578,7 +21575,7 @@ snapshots:
    dependencies:
      '@types/html-minifier-terser': 6.1.0
      html-minifier-terser: 6.1.0
-      lodash: 4.17.23
+      lodash: 4.17.21
      pretty-error: 4.0.0
      tapable: 2.3.0
    optionalDependencies:
@@ -21772,7 +21769,7 @@ snapshots:
      cli-cursor: 3.1.0
      cli-width: 3.0.0
      figures: 3.2.0
-      lodash: 4.17.23
+      lodash: 4.17.21
      mute-stream: 0.0.8
      ora: 5.4.1
      run-async: 2.4.1
@@ -22411,8 +22408,6 @@ snapshots:

  lodash@4.17.21: {}

-  lodash@4.17.23: {}
-
  log-symbols@4.1.0:
    dependencies:
      chalk: 4.1.2
@@ -23388,7 +23383,7 @@ snapshots:

  node-emoji@1.11.0:
    dependencies:
-      lodash: 4.17.23
+      lodash: 4.17.21

  node-emoji@2.2.0:
    dependencies:
@@ -24380,16 +24375,16 @@ snapshots:
    dependencies:
      prettier: 3.8.0

-  prettier-plugin-svelte@3.4.1(prettier@3.8.0)(svelte@5.48.0):
+  prettier-plugin-svelte@3.4.1(prettier@3.8.0)(svelte@5.46.4):
    dependencies:
      prettier: 3.8.0
-      svelte: 5.48.0
+      svelte: 5.46.4

  prettier@3.8.0: {}

  pretty-error@4.0.0:
    dependencies:
-      lodash: 4.17.23
+      lodash: 4.17.21
      renderkid: 3.0.0

  pretty-format@27.5.1:
@@ -24862,7 +24857,7 @@ snapshots:
      css-select: 4.3.0
      dom-converter: 0.2.0
      htmlparser2: 6.1.0
-      lodash: 4.17.23
+      lodash: 4.17.21
      strip-ansi: 6.0.1

  repeat-string@1.6.1: {}
@@ -25010,14 +25005,14 @@ snapshots:
    dependencies:
      queue-microtask: 1.2.3

-  runed@0.35.1(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0):
+  runed@0.35.1(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4):
    dependencies:
      dequal: 2.0.3
      esm-env: 1.2.2
      lz-string: 1.5.0
-      svelte: 5.48.0
+      svelte: 5.46.4
    optionalDependencies:
-      '@sveltejs/kit': 2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@sveltejs/kit': 2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))

  rw@1.3.3: {}

@@ -25647,23 +25642,23 @@ snapshots:

  supports-preserve-symlinks-flag@1.0.0: {}

-  svelte-awesome@3.3.5(svelte@5.48.0):
+  svelte-awesome@3.3.5(svelte@5.46.4):
    dependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4

-  svelte-check@4.3.5(picomatch@4.0.3)(svelte@5.48.0)(typescript@5.9.3):
+  svelte-check@4.3.5(picomatch@4.0.3)(svelte@5.46.4)(typescript@5.9.3):
    dependencies:
      '@jridgewell/trace-mapping': 0.3.31
      chokidar: 4.0.3
      fdir: 6.5.0(picomatch@4.0.3)
      picocolors: 1.1.1
      sade: 1.8.1
-      svelte: 5.48.0
+      svelte: 5.46.4
      typescript: 5.9.3
    transitivePeerDependencies:
      - picomatch

-  svelte-eslint-parser@1.4.1(svelte@5.48.0):
+  svelte-eslint-parser@1.4.1(svelte@5.46.4):
    dependencies:
      eslint-scope: 8.4.0
      eslint-visitor-keys: 4.2.1
@@ -25672,7 +25667,7 @@ snapshots:
      postcss-scss: 4.0.9(postcss@8.5.6)
      postcss-selector-parser: 7.1.1
    optionalDependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4

  svelte-floating-ui@1.5.8:
    dependencies:
@@ -25685,7 +25680,7 @@ snapshots:
    dependencies:
      highlight.js: 11.11.1

-  svelte-i18n@4.0.1(svelte@5.48.0):
+  svelte-i18n@4.0.1(svelte@5.46.4):
    dependencies:
      cli-color: 2.0.4
      deepmerge: 4.3.1
@@ -25693,10 +25688,10 @@ snapshots:
      estree-walker: 2.0.2
      intl-messageformat: 10.7.18
      sade: 1.8.1
-      svelte: 5.48.0
+      svelte: 5.46.4
      tiny-glob: 0.2.9

-  svelte-jsoneditor@3.11.0(svelte@5.48.0):
+  svelte-jsoneditor@3.11.0(svelte@5.46.4):
    dependencies:
      '@codemirror/autocomplete': 6.20.0
      '@codemirror/commands': 6.10.1
@@ -25723,42 +25718,42 @@ snapshots:
      memoize-one: 6.0.0
      natural-compare-lite: 1.4.0
      sass: 1.97.1
-      svelte: 5.48.0
-      svelte-awesome: 3.3.5(svelte@5.48.0)
+      svelte: 5.46.4
+      svelte-awesome: 3.3.5(svelte@5.46.4)
      svelte-select: 5.8.3
      vanilla-picker: 2.12.3

-  svelte-maplibre@1.2.5(svelte@5.48.0):
+  svelte-maplibre@1.2.5(svelte@5.46.4):
    dependencies:
      d3-geo: 3.1.1
      dequal: 2.0.3
      just-compare: 2.3.0
      maplibre-gl: 5.16.0
      pmtiles: 3.2.1
-      svelte: 5.48.0
+      svelte: 5.46.4

-  svelte-parse-markup@0.1.5(svelte@5.48.0):
+  svelte-parse-markup@0.1.5(svelte@5.46.4):
    dependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4

-  svelte-persisted-store@0.12.0(svelte@5.48.0):
+  svelte-persisted-store@0.12.0(svelte@5.46.4):
    dependencies:
-      svelte: 5.48.0
+      svelte: 5.46.4

  svelte-select@5.8.3:
    dependencies:
      svelte-floating-ui: 1.5.8

-  svelte-toolbelt@0.10.6(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0):
+  svelte-toolbelt@0.10.6(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4):
    dependencies:
      clsx: 2.1.1
-      runed: 0.35.1(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.48.0)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.48.0)
+      runed: 0.35.1(@sveltejs/kit@2.49.5(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.4(svelte@5.46.4)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)))(svelte@5.46.4)
      style-to-object: 1.0.14
-      svelte: 5.48.0
+      svelte: 5.46.4
    transitivePeerDependencies:
      - '@sveltejs/kit'

-  svelte@5.48.0:
+  svelte@5.46.4:
    dependencies:
      '@jridgewell/remapping': 2.3.5
      '@jridgewell/sourcemap-codec': 1.5.5
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "2.5.0",
+  "version": "2.4.1",
  "description": "",
  "author": "",
  "private": true,
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -15,7 +15,7 @@ import {
 } from 'src/enum';
 import { ConcurrentQueueName, FullsizeImageOptions, ImageOptions } from 'src/types';

-export type SystemConfig = {
+export interface SystemConfig {
  backup: {
    database: {
      enabled: boolean;
@@ -187,7 +187,7 @@ export type SystemConfig = {
  user: {
    deleteDelay: number;
  };
-};
+}

 export type MachineLearningConfig = SystemConfig['machineLearning'];

@@ -319,13 +319,11 @@ export const defaults = Object.freeze<SystemConfig>({
      format: ImageFormat.Webp,
      size: 250,
      quality: 80,
-      progressive: false,
    },
    preview: {
      format: ImageFormat.Jpeg,
      size: 1440,
      quality: 80,
-      progressive: false,
    },
    colorspace: Colorspace.P3,
    extractEmbedded: false,
@@ -333,7 +331,6 @@ export const defaults = Object.freeze<SystemConfig>({
      enabled: false,
      format: ImageFormat.Jpeg,
      quality: 80,
-      progressive: false,
    },
  },
  newVersionCheck: {
--- a/server/src/controllers/asset-media.controller.ts
+++ b/server/src/controllers/asset-media.controller.ts
@@ -147,8 +147,7 @@ export class AssetMediaController {
  @Authenticated({ permission: Permission.AssetView, sharedLink: true })
  @Endpoint({
    summary: 'View asset thumbnail',
-    description:
-      'Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.',
+    description: 'Retrieve the thumbnail image for the specified asset.',
    history: new HistoryBuilder().added('v1').beta('v1').stable('v2'),
  })
  async viewAsset(
@@ -203,7 +202,7 @@ export class AssetMediaController {
  }

  @Post('exist')
-  @Authenticated({ permission: Permission.AssetUpload })
+  @Authenticated()
  @Endpoint({
    summary: 'Check existing assets',
    description: 'Checks if multiple assets exist on the server and returns all existing - used by background backup',
--- a/server/src/controllers/asset.controller.ts
+++ b/server/src/controllers/asset.controller.ts
@@ -66,7 +66,7 @@ export class AssetController {
  }

  @Post('jobs')
-  @Authenticated({ permission: Permission.JobCreate })
+  @Authenticated()
  @HttpCode(HttpStatus.NO_CONTENT)
  @Endpoint({
    summary: 'Run an asset job',
--- a/server/src/controllers/view.controller.ts
+++ b/server/src/controllers/view.controller.ts
@@ -3,7 +3,7 @@ import { ApiTags } from '@nestjs/swagger';
 import { Endpoint, HistoryBuilder } from 'src/decorators';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { ApiTag, Permission } from 'src/enum';
+import { ApiTag } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { ViewService } from 'src/services/view.service';

@@ -13,7 +13,7 @@ export class ViewController {
  constructor(private service: ViewService) {}

  @Get('folder/unique-paths')
-  @Authenticated({ permission: Permission.FolderRead })
+  @Authenticated()
  @Endpoint({
    summary: 'Retrieve unique paths',
    description: 'Retrieve a list of unique folder paths from asset original paths.',
@@ -24,7 +24,7 @@ export class ViewController {
  }

  @Get('folder')
-  @Authenticated({ permission: Permission.FolderRead })
+  @Authenticated()
  @Endpoint({
    summary: 'Retrieve assets by original path',
    description: 'Retrieve assets that are children of a specific folder.',
--- a/server/src/dtos/asset-media.dto.ts
+++ b/server/src/dtos/asset-media.dto.ts
@@ -7,7 +7,6 @@ import { AssetVisibility } from 'src/enum';
 import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';

 export enum AssetMediaSize {
-  Original = 'original',
  /**
   * An full-sized image extracted/converted from non-web-friendly formats like RAW/HIF.
   * or otherwise the original image itself.
--- a/server/src/dtos/system-config.dto.ts
+++ b/server/src/dtos/system-config.dto.ts
@@ -585,9 +585,6 @@ class SystemConfigGeneratedImageDto {
  @Type(() => Number)
  @ApiProperty({ type: 'integer' })
  size!: number;
-
-  @ValidateBoolean()
-  progressive!: boolean;
 }

 class SystemConfigGeneratedFullsizeImageDto {
@@ -603,9 +600,6 @@ class SystemConfigGeneratedFullsizeImageDto {
  @Type(() => Number)
  @ApiProperty({ type: 'integer' })
  quality!: number;
-
-  @ValidateBoolean()
-  progressive!: boolean;
 }

 export class SystemConfigImageDto {
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -146,8 +146,6 @@ export enum Permission {
  FaceUpdate = 'face.update',
  FaceDelete = 'face.delete',

-  FolderRead = 'folder.read',
-
  JobCreate = 'job.create',
  JobRead = 'job.read',

--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -585,40 +585,3 @@ where
      and "libraryId" = $2::uuid
      and "isExternal" = $3
  )
-
-- AssetRepository.getForOriginal
-select
-  "originalFileName",
-  "asset_file"."path" as "editedPath",
-  "originalPath"
-from
-  "asset"
-  left join "asset_file" on "asset"."id" = "asset_file"."assetId"
-  and "asset_file"."isEdited" = $1
-  and "asset_file"."type" = $2
-where
-  "asset"."id" = $3
-
-- AssetRepository.getForThumbnail
-select
-  "asset"."originalPath",
-  "asset"."originalFileName",
-  "asset_file"."path" as "path"
-from
-  "asset"
-  left join "asset_file" on "asset"."id" = "asset_file"."assetId"
-  and "asset_file"."type" = $1
-where
-  "asset"."id" = $2
-order by
-  "asset_file"."isEdited" desc
-
-- AssetRepository.getForVideo
-select
-  "asset"."encodedVideoPath",
-  "asset"."originalPath"
-from
-  "asset"
-where
-  "asset"."id" = $1
-  and "asset"."type" = $2
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -1009,47 +1009,4 @@ export class AssetRepository {

    return count;
  }
-
-  @GenerateSql({ params: [DummyValue.UUID, true] })
-  async getForOriginal(id: string, isEdited: boolean) {
-    return this.db
-      .selectFrom('asset')
-      .select('originalFileName')
-      .where('asset.id', '=', id)
-      .$if(isEdited, (qb) =>
-        qb
-          .leftJoin('asset_file', (join) =>
-            join
-              .onRef('asset.id', '=', 'asset_file.assetId')
-              .on('asset_file.isEdited', '=', true)
-              .on('asset_file.type', '=', AssetFileType.FullSize),
-          )
-          .select('asset_file.path as editedPath'),
-      )
-      .select('originalPath')
-      .executeTakeFirstOrThrow();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID, AssetFileType.Preview] })
-  async getForThumbnail(id: string, type: AssetFileType) {
-    return this.db
-      .selectFrom('asset')
-      .where('asset.id', '=', id)
-      .leftJoin('asset_file', (join) =>
-        join.onRef('asset.id', '=', 'asset_file.assetId').on('asset_file.type', '=', type),
-      )
-      .select(['asset.originalPath', 'asset.originalFileName', 'asset_file.path as path'])
-      .orderBy('asset_file.isEdited', 'desc')
-      .executeTakeFirstOrThrow();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  async getForVideo(id: string) {
-    return this.db
-      .selectFrom('asset')
-      .select(['asset.encodedVideoPath', 'asset.originalPath'])
-      .where('asset.id', '=', id)
-      .where('asset.type', '=', AssetType.Video)
-      .executeTakeFirst();
-  }
 }
--- a/server/src/repositories/media.repository.ts
+++ b/server/src/repositories/media.repository.ts
@@ -176,7 +176,6 @@ export class MediaRepository {
      quality: options.quality,
      // this is default in libvips (except the threshold is 90), but we need to set it manually in sharp
      chromaSubsampling: options.quality >= 80 ? '4:4:4' : '4:2:0',
-      progressive: options.progressive,
    });

    await decoded.toFile(output);
--- a/server/src/services/asset-media.service.spec.ts
+++ b/server/src/services/asset-media.service.spec.ts
@@ -500,9 +500,17 @@ describe(AssetMediaService.name, () => {
      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
    });

+    it('should throw an error if the asset is not found', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+
+      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', {})).rejects.toBeInstanceOf(NotFoundException);
+
+      expect(mocks.asset.getById).toHaveBeenCalledWith('asset-1', { files: true, edits: true });
+    });
+
    it('should download a file', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      mocks.asset.getForOriginal.mockResolvedValue(assetStub.image);
+      mocks.asset.getById.mockResolvedValue(assetStub.image);

      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', {})).resolves.toEqual(
        new ImmichFileResponse({
@@ -528,10 +536,7 @@ describe(AssetMediaService.name, () => {
        ],
      };
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      mocks.asset.getForOriginal.mockResolvedValue({
-        ...editedAsset,
-        editedPath: '/uploads/user-id/fullsize/edited.jpg',
-      });
+      mocks.asset.getById.mockResolvedValue(editedAsset);

      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', { edited: true })).resolves.toEqual(
        new ImmichFileResponse({
@@ -557,10 +562,7 @@ describe(AssetMediaService.name, () => {
        ],
      };
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      mocks.asset.getForOriginal.mockResolvedValue({
-        ...editedAsset,
-        editedPath: '/uploads/user-id/fullsize/edited.jpg',
-      });
+      mocks.asset.getById.mockResolvedValue(editedAsset);

      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', { edited: true })).resolves.toEqual(
        new ImmichFileResponse({
@@ -586,7 +588,7 @@ describe(AssetMediaService.name, () => {
        ],
      };
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      mocks.asset.getForOriginal.mockResolvedValue(editedAsset);
+      mocks.asset.getById.mockResolvedValue(editedAsset);

      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', { edited: false })).resolves.toEqual(
        new ImmichFileResponse({
@@ -597,6 +599,29 @@ describe(AssetMediaService.name, () => {
        }),
      );
    });
+
+    it('should download original file when no edits exist', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
+
+      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', { edited: true })).resolves.toEqual(
+        new ImmichFileResponse({
+          path: '/original/path.jpg',
+          fileName: 'asset-id.jpg',
+          contentType: 'image/jpeg',
+          cacheControl: CacheControl.PrivateWithCache,
+        }),
+      );
+    });
+
+    it('should throw a not found when edits exist but no edited file available', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getById.mockResolvedValue(assetStub.withCropEdit);
+
+      await expect(sut.downloadOriginal(authStub.admin, 'asset-1', { edited: true })).rejects.toBeInstanceOf(
+        NotFoundException,
+      );
+    });
  });

  describe('viewThumbnail', () => {
@@ -608,9 +633,54 @@ describe(AssetMediaService.name, () => {
      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
    });

+    it('should throw an error if the asset does not exist', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+
+      await expect(
+        sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.PREVIEW }),
+      ).rejects.toBeInstanceOf(NotFoundException);
+    });
+
+    it('should throw an error if the requested thumbnail file does not exist', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({ ...assetStub.image, files: [] });
+
+      await expect(
+        sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.THUMBNAIL }),
+      ).rejects.toBeInstanceOf(NotFoundException);
+    });
+
+    it('should throw an error if the requested preview file does not exist', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({
+        ...assetStub.image,
+        files: [
+          {
+            id: '42',
+            path: '/path/to/preview',
+            type: AssetFileType.Thumbnail,
+            isEdited: false,
+          },
+        ],
+      });
+      await expect(
+        sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.PREVIEW }),
+      ).rejects.toBeInstanceOf(NotFoundException);
+    });
+
    it('should fall back to preview if the requested thumbnail file does not exist', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      mocks.asset.getForThumbnail.mockResolvedValue({ ...assetStub.image, path: '/path/to/preview.jpg' });
+      mocks.asset.getById.mockResolvedValue({
+        ...assetStub.image,
+        files: [
+          {
+            id: '42',
+            path: '/path/to/preview.jpg',
+            type: AssetFileType.Preview,
+            isEdited: false,
+          },
+        ],
+      });

      await expect(
        sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.THUMBNAIL }),
@@ -626,7 +696,7 @@ describe(AssetMediaService.name, () => {

    it('should get preview file', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      mocks.asset.getForThumbnail.mockResolvedValue({ ...assetStub.image, path: '/uploads/user-id/thumbs/path.jpg' });
+      mocks.asset.getById.mockResolvedValue({ ...assetStub.image });
      await expect(
        sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.PREVIEW }),
      ).resolves.toEqual(
@@ -641,7 +711,7 @@ describe(AssetMediaService.name, () => {

    it('should get thumbnail file', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      mocks.asset.getForThumbnail.mockResolvedValue({ ...assetStub.image, path: '/uploads/user-id/webp/path.ext' });
+      mocks.asset.getById.mockResolvedValue({ ...assetStub.image });
      await expect(
        sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.THUMBNAIL }),
      ).resolves.toEqual(
@@ -666,15 +736,22 @@ describe(AssetMediaService.name, () => {
      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
    });

-    it('should throw an error if the video asset could not be found', async () => {
+    it('should throw an error if the asset does not exist', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));

      await expect(sut.playbackVideo(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(NotFoundException);
    });

+    it('should throw an error if the asset is not a video', async () => {
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
+
+      await expect(sut.playbackVideo(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException);
+    });
+
    it('should return the encoded video path if available', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.hasEncodedVideo.id]));
-      mocks.asset.getForVideo.mockResolvedValue(assetStub.hasEncodedVideo);
+      mocks.asset.getById.mockResolvedValue(assetStub.hasEncodedVideo);

      await expect(sut.playbackVideo(authStub.admin, assetStub.hasEncodedVideo.id)).resolves.toEqual(
        new ImmichFileResponse({
@@ -687,7 +764,7 @@ describe(AssetMediaService.name, () => {

    it('should fall back to the original path', async () => {
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.video.id]));
-      mocks.asset.getForVideo.mockResolvedValue(assetStub.video);
+      mocks.asset.getById.mockResolvedValue(assetStub.video);

      await expect(sut.playbackVideo(authStub.admin, assetStub.video.id)).resolves.toEqual(
        new ImmichFileResponse({
--- a/server/src/services/asset-media.service.ts
+++ b/server/src/services/asset-media.service.ts
@@ -25,6 +25,7 @@ import { AuthDto } from 'src/dtos/auth.dto';
 import {
  AssetFileType,
  AssetStatus,
+  AssetType,
  AssetVisibility,
  CacheControl,
  JobName,
@@ -35,7 +36,7 @@ import { AuthRequest } from 'src/middleware/auth.guard';
 import { BaseService } from 'src/services/base.service';
 import { UploadFile, UploadRequest } from 'src/types';
 import { requireUploadAccess } from 'src/utils/access';
-import { asUploadRequest, onBeforeLink } from 'src/utils/asset.util';
+import { asUploadRequest, getAssetFiles, onBeforeLink } from 'src/utils/asset.util';
 import { isAssetChecksumConstraint } from 'src/utils/database';
 import { getFilenameExtension, getFileNameWithoutExtension, ImmichFileResponse } from 'src/utils/file';
 import { mimeTypes } from 'src/utils/mime-types';
@@ -196,17 +197,27 @@ export class AssetMediaService extends BaseService {
  async downloadOriginal(auth: AuthDto, id: string, dto: AssetDownloadOriginalDto): Promise<ImmichFileResponse> {
    await this.requireAccess({ auth, permission: Permission.AssetDownload, ids: [id] });

-    const { originalPath, originalFileName, editedPath } = await this.assetRepository.getForOriginal(
-      id,
-      dto.edited ?? false,
-    );
+    const asset = await this.findOrFail(id);

-    const path = editedPath ?? originalPath!;
+    if (asset.edits!.length > 0 && (dto.edited ?? false)) {
+      const { editedFullsizeFile } = getAssetFiles(asset.files ?? []);
+
+      if (!editedFullsizeFile) {
+        throw new NotFoundException('Edited asset media not found');
+      }
+
+      return new ImmichFileResponse({
+        path: editedFullsizeFile.path,
+        fileName: getFileNameWithoutExtension(asset.originalFileName) + getFilenameExtension(editedFullsizeFile.path),
+        contentType: mimeTypes.lookup(editedFullsizeFile.path),
+        cacheControl: CacheControl.PrivateWithCache,
+      });
+    }

    return new ImmichFileResponse({
-      path,
-      fileName: getFileNameWithoutExtension(originalFileName) + getFilenameExtension(path),
-      contentType: mimeTypes.lookup(path),
+      path: asset.originalPath,
+      fileName: asset.originalFileName,
+      contentType: mimeTypes.lookup(asset.originalPath),
      cacheControl: CacheControl.PrivateWithCache,
    });
  }
@@ -218,34 +229,45 @@ export class AssetMediaService extends BaseService {
  ): Promise<ImmichFileResponse | AssetMediaRedirectResponse> {
    await this.requireAccess({ auth, permission: Permission.AssetView, ids: [id] });

-    if (dto.size === AssetMediaSize.Original) {
-      throw new BadRequestException('May not request original file');
+    const asset = await this.findOrFail(id);
+    const size = dto.size ?? AssetMediaSize.THUMBNAIL;
+
+    const files = getAssetFiles(asset.files ?? []);
+
+    const requestingEdited = (dto.edited ?? false) && asset.edits!.length > 0;
+    const { fullsizeFile, previewFile, thumbnailFile } = {
+      fullsizeFile: requestingEdited ? files.editedFullsizeFile : files.fullsizeFile,
+      previewFile: requestingEdited ? files.editedPreviewFile : files.previewFile,
+      thumbnailFile: requestingEdited ? files.editedThumbnailFile : files.thumbnailFile,
+    };
+
+    let filepath = previewFile?.path;
+    if (size === AssetMediaSize.THUMBNAIL && thumbnailFile) {
+      filepath = thumbnailFile.path;
+    } else if (size === AssetMediaSize.FULLSIZE) {
+      if (mimeTypes.isWebSupportedImage(asset.originalPath) && !dto.edited) {
+        // use original file for web supported images
+        return { targetSize: 'original' };
+      }
+      if (!fullsizeFile) {
+        // downgrade to preview if fullsize is not available.
+        // e.g. disabled or not yet (re)generated
+        return { targetSize: AssetMediaSize.PREVIEW };
+      }
+      filepath = fullsizeFile.path;
    }

-    const size = (dto.size ?? AssetMediaSize.THUMBNAIL) as unknown as AssetFileType;
-    const { originalPath, originalFileName, path } = await this.assetRepository.getForThumbnail(id, size);
-
-    if (size === AssetFileType.FullSize && mimeTypes.isWebSupportedImage(originalPath) && !dto.edited) {
-      // use original file for web supported images
-      return { targetSize: 'original' };
-    }
-
-    if (dto.size === AssetMediaSize.FULLSIZE && !path) {
-      // downgrade to preview if fullsize is not available.
-      // e.g. disabled or not yet (re)generated
-      return { targetSize: AssetMediaSize.PREVIEW };
-    }
-
-    if (!path) {
+    if (!filepath) {
      throw new NotFoundException('Asset media not found');
    }
-
-    const fileName = `${getFileNameWithoutExtension(originalFileName)}_${size}${getFilenameExtension(path)}`;
+    let fileName = getFileNameWithoutExtension(asset.originalFileName);
+    fileName += `_${size}`;
+    fileName += getFilenameExtension(filepath);

    return new ImmichFileResponse({
      fileName,
-      path,
-      contentType: mimeTypes.lookup(path),
+      path: filepath,
+      contentType: mimeTypes.lookup(filepath),
      cacheControl: CacheControl.PrivateWithCache,
    });
  }
@@ -253,10 +275,10 @@ export class AssetMediaService extends BaseService {
  async playbackVideo(auth: AuthDto, id: string): Promise<ImmichFileResponse> {
    await this.requireAccess({ auth, permission: Permission.AssetView, ids: [id] });

-    const asset = await this.assetRepository.getForVideo(id);
+    const asset = await this.findOrFail(id);

-    if (!asset) {
-      throw new NotFoundException('Asset not found or asset is not a video');
+    if (asset.type !== AssetType.Video) {
+      throw new BadRequestException('Asset is not a video');
    }

    const filepath = asset.encodedVideoPath || asset.originalPath;
@@ -465,4 +487,13 @@ export class AssetMediaService extends BaseService {
      throw new BadRequestException('Quota has been exceeded!');
    }
  }
+
+  private async findOrFail(id: string) {
+    const asset = await this.assetRepository.getById(id, { files: true, edits: true });
+    if (!asset) {
+      throw new NotFoundException('Asset not found');
+    }
+
+    return asset;
+  }
 }
--- a/server/src/services/media.service.spec.ts
+++ b/server/src/services/media.service.spec.ts
@@ -352,7 +352,6 @@ describe(MediaService.name, () => {
          format: ImageFormat.Jpeg,
          size: 1440,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -366,7 +365,6 @@ describe(MediaService.name, () => {
          format: ImageFormat.Webp,
          size: 250,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -577,7 +575,6 @@ describe(MediaService.name, () => {
          format,
          size: 1440,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -591,7 +588,6 @@ describe(MediaService.name, () => {
          format: ImageFormat.Webp,
          size: 250,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -626,7 +622,6 @@ describe(MediaService.name, () => {
          format: ImageFormat.Jpeg,
          size: 1440,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -640,7 +635,6 @@ describe(MediaService.name, () => {
          format,
          size: 250,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -649,58 +643,6 @@ describe(MediaService.name, () => {
      );
    });

-    it('should generate progressive JPEG for preview when enabled', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        image: { preview: { progressive: true }, thumbnail: { progressive: false } },
-      });
-      mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
-
-      await sut.handleGenerateThumbnails({ id: assetStub.image.id });
-
-      expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
-        rawBuffer,
-        expect.objectContaining({
-          format: ImageFormat.Jpeg,
-          progressive: true,
-        }),
-        expect.stringContaining('preview.jpeg'),
-      );
-      expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
-        rawBuffer,
-        expect.objectContaining({
-          format: ImageFormat.Webp,
-          progressive: false,
-        }),
-        expect.stringContaining('thumbnail.webp'),
-      );
-    });
-
-    it('should generate progressive JPEG for thumbnail when enabled', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        image: { preview: { progressive: false }, thumbnail: { format: ImageFormat.Jpeg, progressive: true } },
-      });
-      mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
-
-      await sut.handleGenerateThumbnails({ id: assetStub.image.id });
-
-      expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
-        rawBuffer,
-        expect.objectContaining({
-          format: ImageFormat.Jpeg,
-          progressive: false,
-        }),
-        expect.stringContaining('preview.jpeg'),
-      );
-      expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
-        rawBuffer,
-        expect.objectContaining({
-          format: ImageFormat.Jpeg,
-          progressive: true,
-        }),
-        expect.stringContaining('thumbnail.jpeg'),
-      );
-    });
-
    it('should delete previous thumbnail if different path', async () => {
      mocks.systemMetadata.get.mockResolvedValue({ image: { thumbnail: { format: ImageFormat.Webp } } });
      mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
@@ -834,7 +776,6 @@ describe(MediaService.name, () => {
          format: ImageFormat.Jpeg,
          size: 1440,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -866,7 +807,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Webp,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -880,7 +820,6 @@ describe(MediaService.name, () => {
          format: ImageFormat.Jpeg,
          size: 1440,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -910,7 +849,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -923,7 +861,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          size: 1440,
          processInvalidImages: false,
          raw: rawInfo,
@@ -955,7 +892,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -1012,7 +948,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.Srgb,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -1052,7 +987,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Webp,
          quality: 90,
-          progressive: false,
          processInvalidImages: false,
          raw: rawInfo,
          edits: [],
@@ -1060,27 +994,6 @@ describe(MediaService.name, () => {
        expect.any(String),
      );
    });
-
-    it('should generate progressive JPEG for fullsize when enabled', async () => {
-      mocks.systemMetadata.get.mockResolvedValue({
-        image: { fullsize: { enabled: true, format: ImageFormat.Jpeg, progressive: true } },
-      });
-      mocks.media.extract.mockResolvedValue({ buffer: extractedBuffer, format: RawExtractedFormat.Jpeg });
-      mocks.media.getImageDimensions.mockResolvedValue({ width: 3840, height: 2160 });
-      mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.imageHif);
-
-      await sut.handleGenerateThumbnails({ id: assetStub.image.id });
-
-      expect(mocks.media.generateThumbnail).toHaveBeenCalledTimes(3);
-      expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
-        rawBuffer,
-        expect.objectContaining({
-          format: ImageFormat.Jpeg,
-          progressive: true,
-        }),
-        expect.stringContaining('fullsize.jpeg'),
-      );
-    });
  });

  describe('handleAssetEditThumbnailGeneration', () => {
@@ -1285,7 +1198,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
@@ -1330,7 +1242,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
@@ -1373,7 +1284,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
@@ -1416,7 +1326,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
@@ -1459,7 +1368,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
@@ -1502,7 +1410,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
@@ -1550,7 +1457,6 @@ describe(MediaService.name, () => {
          colorspace: Colorspace.P3,
          format: ImageFormat.Jpeg,
          quality: 80,
-          progressive: false,
          edits: [
            {
              action: 'crop',
--- a/server/src/services/media.service.ts
+++ b/server/src/services/media.service.ts
@@ -351,7 +351,6 @@ export class MediaService extends BaseService {
      const fullsizeOptions = {
        format: image.fullsize.format,
        quality: image.fullsize.quality,
-        progressive: image.fullsize.progressive,
        ...thumbnailOptions,
      };
      promises.push(this.mediaRepository.generateThumbnail(data, fullsizeOptions, fullsizePath));
@@ -435,7 +434,6 @@ export class MediaService extends BaseService {
      format: ImageFormat.Jpeg,
      raw: info,
      quality: image.thumbnail.quality,
-      progressive: false,
      processInvalidImages: false,
      size: FACE_THUMBNAIL_SIZE,
      edits: [
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -387,7 +387,7 @@ describe(MetadataService.name, () => {

    it('should extract tags from TagsList', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent'] }) });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent'] } } as any);
      mockReadTags({ TagsList: ['Parent'] });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -398,7 +398,7 @@ describe(MetadataService.name, () => {

    it('should extract hierarchy from TagsList', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent/Child'] }) });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent/Child'] } } as any);
      mockReadTags({ TagsList: ['Parent/Child'] });
      mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.parentUpsert);
      mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.childUpsert);
@@ -419,7 +419,7 @@ describe(MetadataService.name, () => {

    it('should extract tags from Keywords as a string', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent'] }) });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent'] } } as any);
      mockReadTags({ Keywords: 'Parent' });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -430,7 +430,7 @@ describe(MetadataService.name, () => {

    it('should extract tags from Keywords as a list', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent'] }) });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent'] } } as any);
      mockReadTags({ Keywords: ['Parent'] });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -441,10 +441,7 @@ describe(MetadataService.name, () => {

    it('should extract tags from Keywords as a list with a number', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent', '2024'] }),
-      });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent', '2024'] } } as any);
      mockReadTags({ Keywords: ['Parent', 2024] });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -456,7 +453,7 @@ describe(MetadataService.name, () => {

    it('should extract hierarchal tags from Keywords', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent/Child'] }) });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent/Child'] } } as any);
      mockReadTags({ Keywords: 'Parent/Child' });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -476,10 +473,7 @@ describe(MetadataService.name, () => {

    it('should ignore Keywords when TagsList is present', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent/Child', 'Child'] }),
-      });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent/Child', 'Child'] } } as any);
      mockReadTags({ Keywords: 'Child', TagsList: ['Parent/Child'] });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -499,10 +493,7 @@ describe(MetadataService.name, () => {

    it('should extract hierarchy from HierarchicalSubject', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent/Child', 'TagA'] }),
-      });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent/Child', 'TagA'] } } as any);
      mockReadTags({ HierarchicalSubject: ['Parent|Child', 'TagA'] });
      mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.parentUpsert);
      mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.childUpsert);
@@ -524,10 +515,7 @@ describe(MetadataService.name, () => {

    it('should extract tags from HierarchicalSubject as a list with a number', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent', '2024'] }),
-      });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent', '2024'] } } as any);
      mockReadTags({ HierarchicalSubject: ['Parent', 2024] });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

@@ -539,7 +527,7 @@ describe(MetadataService.name, () => {

    it('should extract ignore / characters in a HierarchicalSubject tag', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(assetStub.image);
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Mom|Dad'] }) });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Mom|Dad'] } } as any);
      mockReadTags({ HierarchicalSubject: ['Mom/Dad'] });
      mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.parentUpsert);

@@ -554,10 +542,7 @@ describe(MetadataService.name, () => {

    it('should ignore HierarchicalSubject when TagsList is present', async () => {
      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(assetStub.image);
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent/Child', 'Parent2/Child2'] }),
-      });
+      mocks.asset.getById.mockResolvedValue({ exifInfo: { tags: ['Parent/Child', 'Parent2/Child2'] } } as any);
      mockReadTags({ HierarchicalSubject: ['Parent2|Child2'], TagsList: ['Parent/Child'] });
      mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);

--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -167,15 +167,13 @@ const updatedConfig = Object.freeze<SystemConfig>({
      size: 250,
      format: ImageFormat.Webp,
      quality: 80,
-      progressive: false,
    },
    preview: {
      size: 1440,
      format: ImageFormat.Jpeg,
      quality: 80,
-      progressive: false,
    },
-    fullsize: { enabled: false, format: ImageFormat.Jpeg, quality: 80, progressive: false },
+    fullsize: { enabled: false, format: ImageFormat.Jpeg, quality: 80 },
    colorspace: Colorspace.P3,
    extractEmbedded: false,
  },
--- a/server/src/services/tag.service.spec.ts
+++ b/server/src/services/tag.service.spec.ts
@@ -4,7 +4,6 @@ import { JobStatus } from 'src/enum';
 import { TagService } from 'src/services/tag.service';
 import { authStub } from 'test/fixtures/auth.stub';
 import { tagResponseStub, tagStub } from 'test/fixtures/tag.stub';
-import { factory } from 'test/small.factory';
 import { newTestService, ServiceMocks } from 'test/utils';

 describe(TagService.name, () => {
@@ -192,10 +191,7 @@ describe(TagService.name, () => {
    it('should upsert records', async () => {
      mocks.access.tag.checkOwnerAccess.mockResolvedValue(new Set(['tag-1', 'tag-2']));
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        tags: [factory.tag({ value: 'tag-1' }), factory.tag({ value: 'tag-2' })],
-      });
+      mocks.asset.getById.mockResolvedValue({ tags: [{ value: 'tag-1' }, { value: 'tag-2' }] } as any);
      mocks.tag.upsertAssetIds.mockResolvedValue([
        { tagId: 'tag-1', assetId: 'asset-1' },
        { tagId: 'tag-1', assetId: 'asset-2' },
@@ -246,10 +242,7 @@ describe(TagService.name, () => {
      mocks.tag.get.mockResolvedValue(tagStub.tag);
      mocks.tag.getAssetIds.mockResolvedValue(new Set(['asset-1']));
      mocks.tag.addAssetIds.mockResolvedValue();
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        tags: [factory.tag({ value: 'tag-1' })],
-      });
+      mocks.asset.getById.mockResolvedValue({ tags: [{ value: 'tag-1' }] } as any);
      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-2']));

      await expect(
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -23,48 +23,41 @@ import {
  VideoCodec,
 } from 'src/enum';

-export type DeepPartial<T> =
-  T extends Record<string, unknown>
-    ? { [K in keyof T]?: DeepPartial<T[K]> }
-    : T extends Array<infer R>
-      ? DeepPartial<R>[]
-      : T;
+export type DeepPartial<T> = T extends object ? { [K in keyof T]?: DeepPartial<T[K]> } : T;

 export type RepositoryInterface<T extends object> = Pick<T, keyof T>;

-export type FullsizeImageOptions = {
+export interface FullsizeImageOptions {
  format: ImageFormat;
  quality: number;
  enabled: boolean;
-  progressive: boolean;
-};
+}

-export type ImageOptions = {
+export interface ImageOptions {
  format: ImageFormat;
  quality: number;
  size: number;
-  progressive: boolean;
-};
+}

-export type RawImageInfo = {
+export interface RawImageInfo {
  width: number;
  height: number;
  channels: 1 | 2 | 3 | 4;
-};
+}

-type DecodeImageOptions = {
+interface DecodeImageOptions {
  colorspace: string;
  processInvalidImages: boolean;
  raw?: RawImageInfo;
  edits?: AssetEditActionItem[];
-};
+}

 export interface DecodeToBufferOptions extends DecodeImageOptions {
  size?: number;
  orientation?: ExifOrientation;
 }

-export type GenerateThumbnailOptions = Pick<ImageOptions, 'format' | 'quality' | 'progressive'> & DecodeToBufferOptions;
+export type GenerateThumbnailOptions = Pick<ImageOptions, 'format' | 'quality'> & DecodeToBufferOptions;

 export type GenerateThumbnailFromBufferOptions = GenerateThumbnailOptions & { raw: RawImageInfo };

@@ -511,7 +504,7 @@ export interface SystemMetadata extends Record<SystemMetadataKey, Record<string,
  [SystemMetadataKey.MemoriesState]: MemoriesState;
 }

-export type UserPreferences = {
+export interface UserPreferences {
  albums: {
    defaultAssetOrder: AssetOrder;
  };
@@ -554,7 +547,7 @@ export type UserPreferences = {
  cast: {
    gCastEnabled: boolean;
  };
-};
+}

 export type UserMetadataItem<T extends keyof UserMetadata = UserMetadataKey> = {
  key: T;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mertalev	40dd94d10d	better error handling	2026-01-23 14:55:01 -05:00
mertalev	538cc926da	tighten dispose	2026-01-23 14:50:27 -05:00
mertalev	a04338e5ad	add extra cancellation check	2026-01-23 14:44:36 -05:00
mertalev	f1b1f90fb6	fix eviction race condition	2026-01-23 14:39:30 -05:00
mertalev	3555021173	clear cache button	2026-01-23 02:10:39 -05:00
mertalev	15c9eb12a8	bump concurrency	2026-01-23 02:10:39 -05:00
Alex	cf623a49c6	Merge branch 'main' into feat/mobile-platform-clients	2026-01-22 15:55:25 -06:00
mertalev	c531b95d54	formatting	2026-01-21 18:53:41 -05:00
mertalev	82dde1c3e7	re-enable cache	2026-01-21 18:52:32 -05:00
mertalev	fe07cf6f6d	ios optimizations	2026-01-21 18:52:32 -05:00
mertalev	87a1502ef1	fast path for known content length	2026-01-21 18:52:32 -05:00
mertalev	cef5a7cf50	refactor, fix capacity handling	2026-01-21 18:52:32 -05:00
mertalev	9980d06f0c	embedded cronet	2026-01-21 18:52:32 -05:00
mertalev	e51547cd28	potential race conditions	2026-01-21 18:52:32 -05:00
mertalev	d898cba04d	refactor	2026-01-21 18:52:32 -05:00
mertalev	fd89607142	fixed locking	2026-01-21 18:52:32 -05:00
mertalev	95fad974c1	optimized http	2026-01-21 18:52:32 -05:00
mertalev	00ea98479f	flutter-side decode	2026-01-21 18:52:32 -05:00
mertalev	24ff08e094	set user agent	2026-01-21 18:52:32 -05:00
mertalev	495cd8a6de	enable disk cache	2026-01-21 18:52:32 -05:00
mertalev	f98b441100	clarify parameter	2026-01-21 18:52:32 -05:00
mertalev	e739aa1667	conditional cronet	2026-01-21 18:52:32 -05:00
mertalev	d83e74dc88	lock approach is slower on ios	2026-01-21 18:52:32 -05:00
mertalev	06467f2c0d	memory optimization	2026-01-21 18:52:32 -05:00
mertalev	957ee84636	android impl	2026-01-21 18:52:32 -05:00
mertalev	8ad93ab4b1	remove incremental	2026-01-21 18:52:32 -05:00
mertalev	89f9c136ac	optimized decoding	2026-01-21 18:52:32 -05:00
mertalev	4ec0d6df9a	disable disk cache by default	2026-01-21 18:52:32 -05:00
mertalev	6cba10513b	unrelated change	2026-01-21 18:52:32 -05:00
mertalev	2d4ee03c5b	move to bootstrap	2026-01-21 18:52:31 -05:00
mertalev	6e956bfe4c	set defaults	2026-01-21 18:52:31 -05:00
mertalev	1e0e0d8066	init before app launch	2026-01-21 18:52:31 -05:00
mertalev	66a0e04489	custom user agent	2026-01-21 18:52:31 -05:00
mertalev	9cae61851c	fix hot reload	2026-01-21 18:52:31 -05:00
mertalev	34f7e07be9	uppercase http method	2026-01-21 18:52:31 -05:00
mertalev	e098a8261e	platform clients	2026-01-21 18:52:29 -05:00