chore: release v2.5.0

refactor: use assetCacheManager for OCR data (#25437 )
refactor: rename preloadManager to imageManager (#25436 )
2026-01-23 01:49:01 -08:00 · 2026-01-23 03:15:08 +00:00 · 2026-01-22 21:12:56 -06:00 · 2026-01-22 21:11:57 -06:00
91 changed files with 1009 additions and 2036 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,291 @@
+
+# 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
+### 🌟 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
+### 🐛 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
+### 📚 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
+
+## 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
+
+**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.105",
+  "version": "2.2.106",
  "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,4 +1,8 @@
 [
+  {
+    "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.4.1",
+  "version": "2.5.0",
  "description": "",
  "main": "index.js",
  "type": "module",
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -449,9 +449,6 @@
  "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}",
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.4.1"
+version = "2.5.0"
 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,5 +8,3 @@ 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.2.13676358"
+  ndkVersion = "28.1.13356709"

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

  buildFeatures {
-    buildConfig true
    compose true
  }

@@ -106,11 +105,8 @@ 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,38 +1,40 @@
 #include <jni.h>
 #include <stdlib.h>
-#include <string.h>

 JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeBuffer_allocate(
+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(
        JNIEnv *env, jclass clazz, jint size) {
    void *ptr = malloc(size);
    return (jlong) ptr;
 }

 JNIEXPORT void JNICALL
-Java_app_alextran_immich_NativeBuffer_free(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_freeNative(
        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 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_NativeBuffer_wrap(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_wrapAsBuffer(
        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
 }

-JNIEXPORT void JNICALL
-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);
-    }
+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);
 }
--- 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,7 +2,6 @@ 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
@@ -52,18 +51,15 @@ 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 (allowSelfSigned) {
-            tm = arrayOf(AllowSelfSignedTrustManager(serverHost))
+          if (args[0] as Boolean) {
+            tm = arrayOf(AllowSelfSignedTrustManager(args[1] as? String))
          }

          var km: Array<KeyManager>? = null
-          if (clientCertHash != null) {
-            val cert = ByteArrayInputStream(clientCertHash)
+          if (args[2] != null) {
+            val cert = ByteArrayInputStream(args[2] as ByteArray)
            val password = (args[3] as String).toCharArray()
            val keyStore = KeyStore.getInstance("PKCS12")
            keyStore.load(cert, password)
@@ -73,9 +69,6 @@ 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,10 +10,8 @@ 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.LocalImageApi
-import app.alextran.immich.images.LocalImagesImpl
-import app.alextran.immich.images.RemoteImageApi
-import app.alextran.immich.images.RemoteImagesImpl
+import app.alextran.immich.images.ThumbnailApi
+import app.alextran.immich.images.ThumbnailsImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -38,9 +36,7 @@ class MainActivity : FlutterFragmentActivity() {
          NativeSyncApiImpl30(ctx)
        }
      NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
-      LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
-      RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
-
+      ThumbnailApi.setUp(messenger, ThumbnailsImpl(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
@@ -1,52 +0,0 @@
-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
@@ -1,73 +0,0 @@
-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/RemoteImages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImages.g.kt
@@ -1,123 +0,0 @@
-// 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
@@ -1,520 +0,0 @@
-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 httpError: IOException? = 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) {
-        httpError = IOException("HTTP ${info.httpStatusCode}: ${info.httpStatusText}")
-        return request.cancel()
-      }
-
-      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())
-      }
-    }
-
-    override fun onReadCompleted(
-      request: UrlRequest,
-      info: UrlResponseInfo,
-      byteBuffer: ByteBuffer
-    ) {
-      val buf = if (wrapped == null) {
-        buffer!!.run {
-          advance(byteBuffer.position())
-          ensureHeadroom()
-          wrapRemaining()
-        }
-      } else {
-        wrapped
-      }
-      request.read(buf)
-    }
-
-    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(httpError ?: 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,8 +7,6 @@ package app.alextran.immich.images;

 import java.nio.ByteBuffer;

-import app.alextran.immich.NativeBuffer;
-
 // modified to use native allocations
 public final class ThumbHash {
  /**
@@ -58,8 +56,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 = NativeBuffer.allocate(size);
-    ByteBuffer rgba = NativeBuffer.wrap(pointer, size);
+    long pointer = ThumbnailsImpl.allocateNative(size);
+    ByteBuffer rgba = ThumbnailsImpl.wrapAsBuffer(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/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 LocalImagesPigeonUtils {
+private object ThumbnailsPigeonUtils {

  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 LocalImagesPigeonCodec : StandardMessageCodec() {
+private open class ThumbnailsPigeonCodec : StandardMessageCodec() {
  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
    return     super.readValueOfType(type, buffer)
  }
@@ -58,22 +58,22 @@ private open class LocalImagesPigeonCodec : StandardMessageCodec() {


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

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

-@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 {
+class ThumbnailsImpl(context: Context) : ThumbnailApi {
  private val ctx: Context = context.applicationContext
  private val resolver: ContentResolver = ctx.contentResolver
  private val requestThread = Executors.newSingleThreadExecutor()
@@ -71,8 +38,21 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
  private val requestMap = ConcurrentHashMap<Long, Request>()

  companion object {
-    val CANCELLED = Result.success<Map<String, Long>?>(null)
+    val CANCELLED = Result.success<Map<String, Long>>(mapOf())
    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) {
@@ -83,8 +63,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
        val res = mapOf(
          "pointer" to image.pointer,
          "width" to image.width.toLong(),
-          "height" to image.height.toLong(),
-          "rowBytes" to (image.width * 4).toLong()
+          "height" to image.height.toLong()
        )
        callback(Result.success(res))
      } catch (e: Exception) {
@@ -99,7 +78,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
    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 {
@@ -119,7 +98,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
    requestMap[requestId] = request
  }

-  override fun cancelRequest(requestId: Long) {
+  override fun cancelImageRequest(requestId: Long) {
    val request = requestMap.remove(requestId) ?: return
    request.taskFuture.cancel(false)
    request.cancellationSignal.cancel()
@@ -138,7 +117,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
    width: Long,
    height: Long,
    isVideo: Boolean,
-    callback: (Result<Map<String, Long>?>) -> Unit,
+    callback: (Result<Map<String, Long>>) -> Unit,
    signal: CancellationSignal
  ) {
    signal.throwIfCanceled()
@@ -152,12 +131,31 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
      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 res = bitmap.toNativeBuffer()
+      val buffer = wrapAsBuffer(pointer, size)
+      bitmap.copyPixelsToBuffer(buffer)
+      bitmap.recycle()
      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))
    }
  }
@@ -193,7 +191,16 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
  private fun decodeSource(uri: Uri, target: Size, signal: CancellationSignal): Bitmap {
    signal.throwIfCanceled()
    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      ImageDecoder.createSource(resolver, uri).decodeBitmap(target)
+      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))
+      }
    } else {
      val ref =
        Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri).disallowHardwareConfig()
--- 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" => 3030,
-        "android.injected.version.name" => "2.4.1",
+        "android.injected.version.code" => 3031,
+        "android.injected.version.name" => "2.5.0",
      }
    )
    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,9 +6,6 @@ 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):
@@ -139,7 +136,6 @@ 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`)
@@ -188,8 +184,6 @@ 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:
@@ -255,7 +249,6 @@ 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 = 77;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -29,11 +29,9 @@
 		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 */; };
@@ -120,11 +118,9 @@
 		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 */
@@ -140,11 +136,15 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -158,6 +158,8 @@
 		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -319,11 +321,9 @@
 		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,14 +549,10 @@
 			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";
@@ -585,14 +581,10 @@
 			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";
@@ -608,14 +600,12 @@
 				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,8 +53,7 @@ import UIKit
  
  public static func registerPlugins(with engine: FlutterEngine) {
    NativeSyncApiImpl.register(with: engine.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    LocalImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: LocalImageApiImpl())
-    RemoteImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: RemoteImageApiImpl())
+    ThumbnailApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ThumbnailApiImpl())
    BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: BackgroundWorkerApiImpl())
    ConnectivityApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ConnectivityApiImpl())
  }
--- a/mobile/ios/Runner/Images/RemoteImages.g.swift
+++ b/mobile/ios/Runner/Images/RemoteImages.g.swift
@@ -1,134 +0,0 @@
-// 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
@@ -1,181 +0,0 @@
-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))
-    }
-    
-    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/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 LocalImagesPigeonCodecReader: FlutterStandardReader {
+private class ThumbnailsPigeonCodecReader: FlutterStandardReader {
 }

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

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

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

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


 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-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
+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
  func getThumbhash(thumbhash: String, completion: @escaping (Result<[String: Int64], Error>) -> Void)
 }

 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-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 = "") {
+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 = "") {
    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.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 LocalImageApiSetup {
    } else {
      requestImageChannel.setMessageHandler(nil)
    }
-    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let cancelImageRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
    if let api = api {
-      cancelRequestChannel.setMessageHandler { message, reply in
+      cancelImageRequestChannel.setMessageHandler { message, reply in
        let args = message as! [Any?]
        let requestIdArg = args[0] as! Int64
        do {
-          try api.cancelRequest(requestId: requestIdArg)
+          try api.cancelImageRequest(requestId: requestIdArg)
          reply(wrapResult(nil))
        } catch {
          reply(wrapError(error))
        }
      }
    } else {
-      cancelRequestChannel.setMessageHandler(nil)
+      cancelImageRequestChannel.setMessageHandler(nil)
    }
-    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.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 Accelerate
+import CryptoKit
 import Flutter
 import MobileCoreServices
 import Photos

-class LocalImageRequest {
+class Request {
  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 LocalImageApiImpl: LocalImageApi {
+class ThumbnailApiImpl: ThumbnailApi {
  private static let imageManager = PHImageManager.default()
  private static let fetchOptions = {
    let fetchOptions = PHFetchOptions()
@@ -36,39 +36,47 @@ class LocalImageApiImpl: LocalImageApi {
  private static let cancelQueue = DispatchQueue(label: "thumbnail.cancellation", qos: .default)
  private static let processingQueue = DispatchQueue(label: "thumbnail.processing", qos: .userInteractive, attributes: .concurrent)
  
-  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 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 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)
-      completion(.success([
-        "pointer": Int64(Int(bitPattern: pointer.baseAddress)),
-        "width": Int64(width),
-        "height": Int64(height),
-        "rowBytes": Int64(width * 4)
-      ]))
+      self.waitForActiveState()
+      completion(.success(["pointer": Int64(Int(bitPattern: pointer.baseAddress)), "width": Int64(width), "height": Int64(height)]))
    }
  }
  
-  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)
+  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)
    let item = DispatchWorkItem {
      if request.isCancelled {
        return completion(Self.cancelledResult)
@@ -85,7 +93,7 @@ class LocalImageApiImpl: LocalImageApi {
      
      guard let asset = Self.requestAsset(assetId: assetId)
      else {
-        Self.remove(requestId: requestId)
+        Self.removeRequest(requestId: requestId)
        completion(.failure(PigeonError(code: "", message: "Could not get asset data for \(assetId)", details: nil)))
        return
      }
@@ -111,54 +119,70 @@ class LocalImageApiImpl: LocalImageApi {
      
      guard let image = image,
            let cgImage = image.cgImage else {
-        Self.remove(requestId: requestId)
+        Self.removeRequest(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)
      }
      
-      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)))
+      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)))
      }
+      
+      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.add(requestId: requestId, request: request)
+    Self.addRequest(requestId: requestId, request: request)
    Self.processingQueue.async(execute: item)
  }
  
-  func cancelRequest(requestId: Int64) {
-    Self.cancel(requestId: requestId)
+  func cancelImageRequest(requestId: Int64) {
+    Self.cancelRequest(requestId: requestId)
  }
  
-  private static func add(requestId: Int64, request: LocalImageRequest) -> Void {
+  private static func addRequest(requestId: Int64, request: Request) -> Void {
    requestQueue.sync { requests[requestId] = request }
  }
  
-  private static func remove(requestId: Int64) -> Void {
+  private static func removeRequest(requestId: Int64) -> Void {
    requestQueue.sync { requests[requestId] = nil }
  }
  
-  private static func cancel(requestId: Int64) -> Void {
+  private static func cancelRequest(requestId: Int64) -> Void {
    requestQueue.async {
      guard let request = requests.removeValue(forKey: requestId) else { return }
      request.isCancelled = true
@@ -179,4 +203,9 @@ class LocalImageApiImpl: LocalImageApi {
    assetQueue.async { assetCache.setObject(asset, forKey: assetId as NSString) }
    return asset
  }
+  
+  func waitForActiveState() {
+    Self.activitySemaphore.wait()
+    Self.activitySemaphore.signal()
+  }
 }
--- 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.4.1</string>
+	<string>2.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
--- a/mobile/lib/infrastructure/loaders/image_request.dart
+++ b/mobile/lib/infrastructure/loaders/image_request.dart
@@ -1,12 +1,15 @@
 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';
@@ -34,53 +37,27 @@ abstract class ImageRequest {

  void _onCancelled();

-  Future<ui.FrameInfo?> _fromEncodedPlatformImage(int address, int length) async {
+  Future<ui.FrameInfo?> _fromPlatformImage(Map<String, int> info) async {
+    final address = info['pointer'];
+    if (address == null) {
+      return null;
+    }
+
    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 {
-      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();
-    if (_isCancelled) {
-      buffer.dispose();
-      descriptor.dispose();
-      codec.dispose();
-      return null;
-    }
-    return await codec.getNextFrame();
-  }
-
-  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));
+      actualWidth = info['width']!;
+      actualHeight = info['height']!;
+      actualSize = actualWidth * actualHeight * 4;
+      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(actualSize));
    } finally {
      malloc.free(pointer);
    }
@@ -92,9 +69,8 @@ abstract class ImageRequest {

    final descriptor = ui.ImageDescriptor.raw(
      buffer,
-      width: width,
-      height: height,
-      rowBytes: rowBytes,
+      width: actualWidth,
+      height: actualHeight,
      pixelFormat: ui.PixelFormat.rgba8888,
    );
    final codec = await descriptor.instantiateCodec();
--- a/mobile/lib/infrastructure/loaders/local_image_request.dart
+++ b/mobile/lib/infrastructure/loaders/local_image_request.dart
@@ -16,23 +16,20 @@ class LocalImageRequest extends ImageRequest {
      return null;
    }

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

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

  @override
  Future<void> _onCancelled() {
-    return localImageApi.cancelRequest(requestId);
+    return thumbnailApi.cancelImageRequest(requestId);
  }
 }
--- a/mobile/lib/infrastructure/loaders/remote_image_request.dart
+++ b/mobile/lib/infrastructure/loaders/remote_image_request.dart
@@ -1,10 +1,14 @@
 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});
+  RemoteImageRequest({required this.uri, required this.headers, this.cacheManager});

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

-    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);
+    // 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);
  }

  @override
-  Future<void> _onCancelled() {
-    return remoteImageApi.cancelRequest(requestId);
+  void _onCancelled() {
+    _request?.abort();
+    _request = null;
  }
 }
--- 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 localImageApi.getThumbhash(thumbhash);
-    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
+    final Map<String, int> info = await thumbnailApi.getThumbhash(thumbhash);
+    final frame = await _fromPlatformImage(info);
    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
@@ -1,67 +0,0 @@
-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/main.dart
+++ b/mobile/lib/main.dart
@@ -19,7 +19,6 @@ 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';
@@ -238,14 +237,6 @@ 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/platform/local_image_api.g.dart
+++ b/mobile/lib/platform/local_image_api.g.dart
@@ -1,137 +0,0 @@
-// 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
@@ -1,129 +0,0 @@
-// 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/widgets/images/remote_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
@@ -7,12 +7,14 @@ 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;

@@ -39,6 +41,7 @@ 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);
  }
@@ -59,6 +62,7 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>

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

@@ -94,6 +98,7 @@ 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);

--- a/mobile/lib/presentation/widgets/timeline/constants.dart
+++ b/mobile/lib/presentation/widgets/timeline/constants.dart
@@ -2,11 +2,9 @@ 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,25 +1,148 @@
 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';

-class RemoteImageCacheManager extends CacheManager {
+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 {
  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(_config);
+  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,
+    );
+  }
 }

-class RemoteThumbnailCacheManager extends CacheManager {
+/// The cache manager for full size images [ImmichRemoteImageProvider]
+class RemoteThumbnailCacheManager extends RemoteCacheManager {
  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(_config);
+  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,
+    );
+  }
 }
--- a/mobile/lib/providers/infrastructure/platform.provider.dart
+++ b/mobile/lib/providers/infrastructure/platform.provider.dart
@@ -4,8 +4,7 @@ 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/local_image_api.g.dart';
-import 'package:immich_mobile/platform/remote_image_api.g.dart';
+import 'package:immich_mobile/platform/thumbnail_api.g.dart';

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

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

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

-final localImageApi = LocalImageApi();
-
-final remoteImageApi = RemoteImageApi();
+final thumbnailApi = ThumbnailApi();
--- a/mobile/lib/utils/bootstrap.dart
+++ b/mobile/lib/utils/bootstrap.dart
@@ -21,7 +21,6 @@ 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';
@@ -107,7 +106,5 @@ 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", "KiB", "MiB", "GiB", "TiB"];
+  const suffixes = ["B", "KB", "MB", "GB", "TB"];
  var i = (log(bytes) / log(1024)).floor();
  return '${(bytes / pow(1024, i)).toStringAsFixed(decimals)} ${suffixes[i]}';
 }
--- a/mobile/lib/widgets/settings/advanced_settings.dart
+++ b/mobile/lib/widgets/settings/advanced_settings.dart
@@ -8,12 +8,10 @@ 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';
@@ -155,43 +153,6 @@ 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,14 +7,12 @@ build:

 pigeon:
 	dart run pigeon --input pigeon/native_sync_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/thumbnail_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/local_image_api.g.dart
-	dart format lib/platform/remote_image_api.g.dart
+	dart format lib/platform/thumbnail_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.4.1
+- API version: 2.5.0
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

--- a/mobile/openapi/lib/model/asset_media_size.dart
+++ b/mobile/openapi/lib/model/asset_media_size.dart
@@ -23,12 +23,14 @@ 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,
@@ -70,6 +72,7 @@ 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/packages/ui/pubspec.lock
+++ b/mobile/packages/ui/pubspec.lock
@@ -34,10 +34,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.16.0"
  sky_engine:
    dependency: transitive
    description: flutter
--- a/mobile/pigeon/remote_image_api.dart
+++ b/mobile/pigeon/remote_image_api.dart
@@ -1,28 +0,0 @@
-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/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/local_image_api.g.dart',
-    swiftOut: 'ios/Runner/Images/LocalImages.g.swift',
+    dartOut: 'lib/platform/thumbnail_api.g.dart',
+    swiftOut: 'ios/Runner/Images/Thumbnails.g.swift',
    swiftOptions: SwiftOptions(includeErrorClass: false),
    kotlinOut:
-        'android/app/src/main/kotlin/app/alextran/immich/images/LocalImages.g.kt',
+        'android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt',
    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.images'),
    dartOptions: DartOptions(),
    dartPackageName: 'immich_mobile',
  ),
 )
@HostApi()
-abstract class LocalImageApi {
+abstract class ThumbnailApi {
  @async
-  Map<String, int>? requestImage(
+  Map<String, int> requestImage(
    String assetId, {
    required int requestId,
    required int width,
@@ -23,7 +23,7 @@ abstract class LocalImageApi {
    required bool isVideo,
  });

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

  @async
  Map<String, int> getThumbhash(String thumbhash);
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -297,14 +297,6 @@ 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:
@@ -345,14 +337,6 @@ 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:
@@ -385,14 +369,6 @@ 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:
@@ -912,14 +888,6 @@ 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:
@@ -968,14 +936,6 @@ 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:
@@ -1117,14 +1077,6 @@ 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:
@@ -1265,10 +1217,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.16.0"
  mime:
    dependency: transitive
    description:
@@ -1285,14 +1237,6 @@ 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:
@@ -1326,14 +1270,6 @@ 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:
@@ -1966,10 +1902,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.7"
+    version: "0.7.6"
  thumbhash:
    dependency: "direct main"
    description:
@@ -2259,5 +2195,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.10.0 <4.0.0"
+  dart: ">=3.9.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.4.1+3030
+version: 2.5.0+3031

 environment:
  sdk: '>=3.8.0 <4.0.0'
@@ -86,8 +86,6 @@ 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/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -14947,7 +14947,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "2.4.1",
+    "version": "2.5.0",
    "contact": {}
  },
  "tags": [
@@ -16301,6 +16301,7 @@
      },
      "AssetMediaSize": {
        "enum": [
+          "original",
          "fullsize",
          "preview",
          "thumbnail"
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "2.4.1",
+  "version": "2.5.0",
  "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.4.1
+ * 2.5.0
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
@@ -5660,6 +5660,7 @@ export enum MirrorAxis {
    Vertical = "vertical"
 }
 export enum AssetMediaSize {
+    Original = "original",
    Fullsize = "fullsize",
    Preview = "preview",
    Thumbnail = "thumbnail"
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "2.4.1",
+  "version": "2.5.0",
  "description": "",
  "author": "",
  "private": true,
--- a/server/src/dtos/asset-media.dto.ts
+++ b/server/src/dtos/asset-media.dto.ts
@@ -7,6 +7,7 @@ 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/utils/file.ts
+++ b/server/src/utils/file.ts
@@ -34,8 +34,7 @@ type SendFile = Parameters<Response['sendFile']>;
 type SendFileOptions = SendFile[1];

 const cacheControlHeaders: Record<CacheControl, string | null> = {
-  [CacheControl.PrivateWithCache]:
-    'private, max-age=86400, no-transform, stale-while-revalidate=2592000, stale-if-error=2592000',
+  [CacheControl.PrivateWithCache]: 'private, max-age=86400, no-transform',
  [CacheControl.PrivateWithoutCache]: 'private, no-cache, no-transform',
  [CacheControl.None]: null, // falsy value to prevent adding Cache-Control header
 };
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-web",
-  "version": "2.4.1",
+  "version": "2.5.0",
  "license": "GNU Affero General Public License version 3",
  "type": "module",
  "scripts": {
--- a/web/src/lib/components/album-page/tests/album-cover.spec.ts
+++ b/web/src/lib/components/album-page/tests/album-cover.spec.ts
@@ -1,5 +1,5 @@
 import AlbumCover from '$lib/components/album-page/album-cover.svelte';
-import { getAssetThumbnailUrl } from '$lib/utils';
+import { getAssetMediaUrl } from '$lib/utils';
 import { albumFactory } from '@test-data/factories/album-factory';
 import { render } from '@testing-library/svelte';

@@ -7,7 +7,7 @@ vi.mock('$lib/utils');

 describe('AlbumCover component', () => {
  it('renders an image when the album has a thumbnail', () => {
-    vi.mocked(getAssetThumbnailUrl).mockReturnValue('/asdf');
+    vi.mocked(getAssetMediaUrl).mockReturnValue('/asdf');
    const component = render(AlbumCover, {
      album: albumFactory.build({
        albumName: 'someName',
@@ -21,7 +21,7 @@ describe('AlbumCover component', () => {
    expect(img.getAttribute('loading')).toBe('lazy');
    expect(img.className).toBe('size-full rounded-xl object-cover aspect-square text');
    expect(img.getAttribute('src')).toBe('/asdf');
-    expect(getAssetThumbnailUrl).toHaveBeenCalledWith({ id: '123' });
+    expect(getAssetMediaUrl).toHaveBeenCalledWith({ id: '123' });
  });

  it('renders an image when the album has no thumbnail', () => {
--- a/web/src/lib/components/album-page/album-cover.svelte
+++ b/web/src/lib/components/album-page/album-cover.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { getAssetThumbnailUrl } from '$lib/utils';
-  import { type AlbumResponseDto } from '@immich/sdk';
-  import NoCover from '$lib/components/sharedlinks-page/covers/no-cover.svelte';
  import AssetCover from '$lib/components/sharedlinks-page/covers/asset-cover.svelte';
+  import NoCover from '$lib/components/sharedlinks-page/covers/no-cover.svelte';
+  import { getAssetMediaUrl } from '$lib/utils';
+  import { type AlbumResponseDto } from '@immich/sdk';
  import { t } from 'svelte-i18n';

  interface Props {
@@ -15,7 +15,7 @@

  let alt = $derived(album.albumName || $t('unnamed_album'));
  let thumbnailUrl = $derived(
-    album.albumThumbnailAssetId ? getAssetThumbnailUrl({ id: album.albumThumbnailAssetId }) : null,
+    album.albumThumbnailAssetId ? getAssetMediaUrl({ id: album.albumThumbnailAssetId }) : null,
  );
 </script>

--- a/web/src/lib/components/asset-viewer/activity-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/activity-viewer.svelte
@@ -7,7 +7,7 @@
  import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
  import { Route } from '$lib/route';
  import { locale } from '$lib/stores/preferences.store';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { getAssetType } from '$lib/utils/asset-utils';
  import { handleError } from '$lib/utils/handle-error';
  import { isTenMinutesApart } from '$lib/utils/timesince';
@@ -142,7 +142,7 @@
                <a class="aspect-square w-19 h-19" href={Route.viewAlbumAsset({ albumId, assetId: reaction.assetId })}>
                  <img
                    class="rounded-lg w-19 h-19 object-cover"
-                    src={getAssetThumbnailUrl(reaction.assetId)}
+                    src={getAssetMediaUrl({ id: reaction.assetId })}
                    alt="Profile picture of {reaction.user.name}, who commented on this asset"
                  />
                </a>
@@ -195,7 +195,7 @@
                  >
                    <img
                      class="rounded-lg w-19 h-19 object-cover"
-                      src={getAssetThumbnailUrl(reaction.assetId)}
+                      src={getAssetMediaUrl({ id: reaction.assetId })}
                      alt="Profile picture of {reaction.user.name}, who liked this asset"
                    />
                  </a>
--- a/web/src/lib/components/asset-viewer/album-list-item.svelte
+++ b/web/src/lib/components/asset-viewer/album-list-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { SCROLL_PROPERTIES } from '$lib/components/shared-components/album-selection/album-selection-utils';
  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { normalizeSearchString } from '$lib/utils/string-utils.js';
  import { type AlbumResponseDto } from '@immich/sdk';
  import { Icon } from '@immich/ui';
@@ -134,7 +134,7 @@
    <span class="h-16 w-16 shrink-0 rounded-xl bg-slate-300">
      {#if album.albumThumbnailAssetId}
        <img
-          src={getAssetThumbnailUrl(album.albumThumbnailAssetId)}
+          src={getAssetMediaUrl({ id: album.albumThumbnailAssetId })}
          alt={album.albumName}
          class={['h-full w-full rounded-xl object-cover transition-all duration-300 hover:shadow-lg']}
          data-testid="album-image"
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -12,20 +12,19 @@
  import { authManager } from '$lib/managers/auth-manager.svelte';
  import { editManager, EditToolType } from '$lib/managers/edit/edit-manager.svelte';
  import { eventManager } from '$lib/managers/event-manager.svelte';
-  import { preloadManager } from '$lib/managers/PreloadManager.svelte';
+  import { imageManager } from '$lib/managers/ImageManager.svelte';
  import { Route } from '$lib/route';
  import { assetViewingStore } from '$lib/stores/asset-viewing.store';
  import { ocrManager } from '$lib/stores/ocr.svelte';
  import { alwaysLoadOriginalVideo } from '$lib/stores/preferences.store';
  import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
  import { user } from '$lib/stores/user.store';
-  import { getAssetUrl, getSharedLink, handlePromiseError } from '$lib/utils';
+  import { getSharedLink, handlePromiseError } from '$lib/utils';
  import type { OnUndoDelete } from '$lib/utils/actions';
  import { navigateToAsset } from '$lib/utils/asset-utils';
  import { handleError } from '$lib/utils/handle-error';
  import { InvocationTracker } from '$lib/utils/invocationTracker';
  import { SlideshowHistory } from '$lib/utils/slideshow-history';
-  import { preloadImageUrl } from '$lib/utils/sw-messaging';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
  import {
    AssetTypeEnum,
@@ -133,9 +132,7 @@
    }

    untrack(() => {
-      if (stack && stack?.assets.length > 1) {
-        preloadImageUrl(getAssetUrl({ asset: stack.assets[1] }));
-      }
+      imageManager.preload(stack?.assets[1]);
    });
  };

@@ -220,7 +217,7 @@
    }

    e?.stopPropagation();
-    preloadManager.cancel(asset);
+    imageManager.cancel(asset);
    if (tracker.isActive()) {
      return;
    }
@@ -380,8 +377,8 @@
    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
    asset;
    untrack(() => handlePromiseError(refresh()));
-    preloadManager.preload(cursor.nextAsset);
-    preloadManager.preload(cursor.previousAsset);
+    imageManager.preload(cursor.nextAsset);
+    imageManager.preload(cursor.previousAsset);
  });

  const onAssetReplace = async ({ oldAssetId, newAssetId }: { oldAssetId: string; newAssetId: string }) => {
@@ -503,7 +500,7 @@
      />
    {:else if viewerKind === 'StackVideoViewer'}
      <VideoViewer
-        assetId={previewStackedAsset!.id}
+        asset={previewStackedAsset!}
        cacheKey={previewStackedAsset!.thumbhash}
        projectionType={previewStackedAsset!.exifInfo?.projectionType}
        loopVideo={true}
@@ -516,6 +513,7 @@
      />
    {:else if viewerKind === 'LiveVideoViewer'}
      <VideoViewer
+        {asset}
        assetId={asset.livePhotoVideoId!}
        cacheKey={asset.thumbhash}
        projectionType={asset.exifInfo?.projectionType}
@@ -541,7 +539,7 @@
      />
    {:else if viewerKind === 'VideoViewer'}
      <VideoViewer
-        assetId={asset.id}
+        {asset}
        cacheKey={asset.thumbhash}
        projectionType={asset.exifInfo?.projectionType}
        loopVideo={$slideshowState !== SlideshowState.PlaySlideshow}
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -14,7 +14,7 @@
  import { boundingBoxesArray } from '$lib/stores/people.store';
  import { locale } from '$lib/stores/preferences.store';
  import { preferences, user } from '$lib/stores/user.store';
-  import { getAssetThumbnailUrl, getPeopleThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl, getPeopleThumbnailUrl } from '$lib/utils';
  import { delay, getDimensions } from '$lib/utils/asset-utils';
  import { getByteUnitString } from '$lib/utils/byte-units';
  import { fromISODateTime, fromISODateTimeUTC, toTimelineAsset } from '$lib/utils/timeline-util';
@@ -515,7 +515,7 @@
              alt={album.albumName}
              class="h-12.5 w-12.5 rounded object-cover"
              src={album.albumThumbnailAssetId &&
-                getAssetThumbnailUrl({ id: album.albumThumbnailAssetId, size: AssetMediaSize.Preview })}
+                getAssetMediaUrl({ id: album.albumThumbnailAssetId, size: AssetMediaSize.Preview })}
              draggable="false"
            />
          </div>
--- a/web/src/lib/components/asset-viewer/editor/transform-tool/crop-area.svelte
+++ b/web/src/lib/components/asset-viewer/editor/transform-tool/crop-area.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
  import { transformManager } from '$lib/managers/edit/transform-manager.svelte';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { getAltText } from '$lib/utils/thumbnail-util';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
  import { AssetMediaSize, type AssetResponseDto } from '@immich/sdk';
@@ -14,7 +14,7 @@
  let canvasContainer = $state<HTMLElement | null>(null);

  let imageSrc = $derived(
-    getAssetThumbnailUrl({ id: asset.id, cacheKey: asset.thumbhash, edited: false, size: AssetMediaSize.Preview }),
+    getAssetMediaUrl({ id: asset.id, cacheKey: asset.thumbhash, edited: false, size: AssetMediaSize.Preview }),
  );

  let imageTransform = $derived.by(() => {
--- a/web/src/lib/components/asset-viewer/image-panorama-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/image-panorama-viewer.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
  import { authManager } from '$lib/managers/auth-manager.svelte';
-  import { getAssetOriginalUrl, getAssetThumbnailUrl } from '$lib/utils';
-  import { isWebCompatibleImage } from '$lib/utils/asset-utils';
+  import { getAssetUrl } from '$lib/utils';
  import { AssetMediaSize, viewAsset, type AssetResponseDto } from '@immich/sdk';
  import { LoadingSpinner } from '@immich/ui';
  import { t } from 'svelte-i18n';
@@ -24,13 +23,7 @@
  {#await Promise.all([loadAssetData(asset.id), import('./photo-sphere-viewer-adapter.svelte')])}
    <LoadingSpinner />
  {:then [data, { default: PhotoSphereViewer }]}
-    <PhotoSphereViewer
-      bind:zoomToggle
-      panorama={data}
-      originalPanorama={isWebCompatibleImage(asset)
-        ? getAssetOriginalUrl(asset.id)
-        : getAssetThumbnailUrl({ id: asset.id, size: AssetMediaSize.Fullsize, cacheKey: asset.thumbhash })}
-    />
+    <PhotoSphereViewer bind:zoomToggle panorama={data} originalPanorama={getAssetUrl({ asset, forceOriginal: true })} />
  {:catch}
    {$t('errors.failed_to_load_asset')}
  {/await}
--- a/web/src/lib/components/asset-viewer/photo-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte
@@ -6,7 +6,7 @@
  import BrokenAsset from '$lib/components/assets/broken-asset.svelte';
  import { assetViewerFadeDuration } from '$lib/constants';
  import { castManager } from '$lib/managers/cast-manager.svelte';
-  import { preloadManager } from '$lib/managers/PreloadManager.svelte';
+  import { imageManager } from '$lib/managers/ImageManager.svelte';
  import { photoViewerImgElement } from '$lib/stores/assets-store.svelte';
  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
  import { ocrManager } from '$lib/stores/ocr.svelte';
@@ -164,7 +164,7 @@
    imageError = imageLoaded = true;
  };

-  onDestroy(() => preloadManager.cancelPreloadUrl(imageLoaderUrl));
+  onDestroy(() => imageManager.cancelPreloadUrl(imageLoaderUrl));

  let imageLoaderUrl = $derived(
    getAssetUrl({ asset, sharedLink, forceOriginal: originalImageLoaded || $photoZoomState.currentZoom > 1 }),
--- a/web/src/lib/components/asset-viewer/video-native-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/video-native-viewer.svelte
@@ -10,7 +10,7 @@
    videoViewerMuted,
    videoViewerVolume,
  } from '$lib/stores/preferences.store';
-  import { getAssetOriginalUrl, getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl, getAssetPlaybackUrl } from '$lib/utils';
  import { AssetMediaSize } from '@immich/sdk';
  import { LoadingSpinner } from '@immich/ui';
  import { onDestroy, onMount } from 'svelte';
@@ -44,7 +44,9 @@
  let videoPlayer: HTMLVideoElement | undefined = $state();
  let isLoading = $state(true);
  let assetFileUrl = $derived(
-    playOriginalVideo ? getAssetOriginalUrl({ id: assetId, cacheKey }) : getAssetPlaybackUrl({ id: assetId, cacheKey }),
+    playOriginalVideo
+      ? getAssetMediaUrl({ id: assetId, size: AssetMediaSize.Original, cacheKey })
+      : getAssetPlaybackUrl({ id: assetId, cacheKey }),
  );
  let isScrubbing = $state(false);
  let showVideo = $state(false);
@@ -127,7 +129,7 @@
    {#if castManager.isCasting}
      <div class="place-content-center h-full place-items-center">
        <VideoRemoteViewer
-          poster={getAssetThumbnailUrl({ id: assetId, size: AssetMediaSize.Preview, cacheKey })}
+          poster={getAssetMediaUrl({ id: assetId, size: AssetMediaSize.Preview, cacheKey })}
          {onVideoStarted}
          {onVideoEnded}
          {assetFileUrl}
@@ -154,7 +156,7 @@
        onclose={() => onClose()}
        muted={$videoViewerMuted}
        bind:volume={$videoViewerVolume}
-        poster={getAssetThumbnailUrl({ id: assetId, size: AssetMediaSize.Preview, cacheKey })}
+        poster={getAssetMediaUrl({ id: assetId, size: AssetMediaSize.Preview, cacheKey })}
        src={assetFileUrl}
      >
      </video>
--- a/web/src/lib/components/asset-viewer/video-panorama-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/video-panorama-viewer.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
-  import { getAssetOriginalUrl, getAssetPlaybackUrl } from '$lib/utils';
+  import { getAssetPlaybackUrl, getAssetUrl } from '$lib/utils';
+  import type { AssetResponseDto } from '@immich/sdk';
  import { LoadingSpinner } from '@immich/ui';
  import { t } from 'svelte-i18n';
  import { fade } from 'svelte/transition';

  interface Props {
-    assetId: string;
+    asset: AssetResponseDto;
  }

-  const { assetId }: Props = $props();
+  const { asset }: Props = $props();

  const modules = Promise.all([
    import('./photo-sphere-viewer-adapter.svelte').then((module) => module.default),
@@ -23,8 +24,8 @@
    <LoadingSpinner />
  {:then [PhotoSphereViewer, adapter, videoPlugin]}
    <PhotoSphereViewer
-      panorama={{ source: getAssetPlaybackUrl(assetId) }}
-      originalPanorama={{ source: getAssetOriginalUrl(assetId) }}
+      panorama={{ source: getAssetPlaybackUrl({ id: asset.id }) }}
+      originalPanorama={{ source: getAssetUrl({ asset, forceOriginal: true })! }}
      plugins={[videoPlugin]}
      {adapter}
      navbar
--- a/web/src/lib/components/asset-viewer/video-wrapper-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/video-wrapper-viewer.svelte
@@ -2,9 +2,11 @@
  import VideoNativeViewer from '$lib/components/asset-viewer/video-native-viewer.svelte';
  import VideoPanoramaViewer from '$lib/components/asset-viewer/video-panorama-viewer.svelte';
  import { ProjectionType } from '$lib/constants';
+  import type { AssetResponseDto } from '@immich/sdk';

  interface Props {
-    assetId: string;
+    asset: AssetResponseDto;
+    assetId?: string;
    projectionType: string | null | undefined;
    cacheKey: string | null;
    loopVideo: boolean;
@@ -17,6 +19,7 @@
  }

  let {
+    asset,
    assetId,
    projectionType,
    cacheKey,
@@ -28,15 +31,17 @@
    onVideoEnded,
    onVideoStarted,
  }: Props = $props();
+
+  const effectiveAssetId = $derived(assetId ?? asset.id);
 </script>

 {#if projectionType === ProjectionType.EQUIRECTANGULAR}
-  <VideoPanoramaViewer {assetId} />
+  <VideoPanoramaViewer {asset} />
 {:else}
  <VideoNativeViewer
    {loopVideo}
    {cacheKey}
-    {assetId}
+    assetId={effectiveAssetId}
    {playOriginalVideo}
    {onPreviousAsset}
    {onNextAsset}
--- a/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
  import BrokenAsset from '$lib/components/assets/broken-asset.svelte';
-  import { preloadManager } from '$lib/managers/PreloadManager.svelte';
+  import { imageManager } from '$lib/managers/ImageManager.svelte';
  import { Icon } from '@immich/ui';
  import { mdiEyeOffOutline } from '@mdi/js';
  import type { ActionReturn } from 'svelte/action';
@@ -60,7 +60,7 @@
      onComplete?.(false);
    }
    return {
-      destroy: () => preloadManager.cancelPreloadUrl(url),
+      destroy: () => imageManager.cancelPreloadUrl(url),
    };
  }

--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { ProjectionType } from '$lib/constants';
  import { locale, playVideoThumbnailOnHover } from '$lib/stores/preferences.store';
-  import { getAssetOriginalUrl, getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl, getAssetPlaybackUrl } from '$lib/utils';
  import { timeToSeconds } from '$lib/utils/date-time';
  import { getAltText } from '$lib/utils/thumbnail-util';
  import { AssetMediaSize, AssetVisibility, type UserResponseDto } from '@immich/sdk';
@@ -335,7 +335,7 @@
      <ImageThumbnail
        class={imageClass}
        {brokenAssetClass}
-        url={getAssetThumbnailUrl({ id: asset.id, size: AssetMediaSize.Thumbnail, cacheKey: asset.thumbhash })}
+        url={getAssetMediaUrl({ id: asset.id, size: AssetMediaSize.Thumbnail, cacheKey: asset.thumbhash })}
        altText={$getAltText(asset)}
        widthStyle="{width}px"
        heightStyle="{height}px"
@@ -371,7 +371,7 @@
          <ImageThumbnail
            class={imageClass}
            {brokenAssetClass}
-            url={getAssetOriginalUrl({ id: asset.id, cacheKey: asset.thumbhash })}
+            url={getAssetMediaUrl({ id: asset.id, size: AssetMediaSize.Original, cacheKey: asset.thumbhash })}
            altText={$getAltText(asset)}
            widthStyle="{width}px"
            heightStyle="{height}px"
--- a/web/src/lib/components/memory-page/memory-photo-viewer.svelte
+++ b/web/src/lib/components/memory-page/memory-photo-viewer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { assetViewerFadeDuration } from '$lib/constants';
  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { getAltText } from '$lib/utils/thumbnail-util';
  import { AssetMediaSize } from '@immich/sdk';
  import { LoadingSpinner } from '@immich/ui';
@@ -35,7 +35,7 @@
    };
  });

-  const imageLoaderUrl = $derived(getAssetThumbnailUrl({ id: asset.id, size: AssetMediaSize.Preview }));
+  const imageLoaderUrl = $derived(getAssetMediaUrl({ id: asset.id, size: AssetMediaSize.Preview }));
 </script>

 {#if !imageLoaded}
--- a/web/src/lib/components/memory-page/memory-video-viewer.svelte
+++ b/web/src/lib/components/memory-page/memory-video-viewer.svelte
@@ -2,7 +2,7 @@
  import { assetViewerFadeDuration } from '$lib/constants';
  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
  import { autoPlayVideo } from '$lib/stores/preferences.store';
-  import { getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl, getAssetPlaybackUrl } from '$lib/utils';
  import { AssetMediaSize } from '@immich/sdk';
  import { onMount } from 'svelte';
  import { fade } from 'svelte/transition';
@@ -32,7 +32,7 @@
      playsinline
      class="h-full w-full rounded-2xl object-contain transition-all"
      src={getAssetPlaybackUrl({ id: asset.id })}
-      poster={getAssetThumbnailUrl({ id: asset.id, size: AssetMediaSize.Preview })}
+      poster={getAssetMediaUrl({ id: asset.id, size: AssetMediaSize.Preview })}
      draggable="false"
      muted={videoViewerMuted}
      volume={videoViewerVolume}
--- a/web/src/lib/components/memory-page/memory-viewer.svelte
+++ b/web/src/lib/components/memory-page/memory-viewer.svelte
@@ -30,7 +30,7 @@
  import { memoryStore, type MemoryAsset } from '$lib/stores/memory.store.svelte';
  import { locale, videoViewerMuted, videoViewerVolume } from '$lib/stores/preferences.store';
  import { preferences } from '$lib/stores/user.store';
-  import { getAssetThumbnailUrl, handlePromiseError, memoryLaneTitle } from '$lib/utils';
+  import { getAssetMediaUrl, handlePromiseError, memoryLaneTitle } from '$lib/utils';
  import { cancelMultiselect } from '$lib/utils/asset-utils';
  import { fromISODateTimeUTC, toTimelineAsset } from '$lib/utils/timeline-util';
  import { AssetMediaSize, AssetTypeEnum, getAssetInfo } from '@immich/sdk';
@@ -449,7 +449,7 @@
            {#if current.previousMemory && current.previousMemory.assets.length > 0}
              <img
                class="h-full w-full rounded-2xl object-cover"
-                src={getAssetThumbnailUrl({ id: current.previousMemory.assets[0].id, size: AssetMediaSize.Preview })}
+                src={getAssetMediaUrl({ id: current.previousMemory.assets[0].id, size: AssetMediaSize.Preview })}
                alt={$t('previous_memory')}
                draggable="false"
              />
@@ -598,7 +598,7 @@
            {#if current.nextMemory && current.nextMemory.assets.length > 0}
              <img
                class="h-full w-full rounded-2xl object-cover"
-                src={getAssetThumbnailUrl({ id: current.nextMemory.assets[0].id, size: AssetMediaSize.Preview })}
+                src={getAssetMediaUrl({ id: current.nextMemory.assets[0].id, size: AssetMediaSize.Preview })}
                alt={$t('next_memory')}
                draggable="false"
              />
--- a/web/src/lib/components/places-page/places-card-group.svelte
+++ b/web/src/lib/components/places-page/places-card-group.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { Route } from '$lib/route';
  import { placesViewSettings } from '$lib/stores/preferences.store';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { type PlacesGroup, isPlacesGroupCollapsed, togglePlacesGroupCollapsing } from '$lib/utils/places-utils';
  import { AssetMediaSize, type AssetResponseDto } from '@immich/sdk';
  import { Icon } from '@immich/ui';
@@ -45,7 +45,7 @@
            class="flex w-[calc((100vw-(72px+5rem))/2)] max-w-39 justify-center overflow-hidden rounded-xl brightness-75 filter"
          >
            <img
-              src={getAssetThumbnailUrl({ id: item.id, size: AssetMediaSize.Thumbnail })}
+              src={getAssetMediaUrl({ id: item.id, size: AssetMediaSize.Thumbnail })}
              alt={city}
              class="object-cover w-39 h-39"
              loading="lazy"
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -16,7 +16,7 @@
  import { themeManager } from '$lib/managers/theme-manager.svelte';
  import MapSettingsModal from '$lib/modals/MapSettingsModal.svelte';
  import { mapSettings } from '$lib/stores/preferences.store';
-  import { getAssetThumbnailUrl, handlePromiseError } from '$lib/utils';
+  import { getAssetMediaUrl, handlePromiseError } from '$lib/utils';
  import { getMapMarkers, type MapMarkerResponseDto } from '@immich/sdk';
  import { Icon, modalManager } from '@immich/ui';
  import { mdiCog, mdiMap, mdiMapMarker } from '@mdi/js';
@@ -388,7 +388,7 @@
            <Icon icon={mdiMapMarker} size="50px" class="text-primary -translate-y-[50%]" />
          {:else}
            <img
-              src={getAssetThumbnailUrl(feature.properties?.id)}
+              src={getAssetMediaUrl({ id: feature.properties?.id })}
              class="rounded-full w-15 h-15 border-2 border-immich-primary shadow-lg hover:border-immich-dark-primary transition-all duration-200 hover:scale-150 object-cover bg-immich-primary"
              alt={feature.properties?.city && feature.properties.country
                ? $t('map_marker_for_images', {
--- a/web/src/lib/components/shared-components/side-bar/recent-albums.svelte
+++ b/web/src/lib/components/shared-components/side-bar/recent-albums.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
  import { Route } from '$lib/route';
  import { userInteraction } from '$lib/stores/user.svelte';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { handleError } from '$lib/utils/handle-error';
  import { getAllAlbums, type AlbumResponseDto } from '@immich/sdk';
  import { onMount } from 'svelte';
@@ -34,7 +34,7 @@
      <div
        class="h-6 w-6 bg-cover rounded bg-gray-200 dark:bg-gray-600"
        style={album.albumThumbnailAssetId
-          ? `background-image:url('${getAssetThumbnailUrl({ id: album.albumThumbnailAssetId })}')`
+          ? `background-image:url('${getAssetMediaUrl({ id: album.albumThumbnailAssetId })}')`
          : ''}
      ></div>
    </div>
--- a/web/src/lib/components/sharedlinks-page/covers/tests/share-cover.spec.ts
+++ b/web/src/lib/components/sharedlinks-page/covers/tests/share-cover.spec.ts
@@ -1,5 +1,5 @@
 import ShareCover from '$lib/components/sharedlinks-page/covers/share-cover.svelte';
-import { getAssetThumbnailUrl } from '$lib/utils';
+import { getAssetMediaUrl } from '$lib/utils';
 import { albumFactory } from '@test-data/factories/album-factory';
 import { assetFactory } from '@test-data/factories/asset-factory';
 import { sharedLinkFactory } from '@test-data/factories/shared-link-factory';
@@ -21,7 +21,7 @@ describe('ShareCover component', () => {
  });

  it('renders an image when the shared link is an individual share', () => {
-    vi.mocked(getAssetThumbnailUrl).mockReturnValue('/asdf');
+    vi.mocked(getAssetMediaUrl).mockReturnValue('/asdf');
    const component = render(ShareCover, {
      sharedLink: sharedLinkFactory.build({ assets: [assetFactory.build({ id: 'someId' })] }),
      preload: false,
@@ -32,7 +32,7 @@ describe('ShareCover component', () => {
    expect(img.getAttribute('loading')).toBe('lazy');
    expect(img.className).toBe('size-full rounded-xl object-cover aspect-square text');
    expect(img.getAttribute('src')).toBe('/asdf');
-    expect(getAssetThumbnailUrl).toHaveBeenCalledWith('someId');
+    expect(getAssetMediaUrl).toHaveBeenCalledWith({ id: 'someId' });
  });

  it('renders an image when the shared link has no album or assets', () => {
--- a/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte
+++ b/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte
@@ -2,7 +2,7 @@
  import AlbumCover from '$lib/components/album-page/album-cover.svelte';
  import AssetCover from '$lib/components/sharedlinks-page/covers/asset-cover.svelte';
  import NoCover from '$lib/components/sharedlinks-page/covers/no-cover.svelte';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import type { SharedLinkResponseDto } from '@immich/sdk';
  import { t } from 'svelte-i18n';

@@ -23,7 +23,7 @@
      alt={$t('individual_share')}
      class={className}
      {preload}
-      src={getAssetThumbnailUrl(sharedLink.assets[0].id)}
+      src={getAssetMediaUrl({ id: sharedLink.assets[0].id })}
    />
  {:else}
    <NoCover alt={$t('unnamed_share')} class={className} {preload} />
--- a/web/src/lib/components/utilities-page/duplicates/duplicate-asset.svelte
+++ b/web/src/lib/components/utilities-page/duplicates/duplicate-asset.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
  import { locale } from '$lib/stores/preferences.store';
-  import { getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl } from '$lib/utils';
  import { getAssetResolution, getFileSize } from '$lib/utils/asset-utils';
  import { getAltText } from '$lib/utils/thumbnail-util';
  import { fromISODateTime, fromISODateTimeUTC, toTimelineAsset } from '$lib/utils/timeline-util';
@@ -112,7 +112,7 @@
    >
      <!-- THUMBNAIL-->
      <img
-        src={getAssetThumbnailUrl(asset.id)}
+        src={getAssetMediaUrl({ id: asset.id })}
        alt={$getAltText(toTimelineAsset(asset))}
        title={assetData}
        class="h-60 object-cover w-full rounded-t-md"
--- a/web/src/lib/components/workflows/WorkflowPickerItemCard.svelte
+++ b/web/src/lib/components/workflows/WorkflowPickerItemCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { getAssetThumbnailUrl, getPeopleThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl, getPeopleThumbnailUrl } from '$lib/utils';
  import type { AlbumResponseDto, PersonResponseDto } from '@immich/sdk';
  import { Card, CardBody, IconButton, Text } from '@immich/ui';
  import { mdiClose } from '@mdi/js';
@@ -20,7 +20,7 @@
      {#if isAlbum && 'albumThumbnailAssetId' in item}
        {#if item.albumThumbnailAssetId}
          <img
-            src={getAssetThumbnailUrl(item.albumThumbnailAssetId)}
+            src={getAssetMediaUrl({ id: item.albumThumbnailAssetId })}
            alt={item.albumName}
            class="h-12 w-12 rounded-lg object-cover"
          />
--- a/web/src/lib/managers/ImageManager.svelte.ts
+++ b/web/src/lib/managers/ImageManager.svelte.ts
@@ -0,0 +1,43 @@
+import { getAssetMediaUrl } from '$lib/utils';
+import { cancelImageUrl } from '$lib/utils/sw-messaging';
+import { AssetMediaSize, type AssetResponseDto } from '@immich/sdk';
+
+type AllAssetMediaSize = AssetMediaSize | 'all';
+
+class ImageManager {
+  preload(asset: AssetResponseDto | undefined, size: AssetMediaSize = AssetMediaSize.Preview) {
+    if (!asset) {
+      return;
+    }
+
+    const url = getAssetMediaUrl({ id: asset.id, size, cacheKey: asset.thumbhash });
+    if (!url) {
+      return;
+    }
+
+    const img = new Image();
+    img.src = url;
+  }
+
+  cancel(asset: AssetResponseDto | undefined, size: AllAssetMediaSize = AssetMediaSize.Preview) {
+    if (!asset) {
+      return;
+    }
+
+    const sizes = size === 'all' ? Object.values(AssetMediaSize) : [size];
+    for (const size of sizes) {
+      const url = getAssetMediaUrl({ id: asset.id, size, cacheKey: asset.thumbhash });
+      if (url) {
+        cancelImageUrl(url);
+      }
+    }
+  }
+
+  cancelPreloadUrl(url: string | undefined) {
+    if (url) {
+      cancelImageUrl(url);
+    }
+  }
+}
+
+export const imageManager = new ImageManager();
--- a/web/src/lib/managers/PreloadManager.svelte.ts
+++ b/web/src/lib/managers/PreloadManager.svelte.ts
@@ -1,38 +0,0 @@
-import { getAssetUrl } from '$lib/utils';
-import { cancelImageUrl, preloadImageUrl } from '$lib/utils/sw-messaging';
-import { AssetTypeEnum, type AssetResponseDto } from '@immich/sdk';
-
-class PreloadManager {
-  preload(asset: AssetResponseDto | undefined) {
-    if (globalThis.isSecureContext) {
-      preloadImageUrl(getAssetUrl({ asset }));
-      return;
-    }
-    if (!asset || asset.type !== AssetTypeEnum.Image) {
-      return;
-    }
-    const img = new Image();
-    const url = getAssetUrl({ asset });
-    if (!url) {
-      return;
-    }
-    img.src = url;
-  }
-
-  cancel(asset: AssetResponseDto | undefined) {
-    if (!globalThis.isSecureContext || !asset) {
-      return;
-    }
-    const url = getAssetUrl({ asset });
-    cancelImageUrl(url);
-  }
-
-  cancelPreloadUrl(url: string | undefined) {
-    if (!globalThis.isSecureContext) {
-      return;
-    }
-    cancelImageUrl(url);
-  }
-}
-
-export const preloadManager = new PreloadManager();
--- a/web/src/lib/managers/edit/transform-manager.svelte.ts
+++ b/web/src/lib/managers/edit/transform-manager.svelte.ts
@@ -1,5 +1,5 @@
 import { editManager, type EditActions, type EditToolManager } from '$lib/managers/edit/edit-manager.svelte';
-import { getAssetThumbnailUrl } from '$lib/utils';
+import { getAssetMediaUrl } from '$lib/utils';
 import { getDimensions } from '$lib/utils/asset-utils';
 import { handleError } from '$lib/utils/handle-error';
 import {
@@ -185,7 +185,7 @@ class TransformManager implements EditToolManager {

    this.imgElement = new Image();

-    const imageURL = getAssetThumbnailUrl({
+    const imageURL = getAssetMediaUrl({
      id: asset.id,
      cacheKey: asset.thumbhash,
      edited: false,
--- a/web/src/lib/stores/ocr.svelte.spec.ts
+++ b/web/src/lib/stores/ocr.svelte.spec.ts
@@ -1,3 +1,4 @@
+import { assetCacheManager } from '$lib/managers/AssetCacheManager.svelte';
 import { ocrManager, type OcrBoundingBox } from '$lib/stores/ocr.svelte';
 import { getAssetOcr } from '@immich/sdk';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
@@ -30,6 +31,7 @@ describe('OcrManager', () => {
  beforeEach(() => {
    // Reset the singleton state before each test
    ocrManager.clear();
+    assetCacheManager.clearOcrCache();
    vi.clearAllMocks();
  });

--- a/web/src/lib/stores/ocr.svelte.ts
+++ b/web/src/lib/stores/ocr.svelte.ts
@@ -1,5 +1,5 @@
+import { assetCacheManager } from '$lib/managers/AssetCacheManager.svelte';
 import { CancellableTask } from '$lib/utils/cancellable-task';
-import { getAssetOcr } from '@immich/sdk';

 export type OcrBoundingBox = {
  id: string;
@@ -38,7 +38,7 @@ class OcrManager {
      this.#cleared = false;
    }
    await this.#ocrLoader.execute(async () => {
-      this.#data = await getAssetOcr({ id });
+      this.#data = await assetCacheManager.getAssetOcr(id);
    }, false);
  }

--- a/web/src/lib/utils.ts
+++ b/web/src/lib/utils.ts
@@ -193,7 +193,7 @@ const createUrl = (path: string, parameters?: Record<string, unknown>) => {
  return getBaseUrl() + url.pathname + url.search + url.hash;
 };

-type AssetUrlOptions = { id: string; cacheKey?: string | null; edited?: boolean };
+type AssetUrlOptions = { id: string; cacheKey?: string | null; edited?: boolean; size?: AssetMediaSize };

 export const getAssetUrl = ({
  asset,
@@ -210,12 +210,10 @@ export const getAssetUrl = ({
  const id = asset.id;
  const cacheKey = asset.thumbhash;
  if (sharedLink && (!sharedLink.allowDownload || !sharedLink.showMetadata)) {
-    return getAssetThumbnailUrl({ id, size: AssetMediaSize.Preview, cacheKey });
+    return getAssetMediaUrl({ id, size: AssetMediaSize.Preview, cacheKey });
  }
-  const targetSize = targetImageSize(asset, forceOriginal);
-  return targetSize === 'original'
-    ? getAssetOriginalUrl({ id, cacheKey })
-    : getAssetThumbnailUrl({ id, size: targetSize, cacheKey });
+  const size = targetImageSize(asset, forceOriginal);
+  return getAssetMediaUrl({ id, size, cacheKey });
 };

 const forceUseOriginal = (asset: AssetResponseDto) => {
@@ -224,33 +222,21 @@ const forceUseOriginal = (asset: AssetResponseDto) => {

 export const targetImageSize = (asset: AssetResponseDto, forceOriginal: boolean) => {
  if (forceOriginal || get(alwaysLoadOriginalFile) || forceUseOriginal(asset)) {
-    return isWebCompatibleImage(asset) ? 'original' : AssetMediaSize.Fullsize;
+    return isWebCompatibleImage(asset) ? AssetMediaSize.Original : AssetMediaSize.Fullsize;
  }
  return AssetMediaSize.Preview;
 };

-export const getAssetOriginalUrl = (options: string | AssetUrlOptions) => {
-  if (typeof options === 'string') {
-    options = { id: options };
-  }
-  const { id, cacheKey, edited = true } = options;
-  return createUrl(getAssetOriginalPath(id), { ...authManager.params, c: cacheKey, edited });
+export const getAssetMediaUrl = (options: AssetUrlOptions) => {
+  const { id, size, cacheKey: c, edited = true } = options;
+  const isOriginal = size === AssetMediaSize.Original;
+  const path = isOriginal ? getAssetOriginalPath(id) : getAssetThumbnailPath(id);
+  return createUrl(path, { ...authManager.params, size: isOriginal ? undefined : size, c, edited });
 };

-export const getAssetThumbnailUrl = (options: string | (AssetUrlOptions & { size?: AssetMediaSize })) => {
-  if (typeof options === 'string') {
-    options = { id: options };
-  }
-  const { id, size, cacheKey, edited = true } = options;
-  return createUrl(getAssetThumbnailPath(id), { ...authManager.params, size, c: cacheKey, edited });
-};
-
-export const getAssetPlaybackUrl = (options: string | AssetUrlOptions) => {
-  if (typeof options === 'string') {
-    options = { id: options };
-  }
-  const { id, cacheKey } = options;
-  return createUrl(getAssetPlaybackPath(id), { ...authManager.params, c: cacheKey });
+export const getAssetPlaybackUrl = (options: AssetUrlOptions) => {
+  const { id, cacheKey: c } = options;
+  return createUrl(getAssetPlaybackPath(id), { ...authManager.params, c });
 };

 export const getProfileImageUrl = (user: UserResponseDto) =>
--- a/web/src/lib/utils/people-utils.ts
+++ b/web/src/lib/utils/people-utils.ts
@@ -1,5 +1,5 @@
 import type { Faces } from '$lib/stores/people.store';
-import { getAssetThumbnailUrl } from '$lib/utils';
+import { getAssetMediaUrl } from '$lib/utils';
 import { AssetTypeEnum, type AssetFaceResponseDto } from '@immich/sdk';
 import type { ZoomImageWheelState } from '@zoom-image/core';

@@ -82,7 +82,7 @@ export const zoomImageToBase64 = async (
  if (assetType === AssetTypeEnum.Image) {
    image = photoViewer;
  } else if (assetType === AssetTypeEnum.Video) {
-    const data = getAssetThumbnailUrl(assetId);
+    const data = getAssetMediaUrl({ id: assetId });
    const img: HTMLImageElement = new Image();
    img.src = data;

--- a/web/src/lib/utils/shared-links.ts
+++ b/web/src/lib/utils/shared-links.ts
@@ -1,4 +1,4 @@
-import { getAssetThumbnailUrl, setSharedLink } from '$lib/utils';
+import { getAssetMediaUrl, setSharedLink } from '$lib/utils';
 import { authenticate } from '$lib/utils/auth';
 import { getFormatter } from '$lib/utils/i18n';
 import { getAssetInfoFromParam } from '$lib/utils/navigation';
@@ -36,7 +36,7 @@ export const loadSharedLink = async ({
    setSharedLink(sharedLink);
    const assetCount = sharedLink.assets.length;
    const assetId = sharedLink.album?.albumThumbnailAssetId || sharedLink.assets[0]?.id;
-    const assetPath = assetId ? getAssetThumbnailUrl(assetId) : '/feature-panel.png';
+    const assetPath = assetId ? getAssetMediaUrl({ id: assetId }) : '/feature-panel.png';

    return {
      ...common,
--- a/web/src/routes/(user)/explore/+page.svelte
+++ b/web/src/routes/(user)/explore/+page.svelte
@@ -5,7 +5,7 @@
  import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
  import SingleGridRow from '$lib/components/shared-components/single-grid-row.svelte';
  import { Route } from '$lib/route';
-  import { getAssetThumbnailUrl, getPeopleThumbnailUrl } from '$lib/utils';
+  import { getAssetMediaUrl, getPeopleThumbnailUrl } from '$lib/utils';
  import { AssetMediaSize, type SearchExploreResponseDto } from '@immich/sdk';
  import { Icon } from '@immich/ui';
  import { mdiHeart } from '@mdi/js';
@@ -90,7 +90,7 @@
            <a class="relative" href={Route.search({ city: item.value })} draggable="false">
              <div class="flex justify-center overflow-hidden rounded-xl brightness-75 filter">
                <img
-                  src={getAssetThumbnailUrl({ id: item.data.id, size: AssetMediaSize.Thumbnail })}
+                  src={getAssetMediaUrl({ id: item.data.id, size: AssetMediaSize.Thumbnail })}
                  alt={item.value}
                  class="object-cover aspect-square w-full"
                />
--- a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
@@ -28,7 +28,7 @@
  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
  import { memoryStore } from '$lib/stores/memory.store.svelte';
  import { preferences, user } from '$lib/stores/user.store';
-  import { getAssetThumbnailUrl, memoryLaneTitle } from '$lib/utils';
+  import { getAssetMediaUrl, memoryLaneTitle } from '$lib/utils';
  import {
    updateStackedAssetInTimeline,
    updateUnstackedAssetInTimeline,
@@ -98,7 +98,7 @@
      title: $memoryLaneTitle(memory),
      href: Route.memories({ id: memory.assets[0].id }),
      alt: $t('memory_lane_title', { values: { title: $getAltText(toTimelineAsset(memory.assets[0])) } }),
-      src: getAssetThumbnailUrl(memory.assets[0].id),
+      src: getAssetMediaUrl({ id: memory.assets[0].id }),
    })),
  );
 </script>
Author	SHA1	Message	Date
alextran1502	6cae864e2a	chore: release v2.5.0	2026-01-23 03:15:08 +00:00
Min Idzelis	84679fb2b2	refactor: use assetCacheManager for OCR data (#25437 )	2026-01-22 21:12:56 -06:00
Min Idzelis	a96a08939e	refactor: rename preloadManager to imageManager (#25436 ) rename: preloadManager to imageManager	2026-01-22 21:11:57 -06:00