diff --git a/lib/modules/storage/schemas/folder.ex b/lib/modules/storage/schemas/folder.ex
index 3a811b737..a74ef2578 100644
--- a/lib/modules/storage/schemas/folder.ex
+++ b/lib/modules/storage/schemas/folder.ex
@@ -23,10 +23,13 @@ defmodule PhoenixKit.Modules.Storage.Folder do
     # Folder hero-header customization. The cover (background) and logo (icon)
     # are media files living in the folder, excluded from its visible listing.
     # `header_size` is small/medium/large; the `header_show_*` flags toggle each
-    # header element. All defaulted so existing folders render as before.
+    # header element. New folders default to a small header (less vertical
+    # space up front). Existing rows keep their stored size — the DB column
+    # default (v134, "medium") only applies to raw inserts, which never happen
+    # here; folders are always created via changeset, so this default wins.
     field :cover_file_uuid, UUIDv7
     field :logo_file_uuid, UUIDv7
-    field :header_size, :string, default: "medium"
+    field :header_size, :string, default: "small"
     field :header_show_title, :boolean, default: true
     field :header_show_icon, :boolean, default: true
     field :header_show_creator, :boolean, default: true
diff --git a/lib/modules/storage/storage.ex b/lib/modules/storage/storage.ex
index 0cef0a848..70ca6fbad 100644
--- a/lib/modules/storage/storage.ex
+++ b/lib/modules/storage/storage.ex
@@ -1346,36 +1346,36 @@ defmodule PhoenixKit.Modules.Storage do
     limit = Keyword.get(opts, :limit, 50)
     offset = Keyword.get(opts, :offset, 0)
 
-    query =
-      from(f in Folder,
-        where: not is_nil(f.trashed_at),
-        order_by: [desc: f.trashed_at],
-        limit: ^limit,
-        offset: ^offset
-      )
-
-    query =
-      if scope_folder_id do
-        from(f in query, where: f.uuid != ^scope_folder_id)
-      else
-        query
-      end
-
-    repo().all(query)
+    from(f in Folder,
+      where: not is_nil(f.trashed_at),
+      order_by: [desc: f.trashed_at],
+      limit: ^limit,
+      offset: ^offset
+    )
+    |> scope_trashed_folders(scope_folder_id)
+    |> repo().all()
   end
 
   @doc "Counts trashed folders (with optional scope)."
   def count_trashed_folders(scope_folder_id \\ nil) do
-    query = from(f in Folder, where: not is_nil(f.trashed_at), select: count(f.uuid))
+    from(f in Folder, where: not is_nil(f.trashed_at), select: count(f.uuid))
+    |> scope_trashed_folders(scope_folder_id)
+    |> repo().one()
+    |> Kernel.||(0)
+  end
 
-    query =
-      if scope_folder_id do
-        from(f in query, where: f.uuid != ^scope_folder_id)
-      else
-        query
-      end
+  # Restrict trashed folders to the scope folder's own subtree — the folders
+  # trashed *under* it — so a folder's Trash never shows folders trashed in a
+  # sibling root. nil scope = all trashed folders (the top-level view).
+  # `folder_subtree_uuids/1` walks children by parent_uuid without filtering
+  # trashed_at, so a trashed subfolder's trashed children are still reachable.
+  # The subtree includes the scope folder itself; drop it — the scope folder
+  # is where you're standing, not a trashed row.
+  defp scope_trashed_folders(query, nil), do: query
 
-    repo().one(query) || 0
+  defp scope_trashed_folders(query, scope_folder_id) do
+    descendants = folder_subtree_uuids(scope_folder_id) -- [scope_folder_id]
+    from(f in query, where: f.uuid in ^descendants)
   end
 
   @doc """
@@ -1503,7 +1503,6 @@ defmodule PhoenixKit.Modules.Storage do
         build_scope_file_query(scope_folder_id, folder_uuid, search, include_orphaned)
         |> where([f], f.status != "trashed")
         |> exclude_system_managed()
-        |> exclude_folder_header_assets(folder_uuid)
         |> maybe_filter_file_type(file_type)
 
       total = repo().aggregate(query, :count, :uuid)
@@ -1524,26 +1523,6 @@ defmodule PhoenixKit.Modules.Storage do
   defp maybe_filter_file_type(query, type) when type in [nil, "all", ""], do: query
   defp maybe_filter_file_type(query, type), do: where(query, [f], f.file_type == ^type)
 
-  # A folder's own cover/logo are folder assets, not part of its visible file
-  # listing — drop them from the per-folder grid. They remain real files
-  # (re-selectable via the header's media picker); we just don't show them as
-  # loose files in the folder they decorate. Only applies when listing a
-  # specific folder; flat views (all/orphaned/search) pass folder_uuid = nil.
-  defp exclude_folder_header_assets(query, nil), do: query
-
-  defp exclude_folder_header_assets(query, folder_uuid) do
-    case get_folder(folder_uuid) do
-      %{} = folder ->
-        case Enum.reject([folder.cover_file_uuid, folder.logo_file_uuid], &is_nil/1) do
-          [] -> query
-          excluded -> where(query, [f], f.uuid not in ^excluded)
-        end
-
-      _ ->
-        query
-    end
-  end
-
   # Sort whitelist for the media browser toolbar — defaults to newest first.
   # Every order carries `f.uuid` as a stable tiebreaker so equal values
   # (same size, same name, same insert time) can't shuffle across pages.
diff --git a/lib/phoenix_kit/migrations/postgres.ex b/lib/phoenix_kit/migrations/postgres.ex
index 24695daa0..9bff02d3a 100644
--- a/lib/phoenix_kit/migrations/postgres.ex
+++ b/lib/phoenix_kit/migrations/postgres.ex
@@ -529,7 +529,13 @@ defmodule PhoenixKit.Migrations.Postgres do
   - Replaces unique index with partial index (slug-mode only, WHERE slug IS NOT NULL)
   - Adds unique index on `(group_uuid, post_date, post_time)` for timestamp-mode posts
 
-  ### V152 - Newsletters/CRM/Core restructuring (accumulator) ⚡ LATEST
+  ### V153 - Folder header size defaults to small ⚡ LATEST
+  - Flips `phoenix_kit_media_folders.header_size` column default from
+    'medium' (V134) to 'small', and backfills existing 'medium' rows to
+    'small' ('medium' was the old default, so it reads as untouched;
+    'large' is a deliberate choice and is left alone)
+
+  ### V152 - Newsletters/CRM/Core restructuring (accumulator)
   - Unreleased — per the "one open migration" rule, every DDL step of the
     restructuring plan lands in V152 as its own section until it ships;
     later stages append here rather than opening V153.
@@ -1323,7 +1329,7 @@ defmodule PhoenixKit.Migrations.Postgres do
   alias PhoenixKit.Migrations.Postgres.Helpers
 
   @initial_version 1
-  @current_version 152
+  @current_version 153
   @default_prefix "public"
 
   # First version whose SQL references uuid_generate_v7(). Chains that
diff --git a/lib/phoenix_kit/migrations/postgres/v153.ex b/lib/phoenix_kit/migrations/postgres/v153.ex
new file mode 100644
index 000000000..3a3794c83
--- /dev/null
+++ b/lib/phoenix_kit/migrations/postgres/v153.ex
@@ -0,0 +1,68 @@
+defmodule PhoenixKit.Migrations.Postgres.V153 do
+  @moduledoc """
+  V153: folder header size defaults to small.
+
+  New folders now open with a small hero header (see the schema default on
+  `PhoenixKit.Modules.Storage.Folder`). This migration brings existing rows
+  and the DB column default in line:
+
+    * **Column default** `phoenix_kit_media_folders.header_size` flips from
+      `'medium'` (set in V134) to `'small'`, so raw inserts match the
+      changeset default.
+
+    * **Backfill** every folder currently on `'medium'` → `'small'`.
+      `'medium'` was the *old default*, so a stored `'medium'` is
+      indistinguishable from "never touched" — those reset to small.
+      `'large'` was never a default, so any `'large'` is a deliberate
+      choice and is left alone; existing `'small'` rows are unaffected.
+
+  There is no stored "user customised this" signal, so a folder someone
+  deliberately set to `'medium'` also resets — an accepted trade-off, since
+  medium and default-medium can't be told apart. Users can re-pick medium
+  from the header-size control any time.
+
+  Idempotent: the backfill's `WHERE header_size = 'medium'` and the default
+  swap are safe to re-run.
+  """
+
+  use Ecto.Migration
+
+  def up(opts) do
+    p = prefix_str(Map.get(opts, :prefix, "public"))
+
+    execute("""
+    ALTER TABLE #{p}phoenix_kit_media_folders
+    ALTER COLUMN header_size SET DEFAULT 'small'
+    """)
+
+    execute("""
+    UPDATE #{p}phoenix_kit_media_folders
+    SET header_size = 'small'
+    WHERE header_size = 'medium'
+    """)
+
+    execute("COMMENT ON TABLE #{p}phoenix_kit IS '153'")
+  end
+
+  @doc """
+  Rolls V152 back.
+
+  Restores the column default to `'medium'` (its V134 value). **Lossy:** the
+  `medium → small` backfill is not reversed — the folders that were reset
+  can't be told apart from folders genuinely on small, so their sizes stay
+  as they are.
+  """
+  def down(opts) do
+    p = prefix_str(Map.get(opts, :prefix, "public"))
+
+    execute("""
+    ALTER TABLE #{p}phoenix_kit_media_folders
+    ALTER COLUMN header_size SET DEFAULT 'medium'
+    """)
+
+    execute("COMMENT ON TABLE #{p}phoenix_kit IS '152'")
+  end
+
+  defp prefix_str("public"), do: "public."
+  defp prefix_str(prefix), do: "#{prefix}."
+end
diff --git a/lib/phoenix_kit_web/components/media_browser.ex b/lib/phoenix_kit_web/components/media_browser.ex
index 9ae31e801..00d21ba24 100644
--- a/lib/phoenix_kit_web/components/media_browser.ex
+++ b/lib/phoenix_kit_web/components/media_browser.ex
@@ -441,7 +441,10 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
     |> assign(:filter_trash, false)
     |> assign(:file_view, file_view)
     |> assign(:orphaned_count, orphaned_count)
-    |> assign(:trash_count, full_trash_count(scope_folder_id(socket)))
+    # Badge counts the trash of the folder being navigated to (its subtree),
+    # matching the scope the Trash view will use — read from the local
+    # `current_folder`, since the pre-pipe socket still holds the old one.
+    |> assign(:trash_count, full_trash_count(folder_or_scope(current_folder, scope)))
     |> assign(:uploaded_files, files)
     |> assign(:total_count, total_count)
     |> assign(:total_pages, ceil(total_count / per_page))
@@ -1554,16 +1557,18 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
 
   def handle_event("toggle_select_mode", _params, socket) do
     if socket.assigns.select_mode do
-      {:noreply,
-       socket
-       |> assign(:select_mode, false)
-       |> assign(:selected_files, MapSet.new())
-       |> assign(:selected_folders, MapSet.new())}
+      {:noreply, exit_select_mode(socket)}
     else
       {:noreply, assign(socket, :select_mode, true)}
     end
   end
 
+  # Esc leaves select mode from anywhere, mirroring the toolbar's Cancel — the
+  # window-keydown is only attached while select mode is on (see the heex).
+  def handle_event("exit_select_mode", _params, socket) do
+    {:noreply, exit_select_mode(socket)}
+  end
+
   # Long-press on a card (from the MediaDragDrop JS hook) enters select mode and
   # selects the held item.
   def handle_event("long_press_select", %{"type" => "file", "uuid" => uuid}, socket) do
@@ -1869,6 +1874,35 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
   # Single-file delete via the per-row kebab menu. Mirrors `delete_selected`
   # for one file — soft-delete to trash when outside the trash view, permanent
   # delete when already inside it. Scope-guarded the same way.
+  # Rotate a single file's saved orientation ±90 from the per-file kebab.
+  # Same persistence as the viewer's rotate button — writes
+  # metadata["rotation"] and broadcasts the thumbnail refresh — so the grid
+  # reorients its thumbnail via the rotation_class CSS transform (no
+  # re-encode, no open viewer needed). Images only; scope-guarded like the
+  # other per-file mutations.
+  def handle_event("rotate_file", %{"file-uuid" => file_uuid, "dir" => dir}, socket) do
+    delta = if dir == "left", do: -90, else: 90
+    scope = scope_folder_id(socket)
+
+    with %Storage.File{} = file <- Storage.get_file(file_uuid),
+         true <- Storage.within_scope?(file.folder_uuid, scope) do
+      current = normalized_rotation(Map.get(file.metadata || %{}, "rotation"))
+      next = Integer.mod(current + delta, 360)
+      merged = Map.put(file.metadata || %{}, "rotation", next)
+
+      case Storage.update_file(file, %{metadata: merged}) do
+        {:ok, _} ->
+          Storage.broadcast_file_thumbnail_updated(file_uuid)
+          {:noreply, refresh_processed_file(socket, file_uuid, viewer: false)}
+
+        {:error, _} ->
+          {:noreply, put_flash(socket, :error, gettext("Could not rotate the image."))}
+      end
+    else
+      _ -> {:noreply, socket}
+    end
+  end
+
   def handle_event("delete_file", %{"file-uuid" => file_uuid}, socket) do
     scope = scope_folder_id(socket)
     repo = PhoenixKit.Config.get_repo()
@@ -1925,12 +1959,15 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
 
   def handle_event("toggle_trash_filter", _params, socket) do
     filter_trash = !socket.assigns.filter_trash
-    scope = scope_folder_id(socket)
+    # Trash is scoped to the current folder's subtree (see trash_scope/1);
+    # the active-file reload below uses the plain embedded scope.
+    t_scope = trash_scope(socket)
 
     {files, total_count} =
       if filter_trash do
-        load_trashed_files(scope, 1, socket.assigns.per_page)
+        load_trashed_files(t_scope, 1, socket.assigns.per_page)
       else
+        scope = scope_folder_id(socket)
         folder_uuid = current_folder_uuid(socket)
         load_scoped_files(scope, 1, socket.assigns.per_page, folder_uuid, "", list_extra(socket))
       end
@@ -1942,8 +1979,8 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
     # cards on screen in the normal view.
     folders =
       if filter_trash,
-        do: Storage.list_trashed_folders(scope),
-        else: Storage.list_folders(current_folder_uuid(socket), scope)
+        do: Storage.list_trashed_folders(t_scope),
+        else: Storage.list_folders(current_folder_uuid(socket), scope_folder_id(socket))
 
     {:noreply,
      socket
@@ -1960,7 +1997,7 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
      # would be permanently destroyed.
      |> assign(:selected_files, MapSet.new())
      |> assign(:selected_folders, MapSet.new())
-     |> assign(:trash_count, full_trash_count(scope))}
+     |> assign(:trash_count, full_trash_count(t_scope))}
   end
 
   def handle_event("restore_selected", _params, socket) do
@@ -2008,7 +2045,9 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
   end
 
   def handle_event("empty_trash", _params, socket) do
-    {:ok, count} = Storage.empty_trash(scope_folder_id(socket))
+    # Scoped to the folder you're viewing the Trash of — emptying a folder's
+    # trash must not purge sibling roots' trashed files.
+    {:ok, count} = Storage.empty_trash(trash_scope(socket))
 
     {:noreply,
      socket
@@ -2150,6 +2189,15 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
     assign(socket, :selected_files, selected)
   end
 
+  # Leave select mode and drop any selection — shared by the toolbar Cancel
+  # button and the Esc key.
+  defp exit_select_mode(socket) do
+    socket
+    |> assign(:select_mode, false)
+    |> assign(:selected_files, MapSet.new())
+    |> assign(:selected_folders, MapSet.new())
+  end
+
   # Look up the clicked file's enriched map (filename, mime_type, size, urls,
   # …) inside the current page's uploaded_files list so the modal can render
   # without an extra DB roundtrip.
@@ -2299,7 +2347,7 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
 
     folders =
       cond do
-        filter_trash -> Storage.list_trashed_folders(scope)
+        filter_trash -> Storage.list_trashed_folders(trash_scope(socket))
         file_view == "all" -> []
         true -> Storage.list_folders(parent_uuid, scope)
       end
@@ -2356,7 +2404,7 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
 
     {files, total_count} =
       cond do
-        socket.assigns[:filter_trash] -> load_trashed_files(scope, page, per_page)
+        socket.assigns[:filter_trash] -> load_trashed_files(trash_scope(socket), page, per_page)
         socket.assigns.filter_orphaned -> load_orphaned_files(page, per_page)
         file_view == "all" -> load_all_view_files(scope, page, per_page, search, extra)
         true -> load_scoped_files(scope, page, per_page, folder_uuid, search, extra)
@@ -2377,7 +2425,7 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
       |> assign(:uploaded_files, files)
       |> assign(:total_count, total_count)
       |> assign(:total_pages, total_pages)
-      |> assign(:trash_count, full_trash_count(scope_folder_id(socket)))
+      |> assign(:trash_count, full_trash_count(trash_scope(socket)))
       |> assign_stacks()
     end
   end
@@ -2635,6 +2683,26 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
           icon="hero-arrow-down-tray"
           label={gettext("Download")}
         />
+        <%!-- Rotate the saved orientation ±90 (images only). Persists like
+              the viewer; the thumbnail reorients live. --%>
+        <.table_row_menu_button
+          :if={@file.file_type == "image"}
+          phx-click="rotate_file"
+          phx-target={@myself}
+          phx-value-file-uuid={@file.file_uuid}
+          phx-value-dir="left"
+          icon="hero-arrow-uturn-left"
+          label={gettext("Rotate left")}
+        />
+        <.table_row_menu_button
+          :if={@file.file_type == "image"}
+          phx-click="rotate_file"
+          phx-target={@myself}
+          phx-value-file-uuid={@file.file_uuid}
+          phx-value-dir="right"
+          icon="hero-arrow-uturn-right"
+          label={gettext("Rotate right")}
+        />
         <.table_row_menu_button
           phx-click="prepare_move_file"
           phx-target={@myself}
@@ -2941,6 +3009,20 @@ defmodule PhoenixKitWeb.Components.MediaBrowser do
 
   defp scope_folder_id(socket), do: socket.assigns[:scope_folder_id]
 
+  # The scope for the Trash view + badge: the folder you're currently in (its
+  # whole subtree), falling back to the embedded browser scope at the root.
+  # Keeps a folder's Trash to what was deleted under it — never a sibling
+  # root's trash. At the true root (no current folder, no embed scope) this is
+  # nil, so the top-level view still shows all trash.
+  defp trash_scope(socket), do: current_folder_uuid(socket) || scope_folder_id(socket)
+
+  # trash_scope/1 reads the socket's `current_folder`, but on the nav path the
+  # target folder is only a local (the socket still holds the old one), so this
+  # resolves the same "this folder's subtree, else the embed scope" from
+  # explicit args.
+  defp folder_or_scope(nil, scope), do: scope
+  defp folder_or_scope(folder, _scope), do: folder.uuid
+
   defp controlled_mode?(socket), do: socket.assigns[:on_navigate] != nil
 
   # ──────────────────────────────────────────────────────────────
diff --git a/lib/phoenix_kit_web/components/media_browser.html.heex b/lib/phoenix_kit_web/components/media_browser.html.heex
index f0f260679..b83774b04 100644
--- a/lib/phoenix_kit_web/components/media_browser.html.heex
+++ b/lib/phoenix_kit_web/components/media_browser.html.heex
@@ -1,9 +1,13 @@
 <%!-- MediaBrowser LiveComponent template.
      All phx-* events route to the component via phx-target={@myself} on the root div. --%>
+<%!-- Esc exits select mode (same as the toolbar Cancel), only while it's on
+     so the window listener isn't attached otherwise. --%>
 <div
   id={@id}
   phx-target={@myself}
   phx-hook="MediaDragDrop"
+  phx-window-keydown={@select_mode && "exit_select_mode"}
+  phx-key="Escape"
   class={@fill_height && "flex flex-col flex-1 min-h-0 w-full"}
 >
   <style>
@@ -1569,6 +1573,27 @@
                                 icon="hero-arrow-down-tray"
                                 label={gettext("Download")}
                               />
+                              <%!-- Rotate the saved orientation ±90 (images
+                                    only). Persists like the viewer's rotate
+                                    button; the thumbnail reorients live. --%>
+                              <.table_row_menu_button
+                                :if={file.file_type == "image"}
+                                phx-click="rotate_file"
+                                phx-target={@myself}
+                                phx-value-file-uuid={file.file_uuid}
+                                phx-value-dir="left"
+                                icon="hero-arrow-uturn-left"
+                                label={gettext("Rotate left")}
+                              />
+                              <.table_row_menu_button
+                                :if={file.file_type == "image"}
+                                phx-click="rotate_file"
+                                phx-target={@myself}
+                                phx-value-file-uuid={file.file_uuid}
+                                phx-value-dir="right"
+                                icon="hero-arrow-uturn-right"
+                                label={gettext("Rotate right")}
+                              />
                               <.table_row_menu_button
                                 phx-click="prepare_move_file"
                                 phx-target={@myself}
@@ -2176,6 +2201,27 @@
                                       icon="hero-arrow-down-tray"
                                       label={gettext("Download")}
                                     />
+                                    <%!-- Rotate the saved orientation ±90
+                                          (images only). Persists like the
+                                          viewer; the thumbnail reorients live. --%>
+                                    <.table_row_menu_button
+                                      :if={file.file_type == "image"}
+                                      phx-click="rotate_file"
+                                      phx-target={@myself}
+                                      phx-value-file-uuid={file.file_uuid}
+                                      phx-value-dir="left"
+                                      icon="hero-arrow-uturn-left"
+                                      label={gettext("Rotate left")}
+                                    />
+                                    <.table_row_menu_button
+                                      :if={file.file_type == "image"}
+                                      phx-click="rotate_file"
+                                      phx-target={@myself}
+                                      phx-value-file-uuid={file.file_uuid}
+                                      phx-value-dir="right"
+                                      icon="hero-arrow-uturn-right"
+                                      label={gettext("Rotate right")}
+                                    />
                                     <.table_row_menu_button
                                       phx-click="prepare_move_file"
                                       phx-target={@myself}
diff --git a/mix.lock b/mix.lock
index f3c95c443..5cc9a5c05 100644
--- a/mix.lock
+++ b/mix.lock
@@ -20,7 +20,7 @@
   "eqrcode": {:hex, :eqrcode, "0.2.1", "d12838813e8fc87b8940cc05f9baadb189031f6009facdc56ff074375ec73b6e", [:mix], [], "hexpm", "d5828a222b904c68360e7dc2a40c3ef33a1328b7c074583898040f389f928025"},
   "erlex": {:hex, :erlex, "0.2.9", "7debbbaa9f4f368b8cd648983e0f1d7963028508e9c59e9d4ed504e94ef52a55", [:mix], [], "hexpm", "8cfffc0ec7159e6d73de2ab28a588064de80f88b2798d5cbe4482cbbc200178b"},
   "esbuild": {:hex, :esbuild, "0.10.0", "b0aa3388a1c23e727c5a3e7427c932d89ee791746b0081bbe56103e9ef3d291f", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "468489cda427b974a7cc9f03ace55368a83e1a7be12fba7e30969af78e5f8c70"},
-  "etcher": {:hex, :etcher, "0.8.0", "1bac2809e57dd79f743b0f37c2219433a1239cf7bcb41deadbb51b98077532a0", [:mix], [{:fresco, "~> 0.5.9 or ~> 0.6.0 or ~> 0.7.0 or ~> 0.8.0 or ~> 0.9.0", [hex: :fresco, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "a826b4df717263937ba429fbdc5a7fc0f555d5198fb163959ab0204a7c566fd0"},
+  "etcher": {:hex, :etcher, "0.8.1", "048155327e8aefd6ab7e2bb616d218a20201b7863d2f89fdef202921c386af21", [:mix], [{:fresco, "~> 0.5.9 or ~> 0.6.0 or ~> 0.7.0 or ~> 0.8.0 or ~> 0.9.0 or ~> 0.10.0", [hex: :fresco, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "e247391080c7349294dea76aac547d5563ea651ff3864d3c2e0c4cfd68b8278e"},
   "ex_ast": {:hex, :ex_ast, "0.12.10", "1126eb2afe3218e7a8a53ce85adf1056c528c88fbb5adcbe0191b647b842b377", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.7", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "e03f668c4354e3a1382c3d762c0fcc82ca9670f6f37e62b9097ce752be6adf39"},
   "ex_aws": {:hex, :ex_aws, "2.7.0", "e6bfd4b5fb8c791aa6c7d57fc7c45f050bb89de9576f1f6104aa974b234c01ec", [:mix], [{:configparser_ex, "~> 5.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "~> 4.0", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8 or ~> 3.0", [hex: :jsx, repo: "hexpm", optional: true]}, {:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:req, "~> 0.5.10 or ~> 0.6 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "bfe9d744d4fd4c1f40314ee7fab504d5547d1f01cd377fff1568cbe630b06d65"},
   "ex_aws_ec2": {:hex, :ex_aws_ec2, "2.0.1", "1558c9bf4044048fb2b3b1ca3d7a62c65666959432ae29ef1d584258926d8fc0", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}], "hexpm", "adb86c51c2bcf630a739261bfff9293d2bf96946bf1a2d40d4f78e56a349a52b"},
@@ -34,7 +34,7 @@
   "finch": {:hex, :finch, "0.23.0", "e3f9287ac25a8832f848b144c2b57346aac65b205e2e0629a52adfe6507fd837", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.8", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 1.1", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "80e58d3f936f57e3fdf404f83a3642897ae6d9fb642934e46da4d8fe761b99d5"},
   "fine": {:hex, :fine, "0.1.6", "4bf7151493443c454aac9f2fa2f34f5fefd0346a83fb5586a016c4a135c63247", [:mix], [], "hexpm", "5638eb4495488e885ebec167fa57973e5c35e1a50c344eb7666c90ec1c4e3b12"},
   "floki": {:hex, :floki, "0.38.4", "10f98971e892aed2c2f1b3a0f928e488e3797e1c6dd3dfd98db40b14e9a78bcf", [:mix], [], "hexpm", "bdb34645eee8e79845c7edaca2d4099a52804ee4d4a3ecc683a69451f0244973"},
-  "fresco": {:hex, :fresco, "0.9.0", "f166a3e92084c1f29db76e07e867ff92a9c939e8a9c608772a5c38c8c6048318", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "e29021c26a52d611c517d5bf465e7ed6182249ba4753844cfb1868c84421f854"},
+  "fresco": {:hex, :fresco, "0.10.0", "16138442f013f7bf1bb274c2a04d5bdb7b45f58ae5efec290d271ae012aef639", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "781dc5ebbb5a89ca8617b7d1c5339f43e3ff8715263811c430cfdb9051cdd8fd"},
   "gen_smtp": {:hex, :gen_smtp, "1.3.0", "62c3d91f0dcf6ce9db71bcb6881d7ad0d1d834c7f38c13fa8e952f4104a8442e", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "0b73fbf069864ecbce02fe653b16d3f35fd889d0fdd4e14527675565c39d84e6"},
   "gettext": {:hex, :gettext, "1.0.2", "5457e1fd3f4abe47b0e13ff85086aabae760497a3497909b8473e0acee57673b", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "eab805501886802071ad290714515c8c4a17196ea76e5afc9d06ca85fb1bfeb3"},
   "glob_ex": {:hex, :glob_ex, "0.1.11", "cb50d3f1ef53f6ca04d6252c7fde09fd7a1cf63387714fe96f340a1349e62c93", [:mix], [], "hexpm", "342729363056e3145e61766b416769984c329e4378f1d558b63e341020525de4"},
@@ -90,7 +90,7 @@
   "tailwind": {:hex, :tailwind, "0.5.1", "35435b13158c90d37da11e1cfc808755fca1d7b6c5ab87b1b19c5de87e2f0a10", [:mix], [], "hexpm", "c4e26302a59fec72abc5610ecb6ad2116d9aa31f31aab2d4b8eb6e95d25a689c"},
   "telemetry": {:hex, :telemetry, "1.4.2", "a0cb522801dffb1c49fe6e30561badffc7b6d0e180db1300df759faa22062855", [:rebar3], [], "hexpm", "928f6495066506077862c0d1646609eed891a4326bee3126ba54b60af61febb1"},
   "tesla": {:hex, :tesla, "1.20.0", "922b504e186da2ee82990d44e7422435f41b67403908a00340c3a0b23a17aa90", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.21 or >= 4.0.2 and < 5.0.0-0", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:mox, "~> 1.0", [hex: :mox, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:opentelemetry_semantic_conventions, "~> 1.27", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "3ecb41cb458772332752c3acdfe983e23abb991f5a43cfd69a64e9ea3f4b0061"},
-  "tessera": {:hex, :tessera, "0.3.3", "b17e50364468767d4da54f83dab933d02ed6e02dd871481a348e0ef140b13d47", [:mix], [{:fresco, "~> 0.5.9 or ~> 0.6.0 or ~> 0.7.0 or ~> 0.8.0 or ~> 0.9.0", [hex: :fresco, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "dd24043594e25fa30dcb32940f6834c6b1f1a4d7463e5e24bf1511a8c5912925"},
+  "tessera": {:hex, :tessera, "0.3.4", "544d9e33fd1830219f1962a682242cec542ffecf46801399ca0c7f381161f021", [:mix], [{:fresco, "~> 0.5.9 or ~> 0.6.0 or ~> 0.7.0 or ~> 0.8.0 or ~> 0.9.0 or ~> 0.10.0", [hex: :fresco, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "7239525327c1ed695c79ba2551832179537569fdfc551fcf8bbcc9f84d135154"},
   "text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"},
   "thousand_island": {:hex, :thousand_island, "1.5.0", "f50a213cac97262b6d5ebb85745aa2c00fec1413191e6e66834788d45425cecb", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "708923d40523e43cf99041ab37a0d4b0ec426ac6438fa3716ab23d919eaeb412"},
   "tigris_regions": {:hex, :tigris_regions, "0.1.0", "5c436ecb36c74b09f887a83a165e1836b66cb2fa491a817e25c4605808834b9c", [:mix], [], "hexpm", "46c0154e294751e6fc194cc45c09f25c837c25074fcf29a7aaf762d7bfb10292"},
diff --git a/priv/gettext/et/LC_MESSAGES/default.po b/priv/gettext/et/LC_MESSAGES/default.po
index 96aff7042..2f428f779 100644
--- a/priv/gettext/et/LC_MESSAGES/default.po
+++ b/priv/gettext/et/LC_MESSAGES/default.po
@@ -9020,7 +9020,7 @@ msgstr "Toiming:"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:2006
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Add description"
-msgstr "Kirjeldus"
+msgstr "Lisa kirjeldus"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:847
 #, elixir-autogen, elixir-format, fuzzy
@@ -9035,7 +9035,7 @@ msgstr "Märgistatud pisipildid"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:852
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Archives"
-msgstr "Arhiveeritud"
+msgstr "Arhiivid"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:851
 #, elixir-autogen, elixir-format
@@ -9051,7 +9051,7 @@ msgstr "Tagasi"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:475
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Background image"
-msgstr "Taustapilt (lauaarvuti)"
+msgstr "Taustapilt"
 
 #: lib/modules/storage/web/settings.html.heex:436
 #, elixir-autogen, elixir-format
@@ -9077,7 +9077,7 @@ msgstr "Muuda"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:502
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Choose"
-msgstr "Sulge"
+msgstr "Vali"
 
 #: lib/phoenix_kit/integrations/providers.ex:611
 #, elixir-autogen, elixir-format, fuzzy
@@ -9093,7 +9093,7 @@ msgstr "Klõpsa **Loo API võti**, anna sellele nimi"
 #: lib/phoenix_kit_web/live/users/users.html.heex:259
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Close search"
-msgstr "Tühjenda"
+msgstr "Sulge otsing"
 
 #: lib/phoenix_kit/integrations/providers.ex:601
 #, elixir-autogen, elixir-format, fuzzy
@@ -9113,7 +9113,7 @@ msgstr "Loo ja muuda pildi/video suuruse eelseadeid, mida kasutatakse üleslaadi
 #: lib/phoenix_kit_web/components/media_browser.html.heex:2362
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create folder"
-msgstr "Loo roll"
+msgstr "Loo kaust"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:709
 #, elixir-autogen, elixir-format
@@ -9145,7 +9145,7 @@ msgstr "Eemaldatud"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:850
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Documents"
-msgstr "Kommentaarid"
+msgstr "Dokumendid"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:1728
 #, elixir-autogen, elixir-format
@@ -9212,7 +9212,7 @@ msgstr "Seade uuendamine ebaõnnestus"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:943
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Filter"
-msgstr "Fail"
+msgstr "Filter"
 
 #: lib/modules/storage/web/settings.html.heex:564
 #, elixir-autogen, elixir-format, fuzzy
@@ -9222,7 +9222,7 @@ msgstr "Sidumata failid"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:395
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Folder name"
-msgstr "Kaust teisaldatud"
+msgstr "Kausta nimi"
 
 #: lib/phoenix_kit_web/components/media_browser.ex:1505
 #, elixir-autogen, elixir-format
@@ -9281,7 +9281,7 @@ msgstr "Ruudustikuvaade"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:524
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Header size"
-msgstr "Pealkiri"
+msgstr "Päise suurus"
 
 #: lib/phoenix_kit_web/components/core/markdown_editor.ex:192
 #, elixir-autogen, elixir-format
@@ -9306,7 +9306,7 @@ msgstr "Keeled"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:530
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Large"
-msgstr "Sihtmärk"
+msgstr "Suur"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:843
 #, elixir-autogen, elixir-format
@@ -9335,17 +9335,17 @@ msgstr "Meedia on põhisüsteemi moodul, mis on alati lubatud ja mida ei saa kee
 #: lib/phoenix_kit_web/components/media_browser.html.heex:529
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Medium"
-msgstr "Meedia"
+msgstr "Keskmine"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:841
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Name A–Z"
-msgstr "Nimi"
+msgstr "Nimi A–Z"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:842
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Name Z–A"
-msgstr "Nimi"
+msgstr "Nimi Z–A"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:2334
 #, elixir-autogen, elixir-format
@@ -9365,7 +9365,7 @@ msgstr "Taustata"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:695
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No description — add one"
-msgstr "Kirjeldus puudub"
+msgstr "Kirjeldus puudub — lisa see"
 
 #: lib/phoenix_kit_web/components/media_browser.ex:2487
 #: lib/phoenix_kit_web/components/media_browser.html.heex:1670
@@ -9457,7 +9457,7 @@ msgstr "Näita loomise kuupäeva"
 #: lib/phoenix_kit_web/components/media_browser.html.heex:562
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show description"
-msgstr "Kirjeldus puudub"
+msgstr "Näita kirjeldust"
 
 #: lib/phoenix_kit_web/components/media_browser.html.heex:560
 #, elixir-autogen, elixir-format
@@ -9684,7 +9684,7 @@ msgstr ""
 #: lib/phoenix_kit_web/components/media_canvas_viewer.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "Play / Pause"
-msgstr ""
+msgstr "Esita / Peata"
 
 #: lib/phoenix_kit/theme_config.ex:122
 #, elixir-autogen, elixir-format
@@ -9724,7 +9724,7 @@ msgstr ""
 #: lib/phoenix_kit_web/components/media_canvas_viewer.html.heex:185
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Your browser does not support the audio tag."
-msgstr "Teie brauser ei toeta video-elementi."
+msgstr "Teie brauser ei toeta heli-elementi."
 
 #: lib/phoenix_kit_web/components/user_dashboard_nav.ex:237
 #, elixir-autogen, elixir-format, fuzzy
diff --git a/test/integration/phoenix_kit_web/components/media_browser_test.exs b/test/integration/phoenix_kit_web/components/media_browser_test.exs
index 4a159d3ff..6b1a3b662 100644
--- a/test/integration/phoenix_kit_web/components/media_browser_test.exs
+++ b/test/integration/phoenix_kit_web/components/media_browser_test.exs
@@ -461,6 +461,86 @@ defmodule PhoenixKitWeb.Components.MediaBrowserTest do
     end
   end
 
+  # ---------------------------------------------------------------------------
+  # Per-file kebab rotate — saves the rotation like the viewer's rotate button
+  # ---------------------------------------------------------------------------
+
+  describe "kebab rotate" do
+    test "Rotate right/left steps the file's saved rotation by ±90", %{conn: conn} do
+      {user, _token} = create_admin_user()
+      folder = create_folder!()
+      file = create_file!(folder.uuid)
+      create_instance!(file.uuid)
+      conn = log_in_user(conn, user)
+
+      {:ok, view, _html} = live(conn, @media_path <> "?folder=#{folder.uuid}")
+
+      right =
+        "[phx-click='rotate_file'][phx-value-file-uuid='#{file.uuid}'][phx-value-dir='right']"
+
+      left = "[phx-click='rotate_file'][phx-value-file-uuid='#{file.uuid}'][phx-value-dir='left']"
+
+      view |> element(right) |> render_click()
+      assert %{metadata: %{"rotation" => 90}} = Storage.get_file(file.uuid)
+
+      view |> element(left) |> render_click()
+      assert %{metadata: %{"rotation" => 0}} = Storage.get_file(file.uuid)
+
+      # Left from 0 wraps to 270 (the other direction).
+      view |> element(left) |> render_click()
+      assert %{metadata: %{"rotation" => 270}} = Storage.get_file(file.uuid)
+    end
+  end
+
+  # ---------------------------------------------------------------------------
+  # Select mode — Esc exits it like the toolbar Cancel
+  # ---------------------------------------------------------------------------
+
+  describe "select mode" do
+    test "Escape exits select mode and clears the selection", %{conn: conn} do
+      {user, _token} = create_admin_user()
+      folder = create_folder!()
+      _file = create_file!(folder.uuid)
+      conn = log_in_user(conn, user)
+
+      {:ok, view, _html} = live(conn, @media_path <> "?folder=#{folder.uuid}")
+
+      # Enter select mode via the overflow menu's Select (the only
+      # toggle_select_mode control rendered while not selecting).
+      html = view |> element("[phx-click='toggle_select_mode']") |> render_click()
+      assert html =~ ~s(phx-click="select_all")
+
+      # Esc exits — the window-keydown is attached only while selecting.
+      html = view |> element("#media-browser") |> render_keydown(%{"key" => "Escape"})
+      refute html =~ ~s(phx-click="select_all")
+    end
+  end
+
+  # ---------------------------------------------------------------------------
+  # Trash is scoped to the folder you're in — not other roots' trash
+  # ---------------------------------------------------------------------------
+
+  describe "trash view scoping" do
+    test "opening trash inside a folder shows only that folder's trash", %{conn: conn} do
+      {user, _token} = create_admin_user()
+      r1 = create_folder!(%{name: "root_one"})
+      r2 = create_folder!(%{name: "root_two"})
+      here = create_file!(r1.uuid)
+      elsewhere = create_file!(r2.uuid)
+      {:ok, _} = Storage.trash_file(here)
+      {:ok, _} = Storage.trash_file(elsewhere)
+      conn = log_in_user(conn, user)
+
+      # Land inside r1, then open Trash. Before the fix the browser passed a
+      # nil scope, so trash showed every root's trashed files.
+      {:ok, view, _html} = live(conn, @media_path <> "?folder=#{r1.uuid}")
+      html = view |> element("[phx-click='toggle_trash_filter']") |> render_click()
+
+      assert html =~ here.uuid
+      refute html =~ elsewhere.uuid
+    end
+  end
+
   # ---------------------------------------------------------------------------
   # Info sidebar collapse — viewer-only mode for small screens, per-user sticky
   # ---------------------------------------------------------------------------
diff --git a/test/integration/storage/scope_test.exs b/test/integration/storage/scope_test.exs
index 0dd117e11..c685c33f5 100644
--- a/test/integration/storage/scope_test.exs
+++ b/test/integration/storage/scope_test.exs
@@ -298,6 +298,31 @@ defmodule PhoenixKit.Integration.Storage.ScopeTest do
                Storage.list_files_in_scope(scope.uuid, folder_uuid: sibling.uuid)
     end
 
+    test "a file used as the folder's cover/logo still appears in its listing" do
+      # Setting a folder's hero background/icon must not hide that file from
+      # the folder — it stays a normal file in the folder. Regression: the
+      # listing used to drop cover_file_uuid / logo_file_uuid.
+      folder = create_folder!(%{name: "decorated_#{System.unique_integer([:positive])}"})
+      cover = create_file!(folder.uuid)
+      logo = create_file!(folder.uuid)
+      plain = create_file!(folder.uuid)
+
+      {:ok, _} =
+        Storage.update_folder(
+          folder,
+          %{cover_file_uuid: cover.uuid, logo_file_uuid: logo.uuid},
+          nil
+        )
+
+      {files, count} = Storage.list_files_in_scope(nil, folder_uuid: folder.uuid)
+      uuids = Enum.map(files, & &1.uuid)
+
+      assert cover.uuid in uuids
+      assert logo.uuid in uuids
+      assert plain.uuid in uuids
+      assert count == 3
+    end
+
     test "folder_uuid within scope filters to that folder" do
       %{scope: scope, child_a: child_a, child_b: child_b} = build_tree()
       f_a = create_file!(child_a.uuid)
@@ -354,6 +379,44 @@ defmodule PhoenixKit.Integration.Storage.ScopeTest do
     end
   end
 
+  # ---------------------------------------------------------------------------
+  # Trash scoping — a folder's Trash shows only its own subtree, never siblings
+  # ---------------------------------------------------------------------------
+
+  describe "trash scoping" do
+    test "list/count_trashed_files scoped to a folder covers only its subtree" do
+      %{scope: scope, grandchild: grandchild, sibling: sibling} = build_tree()
+      in_scope = create_file!(grandchild.uuid)
+      out = create_file!(sibling.uuid)
+      {:ok, _} = Storage.trash_file(in_scope)
+      {:ok, _} = Storage.trash_file(out)
+
+      scoped = Storage.list_trashed_files(scope.uuid) |> Enum.map(& &1.uuid)
+      assert in_scope.uuid in scoped
+      refute out.uuid in scoped
+      assert Storage.count_trashed_files(scope.uuid) == 1
+
+      # Unscoped (the true-root view) still sees both.
+      all = Storage.list_trashed_files() |> Enum.map(& &1.uuid)
+      assert in_scope.uuid in all
+      assert out.uuid in all
+    end
+
+    test "list/count_trashed_folders scoped to a folder covers only its subtree" do
+      %{scope: scope, grandchild: grandchild, sibling: sibling} = build_tree()
+      sib_child = create_folder!(%{name: "sib_child", parent_uuid: sibling.uuid})
+      {:ok, _} = Storage.trash_folder(grandchild, nil)
+      {:ok, _} = Storage.trash_folder(sib_child, nil)
+
+      scoped = Storage.list_trashed_folders(scope.uuid) |> Enum.map(& &1.uuid)
+      assert grandchild.uuid in scoped
+      refute sib_child.uuid in scoped
+      # the scope folder itself is where you're standing, not a trashed row
+      refute scope.uuid in scoped
+      assert Storage.count_trashed_folders(scope.uuid) == 1
+    end
+  end
+
   # ---------------------------------------------------------------------------
   # count_orphaned_files/1
   # ---------------------------------------------------------------------------